diff --git a/.gitignore b/.gitignore
index 70cfadb..00c0979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,10 @@
 *.mexmaci64
 .classpath
 .cproject
+.factorypath
 .project
 .pydevproject
 .settings
-dist
-doc/pdf
+outside
+src/main/resources/ziggy-build.properties
 src/test/cpp/ExternalProcess/testprog.o
-src/test/cpp/testmi/inputs-0.bin
diff --git a/CITATION.cff b/CITATION.cff
index f49b4ce..7699906 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -15,6 +15,7 @@ authors:
   affiliation: "SETI Institute/NASA Ames Research Center"
   email: Bill.Wohler@nasa.gov
   orcid: "https://orcid.org/0000-0002-5402-9613"
+doi: 10.5281/zenodo.7859503
 license-url: "https://github.com/nasa/ziggy/blob/main/LICENSE.pdf"
 url: "https://github.com/nasa/ziggy"
 repository-code: "https://github.com/nasa/ziggy"
diff --git a/build.gradle b/build.gradle
index 9260087..8ac6f7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,101 +7,143 @@
 // To view a dependency graph using the taskinfo plugin, run "./gradlew tiTree build"
 
 plugins {
-    id 'com.github.spotbugs' version '5.0.+'
+    id 'com.github.spotbugs' version '5.1.+'
     id 'eclipse'
     id 'jacoco'
     id 'java'
+    id 'maven-publish'
     id 'org.barfuin.gradle.taskinfo' version '2.1.+'
+    id 'signing'
 }
 
-defaultTasks 'assemble', 'test'
+defaultTasks 'assemble', 'publish', 'test'
 
 ext {
-    // See comment for ziggyDependencies in gradle.properties.
-    ziggyDependencies = "$rootDir/$ziggyDependencies"
+    // Location of third-party sources.
+    outsideDir = "$rootDir/outside"
+
+    // The dependency group used for libraries from outside is called "outside".
+    // This variable contains the directory that contains the libraries from
+    // outside. Without the dependency group and the outside subdirectory,
+    // consumers of the published module will get "null" errors.
+    outsideGroupDir = "$buildDir/libs/outside"
+
+    // Name of the outside group, used in publishing artifacts.
+    outsideGroup = "outside"
 }
 
 repositories {
     mavenCentral()
     flatDir {
-        dirs "$ziggyDependencies/lib"
+        dirs "$outsideDir/lib"
     }
 }
 
 dependencies {
     // Needed to compile ziggy.
+    implementation files("$rootDir/buildSrc/build/libs/buildSrc-${version}.jar")
+
     implementation 'com.github.librepdf:openpdf:1.3.+'
-    implementation 'com.github.testdriven.guice:commons-configuration:1.+'
+    implementation 'com.github.spotbugs:spotbugs-annotations:4.7.+'
     implementation 'com.google.guava:guava:23.+'
     implementation 'com.jgoodies:jgoodies-forms:1.9.+'
     implementation 'com.jgoodies:jgoodies-looks:2.7.+'
-    implementation 'com.sun.xml.bind:jaxb-impl:3.0+'
     implementation 'commons-cli:commons-cli:1.5.+'
     implementation 'commons-codec:commons-codec:1.+'
     implementation 'commons-io:commons-io:2.11.+'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0+'
     implementation 'org.apache.commons:commons-collections4:4.+'
     implementation 'org.apache.commons:commons-compress:1.+'
+    implementation 'org.apache.commons:commons-configuration2:2.9.+'
     implementation 'org.apache.commons:commons-csv:1.9.+'
     implementation 'org.apache.commons:commons-exec:1.+'
     implementation 'org.apache.commons:commons-lang3:3.12.+'
     implementation 'org.apache.commons:commons-math3:3.6.+'
     implementation 'org.apache.commons:commons-text:1.+'
-    implementation 'org.apache.logging.log4j:log4j-api:2.17.+'
-    implementation 'org.apache.logging.log4j:log4j-core:2.17.+'
-    implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.+'
-    implementation 'org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.+'
-    implementation 'org.hibernate:hibernate-core:4.2.+'
+    implementation 'org.apache.logging.log4j:log4j-core:2.20.+'
+    implementation 'org.apache.logging.log4j:log4j-slf4j2-impl:2.20.+'
+    implementation 'org.hibernate.orm:hibernate-ant:6.2.+'
+    implementation 'org.hibernate:hibernate-core:6.2.+'
     implementation 'org.javassist:javassist:3.29.2-GA'
     implementation 'org.jfree:jfreechart:1.0.+'
+    implementation 'org.jsoup:jsoup:1.16.+'
     implementation 'org.netbeans.api:org-netbeans-swing-outline:+'
+    implementation 'org.slf4j:slf4j-api:2.0.+'
     implementation 'org.tros:l2fprod-properties-editor:1.3.+'
-    implementation 'tanukisoft:wrapper:3.2.+'
-    runtimeOnly 'jakarta.xml.bind:jakarta.xml.bind-api:3.0+'
 
-    // Libraries built in buildSrc.
-    implementation ':jarhdf5:1.12.+'
-    implementation ':wrapper:'
+    // Configuration2 declares the following as optional [1]. It's not, so it's added here.
+    // Occasionally, comment out this line--if the tests pass, delete it.
+    // 1. https://github.com/apache/commons-configuration/blob/master/pom.xml
+    implementation 'commons-beanutils:commons-beanutils:1.9.+'
 
-    // Needed to compile unit tests.
-    implementation 'com.github.spotbugs:spotbugs-annotations:4.7.+'
-    implementation 'junit:junit:4.13.+'
-    implementation 'org.hamcrest:hamcrest:2.+'
-    implementation 'org.mockito:mockito-core:3.12.+'
+    // Libraries built outside.
+    implementation 'outside:jarhdf5:1.12.+'
+    implementation 'outside:wrapper:3.5.+'
+
+    // Needed to run unit tests and at runtime.
+    implementation 'org.hsqldb:hsqldb:2.7.+'
 
-    // Needed to run unit tests.
-    // hsqldb version 2.3.4 causes PipelineInstanceTaskCrudTest to
-    // fail with HsqlException: data exception: datetime field
-    // overflow. This can be fixed by replacing Long.MAX_VALUE with a
-    // smaller date. Other problems ensue with version 2.6.
-    implementation 'org.hsqldb:hsqldb:2.3.2'
+    // Needed to compile unit tests.
+    testImplementation 'junit:junit:4.13.+'
+    testImplementation 'org.hamcrest:hamcrest:2.+'
+    testImplementation 'org.mockito:mockito-core:3.12.+'
 
     // Needed at runtime.
-    implementation 'org.postgresql:postgresql:9.4-1201-jdbc4'
+    runtimeOnly 'jakarta.xml.bind:jakarta.xml.bind-api:3.0+'
+    runtimeOnly 'org.hibernate.orm:hibernate-hikaricp:6.2.+'
+    runtimeOnly 'org.postgresql:postgresql:42.6.+'
+
+    // Astonishingly, for some reason configuration2 doesn't work when
+    // called by MATLAB, but configuration does. Ziggy doesn't use MATLAB
+    // in its build but provides MATLAB utilities that pipelines can call,
+    // so I think that makes this a runtime dependency for Ziggy.
+    runtimeOnly 'commons-configuration:commons-configuration:1.10'
 
     // The following plugin reveals some bugs in our code, but until
     // the "The following classes needed for analysis were missing" bug
     // is fixed, it is commented out for daily use.
     // spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.+'
+
+    annotationProcessor 'org.hibernate.orm:hibernate-jpamodelgen:6.2.+'
 }
 
 tasks.withType(JavaCompile) {
     options.deprecation = true
 }
 
+// Add additional artifacts for publishing (see script-utils/publish.gradle).
+java {
+    // This runs the javadoc task, which currently fails due to
+    // Javadoc errors. Enable after errors fixed, or ignored.
+    // withJavadocJar()
+
+    withSourcesJar()
+}
+
 test {
-    systemProperty "log4j2.configurationFile","$projectDir/test/data/logging/log4j2.xml"
-    systemProperty "java.library.path", "$ziggyDependencies/lib"
-    
+    systemProperty "java.library.path", "$outsideDir/lib"
+
     testLogging {
         events "failed", "skipped"
     }
     useJUnit {
+        // If a code coverage report that incudes the integration tests is desired, then comment
+        // out the IntegrationTestCategory line and uncomment the RunByNameTestCategory line. When
+        // the JaCoCo issue described below is resolved, then delete this comment.
+        // excludeCategories 'gov.nasa.ziggy.RunByNameTestCategory'
         excludeCategories 'gov.nasa.ziggy.IntegrationTestCategory'
     }
 }
 
 // Execute tests marked with @Category(IntegrationTestCategory.class).
 task integrationTest(type: Test) {
+    systemProperty "log4j2.configurationFile", "$rootDir/etc/log4j2.xml"
+    systemProperty "ziggy.logfile", "$buildDir/build.log"
+    systemProperty "java.library.path", "$outsideDir/lib"
+
+    testLogging {
+        events "failed", "skipped"
+    }
     useJUnit {
         includeCategories 'gov.nasa.ziggy.IntegrationTestCategory'
         excludeCategories 'gov.nasa.ziggy.RunByNameTestCategory'
@@ -113,6 +155,10 @@ task integrationTest(type: Test) {
 // since they don't play well with others. For example:
 // gradle runByNameTests --tests *RmiInterProcessCommunicationTest
 task runByNameTest(type: Test) {
+    systemProperty "log4j2.configurationFile", "$rootDir/etc/log4j2.xml"
+    systemProperty "ziggy.logfile", "$buildDir/build.log"
+    systemProperty "java.library.path", "$outsideDir/lib"
+
     useJUnit {
         includeCategories 'gov.nasa.ziggy.RunByNameTestCategory'
     }
@@ -122,12 +168,19 @@ task runByNameTest(type: Test) {
 task testAll
 
 testAll.dependsOn test, integrationTest
+check.dependsOn testAll
 
 // To view code coverage, run the jacocoTestReport task and view the output in:
 // build/reports/jacoco/test/html/index.html.
 check.dependsOn jacocoTestReport
 
 jacocoTestReport {
+    // TODO Switch dependency to testAll to ensure that the integration tests are counted
+    // Depending on anything other than test results in this task
+    // getting SKIPPED, perhaps due to missing execution data. If code
+    // coverage of integration tests is desired, see comment in the test
+    // configuration.
+    // Switching to a recent version of JUnit 5+ was shown to work in one post
     dependsOn test
 
     // Since GUI code doesn't have unit tests, exclude it from the
@@ -153,31 +206,28 @@ spotbugs {
     reportLevel = 'high'
 }
 
-// The following should work to provide a single closure instead of
-// separate closures for the spotbugsMain and spotbugsTest tasks, but
-// it generates a "Could not get unknown property 'com'" error.
-// tasks.withType(com.github.spotbugs.SpotBugsTask) {
-// The following more verbose code accomplishes the same thing.
-// Note that the following more verbose code also triggers a Gradle
-// deprecation warning, specifically a warning that ConfigureUtil
-// is going away. The specific line that generates the message appears
-// to be the "html" line. 
-tasks.matching {task -> task.name.startsWith('spotbugs')}.forEach {
-    it.reports {
-        html {
-            stylesheet = 'fancy-hist.xsl'
-        }
+tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
+    reports {
+        html.stylesheet = "fancy-hist.xsl"
     }
 }
 
+// Outside build files should copy their jars to $outsideGroupDir and
+// then make copyOutsideLibs depend on the task that performs that copy.
+// This is used to publish the outside jars.
+task copyOutsideLibs
+compileJava.dependsOn copyOutsideLibs
+
 // Apply Ziggy Gradle script plugins.
 apply from: "script-plugins/copy.gradle"
-apply from: "script-plugins/copy-hdf5.gradle"
 apply from: "script-plugins/database-schemas.gradle"
 apply from: "script-plugins/eclipse.gradle"
-apply from: "script-plugins/gcc.gradle"
+apply from: "script-plugins/hdf5.gradle"
 apply from: "script-plugins/misc.gradle"
 apply from: "script-plugins/test.gradle"
 apply from: "script-plugins/wrapper.gradle"
 apply from: "script-plugins/xml-schemas.gradle"
 apply from: "script-plugins/ziggy-libraries.gradle"
+
+// Depends on versions set in hdf5.gradle and wrapper.gradle and copyBuildSrc from copy.gradle.
+apply from: "script-plugins/publish.gradle"
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 073addb..f2c1666 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -2,8 +2,11 @@
  * This is the buildSrc/build.gradle file.  This should contain a minimal
  * amount of dependencies as this is used by the build system itself.
  */
-apply plugin: 'eclipse'
-apply plugin: 'java'
+plugins {
+    id 'eclipse'
+    id 'java'
+    id 'maven-publish'
+}
 
 defaultTasks 'assemble'
 
@@ -15,23 +18,29 @@ dependencies {
     // Needed to compile buildSrc.
     implementation 'com.google.guava:guava:23.+'
     implementation 'commons-io:commons-io:2.11.+'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.+'
     implementation 'org.apache.commons:commons-exec:1.+'
-    implementation 'org.freemarker:freemarker:2.3.+'
-    implementation 'com.sun.xml.bind:jaxb-impl:3.0+'
-    runtimeOnly 'jakarta.xml.bind:jakarta.xml.bind-api:3.0+'
+    implementation 'org.apache.commons:commons-lang3:3.12.+'
+    runtimeOnly 'com.sun.xml.bind:jaxb-impl:3.0.+'
 
     // Needed to compile unit tests.
-    implementation 'junit:junit:4.+'
-    implementation 'org.mockito:mockito-core:4.8.+'
+    testImplementation 'junit:junit:4.+'
+    testImplementation 'org.mockito:mockito-core:4.8.+'
 
     // The following stuff is needed in order to build custom gradle tasks and plugins.
     implementation gradleApi()
     implementation localGroovy()
 }
 
+test {
+    testLogging  {
+        showStandardStreams = true
+    }
+}
+
 eclipse {
     classpath {
-        defaultOutputDir = file("$buildDir/eclipse")
+        defaultOutputDir = file("$buildDir/eclipse/default")
         // outputBaseDir = file("$buildDir/eclipse")
         downloadSources = false
         downloadJavadoc = false
@@ -45,19 +54,65 @@ eclipse {
             entries.each { entry ->
                 if (entry.kind == "src" && entry.hasProperty("output")) {
                     // The use of $buildDir does not return build.
-                    entry.output = "build/eclipse"
+                    entry.output = entry.output.replace("bin/", "build/eclipse/")
                 }
             }
         }
     }
 }
 
-test {
-    testLogging  {
-        showStandardStreams = true
+// Avoid duplicate classpath entries.
+tasks.eclipse.dependsOn(cleanEclipse)
+
+// Publish ziggy-buildSrc.jar. See also $rootDir/script-utils/publish.gradle.
+publishing {
+    publications {
+        ziggyBuildSrc(MavenPublication) {
+            groupId group
+            from components.java
+            artifactId "ziggy-buildSrc"
+            version version
+
+            // Maven doesn't understand 2.17.+ notation.
+            suppressPomMetadataWarningsFor('runtimeElements')
+
+            pom {
+                name = 'Ziggy BuildSrc'
+                description = 'Ziggy Gradle build library'
+                url = 'https://github.com/nasa/ziggy'
+                licenses {
+                    license {
+                        name = 'NASA Open Source Agreement Version 1.3'
+                        url = 'https://github.com/nasa/ziggy/blob/main/LICENSE.pdf'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'quarkpt'
+                        name = 'Peter Tenenbaum'
+                        email = 'Peter.Tenenbaum@nasa.gov'
+                    }
+                    developer {
+                        id = 'wohler'
+                        name = 'Bill Wohler'
+                        email = 'Bill.Wohler@nasa.gov'
+                    }
+                }
+                scm {
+                    connection = 'scm:git:https://github.com/nasa/ziggy.git'
+                    developerConnection = 'scm:git:git@github.com:nasa/ziggy.git'
+                    url = 'https://github.com/nasa/ziggy'
+                }
+            }
+        }
     }
-}
 
-apply from: "script-plugins/hdf5.gradle"
-apply from: "script-plugins/wrapper.gradle"
+    repositories {
+        maven {
+            name = 'ziggyBuildSrc'
+            url = layout.buildDirectory.dir("repository")
+        }
+    }
+}
 
+build.dependsOn publish
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
new file mode 120000
index 0000000..7677fb7
--- /dev/null
+++ b/buildSrc/gradle.properties
@@ -0,0 +1 @@
+../gradle.properties
\ No newline at end of file
diff --git a/buildSrc/script-plugins/hdf5.gradle b/buildSrc/script-plugins/hdf5.gradle
deleted file mode 100644
index 23251d0..0000000
--- a/buildSrc/script-plugins/hdf5.gradle
+++ /dev/null
@@ -1,45 +0,0 @@
-// Download and build HDF5.
-//
-// TODO Next time around, parameterize the version and possibly the URL
-
-task buildHdf5() {
-    def tmp = file("$buildDir/tmp/hdf5")
-    def hdf5 = file("$tmp/hdf5-1.12.2")
-    def lib = file("$buildDir/lib")
-
-    outputs.file "$lib/jarhdf5-1.12.2.jar"
-
-    doLast() {
-        tmp.mkdirs()
-
-        // Use the SHA256 links at https://www.hdfgroup.org/downloads/hdf5/source-code/ to determine the URL. 
-        exec {
-            workingDir tmp
-            commandLine "curl", "-o", "hdf5-1.12.2.#1", "https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF5/HDF5_1_12_2/source/hdf5-1.12.2.{tar.bz2,sha256}"
-        }
-        exec {
-            workingDir tmp
-            commandLine "tar", "-xf", "hdf5-1.12.2.tar.bz2"
-        }
-        exec {
-            workingDir hdf5
-            commandLine "sh", "-c", "./configure --with-zlib=/usr --prefix=$buildDir --enable-threadsafe --with-pthread=/usr --enable-unsupported --enable-java"
-        }
-        exec {
-            workingDir hdf5
-            commandLine "make"
-        }
-        exec {
-            workingDir hdf5
-            commandLine "make", "install"
-        }
-        copy {
-            from("$tmp/lib") {
-                include "*.jar"
-            }
-            into "$lib"
-        }
-    }
-}
-
-assemble.dependsOn buildHdf5
diff --git a/buildSrc/script-plugins/wrapper.gradle b/buildSrc/script-plugins/wrapper.gradle
deleted file mode 100644
index fc210d2..0000000
--- a/buildSrc/script-plugins/wrapper.gradle
+++ /dev/null
@@ -1,56 +0,0 @@
-// Download and build the wrapper.
-
-import org.gradle.internal.os.OperatingSystem
-
-task buildWrapper() {
-    def version = "3.5.26"
-    def tmp = file("$buildDir/tmp/wrapper")
-    def bin = file("$buildDir/bin")
-    def lib = file("$buildDir/lib")
-    def format = ""
-    def libSuffix = ""
-
-    OperatingSystem os = OperatingSystem.current();
-    if (os.isLinux()) {
-        format = "linux-x86-64"
-        libSuffix = "so"
-    } else if (os.isMacOsX()) {
-        format = "macosx-universal-64"
-        libSuffix = "jnilib"
-    }
-    def wrapperBaseName = "wrapper-$format-$version"
-    def wrapperDir = file("$tmp/$wrapperBaseName")
-    def wrapperLib = "libwrapper.$libSuffix"
-
-    outputs.file "$bin/wrapper"
-    outputs.file "$wrapperLib"
-    outputs.file "$lib/wrapper.jar"
-
-    doLast() {
-        tmp.mkdirs()
-
-        // See https://wrapper.tanukisoftware.com/doc/english/versions.jsp to determine the URL.
-        exec {
-            workingDir tmp
-            commandLine "curl", "-o", "wrapper-${version}.tar.gz", "https://download.tanukisoftware.com/wrapper/$version/${wrapperBaseName}.tar.gz"
-        }
-        exec {
-            workingDir tmp
-            commandLine "tar", "-xf", "wrapper-${version}.tar.gz"
-        }
-        copy {
-            from("$wrapperDir/bin") {
-                include "wrapper"
-            }
-            into "$bin"
-        }
-        copy {
-            from("$wrapperDir/lib") {
-                include "$wrapperLib", "wrapper.jar"
-            }
-            into "$lib"
-        }
-    }
-}
-
-assemble.dependsOn buildWrapper
diff --git a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/EnvUtil.java b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/EnvUtil.java
deleted file mode 100644
index ba15104..0000000
--- a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/EnvUtil.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package gov.nasa.ziggy.buildutil;
-
-import java.util.NoSuchElementException;
-
-/**
- * Environment variables utilities.
- * 
- * @author Sean McCauliff
- *
- */
-public class EnvUtil {
-
-    /**
-     * @param key non-null environment variable key.
-     * @return the environment variable
-     * @exception NoSuchElementException if the key does not exist.
-     */
-    public static String environment(String key) {
-        String value = System.getenv(key);
-        if (value == null) {
-            throw new NoSuchElementException("Environment variable \"" + key + "\" is not set.");
-        }
-        return value;
-    }
-
-    public static String environment(String key, String defaultValue) {
-        String value = System.getenv(key);
-        if (value == null) {
-            return defaultValue;
-        }
-        return value;
-    }
-}
diff --git a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/GitRevisionHistoryToLatex.java b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/GitRevisionHistoryToLatex.java
deleted file mode 100644
index f957f5a..0000000
--- a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/GitRevisionHistoryToLatex.java
+++ /dev/null
@@ -1,353 +0,0 @@
-package gov.nasa.ziggy.buildutil;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Utility methods for dealing with latex files.
- */
-public class GitRevisionHistoryToLatex { 
-
-    private static final int LINES_PER_PAGE = 50;
-    private static final int CHARACTERS_PER_LINE = 100;
-    private static final ThreadLocal<SimpleDateFormat> revisionHistoryDateFormat = ThreadLocal
-        .withInitial(() -> new SimpleDateFormat("d MMM yyyy"));
-
-    /**
-     * Runs "git log" on the specified document file to generate the revision history in the same
-     * directory as <orig file>-revision-history.tex
-     *
-     * @throws Exception
-     */
-    public static void gitLogToLatex(String documentFileName, File destDir) throws Exception {
-        try {
-            System.out.println(
-                "Generating revision history for latex file \"" + documentFileName + "\".");
-            gitLogToLatexInternal(documentFileName, destDir);
-        } catch (Throwable t) {
-            // This is here because gradle -stacktrace causes this stack trace
-            // to disappear.
-            StringWriter stringWriter = new StringWriter();
-            PrintWriter pw = new PrintWriter(stringWriter);
-            t.printStackTrace(pw);
-            System.out.println(stringWriter.toString());
-            throw t;
-        }
-    }
-
-    /**
-     * Escapes stuff like $ and _.
-     */
-    private static String escapeLatex(String raw) {
-        StringBuilder bldr = new StringBuilder(raw.length());
-        for (int i = 0; i < raw.length(); i++) {
-            char c = raw.charAt(i);
-            switch (c) {
-                case '\\':
-                    bldr.append("\\\\");
-                    break;
-                case '$':
-                    bldr.append("\\$");
-                    break;
-                case '_':
-                    bldr.append("\\_");
-                    break;
-                case '{':
-                    bldr.append("\\{");
-                    break;
-                case '}':
-                    bldr.append("\\}");
-                    break;
-                case '~':
-                    bldr.append("\\~");
-                    break;
-                case '&':
-                    bldr.append("\\&");
-                    break;
-                // TODO: test me
-                case '"':
-                    bldr.append("\\verb|\"|");
-                    break;
-                default:
-                    bldr.append(c);
-            }
-        }
-        return bldr.toString();
-    }
-
-    private static void writeErrorToLatexFile(Throwable exception, File outputFile)
-        throws IOException {
-        StringWriter errMsgString = new StringWriter();
-        PrintWriter exceptionOutput = new PrintWriter(errMsgString);
-        exception.printStackTrace(exceptionOutput);
-        exceptionOutput.close();
-        BufferedWriter fileWriter = new BufferedWriter(new FileWriter(outputFile));
-        try {
-            fileWriter.write("Error &");
-            fileWriter.write(escapeLatex(errMsgString.toString()));
-            fileWriter.write("\\\\\n");
-        } finally {
-            fileWriter.close();
-        }
-    }
-
-    private static final class HistoryEntry {
-        private final Date entryDate;
-        private final String entry;
-        private final int pageNumber;
-
-        public HistoryEntry(Date entryDate, String entry, int pageNumber) {
-            this.entryDate = entryDate;
-            this.entry = entry;
-            this.pageNumber = pageNumber;
-        }
-
-        void writeTo(Appendable writer) throws IOException {
-            writer.append(revisionHistoryDateFormat.get().format(entryDate));
-            writer.append(" & ");
-            writer.append(entry);
-            writer.append("\\\\\n");
-        }
-    }
-
-    private static void gitLogToLatexInternal(String documentFileName, File destDir)
-        throws ParseException, IOException, InterruptedException {
-        String[] command = new String[] { "git", "log", "--follow", documentFileName };
-
-        File documentFile = new File(documentFileName);
-        String fileNameWithoutExtension = stripFileExtension(documentFile.getName());
-        String outputFName = fileNameWithoutExtension + "-revision-history.tex";
-        File outputFile = new File(destDir, outputFName);
-
-        List<String> lines = readProcessOutput(command, outputFile);
-
-        // System.out.println("Completed reading git history.");
-        SortedMap<Date, StringBuilder> dateToLog = collectHistoryEntries(lines);
-
-        // Paginate
-        List<List<HistoryEntry>> historyEntriesPerPage = paginate(dateToLog);
-
-        // Write out top level history tex file
-        System.out.println("Writing history file \"" + outputFile + "\".");
-        try (BufferedWriter outputWriter = new BufferedWriter(new FileWriter(outputFile))) {
-            for (int pagei = 0; pagei < historyEntriesPerPage.size(); pagei++) {
-                outputWriter.write("\\input{build/" + fileNameWithoutExtension
-                    + "-revision-history-" + pagei + ".tex}\n");
-            }
-        }
-
-        // Write out each page's history.
-        for (int pagei = 0; pagei < historyEntriesPerPage.size(); pagei++) {
-            File pageFileName = new File(outputFile.getParent(),
-                fileNameWithoutExtension + "-revision-history-" + pagei + ".tex");
-            try (BufferedWriter writer = new BufferedWriter(new FileWriter(pageFileName))) {
-                // Table header
-                writer.write("\\begin{table}[H]\n");
-                writer.write("\\centering\n");
-                writer.write("\\begin{tabularx}{\\linewidth}{l X}\n");
-                writer.write("\\thead{Change Date} & \\thead{Notes} \\\\\n");
-                writer.write("\\hline\n");
-
-                for (HistoryEntry historyEntry : historyEntriesPerPage.get(pagei)) {
-                    historyEntry.writeTo(writer);
-                }
-
-                // Table footer.
-                writer.write("\\hline\n");
-                writer.write("\\end{tabularx}\n");
-                writer.write("\\end{table}\n");
-                writer.write("\\newpage\n");
-            }
-        }
-
-    }
-
-    private static List<List<HistoryEntry>> paginate(SortedMap<Date, StringBuilder> dateToLog) {
-
-        List<List<HistoryEntry>> entriesPerPage = new ArrayList<>();
-        int lineCount = 0;
-        for (Map.Entry<Date, StringBuilder> entry : dateToLog.entrySet()) {
-            String entryString = entry.getValue().toString();
-            int lineCountForEntry = entryString.length() / CHARACTERS_PER_LINE + 1;
-            lineCount += lineCountForEntry;
-            int pageNo = lineCount / LINES_PER_PAGE;
-
-            if (entriesPerPage.size() <= pageNo) {
-                entriesPerPage.add(new ArrayList<>(LINES_PER_PAGE));
-            }
-            List<HistoryEntry> l = entriesPerPage.get(pageNo);
-            l.add(new HistoryEntry(entry.getKey(), entryString, pageNo));
-        }
-
-        return entriesPerPage;
-    }
-
-    private static SortedMap<Date, StringBuilder> collectHistoryEntries(List<String> lines)
-        throws ParseException {
-        TreeMap<Date, StringBuilder> dateToLog = new TreeMap<>();
-        SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d HH:mm:ss yyyy Z");
-        StringBuilder currentEntry = null;
-        Date entryDate = null;
-        boolean skipEntry = false;
-        for (String line : lines) {
-            if (line.startsWith("commit")) {
-                // Start of new entry
-                if (currentEntry != null && entryDate != null) {
-                    StringBuilder existingLog = dateToLog.get(entryDate);
-                    existingLog.append(currentEntry);
-                }
-                currentEntry = new StringBuilder();
-                entryDate = null;
-                skipEntry = false;
-            } else if (line.startsWith("Date: ")) {
-                // Start of new date
-                String dateLine = line.substring(6, line.length()).trim();
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(dateFormat.parse(dateLine));
-                calendar.set(Calendar.HOUR, 0);
-                calendar.set(Calendar.MINUTE, 0);
-                calendar.set(Calendar.SECOND, 0);
-                calendar.set(Calendar.AM_PM, Calendar.AM);
-                entryDate = calendar.getTime();
-                if (!dateToLog.containsKey(entryDate)) {
-                    dateToLog.put(entryDate, new StringBuilder());
-                }
-            } else if (line.startsWith("Author")) {
-                // Ignore
-            } else if (line.matches("\\s+") || line.length() == 0) {
-                // Ignore lines with only white space
-            } else if (line.contains("Merge branch")) {
-                // Ignore log entries that are merges.
-                skipEntry = true;
-                currentEntry = null;
-            } else if (!skipEntry) {
-                // Content
-                if (currentEntry == null) {
-                    throw new NullPointerException("currentEntry == null.  line=\"" + line + "\"");
-                }
-                line = line.trim();
-                currentEntry.append("~");
-                currentEntry.append(escapeLatex(line));
-            }
-        }
-        if (currentEntry != null && entryDate != null) {
-            // Append last entry
-            StringBuilder existingLog = dateToLog.get(entryDate);
-            existingLog.append(currentEntry);
-        }
-        return dateToLog;
-    }
-
-    private static List<String> readProcessOutput(String[] command, File outputFile)
-        throws InterruptedException, IOException {
-        Process process = null;
-        List<String> lines = new ArrayList<>(1024);
-        try {
-            ProcessBuilder processBuilder = new ProcessBuilder(command);
-            // processBuilder.inheritIO();
-            process = processBuilder.start();
-            // System.out.println("Running git process.");
-            BufferedReader bufferedReader = new BufferedReader(
-                new InputStreamReader(process.getInputStream()));
-
-            for (String line = bufferedReader.readLine(); line != null; line = bufferedReader
-                .readLine()) {
-                // System.out.println("lineRead " + line);
-                lines.add(line);
-            }
-            process.waitFor(1, TimeUnit.SECONDS);
-
-        } catch (IOException ioe) {
-            System.out.println("Writing error to latex file.");
-            try {
-                writeErrorToLatexFile(ioe, outputFile);
-            } catch (IOException ignored) {
-            }
-            throw ioe;
-        } finally {
-            if (process != null) {
-                try {
-                    process.getErrorStream().close();
-                } catch (Exception ignored) {
-                }
-                try {
-                    process.getOutputStream().close();
-                } catch (Exception ignored) {
-                }
-                try {
-                    process.getInputStream().close();
-                } catch (Exception ignored) {
-                }
-            }
-        }
-
-        if (process.exitValue() != 0) {
-            throw new IOException(
-                "Process exited with non-zero exit code (" + process.exitValue() + ").");
-        }
-        return lines;
-    }
-
-    /**
-     * Returns a file name without its extension so blah.txt would become blah (no dot).
-     */
-    public static String stripFileExtension(String fname) {
-        int dotIndex = fname.lastIndexOf('.');
-        if (dotIndex == -1 || dotIndex == 0) {
-            return fname;
-        } else {
-            return fname.substring(0, dotIndex);
-        }
-    }
-
-    /**
-     * Returns the file extension
-     */
-    public static String fileExtension(String fname) {
-        int dotIndex = fname.lastIndexOf('.');
-        if (dotIndex == -1 || dotIndex == 0 || dotIndex == (fname.length() - 1)) {
-            return "";
-        } else {
-            return fname.substring(dotIndex + 1, fname.length());
-        }
-    }
-
-    public static String changeFileExtension(String fname, String newExtension) {
-        if (newExtension.charAt(0) != '.') {
-            return newExtension = "." + newExtension;
-        }
-        String prefix = stripFileExtension(fname);
-        return prefix + newExtension;
-    }
-
-    /**
-     * Given the specified file name this appends the creation date before the file name extension.
-     */
-    public static String appendCreationDate(String fname) {
-        String extension = fileExtension(fname);
-        if (extension.length() != 0) {
-            extension = "." + extension;
-        }
-        String prefix = stripFileExtension(fname);
-        // TODO: Is this the correct format?
-        SimpleDateFormat dateFormatter = new SimpleDateFormat("dd-MMM-yyyy");
-        return prefix + "-" + dateFormatter.format(new Date()) + extension;
-    }
-}
-
diff --git a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/Mcc.java b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/Mcc.java
index 72c3bb2..606921b 100644
--- a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/Mcc.java
+++ b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/Mcc.java
@@ -7,8 +7,14 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -17,22 +23,23 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.internal.os.OperatingSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Compiles the matlab executables (i.e. it runs mcc). This class can not be made final.
  * <p>
- * This class puts the variable MCC_DIR into the environment and sets it to the directory of the project that has
- * invoked this task.
+ * This class puts the variable MCC_DIR into the environment and sets it to the directory of the
+ * project that has invoked this task.
  *
  * @author Bill Wohler
  * @author Sean McCauliff
@@ -60,6 +67,8 @@ public void setControllerFiles(FileCollection controllerFiles) {
         this.controllerFiles = controllerFiles;
     }
 
+    @InputFiles
+    @Optional
     public FileCollection getAdditionalFiles() {
         return additionalFiles;
     }
@@ -95,7 +104,8 @@ public void setOutputExecutable(File outputExecutable) {
     }
 
     @Optional
-    public boolean isSingleThreaded() {
+    @Input
+    public Boolean isSingleThreaded() {
         return singleThreaded;
     }
 
@@ -109,10 +119,8 @@ public void action() {
         File matlabHome = matlabHome();
 
         File buildBinDir = new File(getProject().getBuildDir(), "bin");
-        List<String> command = new ArrayList<>();
-
-        command.addAll(Arrays.asList("mcc", "-v", "-m", "-N", "-d", buildBinDir.toString(), "-R",
-            "-nodisplay", "-R", "-nodesktop"));
+        List<String> command = new ArrayList<>(Arrays.asList("mcc", "-v", "-m", "-N", "-d",
+            buildBinDir.toString(), "-R", "-nodisplay", "-R", "-nodesktop"));
 
         if (isSingleThreaded()) {
             command.add("-R");
@@ -184,33 +192,40 @@ public void action() {
         }
         execProcess(processBuilder);
 
-        Set<PosixFilePermission> neededPermissions = new HashSet<>(Arrays.asList(
-            new PosixFilePermission[] { OWNER_EXECUTE, GROUP_EXECUTE, OWNER_READ, GROUP_READ }));
+        Set<PosixFilePermission> neededPermissions = new HashSet<>(
+            Arrays.asList(OWNER_EXECUTE, GROUP_EXECUTE, OWNER_READ, GROUP_READ));
 
         if (!executable.exists()) {
             String message = "The outputExecutable,\"" + executable + "\" does not exist.";
             log.error(message);
             throw new GradleException(message);
-        } else {
-            Set<PosixFilePermission> currentPosixFilePermissions = null;
-            try {
-                currentPosixFilePermissions = Files.getPosixFilePermissions(executable.toPath());
+        }
+        Set<PosixFilePermission> currentPosixFilePermissions = null;
+        try {
+            currentPosixFilePermissions = Files.getPosixFilePermissions(executable.toPath());
+            log.info(currentPosixFilePermissions.stream()
+                .map(PosixFilePermission::name)
+                .collect(Collectors.joining(" ", "Current file permissions are: ", ".")));
+            if (!neededPermissions.containsAll(currentPosixFilePermissions)) {
+                currentPosixFilePermissions.addAll(neededPermissions);
                 log.info(currentPosixFilePermissions.stream()
-                    .map(p -> p.name())
-                    .collect(Collectors.joining(" ", "Current file permissions are: ", ".")));
-                if (!neededPermissions.containsAll(currentPosixFilePermissions)) {
-                    currentPosixFilePermissions.addAll(neededPermissions);
-                    log.info(currentPosixFilePermissions.stream()
-                        .map(p -> p.name())
-                        .collect(Collectors.joining(" ", "Setting file permissions to: ", ",")));
-                    Files.setPosixFilePermissions(executable.toPath(), currentPosixFilePermissions);
-                }
-            } catch (IOException ioe) {
-                String message = "Failed to either get or set permissions on outputExecutable \""
-                    + outputExecutable;
-                log.error(message);
-                throw new GradleException(message);
+                    .map(PosixFilePermission::name)
+                    .collect(Collectors.joining(" ", "Setting file permissions to: ", ",")));
+                Files.setPosixFilePermissions(executable.toPath(), currentPosixFilePermissions);
             }
+        } catch (IOException ioe) {
+            String message = "Failed to either get or set permissions on outputExecutable \""
+                + outputExecutable;
+            log.error(message);
+            throw new GradleException(message);
+        }
+
+        // On the Mac, there are 2 files created without U+W permission, so any time the
+        // user tries an incremental build it fails because those files can't be deleted.
+        if (SystemArchitecture.architecture() == SystemArchitecture.MAC_INTEL
+            || SystemArchitecture.architecture() == SystemArchitecture.MAC_M1) {
+            setPosixPermissionsRecursively(executable.toPath().resolve("Contents"), "rwxr-xr--",
+                "rwxr-xr--");
         }
         File readme = new File(outputExecutable.getParentFile(), "readme.txt");
         if (readme.exists()) {
@@ -218,4 +233,61 @@ public void action() {
                 outputExecutable.getName() + "-readme.txt"));
         }
     }
+
+    /**
+     * Recursively sets permissions on all files and directories that lie under a given top-level
+     * directory.
+     *
+     * @param top Location of the top-level directory.
+     * @param filePermissions POSIX-style string of permissions for regular files (i.e.,
+     * "r--r-r--").
+     * @param dirPermissions POSIX-style string of permissions for regular files (i.e.,
+     * "rwxr-xr-x").
+     * <p>
+     * NB: This is a copy of the same method that appears in FileUtil. It's duplicated here so that
+     * we don't need to have buildSrc trying to use code from Ziggy main source, and also so that we
+     * don't wind up with code in FileUtil calling this method in buildSrc.
+     */
+    public static void setPosixPermissionsRecursively(Path top, String filePermissions,
+        String dirPermissions) {
+        try {
+            if (!Files.isDirectory(top)) {
+                Files.setPosixFilePermissions(top,
+                    PosixFilePermissions.fromString(filePermissions));
+            } else {
+                Files.setPosixFilePermissions(top, PosixFilePermissions.fromString(dirPermissions));
+                Files.walkFileTree(top, new SimpleFileVisitor<Path>() {
+
+                    @Override
+                    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+                        try {
+                            Files.setPosixFilePermissions(dir,
+                                PosixFilePermissions.fromString(dirPermissions));
+                        } catch (IOException e) {
+                            throw new UncheckedIOException(
+                                "Failed to set permissions on dir " + dir.toString(), e);
+                        }
+                        return FileVisitResult.CONTINUE;
+                    }
+
+                    @Override
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+                        if (Files.isSymbolicLink(file)) {
+                            return FileVisitResult.CONTINUE;
+                        }
+                        try {
+                            Files.setPosixFilePermissions(file,
+                                PosixFilePermissions.fromString(filePermissions));
+                        } catch (IOException e) {
+                            throw new UncheckedIOException(
+                                "Failed to set permissions on file " + file.toString(), e);
+                        }
+                        return FileVisitResult.CONTINUE;
+                    }
+                });
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException("Failed to set permissions on dir " + top.toString(), e);
+        }
+    }
 }
diff --git a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/SystemArchitecture.java b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/SystemArchitecture.java
new file mode 100644
index 0000000..3defcd5
--- /dev/null
+++ b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/SystemArchitecture.java
@@ -0,0 +1,93 @@
+package gov.nasa.ziggy.buildutil;
+
+/**
+ * Provides a uniform system for ascertaining the combination of OS and CPU architecture of the
+ * system.
+ *
+ * @author PT
+ */
+public enum SystemArchitecture {
+    LINUX_INTEL, MAC_INTEL, MAC_M1;
+
+    public static SystemArchitecture architecture() {
+
+        String opSys = System.getProperty("os.name").toLowerCase();
+        String arch = System.getProperty("os.arch").toLowerCase();
+        if (opSys.contains("linux")) {
+            return LINUX_INTEL;
+        }
+        if (opSys.contains("mac")) {
+            if (arch.contains("aarch")) {
+                return MAC_M1;
+            }
+            return MAC_INTEL;
+        }
+        throw new IllegalStateException("System architecture unknown");
+    }
+
+    /**
+     * Returns a new instance of {@link Selector}.
+     *
+     * @param <T> Class for Selector.
+     * @param clazz Class for Selector.
+     */
+    public static <T> Selector<T> selector(Class<T> clazz) {
+        return new Selector<>();
+    }
+
+    /**
+     * Provides a compact notation for specifying a collection of objects, where one of the
+     * collection is to be returned depending on the system architecture of the executing computer.
+     * This can be used in place of switch statements (for systems that support them), or if-elseif
+     * chains (for systems that do not support switch, such as Gradle scripts). Example:
+     *
+     * <pre>
+     * String s = SystemArchitecture.selector(String.class)
+     *     .linuxIntelObject("A")
+     *     .macIntelObject("B")
+     *     .macM1Object("C")
+     *     .get();
+     * </pre>
+     *
+     * will return "A" when executed on a Linux system, "B" when executed on a Mac using Intel
+     * silicon, and "C" when executed on a Mac using Apple silicon.
+     *
+     * @author PT
+     * @param <T> Class of object to be managed by the {@link Selector}.
+     */
+    public static class Selector<T> {
+        private T linuxIntelObject;
+        private T macM1Object;
+        private T macIntelObject;
+
+        private Selector() {
+        }
+
+        public Selector<T> linuxIntelObject(T object) {
+            linuxIntelObject = object;
+            return this;
+        }
+
+        public Selector<T> macIntelObject(T object) {
+            macIntelObject = object;
+            return this;
+        }
+
+        public Selector<T> macM1Object(T object) {
+            macM1Object = object;
+            return this;
+        }
+
+        SystemArchitecture architecture() {
+            return SystemArchitecture.architecture();
+        }
+
+        public T get() {
+            return switch (architecture()) {
+                case LINUX_INTEL -> linuxIntelObject;
+                case MAC_INTEL -> macIntelObject;
+                case MAC_M1 -> macM1Object;
+            };
+        }
+    }
+}
diff --git a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCpp.java b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCpp.java
index 3813ae5..eb3887d 100644
--- a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCpp.java
+++ b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCpp.java
@@ -5,31 +5,90 @@
 
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.Input;
-
 
 import gov.nasa.ziggy.buildutil.ZiggyCppPojo.BuildType;
 
 /**
- * Performs C++ builds for Gradle. Ziggy and its pipelines use this instead of the 
- * standard Gradle C++ task classes because it provides only the options we actually 
- * need without many that we can't use, and also because it allows us to use the CXX
- * environment variable to define the location of the C++ compiler. This allows us to
- * use the same compiler as some of the third party libraries used by Ziggy (they also
- * use CXX to select their compiler). 
- * 
- * Because Gradle classes that extend DefaultTask are effectively impossible to unit test,
- * all of the actual data and work are managed by the ZiggyCppPojo class (which does have
- * unit tests), while this class simply provides access to the ZiggyCppPojo class for Gradle. 
- * 
- * @author PT
+ * Performs C++ builds for Gradle. Ziggy and its pipelines use this instead of the standard Gradle
+ * C++ task classes because it provides only the options we actually need without many that we can't
+ * use, and also because it allows us to use the CXX environment variable to define the location of
+ * the C++ compiler. This allows us to use the same compiler as some of the third party libraries
+ * used by Ziggy (they also use CXX to select their compiler).
+ * <p>
+ * Usage example: assume that the user wishes to construct a shared object library, libfoo.(so,
+ * dylib) from the contents of directories $projectDir/foo and $projectDir/bar, with additional
+ * include files in $projectDir/include and $rootDir/project2/include. The task
+ *
+ * <pre>
+ * task fooLib(type : ZiggyCpp) {
+ *     outputName        = "foo"
+ *     cppFilePaths      = ["$projectDir/foo", "$projectDir/bar"]
+ *     includeFilePaths  = ["$projectDir/include", "$rootDir/project2/include"]
+ *     outputType        = "shared"
+ *     compileOptions    = ["std=c++11", "O2"]
+ *     maxCompileThreads = 10
+ * }
+ * </pre>
+ *
+ * will compile the contents of the specified C++ file paths, placing the resulting object files in
+ * $buildDir/obj, and then link them into shared object library libfoo.(so, dylib), placed in
+ * $buildDir/lib. Options "-std=c++11" and "-O2" will be applied at compile time. During the compile
+ * phase, up to 10 threads will run in order to compile source files in parallel. If
+ * maxCompileThreads is not specified, a default value equal to the number of cores on the system
+ * will be used.
+ * <p>
+ * If a static library had been desired in the prior example, the outputType would be changed to
+ * "static", and file libfoo.a would be saved to $buildDir/lib. If a standalone executable was
+ * needed, the outputType would be changed to "executable" and the resulting file foo would be
+ * placed in $buildDir/bin. In this latter case, the user can specify additional libraries and
+ * library paths via additional options:
+ *
+ * <pre>
+ * task fooProgram(type : ZiggyCpp) {
+ *     outputName        = "foo"
+ *     cppFilePaths      = ["$projectDir/foo", "$projectDir/bar"]
+ *     includeFilePaths  = ["$projectDir/include", "$rootDir/project2/include"]
+ *     outputType        = "executable"
+ *     cppCompileOptions = ["std=c++11", "O2"]
+ *     cCompileOptions   = ["O2"]
+ *     libraryPaths      = ["$buildDir/lib", "$rootDir/project2/build/lib"]
+ *     libraries         = ["math1", "spelling2"]
+ * }
+ * </pre>
  *
+ * would link using libmath1 and libmath2, located in $buildDir/lib and/or
+ * $rootDir/project2/build/lib.
+ * <p>
+ * The user can override the default directories used to store build products, which are:
+ * $buildDir/lib, $buildDir/obj, and $buildDir/bin, respectively, for libraries, object files, and
+ * executables. There are two ways to override: the first is to specify a directory that will be
+ * used for all output products using the property name "outputDir". The other is to specify a
+ * parent directory for the output directories using the property name "outputDirParent". In this
+ * latter case, outputs will go to <outputDirParent>/lib, <outputDirParent>/obj, and
+ * <outputDirParent>/bin, respectively, for libraries, object files, and executables. If both
+ * outputDir and outputDirParent are specified, outputDir will take precedence.
+ * <p>
+ * Because Gradle classes that extend DefaultTask are effectively impossible to unit test, all of
+ * the actual data and work are managed by the ZiggyCppPojo class (which does have unit tests),
+ * while this class simply provides access to the ZiggyCppPojo class for Gradle.
+ *
+ * @author PT
  */
 public class ZiggyCpp extends DefaultTask {
 
+    private static final String DEFAULT_CPP_COMPILE_OPTIONS_GRADLE_PROPERTY = "defaultCppCompileOptions";
+    private static final String DEFAULT_C_COMPILE_OPTIONS_GRADLE_PROPERTY = "defaultCCompileOptions";
+    private static final String DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY = "defaultLinkOptions";
+    private static final String DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY = "defaultReleaseOptimizations";
+    private static final String DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY = "defaultDebugOptimizations";
+    private static final String PIPELINE_ROOT_DIR_PROP_NAME = "pipelineRootDir";
+
     /**
      * Data and methods used to perform the C++ compile and link.
      */
@@ -43,21 +102,25 @@ public ZiggyCpp() {
         Project project = getProject();
         ziggyCppPojo.setBuildDir(project.getBuildDir());
         ziggyCppPojo.setRootDir(pipelineRootDir(project));
-        if (project.hasProperty(ZiggyCppPojo.DEFAULT_COMPILE_OPTIONS_GRADLE_PROPERTY)) {
-            ziggyCppPojo.setCompileOptions(ZiggyCppPojo.gradlePropertyToList(
-                project.property(ZiggyCppPojo.DEFAULT_COMPILE_OPTIONS_GRADLE_PROPERTY)));
+        if (project.hasProperty(DEFAULT_CPP_COMPILE_OPTIONS_GRADLE_PROPERTY)) {
+            ziggyCppPojo.setCppCompileOptions(ZiggyCppPojo.gradlePropertyToList(
+                project.property(DEFAULT_CPP_COMPILE_OPTIONS_GRADLE_PROPERTY)));
         }
-        if (project.hasProperty(ZiggyCppPojo.DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY)) {
-            ziggyCppPojo.setLinkOptions(ZiggyCppPojo.gradlePropertyToList(
-                project.property(ZiggyCppPojo.DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY)));
+        if (project.hasProperty(DEFAULT_C_COMPILE_OPTIONS_GRADLE_PROPERTY)) {
+            ziggyCppPojo.setCCompileOptions(ZiggyCppPojo
+                .gradlePropertyToList(project.property(DEFAULT_C_COMPILE_OPTIONS_GRADLE_PROPERTY)));
         }
-        if (project.hasProperty(ZiggyCppPojo.DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY)) {
-            ziggyCppPojo.setReleaseOptimizations(ZiggyCppPojo.gradlePropertyToList(
-                project.findProperty(ZiggyCppPojo.DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY)));
+        if (project.hasProperty(DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY)) {
+            ziggyCppPojo.setLinkOptions(ZiggyCppPojo
+                .gradlePropertyToList(project.property(DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY)));
         }
-        if (project.hasProperty(ZiggyCppPojo.DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY)) {
-            ziggyCppPojo.setDebugOptimizations(ZiggyCppPojo.gradlePropertyToList(
-                project.findProperty(ZiggyCppPojo.DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY)));
+        if (project.hasProperty(DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY)) {
+            ziggyCppPojo.setReleaseOptimizations(ZiggyCppPojo
+                .gradlePropertyToList(project.findProperty(DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY)));
+        }
+        if (project.hasProperty(DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY)) {
+            ziggyCppPojo.setDebugOptimizations(ZiggyCppPojo
+                .gradlePropertyToList(project.findProperty(DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY)));
         }
     }
 
@@ -70,9 +133,8 @@ public ZiggyCpp() {
      */
     public static File pipelineRootDir(Project project) {
         File pipelineRootDir = null;
-        if (project.hasProperty(ZiggyCppPojo.PIPELINE_ROOT_DIR_PROP_NAME)) {
-            pipelineRootDir = new File(
-                project.property(ZiggyCppPojo.PIPELINE_ROOT_DIR_PROP_NAME).toString());
+        if (project.hasProperty(PIPELINE_ROOT_DIR_PROP_NAME)) {
+            pipelineRootDir = new File(project.property(PIPELINE_ROOT_DIR_PROP_NAME).toString());
         } else {
             pipelineRootDir = project.getRootDir();
         }
@@ -93,7 +155,7 @@ public void action() {
      */
     @InputFiles
     public List<File> getCppFiles() {
-        return ziggyCppPojo.getCppFiles();
+        return ziggyCppPojo.getSourceFiles();
     }
 
     /**
@@ -138,7 +200,7 @@ public List<String> getIncludeFilePaths() {
         return ziggyCppPojo.getIncludeFilePaths();
     }
 
-    // paths for libraries that must be linked in
+    // Paths for libraries that must be linked in.
     public void setLibraryPaths(List<? extends Object> libraryPaths) {
         ziggyCppPojo.setLibraryPaths(libraryPaths);
     }
@@ -160,13 +222,12 @@ public List<String> getLibraries() {
 
     // compiler options
     public void setCompileOptions(List<? extends Object> compileOptions) {
-        ziggyCppPojo.setCompileOptions(compileOptions);
-        ;
+        ziggyCppPojo.setCppCompileOptions(compileOptions);
     }
 
     @Input
     public List<String> getCompileOptions() {
-        return ziggyCppPojo.getCompileOptions();
+        return ziggyCppPojo.getCppCompileOptions();
     }
 
     // linker options
@@ -198,4 +259,37 @@ public void setOutputName(Object name) {
     public String getOutputName() {
         return ziggyCppPojo.getOutputName();
     }
+
+    // Directory to use for build product
+    public void setOutputDir(Object outputDir) {
+        ziggyCppPojo.setOutputDir(outputDir);
+    }
+
+    @Input
+    @Optional
+    public String getOutputDir() {
+        return ziggyCppPojo.getOutputDir();
+    }
+
+    // Parent directory for build product (i.e., build products go in this location + "/obj",
+    // "/bin", or "/lib")
+
+    public void setOutputDirParent(Object outputDirParent) {
+        ziggyCppPojo.setOutputDirParent(outputDirParent);
+    }
+
+    @Input
+    @Optional
+    public String getOutputDirParent() {
+        return ziggyCppPojo.getOutputDirParent();
+    }
+
+    public void setMaxCompileThreads(int maxCompileThreads) {
+        ziggyCppPojo.setMaxCompileThreads(maxCompileThreads);
+    }
+
+    @Internal
+    public int getMaxCompileThreads() {
+        return ziggyCppPojo.getMaxCompileThreads();
+    }
 }
diff --git a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppMex.java b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppMex.java
index a29f4cd..0c6e546 100644
--- a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppMex.java
+++ b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppMex.java
@@ -3,43 +3,97 @@
 import java.io.File;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.OutputFiles;
 import org.gradle.api.tasks.TaskAction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.buildutil.ZiggyCppPojo.BuildType;
 
 /**
  * Performs mexfile builds for Gradle. The sequence of build steps is as follows:
- * 1. The C/C++ files are compiled with a MATLAB_MEX_FILE compiler directive.
- * 2. The object files from (1) are linked into a shared object library.
- * 3. The actual mexfiles are built from the appropriate object files and the 
- *     shared object library.
+ * <ol>
+ * <li>The C/C++ files are compiled with a MATLAB_MEX_FILE compiler directive. The resulting object
+ * files are saved in $buildDir/obj .
+ * <li>The object files from (1) are linked into a shared object library. The shared object library
+ * is saved in $buildDir/lib .
+ * <li>The actual mexfiles are built from the appropriate object files and the shared object
+ * library. The mexfile is saved in $buildDir/mex .
+ * </ol>
+ * <p>
  * The user specifies the following:
- * 1. The path to the C/C++ files
- * 2. Compiler and linker options, including libraries, library paths, include 
- *     file paths, optimization flags.
- * 3. The names of the desired mexfiles.
- * 4. Optionally, a name for the shared library (otherwise a default name is generated
- *     from the C++ source file path).
- * 
- * Because it is effectively impossible to unit test any class that extends DefaultTask,
- * the actual workings of the ZiggyCppMex class are in a separate class, ZiggyCppMexPojo,
- * which has appropriate unit testing. This class provides a thin interface between 
- * Gradle and the ZiggyCppMexPojo class.
- * 
- * @author PT
+ * <ol>
+ * <li>The path to the C/C++ files
+ * <li>Compiler and linker options, including libraries, library paths, include file paths,
+ * optimization flags.
+ * <li>The names of the desired mexfiles.
+ * <li>Optionally, a name for the shared library (otherwise a default name is generated from the C++
+ * source file path).
+ * </ol>
+ * <p>
+ * Usage example: assume that mexfile main functions are in files foo.cpp and bar.cpp, which are in
+ * the src/cpp/foo subdirectory of $projectDir, along with header files and potentially additional
+ * C++ files. The user wishes to build mexfiles from these functions, which depend on additional
+ * libraries elsewhere on the system. The task
  *
+ * <pre>
+ * task mexFoo(type : ZiggyCppMex) {
+ *     cppFilePath      = "$projectDir/src/cpp/foo"
+ *     includeFilePaths = ["$projectDir/src/cpp/foo", "$projectDir/include"]
+ *     libraryPaths     = ["$buildDir/lib", "$rootDir/project2/build/lib"]
+ *     libraries        = ["blas", "lapack"]
+ *     mexfileNames     = ["foo", "bar"]
+ *     compileOptions   = ["std=c++11", "O2"]
+ *     outputName       = "baz"
+ * }
+ * </pre>
+ *
+ * will compile the contents of $projectDir/src/cpp/mex into object files in $buildDir/obj, and link
+ * them into library libbaz.(so, dylib) in $buildDir/lib; mexfiles foo.(mexa64, mexmaci64,
+ * mexmaca64) and bar.(mexa64, mexmaci64, mexmaca64) are then generated in $buildDir/mex by linking
+ * against libraries libblas and liblapack, which are located in the directories specified by the
+ * libraryPaths property. Options "-std=c++11" and "-O2" will be applied at compile time; link
+ * options can be specified with the linkOptions property (not shown).
+ * <p>
+ * Note that the user does not need to specify the locations for MATLAB include files, the locations
+ * or names of MATLAB libraries, or indeed the location of MATLAB's mex executable. The MATLAB
+ * top-level directory comes from either the $matlabHome Gradle variable or the $MATLAB_HOME
+ * environment variable; from this location, the operating system, and the CPU architecture, all of
+ * the MATLAB libraries, library directories, and mexfile suffix are automatically determined.
+ * <p>
+ * By default, object files produced by {@link ZiggyCppMex} are saved in $buildDir/obj, libraries in
+ * $buildDir/lib, and mexfiles in $buildDir/mex. This behavior can be overridden. If the property
+ * outputDir is specified, then all 3 types of files will be stored in the location specified by
+ * outputDir. If the property outputDirParent is specified, then the 3 file types will be saved in
+ * <outputDirParent>/obj, <outputDirParent>/lib, and <outputDirParent>/mex, respectively. If both
+ * outputDir and outputDirParent are specified, the outputDir value will be used and the
+ * outputDirParent value ignored.
+ * <p>
+ * Because it is effectively impossible to unit test any class that extends DefaultTask, the actual
+ * workings of the ZiggyCppMex class are in a separate class, ZiggyCppMexPojo, which has appropriate
+ * unit testing. This class provides a thin interface between Gradle and the ZiggyCppMexPojo class.
+ *
+ * @author PT
  */
 public class ZiggyCppMex extends DefaultTask {
 
     private static final Logger log = LoggerFactory.getLogger(ZiggyCppMex.class);
+
+    private static final String DEFAULT_COMPILE_OPTIONS_GRADLE_PROPERTY = "defaultCppMexCompileOptions";
+    private static final String DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY = "defaultCppMexLinkOptions";
+    private static final String DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY = "defaultCppMexReleaseOptimizations";
+    private static final String DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY = "defaultCppMexDebugOptimizations";
+    private static final String MATLAB_PATH_PROJECT_PROPERTY = "matlabHome";
+    private static final String MATLAB_PATH_ENV_VAR = "MATLAB_HOME";
+
     private ZiggyCppMexPojo ziggyCppMexObject = new ZiggyCppMexPojo();
 
     /**
@@ -53,21 +107,21 @@ public ZiggyCppMex() {
         ziggyCppMexObject.setBuildDir(project.getBuildDir());
         ziggyCppMexObject.setRootDir(ZiggyCpp.pipelineRootDir(project));
         ziggyCppMexObject.setProjectDir(project.getProjectDir());
-        if (project.hasProperty(ZiggyCppMexPojo.DEFAULT_COMPILE_OPTIONS_GRADLE_PROPERTY)) {
-            ziggyCppMexObject.setCompileOptions(ZiggyCppPojo.gradlePropertyToList(
-                project.property(ZiggyCppMexPojo.DEFAULT_COMPILE_OPTIONS_GRADLE_PROPERTY)));
+        if (project.hasProperty(DEFAULT_COMPILE_OPTIONS_GRADLE_PROPERTY)) {
+            ziggyCppMexObject.setCppCompileOptions(ZiggyCppPojo
+                .gradlePropertyToList(project.property(DEFAULT_COMPILE_OPTIONS_GRADLE_PROPERTY)));
         }
-        if (project.hasProperty(ZiggyCppMexPojo.DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY)) {
-            ziggyCppMexObject.setLinkOptions(ZiggyCppPojo.gradlePropertyToList(
-                project.property(ZiggyCppMexPojo.DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY)));
+        if (project.hasProperty(DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY)) {
+            ziggyCppMexObject.setLinkOptions(ZiggyCppPojo
+                .gradlePropertyToList(project.property(DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY)));
         }
-        if (project.hasProperty(ZiggyCppMexPojo.DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY)) {
-            ziggyCppMexObject.setReleaseOptimizations(ZiggyCppPojo.gradlePropertyToList(
-                project.findProperty(ZiggyCppMexPojo.DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY)));
+        if (project.hasProperty(DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY)) {
+            ziggyCppMexObject.setReleaseOptimizations(ZiggyCppPojo
+                .gradlePropertyToList(project.findProperty(DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY)));
         }
-        if (project.hasProperty(ZiggyCppMexPojo.DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY)) {
-            ziggyCppMexObject.setDebugOptimizations(ZiggyCppPojo.gradlePropertyToList(
-                project.findProperty(ZiggyCppMexPojo.DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY)));
+        if (project.hasProperty(DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY)) {
+            ziggyCppMexObject.setDebugOptimizations(ZiggyCppPojo
+                .gradlePropertyToList(project.findProperty(DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY)));
         }
         setMatlabPath();
     }
@@ -81,7 +135,7 @@ public void action() {
     /** Specifies that the C/C++ source files are the input files for this Gradle task. */
     @InputFiles
     public List<File> getCppFiles() {
-        return ziggyCppMexObject.getCppFiles();
+        return ziggyCppMexObject.getSourceFiles();
     }
 
     /** Specifies that the mexfiles are the output files for this Gradle task. */
@@ -112,6 +166,7 @@ public void setCppFilePath(Object cppFilePath) {
         ziggyCppMexObject.setCppFilePath(cppFilePath);
     }
 
+    @Internal
     public String getCppFilePath() {
         return ziggyCppMexObject.getCppFilePaths().get(0);
     }
@@ -121,15 +176,17 @@ public void setIncludeFilePaths(List<? extends Object> includeFilePaths) {
         ziggyCppMexObject.setIncludeFilePaths(includeFilePaths);
     }
 
+    @Internal
     public List<String> getIncludeFilePaths() {
         return ziggyCppMexObject.getIncludeFilePaths();
     }
 
-    // paths for libraries that must be linked in
+    // Paths for libraries that must be linked in.
     public void setLibraryPaths(List<? extends Object> libraryPaths) {
         ziggyCppMexObject.setLibraryPaths(libraryPaths);
     }
 
+    @Internal
     public List<String> getLibraryPaths() {
         return ziggyCppMexObject.getLibraryPaths();
     }
@@ -139,18 +196,19 @@ public void setLibraries(List<? extends Object> libraries) {
         ziggyCppMexObject.setLibraries(libraries);
     }
 
+    @Internal
     public List<String> getLibraries() {
         return ziggyCppMexObject.getLibraries();
     }
 
     // compiler options
     public void setCompileOptions(List<? extends Object> compileOptions) {
-        ziggyCppMexObject.setCompileOptions(compileOptions);
-        ;
+        ziggyCppMexObject.setCppCompileOptions(compileOptions);
     }
 
+    @Internal
     public List<String> getCompileOptions() {
-        return ziggyCppMexObject.getCompileOptions();
+        return ziggyCppMexObject.getCppCompileOptions();
     }
 
     // linker options
@@ -158,6 +216,7 @@ public void setLinkOptions(List<? extends Object> linkOptions) {
         ziggyCppMexObject.setLinkOptions(linkOptions);
     }
 
+    @Internal
     public List<String> getLinkOptions() {
         return ziggyCppMexObject.getLinkOptions();
     }
@@ -167,6 +226,7 @@ public void setOutputType(Object outputType) {
         ziggyCppMexObject.setOutputType(outputType);
     }
 
+    @Internal
     public BuildType getOutputType() {
         return ziggyCppMexObject.getOutputType();
     }
@@ -176,6 +236,7 @@ public void setOutputName(Object name) {
         ziggyCppMexObject.setOutputName(name);
     }
 
+    @Internal
     public String getOutputName() {
         return ziggyCppMexObject.getOutputName();
     }
@@ -185,10 +246,35 @@ public void setMexfileNames(List<? extends Object> mexfileNames) {
         ziggyCppMexObject.setMexfileNames(mexfileNames);
     }
 
+    @Internal
     public List<String> getMexfileNames() {
         return ziggyCppMexObject.getMexfileNames();
     }
 
+    // Directory to use for build product
+    public void setOutputDir(Object outputDir) {
+        ziggyCppMexObject.setOutputDir(outputDir);
+    }
+
+    @Input
+    @Optional
+    public String getOutputDir() {
+        return ziggyCppMexObject.getOutputDir();
+    }
+
+    // Parent directory for build product (i.e., build products go in this location + "/obj",
+    // "/bin", or "/lib")
+
+    public void setOutputDirParent(Object outputDirParent) {
+        ziggyCppMexObject.setOutputDirParent(outputDirParent);
+    }
+
+    @Input
+    @Optional
+    public String getOutputDirParent() {
+        return ziggyCppMexObject.getOutputDirParent();
+    }
+
     /**
      * Sets the path to the MATLAB executable. This searches the following options in the following
      * order: 1. If there is a project extra property, matlabPath, use that. 2. If no matlabPath
@@ -200,9 +286,8 @@ public List<String> getMexfileNames() {
     public void setMatlabPath() {
         String matlabPath = null;
         Project project = getProject();
-        if (project.hasProperty(ZiggyCppMexPojo.MATLAB_PATH_PROJECT_PROPERTY)) {
-            matlabPath = project.findProperty(ZiggyCppMexPojo.MATLAB_PATH_PROJECT_PROPERTY)
-                .toString();
+        if (project.hasProperty(MATLAB_PATH_PROJECT_PROPERTY)) {
+            matlabPath = project.findProperty(MATLAB_PATH_PROJECT_PROPERTY).toString();
             log.info("MATLAB path set from project extra property: " + matlabPath);
         }
         if (matlabPath == null) {
@@ -220,7 +305,7 @@ public void setMatlabPath() {
             }
         }
         if (matlabPath == null) {
-            String matlabHome = System.getenv(ZiggyCppMexPojo.MATLAB_PATH_ENV_VAR);
+            String matlabHome = System.getenv(MATLAB_PATH_ENV_VAR);
             if (matlabHome != null) {
                 matlabPath = matlabHome;
                 log.info("MATLAB path set from MATLAB_HOME environment variable: " + matlabPath);
diff --git a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppMexPojo.java b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppMexPojo.java
index d253ad8..528327e 100644
--- a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppMexPojo.java
+++ b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppMexPojo.java
@@ -3,42 +3,39 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.exec.DefaultExecutor;
+import org.apache.commons.lang3.StringUtils;
+import org.gradle.api.GradleException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.gradle.api.GradleException;
-import org.gradle.internal.os.OperatingSystem;
 
 /**
- * Manages the construction of mexfiles from C/C++ source code. The source code is compiled
- * using the C++ compiler in the CXX environment variable, with appropriate compiler options
- * for use in creating object files that can be used in mexfiles. These object files are then
- * combined into a shared library. Finally, the C++ compiler is used to produce mexfiles for
- * each source file that contains the mexFunction entry point by linking the object files with
- * the shared library and attaching an appropriate file type. 
- * 
- * Because Gradle task classes cannot easily be unit tested, the key functionality needed for
- * mexfile construction is in this class; a separate class, ZiggyCppMex, extends the Gradle
- * DefaultTask and provides the interface from Gradle to ZiggyCppMexPojo.
- * 
- * @author PT
+ * Manages the construction of mexfiles from C/C++ source code. The source code is compiled using
+ * the C++ compiler in the CXX environment variable, with appropriate compiler options for use in
+ * creating object files that can be used in mexfiles. These object files are then combined into a
+ * shared library. Finally, the C++ compiler is used to produce mexfiles for each source file that
+ * contains the mexFunction entry point by linking the object files with the shared library and
+ * attaching an appropriate file type. Because Gradle task classes cannot easily be unit tested, the
+ * key functionality needed for mexfile construction is in this class; a separate class,
+ * ZiggyCppMex, extends the Gradle DefaultTask and provides the interface from Gradle to
+ * ZiggyCppMexPojo.
  *
+ * @author PT
  */
 public class ZiggyCppMexPojo extends ZiggyCppPojo {
 
     private static final Logger log = LoggerFactory.getLogger(ZiggyCppMexPojo.class);
 
-    public static final String DEFAULT_COMPILE_OPTIONS_GRADLE_PROPERTY = "defaultCppMexCompileOptions";
-    public static final String DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY = "defaultCppMexLinkOptions";
-    public static final String DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY = "defaultCppMexReleaseOptimizations";
-    public static final String DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY = "defaultCppMexDebugOptimizations";
-    public static final String MATLAB_PATH_PROJECT_PROPERTY = "matlabPath";
-    public static final String MATLAB_PATH_ENV_VAR = "MATLAB_HOME";
+    private static final List<String> DEFAULT_COMPILE_OPTIONS = List.of("-Wall", "-fPIC",
+        "-std=c++11", "-D_GNU_SOURCE", "-fexceptions", "-fno-omit-frame-pointer", "-pthread",
+        "-fno-reorder-blocks", "-fstack-protector-all", "-fpermissive");
+    private static final List<String> DEFAULT_LINK_OPTIONS = List.of("-lstdc++");
+    private static final List<String> DEFAULT_RELEASE_OPTS = List.of("-O2", "-DNDEBUG", "-g");
+    private static final List<String> DEFAULT_DEBUG_OPTS = List.of("-Og", "-g");
 
     /** Path to the MATLAB directories to be used in the build */
     private String matlabPath;
@@ -54,49 +51,47 @@ public class ZiggyCppMexPojo extends ZiggyCppPojo {
 
     public ZiggyCppMexPojo() {
         super.setOutputType(BuildType.SHARED);
+        setCppCompileOptions(DEFAULT_COMPILE_OPTIONS);
+        setLinkOptions(DEFAULT_LINK_OPTIONS);
+        setReleaseOptimizations(DEFAULT_RELEASE_OPTS);
+        setDebugOptimizations(DEFAULT_DEBUG_OPTS);
     }
 
     /**
      * Returns the correct file type for a mexfile given the OS.
      *
-     * @return string "mexmaci64" for a Mac, "mexa64" for Linux, GradleException for all other
-     * operating systems.
+     * @return string "mexa64" for Linux, "mexmaca64" for Mac M1, "mexmaci64" for Mac Intel.
      */
     String mexSuffix() {
-        OperatingSystem os = getOperatingSystem();
-        String mexSuffix = null;
-        if (os.isMacOsX()) {
-            mexSuffix = "mexmaci64";
-        } else if (os.isLinux()) {
-            mexSuffix = "mexa64";
-        } else {
-            throw new GradleException("Operating system " + os.toString() + " not supported");
-        }
-        return mexSuffix;
+        return switch (getArchitecture()) {
+            case LINUX_INTEL -> "mexa64";
+            case MAC_M1 -> "mexmaca64";
+            case MAC_INTEL -> "mexmaci64";
+        };
     }
 
     /**
      * Returns the correct MATLAB architecture name given the OS.
      *
-     * @return string "maci64" for a Mac, "glnxa64" for Linux, Gradle exception for all other
+     * @return string "glnxa64" for Linux, "maci64" for Mac Intel, "maca64" for Mac M1.
      */
     String matlabArch() {
-        OperatingSystem os = getOperatingSystem();
-        String matlabArch = null;
-        if (os.isMacOsX()) {
-            matlabArch = "maci64";
-        } else if (os.isLinux()) {
-            matlabArch = "glnxa64";
-        } else {
-            throw new GradleException("Operating system " + os.toString() + " not supported");
-        }
-        return matlabArch;
+        return switch (getArchitecture()) {
+            case LINUX_INTEL -> "glnxa64";
+            case MAC_M1 -> "maca64";
+            case MAC_INTEL -> "maci64";
+        };
+    }
+
+    private File mexDir() {
+        return StringUtils.isEmpty(outputDir) ? new File(outputParent(), "mex")
+            : new File(outputDir);
     }
 
     /**
      * Generates the mexfiles that are the output of this class, and stores them in the mexfiles
      * list. The files that are generated are named $mexfileName.$mexfileSuffix, and are stored in
-     * $buildDir/lib .
+     * $buildDir/mex .
      */
     void populateMexfiles() {
         if (getBuildDir() == null || mexfileNames == null) {
@@ -105,7 +100,7 @@ void populateMexfiles() {
         mexfiles = new ArrayList<>();
         for (String mexfileName : mexfileNames) {
             String fullMexfileName = mexfileName + "." + mexSuffix();
-            File mexfile = new File(libDir(), fullMexfileName);
+            File mexfile = new File(mexDir(), fullMexfileName);
             mexfiles.add(mexfile);
         }
     }
@@ -161,16 +156,18 @@ private File getFileByName(List<File> files, String fileName) {
      * MATLAB include directory as an include path, and includes the mexfile compiler directive.
      */
     @Override
-    public String generateCompileCommand(File sourceFile) {
+    public String generateCompileCommand(Map.Entry<File, String> sourceFile) {
+        return generateCompileCommand(sourceFile.getKey(), sourceFile.getValue());
+    }
 
-        // generate the include path
+    @Override
+    public String generateCompileCommand(File sourceFile, String compiler) {
         String matlabIncludePath = matlabPath + "/extern/include";
-        return generateCompileCommand(sourceFile, matlabIncludePath, "DMATLAB_MEX_FILE");
+        return generateCompileCommand(sourceFile, compiler, matlabIncludePath, "DMATLAB_MEX_FILE");
     }
 
     public String matlabLibPath() {
-        String matlabLibPath = matlabPath + "/bin/" + matlabArch();
-        return matlabLibPath;
+        return matlabPath + "/bin/" + matlabArch();
     }
 
     @Override
@@ -239,7 +236,7 @@ public String generateMexCommand(File mexfile, File obj) {
         }
 
         StringBuilder mexCommandBuilder = new StringBuilder();
-        mexCommandBuilder.append(getCppCompiler() + " ");
+        mexCommandBuilder.append(ZiggyCppPojo.Compiler.CPP.compiler() + " ");
         mexCommandBuilder.append("-o " + mexfile.getAbsolutePath() + " ");
         mexCommandBuilder.append(obj.getAbsolutePath() + " ");
         mexCommandBuilder.append(argListToString(getLibraryPaths(), "-L"));
@@ -309,8 +306,7 @@ public void setOutputType(Object buildType) {
 
     // Setters and getters
     public void setMexfileNames(List<? extends Object> mexfileNames) {
-        this.mexfileNames = new ArrayList<>();
-        this.mexfileNames.addAll(ZiggyCppPojo.objectListToStringList(mexfileNames));
+        this.mexfileNames = ZiggyCppPojo.objectListToStringList(mexfileNames);
     }
 
     public List<String> getMexfileNames() {
diff --git a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppPojo.java b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppPojo.java
index 8a238bd..436c8ee 100644
--- a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppPojo.java
+++ b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyCppPojo.java
@@ -4,36 +4,42 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;
+import org.apache.commons.exec.ExecuteException;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.gradle.api.GradleException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.gradle.api.GradleException;
-import org.gradle.internal.os.OperatingSystem;
 
 /**
- * Performs compilation and linking of C++ code for Ziggy and for pipelines based on Ziggy.
- * The command line options, source directory, include paths, library paths, library names, and
- * type of build (executable, shared library, static library) and output file name
- * must be specified in the Gradle task that makes use of this class. The compiler is determined 
- * from the CXX environment variable, thus is compatible with third-party packages that use the same 
- * convention. Actual source file names are deduced from listing the source directory, object file 
- * information is generated during the compile and saved for use in the link. 
- * 
- * If Gradle's JVM has cppdebug set to true as a system property, the compile and link commands will
- * have appropriate options (-g and -Og). These will be placed after the compile / link options, thus
- * will override any optimization options supplied to Gradle. 
- * 
- * NB: this is a POJO that makes minimal use of the Gradle API. In particular, it does not extend
- * DefaultTask. This is because classes that extend DefaultTask are de facto impossible to unit test
- * in Java. The ZiggyCpp class embeds a ZiggyCpp class to perform its actions and store its members.
- * 
- * @author PT
+ * Performs compilation and linking of C++ code for Ziggy and for pipelines based on Ziggy. The
+ * command line options, source directory, include paths, library paths, library names, and type of
+ * build (executable, shared library, static library) and output file name must be specified in the
+ * Gradle task that makes use of this class. The compiler is determined from the CXX environment
+ * variable, thus is compatible with third-party packages that use the same convention. Actual
+ * source file names are deduced from listing the source directory, object file information is
+ * generated during the compile and saved for use in the link. If Gradle's JVM has cppdebug set to
+ * true as a system property, the compile and link commands will have appropriate options (-g and
+ * -Og). These will be placed after the compile / link options, thus will override any optimization
+ * options supplied to Gradle. NB: this is a POJO that makes minimal use of the Gradle API. In
+ * particular, it does not extend DefaultTask. This is because classes that extend DefaultTask are
+ * de facto impossible to unit test in Java. The ZiggyCpp class embeds a ZiggyCpp class to perform
+ * its actions and store its members.
  *
+ * @author PT
  */
 
 public class ZiggyCppPojo {
@@ -45,15 +51,43 @@ enum BuildType {
         SHARED, STATIC, EXECUTABLE
     }
 
+    enum Compiler {
+        C(".c", C_COMPILER), CPP(".cpp", CPP_COMPILER);
+
+        private String fileSuffix;
+        private String compiler;
+
+        Compiler(String fileSuffix, String compiler) {
+            this.fileSuffix = fileSuffix;
+            this.compiler = compiler;
+        }
+
+        public String fileSuffix() {
+            return fileSuffix;
+        }
+
+        public String compiler() {
+            return compiler;
+        }
+    }
+
     public static final String CPP_COMPILER_ENV_VAR = "CXX";
-    public static final String[] CPP_FILE_TYPES = { ".c", ".cpp" };
+    public static final String C_COMPILER_ENV_VAR = "CC";
     public static final String CPP_DEBUG_PROPERTY_NAME = "cppdebug";
 
-    public static final String DEFAULT_COMPILE_OPTIONS_GRADLE_PROPERTY = "defaultCppCompileOptions";
-    public static final String DEFAULT_LINK_OPTIONS_GRADLE_PROPERTY = "defaultCppLinkOptions";
-    public static final String DEFAULT_RELEASE_OPTS_GRADLE_PROPERTY = "defaultCppReleaseOptimizations";
-    public static final String DEFAULT_DEBUG_OPTS_GRADLE_PROPERTY = "defaultCppDebugOptimizations";
-    public static final String PIPELINE_ROOT_DIR_PROP_NAME = "pipelineRootDir";
+    // The compiler Strings cannot be final because they need to be overridden
+    // during test.
+    public static String CPP_COMPILER = System.getenv(CPP_COMPILER_ENV_VAR);
+    public static String C_COMPILER = System.getenv(C_COMPILER_ENV_VAR);
+
+    private static final List<String> DEFAULT_CPP_COMPILE_OPTIONS = List.of("-Wall", "-fPIC",
+        "-std=c++11");
+    private static final List<String> DEFAULT_C_COMPILE_OPTIONS = List.of("-fPIC");
+    private static final List<String> DEFAULT_LINK_OPTIONS = List.of();
+    private static final List<String> DEFAULT_RELEASE_OPTS = List.of("-O2", "-DNDEBUG", "-g");
+    private static final List<String> DEFAULT_DEBUG_OPTS = List.of("-Og", "-g");
+    private static final int DEFAULT_PARALLEL_COMPILE_THREADS = Runtime.getRuntime()
+        .availableProcessors();
 
     /** Path to the C++ files to be compiled */
     private List<String> cppFilePaths = null;
@@ -68,16 +102,19 @@ enum BuildType {
     private List<String> libraries = new ArrayList<>();
 
     /** compile options (minus the initial hyphen) */
-    private List<String> compileOptions = new ArrayList<>();
+    private List<String> cppCompileOptions = DEFAULT_CPP_COMPILE_OPTIONS;
+
+    /** compile options (minus the initial hyphen) */
+    private List<String> cCompileOptions = DEFAULT_C_COMPILE_OPTIONS;
 
     /** linker options (minus the initial hyphen) */
-    private List<String> linkOptions = new ArrayList<>();
+    private List<String> linkOptions = DEFAULT_LINK_OPTIONS;
 
     /** Optimizations, if any, desired for a build without cppdebug=true system property */
-    private List<String> releaseOptimizations = new ArrayList<>();
+    private List<String> releaseOptimizations = DEFAULT_RELEASE_OPTS;
 
     /** Optimizations, if any, desired for a build with cppdebug=true system property */
-    private List<String> debugOptimizations = new ArrayList<>();
+    private List<String> debugOptimizations = DEFAULT_DEBUG_OPTS;
 
     /** Caller-selected build type */
     private BuildType outputType = null;
@@ -85,8 +122,14 @@ enum BuildType {
     /** Name of the output file (with no "lib" prefix or file type suffix) */
     private String name = null;
 
+    /** Name of the directory for output, if not specified an appropriate default is used. */
+    protected String outputDir;
+
+    /** Parent of the directory for output, if not specified buildDir is used. */
+    protected String outputDirParent;
+
     /** C++ files found in the cppFilePath directory */
-    private List<File> cppFiles = new ArrayList<>();
+    private Map<File, String> cppFiles = new TreeMap<>();
 
     /** Object files built from the C++ files */
     private List<File> objectFiles = new ArrayList<>();
@@ -95,19 +138,19 @@ enum BuildType {
     private File builtFile = null;
 
     /** Desired Gradle build directory, as a File */
-    private File buildDir = null;
+    protected File buildDir = null;
 
     /** Root directory for the parent Gradle project, as a File */
     private File rootDir = null;
 
-    /** C++ compiler command including path to same */
-    private String cppCompiler = null;
-
     /** Default executor used only for testing, do not use for real execution! */
     private DefaultExecutor defaultExecutor = null;
 
     /** Operating system, needed to set options and names for the linker command */
-    private OperatingSystem operatingSystem = OperatingSystem.current();
+    private SystemArchitecture architecture = SystemArchitecture.architecture();
+
+    /** Number of parallel compiler processes to accept. */
+    private int maxCompileThreads = DEFAULT_PARALLEL_COMPILE_THREADS;
 
     // stores logger warning messages. Used only for testing.
     private List<String> loggerWarnings = new ArrayList<>();
@@ -116,35 +159,44 @@ enum BuildType {
      * Converts a list of arguments to a single string that can be used in a command line compiler
      * call
      *
-     * @param argList list of arguments
+     * @param argList list of arguments, may contain null or empty items, which are skipped
      * @param prefix prefix for each argument ("-I", "-L", etc.)
      * @return the list of arguments converted to a string, and with the prefix added to each
      */
     public String argListToString(List<String> argList, String prefix) {
         StringBuilder argStringBuilder = new StringBuilder();
         for (String arg : argList) {
-            argStringBuilder.append(prefix + arg + " ");
+            if (arg != null && !arg.isEmpty()) {
+                argStringBuilder.append(prefix + arg + " ");
+            }
         }
         return argStringBuilder.toString();
     }
 
     File objDir() {
-        return new File(buildDir, "obj");
+        return StringUtils.isEmpty(outputDir) ? new File(outputParent(), "obj")
+            : new File(outputDir);
     }
 
     File libDir() {
-        return new File(buildDir, "lib");
+        return StringUtils.isEmpty(outputDir) ? new File(outputParent(), "lib")
+            : new File(outputDir);
     }
 
     File binDir() {
-        return new File(buildDir, "bin");
+        return StringUtils.isEmpty(outputDir) ? new File(outputParent(), "bin")
+            : new File(outputDir);
+    }
+
+    File outputParent() {
+        return StringUtils.isEmpty(outputDirParent) ? buildDir : new File(outputDirParent);
     }
 
     /**
      * Search the specified file path for C and C++ files, and populate the cppFiles list with same.
      * If the file path is not set or does not exist, a GradleException will be thrown.
      */
-    private void populateCppFiles() {
+    private void populateCppFiles(boolean warn) {
 
         // check that the path is set and exists
         if (cppFilePaths == null) {
@@ -154,37 +206,37 @@ private void populateCppFiles() {
         // clear any existing files, and also handle the null pointer case
         // neither of these should ever occur in real life, but why risk it?
         if (cppFiles == null || !cppFiles.isEmpty()) {
-            cppFiles = new ArrayList<>();
+            cppFiles = new TreeMap<>();
         }
 
         for (String cppFilePath : cppFilePaths) {
             File cppFileDir = new File(cppFilePath);
             if (!cppFileDir.exists()) {
-                String w = "C++ file path " + cppFilePath + " does not exist";
-                log.warn(w);
-                addLoggerWarning(w);
-
+                if (warn) {
+                    String w = "C++ file path " + cppFilePath + " does not exist";
+                    log.warn(w);
+                    addLoggerWarning(w);
+                }
             } else {
 
                 // find all C and C++ files and add them to the cppFiles list
-                for (String fileType : CPP_FILE_TYPES) {
-                    File[] cFiles = cppFileDir.listFiles(new FilenameFilter() {
-                        public boolean accept(File dir, String name) {
-                            return name.endsWith(fileType);
-                        }
-                    });
-                    for (File file : cFiles) {
-                        cppFiles.add(file);
+                for (Compiler compiler : Compiler.values()) {
+                    File[] cFiles = cppFileDir.listFiles(
+                        (FilenameFilter) (dir, name) -> name.endsWith(compiler.fileSuffix()));
+                    if (cFiles == null) {
+                        continue;
+                    }
+                    for (File cFile : cFiles) {
+                        cppFiles.put(cFile, compiler.compiler());
                     }
                 }
             }
         }
 
         if (!cppFiles.isEmpty()) {
-            Collections.sort(cppFiles);
             // write the list of files to the log if info logging is set
             StringBuilder fileListBuilder = new StringBuilder();
-            for (File file : cppFiles) {
+            for (File file : cppFiles.keySet()) {
                 fileListBuilder.append(file.getName());
                 fileListBuilder.append(" ");
             }
@@ -218,20 +270,18 @@ protected void populateBuiltFile() {
             prefix = "lib";
             if (outputType == BuildType.STATIC) {
                 fileType = ".a";
+            } else if (architecture == SystemArchitecture.MAC_M1
+                || architecture == SystemArchitecture.MAC_INTEL) {
+                fileType = ".dylib";
+            } else if (architecture == SystemArchitecture.LINUX_INTEL) {
+                fileType = ".so";
             } else {
-                if (operatingSystem.isMacOsX()) {
-                    fileType = ".dylib";
-                } else if (operatingSystem.isLinux()) {
-                    fileType = ".so";
-                } else {
-                    throw new GradleException(
-                        "ZiggyCpp class does not support OS " + operatingSystem.getName());
-                }
+                throw new GradleException(
+                    "ZiggyCpp class does not support OS " + architecture.toString());
             }
         }
         String outputFile = prefix + name + fileType;
         builtFile = new File(outputDirectory, outputFile);
-
     }
 
     /**
@@ -243,9 +293,10 @@ protected void populateBuiltFile() {
     public static String objectNameFromSourceFile(File sourceFile) {
         String sourceName = sourceFile.getName();
         String strippedName = null;
-        for (String fileType : CPP_FILE_TYPES) {
-            if (sourceName.endsWith(fileType)) {
-                strippedName = sourceName.substring(0, sourceName.length() - fileType.length());
+        for (Compiler compiler : Compiler.values()) {
+            if (sourceName.endsWith(compiler.fileSuffix())) {
+                strippedName = sourceName.substring(0,
+                    sourceName.length() - compiler.fileSuffix().length());
                 break;
             }
         }
@@ -254,38 +305,36 @@ public static String objectNameFromSourceFile(File sourceFile) {
 
     /**
      * Generates the command to compile a single source file
-     *
-     * @param sourceFile File of the C/C++ source that is to be compiled
-     * @return the compile command as a single string. This command will include the include files
-     * and command line options specified in the object, and will route the output to the correct
-     * output directory (specifically $buildDir/obj). It will also take care of setting options
-     * correctly for a debug build if the JVM has cppdebug=true set as a system property.
      */
-    public String generateCompileCommand(File sourceFile) {
+    public String generateCompileCommand(Map.Entry<File, String> sourceFile) {
         return generateCompileCommand(sourceFile, null, null);
     }
 
     /**
      * Generates the command to compile a single source file, with additional options that are
-     * needed for mexfiles
-     *
-     * @param sourceFile File of the C/C++ source that is to be compiled
-     * @param matlabIncludePath String that indicates the location of MATLAB include files, can be
-     * null
-     * @param matlabCompilerDirective String that contains the MATLAB compiler directive, can be
-     * null
-     * @return the compile command as a single string. This command will include the include files
-     * and command line options specified in the object, and will route the output to the correct
-     * output directory (specifically $buildDir/obj). It will also take care of setting options
-     * correctly for a debug build if the JVM has cppdebug=true set as a system property.
+     * needed for mexfiles.
      */
-    public String generateCompileCommand(File sourceFile, String matlabIncludePath,
+    public String generateCompileCommand(Map.Entry<File, String> sourceFile,
+        String matlabIncludePath, String matlabCompilerDirective) {
+        return generateCompileCommand(sourceFile.getKey(), sourceFile.getValue(), matlabIncludePath,
+            matlabCompilerDirective);
+    }
+
+    public String generateCompileCommand(File sourceFile, String compiler) {
+        return generateCompileCommand(sourceFile, compiler, null, null);
+    }
+
+    /**
+     * Generates the command to compile a single source file, with additional options that are
+     * needed for mexfiles.
+     */
+    public String generateCompileCommand(File sourceFile, String compiler, String matlabIncludePath,
         String matlabCompilerDirective) {
 
         StringBuilder compileStringBuilder = new StringBuilder();
 
         // compiler executable
-        compileStringBuilder.append(getCppCompiler() + " ");
+        compileStringBuilder.append(compiler + " ");
 
         // compile only flag
         compileStringBuilder.append("-c ");
@@ -303,7 +352,11 @@ public String generateCompileCommand(File sourceFile, String matlabIncludePath,
         }
 
         // add the command line options
-        compileStringBuilder.append(argListToString(compileOptions, "-"));
+        if (compiler.equals(CPP_COMPILER)) {
+            compileStringBuilder.append(argListToString(cppCompileOptions, ""));
+        } else {
+            compileStringBuilder.append(argListToString(cCompileOptions, ""));
+        }
 
         // if there is a MATLAB compiler directive, handle that now
         if (matlabCompilerDirective != null && !matlabCompilerDirective.isEmpty()) {
@@ -317,9 +370,9 @@ public String generateCompileCommand(File sourceFile, String matlabIncludePath,
             debug = Boolean.getBoolean(CPP_DEBUG_PROPERTY_NAME);
         }
         if (debug) {
-            compileStringBuilder.append(argListToString(debugOptimizations, "-"));
+            compileStringBuilder.append(argListToString(debugOptimizations, ""));
         } else {
-            compileStringBuilder.append(argListToString(releaseOptimizations, "-"));
+            compileStringBuilder.append(argListToString(releaseOptimizations, ""));
         }
         compileStringBuilder.append(sourceFile.getAbsolutePath());
 
@@ -327,7 +380,6 @@ public String generateCompileCommand(File sourceFile, String matlabIncludePath,
         log.info(compileStringBuilder.toString());
 
         return compileStringBuilder.toString();
-
     }
 
     /**
@@ -355,7 +407,7 @@ public String generateLinkCommand(String matlabLibPath) {
         if (outputType == BuildType.STATIC) {
             linkStringBuilder.append("ar rs ");
         } else {
-            linkStringBuilder.append(getCppCompiler() + " -o ");
+            linkStringBuilder.append(Compiler.CPP.compiler() + " -o ");
         }
 
         // add the name of the desired output file
@@ -368,17 +420,16 @@ public String generateLinkCommand(String matlabLibPath) {
             if (matlabLibPath != null && !matlabLibPath.isEmpty()) {
                 linkStringBuilder.append("-L" + matlabLibPath + " ");
             }
-
         }
 
         // add release or debug options
         if (outputType == BuildType.EXECUTABLE) {
-            linkStringBuilder.append(argListToString(linkOptions, "-"));
+            linkStringBuilder.append(argListToString(linkOptions, ""));
             if (System.getProperty(CPP_DEBUG_PROPERTY_NAME) != null
                 && Boolean.getBoolean(CPP_DEBUG_PROPERTY_NAME)) {
-                linkStringBuilder.append(argListToString(debugOptimizations, "-"));
+                linkStringBuilder.append(argListToString(debugOptimizations, ""));
             } else {
-                linkStringBuilder.append(argListToString(releaseOptimizations, "-"));
+                linkStringBuilder.append(argListToString(releaseOptimizations, ""));
             }
         }
 
@@ -391,13 +442,15 @@ public String generateLinkCommand(String matlabLibPath) {
         // if the OS is Mac OS, set the install name. The install name assumes that the library
         // will be installed in the build/lib directory under the root directory.
 
-        if (operatingSystem.isMacOsX() && outputType == BuildType.SHARED) {
+        if ((architecture == SystemArchitecture.MAC_M1
+            || architecture == SystemArchitecture.MAC_INTEL) && outputType == BuildType.SHARED) {
             linkStringBuilder.append("-install_name " + getRootDir().getAbsolutePath()
                 + "/build/lib/" + getBuiltFile().getName() + " ");
         }
 
-        // add the object files
-        for (File objectFile : objectFiles) {
+        // add the object files, sorted into alphabetical order (to simplify testing).
+        Set<File> sortedObjectFiles = new TreeSet<>(objectFiles);
+        for (File objectFile : sortedObjectFiles) {
             linkStringBuilder.append(objectFile.getName() + " ");
         }
 
@@ -412,7 +465,6 @@ public String generateLinkCommand(String matlabLibPath) {
 
         log.info(linkStringBuilder.toString());
         return linkStringBuilder.toString();
-
     }
 
     /**
@@ -456,25 +508,39 @@ protected void compileAction() {
             log.info("mkdir: " + objDir.getAbsolutePath());
             objDir.mkdirs();
         }
+
+        // Create a thread pool for compilation.
+        ExecutorService compilerThreadPool = Executors.newFixedThreadPool(maxCompileThreads);
+        Set<Future<CompilationResult>> compilationResults = new HashSet<>();
+
         // loop over source files, compile them and add the object file to the object file list
-        for (File file : getCppFiles()) {
-            DefaultExecutor compilerExec = getDefaultExecutor();
-            compilerExec.setWorkingDirectory(new File(cppFilePaths.get(0)));
-            try {
-                int returnCode = compilerExec
-                    .execute(new CommandLineComparable(generateCompileCommand(file)));
+        for (Map.Entry<File, String> file : getCppFiles(true).entrySet()) {
+            compilationResults.add(compilerThreadPool.submit(() -> compileActionInternal(file)));
+        }
 
-                if (returnCode != 0) {
-                    throw new GradleException("Compilation of file " + file.getName() + " failed");
+        for (Future<CompilationResult> futureResult : compilationResults) {
+            try {
+                CompilationResult result = futureResult.get();
+                if (result.getReturnCode() != 0) {
+                    throw new GradleException(
+                        "Compilation of file " + result.getSourceFile().getName() + " failed");
                 }
-                objectFiles.add(new File(objDir, objectNameFromSourceFile(file)));
-            } catch (IOException e) {
-                throw new GradleException(
-                    "IOException occurred when attempting to compile " + file.getName(), e);
+                objectFiles.add(new File(objDir, objectNameFromSourceFile(result.getSourceFile())));
+            } catch (ExecutionException | InterruptedException e) {
+                throw new GradleException("Exception occurred during compilation", e);
             }
         }
     }
 
+    private CompilationResult compileActionInternal(Map.Entry<File, String> sourceFile)
+        throws ExecuteException, IOException {
+        DefaultExecutor compilerExec = getDefaultExecutor();
+        compilerExec.setWorkingDirectory(new File(cppFilePaths.get(0)));
+        int returnCode = compilerExec
+            .execute(new CommandLineComparable(generateCompileCommand(sourceFile)));
+        return new CompilationResult(sourceFile.getKey(), returnCode);
+    }
+
     protected void linkAction() {
 
         File objDir = objDir();
@@ -491,7 +557,8 @@ protected void linkAction() {
             destDir.mkdirs();
         }
         try {
-            int returnCode = linkExec.execute(new CommandLineComparable(generateLinkCommand()));
+            String linkCommand = generateLinkCommand();
+            int returnCode = linkExec.execute(new CommandLineComparable(linkCommand));
             if (returnCode != 0) {
                 throw new GradleException(
                     "Link / library construction of " + getBuiltFile().getName() + " failed");
@@ -504,34 +571,48 @@ protected void linkAction() {
         // copy the files from each of the include directories to buildDir/include
         File includeDest = new File(buildDir, "include");
         for (String include : includeFilePaths) {
-            File[] includeFiles = new File(include).listFiles(new FilenameFilter() {
-                @Override
-                public boolean accept(File dir, String name) {
-                    return (name.endsWith(".h") || name.endsWith(".hpp"));
+            File directory = new File(include);
+            if (!directory.exists()) {
+                // Strip rootDir prefix from the entry for easier reading (in most cases).
+                String shortInclude = include;
+                int index = include.indexOf(getRootDir().getAbsolutePath());
+                if (index >= 0) {
+                    // +1: Strip the / after rootDir as well.
+                    shortInclude = include.substring(getRootDir().getAbsolutePath().length() + 1);
                 }
-            });
+                throw new GradleException("The directory " + shortInclude
+                    + " specified in includeFilePaths does not exist");
+            }
+            File[] includeFiles = directory.listFiles(
+                (FilenameFilter) (dir, name) -> name.endsWith(".h") || name.endsWith(".hpp"));
             for (File includeFile : includeFiles) {
                 try {
-                    FileUtils.copyFileToDirectory(includeFile, includeDest);
+                    if (!includeFile.getParentFile()
+                        .getCanonicalFile()
+                        .equals(includeDest.getCanonicalFile())) {
+                        FileUtils.copyFileToDirectory(includeFile, includeDest);
+                    }
                 } catch (IOException e) {
                     throw new GradleException("Unable to copy include files from" + include + " to "
                         + includeDest.getAbsoluteFile(), e);
                 }
             }
         }
-
     }
 
     /**
-     * Converts a list of Objects to a list of Strings, preserving their order.
-     *
-     * @param libraries2 List of objects to be converted.
-     * @return ArrayList of strings obtained by taking toString() of the objects in the objectList.
+     * Converts a list of Objects to a list of Strings, preserving their order. Null objects, empty
+     * strings, or strings consisting solely of whitespace are ignored.
      */
-    static List<String> objectListToStringList(List<? extends Object> libraries2) {
+    static List<String> objectListToStringList(List<? extends Object> objectList) {
         List<String> stringList = new ArrayList<>();
-        for (Object obj : libraries2) {
-            stringList.add(obj.toString());
+        for (Object object : objectList) {
+            if (object != null) {
+                String string = object.toString();
+                if (!string.isBlank()) {
+                    stringList.add(string);
+                }
+            }
         }
         return stringList;
     }
@@ -547,18 +628,15 @@ static List<String> objectListToStringList(List<? extends Object> libraries2) {
     static List<String> gradlePropertyToList(Object gradleProperty) {
         if (gradleProperty instanceof List<?>) {
             return objectListToStringList((List<? extends Object>) gradleProperty);
-        } else {
-            List<Object> gradlePropertyList = new ArrayList<>();
-            gradlePropertyList.add(gradleProperty);
-            return objectListToStringList((List<? extends Object>) gradlePropertyList);
         }
+
+        return objectListToStringList(List.of(gradleProperty));
     }
 
-//	setters and getters 
+//	setters and getters
 
     public void setCppFilePath(Object cppFilePath) {
-        this.cppFilePaths = new ArrayList<>();
-        cppFilePaths.add(cppFilePath.toString());
+        cppFilePaths = List.of(cppFilePath.toString());
     }
 
     public List<String> getCppFilePaths() {
@@ -574,8 +652,7 @@ public List<String> getIncludeFilePaths() {
     }
 
     public void setIncludeFilePaths(List<? extends Object> includeFilePaths) {
-        this.includeFilePaths = new ArrayList<>();
-        this.includeFilePaths.addAll(objectListToStringList(includeFilePaths));
+        this.includeFilePaths = objectListToStringList(includeFilePaths);
     }
 
     public List<String> getLibraryPaths() {
@@ -583,8 +660,7 @@ public List<String> getLibraryPaths() {
     }
 
     public void setLibraryPaths(List<? extends Object> libraryPaths) {
-        this.libraryPaths = new ArrayList<>();
-        this.libraryPaths.addAll(objectListToStringList(libraryPaths));
+        this.libraryPaths = objectListToStringList(libraryPaths);
     }
 
     public List<String> getLibraries() {
@@ -592,17 +668,23 @@ public List<String> getLibraries() {
     }
 
     public void setLibraries(List<? extends Object> libraries) {
-        this.libraries = new ArrayList<>();
-        this.libraries.addAll(objectListToStringList(libraries));
+        this.libraries = objectListToStringList(libraries);
+    }
+
+    public List<String> getCppCompileOptions() {
+        return cppCompileOptions;
+    }
+
+    public void setCppCompileOptions(List<? extends Object> compileOptions) {
+        cppCompileOptions = objectListToStringList(compileOptions);
     }
 
-    public List<String> getCompileOptions() {
-        return compileOptions;
+    public List<String> getCCompileOptions() {
+        return cCompileOptions;
     }
 
-    public void setCompileOptions(List<? extends Object> compileOptions) {
-        this.compileOptions = new ArrayList<>();
-        this.compileOptions.addAll(objectListToStringList(compileOptions));
+    public void setCCompileOptions(List<String> cCompileOptions) {
+        this.cCompileOptions = cCompileOptions;
     }
 
     public List<String> getLinkOptions() {
@@ -610,8 +692,7 @@ public List<String> getLinkOptions() {
     }
 
     public void setLinkOptions(List<? extends Object> linkOptions) {
-        this.linkOptions = new ArrayList<>();
-        this.linkOptions.addAll(objectListToStringList(linkOptions));
+        this.linkOptions = objectListToStringList(linkOptions);
     }
 
     public List<String> getReleaseOptimizations() {
@@ -619,8 +700,7 @@ public List<String> getReleaseOptimizations() {
     }
 
     public void setReleaseOptimizations(List<? extends Object> releaseOptimizations) {
-        this.releaseOptimizations = new ArrayList<>();
-        this.releaseOptimizations.addAll(objectListToStringList(releaseOptimizations));
+        this.releaseOptimizations = objectListToStringList(releaseOptimizations);
     }
 
     public List<String> getDebugOptimizations() {
@@ -628,8 +708,7 @@ public List<String> getDebugOptimizations() {
     }
 
     public void setDebugOptimizations(List<? extends Object> debugOptimizations) {
-        this.debugOptimizations = new ArrayList<>();
-        this.debugOptimizations.addAll(objectListToStringList(debugOptimizations));
+        this.debugOptimizations = objectListToStringList(debugOptimizations);
     }
 
     public BuildType getOutputType() {
@@ -652,13 +731,21 @@ public void setOutputName(Object name) {
         this.name = name.toString();
     }
 
-    public List<File> getCppFiles() {
-        // always generate the list afresh -- necessary because Gradle calls the ZiggyCpp
+    public Map<File, String> getCppFiles() {
+        return getCppFiles(false);
+    }
+
+    public List<File> getSourceFiles() {
+        return new ArrayList<>(getCppFiles().keySet());
+    }
+
+    public Map<File, String> getCppFiles(boolean warn) {
+        // Always generate the list afresh -- necessary because Gradle calls the ZiggyCpp
         // method getCppFiles() prior to the actual build, at which time the directories of
         // source files may or may not exist yet! Thus we can't afford to cache the C++
         // file list, since I can't tell whether Gradle creates a new ZiggyCpp object when
         // it actually does the build, or whether it simply re-uses the one from pre-build.
-        populateCppFiles();
+        populateCppFiles(warn);
         return cppFiles;
     }
 
@@ -671,13 +758,11 @@ public void setObjectFiles(List<File> objectFiles) {
     }
 
     public void setObjectFiles(File objectFile) {
-        this.objectFiles.add(objectFile);
+        objectFiles.add(objectFile);
     }
 
     public File getBuiltFile() {
-        if (builtFile == null) {
-            populateBuiltFile();
-        }
+        populateBuiltFile();
         return builtFile;
     }
 
@@ -697,20 +782,32 @@ public void setRootDir(File rootDir) {
         this.rootDir = rootDir;
     }
 
-    public String getCppCompiler() {
-        if (cppCompiler == null) {
-            cppCompiler = System.getenv(CPP_COMPILER_ENV_VAR);
-        }
-        return cppCompiler;
+    public SystemArchitecture getArchitecture() {
+        return architecture;
     }
 
-    public OperatingSystem getOperatingSystem() {
-        return operatingSystem;
+    public String getOutputDir() {
+        return outputDir;
     }
 
-    // this method is intended for use only in testing, for that reason it is package-private
-    void setCppCompiler(String cppCompiler) {
-        this.cppCompiler = cppCompiler;
+    public void setOutputDir(Object outputDir) {
+        this.outputDir = outputDir.toString();
+    }
+
+    public String getOutputDirParent() {
+        return outputDirParent;
+    }
+
+    public void setOutputDirParent(Object outputDirParent) {
+        this.outputDirParent = outputDirParent.toString();
+    }
+
+    public int getMaxCompileThreads() {
+        return maxCompileThreads;
+    }
+
+    public void setMaxCompileThreads(int maxCompileThreads) {
+        this.maxCompileThreads = maxCompileThreads;
     }
 
     // this method is intended for use only in testing, for that reason it is package-private
@@ -719,8 +816,18 @@ void setDefaultExecutor(DefaultExecutor defaultExecutor) {
     }
 
     // this method is intended for use only in testing, for that reason it is package-private
-    void setOperatingSystem(OperatingSystem operatingSystem) {
-        this.operatingSystem = operatingSystem;
+    void setArchitecture(SystemArchitecture architecture) {
+        this.architecture = architecture;
+    }
+
+    /** For testing use only. */
+    static void setCppCompiler(String testCompiler) {
+        CPP_COMPILER = testCompiler;
+    }
+
+    /** For testing use only. */
+    static void setCCompiler(String testCompiler) {
+        C_COMPILER = testCompiler;
     }
 
     /**
@@ -736,10 +843,11 @@ public CommandLineComparable(String executable) {
             super(CommandLine.parse(executable));
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o instanceof CommandLine) {
                 CommandLine oo = (CommandLine) o;
-                if (this.toString().contentEquals(oo.toString())) {
+                if (toString().contentEquals(oo.toString())) {
                     return true;
                 }
             }
@@ -756,4 +864,23 @@ private void addLoggerWarning(String warning) {
     List<String> loggerWarnings() {
         return loggerWarnings;
     }
+
+    private static class CompilationResult {
+
+        private final File sourceFile;
+        private final int returnCode;
+
+        public CompilationResult(File sourceFile, int returnCode) {
+            this.sourceFile = sourceFile;
+            this.returnCode = returnCode;
+        }
+
+        public File getSourceFile() {
+            return sourceFile;
+        }
+
+        public int getReturnCode() {
+            return returnCode;
+        }
+    }
 }
diff --git a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyVersionGenerator.java b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyVersionGenerator.java
index c9e8b4e..fd41c50 100644
--- a/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyVersionGenerator.java
+++ b/buildSrc/src/main/java/gov/nasa/ziggy/buildutil/ZiggyVersionGenerator.java
@@ -6,82 +6,106 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
-import org.gradle.api.tasks.OutputFile;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.Internal;
 
 import com.google.common.collect.ImmutableList;
 
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-import freemarker.template.TemplateExceptionHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
- * Generates version info in the generated file <code>ZiggyVersion.java</code.
- * Note that several Git commands are used here, with command-line options to
- * set the number of characters of the commit hash to use. The number is set to
- * 10, because that is currently 1 more than necessary to distinguish all commit
- * hashes to date. One command to determine the maximum hash length in use is:
+ * Places version info in the property file {@value #BUILD_CONFIGURATION}). The available Gradle
+ * properties used to set the names of the various properties that describe the version include:
+ * <dl>
+ * <dt>{@code versionPropertyName}</dt>
+ * <dd>name of the property that holds the output of {@code git describe} (default:
+ * {@value #DEFAULT_BUILD_VERSION_PROPERTY_NAME})</dd>
+ * <dt>{@code branchPropertyName}</dt>
+ * <dd>name of the property that contains the name of the current branch
+ * (default:{@value #DEFAULT_BUILD_BRANCH_PROPERTY_NAME})</dd>
+ * <dt>{@code commitPropertyName}</dt>
+ * <dd>name of the property that contains the commit
+ * (default:{@value #DEFAULT_BUILD_COMMIT_PROPERTY_NAME})</dd>
+ * </dl>
+ * <p>
+ * The following example shows how to to run this plugin only when necessary by saving the current
+ * Git version in a property called {@code ziggyVersion}. The default values of the aforementioned
+ * properties are used.
+ *
+ * <pre>
+ * import gov.nasa.ziggy.buildutil.ZiggyVersionGenerator
+ *
+ * def gitVersion = new ByteArrayOutputStream()
+ * exec {
+ *     commandLine "git", "rev-parse", "HEAD"
+ *     standardOutput = gitVersion
+ * }
+ * gitVersion = gitVersion.toString().trim()
  *
- * <pre>$ git rev-list --all --abbrev=0 --abbrev-commit | awk '{print length()}' | sort -n | uniq -c
- * 1040 4
- * 7000 5
- * 1149 6
- *   68 7
- *    8 8
- *    1 9
+ * task ziggyVersion(type: ZiggyVersionGenerator) {
+ *     inputs.property "ziggyVersion", gitVersion
+ * }
  * </pre>
  *
+ * See ZiggyConfiguration.
  */
-public class ZiggyVersionGenerator extends TessExecTask {
-
-    private static final Logger log = LoggerFactory.getLogger(ZiggyVersionGenerator.class);
-    private static final String MAC_OS_X_OS_NAME = "Mac OS X";
-
-    public File outputFile;
-    public final String dateFormat = "dd-MMM-yyyy HH:mm:ss";
-    private String osType;
-
-    public void generateFile(BufferedWriter out) throws IOException, InterruptedException {
-
-        osType = System.getProperty("os.name");
-        log.debug("OS Type: " + osType);
-        
-        // Suppressed because this entire class is going to be removed in Ziggy 0.4.0.
-        @SuppressWarnings(value = "deprecated")
-        Configuration config = new Configuration();
-        config.setClassForTemplateLoading(this.getClass(), "/");
-        config.setDefaultEncoding("UTF-8");
-        config.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-
-        VersionInfo versionInfo = new VersionInfo();
-        versionInfo.setBuildDate(getBuildDate());
-        versionInfo.setSoftwareVersion(getGitRelease());
-        versionInfo.setBranch(getGitBranch());
-        versionInfo.setRevision(getGitRevision());
-
-        try {
-            config.getTemplate("ZiggyVersion.java.ftlh").process(versionInfo, out);
-        } catch (TemplateException e) {
-            throw new IllegalStateException("Error processing template", e);
+public class ZiggyVersionGenerator extends DefaultTask {
+
+    private static final String BUILD_CONFIGURATION = "src/main/resources/ziggy-build.properties";
+    private static final String DEFAULT_BUILD_VERSION_PROPERTY_NAME = "ziggy.version";
+    private static final String DEFAULT_BUILD_BRANCH_PROPERTY_NAME = "ziggy.version.branch";
+    private static final String DEFAULT_BUILD_COMMIT_PROPERTY_NAME = "ziggy.version.commit";
+
+    /**
+     * Length that object names are abbreviated to. The number is set to 10, because that is
+     * currently 1 more than necessary to distinguish all commit hashes to date. One command to
+     * determine the maximum hash length in use is:
+     *
+     * <pre>
+     * $ git rev-list --all --abbrev=0 --abbrev-commit | awk '{print length()}' | sort -n | uniq -c
+     * 1040 4
+     * 7000 5
+     * 1149 6
+     *   68 7
+     *    8 8
+     *    1 9
+     * </pre>
+     */
+    private static final int ABBREV = 10;
+
+    private static final String HEADER = "# This file is automatically generated by Gradle."
+        + System.lineSeparator() + "# Do not edit." + System.lineSeparator();
+
+    private String versionPropertyName = DEFAULT_BUILD_VERSION_PROPERTY_NAME;
+    private String branchPropertyName = DEFAULT_BUILD_BRANCH_PROPERTY_NAME;
+    private String commitPropertyName = DEFAULT_BUILD_COMMIT_PROPERTY_NAME;
+
+    @TaskAction
+    public void generateVersionProperties() throws IOException, InterruptedException {
+
+        File outputFile = new File(getProject().getProjectDir(), buildConfiguration());
+
+        try (BufferedWriter output = new BufferedWriter(new FileWriter(outputFile))) {
+            output.write(HEADER);
+            output.write(getVersionPropertyName() + " = "
+                + runCommand(ImmutableList.of("git", "describe", "--always", "--abbrev=" + ABBREV))
+                + System.lineSeparator());
+            output.write(getBranchPropertyName() + " = "
+                + runCommand(ImmutableList.of("git", "rev-parse", "--abbrev-ref", "HEAD"))
+                + System.lineSeparator());
+            output.write(getCommitPropertyName() + " = "
+                + runCommand(ImmutableList.of("git", "rev-parse", "--short=" + ABBREV, "HEAD"))
+                + System.lineSeparator());
         }
     }
 
-    public List<String> processOutput(List<String> command)
-        throws IOException, InterruptedException {
+    public String runCommand(List<String> command) throws IOException, InterruptedException {
 
-        ProcessBuilder processBuilder = new ProcessBuilder(command);
-        Process process = processBuilder.start();
-        List<String> lines = new ArrayList<>();
+        Process process = new ProcessBuilder(command).start();
+        List<String> output = new ArrayList<>();
 
         BufferedReader bufferedReader = new BufferedReader(
             new InputStreamReader(process.getInputStream()));
@@ -91,106 +115,43 @@ public List<String> processOutput(List<String> command)
             if (line == null) {
                 break;
             }
-
-            lines.add(line);
+            output.add(line);
         }
 
         process.waitFor();
-        return lines;
-    }
 
-    @Internal
-    public String getGitRevision() throws IOException, InterruptedException {
-        if (osType.equals(MAC_OS_X_OS_NAME)) {
-            return "Not Supported";
-        }
-        List<String> cmd = ImmutableList.of("git", "rev-parse", "--short=10", "HEAD");
-        List<String> output = processOutput(cmd);
-        return output.get(output.size() - 1);
+        return output.stream().collect(Collectors.joining(System.lineSeparator())).trim();
     }
 
-    @Internal
-    public String getGitBranch() throws IOException, InterruptedException {
-        if (osType.equals(MAC_OS_X_OS_NAME)) {
-            return "Not Supported";
-        }
-        List<String> cmd = ImmutableList.of("git", "rev-parse", "--abbrev-ref", "HEAD");
-        List<String> output = processOutput(cmd);
-        return output.get(output.size() - 1);
+    /** Override this to create your own subclass for pipeline-side version generation. */
+    protected String buildConfiguration() {
+        return BUILD_CONFIGURATION;
     }
 
-    @Internal
-    public String getGitRelease() throws IOException, InterruptedException {
-        if (osType.equals(MAC_OS_X_OS_NAME)) {
-            return "Not Supported";
-        }
-        List<String> cmd = ImmutableList.of("git", "describe", "--always", "--abbrev=10");
-        List<String> output = processOutput(cmd);
-        return output.get(output.size() - 1);
+    @Input
+    public String getVersionPropertyName() {
+        return versionPropertyName;
     }
 
-    @Internal
-    public String getBuildDate() {
-        SimpleDateFormat dateFormatter = new SimpleDateFormat(dateFormat);
-        return dateFormatter.format(new Date());
+    public void setVersionPropertyName(String versionPropertyName) {
+        this.versionPropertyName = versionPropertyName;
     }
 
-    @OutputFile
-    public File getOutputFile() {
-        return outputFile;
+    @Input
+    public String getBranchPropertyName() {
+        return branchPropertyName;
     }
 
-    public void setOutputFile(File output) {
-        outputFile = output;
+    public void setBranchPropertyName(String branchPropertyName) {
+        this.branchPropertyName = branchPropertyName;
     }
 
-    @TaskAction
-    public void action() throws IOException, InterruptedException {
-        try (BufferedWriter output = new BufferedWriter(new FileWriter(outputFile))) {
-            generateFile(output);
-        }
+    @Input
+    public String getCommitPropertyName() {
+        return commitPropertyName;
     }
 
-    /**
-     * Holds version information in a Java bean suitable for referencing from a template.
-     */
-    public static class VersionInfo {
-
-        private String buildDate;
-        private String softwareVersion;
-        private String revision;
-        private String branch;
-
-        public String getBuildDate() {
-            return buildDate;
-        }
-
-        public void setBuildDate(String dateStr) {
-            buildDate = dateStr;
-        }
-
-        public String getSoftwareVersion() {
-            return softwareVersion;
-        }
-
-        public void setSoftwareVersion(String versionStr) {
-            softwareVersion = versionStr;
-        }
-
-        public String getRevision() {
-            return revision;
-        }
-
-        public void setRevision(String revision) {
-            this.revision = revision;
-        }
-
-        public String getBranch() {
-            return branch;
-        }
-
-        public void setBranch(String branch) {
-            this.branch = branch;
-        }
+    public void setCommitPropertyName(String commitPropertyName) {
+        this.commitPropertyName = commitPropertyName;
     }
 }
diff --git a/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/SystemArchitectureTest.java b/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/SystemArchitectureTest.java
new file mode 100644
index 0000000..3af7dcf
--- /dev/null
+++ b/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/SystemArchitectureTest.java
@@ -0,0 +1,38 @@
+package gov.nasa.ziggy.buildutil;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import gov.nasa.ziggy.buildutil.SystemArchitecture.Selector;
+
+/**
+ * Unit tests for {@link SystemArchitecture} class.
+ *
+ * @author PT
+ */
+public class SystemArchitectureTest {
+
+    @Test
+    public void testSelector() {
+
+        Selector<String> selectorSpy = Mockito.spy(SystemArchitecture.selector(String.class));
+        Mockito.doReturn(SystemArchitecture.LINUX_INTEL).when(selectorSpy).architecture();
+        selectorSpy.linuxIntelObject("A").macIntelObject("B").macM1Object("C");
+        assertEquals("A", selectorSpy.get());
+        Mockito.doReturn(SystemArchitecture.MAC_INTEL).when(selectorSpy).architecture();
+        assertEquals("B", selectorSpy.get());
+        Mockito.doReturn(SystemArchitecture.MAC_M1).when(selectorSpy).architecture();
+        assertEquals("C", selectorSpy.get());
+    }
+
+    @Test
+    public void testFastSelectorSyntax() {
+        SystemArchitecture.selector(String.class)
+            .linuxIntelObject("A")
+            .macIntelObject("B")
+            .macM1Object("C")
+            .get();
+    }
+}
diff --git a/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/ZiggyCppMexPojoTest.java b/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/ZiggyCppMexPojoTest.java
index b4e8e5c..a656fb6 100644
--- a/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/ZiggyCppMexPojoTest.java
+++ b/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/ZiggyCppMexPojoTest.java
@@ -7,6 +7,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,10 +15,8 @@
 import org.apache.commons.exec.ExecuteException;
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.GradleException;
-import org.gradle.internal.os.OperatingSystem;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
@@ -26,408 +25,415 @@
 
 public class ZiggyCppMexPojoTest {
 
-	File tempDir = null;
-	File buildDir = null;
-	File rootDir = null;
-	File projectDir = null;
-	File srcDir = null;
-	File incDir = null;
-	ZiggyCppMexPojo ziggyCppMexObject = null;
-	
-	DefaultExecutor defaultExecutor = Mockito.mock(DefaultExecutor.class);
-	
-	@Before
-	public void before() throws IOException {
-		
-		//	create a temporary directory for everything
-		tempDir = Files.createTempDirectory("rootDir").toFile();
-		tempDir.deleteOnExit();
-		
-		//	rootDir is the same as tempDir
-		rootDir = tempDir;
-		
-		//	projectDir
-		projectDir = new File(rootDir,"projectDir");
-		projectDir.mkdir();
-		
-		//	build directory under project
-		buildDir = new File(projectDir, "build");
-		buildDir.mkdir();
-		
-		//	lib, bin, obj, and include directories under build
-		new File(buildDir, "lib").mkdir();
-		new File(buildDir, "obj").mkdir();
-		new File(buildDir, "bin").mkdir();
-		new File(buildDir, "include").mkdir();
-		
-		//	add a source directory that's several levels down
-		srcDir = new File(projectDir, "src/main/cpp/mex");
-		srcDir.mkdirs();
-		
-		//	add an include directory that's several levels down
-		incDir = new File(projectDir, "src/main/include");
-		incDir.mkdirs();
-		
-		//	create source files
-		createSourceFiles();
-		
-		//	create the ZiggyCppMexPojo object
-		ziggyCppMexObject = createZiggyCppMexPojo();
-	}
-	
-	@After
-	public void after() throws IOException {
-		
-		//	explicitly delete the temp directory
-		FileUtils.deleteDirectory(tempDir);
-		
-		//	delete any cppdebug system properties
-		System.clearProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME);
-		
-		//	delete the ZiggyCpp object
-		ziggyCppMexObject = null;
-		buildDir = null;
-		tempDir = null;
-		projectDir = null;
-		srcDir = null;
-		incDir = null;
-	}
-	
+    File tempDir = null;
+    File buildDir = null;
+    File rootDir = null;
+    File projectDir = null;
+    File srcDir = null;
+    File incDir = null;
+    ZiggyCppMexPojo ziggyCppMexObject = null;
+
+    DefaultExecutor defaultExecutor = Mockito.mock(DefaultExecutor.class);
+
+    @Before
+    public void before() throws IOException {
+
+        // create a temporary directory for everything
+        tempDir = Files
+            .createDirectories(Paths.get("build").resolve("test").resolve("ZiggyCppMexPojoTest"))
+            .toFile()
+            .getAbsoluteFile();
+
+        // rootDir is the same as tempDir
+        rootDir = tempDir;
+
+        // projectDir
+        projectDir = new File(rootDir, "projectDir");
+        projectDir.mkdir();
+
+        // build directory under project
+        buildDir = new File(projectDir, "build");
+        buildDir.mkdir();
+
+        // lib, bin, obj, and include directories under build
+        new File(buildDir, "lib").mkdir();
+        new File(buildDir, "obj").mkdir();
+        new File(buildDir, "bin").mkdir();
+        new File(buildDir, "include").mkdir();
+
+        // add a source directory that's several levels down
+        srcDir = new File(projectDir, "src/main/cpp/mex");
+        srcDir.mkdirs();
+
+        // add an include directory that's several levels down
+        incDir = new File(projectDir, "src/main/include");
+        incDir.mkdirs();
+
+        // create source files
+        createSourceFiles();
+
+        // create the ZiggyCppMexPojo object
+        ziggyCppMexObject = createZiggyCppMexPojo();
+    }
+
+    @After
+    public void after() throws IOException {
+
+        // explicitly delete the temp directory
+        FileUtils.deleteDirectory(tempDir);
+
+        // delete any cppdebug system properties
+        System.clearProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME);
+
+        // delete the ZiggyCpp object
+        ziggyCppMexObject = null;
+        buildDir = null;
+        tempDir = null;
+        projectDir = null;
+        srcDir = null;
+        incDir = null;
+    }
+
 //***************************************************************************************
-	
-	//	Here begins the actual test classes
-	
-	/** Tests that the output type setters have no effect on the output type
-	 * 
-	 */
-	@Test
-	public void testOutputTypeSetters() {
-		ziggyCppMexObject.setOutputType("executable");
-		assertEquals(ziggyCppMexObject.getOutputType(), BuildType.SHARED);
-		ziggyCppMexObject.setOutputType("static");
-		assertEquals(ziggyCppMexObject.getOutputType(), BuildType.SHARED);
-		ziggyCppMexObject.setOutputType(BuildType.EXECUTABLE);
-		assertEquals(ziggyCppMexObject.getOutputType(), BuildType.SHARED);
-		ziggyCppMexObject.setOutputType(BuildType.STATIC);
-		assertEquals(ziggyCppMexObject.getOutputType(), BuildType.SHARED);
-	}
-	
-	/**
-	 * Tests the setters and getters that are unique to the ZiggyCppMexPojo (the ones
-	 * that are inherited from ZiggyCppPojo are not tested).
-	 */
-	@Test
-	public void testSettersAndGetters() {
-		
-		//	these getter tests implicitly test the setters in createZiggyCppMexPojo():
-		assertEquals(projectDir.getAbsolutePath(), ziggyCppMexObject.getProjectDir().getAbsolutePath());
-		assertEquals("/dev/null/MATLAB_R2017b", ziggyCppMexObject.getMatlabPath());
-		List<String> mexfileNames = ziggyCppMexObject.getMexfileNames();
-		assertEquals(2, mexfileNames.size());
-		assertEquals("CSource1", mexfileNames.get(0));
-		assertEquals("CppSource2", mexfileNames.get(1));
-	}
-	
-	/**
-	 * Tests the compile command generator, in particular to make certain that the MATLAB include
-	 * path and MATLAB_MEX_FILE compiler directive are present
-	 */
-	@Test
-	public void testGenerateCompileCommand() {
-		
-		//	test with debug options disabled
-		String compileString = ziggyCppMexObject.generateCompileCommand(new File("/dev/null/dmy1.c"));
-		String expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/dmy1.o "
-				+ "-I" + srcDir.getAbsolutePath() + " -I" + incDir.getAbsolutePath()
-				+ " -I/dev/null/MATLAB_R2017b/extern/include -Wall -fPic -DMATLAB_MEX_FILE -O2 -DNDEBUG -g "
-				+ "/dev/null/dmy1.c";
-		assertEquals(expectedString, compileString);
-		
-		//	test with debug options enabled
-		System.setProperty("cppdebug", "true");
-		compileString = ziggyCppMexObject.generateCompileCommand(new File("/dev/null/dmy1.c"));
-		expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/dmy1.o "
-				+ "-I" + srcDir.getAbsolutePath() + " -I" + incDir.getAbsolutePath()
-				+ " -I/dev/null/MATLAB_R2017b/extern/include -Wall -fPic -DMATLAB_MEX_FILE -Og -g "
-				+ "/dev/null/dmy1.c";
-		assertEquals(expectedString, compileString);
-		
-		//	test with debug property present but set to false
-		System.setProperty("cppdebug", "false");
-		compileString = ziggyCppMexObject.generateCompileCommand(new File("/dev/null/dmy1.c"));
-		expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/dmy1.o "
-				+ "-I" + srcDir.getAbsolutePath() + " -I" + incDir.getAbsolutePath()
-				+ " -I/dev/null/MATLAB_R2017b/extern/include -Wall -fPic -DMATLAB_MEX_FILE -O2 -DNDEBUG -g "
-				+ "/dev/null/dmy1.c";
-		assertEquals(expectedString, compileString);
-	}
-	
-	@Test
-	public void testGenerateSharedObjectName() {
-		String generatedName = ziggyCppMexObject.generateSharedObjectName();
-		assertEquals("projectDir-src-main-cpp-mex", generatedName);
-	}
-	
-	@Test
-	public void testGenerateLinkCommand() {
-		configureLinkerOptions(ziggyCppMexObject);
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.LINUX);
-		String linkCommand = ziggyCppMexObject.generateLinkCommand();
-		String expectedCommand = "/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/"
-				+ "libdummy.so -L/dummy1/lib -L/dummy2/lib "
-				+"-L/dev/null/MATLAB_R2017b/bin/glnxa64 -shared o1.o o2.o -lhdf5 -lnetcdf -lmex -lmx -lmat ";
-		assertEquals(expectedCommand, linkCommand);
-
-		//	now test the library name for empty object name
-		ziggyCppMexObject = createZiggyCppMexPojo();
-		ziggyCppMexObject.setOutputName("");
-		configureLinkerOptions(ziggyCppMexObject);
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.LINUX);
-		linkCommand = ziggyCppMexObject.generateLinkCommand();
-		expectedCommand = "/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/"
-				+ "libprojectDir-src-main-cpp-mex.so -L/dummy1/lib -L/dummy2/lib "
-				+"-L/dev/null/MATLAB_R2017b/bin/glnxa64 -shared o1.o o2.o -lhdf5 -lnetcdf -lmex -lmx -lmat ";
-		assertEquals(expectedCommand, linkCommand);
-
-		//	test for Mac OS
-		ziggyCppMexObject = createZiggyCppMexPojo();
-		configureLinkerOptions(ziggyCppMexObject);
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.MAC_OS);
-		linkCommand = ziggyCppMexObject.generateLinkCommand();
-		expectedCommand = "/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/"
-				+ "libdummy.dylib -L/dummy1/lib -L/dummy2/lib "
-				+"-L/dev/null/MATLAB_R2017b/bin/maci64 "
-				+"-shared -install_name " + rootDir.getAbsolutePath()+"/build/lib/libdummy.dylib"
-				+ " o1.o o2.o -lhdf5 -lnetcdf -lmex -lmx -lmat ";
-		assertEquals(expectedCommand, linkCommand);
-	}
-	
-	@Test
-	public void testGenerateMexCommand() {
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.LINUX);
-		configureLinkerOptions(ziggyCppMexObject);
-		File mexfile = new File(buildDir, "lib/o1.mexmaci64");
-		File objFile = new File(buildDir, "obj/o1.o");
-		String mexCommand = ziggyCppMexObject.generateMexCommand(mexfile, objFile);
-		String expectedCommand = "/dev/null/g++ -o " + mexfile.getAbsolutePath() + " "
-				+ objFile.getAbsolutePath() + " -L/dummy1/lib -L/dummy2/lib "
-				+ "-L/dev/null/MATLAB_R2017b/bin/glnxa64 -L" + buildDir.getAbsolutePath() + "/lib "
-				+ "-lhdf5 -lnetcdf -lmex -lmx -lmat -ldummy -shared";
-		assertEquals(expectedCommand, mexCommand);
-		
-		//	test for empty library object name
-		ziggyCppMexObject = createZiggyCppMexPojo();
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.LINUX);
-		configureLinkerOptions(ziggyCppMexObject);
-		ziggyCppMexObject.setOutputName("");
-		mexCommand = ziggyCppMexObject.generateMexCommand(mexfile, objFile);	
-		expectedCommand = "/dev/null/g++ -o " + mexfile.getAbsolutePath() + " "
-				+ objFile.getAbsolutePath() + " -L/dummy1/lib -L/dummy2/lib "
-				+ "-L/dev/null/MATLAB_R2017b/bin/glnxa64 -L" + buildDir.getAbsolutePath() + "/lib "
-				+ "-lhdf5 -lnetcdf -lmex -lmx -lmat -lprojectDir-src-main-cpp-mex -shared";
-		assertEquals(expectedCommand, mexCommand);	
-		
-		//	test for Mac OS
-		ziggyCppMexObject = createZiggyCppMexPojo();
-		configureLinkerOptions(ziggyCppMexObject);
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.MAC_OS);
-		mexCommand = ziggyCppMexObject.generateMexCommand(mexfile, objFile);	
-		expectedCommand = "/dev/null/g++ -o " + mexfile.getAbsolutePath() + " "
-				+ objFile.getAbsolutePath() + " -L/dummy1/lib -L/dummy2/lib "
-				+ "-L/dev/null/MATLAB_R2017b/bin/maci64 -L" + buildDir.getAbsolutePath() + "/lib "
-				+ "-lhdf5 -lnetcdf -lmex -lmx -lmat -ldummy -shared";
-		assertEquals(expectedCommand, mexCommand);			
-	}
-	
-	@Test
-	public void testAction() throws ExecuteException, IOException {
-		
-		//	set the mocked executor into the object
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.LINUX);
-		ziggyCppMexObject.setDefaultExecutor(defaultExecutor);
-		InOrder executorCalls = Mockito.inOrder(defaultExecutor);
-		
-		//	call the method
-		ziggyCppMexObject.action();
-
-		//	check the calls -- first the 4 compile commands
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(projectDir, 
-				"src/main/cpp/mex"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppMexObject.new CommandLineComparable(
-				ziggyCppMexObject.generateCompileCommand(new File(srcDir, "CSource1.c"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(projectDir, 
-				"src/main/cpp/mex"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppMexObject.new CommandLineComparable(
-				ziggyCppMexObject.generateCompileCommand(new File(srcDir, "CSource2.c"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(projectDir, 
-				"src/main/cpp/mex"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppMexObject.new CommandLineComparable(
-				ziggyCppMexObject.generateCompileCommand(new File(srcDir, "CppSource1.cpp"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(projectDir, 
-				"src/main/cpp/mex"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppMexObject.new CommandLineComparable(
-				ziggyCppMexObject.generateCompileCommand(new File(srcDir, "CppSource2.cpp"))));
-		
-		//	then the link command for the dynamic library (and also make sure that 2 of the 4 files
-		//	got removed from the list of object files)
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, 
-				"obj"));
-		List<File> allObjectFiles = ziggyCppMexObject.getObjectFiles();
-		assertEquals(2, allObjectFiles.size());
-		executorCalls.verify(defaultExecutor).execute(ziggyCppMexObject.new CommandLineComparable(
-				ziggyCppMexObject.generateLinkCommand()));
-		
-		//	then the mex commands
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, 
-				"obj"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppMexObject.new CommandLineComparable(
-				ziggyCppMexObject.generateMexCommand(new File(buildDir, "lib/CSource1.mexa64"),
-						new File(buildDir, "obj/CSource1.o"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, 
-				"obj"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppMexObject.new CommandLineComparable(
-				ziggyCppMexObject.generateMexCommand(new File(buildDir, "lib/CppSource2.mexa64"),
-						new File(buildDir, "obj/CppSource2.o"))));		
-		
-	}
-	
-	//	Here are unit tests that exercise various error cases
-	
-	@SuppressWarnings("serial")
-	@Test
-	public void testErrorMexfileMissingSourceFile() {
-		ziggyCppMexObject.setMexfileNames(new ArrayList<String>() {{
-			add("CSource3");
-		}});
-		ziggyCppMexObject.setDefaultExecutor(defaultExecutor);
-		assertThrows("No object file for mexfile CSource3", GradleException.class, () -> {
-		    ziggyCppMexObject.action();
-		});
-	}
-	
-	@Test
-	public void testErrorMexReturnCode() throws ExecuteException, IOException {
-		ziggyCppMexObject.setDefaultExecutor(defaultExecutor);
-		configureLinkerOptions(ziggyCppMexObject);
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.LINUX);
-		File mexfile = new File(buildDir, "lib/CSource1.mexa64");
-		File objFile = new File(buildDir, "obj/CSource1.o");
-		String mexCommand = ziggyCppMexObject.generateMexCommand(mexfile, objFile);
-		when(defaultExecutor.execute(ziggyCppMexObject.new CommandLineComparable(
-				mexCommand))).thenReturn(1);
-		assertThrows("Mexing of file CSource1.mexa64 failed", GradleException.class, () -> {
-		    ziggyCppMexObject.action();
-		});
-	}
-	
-	@Test
-	public void testBadMexSuffix() {
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.WINDOWS);
-		assertThrows(GradleException.class, () -> {
-		    ziggyCppMexObject.mexSuffix();
-		});
-	}
-	
-	@Test
-	public void testBadMatlabArch() {
-		ziggyCppMexObject.setOperatingSystem(OperatingSystem.WINDOWS);
-		assertThrows(GradleException.class, () -> {
-		    ziggyCppMexObject.matlabArch();
-		});
-	}
-	
-	@SuppressWarnings("serial")
-	@Test
-	public void testNoBuildDir() {
-		ZiggyCppMexPojo ziggyCppMexObject = new ZiggyCppMexPojo();
-		ziggyCppMexObject.setMexfileNames(new ArrayList<String>() {{
-			add("CSource1");
-			add("CppSource2");
-		}});
-		assertThrows("buildDir and mexfileNames must not be null", GradleException.class, 
-		    () -> {
-		        ziggyCppMexObject.populateMexfiles();
-		    });
-	}
-	
-	@Test
-	public void testNoMexfiles() {
-		ZiggyCppMexPojo ziggyCppMexObject = new ZiggyCppMexPojo();
-		ziggyCppMexObject.setBuildDir(buildDir);
-		assertThrows("buildDir and mexfileNames must not be null", GradleException.class, 
-		    () -> {
-		        ziggyCppMexObject.populateMexfiles();
-		    });
-	}
-	
+
+    // Here begins the actual test classes
+
+    /**
+     * Tests that the output type setters have no effect on the output type
+     */
+    @Test
+    public void testOutputTypeSetters() {
+        ziggyCppMexObject.setOutputType("executable");
+        assertEquals(ziggyCppMexObject.getOutputType(), BuildType.SHARED);
+        ziggyCppMexObject.setOutputType("static");
+        assertEquals(ziggyCppMexObject.getOutputType(), BuildType.SHARED);
+        ziggyCppMexObject.setOutputType(BuildType.EXECUTABLE);
+        assertEquals(ziggyCppMexObject.getOutputType(), BuildType.SHARED);
+        ziggyCppMexObject.setOutputType(BuildType.STATIC);
+        assertEquals(ziggyCppMexObject.getOutputType(), BuildType.SHARED);
+    }
+
+    /**
+     * Tests the setters and getters that are unique to the ZiggyCppMexPojo (the ones that are
+     * inherited from ZiggyCppPojo are not tested).
+     */
+    @Test
+    public void testSettersAndGetters() {
+
+        // these getter tests implicitly test the setters in createZiggyCppMexPojo():
+        assertEquals(projectDir.getAbsolutePath(),
+            ziggyCppMexObject.getProjectDir().getAbsolutePath());
+        assertEquals("/dev/null/MATLAB_R2017b", ziggyCppMexObject.getMatlabPath());
+        List<String> mexfileNames = ziggyCppMexObject.getMexfileNames();
+        assertEquals(2, mexfileNames.size());
+        assertEquals("CSource1", mexfileNames.get(0));
+        assertEquals("CppSource2", mexfileNames.get(1));
+    }
+
+    /**
+     * Tests the compile command generator, in particular to make certain that the MATLAB include
+     * path and MATLAB_MEX_FILE compiler directive are present
+     */
+    @Test
+    public void testGenerateCompileCommand() {
+
+        String compiler = ZiggyCppPojo.Compiler.CPP.compiler();
+        // test with debug options disabled
+        String compileString = ziggyCppMexObject
+            .generateCompileCommand(new File("/dev/null/dmy1.c"), compiler);
+        String expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/dmy1.o "
+            + "-I" + srcDir.getAbsolutePath() + " -I" + incDir.getAbsolutePath()
+            + " -I/dev/null/MATLAB_R2017b/extern/include -Wall -fPic -DMATLAB_MEX_FILE -O2 -DNDEBUG -g "
+            + "/dev/null/dmy1.c";
+        assertEquals(expectedString, compileString);
+
+        // test with debug options enabled
+        System.setProperty("cppdebug", "true");
+        compileString = ziggyCppMexObject.generateCompileCommand(new File("/dev/null/dmy1.c"),
+            compiler);
+        expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/dmy1.o " + "-I"
+            + srcDir.getAbsolutePath() + " -I" + incDir.getAbsolutePath()
+            + " -I/dev/null/MATLAB_R2017b/extern/include -Wall -fPic -DMATLAB_MEX_FILE -Og -g "
+            + "/dev/null/dmy1.c";
+        assertEquals(expectedString, compileString);
+
+        // test with debug property present but set to false
+        System.setProperty("cppdebug", "false");
+        compileString = ziggyCppMexObject.generateCompileCommand(new File("/dev/null/dmy1.c"),
+            compiler);
+        expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/dmy1.o " + "-I"
+            + srcDir.getAbsolutePath() + " -I" + incDir.getAbsolutePath()
+            + " -I/dev/null/MATLAB_R2017b/extern/include -Wall -fPic -DMATLAB_MEX_FILE -O2 -DNDEBUG -g "
+            + "/dev/null/dmy1.c";
+        assertEquals(expectedString, compileString);
+    }
+
+    @Test
+    public void testGenerateSharedObjectName() {
+        String generatedName = ziggyCppMexObject.generateSharedObjectName();
+        assertEquals("projectDir-src-main-cpp-mex", generatedName);
+    }
+
+    @Test
+    public void testGenerateLinkCommand() {
+        configureLinkerOptions(ziggyCppMexObject);
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.LINUX_INTEL);
+        String linkCommand = ziggyCppMexObject.generateLinkCommand();
+        String expectedCommand = "/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/"
+            + "libdummy.so -L/dummy1/lib -L/dummy2/lib "
+            + "-L/dev/null/MATLAB_R2017b/bin/glnxa64 -shared o1.o o2.o -lhdf5 -lnetcdf -lmex -lmx -lmat ";
+        assertEquals(expectedCommand, linkCommand);
+
+        // now test the library name for empty object name
+        ziggyCppMexObject = createZiggyCppMexPojo();
+        ziggyCppMexObject.setOutputName("");
+        configureLinkerOptions(ziggyCppMexObject);
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.LINUX_INTEL);
+        linkCommand = ziggyCppMexObject.generateLinkCommand();
+        expectedCommand = "/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/"
+            + "libprojectDir-src-main-cpp-mex.so -L/dummy1/lib -L/dummy2/lib "
+            + "-L/dev/null/MATLAB_R2017b/bin/glnxa64 -shared o1.o o2.o -lhdf5 -lnetcdf -lmex -lmx -lmat ";
+        assertEquals(expectedCommand, linkCommand);
+
+        // test for Mac OS
+        ziggyCppMexObject = createZiggyCppMexPojo();
+        configureLinkerOptions(ziggyCppMexObject);
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.MAC_M1);
+        linkCommand = ziggyCppMexObject.generateLinkCommand();
+        expectedCommand = "/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/"
+            + "libdummy.dylib -L/dummy1/lib -L/dummy2/lib "
+            + "-L/dev/null/MATLAB_R2017b/bin/maca64 " + "-shared -install_name "
+            + rootDir.getAbsolutePath() + "/build/lib/libdummy.dylib"
+            + " o1.o o2.o -lhdf5 -lnetcdf -lmex -lmx -lmat ";
+        assertEquals(expectedCommand, linkCommand);
+
+        ziggyCppMexObject = createZiggyCppMexPojo();
+        configureLinkerOptions(ziggyCppMexObject);
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.MAC_INTEL);
+        linkCommand = ziggyCppMexObject.generateLinkCommand();
+        expectedCommand = "/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/"
+            + "libdummy.dylib -L/dummy1/lib -L/dummy2/lib "
+            + "-L/dev/null/MATLAB_R2017b/bin/maci64 " + "-shared -install_name "
+            + rootDir.getAbsolutePath() + "/build/lib/libdummy.dylib"
+            + " o1.o o2.o -lhdf5 -lnetcdf -lmex -lmx -lmat ";
+        assertEquals(expectedCommand, linkCommand);
+    }
+
+    @Test
+    public void testGenerateMexCommand() {
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.LINUX_INTEL);
+        configureLinkerOptions(ziggyCppMexObject);
+        File mexfile = new File(buildDir, "lib/o1.mexmaci64");
+        File objFile = new File(buildDir, "obj/o1.o");
+        String mexCommand = ziggyCppMexObject.generateMexCommand(mexfile, objFile);
+        String expectedCommand = "/dev/null/g++ -o " + mexfile.getAbsolutePath() + " "
+            + objFile.getAbsolutePath() + " -L/dummy1/lib -L/dummy2/lib "
+            + "-L/dev/null/MATLAB_R2017b/bin/glnxa64 -L" + buildDir.getAbsolutePath() + "/lib "
+            + "-lhdf5 -lnetcdf -lmex -lmx -lmat -ldummy -shared";
+        assertEquals(expectedCommand, mexCommand);
+
+        // test for empty library object name
+        ziggyCppMexObject = createZiggyCppMexPojo();
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.LINUX_INTEL);
+        configureLinkerOptions(ziggyCppMexObject);
+        ziggyCppMexObject.setOutputName("");
+        mexCommand = ziggyCppMexObject.generateMexCommand(mexfile, objFile);
+        expectedCommand = "/dev/null/g++ -o " + mexfile.getAbsolutePath() + " "
+            + objFile.getAbsolutePath() + " -L/dummy1/lib -L/dummy2/lib "
+            + "-L/dev/null/MATLAB_R2017b/bin/glnxa64 -L" + buildDir.getAbsolutePath() + "/lib "
+            + "-lhdf5 -lnetcdf -lmex -lmx -lmat -lprojectDir-src-main-cpp-mex -shared";
+        assertEquals(expectedCommand, mexCommand);
+
+        // test for Mac OS
+        ziggyCppMexObject = createZiggyCppMexPojo();
+        configureLinkerOptions(ziggyCppMexObject);
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.MAC_M1);
+        mexCommand = ziggyCppMexObject.generateMexCommand(mexfile, objFile);
+        expectedCommand = "/dev/null/g++ -o " + mexfile.getAbsolutePath() + " "
+            + objFile.getAbsolutePath() + " -L/dummy1/lib -L/dummy2/lib "
+            + "-L/dev/null/MATLAB_R2017b/bin/maca64 -L" + buildDir.getAbsolutePath() + "/lib "
+            + "-lhdf5 -lnetcdf -lmex -lmx -lmat -ldummy -shared";
+        assertEquals(expectedCommand, mexCommand);
+
+        ziggyCppMexObject = createZiggyCppMexPojo();
+        configureLinkerOptions(ziggyCppMexObject);
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.MAC_INTEL);
+        mexCommand = ziggyCppMexObject.generateMexCommand(mexfile, objFile);
+        expectedCommand = "/dev/null/g++ -o " + mexfile.getAbsolutePath() + " "
+            + objFile.getAbsolutePath() + " -L/dummy1/lib -L/dummy2/lib "
+            + "-L/dev/null/MATLAB_R2017b/bin/maci64 -L" + buildDir.getAbsolutePath() + "/lib "
+            + "-lhdf5 -lnetcdf -lmex -lmx -lmat -ldummy -shared";
+        assertEquals(expectedCommand, mexCommand);
+    }
+
+    @Test
+    public void testAction() throws ExecuteException, IOException {
+
+        // set the mocked executor into the object
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.LINUX_INTEL);
+        ziggyCppMexObject.setDefaultExecutor(defaultExecutor);
+        ziggyCppMexObject.setMaxCompileThreads(1);
+        InOrder executorCalls = Mockito.inOrder(defaultExecutor);
+
+        String cppCompiler = ZiggyCppPojo.Compiler.CPP.compiler();
+        String cCompiler = ZiggyCppPojo.Compiler.C.compiler();
+
+        // call the method
+        ziggyCppMexObject.action();
+
+        // check the calls -- first the 4 compile commands
+        executorCalls.verify(defaultExecutor)
+            .setWorkingDirectory(new File(projectDir, "src/main/cpp/mex"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppMexObject.new CommandLineComparable(ziggyCppMexObject
+                .generateCompileCommand(new File(srcDir, "CSource1.c"), cCompiler)));
+        executorCalls.verify(defaultExecutor)
+            .setWorkingDirectory(new File(projectDir, "src/main/cpp/mex"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppMexObject.new CommandLineComparable(ziggyCppMexObject
+                .generateCompileCommand(new File(srcDir, "CSource2.c"), cCompiler)));
+        executorCalls.verify(defaultExecutor)
+            .setWorkingDirectory(new File(projectDir, "src/main/cpp/mex"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppMexObject.new CommandLineComparable(ziggyCppMexObject
+                .generateCompileCommand(new File(srcDir, "CppSource1.cpp"), cppCompiler)));
+        executorCalls.verify(defaultExecutor)
+            .setWorkingDirectory(new File(projectDir, "src/main/cpp/mex"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppMexObject.new CommandLineComparable(ziggyCppMexObject
+                .generateCompileCommand(new File(srcDir, "CppSource2.cpp"), cppCompiler)));
+
+        // then the link command for the dynamic library (and also make sure that 2 of the 4 files
+        // got removed from the list of object files)
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, "obj"));
+        List<File> allObjectFiles = ziggyCppMexObject.getObjectFiles();
+        assertEquals(2, allObjectFiles.size());
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppMexObject.new CommandLineComparable(
+                ziggyCppMexObject.generateLinkCommand()));
+
+        // then the mex commands
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, "obj"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppMexObject.new CommandLineComparable(
+                ziggyCppMexObject.generateMexCommand(new File(buildDir, "mex/CSource1.mexa64"),
+                    new File(buildDir, "obj/CSource1.o"))));
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, "obj"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppMexObject.new CommandLineComparable(
+                ziggyCppMexObject.generateMexCommand(new File(buildDir, "mex/CppSource2.mexa64"),
+                    new File(buildDir, "obj/CppSource2.o"))));
+    }
+
+    // Here are unit tests that exercise various error cases
+
+    @SuppressWarnings("serial")
+    @Test
+    public void testErrorMexfileMissingSourceFile() {
+        ziggyCppMexObject.setMexfileNames(new ArrayList<String>() {
+            {
+                add("CSource3");
+            }
+        });
+        ziggyCppMexObject.setDefaultExecutor(defaultExecutor);
+        assertThrows("No object file for mexfile CSource3", GradleException.class, () -> {
+            ziggyCppMexObject.action();
+        });
+    }
+
+    @Test
+    public void testErrorMexReturnCode() throws ExecuteException, IOException {
+        ziggyCppMexObject.setDefaultExecutor(defaultExecutor);
+        configureLinkerOptions(ziggyCppMexObject);
+        ziggyCppMexObject.setArchitecture(SystemArchitecture.LINUX_INTEL);
+        File mexfile = new File(buildDir, "mex/CSource1.mexa64");
+        File objFile = new File(buildDir, "obj/CSource1.o");
+        String mexCommand = ziggyCppMexObject.generateMexCommand(mexfile, objFile);
+        when(defaultExecutor.execute(ziggyCppMexObject.new CommandLineComparable(mexCommand)))
+            .thenReturn(1);
+        assertThrows("Mexing of file CSource1.mexa64 failed", GradleException.class, () -> {
+            ziggyCppMexObject.action();
+        });
+    }
+
+    @SuppressWarnings("serial")
+    @Test
+    public void testNoBuildDir() {
+        ZiggyCppMexPojo ziggyCppMexObject = new ZiggyCppMexPojo();
+        ziggyCppMexObject.setMexfileNames(new ArrayList<String>() {
+            {
+                add("CSource1");
+                add("CppSource2");
+            }
+        });
+        assertThrows("buildDir and mexfileNames must not be null", GradleException.class, () -> {
+            ziggyCppMexObject.populateMexfiles();
+        });
+    }
+
+    @Test
+    public void testNoMexfiles() {
+        ZiggyCppMexPojo ziggyCppMexObject = new ZiggyCppMexPojo();
+        ziggyCppMexObject.setBuildDir(buildDir);
+        assertThrows("buildDir and mexfileNames must not be null", GradleException.class, () -> {
+            ziggyCppMexObject.populateMexfiles();
+        });
+    }
+
 //***************************************************************************************
-	
-	//	here begins assorted setup and helper methods
-	
-	public void createSourceFiles() throws IOException {
-		
-		//	create 4 temporary "C/C++" files in the source directory
-		new File(srcDir, "CSource1.c").createNewFile();
-		new File(srcDir, "CSource2.c").createNewFile();
-		new File(srcDir, "CppSource1.cpp").createNewFile();
-		new File(srcDir, "CppSource2.cpp").createNewFile();
-		
-		new File(srcDir, "Header1.h").createNewFile();
-		new File(incDir, "Header2.hpp").createNewFile();
-	}
-	
-	@SuppressWarnings("serial")
-	public ZiggyCppMexPojo createZiggyCppMexPojo() {
-		ZiggyCppMexPojo ziggyCppMexObject = new ZiggyCppMexPojo();
-		ziggyCppMexObject.setBuildDir(buildDir);
-		ziggyCppMexObject.setProjectDir(projectDir);
-		ziggyCppMexObject.setRootDir(rootDir);
-		ziggyCppMexObject.setCppCompiler("/dev/null/g++");
-		ziggyCppMexObject.setCppFilePath(srcDir.getAbsolutePath());
-		ziggyCppMexObject.setMatlabPath("/dev/null/MATLAB_R2017b");
-		ziggyCppMexObject.setOutputName("dummy");
-		ziggyCppMexObject.setMexfileNames(new ArrayList<String>() {{
-			add("CSource1");
-			add("CppSource2");
-		}});
-		ziggyCppMexObject.setIncludeFilePaths(new ArrayList<String>() {{
-			add(srcDir.getAbsolutePath());
-			add(incDir.getAbsolutePath());
-		}});
-		ziggyCppMexObject.setCompileOptions(new ArrayList<String>() {{
-			add("Wall");
-			add("fPic");
-		}});
-		ziggyCppMexObject.setReleaseOptimizations(new ArrayList<String>() {{
-			add("O2");
-			add("DNDEBUG");
-			add("g");
-		}});
-		ziggyCppMexObject.setDebugOptimizations(new ArrayList<String>() {{
-			add("Og");
-			add("g");
-		}});
-		return ziggyCppMexObject;
-	}
-
-	public void configureLinkerOptions(ZiggyCppPojo ziggyCppObject) {
-		//	first we need to add some object files
-		File o1 = new File(buildDir, "obj/o1.o");
-		File o2 = new File(buildDir, "obj/o2.o");
-		ziggyCppObject.setObjectFiles(o1);
-		ziggyCppObject.setObjectFiles(o2);
-		
-		//	also some linker options and libraries
-		List<String> linkerOptions = new ArrayList<>();
-		linkerOptions.add("u whatevs");
-		ziggyCppObject.setLinkOptions(linkerOptions);
-		List<String> libraryPathOptions = new ArrayList<>();
-		libraryPathOptions.add("/dummy1/lib");
-		libraryPathOptions.add("/dummy2/lib");
-		ziggyCppObject.setLibraryPaths(libraryPathOptions);
-		List<String> libraryOptions = new ArrayList<>();
-		libraryOptions.add("hdf5");
-		libraryOptions.add("netcdf");
-		ziggyCppObject.setLibraries(libraryOptions);
-	}
+
+    // here begins assorted setup and helper methods
+
+    public void createSourceFiles() throws IOException {
+
+        // create 4 temporary "C/C++" files in the source directory
+        new File(srcDir, "CSource1.c").createNewFile();
+        new File(srcDir, "CSource2.c").createNewFile();
+        new File(srcDir, "CppSource1.cpp").createNewFile();
+        new File(srcDir, "CppSource2.cpp").createNewFile();
+
+        new File(srcDir, "Header1.h").createNewFile();
+        new File(incDir, "Header2.hpp").createNewFile();
+    }
+
+    public ZiggyCppMexPojo createZiggyCppMexPojo() {
+        ZiggyCppMexPojo ziggyCppMexObject = new ZiggyCppMexPojo();
+        ziggyCppMexObject.setBuildDir(buildDir);
+        ziggyCppMexObject.setProjectDir(projectDir);
+        ziggyCppMexObject.setRootDir(rootDir);
+        ZiggyCppPojo.setCppCompiler("/dev/null/g++");
+        ZiggyCppPojo.setCCompiler("/dev/null/gcc");
+        ziggyCppMexObject.setCppFilePath(srcDir.getAbsolutePath());
+        ziggyCppMexObject.setMatlabPath("/dev/null/MATLAB_R2017b");
+        ziggyCppMexObject.setOutputName("dummy");
+        ziggyCppMexObject.setMexfileNames(List.of("CSource1", "CppSource2"));
+        ziggyCppMexObject
+            .setIncludeFilePaths(List.of(srcDir.getAbsolutePath(), incDir.getAbsolutePath()));
+        ziggyCppMexObject.setCppCompileOptions(List.of("-Wall", "-fPic"));
+        ziggyCppMexObject.setReleaseOptimizations(List.of("-O2", "-DNDEBUG", "-g"));
+        ziggyCppMexObject.setDebugOptimizations(List.of("-Og", "-g"));
+        ziggyCppMexObject.setMaxCompileThreads(1);
+        return ziggyCppMexObject;
+    }
+
+    public void configureLinkerOptions(ZiggyCppPojo ziggyCppObject) {
+        // first we need to add some object files
+        File o1 = new File(buildDir, "obj/o1.o");
+        File o2 = new File(buildDir, "obj/o2.o");
+        ziggyCppObject.setObjectFiles(o1);
+        ziggyCppObject.setObjectFiles(o2);
+
+        // also some linker options and libraries
+        List<String> linkerOptions = new ArrayList<>();
+        linkerOptions.add("-u whatevs");
+        ziggyCppObject.setLinkOptions(linkerOptions);
+        List<String> libraryPathOptions = new ArrayList<>();
+        libraryPathOptions.add("/dummy1/lib");
+        libraryPathOptions.add("/dummy2/lib");
+        ziggyCppObject.setLibraryPaths(libraryPathOptions);
+        List<String> libraryOptions = new ArrayList<>();
+        libraryOptions.add("hdf5");
+        libraryOptions.add("netcdf");
+        ziggyCppObject.setLibraries(libraryOptions);
+    }
 }
diff --git a/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/ZiggyCppPojoTest.java b/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/ZiggyCppPojoTest.java
index dfcddef..57087af 100644
--- a/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/ZiggyCppPojoTest.java
+++ b/buildSrc/src/test/java/gov/nasa/ziggy/buildutil/ZiggyCppPojoTest.java
@@ -1,5 +1,12 @@
 package gov.nasa.ziggy.buildutil;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -9,6 +16,7 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.exec.CommandLine;
@@ -16,751 +24,837 @@
 import org.apache.commons.exec.ExecuteException;
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.GradleException;
-import org.gradle.internal.os.OperatingSystem;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertThrows;
-
-import gov.nasa.ziggy.buildutil.ZiggyCppPojo;
 import gov.nasa.ziggy.buildutil.ZiggyCppPojo.BuildType;
 
 /**
- * Unit test class for ZiggyCppPojo class. 
- * @author PT
+ * Unit test class for ZiggyCppPojo class.
  *
+ * @author PT
  */
 public class ZiggyCppPojoTest {
 
-	File tempDir = null;
-	File buildDir = null;
-	File srcDir = null;
-	File rootDir = new File("/dev/null/rootDir");
-	ZiggyCppPojo ziggyCppObject;
-	
-	DefaultExecutor defaultExecutor = Mockito.mock(DefaultExecutor.class);
-	
-	@Before
-	public void before() throws IOException {
-		
-		//	create a temporary directory for everything
-		tempDir = Files.createTempDirectory("ZiggyCpp").toFile();
-		tempDir.deleteOnExit();
-		
-		//	directory for includes
-		new File(tempDir, "include").mkdir();
-		
-		//	directory for source
-		srcDir = new File(tempDir, "src");
-		srcDir.mkdir();
-		
-		//	build directory
-		buildDir = new File(tempDir,"build");
-		
-		//	directory for libraries
-		new File(buildDir,"lib").mkdir();
-		
-		//	directory for includes
-		new File(buildDir, "include").mkdir();
-		
-		//	directory for built source
-		new File(buildDir, "src").mkdir();
-		
-		//	directory for objects
-		new File(buildDir, "obj").mkdir();
-		
-		//	directory for executables
-		new File(buildDir, "bin").mkdir();
-		
-		//	create C++ source and header files
-		createSourceFiles();
-		
-		//	create the ZiggyCpp object
-		ziggyCppObject = createZiggyCppObject(buildDir);
-		
-	}
-	
-	@After
-	public void after() throws IOException {
-		
-		//	explicitly delete the temp directory
-		FileUtils.deleteDirectory(tempDir);
-		
-		//	delete any cppdebug system properties
-		System.clearProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME);
-		
-		//	delete the ZiggyCpp object
-		ziggyCppObject = null;
-		buildDir = null;
-		tempDir = null;
-	}
-		
+    File tempDir = null;
+    File buildDir = null;
+    File srcDir = null;
+    File rootDir = new File("/dev/null/rootDir");
+    ZiggyCppPojo ziggyCppObject;
+
+    DefaultExecutor defaultExecutor = Mockito.mock(DefaultExecutor.class);
+
+    @Before
+    public void before() throws IOException {
+
+        // create a temporary directory for everything
+        tempDir = Files.createTempDirectory("ZiggyCpp").toFile();
+        tempDir.deleteOnExit();
+
+        // directory for includes
+        new File(tempDir, "include").mkdir();
+
+        // directory for source
+        srcDir = new File(tempDir, "src");
+        srcDir.mkdir();
+
+        // build directory
+        buildDir = new File(tempDir, "build");
+
+        // directory for libraries
+        new File(buildDir, "lib").mkdir();
+
+        // directory for includes
+        new File(buildDir, "include").mkdir();
+
+        // directory for built source
+        new File(buildDir, "src").mkdir();
+
+        // directory for objects
+        new File(buildDir, "obj").mkdir();
+
+        // directory for executables
+        new File(buildDir, "bin").mkdir();
+
+        // create C++ source and header files
+        createSourceFiles();
+
+        // create the ZiggyCpp object
+        ziggyCppObject = createZiggyCppObject(buildDir);
+    }
+
+    @After
+    public void after() throws IOException {
+
+        // explicitly delete the temp directory
+        FileUtils.deleteDirectory(tempDir);
+
+        // delete any cppdebug system properties
+        System.clearProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME);
+
+        // delete the ZiggyCpp object
+        ziggyCppObject = null;
+        buildDir = null;
+        tempDir = null;
+    }
+
 //***************************************************************************************
-	
-	//	here begins the test methods
-	
-	/**
-	 * Tests all getter and setter methods.  
-	 * @throws InvocationTargetException 
-	 * @throws IllegalArgumentException 
-	 * @throws IllegalAccessException 
-	 * @throws NoSuchMethodException 
-	 */
-	@Test
-	public void getterSetterTest() throws NoSuchMethodException, IllegalAccessException, 
-		IllegalArgumentException, InvocationTargetException {
-		
-		List<String> dummyArguments = new ArrayList<>();
-		dummyArguments.add("DuMMY");
-		dummyArguments.add("dUmMy");
-		assertEquals(tempDir.getAbsolutePath() + "/src", ziggyCppObject.getCppFilePaths().get(0));
-		
-		testStringListSettersAndGetters("IncludeFilePaths", new String[] {
-				tempDir.getAbsolutePath() + "/src", 
-				tempDir.getAbsolutePath() + "/include"});
-		testStringListSettersAndGetters("CompileOptions", new String[] {
-				"Wall", "fPic"});
-		testStringListSettersAndGetters("ReleaseOptimizations", new String[] {
-				"O2", "DNDEBUG", "g"});
-		testStringListSettersAndGetters("DebugOptimizations", new String[] {
-				"Og", "g"});
-		ziggyCppObject.setLibraries(dummyArguments);
-		testStringListSettersAndGetters("Libraries", new String[]{"DuMMY", "dUmMy"});
-		ziggyCppObject.setLibraryPaths(dummyArguments);
-		testStringListSettersAndGetters("LibraryPaths", new String[]{"DuMMY", "dUmMy"});
-		ziggyCppObject.setLinkOptions(dummyArguments);
-		testStringListSettersAndGetters("LinkOptions", new String[]{"DuMMY", "dUmMy"});
-		
-		ziggyCppObject.setOutputName("outputName");
-		assertEquals("outputName", ziggyCppObject.getOutputName());
-		
-		ziggyCppObject.setOutputType(BuildType.EXECUTABLE);
-		assertEquals(BuildType.EXECUTABLE, ziggyCppObject.getOutputType());
-		ziggyCppObject.setOutputType("executable");
-		assertEquals(BuildType.EXECUTABLE, ziggyCppObject.getOutputType());
-		
-		ziggyCppObject.setOutputType(BuildType.SHARED);
-		assertEquals(BuildType.SHARED, ziggyCppObject.getOutputType());
-		ziggyCppObject.setOutputType("shared");
-		assertEquals(BuildType.SHARED, ziggyCppObject.getOutputType());
-		
-		ziggyCppObject.setOutputType(BuildType.STATIC);
-		assertEquals(BuildType.STATIC, ziggyCppObject.getOutputType());
-		ziggyCppObject.setOutputType("static");
-		assertEquals(BuildType.STATIC, ziggyCppObject.getOutputType());
-
-		assertEquals(buildDir, ziggyCppObject.getBuildDir());
-		assertEquals(buildDir.getAbsolutePath(), ziggyCppObject.getBuildDir().getAbsolutePath());
-		
-	}
-	
-	/**
-	 * Tests the ability to find C/C++ source files in the source directory and add them to
-	 * the ZiggyCppPojo as a list of File objects
-	 */
-	@Test
-	public void testGetCppFiles() {
-		List<File> cppFiles = ziggyCppObject.getCppFiles();
-		assertEquals(2, cppFiles.size());
-		List<String> cppFilePaths = cppFiles.stream().map(s -> s.getAbsolutePath())
-				.collect(Collectors.toList());
-		assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/ZiggyCppMain.cpp"));
-		assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/GetString.cpp"));
-		
-		cppFiles = ziggyCppObject.getCppFiles();
-		assertEquals(2, cppFiles.size());
-		cppFilePaths = cppFiles.stream().map(s -> s.getAbsolutePath())
-				.collect(Collectors.toList());
-		assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/ZiggyCppMain.cpp"));
-		assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/GetString.cpp"));
-	}
-	
-	@Test
-	public void testGetCppFilesMultipleDirectories() throws FileNotFoundException {
-		
-		//	put a source directory in build, and populate it
-		new File(buildDir, "src/cpp").mkdirs();
-		createAdditionalSource();
-		
-		//	create the list of directories to check out
-		List<Object> cppPaths = new ArrayList<>();
-		cppPaths.add(tempDir.toString() + "/src");
-		cppPaths.add(buildDir.toString() + "/src/cpp");
-		ziggyCppObject.setCppFilePaths(cppPaths);
-		List<File> cppFiles = ziggyCppObject.getCppFiles();
-		int nFiles = cppFiles.size();
-		assertEquals(3, nFiles);
-		
-		List<String> cppFilePaths = cppFiles.stream().map(s -> s.getAbsolutePath())
-				.collect(Collectors.toList());
-		assertTrue(cppFilePaths.contains(buildDir.getAbsolutePath() + "/src/cpp/GetAnotherString.cpp"));
-		assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/ZiggyCppMain.cpp"));
-		assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/GetString.cpp"));
-	}
-	
-	/**
-	 * Tests the argListToString method, which converts a list of arguments to a string, with a common
-	 * prefix added to each list element
-	 */
-	@Test
-	public void argListToStringTest() {
-		String compileOptionString = ziggyCppObject.argListToString(ziggyCppObject.getCompileOptions(), 
-				"-");
-		assertEquals("-Wall -fPic ", compileOptionString);
-	}
-	
-	/**
-	 * Tests the code that determines the File that is to be the output of the compile and link
-	 * process. 
-	 */
-	@Test
-	public void populateBuiltFileTest() {
-		
-		//	executable
-		ziggyCppObject.setOutputType("executable");
-		File builtFile = ziggyCppObject.getBuiltFile();
-		assertEquals(buildDir.getAbsolutePath() + "/bin/dummy", builtFile.getAbsolutePath());
-		
-		//	shared library
-		ZiggyCppPojo ziggyCppShared = createZiggyCppObject(buildDir);
-		ziggyCppShared.setOutputType("shared");
-		ziggyCppShared.setOperatingSystem(OperatingSystem.MAC_OS);
-		builtFile = ziggyCppShared.getBuiltFile();
-		String builtFilePath = builtFile.getAbsolutePath();
-		String sharedObjectFileType = ".dylib";
-		assertEquals(buildDir.getAbsolutePath() + "/lib/libdummy" + sharedObjectFileType, builtFilePath);
-		ziggyCppShared = createZiggyCppObject(buildDir);
-		ziggyCppShared.setOutputType("shared");
-		ziggyCppShared.setOperatingSystem(OperatingSystem.LINUX);
-		builtFile = ziggyCppShared.getBuiltFile();
-		builtFilePath = builtFile.getAbsolutePath();
-		sharedObjectFileType = ".so";
-		assertEquals(buildDir.getAbsolutePath() + "/lib/libdummy" + sharedObjectFileType, builtFilePath);
-		
-		//	static library
-		ZiggyCppPojo ziggyCppStatic = createZiggyCppObject(buildDir);
-		ziggyCppStatic.setOutputType("static");
-		builtFile = ziggyCppStatic.getBuiltFile();
-		builtFilePath = builtFile.getAbsolutePath();
-		assertEquals(buildDir.getAbsolutePath() + "/lib/libdummy.a", builtFilePath);
-	}
-	
-	/**
-	 * Tests the process of converting a source File to an object file name (with the 
-	 * path of the former stripped away).
-	 */
-	@Test
-	public void objectNameFromSourceFileTest() {
-		File f1 = new File("/tmp/dummy/s1.c");
-		String s1 = ZiggyCppPojo.objectNameFromSourceFile(f1);
-		assertEquals("s1.o", s1);
-		File f2 = new File("/tmp/dummy/s1.cpp");
-		String s2 = ZiggyCppPojo.objectNameFromSourceFile(f2);
-		assertEquals("s1.o", s2);
-	}
-	
-	/**
-	 * Tests the method that generates compile commands.
-	 */
-	@Test
-	public void generateCompileCommandTest() {
-		File f1 = new File("/tmp/dummy/s1.c");
-		String compileCommand = ziggyCppObject.generateCompileCommand(f1);
-		String expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/s1.o "
-				+ "-I" + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath() + 
-				"/include -Wall -fPic -O2 -DNDEBUG -g /tmp/dummy/s1.c";
-		assertEquals(expectedString, compileCommand);
-		
-		//	set up for debugging
-		System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "true");
-		compileCommand = ziggyCppObject.generateCompileCommand(f1);
-		expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/s1.o "
-				+ "-I" + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath() + 
-				"/include -Wall -fPic -Og -g /tmp/dummy/s1.c";
-		assertEquals(expectedString, compileCommand);
-		
-		//	have the debugging property but set to false
-		System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "false");
-		compileCommand = ziggyCppObject.generateCompileCommand(f1);
-		expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/s1.o "
-				+ "-I" + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath() + 
-				"/include -Wall -fPic -O2 -DNDEBUG -g /tmp/dummy/s1.c";
-		assertEquals(expectedString, compileCommand);	
-		
-		//	test .cpp file type
-		f1 = new File("/tmp/dummy/s1.cpp");
-		compileCommand = ziggyCppObject.generateCompileCommand(f1);
-		expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/s1.o "
-				+ "-I" + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath() + 
-				"/include -Wall -fPic -O2 -DNDEBUG -g /tmp/dummy/s1.cpp";
-		assertEquals(expectedString, compileCommand);	
-	}
-	
-	/**
-	 * Tests the method that generates link commands. 
-	 */
-	@Test
-	public void generateLinkCommandTest() {
-		
-		configureLinkerOptions(ziggyCppObject);
-		ziggyCppObject.setOutputType("executable");
-		String linkString = ziggyCppObject.generateLinkCommand();
-		assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/bin/dummy -L/dummy1/lib -L/dummy2/lib "
-				+ "-u whatevs -O2 -DNDEBUG -g o1.o o2.o -lhdf5 -lnetcdf ", linkString);
-		
-		//	now try it with debug enabled
-		System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "true");
-		linkString = ziggyCppObject.generateLinkCommand();
-		assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/bin/dummy -L/dummy1/lib -L/dummy2/lib "
-				+ "-u whatevs -Og -g o1.o o2.o -lhdf5 -lnetcdf ", linkString);		
-		System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "false");
-		
-		
-		//	Now for a shared object library
-		ziggyCppObject = createZiggyCppObject(buildDir);
-		configureLinkerOptions(ziggyCppObject);
-		ziggyCppObject.setOutputType("shared");
-		ziggyCppObject.setOperatingSystem(OperatingSystem.LINUX);
-		String sharedObjectFileType = ".so";
-		linkString = ziggyCppObject.generateLinkCommand();
-		assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/libdummy" + sharedObjectFileType
-				+ " -L/dummy1/lib -L/dummy2/lib -shared"
-				+ " o1.o o2.o -lhdf5 -lnetcdf ", linkString);
-		
-		//	For a Mac, there has to be an install name as well
-		ziggyCppObject = createZiggyCppObject(buildDir);
-		configureLinkerOptions(ziggyCppObject);
-		ziggyCppObject.setOutputType("shared");
-		ziggyCppObject.setOperatingSystem(OperatingSystem.MAC_OS);
-		sharedObjectFileType = ".dylib";
-		linkString = ziggyCppObject.generateLinkCommand();
-		assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/libdummy" + sharedObjectFileType
-				+ " -L/dummy1/lib -L/dummy2/lib -shared"
-				+ " -install_name /dev/null/rootDir/build/lib/libdummy.dylib "
-				+ "o1.o o2.o -lhdf5 -lnetcdf ", linkString);
-		
-		//	debug enabled shouldn't do anything
-		System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "true");
-		linkString = ziggyCppObject.generateLinkCommand();
-		assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/libdummy" + sharedObjectFileType
-				+ " -L/dummy1/lib -L/dummy2/lib -shared"
-				+ " -install_name /dev/null/rootDir/build/lib/libdummy.dylib "
-				+ "o1.o o2.o -lhdf5 -lnetcdf ", linkString);
-		System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "false");
-		
-		//	static library case
-		ziggyCppObject = createZiggyCppObject(buildDir);
-		configureLinkerOptions(ziggyCppObject);
-		ziggyCppObject.setOutputType("static");
-		linkString = ziggyCppObject.generateLinkCommand();
-		assertEquals("ar rs " + buildDir.getAbsolutePath() + "/lib/libdummy.a o1.o o2.o ", linkString);
-		
-		//	debug enabled shouldn't do anything
-		System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "true");
-		linkString = ziggyCppObject.generateLinkCommand();
-		assertEquals("ar rs " + buildDir.getAbsolutePath() + "/lib/libdummy.a o1.o o2.o ", linkString);
-		System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "false");
-		
-	}
-	
-	/**
-	 * Tests the method that executes the main action (compiles and links).
-	 * @throws ExecuteException
-	 * @throws IOException
-	 */
-	@Test
-	public void actionTest() throws ExecuteException, IOException {
-		
-		//	set values for the ZiggyCppPojo 
-		ziggyCppObject.setOutputName("testOutput");
-		ziggyCppObject.setOutputType("executable");
-		
-		//	set the mocked executor into the object
-		ziggyCppObject.setDefaultExecutor(defaultExecutor);
-		InOrder executorCalls = Mockito.inOrder(defaultExecutor);
-		
-		//	call the method
-		ziggyCppObject.action();
-		
-		//	check the calls to the executor and their order
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppObject.new CommandLineComparable(
-				ziggyCppObject.generateCompileCommand(new File(srcDir, "GetString.cpp"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppObject.new CommandLineComparable(
-				ziggyCppObject.generateCompileCommand(new File(srcDir, "ZiggyCppMain.cpp"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, "obj"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppObject.new CommandLineComparable(
-				ziggyCppObject.generateLinkCommand()));
-		
-		//	test that the include files were copied
-		File buildInclude = new File(buildDir, "include");
-		File buildInclude1 = new File(buildInclude, "ZiggyCppMain.h");
-		assertTrue(buildInclude1.exists());
-		File buildInclude2 = new File(buildInclude, "ZiggyCppLib.h");
-		assertTrue(buildInclude2.exists());
-
-		
-		//	create a new object for linking a shared object
-		ziggyCppObject = createZiggyCppObject(buildDir);
-		ziggyCppObject.setOutputName("testOutput");
-		ziggyCppObject.setOutputType("shared");
-		ziggyCppObject.setDefaultExecutor(defaultExecutor);
-		ziggyCppObject.action();
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppObject.new CommandLineComparable(
-				ziggyCppObject.generateCompileCommand(new File(srcDir, "GetString.cpp"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppObject.new CommandLineComparable(
-				ziggyCppObject.generateCompileCommand(new File(srcDir, "ZiggyCppMain.cpp"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, "obj"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppObject.new CommandLineComparable(
-				ziggyCppObject.generateLinkCommand()));
-		
-		//	and once more for a static library
-		//	create a new object for linking a shared object
-		ziggyCppObject = createZiggyCppObject(buildDir);
-		ziggyCppObject.setOutputName("testOutput");
-		ziggyCppObject.setOutputType("static");
-		ziggyCppObject.setDefaultExecutor(defaultExecutor);
-		ziggyCppObject.action();
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppObject.new CommandLineComparable(
-				ziggyCppObject.generateCompileCommand(new File(srcDir, "GetString.cpp"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppObject.new CommandLineComparable(
-				ziggyCppObject.generateCompileCommand(new File(srcDir, "ZiggyCppMain.cpp"))));
-		executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, "obj"));
-		executorCalls.verify(defaultExecutor).execute(ziggyCppObject.new CommandLineComparable(
-				ziggyCppObject.generateLinkCommand()));
-		
-	}
-	
-	//	The following tests exercise various error conditions that return GradleExceptions. There are 2 error
-	//	conditions that are not tested by these methods, they occur when the DefaultExecutor throws an IOException. 
-	//	These cases are considered sufficiently trivial that we omit them. 
-	
-	/**
-	 * Tests that a null value for the C++ file path produces the correct error. 
-	 */
-	@Test
-	public void testCppFilePathNullError() {
-		ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
-		assertThrows("C++ file path is null", GradleException.class, () -> {
-		    ziggyCppError.getCppFiles();		
-		});
-	}
-	
-	/**
-	 * Tests that a nonexistent C++ file path produces the correct warning message. 
-	 */
-	@Test
-	public void testCppFilePathDoesNotExist() {
-		ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
-		ziggyCppError.setCppFilePath("/this/path/does/not/exist");
-		ziggyCppError.getCppFiles();
-		List<String> w = ziggyCppError.loggerWarnings();
-		assertTrue(w.size() > 0);
-		assertTrue(w.contains("C++ file path /this/path/does/not/exist does not exist"));
-	}
-	
-	/**
-	 * Tests that a missing output name produces the correct error.
-	 */
-	@Test
-	public void testErrorNoOutputName() {
-		ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
-		ziggyCppError.setCppFilePath(tempDir.getAbsolutePath() + "/src");
-		ziggyCppError.setBuildDir(buildDir);
-		ziggyCppError.setOutputType("executable");
-		assertThrows("Both output name and output type must be specified", GradleException.class, 
-		    () -> {
-		        ziggyCppError.getBuiltFile();
-		    });
-	}
-	
-	/**
-	 * Tests that a missing output type produces the correct error. 
-	 */
-	@Test
-	public void testErrorNoOutputType() {
-		ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
-		ziggyCppError.setCppFilePath(tempDir.getAbsolutePath() + "/src");
-		ziggyCppError.setBuildDir(buildDir);
-		ziggyCppError.setOutputName("dummy");
-		assertThrows("Both output name and output type must be specified", GradleException.class, 
-		    () -> {
-		        ziggyCppError.getBuiltFile();
-		    });
-	}
-
-	/**
-	 * Tests that missing both the output type and the built file name produces the correct error. 
-	 */
-	@Test
-	public void testErrorNoOutputTypeOrName() {
-		ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
-		List<String> cppPaths = new ArrayList<>();
-		ziggyCppError.setCppFilePath(tempDir.getAbsolutePath() + "/src");
-		ziggyCppError.setBuildDir(buildDir);
-		assertThrows("Both output name and output type must be specified", GradleException.class, 
-		    () -> {
-		        ziggyCppError.getBuiltFile();
-		    });
-	}
-	
-	/**
-	 * Tests that a non-zero compiler return value produces the correct error. 
-	 * @throws ExecuteException
-	 * @throws IOException
-	 */
-	@Test
-	public void testCompilerError() throws ExecuteException, IOException {
-		ziggyCppObject.setOutputType("executable");
-		ziggyCppObject.setDefaultExecutor(defaultExecutor);
-		when(defaultExecutor.execute(any(CommandLine.class))).thenReturn(1);
-		assertThrows("Compilation of file GetString.cpp failed", GradleException.class, 
-		    () -> {
-		        ziggyCppObject.action();
-		    });
-	}
-	
-	/**
-	 * Tests that a non-zero linker return value produces the correct error. 
-	 * @throws ExecuteException
-	 * @throws IOException
-	 */
-	@Test
-	public void testLinkerError() throws ExecuteException, IOException {
-		ziggyCppObject.setOutputType("executable");
-		ziggyCppObject.setDefaultExecutor(defaultExecutor);
-		String linkerCommand = ziggyCppObject.generateLinkCommand() + "GetString.o ZiggyCppMain.o ";
-		when(defaultExecutor.execute(ziggyCppObject.new CommandLineComparable(linkerCommand))).thenReturn(1);
-		assertThrows("Link / library construction of dummy failed", GradleException.class, 
-		    () -> {
-		        ziggyCppObject.action();
-		    });
-	}
-	
-	/**
-	 * Test that an invalid OS produces the correct error. 
-	 */
-	@Test
-	public void testInvalidOsError() {
-		ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
-		ziggyCppError.setBuildDir(buildDir);
-		ziggyCppError.setOperatingSystem(OperatingSystem.WINDOWS);
-		ziggyCppError.setOutputName("dummy");
-		ziggyCppError.setOutputType("shared");
-		assertThrows("ZiggyCpp class does not support OS " + ziggyCppError.getOperatingSystem().getName(),
-		    GradleException.class, () -> {
-		        ziggyCppError.getBuiltFile();
-		    });
-	}
+
+    // here begins the test methods
+
+    /**
+     * Tests all getter and setter methods.
+     *
+     * @throws InvocationTargetException
+     * @throws IllegalArgumentException
+     * @throws IllegalAccessException
+     * @throws NoSuchMethodException
+     */
+    @Test
+    public void getterSetterTest() throws NoSuchMethodException, IllegalAccessException,
+        IllegalArgumentException, InvocationTargetException {
+
+        List<String> dummyArguments = new ArrayList<>();
+        dummyArguments.add("DuMMY");
+        dummyArguments.add("dUmMy");
+        dummyArguments.add("");
+        assertEquals(tempDir.getAbsolutePath() + "/src", ziggyCppObject.getCppFilePaths().get(0));
+
+        testStringListSettersAndGetters("IncludeFilePaths", new String[] {
+            tempDir.getAbsolutePath() + "/src", tempDir.getAbsolutePath() + "/include" });
+        testStringListSettersAndGetters("CppCompileOptions", new String[] { "-Wall", "-fPic" });
+        testStringListSettersAndGetters("CCompileOptions", new String[] { "-fPic" });
+        testStringListSettersAndGetters("ReleaseOptimizations",
+            new String[] { "-O2", "-DNDEBUG", "-g" });
+        testStringListSettersAndGetters("DebugOptimizations", new String[] { "-Og", "-g" });
+        ziggyCppObject.setLibraries(dummyArguments);
+        testStringListSettersAndGetters("Libraries", new String[] { "DuMMY", "dUmMy" });
+        ziggyCppObject.setLibraryPaths(dummyArguments);
+        testStringListSettersAndGetters("LibraryPaths", new String[] { "DuMMY", "dUmMy" });
+        ziggyCppObject.setLinkOptions(dummyArguments);
+        testStringListSettersAndGetters("LinkOptions", new String[] { "DuMMY", "dUmMy" });
+
+        ziggyCppObject.setOutputName("outputName");
+        assertEquals("outputName", ziggyCppObject.getOutputName());
+
+        ziggyCppObject.setOutputType(BuildType.EXECUTABLE);
+        assertEquals(BuildType.EXECUTABLE, ziggyCppObject.getOutputType());
+        ziggyCppObject.setOutputType("executable");
+        assertEquals(BuildType.EXECUTABLE, ziggyCppObject.getOutputType());
+
+        ziggyCppObject.setOutputType(BuildType.SHARED);
+        assertEquals(BuildType.SHARED, ziggyCppObject.getOutputType());
+        ziggyCppObject.setOutputType("shared");
+        assertEquals(BuildType.SHARED, ziggyCppObject.getOutputType());
+
+        ziggyCppObject.setOutputType(BuildType.STATIC);
+        assertEquals(BuildType.STATIC, ziggyCppObject.getOutputType());
+        ziggyCppObject.setOutputType("static");
+        assertEquals(BuildType.STATIC, ziggyCppObject.getOutputType());
+
+        assertEquals(buildDir, ziggyCppObject.getBuildDir());
+        assertEquals(buildDir.getAbsolutePath(), ziggyCppObject.getBuildDir().getAbsolutePath());
+    }
+
+    /**
+     * Tests the ability to find C/C++ source files in the source directory and add them to the
+     * ZiggyCppPojo as a list of File objects
+     */
+    @Test
+    public void testGetCppFiles() {
+        List<File> cppFiles = ziggyCppObject.getSourceFiles();
+        assertEquals(3, cppFiles.size());
+        List<String> cppFilePaths = cppFiles.stream()
+            .map(File::getAbsolutePath)
+            .collect(Collectors.toList());
+        assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/ZiggyCppMain.cpp"));
+        assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/GetString.cpp"));
+        assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/ZiggyCModule.c"));
+
+        // Now check that the compiler choices are set correctly.
+        Map<File, String> sourceFilesWithCompiler = ziggyCppObject.getCppFiles();
+        String cppCompiler = ZiggyCppPojo.Compiler.CPP.compiler();
+        String cCompiler = ZiggyCppPojo.Compiler.C.compiler();
+        assertEquals(cppCompiler, sourceFilesWithCompiler
+            .get(new File(tempDir.getAbsolutePath(), "/src/ZiggyCppMain.cpp")));
+        assertEquals(cppCompiler,
+            sourceFilesWithCompiler.get(new File(tempDir.getAbsolutePath(), "/src/GetString.cpp")));
+        assertEquals(cCompiler, sourceFilesWithCompiler
+            .get(new File(tempDir.getAbsolutePath(), "/src/ZiggyCModule.c")));
+    }
+
+    @Test
+    public void testGetCppFilesMultipleDirectories() throws FileNotFoundException {
+
+        // put a source directory in build, and populate it
+        new File(buildDir, "src/cpp").mkdirs();
+        createAdditionalSource();
+
+        // create the list of directories to check out
+        List<Object> cppPaths = new ArrayList<>();
+        cppPaths.add(tempDir.toString() + "/src");
+        cppPaths.add(buildDir.toString() + "/src/cpp");
+        ziggyCppObject.setCppFilePaths(cppPaths);
+        List<File> cppFiles = ziggyCppObject.getSourceFiles();
+        int nFiles = cppFiles.size();
+        assertEquals(4, nFiles);
+
+        List<String> cppFilePaths = cppFiles.stream()
+            .map(File::getAbsolutePath)
+            .collect(Collectors.toList());
+        assertTrue(
+            cppFilePaths.contains(buildDir.getAbsolutePath() + "/src/cpp/GetAnotherString.cpp"));
+        assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/ZiggyCppMain.cpp"));
+        assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/GetString.cpp"));
+        assertTrue(cppFilePaths.contains(tempDir.getAbsolutePath() + "/src/ZiggyCModule.c"));
+    }
+
+    /**
+     * Tests the argListToString method, which converts a list of arguments to a string, with a
+     * common prefix added to each list element
+     */
+    @Test
+    public void testArgListToString() {
+        String compileOptionString = ziggyCppObject
+            .argListToString(ziggyCppObject.getCppCompileOptions(), "");
+        assertEquals("-Wall -fPic ", compileOptionString);
+    }
+
+    /**
+     * Tests the code that determines the File that is to be the output of the compile and link
+     * process.
+     */
+    @Test
+    public void testPopulateBuiltFile() {
+
+        // executable
+        ziggyCppObject.setOutputType("executable");
+        File builtFile = ziggyCppObject.getBuiltFile();
+        assertEquals(buildDir.getAbsolutePath() + "/bin/dummy", builtFile.getAbsolutePath());
+
+        // shared library
+        ZiggyCppPojo ziggyCppShared = createZiggyCppObject(buildDir);
+        ziggyCppShared.setOutputType("shared");
+        ziggyCppShared.setArchitecture(SystemArchitecture.MAC_INTEL);
+        builtFile = ziggyCppShared.getBuiltFile();
+        String builtFilePath = builtFile.getAbsolutePath();
+        String sharedObjectFileType = ".dylib";
+        assertEquals(buildDir.getAbsolutePath() + "/lib/libdummy" + sharedObjectFileType,
+            builtFilePath);
+        ziggyCppShared = createZiggyCppObject(buildDir);
+        ziggyCppShared.setOutputType("shared");
+        ziggyCppShared.setArchitecture(SystemArchitecture.LINUX_INTEL);
+        builtFile = ziggyCppShared.getBuiltFile();
+        builtFilePath = builtFile.getAbsolutePath();
+        sharedObjectFileType = ".so";
+        assertEquals(buildDir.getAbsolutePath() + "/lib/libdummy" + sharedObjectFileType,
+            builtFilePath);
+
+        // static library
+        ZiggyCppPojo ziggyCppStatic = createZiggyCppObject(buildDir);
+        ziggyCppStatic.setOutputType("static");
+        builtFile = ziggyCppStatic.getBuiltFile();
+        builtFilePath = builtFile.getAbsolutePath();
+        assertEquals(buildDir.getAbsolutePath() + "/lib/libdummy.a", builtFilePath);
+
+        // Now with a user-specified output directory
+        ziggyCppObject.setOutputDir("foo");
+        builtFile = ziggyCppObject.getBuiltFile();
+        assertEquals(System.getProperty("user.dir") + "/foo/dummy", builtFile.getAbsolutePath());
+
+        ziggyCppShared.setOutputDir("foo");
+        builtFile = ziggyCppShared.getBuiltFile();
+        assertEquals(System.getProperty("user.dir") + "/foo/libdummy.so",
+            builtFile.getAbsolutePath());
+
+        ziggyCppStatic.setOutputDir("foo");
+        builtFile = ziggyCppStatic.getBuiltFile();
+        assertEquals(System.getProperty("user.dir") + "/foo/libdummy.a",
+            builtFile.getAbsolutePath());
+
+        // Now with a user-specified output directory parent
+        ziggyCppObject.setOutputDir("");
+        ziggyCppObject.setOutputDirParent("foo");
+        builtFile = ziggyCppObject.getBuiltFile();
+        assertEquals(System.getProperty("user.dir") + "/foo/bin/dummy",
+            builtFile.getAbsolutePath());
+
+        ziggyCppShared.setOutputDir("");
+        ziggyCppShared.setOutputDirParent("foo");
+        builtFile = ziggyCppShared.getBuiltFile();
+        assertEquals(System.getProperty("user.dir") + "/foo/lib/libdummy.so",
+            builtFile.getAbsolutePath());
+
+        ziggyCppStatic.setOutputDir("");
+        ziggyCppStatic.setOutputDirParent("foo");
+        builtFile = ziggyCppStatic.getBuiltFile();
+        assertEquals(System.getProperty("user.dir") + "/foo/lib/libdummy.a",
+            builtFile.getAbsolutePath());
+    }
+
+    /**
+     * Tests the process of converting a source File to an object file name (with the path of the
+     * former stripped away).
+     */
+    @Test
+    public void testObjectNameFromSourceFile() {
+        File f1 = new File("/tmp/dummy/s1.c");
+        String s1 = ZiggyCppPojo.objectNameFromSourceFile(f1);
+        assertEquals("s1.o", s1);
+        File f2 = new File("/tmp/dummy/s1.cpp");
+        String s2 = ZiggyCppPojo.objectNameFromSourceFile(f2);
+        assertEquals("s1.o", s2);
+    }
+
+    /**
+     * Tests the method that generates compile commands.
+     */
+    @Test
+    public void testGenerateCompileCommand() {
+        File f1 = new File("/tmp/dummy/s1.c");
+
+        // This is a stupid way to get my map entry, but it's the way that works with Java,
+        // so here we are.
+        String compiler = ZiggyCppPojo.Compiler.CPP.compiler();
+        String compileCommand = ziggyCppObject.generateCompileCommand(f1, compiler, null, null);
+        String expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/s1.o "
+            + "-I" + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath()
+            + "/include -Wall -fPic -O2 -DNDEBUG -g /tmp/dummy/s1.c";
+        assertEquals(expectedString, compileCommand);
+
+        // set up for debugging
+        System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "true");
+        compileCommand = ziggyCppObject.generateCompileCommand(f1, compiler, null, null);
+        expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/s1.o " + "-I"
+            + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath()
+            + "/include -Wall -fPic -Og -g /tmp/dummy/s1.c";
+        assertEquals(expectedString, compileCommand);
+
+        // have the debugging property but set to false
+        System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "false");
+        compileCommand = ziggyCppObject.generateCompileCommand(f1, compiler, null, null);
+        expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/s1.o " + "-I"
+            + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath()
+            + "/include -Wall -fPic -O2 -DNDEBUG -g /tmp/dummy/s1.c";
+        assertEquals(expectedString, compileCommand);
+
+        // test .cpp file type
+        f1 = new File("/tmp/dummy/s1.cpp");
+        compileCommand = ziggyCppObject.generateCompileCommand(f1, compiler, null, null);
+        expectedString = "/dev/null/g++ -c -o " + buildDir.getAbsolutePath() + "/obj/s1.o " + "-I"
+            + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath()
+            + "/include -Wall -fPic -O2 -DNDEBUG -g /tmp/dummy/s1.cpp";
+        assertEquals(expectedString, compileCommand);
+
+        // test with output dir
+        ziggyCppObject.setOutputDir("foo");
+        compileCommand = ziggyCppObject.generateCompileCommand(f1, compiler, null, null);
+        expectedString = "/dev/null/g++ -c -o " + System.getProperty("user.dir") + "/foo/s1.o "
+            + "-I" + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath()
+            + "/include -Wall -fPic -O2 -DNDEBUG -g /tmp/dummy/s1.cpp";
+        assertEquals(expectedString, compileCommand);
+
+        // Test with output dir parent
+        ziggyCppObject.setOutputDir("");
+        ziggyCppObject.setOutputDirParent("foo");
+        compileCommand = ziggyCppObject.generateCompileCommand(f1, compiler, null, null);
+        expectedString = "/dev/null/g++ -c -o " + System.getProperty("user.dir") + "/foo/obj/s1.o "
+            + "-I" + tempDir.getAbsolutePath() + "/src -I" + tempDir.getAbsolutePath()
+            + "/include -Wall -fPic -O2 -DNDEBUG -g /tmp/dummy/s1.cpp";
+        assertEquals(expectedString, compileCommand);
+    }
+
+    @Test
+    public void testGenerateCompileCommandWithCompiler() {
+
+        Map<File, String> sourceFilesWithCompiler = ziggyCppObject.getCppFiles();
+        ZiggyCppPojo.Compiler.CPP.compiler();
+        String cCompiler = ZiggyCppPojo.Compiler.C.compiler();
+
+        for (Map.Entry<File, String> entry : sourceFilesWithCompiler.entrySet()) {
+            String compileCommand = ziggyCppObject.generateCompileCommand(entry);
+            entry.getKey().toString();
+            entry.getKey().getName();
+            String compiler = entry.getValue();
+            if (compiler.equals(cCompiler)) {
+                assertTrue(compileCommand.startsWith("/dev/null/gcc -c -o"));
+                assertTrue(compileCommand.contains("-fPic"));
+                assertFalse(compileCommand.contains("-Wall"));
+            } else {
+                assertTrue(compileCommand.startsWith("/dev/null/g++ -c -o"));
+                assertTrue(compileCommand.contains("-fPic"));
+                assertTrue(compileCommand.contains("-Wall"));
+            }
+        }
+    }
+
+    /**
+     * Tests the method that generates link commands.
+     */
+    @Test
+    public void testGenerateLinkCommand() {
+
+        configureLinkerOptions(ziggyCppObject);
+        ziggyCppObject.setOutputType("executable");
+        String linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath()
+            + "/bin/dummy -L/dummy1/lib -L/dummy2/lib "
+            + "-u whatevs -O2 -DNDEBUG -g o1.o o2.o -lhdf5 -lnetcdf ", linkString);
+
+        // now try it with debug enabled
+        System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "true");
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath()
+            + "/bin/dummy -L/dummy1/lib -L/dummy2/lib "
+            + "-u whatevs -Og -g o1.o o2.o -lhdf5 -lnetcdf ", linkString);
+        System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "false");
+
+        // Now with an output dir configured
+        ziggyCppObject.setOutputDir("foo");
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("/dev/null/g++ -o " + System.getProperty("user.dir")
+            + "/foo/dummy -L/dummy1/lib -L/dummy2/lib "
+            + "-u whatevs -O2 -DNDEBUG -g o1.o o2.o -lhdf5 -lnetcdf ", linkString);
+
+        // Now with an output dir parent configured
+        ziggyCppObject.setOutputDir("");
+        ziggyCppObject.setOutputDirParent("foo");
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("/dev/null/g++ -o " + System.getProperty("user.dir")
+            + "/foo/bin/dummy -L/dummy1/lib -L/dummy2/lib "
+            + "-u whatevs -O2 -DNDEBUG -g o1.o o2.o -lhdf5 -lnetcdf ", linkString);
+
+        // Now for a shared object library
+        ziggyCppObject = createZiggyCppObject(buildDir);
+        configureLinkerOptions(ziggyCppObject);
+        ziggyCppObject.setOutputType("shared");
+        ziggyCppObject.setArchitecture(SystemArchitecture.LINUX_INTEL);
+        String sharedObjectFileType = ".so";
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/libdummy"
+            + sharedObjectFileType + " -L/dummy1/lib -L/dummy2/lib -shared"
+            + " o1.o o2.o -lhdf5 -lnetcdf ", linkString);
+
+        // For a Mac, there has to be an install name as well
+        ziggyCppObject = createZiggyCppObject(buildDir);
+        configureLinkerOptions(ziggyCppObject);
+        ziggyCppObject.setOutputType("shared");
+        ziggyCppObject.setArchitecture(SystemArchitecture.MAC_INTEL);
+        sharedObjectFileType = ".dylib";
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/libdummy"
+            + sharedObjectFileType + " -L/dummy1/lib -L/dummy2/lib -shared"
+            + " -install_name /dev/null/rootDir/build/lib/libdummy.dylib "
+            + "o1.o o2.o -lhdf5 -lnetcdf ", linkString);
+
+        // debug enabled shouldn't do anything
+        System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "true");
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("/dev/null/g++ -o " + buildDir.getAbsolutePath() + "/lib/libdummy"
+            + sharedObjectFileType + " -L/dummy1/lib -L/dummy2/lib -shared"
+            + " -install_name /dev/null/rootDir/build/lib/libdummy.dylib "
+            + "o1.o o2.o -lhdf5 -lnetcdf ", linkString);
+        System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "false");
+
+        // Output dir case
+        ziggyCppObject.setOutputDir("foo");
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("/dev/null/g++ -o " + System.getProperty("user.dir") + "/foo/libdummy"
+            + sharedObjectFileType + " -L/dummy1/lib -L/dummy2/lib -shared"
+            + " -install_name /dev/null/rootDir/build/lib/libdummy.dylib "
+            + "o1.o o2.o -lhdf5 -lnetcdf ", linkString);
+
+        // Output dir parent case
+        ziggyCppObject.setOutputDir("");
+        ziggyCppObject.setOutputDirParent("foo");
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("/dev/null/g++ -o " + System.getProperty("user.dir") + "/foo/lib/libdummy"
+            + sharedObjectFileType + " -L/dummy1/lib -L/dummy2/lib -shared"
+            + " -install_name /dev/null/rootDir/build/lib/libdummy.dylib "
+            + "o1.o o2.o -lhdf5 -lnetcdf ", linkString);
+
+        // static library case
+        ziggyCppObject = createZiggyCppObject(buildDir);
+        configureLinkerOptions(ziggyCppObject);
+        ziggyCppObject.setOutputType("static");
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("ar rs " + buildDir.getAbsolutePath() + "/lib/libdummy.a o1.o o2.o ",
+            linkString);
+
+        // debug enabled shouldn't do anything
+        System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "true");
+        linkString = ziggyCppObject.generateLinkCommand();
+        assertEquals("ar rs " + buildDir.getAbsolutePath() + "/lib/libdummy.a o1.o o2.o ",
+            linkString);
+        System.setProperty(ZiggyCppPojo.CPP_DEBUG_PROPERTY_NAME, "false");
+    }
+
+    /**
+     * Tests the method that executes the main action (compiles and links).
+     *
+     * @throws ExecuteException
+     * @throws IOException
+     */
+    @Test
+    public void testAction() throws ExecuteException, IOException {
+
+        // set values for the ZiggyCppPojo
+        ziggyCppObject.setOutputName("testOutput");
+        ziggyCppObject.setOutputType("executable");
+
+        // set the mocked executor into the object
+        ziggyCppObject.setDefaultExecutor(defaultExecutor);
+        InOrder executorCalls = Mockito.inOrder(defaultExecutor);
+
+        String compiler = ZiggyCppPojo.Compiler.CPP.compiler();
+        // call the method
+        ziggyCppObject.action();
+
+        // check the calls to the executor and their order
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppObject.new CommandLineComparable(ziggyCppObject
+                .generateCompileCommand(new File(srcDir, "GetString.cpp"), compiler, null, null)));
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppObject.new CommandLineComparable(ziggyCppObject.generateCompileCommand(
+                new File(srcDir, "ZiggyCppMain.cpp"), compiler, null, null)));
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, "obj"));
+        executorCalls.verify(defaultExecutor)
+            .execute(
+                ziggyCppObject.new CommandLineComparable(ziggyCppObject.generateLinkCommand()));
+
+        // test that the include files were copied
+        File buildInclude = new File(buildDir, "include");
+        File buildInclude1 = new File(buildInclude, "ZiggyCppMain.h");
+        assertTrue(buildInclude1.exists());
+        File buildInclude2 = new File(buildInclude, "ZiggyCppLib.h");
+        assertTrue(buildInclude2.exists());
+
+        // create a new object for linking a shared object
+        ziggyCppObject = createZiggyCppObject(buildDir);
+        ziggyCppObject.setOutputName("testOutput");
+        ziggyCppObject.setOutputType("shared");
+        ziggyCppObject.setDefaultExecutor(defaultExecutor);
+        ziggyCppObject.action();
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppObject.new CommandLineComparable(ziggyCppObject
+                .generateCompileCommand(new File(srcDir, "GetString.cpp"), compiler, null, null)));
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppObject.new CommandLineComparable(ziggyCppObject.generateCompileCommand(
+                new File(srcDir, "ZiggyCppMain.cpp"), compiler, null, null)));
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, "obj"));
+        executorCalls.verify(defaultExecutor)
+            .execute(
+                ziggyCppObject.new CommandLineComparable(ziggyCppObject.generateLinkCommand()));
+
+        // and once more for a static library
+        // create a new object for linking a shared object
+        ziggyCppObject = createZiggyCppObject(buildDir);
+        ziggyCppObject.setOutputName("testOutput");
+        ziggyCppObject.setOutputType("static");
+        ziggyCppObject.setDefaultExecutor(defaultExecutor);
+        ziggyCppObject.action();
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppObject.new CommandLineComparable(ziggyCppObject
+                .generateCompileCommand(new File(srcDir, "GetString.cpp"), compiler, null, null)));
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(tempDir, "src"));
+        executorCalls.verify(defaultExecutor)
+            .execute(ziggyCppObject.new CommandLineComparable(ziggyCppObject.generateCompileCommand(
+                new File(srcDir, "ZiggyCppMain.cpp"), compiler, null, null)));
+        executorCalls.verify(defaultExecutor).setWorkingDirectory(new File(buildDir, "obj"));
+        executorCalls.verify(defaultExecutor)
+            .execute(
+                ziggyCppObject.new CommandLineComparable(ziggyCppObject.generateLinkCommand()));
+    }
+
+    // The following tests exercise various error conditions that return GradleExceptions. There are
+    // 2 error
+    // conditions that are not tested by these methods, they occur when the DefaultExecutor throws
+    // an IOException.
+    // These cases are considered sufficiently trivial that we omit them.
+
+    /**
+     * Tests that a null value for the C++ file path produces the correct error.
+     */
+    @Test
+    public void testCppFilePathNullError() {
+        ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
+        assertThrows("C++ file path is null", GradleException.class, () -> {
+            ziggyCppError.getCppFiles();
+        });
+    }
+
+    /**
+     * Tests that a nonexistent C++ file path produces the correct warning message.
+     */
+    @Test
+    public void testCppFilePathDoesNotExist() {
+        ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
+        ziggyCppError.setCppFilePath("/this/path/does/not/exist");
+        ziggyCppError.getCppFiles(true);
+        List<String> w = ziggyCppError.loggerWarnings();
+        assertTrue(w.size() > 0);
+        assertTrue(w.contains("C++ file path /this/path/does/not/exist does not exist"));
+    }
+
+    /**
+     * Tests that a missing output name produces the correct error.
+     */
+    @Test
+    public void testErrorNoOutputName() {
+        ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
+        ziggyCppError.setCppFilePath(tempDir.getAbsolutePath() + "/src");
+        ziggyCppError.setBuildDir(buildDir);
+        ziggyCppError.setOutputType("executable");
+        assertThrows("Both output name and output type must be specified", GradleException.class,
+            () -> {
+                ziggyCppError.getBuiltFile();
+            });
+    }
+
+    /**
+     * Tests that a missing output type produces the correct error.
+     */
+    @Test
+    public void testErrorNoOutputType() {
+        ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
+        ziggyCppError.setCppFilePath(tempDir.getAbsolutePath() + "/src");
+        ziggyCppError.setBuildDir(buildDir);
+        ziggyCppError.setOutputName("dummy");
+        assertThrows("Both output name and output type must be specified", GradleException.class,
+            () -> {
+                ziggyCppError.getBuiltFile();
+            });
+    }
+
+    /**
+     * Tests that missing both the output type and the built file name produces the correct error.
+     */
+    @Test
+    public void testErrorNoOutputTypeOrName() {
+        ZiggyCppPojo ziggyCppError = new ZiggyCppPojo();
+        new ArrayList<>();
+        ziggyCppError.setCppFilePath(tempDir.getAbsolutePath() + "/src");
+        ziggyCppError.setBuildDir(buildDir);
+        assertThrows("Both output name and output type must be specified", GradleException.class,
+            () -> {
+                ziggyCppError.getBuiltFile();
+            });
+    }
+
+    /**
+     * Tests that a non-zero compiler return value produces the correct error.
+     *
+     * @throws ExecuteException
+     * @throws IOException
+     */
+    @Test
+    public void testCompilerError() throws ExecuteException, IOException {
+        ziggyCppObject.setOutputType("executable");
+        ziggyCppObject.setDefaultExecutor(defaultExecutor);
+        when(defaultExecutor.execute(any(CommandLine.class))).thenReturn(1);
+        assertThrows("Compilation of file GetString.cpp failed", GradleException.class, () -> {
+            ziggyCppObject.action();
+        });
+    }
+
+    /**
+     * Tests that a non-zero linker return value produces the correct error.
+     *
+     * @throws ExecuteException
+     * @throws IOException
+     */
+    @Ignore
+    public void testLinkerError() throws ExecuteException, IOException {
+        ziggyCppObject.setOutputType("executable");
+        ziggyCppObject.setDefaultExecutor(defaultExecutor);
+        String linkerCommand = ziggyCppObject.generateLinkCommand()
+            + "GetString.o ZiggyCModule.o ZiggyCppMain.o";
+        when(defaultExecutor.execute(ziggyCppObject.new CommandLineComparable(linkerCommand)))
+            .thenReturn(1);
+        // TODO Fix flaky test
+        // There seems to be a timing issue between these two statements. On my Linux workstation
+        // anyway.
+        assertThrows("Link / library construction of dummy failed", GradleException.class, () -> {
+            ziggyCppObject.action();
+        });
+    }
 
 //***************************************************************************************
-	
-	//	here begins assorted setup and helper methods
-	
-	/**
-	 * Creates four source files for use in the test. Two are C++ files in the tempDir/src
-	 * directory, ZiggyCppMain.cpp and GetString.cpp. One is the header file ZiggyCppMain.h,
-	 * also in tempDir/src. The final one is ZiggyCppLib.h, in tempdir/include.
-	 * @throws FileNotFoundException
-	 */
-	public void createSourceFiles() throws FileNotFoundException {
-		
-		// content for ZiggyCppMain.cpp
-		String[] mainSourceContent = 
-			{"#include \"ZiggyCppMain.h\"" ,
-			 "#include <iostream>",
-			 "#include \"ZiggyCppLib.h",
-			 "",
-			 "using namespace std;",
-			 "",
-			 "int main(int argc, const char* argv[]) {", 
-			 "    string s = getString();",
-			 "    cout << s << endl;",
-			 "}"
-			};
-		
-		//	content for the getString function
-		String[] getStringContent = 
-			{"#include \"ZiggyCppMain.h\"", 
-			 "",
-			 "using namespace std;",
-			 "",
-			 "string getString() {",
-			 "    return string(\"hello world!\");",
-			 "}"
-			};
-		
-		//	content for the ZiggyCppMain.h header
-		String[] ziggyCppMainHeaderContent = 
-			{"#ifndef ZIGGY_CPP",
-			 "#define ZIGGY_CPP",
-			 "#endif",
-			 "",
-			 "string getString();"
-			};
-		
-		//	content for the ZiggyCppLib.h header
-		String[] ziggyCppLibHeaderContent = 
-			{"#ifndef ZIGGY_CPP_LIB",
-			 "#define ZIGGY_CPP_LIB",
-			 "#endif"
-			};
-		
-		//	create the source files first
-		PrintWriter mainSource = new PrintWriter(tempDir.getAbsolutePath() + "/src/ZiggyCppMain.cpp");
-		for (String line : mainSourceContent) {
-			mainSource.println(line);
-		}
-		mainSource.close();
-		
-		PrintWriter getStringSource = new PrintWriter(tempDir.getAbsolutePath() + "/src/GetString.cpp");
-		for (String line : getStringContent) {
-			getStringSource.println(line);
-		}
-		getStringSource.close();
-		
-		//	put the main header in the src directory
-		PrintWriter h1 = new PrintWriter(tempDir.getAbsolutePath() + "/src/ZiggyCppMain.h");
-		for (String line : ziggyCppMainHeaderContent) {
-			h1.println(line);
-		}
-		h1.close();
-		
-		//	put the other header in the include directory
-		PrintWriter h2 = new PrintWriter(tempDir.getAbsolutePath() + "/include/ZiggyCppLib.h");
-		for (String line : ziggyCppLibHeaderContent) {
-			h2.println(line);
-		}
-		h2.close();
-		
-	}
-	
-	/**
-	 * Add an additional source file in another directory to test accumulating files from multiple directories
-	 * @throws FileNotFoundException
-	 */
-	public void createAdditionalSource() throws FileNotFoundException {
-
-		//	content for the getString function
-		String[] getStringContent = 
-			{"#include \"ZiggyCppMain.h\"", 
-			 "",
-			 "using namespace std;",
-			 "",
-			 "string getAnotherString() {",
-			 "    return string(\"hello again world!\");",
-			 "}"
-			};
-
-		PrintWriter getStringSource = new PrintWriter(buildDir.getAbsolutePath() + "/src/cpp/GetAnotherString.cpp");
-		for (String line : getStringContent) {
-			getStringSource.println(line);
-		}
-		getStringSource.close();
-
-	}
-	
-	/**
-	 * Creates a ZiggyCpp object that is properly formed and has the following members populated:
-	 * cppFilePath
-	 * includeFilePaths
-	 * compileOptions
-	 * name
-	 * Project (with a mocked Project object)
-	 * @return properly-formed ZiggyCpp object
-	 */ 
-	@SuppressWarnings("serial")
-	public ZiggyCppPojo createZiggyCppObject(File buildDir) {
-		ZiggyCppPojo ziggyCppObject = new ZiggyCppPojo();
-		ziggyCppObject.setCppFilePath(tempDir.getAbsolutePath() + "/src");
-		ziggyCppObject.setIncludeFilePaths(new ArrayList<String>(){{
-			add(tempDir.getAbsolutePath() + "/src");
-			add(tempDir.getAbsolutePath() + "/include");
-		}});
-		ziggyCppObject.setCompileOptions(new ArrayList<String>() {{
-			add("Wall");
-			add("fPic");
-		}});
-		ziggyCppObject.setReleaseOptimizations(new ArrayList<String>() {{
-			add("O2");
-			add("DNDEBUG");
-			add("g");
-		}});
-		ziggyCppObject.setDebugOptimizations(new ArrayList<String>() {{
-			add("Og");
-			add("g");
-		}});
-		ziggyCppObject.setOutputName("dummy");
-		ziggyCppObject.setBuildDir(buildDir);
-		ziggyCppObject.setCppCompiler("/dev/null/g++");
-		ziggyCppObject.setRootDir(rootDir);
-		return ziggyCppObject;
-	}
-	
-	public void testStringListSettersAndGetters(String fieldName, String[] initialValues) 
-			throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, 
-			InvocationTargetException {
-		String getter = "get" + fieldName;
-		String setter = "set" + fieldName;
-		int nOrigValues = initialValues.length;
-		Method getMethod = ZiggyCppPojo.class.getDeclaredMethod(getter);
-		Method setMethod = ZiggyCppPojo.class.getDeclaredMethod(setter, List.class);
+
+    // here begins assorted setup and helper methods
+
+    /**
+     * Creates four source files for use in the test. Two are C++ files in the tempDir/src
+     * directory, ZiggyCppMain.cpp and GetString.cpp. One is the header file ZiggyCppMain.h, also in
+     * tempDir/src. The final one is ZiggyCppLib.h, in tempdir/include.
+     *
+     * @throws FileNotFoundException
+     */
+    public void createSourceFiles() throws FileNotFoundException {
+
+        // content for ZiggyCppMain.cpp
+        String[] mainSourceContent = { "#include \"ZiggyCppMain.h\"", "#include <iostream>",
+            "#include \"ZiggyCppLib.h", "", "using namespace std;", "",
+            "int main(int argc, const char* argv[]) {", "    string s = getString();",
+            "    cout << s << endl;", "}" };
+
+        // content for the getString function
+        String[] getStringContent = { "#include \"ZiggyCppMain.h\"", "", "using namespace std;", "",
+            "string getString() {", "    return string(\"hello world!\");", "}" };
+
+        // content for the ZiggyCppMain.h header
+        String[] ziggyCppMainHeaderContent = { "#ifndef ZIGGY_CPP", "#define ZIGGY_CPP", "#endif",
+            "", "string getString();",
+            "void get_sort_index(int nLength, double *inputArray, int *sortIndex, int *iStack );" };
+
+        // content for the ZiggyCppLib.h header
+        String[] ziggyCppLibHeaderContent = { "#ifndef ZIGGY_CPP_LIB", "#define ZIGGY_CPP_LIB",
+            "#endif" };
+
+        // Content for the ZiggyCModule.c function
+        String[] ziggyCModuleContent = { "#define <string.h>", "#define <stdlib.h>",
+            "void get_sort_index(int nLength, double *inputArray, int *sortIndex, int *iStack ) {",
+            "}" };
+
+        // create the source files first
+        PrintWriter mainSource = new PrintWriter(
+            tempDir.getAbsolutePath() + "/src/ZiggyCppMain.cpp");
+        for (String line : mainSourceContent) {
+            mainSource.println(line);
+        }
+        mainSource.close();
+
+        PrintWriter getStringSource = new PrintWriter(
+            tempDir.getAbsolutePath() + "/src/GetString.cpp");
+        for (String line : getStringContent) {
+            getStringSource.println(line);
+        }
+        getStringSource.close();
+
+        PrintWriter cModuleSource = new PrintWriter(
+            tempDir.getAbsolutePath() + "/src/ZiggyCModule.c");
+        for (String line : ziggyCModuleContent) {
+            cModuleSource.println(line);
+        }
+        cModuleSource.close();
+
+        // put the main header in the src directory
+        PrintWriter h1 = new PrintWriter(tempDir.getAbsolutePath() + "/src/ZiggyCppMain.h");
+        for (String line : ziggyCppMainHeaderContent) {
+            h1.println(line);
+        }
+        h1.close();
+
+        // put the other header in the include directory
+        PrintWriter h2 = new PrintWriter(tempDir.getAbsolutePath() + "/include/ZiggyCppLib.h");
+        for (String line : ziggyCppLibHeaderContent) {
+            h2.println(line);
+        }
+        h2.close();
+    }
+
+    /**
+     * Add an additional source file in another directory to test accumulating files from multiple
+     * directories
+     *
+     * @throws FileNotFoundException
+     */
+    public void createAdditionalSource() throws FileNotFoundException {
+
+        // content for the getString function
+        String[] getStringContent = { "#include \"ZiggyCppMain.h\"", "", "using namespace std;", "",
+            "string getAnotherString() {", "    return string(\"hello again world!\");", "}" };
+
+        PrintWriter getStringSource = new PrintWriter(
+            buildDir.getAbsolutePath() + "/src/cpp/GetAnotherString.cpp");
+        for (String line : getStringContent) {
+            getStringSource.println(line);
+        }
+        getStringSource.close();
+    }
+
+    /**
+     * Creates a ZiggyCpp object that is properly formed and has the following members populated:
+     * cppFilePath includeFilePaths compileOptions name Project (with a mocked Project object)
+     *
+     * @return properly-formed ZiggyCpp object
+     */
+    public ZiggyCppPojo createZiggyCppObject(File buildDir) {
+        ZiggyCppPojo ziggyCppObject = new ZiggyCppPojo();
+        ziggyCppObject.setCppFilePath(tempDir.getAbsolutePath() + "/src");
+        ziggyCppObject.setIncludeFilePaths(
+            List.of(tempDir.getAbsolutePath() + "/src", tempDir.getAbsolutePath() + "/include"));
+        ziggyCppObject.setCppCompileOptions(List.of("-Wall", "-fPic"));
+        ziggyCppObject.setCCompileOptions(List.of("-fPic"));
+        ziggyCppObject.setReleaseOptimizations(List.of("-O2", "-DNDEBUG", "-g"));
+        ziggyCppObject.setDebugOptimizations(List.of("-Og", "-g"));
+        ziggyCppObject.setOutputName("dummy");
+        ziggyCppObject.setBuildDir(buildDir);
+        ZiggyCppPojo.setCppCompiler("/dev/null/g++");
+        ZiggyCppPojo.setCCompiler("/dev/null/gcc");
+        ziggyCppObject.setRootDir(rootDir);
+        ziggyCppObject.setMaxCompileThreads(1);
+        return ziggyCppObject;
+    }
+
+    public void testStringListSettersAndGetters(String fieldName, String[] initialValues)
+        throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException,
+        InvocationTargetException {
+        String getter = "get" + fieldName;
+        String setter = "set" + fieldName;
+        int nOrigValues = initialValues.length;
+        Method getMethod = ZiggyCppPojo.class.getDeclaredMethod(getter);
+        Method setMethod = ZiggyCppPojo.class.getDeclaredMethod(setter, List.class);
         List<?> initialGetValues = List.class.cast(getMethod.invoke(ziggyCppObject));
-		assertEquals(nOrigValues, initialGetValues.size());
-		for (int i=0 ; i<nOrigValues ; i++) {
-			assertEquals(initialValues[i], initialGetValues.get(i));
-		}
-		
-		List<String> replacementValues = new ArrayList<>();
-		replacementValues.add("R1");
-		replacementValues.add("R2");
-		setMethod.invoke(ziggyCppObject, replacementValues);
-		List<?> replacementGetValues = List.class.cast(getMethod.invoke(ziggyCppObject));
-		assertEquals(replacementValues.size(), replacementGetValues.size());
-		for (int i=0 ; i<replacementValues.size(); i++) {
-			assertEquals(replacementValues.get(i), replacementGetValues.get(i));
-		}
-		
- 	}
-	
-	/**
-	 * Set up linker options. This needs to be done for several ZiggyCppPojo instances so we can test
-	 * all of the different link types (shared, static, executable).
-	 * @param ziggyCppObject object in need of link options.
-	 */
-	public void configureLinkerOptions(ZiggyCppPojo ziggyCppObject) {
-		//	first we need to add some object files
-		File o1 = new File(buildDir, "obj/o1.o");
-		File o2 = new File(buildDir, "obj/o2.o");
-		ziggyCppObject.setObjectFiles(o1);
-		ziggyCppObject.setObjectFiles(o2);
-		
-		//	also some linker options and libraries
-		List<String> linkerOptions = new ArrayList<>();
-		linkerOptions.add("u whatevs");
-		ziggyCppObject.setLinkOptions(linkerOptions);
-		List<String> libraryPathOptions = new ArrayList<>();
-		libraryPathOptions.add("/dummy1/lib");
-		libraryPathOptions.add("/dummy2/lib");
-		ziggyCppObject.setLibraryPaths(libraryPathOptions);
-		List<String> libraryOptions = new ArrayList<>();
-		libraryOptions.add("hdf5");
-		libraryOptions.add("netcdf");
-		ziggyCppObject.setLibraries(libraryOptions);
-		
-	}
+        assertEquals(nOrigValues, initialGetValues.size());
+        for (int i = 0; i < nOrigValues; i++) {
+            assertEquals(initialValues[i], initialGetValues.get(i));
+        }
+
+        List<String> replacementValues = new ArrayList<>();
+        replacementValues.add("R1");
+        replacementValues.add("R2");
+        setMethod.invoke(ziggyCppObject, replacementValues);
+        List<?> replacementGetValues = List.class.cast(getMethod.invoke(ziggyCppObject));
+        assertEquals(replacementValues.size(), replacementGetValues.size());
+        for (int i = 0; i < replacementValues.size(); i++) {
+            assertEquals(replacementValues.get(i), replacementGetValues.get(i));
+        }
+    }
+
+    /**
+     * Set up linker options. This needs to be done for several ZiggyCppPojo instances so we can
+     * test all of the different link types (shared, static, executable).
+     *
+     * @param ziggyCppObject object in need of link options.
+     */
+    public void configureLinkerOptions(ZiggyCppPojo ziggyCppObject) {
+        // first we need to add some object files
+        File o1 = new File(buildDir, "obj/o1.o");
+        File o2 = new File(buildDir, "obj/o2.o");
+        ziggyCppObject.setObjectFiles(o1);
+        ziggyCppObject.setObjectFiles(o2);
+
+        // also some linker options and libraries
+        List<String> linkerOptions = new ArrayList<>();
+        linkerOptions.add("-u whatevs");
+        ziggyCppObject.setLinkOptions(linkerOptions);
+        List<String> libraryPathOptions = new ArrayList<>();
+        libraryPathOptions.add("/dummy1/lib");
+        libraryPathOptions.add("/dummy2/lib");
+        ziggyCppObject.setLibraryPaths(libraryPathOptions);
+        List<String> libraryOptions = new ArrayList<>();
+        libraryOptions.add("hdf5");
+        libraryOptions.add("netcdf");
+        ziggyCppObject.setLibraries(libraryOptions);
+    }
 }
diff --git a/doc/user-manual/alerts.md b/doc/user-manual/alerts.md
index 9afe15e..fea19f9 100644
--- a/doc/user-manual/alerts.md
+++ b/doc/user-manual/alerts.md
@@ -8,11 +8,11 @@
 
 Ziggy uses alerts to tell the pipeline operator that something has happened that they ought to know about. Alerts are displayed on the `Alerts` status panel. It looks like this:
 
-![](images/monitoring-alerts.png)
+<img src="images/monitoring-alerts.png" style="width:32cm;"/>
 
-There are two flavors of alert that you're likely to see: warnings and errors. Warnings will turn the alerts stoplight yellow, errors turn it red. The alerts panel shows which task generated the alert, when it happened, and a hopefully-useful message. If there are no alerts, the stoplight will be green. 
+There are two flavors of alert that you're likely to see: warnings and errors. Warnings will turn the alerts stoplight yellow, errors turn it red. The alerts panel shows which task generated the alert, when it happened, and a hopefully-useful message. If there are no alerts, the stoplight will be green.
 
-Sadly, in this case it tells you pretty much what you already knew: task 12 blew up. 
+Sadly, in this case it tells you pretty much what you already knew: task 12 blew up.
 
 ### Acknowledging Alerts
 
@@ -20,7 +20,7 @@ Once an alert arrives, the stoplight color will stay whatever color is appropria
 
 ### Clearing Alerts
 
-Alternately, once an alert is addressed you may want to get it completely out of the table of alerts. The `Clear` button will clear all alerts from the display and return the stoplight to green. 
+Alternately, once an alert is addressed you may want to get it completely out of the table of alerts. The `Clear` button will clear all alerts from the display and return the stoplight to green.
 
 [[Previous]](monitoring.md)
 [[Up]](ziggy-gui-troubleshooting.md)
diff --git a/doc/user-manual/building-pipeline.md b/doc/user-manual/building-pipeline.md
index 8962ed0..8199084 100644
--- a/doc/user-manual/building-pipeline.md
+++ b/doc/user-manual/building-pipeline.md
@@ -2,7 +2,7 @@
 
 [[Previous]](pipeline-definition.md)
 [[Up]](user-manual.md)
-[[Next]](rdbms.md)
+[[Next]](running-pipeline.md)
 
 ## Building a Pipeline
 
@@ -19,17 +19,17 @@ Just in case you haven't looked yet, here's what the sample pipeline directory s
 ```console
 sample-pipeline$ ls
 build-env.sh    config    data    etc    multi-data    src
-sample-pipeline$ 
+sample-pipeline$
 ```
 
-As we've discussed, the `src` directory is the various bits of source code for the pipeline, `etc` is the location of the pipeline properties file, `config` is the location of the XML files that define the pipeline. The `data` is the initial source of the data files that will be used by the sample pipeline. 
+As we've discussed, the `src` directory is the various bits of source code for the pipeline, `etc` is the location of the pipeline properties file, `config` is the location of the XML files that define the pipeline. The `data` is the initial source of the data files that will be used by the sample pipeline.
 
-At the top you can see `build-env.sh`, which is the "build system" for the sample pipeline. In this case, the sample pipeline is so simple that none of the grown-up build systems were seen as needed or even desirable; a shell script would do what was needed. 
+At the top you can see `build-env.sh`, which is the "build system" for the sample pipeline. In this case, the sample pipeline is so simple that none of the grown-up build systems were seen as needed or even desirable; a shell script would do what was needed.
 
 If you run the shell script from the command line (`./build-env.sh`), you should quickly see something that looks like this:
 
 ```console
-sample-pipeline$ /bin/bash ./build-env.sh 
+sample-pipeline$ /bin/bash ./build-env.sh
 Collecting h5py
   Using cached h5py-3.7.0-cp38-cp38-macosx_10_9_x86_64.whl (3.2 MB)
 Collecting Pillow
@@ -38,7 +38,7 @@ Collecting numpy
   Using cached numpy-1.23.4-cp38-cp38-macosx_10_9_x86_64.whl (18.1 MB)
 Installing collected packages: Pillow, numpy, h5py
 Successfully installed Pillow-9.2.0 h5py-3.7.0 numpy-1.23.4
-sample-pipeline$ 
+sample-pipeline$
 ```
 
 
@@ -50,10 +50,10 @@ sample-pipeline$ ls
 build    build-env.sh    config    data    etc    multi-data    src
 sample-pipeline$ ls build
 bin    env    pipeline-results
-sample-pipeline$ 
+sample-pipeline$
 ```
 
-There's now a `build` directory that contains additional directories: `bin, data-receipt`, and `env`. 
+There's now a `build` directory that contains additional directories: `bin, data-receipt`, and `env`.
 
 #### The build-env.sh Shell Script
 
@@ -87,7 +87,7 @@ mkdir -p $DATA_RECEIPT_DIR
 cp $sample_home/data/* $DATA_RECEIPT_DIR
 ```
 
-Here we create the `build` directory and its `env` and `data-receipt` directories. The contents of the data directory from the sample directory gets copied to `data-receipt`. 
+Here we create the `build` directory and its `env` and `data-receipt` directories. The contents of the data directory from the sample directory gets copied to `data-receipt`.
 
 ```bash
 # build the bin directory in build
@@ -103,7 +103,7 @@ cp $BIN_SRC_DIR/averaging.sh $BIN_DIR/averaging
 chmod -R a+x $BIN_DIR
 ```
 
-Here we construct `build/bin` and copy the shell scripts from `src/main/sh` to `build/bin`. In the process, we strip off the `.sh` suffixes. The shell script copies in `build/bin` now match what Ziggy expects to see. 
+Here we construct `build/bin` and copy the shell scripts from `src/main/sh` to `build/bin`. In the process, we strip off the `.sh` suffixes. The shell script copies in `build/bin` now match what Ziggy expects to see.
 
 ```bash
 python3 -m venv $SAMPLE_PIPELINE_PYTHON_ENV
@@ -130,23 +130,23 @@ cp -r $ZIGGY_HOME/src/main/python/zigutils $SITE_PKGS
 exit 0
 ```
 
-Here at last we build the Python environment that will be used for the sample pipeline. The environment is built in `build/env`, and the packages `h5py`, `Pillow`, and `numpy` are installed in the environment. Finally, the sample pipeline source code and the Ziggy utility modules are copied to the `site-packages` directory of the environment, so that they will be on Python's search path when the environment is activated. 
+Here at last we build the Python environment that will be used for the sample pipeline. The environment is built in `build/env`, and the packages `h5py`, `Pillow`, and `numpy` are installed in the environment. Finally, the sample pipeline source code and the Ziggy utility modules are copied to the `site-packages` directory of the environment, so that they will be on Python's search path when the environment is activated.
 
 ### Okay, but Why?
 
-Setting up the `build` directory this way has a number of advantages. First and foremost, everything that Ziggy will eventually need to find is someplace in `build`. If your experience with computers is anything like mine, you know that 90% of what we spend our time doing is figuring out why various search paths aren't set correctly. Putting everything you need in one directory minimizes this issue. 
+Setting up the `build` directory this way has a number of advantages. First and foremost, everything that Ziggy will eventually need to find is someplace in `build`. If your experience with computers is anything like mine, you know that 90% of what we spend our time doing is figuring out why various search paths aren't set correctly. Putting everything you need in one directory minimizes this issue.
 
-The second advantage is related: if you decide that you need to clean up and start over, you can simply delete the `build` directory. You don't need to go all over the place looking for directories and deleting them. Indeed, most grown up build systems will include a command that will automatically perform this deletion. 
+The second advantage is related: if you decide that you need to clean up and start over, you can simply delete the `build` directory. You don't need to go all over the place looking for directories and deleting them. Indeed, most grown up build systems will include a command that will automatically perform this deletion.
 
 ### Why a Build System?
 
-If you look at build-env.sh, you'll see that it's relatively simple: just 80 lines, including comments and whitespace lines. Nonetheless, you wouldn't want to have to type all this in every time you want to generate the `build` directory! Having a build system -- any build system -- allows you to ensure that the build is performed reproducibly -- every build is the same as all the ones before. It allows you to implement changes to the build in a systematic way. 
+If you look at build-env.sh, you'll see that it's relatively simple: just 80 lines, including comments and whitespace lines. Nonetheless, you wouldn't want to have to type all this in every time you want to generate the `build` directory! Having a build system -- any build system -- allows you to ensure that the build is performed reproducibly -- every build is the same as all the ones before. It allows you to implement changes to the build in a systematic way.
 
 ### Which Build System?
 
-Good question! There are a lot of them out there. 
+Good question! There are a lot of them out there.
 
-For simple systems, good old `make` is a solid choice. Support for `make` is nearly universal, and most computers ship with some version of it already loaded so you won't even need to install it yourself. 
+For simple systems, good old `make` is a solid choice. Support for `make` is nearly universal, and most computers ship with some version of it already loaded so you won't even need to install it yourself.
 
 For more complex systems, we're enamored of Gradle. The secret truth of build systems is that a build is actually a program: it describes the steps that need to be taken, their order, and provides conditionals of various kinds (like, "if the target is up-to-date, skip this step"). Gradle embraces this secret truth and runs with it, which makes it in many ways easier to use for bigger systems than `make`, with its frequently bizarre use of symbols and punctuation to represent relationships within the software.
 
@@ -154,8 +154,6 @@ For more complex systems, we're enamored of Gradle. The secret truth of build sy
 
 Note that while going through all this exposition, we've also sneakily built the sample pipeline! This positions us for the next (exciting) step: [running the pipeline](running-pipeline.md)!
 
-Unfortunately, before you get there, we'll need to talk some about [relational databases](rdbms.md).
-
 [[Previous]](pipeline-definition.md)
 [[Up]](user-manual.md)
-[[Next]](rdbms.md)
+[[Next]](running-pipeline.md)
diff --git a/doc/user-manual/change-param-values.md b/doc/user-manual/change-param-values.md
index 4ff0cc0..8e979d8 100644
--- a/doc/user-manual/change-param-values.md
+++ b/doc/user-manual/change-param-values.md
@@ -2,13 +2,13 @@
 
 [[Previous]](start-end-nodes.md)
 [[Up]](ziggy-gui.md)
-[[Next]](intermediate-topics.md)
+[[Next]](organizing-tables.md)
 
 ## Changing Module Parameter Values
 
-To see how this works, go back to the `Configuration` tab and select the `Parameter Library` option from the menu on the left hand side. You'll see this:
+Module parameters can be changed to affect how the algorithm behaves. To see how this works, select the `Parameter Library` content menu item. You'll see this:
 
-![](images/parameter-library.png)
+<img src="images/parameter-library.png" style="width:32cm;"/>
 
 As you can see, all of the parameter sets defined in `pl-sample.xml` are represented here. What else does the table tell us?
 
@@ -18,20 +18,20 @@ As you can see, all of the parameter sets defined in `pl-sample.xml` are represe
 
 Now: double-click the Algorithm Parameters row in the table. You'll get a new dialog box:
 
-<img src="images/edit-param-set.png" style="width: 15cm;"/>
+<img src="images/edit-param-set.png" style="width: 11cm;"/>
 
 The parameters that were defined as booleans in `pl-sample.xml` have check boxes you can check or uncheck. The other parameter types mostly behave the way you expect, but the array types offer some additional capabilities. If you click the `dummy array parameter` parameter, it will change thusly:
 
-<img src="images/edit-array-1.png" style="width:15cm;"/>
+<img src="images/edit-array-1.png" style="width:11cm;"/>
 
 If you click the "X", all the values will be deleted, which is rarely what you want. Instead click the other button. You'll get this window:
 
-<img src="images/edit-array-2.png" style="width:15cm;"/>
+<img src="images/edit-array-2.png" style="width:9cm;"/>
 
-This allows you to edit the array elements, remove them, add elements, etc., in a more GUI-natural way. Go ahead and change the second element (`idx` of 1) to 4. Click `ok`, then on the Edit Parameter Set dialog click `Save`. The `Version` for Algorithm Parameters will now be set to 1, and the `Locked` checkbox is unchecked.
+This allows you to edit the array elements, remove them, add elements, etc., in a more GUI-natural way. Go ahead and change the second element (`Element` 1 reflecting the zero-based nature of Java arrays) to 4 from 2. Press the `OK` button and then press the `Save` button on the Edit parameter set dialog. The `Version` for Algorithm Parameters will now be set to 1, and the `Locked` checkbox is unchecked.
 
 If you were to now run the sample pipeline, when you returned to the parameter library window, version 1 of `Algorithm Parameters` will show as locked.
 
 [[Previous]](start-end-nodes.md)
 [[Up]](ziggy-gui.md)
-[[Next]](intermediate-topics.md)
+[[Next]](organizing-tables.md)
diff --git a/doc/user-manual/configuring-pipeline.md b/doc/user-manual/configuring-pipeline.md
index 4dfadfb..7940071 100644
--- a/doc/user-manual/configuring-pipeline.md
+++ b/doc/user-manual/configuring-pipeline.md
@@ -201,8 +201,6 @@ Again, really simple: activate the environment; find the location of the environ
 
 All of the above has focused on the permuter algorithm, but the same pattern of "glue" files and design patterns are used for the flip and averaging algorithms.
 
-All of the above has focused on the permuter algorithm, but the same pattern of "glue" files and design patterns are used for the flip and averaging algorithms. 
-
 ### Set up the Properties File
 
 As you can probably imagine, Ziggy actually uses a lot of configuration items: it needs to know numerous paths around your file system, which relational database application you want to use, how much heap space to provide to Ziggy, and on and on. All of this stuff is put into two locations for Ziggy: the pipeline properties file and the Ziggy properties file.
@@ -229,8 +227,6 @@ Answer: the sample properties file sets all its paths relative to the top-level
 
 Anyway: set those properties now, before going any further.
 
-Anyway: set those properties now, before going any further. 
-
 #### What About the Ziggy Properties File?
 
 The sample properties file contains a property that is the location of the Ziggy properties file. Thus there's no need to have a separate environment variable for that information. Like we said, to the extent possible we've put everything configuration related into the pipeline properties file.
@@ -246,6 +242,11 @@ That said, if you're paying attention you've probably noticed that this article
 
 These questions will be discussed in the article on [Building a Pipeline](building-pipeline.md).
 
+<!--
+TODO Discuss how the properties ziggy.pipeline.data.importer.classname, ziggy.pipeline.uow.defaultIdentifier.classname, ziggy.remote.queuecommand.classname, ziggy.test.working.dir are used when rolling your own components.
+See also customizing-ziggy.md.
+-->
+
 [[Previous]](downloading-and-building-ziggy.md)
 [[Up]](user-manual.md)
 [[Next]](module-parameters.md)
diff --git a/doc/user-manual/contact-us.md b/doc/user-manual/contact-us.md
index 135fd62..c65b6cd 100644
--- a/doc/user-manual/contact-us.md
+++ b/doc/user-manual/contact-us.md
@@ -1,7 +1,8 @@
 <!-- -*-visual-line-*- -->
 
-[[Previous]](edit-trigger.md)
+[[Previous]](edit-pipeline.md)
 [[Up]](user-manual.md)
+[[Next]](properties.md)
 
 ## Contact Us
 
@@ -11,8 +12,9 @@ If you have implemented fixes to those problems and improvements, then please su
 
 If you just want to send an email, we are:
 
-Peter Tenenbaum <Peter.Tenenbaum@nasa.gov> (but you can call him PT)  
+Peter Tenenbaum <Peter.Tenenbaum@nasa.gov> (but you can call him PT)<br>
 Bill Wohler <Bill.Wohler@nasa.gov>
 
-[[Previous]](edit-trigger.md)
+[[Previous]](edit-pipeline.md)
 [[Up]](user-manual.md)
+[[Next]](properties.md)
diff --git a/doc/user-manual/customizing-ziggy.md b/doc/user-manual/customizing-ziggy.md
new file mode 100644
index 0000000..ec89cb6
--- /dev/null
+++ b/doc/user-manual/customizing-ziggy.md
@@ -0,0 +1,63 @@
+<!-- -*-visual-line-*- -->
+
+[[Previous]](nicknames.md)
+[[Up]](dusty-corners.md)
+[[Next]](contact-us.md)
+
+## Customizing Ziggy
+
+The [Remote Parameters](remote-parameters.md) article discussed a Java class in Ziggy called `gov.nasa.ziggy.module.remote.RemoteParameters`. You can define your own parameter sets if the `DefaultParameters` is insufficient for your needs. This article discusses how you can do this and more.
+
+### Adding the Ziggy Dependency to Your Build
+
+First, you have to add dependencies to the Ziggy libraries to your build. To do this, run `./gradlew publish` in the Ziggy main directory. Then, add the following to your `build.gradle` file. Your build now has access to the [entire Ziggy Java API](link-to-Javadocs.html).
+
+```groovy
+repositories {
+    mavenCentral()
+    maven {
+        url System.getenv('ZIGGY_HOME') + "/repository"
+        metadataSources {
+            gradleMetadata()
+        }
+    }
+}
+dependencies {
+    implementation 'gov.nasa:ziggy:+'
+}
+```
+
+### Adding a Custom Parameter Class
+
+### Other Customizations You Can Make
+
+List the other things that TESS does to give the reader some ideas.
+
+### Using Ziggy Tools in Your Build
+
+Ziggy has a handful of tools to help build code. A few of the more popular tools include ZiggyCpp for compiling C++, ZiggyCppMex for MATLAB fans, and `ZiggySchemaExport` for exporting database schemas from Hibernate classes. For more information, please refer to the [Ziggy buildSrc Java API](link-to-Javadocs.html).
+
+If you want to use any of these tools, add the following to your `build.gradle` file. This also requires that you run `./gradlew publish` in the Ziggy main directory.
+
+```groovy
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            url System.getenv('ZIGGY_HOME') + "/repository"
+            metadataSources {
+                gradleMetadata()
+            }
+        }
+    }
+    dependencies {
+        classpath 'gov.nasa:ziggy-buildSrc:+'
+    }
+}
+```
+
+The API contains examples for using these tools.
+
+[[Previous]](nicknames.md)
+[[Up]](dusty-corners.md)
+[[Next]](contact-us.md)
diff --git a/doc/user-manual/data-receipt-display.md b/doc/user-manual/data-receipt-display.md
index cbd34e2..9b722a7 100644
--- a/doc/user-manual/data-receipt-display.md
+++ b/doc/user-manual/data-receipt-display.md
@@ -6,15 +6,15 @@
 
 ## Data Receipt Display
 
-The console has the ability to display data receipt activities. From the `Configuration` tab, expand the `Data Receipt` folder and select `Available Datasets`. You'll see something like this:
+The console has the ability to display data receipt activities. Select the `Data Receipt` content menu item. You'll see something like this:
 
-![](images/data-receipt-display.png)
+<img src="images/data-receipt-display.png" style="width:32cm;" />
 
 Double-clicking a row in the table brings up a display of all the files in the dataset:
 
-![](images/data-receipt-list.png)
+<img src="images/data-receipt-list.png" style="width:19cm;" />
 
-Note that the file names are the datastore names. 
+Note that the file names are the datastore names.
 
 [[Previous]](data-receipt-execution.md)
 [[Up]](data-receipt.md)
diff --git a/doc/user-manual/data-receipt-execution.md b/doc/user-manual/data-receipt-execution.md
index cdedb33..437f87a 100644
--- a/doc/user-manual/data-receipt-execution.md
+++ b/doc/user-manual/data-receipt-execution.md
@@ -12,10 +12,10 @@ At the highest level, the purpose of data receipt is to take files delivered fro
   - All of the files that you expected to receive actually showed up.
   - No files showed up that are not expected.
   - The files that showed up were not somehow corrupted in transit.
-- Whoever it was that delivered the files may require a notification that there were no problems with the delivery, so data receipt needs to produce something that can function as the notification. 
-- The data receipt process needs to clean up after itself. In a nutshell, this means that there is no chance that a future data receipt operation fails because of some debris left from a prior data receipt operation, and that there is no chance that a future data receipt operation will inadvertently re-import files that were already imported. 
+- Whoever it was that delivered the files may require a notification that there were no problems with the delivery, so data receipt needs to produce something that can function as the notification.
+- The data receipt process needs to clean up after itself. In a nutshell, this means that there is no chance that a future data receipt operation fails because of some debris left from a prior data receipt operation, and that there is no chance that a future data receipt operation will inadvertently re-import files that were already imported.
 
-The integrity of the delivery is supported by an XML file, the *manifest*, that lists all of the delivered files and contains size and checksum information for each one. After a successful import, Ziggy produces an XML file, the *acknowledgement*, that can be used as a notification to the source of the files that the files were delivered and imported without incident. The cleanup is managed algorithmically by Ziggy. 
+The integrity of the delivery is supported by an XML file, the *manifest*, that lists all of the delivered files and contains size and checksum information for each one. After a successful import, Ziggy produces an XML file, the *acknowledgement*, that can be used as a notification to the source of the files that the files were delivered and imported without incident. The cleanup is managed algorithmically by Ziggy.
 
 With that, let's dive in!
 
@@ -68,7 +68,7 @@ Each file has a `checksum` that's computed using the specified `checksumType`.
 
 ### The Data Receipt Directory
 
-Data receipt needs to have a directory that's used as the source for files that get pulled into the datastore. There's a [property in the properties file](properties.md) that specifies this, namely `data.receipt.dir`. Ziggy allows this directory to be used in either of two ways.
+Data receipt needs to have a directory that's used as the source for files that get pulled into the datastore. There's a [property in the properties file](properties.md) that specifies this, namely `ziggy.pipeline.data.receipt.dir`. Ziggy allows this directory to be used in either of two ways.
 
 #### Files in the Data Receipt Directory
 
@@ -166,7 +166,7 @@ Note that the manifest ignores the fact that import of data is going to treat th
 
 ### Generating Manifests
 
-Ziggy also comes with a utility to generate manifests from the contents of a directory. Use `runjava generate-manifest`. This utility takes 3 command-line arguments:
+Ziggy also comes with a utility to generate manifests from the contents of a directory. Use `ziggy generate-manifest`. This utility takes 3 command-line arguments:
 
 1. Manifest name, required.
 2. Dataset ID, required.
diff --git a/doc/user-manual/data-receipt.md b/doc/user-manual/data-receipt.md
index 32b8f57..a9aeda4 100644
--- a/doc/user-manual/data-receipt.md
+++ b/doc/user-manual/data-receipt.md
@@ -1,21 +1,25 @@
 <!-- -*-visual-line-*- -->
 
-[[Previous]](delete-tasks.md)
+[[Previous]](hpc-cost.md)
 [[Up]](user-manual.md)
 [[Next]](data-receipt-execution.md)
 
 ## Data Receipt
 
-In [the article on pipeline definition](pipeline-definition.md), we mentioned that Ziggy has a special-purpose pipeline module, Data Receipt, that imports data and models into the datastore and which is the only pipeline module the user doesn't need to define. In [the article on starting a pipeline](start-pipeline.md), we led you through starting the sample pipeline, which starts with the data receipt module. 
+In [the article on pipeline definition](pipeline-definition.md), we mentioned that Ziggy has a special-purpose pipeline module, Data Receipt, that imports data and models into the datastore and which is the only pipeline module the user doesn't need to define. In [the article on starting a pipeline](start-pipeline.md), we led you through starting the sample pipeline, which starts with the data receipt module.
 
-So far, so good. However, you've probably noticed that at no point have we told you enough about the details of data receipt for you to feel comfortable putting it into a pipelilne of your own. 
+So far, so good. However, you've probably noticed that at no point have we told you enough about the details of data receipt for you to feel comfortable putting it into a pipeline of your own.
 
 Let's fix that now.
 
-[Execution Flow](data-receipt-execution.md) -- covers the details of manifests, validation, the data receipt directory, and much, much more. 
+### [Data Receipt Execution Flow](data-receipt-execution.md)
 
-[Console Display](data-receipt-display) -- Ziggy provides a panel on the console that shows all of data receipt's activities going back to the beginning of time. 
+This article covers the details of manifests, validation, the data receipt directory, and much, much more.
 
-[[Previous]](delete-tasks.md)
+### [Data Receipt Display](data-receipt-display)
+
+Ziggy provides a panel on the console that shows all of data receipt's activities going back to the beginning of time.
+
+[[Previous]](hpc-cost.md)
 [[Up]](user-manual.md)
 [[Next]](data-receipt-execution.md)
diff --git a/doc/user-manual/datastore-task-dir.md b/doc/user-manual/datastore-task-dir.md
index cf65b49..801de3e 100644
--- a/doc/user-manual/datastore-task-dir.md
+++ b/doc/user-manual/datastore-task-dir.md
@@ -14,9 +14,9 @@ Before we can look at the datastore, we need to find it! Fortunately, we can ref
 
 ```
 pipeline.root.dir = ${ziggy.root}/sample-pipeline
-pipeline.home.dir = ${pipeline.root.dir}/build
-pipeline.results.dir = ${pipeline.home.dir}/pipeline-results
-datastore.root.dir = ${pipeline.results.dir}/datastore
+ziggy.pipeline.home.dir = ${pipeline.root.dir}/build
+ziggy.pipeline.results.dir = ${ziggy.pipeline.home.dir}/pipeline-results
+ziggy.pipeline.datastore.dir = ${ziggy.pipeline.results.dir}/datastore
 ```
 
 Well, you don't see all of those lines laid out as conveniently as the above, but trust me, they're all there. Anyway, what this is telling us is that Ziggy's data directories are in `build/pipeline-results/datastore`. Looking at that location we see this:
@@ -104,7 +104,7 @@ When Ziggy runs algorithm code, it doesn't the algorithm direct access to files
 To find the task directory, look first to the pipeline results location in the properties file:
 
 ```
-pipeline.results.dir=${pipeline.home.dir}/pipeline-results
+ziggy.pipeline.results.dir=${ziggy.pipeline.home.dir}/pipeline-results
 ```
 
 The pipeline-results directory contains a number of subdirectories. First, let's look at task-data:
@@ -181,7 +181,7 @@ st-0$
 Ziggy allows the user to select whether to use actual copies of the files or symbolic links. This is configured in -- yeah, you got it -- the properties file:
 
 ```
-moduleExe.useSymlinks = true
+ziggy.pipeline.useSymlinks = true
 ```
 
 The way this works is obvious for the input files: Ziggy puts a symlink in the working directory, and that's all there is to it. For the outputs file, what happens is that the algorithm produces an actual file of results; when Ziggy goes to store the outputs file, it moves it to the datastore and replaces it in the working directory with a symlink. This is a lot of words to say that you can turn this feature on or off at will and your code doesn't need to do anything different either way.
@@ -193,7 +193,7 @@ The advantages of the symlinks are fairly obvious:
 
 There are also situations in which the symlinks may not be a good idea:
 
-- It may be the case that you're using one computer to run the worker and database, and a different one to run the algorithms. In this situation, the datastore can be on a file system that's mounted on the worker machine but not the compute machine, in which case the symlink solution won't work (the compute node can't see the datastore, so it can't follow the link).
+- It may be the case that you're using one computer to run the supervisor, workers, and database, and a different one to run the algorithms. In this situation, the datastore can be on a file system that's mounted on the supervisor machine but not the compute machine, in which case the symlink solution won't work (the compute node can't see the datastore, so it can't follow the link).
 
 [[Previous]](intermediate-topics.md)
 [[Up]](intermediate-topics.md)
diff --git a/doc/user-manual/delete-tasks.md b/doc/user-manual/delete-tasks.md
deleted file mode 100644
index 7133da3..0000000
--- a/doc/user-manual/delete-tasks.md
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- -*-visual-line-*- -->
-
-[[Previous]](rerun-task.md)
-[[Up]](ziggy-gui-troubleshooting.md)
-[[Next]](select-hpc.md)
-
-## Deleting Tasks
-
-Sometimes it's necessary to stop the execution of tasks after they start running. Tasks that are running as jobs under control of a batch system at an HPC facility will provide command line tools for this, but they're a hassle to use when you're trying to delete a large number of jobs. Trying to delete tasks running locally is likewise hassle-tastic. 
-
-Fortunately, Ziggy will let you do this from the console. 
-
-### Delete all Jobs for a Task
-
-To delete all jobs for a task, go to the tasks table on the Instances panel, right click the task, and select `Delete tasks` from the pop-up menu:
-
-![delete-task-menu-item](images/delete-task-menu-item.png)
-
-You'll be prompted to confirm that you want to delete the task. When you do that, you'll see something like this:
-
-![delete-in-progress](images/delete-in-progress.png)
-
-The state of the task will be immediately moved to `ERROR`, P-state `ALGORITHM_COMPLETE`. The instance will go to state `ERRORS_RUNNING` because the other task is still running; once it completes, the instance will go to `ERRORS_STALLED`. Meanwhile, the alert looks like this:
-
-![delete-alert](images/delete-alert.png)
-
-As expected, it notifies you that the task stopped due to deletion and not due to an error of some kind. 
-
-### Delete all Tasks for an Instance
-
-This is the same idea, except it's the pop-up menu for the instance table, and you select `Delete all tasks`.
-
-[[Previous]](rerun-task.md)
-[[Up]](ziggy-gui-troubleshooting.md)
-[[Next]](select-hpc.md)
diff --git a/doc/user-manual/display-logs.md b/doc/user-manual/display-logs.md
index 750a256..6a55be2 100644
--- a/doc/user-manual/display-logs.md
+++ b/doc/user-manual/display-logs.md
@@ -8,21 +8,21 @@
 
 Ziggy provides a mechanism for viewing task logs that is more convenient than going to the `logs` directory and hunting around.
 
-To use this feature, go to the Instance tab under the Operations tab. Select the task of interest and right-click to bring up the tasks menu:
+To use this feature, go to the instances panel, select the task of interest and right-click to bring up the tasks menu:
 
-<img src="images/tasks-menu.png" style="zoom:50%;"/>
+<img src="images/tasks-menu.png" style="width:15cm;"/>
 
 Select `List task logs`. You'll get this dialog box:
 
-![](images/logs-list.png)
+<img src="images/logs-list.png" style="width:18cm;"/>
 
 By default the logs are ordered by name, which means that they're also ordered by time, from earliest to latest. If you double-click on one of the rows in the table, the log file in question will be opened in a new window:
 
-![](images/task-log-display.png)
+<img src="images/task-log-display.png" style="width:30cm;"/>
 
 The log will always be opened with the view positioned at the end of the log, since that's most often where you can find messages that inform you about the problems. In this case, that's not true, so you can use the `To Top` button to jump to the start of the log, or simply scroll around until you find what you're looking for:
 
-![](images/task-log-showing-problem.png)
+<img src="images/task-log-showing-problem.png" style="width:30cm;"/>
 
 Here you can see the stack trace produced by the Python algorithm when it deliberately threw an exception, and the Java stack trace that was generated when Ziggy detected that the algorithm had thrown an exception. As it happens, the log shows exactly what the problem is: the user set the parameter that tells subtask 0 to fail, and subtask 0 duly failed.
 
diff --git a/doc/user-manual/downloading-and-building-ziggy.md b/doc/user-manual/downloading-and-building-ziggy.md
index 06e4357..36ad69e 100644
--- a/doc/user-manual/downloading-and-building-ziggy.md
+++ b/doc/user-manual/downloading-and-building-ziggy.md
@@ -6,7 +6,7 @@
 
 ## Downloading and Building Ziggy
 
-Before you start, you should check out the [system requirements](system-requirements.md) article. This will ensure that you have the necessary hardware and software to follow the steps in this article. 
+Before you start, you should check out the [system requirements](system-requirements.md) article. This will ensure that you have the necessary hardware and software to follow the steps in this article.
 
 ### Downloading Ziggy
 
@@ -20,7 +20,7 @@ LICENSE.pdf     doc                  gradlew            script-plugins
 README.md       etc                  ide                settings.gradle
 build.gradle    gradle               licenses           src
 buildSrc        gradle.properties    sample-pipeline    test
-ziggy$ 
+ziggy$
 ```
 
 Let's go through these items:
@@ -28,13 +28,13 @@ Let's go through these items:
 - The files `build.gradle`, `settings.gradle`, `gradle.properties`, and `gradlew` are used by our build system. Hopefully you won't need to know anything more about them than that.
 - Likewise, directories `gradle` and `script-plugins` are used in the build.
 - The `buildSrc` directory contains some Java and Groovy classes that are part of Ziggy but are used by the build. The idea here is that Gradle allows users to extend it by defining new kinds of build tasks; those new kinds of build tasks are implemented as Java or Groovy classes and by convention are put into a "buildSrc" folder. This is something else you probably won't need to worry about; certainly not any time soon.
-- The `doc` directory contains this user manual, plus a bunch of other, more technical documentation. 
+- The `doc` directory contains this user manual, plus a bunch of other, more technical documentation.
 - The `etc` directory contains files that are used as configuration inputs to various programs. This is things like: the file that tells the logger how to format text lines, and so on. Two of these are going to be particularly useful and important to you: the ziggy.properties file, and the pipeline.properties.EXAMPLE file. These files provide all of the configuration that Ziggy needs to locate executables, working directories, data storage, and etc. We'll go into a lot of detail on this at the appropriate time.
-- The `ide` directory contains auxiliary files that are useful if you want to develop Ziggy in the Eclipse IDE. 
-- The `licenses` directory contains information about both the Ziggy license and the licenses of third-party applications and libraries that Ziggy uses. 
-- The `src` directory contains the directory tree of Ziggy source code, both main classes and test classes. 
-- The `test` directory contains test data for Ziggy's unit tests. 
-- The `sample-pipeline` directory contains the source and such for the sample pipeline. 
+- The `ide` directory contains auxiliary files that are useful if you want to develop Ziggy in the Eclipse IDE.
+- The `licenses` directory contains information about both the Ziggy license and the licenses of third-party applications and libraries that Ziggy uses.
+- The `src` directory contains the directory tree of Ziggy source code, both main classes and test classes.
+- The `test` directory contains test data for Ziggy's unit tests.
+- The `sample-pipeline` directory contains the source and such for the sample pipeline.
 
 ### Building Ziggy
 
@@ -58,17 +58,17 @@ ziggy$ ./gradlew
 ar: creating archive ziggy/build/lib/libziggy.a
 ar: creating archive ziggy/build/lib/libziggymi.a
 
-> Task :compileJava 
+> Task :compileJava
 Note: Some input files use or override a deprecated API.
 Note: Recompile with -Xlint:deprecation for details.
 
 
 BUILD SUCCESSFUL in 14s
 19 actionable tasks: 19 executed
-ziggy$ 
+ziggy$
 ```
 
-At this point, it's probably worthwhile to run Ziggy's unit tests to make sure nothing has gone wrong. To do this, at the command line type `./gradlew test`. The system will run through a large number of tests (around 700) over the course of about a minute, and hopefully you'll get another "BUILD SUCCESSFUL" message at the end. 
+At this point, it's probably worthwhile to run Ziggy's unit tests to make sure nothing has gone wrong. To do this, at the command line type `./gradlew test`. The system will run through a large number of tests (around 700) over the course of about a minute, and hopefully you'll get another "BUILD SUCCESSFUL" message at the end.
 
 If you look at the Ziggy folder now, you'll see the following:
 
@@ -78,7 +78,7 @@ LICENSE.pdf     buildSrc    gradle.properties    sample-pipeline    test
 README.md       doc         gradlew              script-plugins
 build           etc         ide                  settings.gradle
 build.gradle    gradle      licenses             src
-ziggy$ 
+ziggy$
 ```
 
 Pretty much the same, except that now there's a `build` folder. What's in the `build` folder?
@@ -87,24 +87,24 @@ Pretty much the same, except that now there's a `build` folder. What's in the `b
 build$ ls
 bin        etc        lib     obj          schema    tmp
 classes    include    libs    resources    src
-build$ 
+build$
 ```
 
 The main folders of interest here are:
 
-- The `bin` folder, which has all the executables. 
+- The `bin` folder, which has all the executables.
 - The `lib` folder, which has shared object libraries (i.e., compiled C++)
 - The `libs` folder, which has Jarfiles (so why not name it "jars"? I don't know).
-- The `etc` folder, which is a copy of the main `ziggy/etc` folder. 
+- The `etc` folder, which is a copy of the main `ziggy/etc` folder.
 
-Everything that Ziggy uses in execution comes from the subfolders of `build`. That's why there's a copy of `etc` in `build`: the `etc` in the main directory isn't used, the one in `build` is, so that everything that Ziggy needs is in one place. 
+Everything that Ziggy uses in execution comes from the subfolders of `build`. That's why there's a copy of `etc` in `build`: the `etc` in the main directory isn't used, the one in `build` is, so that everything that Ziggy needs is in one place.
 
 Before we move on, a few useful details about building Ziggy:
 
 - Ziggy makes use of a number of dependencies. Most of them are Jarfiles, which means that they can be downloaded and used without further ado, but at least one, the [HDF5 library](https://www.hdfgroup.org/solutions/hdf5/), requires compilation via the C++ compiler. This is the most time-consuming part of the build.
-- The first time you run `./gradlew`, the dependencies will be automatically downloaded. On subsequent builds with `./gradlew`, the dependencies will mostly not be downloaded, but instead cached copies will be used. This means that the subsequent uses are much faster. 
-- Why "mostly not ... downloaded?" Well, the build system checks the dependencies to see whether any new versions have come out. New versions of the third party libraries are automatically downloaded in order to ensure that Ziggy remains up-to-date with security patches. So on any given invocation of `./gradlew`, there might be a library or two that gets updated. 
-- Gradle has lots of commands (known in the lingo as "tasks") other than `test`. Most notably, the `./gradlew clean` command will delete the build directory so you can start the build over from the beginning. The `./gradlew build` command will first build the code and then run the unit tests. 
+- The first time you run `./gradlew`, the dependencies will be automatically downloaded. On subsequent builds with `./gradlew`, the dependencies will mostly not be downloaded, but instead cached copies will be used. This means that the subsequent uses are much faster.
+- Why "mostly not ... downloaded?" Well, the build system checks the dependencies to see whether any new versions have come out. New versions of the third party libraries are automatically downloaded in order to ensure that Ziggy remains up-to-date with security patches. So on any given invocation of `./gradlew`, there might be a library or two that gets updated.
+- Gradle has lots of commands (known in the lingo as "tasks") other than `test`. Most notably, the `./gradlew clean` command will delete the build directory so you can start the build over from the beginning. The `./gradlew build` command will first build the code and then run the unit tests.
 
 If all is going well, you're now ready to move on to [defining your own pipeline](configuring-pipeline.md)!
 
diff --git a/doc/user-manual/dusty-corners.md b/doc/user-manual/dusty-corners.md
index d654da8..72c8e7e 100644
--- a/doc/user-manual/dusty-corners.md
+++ b/doc/user-manual/dusty-corners.md
@@ -8,16 +8,36 @@
 
 Like most software packages, Ziggy has some features that don't see a lot of use or that only get exercised under unusual circumstances. Those oddballs are documented here.
 
-[More on the Relational Database](more-rdbms.md) -- techically the RDBMS is used all the time, but there are a few details about what we do with it that are potentially interesting to users. 
+### [More on the Relational Database](more-rdbms.md)
 
-[More on Parameter Sets](more-parameter-sets.md) -- importing, modifying, version control, and more!
+Techically the RDBMS is used all the time, but there are a few details about what we do with it that are potentially interesting to users.
 
-[Parameter Overrides](parameter-overrides.md) -- how to conveniently package a collection of parameter changes.
+### [More on Parameter Sets](more-parameter-sets.md)
 
-[Redefining a Pipeline](redefine-pipeline.md) -- what to do if you realize that you need to change the configuration of a pipeline.
+Importing, modifying, version control, and more!
 
-[The Edit Trigger Dialog Box](edit-trigger.md) -- additional features on a dialog box we've already used. 
+### [Parameter Overrides](parameter-overrides.md)
+
+How to conveniently package a collection of parameter changes.
+
+### [Redefining a Pipeline](redefine-pipeline.md)
+
+What to do if you realize that you need to change the configuration of a pipeline.
+
+### [The Edit Pipeline Dialog Box](edit-pipeline.md)
+
+Additional features on a dialog box we've already used.
+
+### [Creating Ziggy Nicknames](nicknames.md)
+
+Make it easier to run those Java programs you've written.
+
+<!--
+### [Customizing Ziggy](customizing-ziggy.md)
+
+Add your own parameter set types and more.
+-->
 
 [[Previous]](event-handler-labels.md)
 [[Up]](user-manual.md)
-[[Next]](more-rdbms.md)
\ No newline at end of file
+[[Next]](more-rdbms.md)
diff --git a/doc/user-manual/edit-pipeline.md b/doc/user-manual/edit-pipeline.md
new file mode 100644
index 0000000..efef228
--- /dev/null
+++ b/doc/user-manual/edit-pipeline.md
@@ -0,0 +1,88 @@
+<!-- -*-visual-line-*- -->
+
+[[Previous]](parameter-overrides.md)
+[[Up]](dusty-corners.md)
+[[Next]](nicknames.md)
+
+## The Edit Pipeline Dialog Box
+
+The Edit Pipeline dialog box is used to edit pipeline parameter sets and modules.
+
+To get to this dialog box, open the pipelines panel and double-click the pipeline you're interested in. You'll get this dialog box:
+
+<img src="images/edit-pipeline.png" style="width:13cm;" />
+
+What does all this stuff do? Let's go through it from the top to the bottom ("Hmm -- I got 'em!'" -C+C Music Factory).
+
+### Pipeline Section
+
+The main actions you can take from this section is to validate the pipeline and view or export parameters.                   
+
+The `Validate` button is a vestige of a bygone era. It looks for issues with the pipeline's parameter sets that are largely impossible today, but which were common in Ziggy's predecessor software packages.
+
+The `Report` button brings up a new window that shows the modules and parameter sets for this pipeline. The report can also be saved to a text file. This dialog is mainly useful in the context of a fairly complex system, in which you want to isolate the bits and pieces of a specified pipeline from the general mass of bits and pieces in the system.
+
+The `Export parameters` button exports the parameters used by this pipeline, in a kind of hokey and non-standard format. The advantage this has over using the export function on the parameter library panel is that it only exports the parameter sets used by this pipeline. In a situation where you have a lot of pipelines, with a lot of parameters, it's potentially useful to be able to see just the parameters for a given pipeline.
+
+The `Priority` field takes a little more explanation. We've discussed in the past the fact that Ziggy sometimes faces a situation in which Ziggy has more tasks waiting for attention than it has worker processes ready to service the tasks. In this case, Ziggy has to prioritize the tasks to ensure that the most critical ones get attention first. The pipeline priority is one way this sorting occurs. Tasks with higher priority get to leap ahead of tasks with lower priority in the queue. The available priorities are LOWEST, LOW, NORMAL, HIGHEST, HIGH. 
+
+So how to tasks get assigned a priority?
+
+All tasks that are running for the first time get assigned a priority equal to the priority of the parent pipeline. In this example, the sample pipeline has a priority of NORMAL, meaning that all tasks for this pipeline will have the lowest possible priority on their first pass through the system. Tasks that are being persisted (which happens on a separate pass through the task management system) do so with priority HIGH, so persisting results takes precedence over starting new tasks. Tasks that are being rerun or restarted do so with priority HIGHEST, which means exactly what it sounds like. 
+
+All pipelines, in turn, are initially created with priority NORMAL, meaning that all pipelines will, by default, produce tasks at priority NORMAL. Thus, all tasks from all pipelines compete for workers with a "level playing field," if you will. Usually this is the situation that most users want.
+
+One case where this isn't true is missions that have occasional need for much faster turnaround of data processing. That is to say, most data can be processed through Pipeline X on a first-come, first-served basis; but occasionally there will be a need to process a small amount of just-acquired data through Pipeline Y immediately. To ensure that this happens, you can set Pipeline Y to have a priority of HIGH or HIGHEST.
+
+Finally, the read-only `Valid?` checkbox is ticked after the `Validate` button is pressed, presuming all went well.  
+
+### Pipeline Parameter Sets Section
+
+Say that five times fast.
+
+Anyway.
+
+This section shows a list of the parameter sets that are assigned at the pipeline level (that is to say, parameter sets that are made available to every task regardless of which processing module it uses). The `Add` button allows you to select any parameter set in the parameter library and make it a pipeline parameter set for this pipeline. The `Edit` button allows you to change the values of the parameters in a given set. The `Select` and `Auto-assign` buttons do things that used to be useful, but in the current version of Ziggy are not.
+
+Given that the parameter library panel already allows you to view and edit parameters, why is it useful to have this section on this dialog box? Again -- in the case where you have a lot of pipelines and a lot of parameters, it's useful to be able to view the parameters for a given pipeline in isolation. This allows you to avoid confusion about which parameters go to which pipelines.
+
+### Modules Section
+
+The `Modules` section offers functions that address the pipeline modules within a given pipeline.
+
+The display shows the modules in the pipeline, sorted in execution order. You can select a module and press one of the following buttons:
+
+#### Task Information Button
+
+This button produces a table of the tasks that Ziggy will produce for the specified module if you start the pipeline. This takes into account whether the module is configured for "keep-up" processing or reprocessing, the setting of the taskDirectoryRegex string (which allows the user to specify that only subsets of the datastore should be run through the pipeline). For each task, the task's unit of work description and number of subtasks are shown. If the table is empty, it means that the relevant files in the datastore are missing. The datastore is populated by [Data Receipt](data-receipt.md); that article will help you ingest your data into the datastore so that the task information table can calculate the number of tasks and subtasks the input data will generate.
+
+#### Resources Button
+
+If you look back at [the article on running the cluster](running-pipeline.md), you'll note that we promised that there was a way to set a different limit on the number of workers for each pipeline module. This button is that way! 
+
+More specifically, if you press the `Resources` button, you'll get the `Worker resources` dialog box that displays a table of the modules and the current max workers and heap size settings. To change these settings from the default, either double-click on a module or use the context menu and choose the `Edit` command. This brings up the `Edit worker resources` dialog box where you can uncheck the Default checkboxes and enter new values for the number of workers or the heap size for that module. Note that the console won't let you enter more workers than cores on your machine, which is found in the the tooltip for this field. Henceforth, Ziggy will use those values when deciding on the maximum number of workers to spin up for that module and how much memory each should be given. Typically, as you increase the number of workers on a single host, you'll need to reduce the amount of heap space for each worker so that the total memory will fit within the memory available on the machine.
+
+Alternately, you may want to do the reverse: take a module that has user-set maximum workers or heap size values and tick the Default checkboxes to go back to using the defaults.
+
+#### Parameters Button
+
+This button brings up the `Edit parameter sets` dialog box that displays a table of module-level parameter sets. The user can edit the existing parameter sets, or add a parameter set to a given module. The not-useful `Select` and `Auto-assign` buttons are also present.
+
+#### Remote Execution Button
+
+This button brings up the `Edit remote execution parameters` dialog box. See [the article on the remote execution dialog](remote-dialog.md) for more information.
+
+### Save and Cancel
+
+You're probably thinking, "How much do I really need to know about Save and Cancel buttons?" Well, yeah, they're mostly self-explanatory. But not completely!
+
+To save changes that you've made on the `Edit pipeline` dialog box, or any other dialog box that it spawned, use the `Save` button. To discard all your changes, use the `Cancel` button. 
+
+The points I'm trying to make here are twofold:
+
+1. Anything you do after you launch the `Edit pipeline` dialog box can be discarded, and will only be preserved when you press `Save`.
+2. The `Save` and `Cancel` buttons on the `Edit pipeline` dialog box also apply to changes made on the `Edit remote execution parameters` dialog box, the `Edit parameter sets` dialog box, etc.
+
+[[Previous]](parameter-overrides.md)
+[[Up]](dusty-corners.md)
+[[Next]](nicknames.md)
diff --git a/doc/user-manual/edit-trigger.md b/doc/user-manual/edit-trigger.md
deleted file mode 100644
index 8b13321..0000000
--- a/doc/user-manual/edit-trigger.md
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- -*-visual-line-*- -->
-
-[[Previous]](parameter-overrides.md)
-[[Up]](dusty-corners.md)
-[[Next]](contact-us.md)
-
-## The Edit Trigger Dialog Box
-
-The Edit Trigger dialog box is a kind of grab-bag of various features related to managing pipeline execution. The name of the dialog box relates to an archaic time in which there were specialized Java objects, called "triggers," for launching pipelines (this is also why starting a pipeline requires the user to hit a button labeled "Fire!" Because you fire a trigger).
-
-To get to this dialog box, go to Operations > Triggers, and double-click the pipeline you're interested in. You'll get this dialog box:
-
-<img src="images/edit-trigger.png" style="zoom:50%;" />
-
-What does all this stuff do? Let's go through it from the top to the bottom ("Hmm -- I got 'em!'" -C+C Music Factory).
-
-### Trigger Panel
-
-The main actions you can take from this panel are viewing or exporting parameters, and validation of the pipeline. 
-
-The `export params` button exports the parameters used by this pipeline, in a kind of hokey and non-standard format. The advantage this has over using the export function on the Parameters Configuration panel is that it only exports the parameter sets used by this pipeline. In a situation where you have a lot of pipelines, with a lot of parameters, it's potentially useful to be able to see just the parameters for a given pipeline. 
-
-The `report` button brings up a new window that shows the modules and parameter sets for this pipeline. The report can also be saved to a text file. Again: mainly useful in the context of a fairly complex system, in which you want to isolate the bits and pieces of a specified pipeline from the general mass of bits and pieces in the system. 
-
-The `validate` button is a vestige of a bygone era. It looks for issues with the pipeline's parameter sets that are largely impossible today, but which were common in Ziggy's predecessor software packages. 
-
-### Priority Panel
-
-We've discussed in the past the fact that Ziggy sometimes faces a situation in which Ziggy has more tasks waiting for attention than it has worker threads ready to service the tasks. In this case, Ziggy has to prioritize the tasks to ensure that the most critical ones get attention first. 
-
-The pipeline priority is one way this sorting occurs. Ziggy uses a system in which priority == 0 is the highest priority, priority == 4 the lowest. Tasks with higher priority get to leap ahead of tasks with lower priority in the queue. 
-
-So how to tasks get assigned a priority? 
-
-All tasks that are running for the first time get assigned a priority equal to the priority of the parent pipeline. In this example, the sample pipeline has a priority of 4, meaning that all tasks for this pipeline will have the lowest possible priority on their first pass through the system. All tasks that are being rerun or restarted are given priority 0, so all restart / rerun tasks have priority over any never-yet-run tasks. 
-
-All pipelines, in turn, are initially created with priority 4, meaning that all pipelines will, by default, produce tasks at priority 4. Thus, all tasks from all pipelines compete for workers with a "level playing field," if you will. Usually this is the situation that most users want. 
-
-One case where this isn't true is missions that have occasional need for much faster turnaround of data processing. That is to say, most data can be processed through Pipeline X on a first-come, first-served basis; but occasionally there will be a need to process a small amount of just-acquired data through Pipeline Y immediately. To ensure that this happens, you can set Pipeline Y to have a priority of 0.
-
-### Pipeline Parameter Sets Panel
-
-Say that five times fast. 
-
-Anyway.
-
-This panel shows a list of the parameter sets that are assigned at the pipeline level (that is to say, parameter sets that are made available to every task regardless of which processing module it uses). The `add` button allows you to select any parameter set in the parameter library and make it a pipeline parameter set for this pipeline. The `edit values` button allows you to change the values of the parameters in a given set. The `select` and `auto-assign` buttons do things that used to be useful, but in the current version of Ziggy are not. 
-
-Given that the Parameter Library Configuration panel already allows you to view and edit parameters, why is it useful to have this panel on this dialog box? Again -- in the case where you have a lot of pipelines and a lot of parameters, it's useful to be able to view the parameters for a given pipeline in isolation. This allows you to avoid confusion about which parameters go to which pipelines. 
-
-### Modules Panel
-
-The `Modules` panel offers functions that address the pipeline modules within a given pipeline. 
-
-The display shows the modules in the pipeline, sorted in execution order. You can select a module and then use the buttons beneath the list to execute hopefully-useful actions:
-
-#### Task Information Button
-
-This button produces a table of the tasks that Ziggy will produce for the specified module if you start the pipeline. This takes into account whether the module is configured for "keep-up" processing or reprocessing, the setting of the taskDirectoryRegex string (which allows the user to specify that only subsets of the datastore should be run through the pipeline). For each task, the task's unit of work description and number of subtasks are shown. 
-
-#### Edit Parameters Button
-
-This button brings up a table of module-level parameter sets. The user can edit the existing parameter sets, or add a parameter set to a given module. The not-useful `select` and `auto-assign` buttons are also present. 
-
-#### Re-Sync Button 
-
-This button deletes any local changes you've made to the parameter values and/or parameter set assignments, and reloads the parameters for the selected module from the database. 
-
-#### Remote Execution Button
-
-This button brings up the remote execution dialog box. See [the article on the remote execution dialog](remote-dialog.md) for more information. 
-
-[[Previous]](parameter-overrides.md)
-[[Up]](dusty-corners.md)
-[[Next]](contact-us.md)
diff --git a/doc/user-manual/event-handler-definition.md b/doc/user-manual/event-handler-definition.md
index 819b161..efd6a66 100644
--- a/doc/user-manual/event-handler-definition.md
+++ b/doc/user-manual/event-handler-definition.md
@@ -17,22 +17,21 @@ The event handler demonstrated in the sample pipeline is in [pe-sample.xml](../.
 ```xml
 <pipelineEvent name="data-receipt" pipelineName="sample"
                enableOnClusterStart="false"
-               directory="${data.receipt.dir}"/>
+               directory="${ziggy.pipeline.data.receipt.dir}"/>
 ```
 
- The `pipelineEvent` element straightforwardly defines the name of the event handler itself and the name of the pipeilne it triggers. The `enableOnClusterStart` attribute tells Ziggy whether the event handler should be enabled immediately when you type `runjava cluster start`, or whether it should require a human to go in and turn it on via the console after the cluster is already up and running.
+The `pipelineEvent` element straightforwardly defines the name of the event handler itself and the name of the pipeilne it triggers. The `enableOnClusterStart` attribute tells Ziggy whether the event handler should be enabled immediately when you type `ziggy cluster start`, or whether it should require a human to go in and turn it on via the console after the cluster is already up and running.
 
 The `directory` attribute is, of course, the directory where the event handler looks for its ready files. In this case, the data receipt event handler looks for ready files in the same directory where the data receipt pipeline module looks for files (or directories of files). That was a design choice, though you wouldn't need to do it that way: you could have a totally separate directory for the event handler to watch, if such was your preference.
 
 Note here that, rather than a normal string, the directory attribute can take a string that needs to be expanded into [one of Ziggy's properties](properties.md). This allows you to specify all the watched directories in the properties file. Note **that this is the only attribute or element in all of Ziggy's XML infrastructure that allows the use of property expansion notation!** That's strictly because it's the only place where we thought we needed it. If you need this added to some other part of the XML infrastructure for your purposes, let us know. We can make it happen!
 
+[[Previous]](event-handler-intro.md)
+[[Up]](event-handler.md)
+[[Next]](event-handler-examples.md)
+
 <!--
 
 TODO Consider allowing property interpolation more generally (ZIGGY-173: Add property interpolation to XML files) and say so here. In addition, it would also be good to talk about properties in XML files in the "Write the Pipeline Configuration Files" section of configuring-pipeline.md and to mention that you have to restart the cluster (which we haven't done yet, but will soon, we promise!)
 
 -->
-
-[[Previous]](event-handler-intro.md)
-[[Up]](event-handler.md)
-[[Next]](event-handler-examples.md)
-
diff --git a/doc/user-manual/event-handler-examples.md b/doc/user-manual/event-handler-examples.md
index 2b5fad1..37e48e3 100644
--- a/doc/user-manual/event-handler-examples.md
+++ b/doc/user-manual/event-handler-examples.md
@@ -6,9 +6,9 @@
 
 ## Event Handler Examples
 
-Now that we've looked at the general concept of event handlers, and we've talked about how to define an event handler, let's work through some examples using the sample pipeline. 
+Now that we've looked at the general concept of event handlers, and we've talked about how to define an event handler, let's work through some examples using the sample pipeline.
 
-Note that for these examples, the sample pipeline has been restored to its original state. That is to say, the `sample-pipeline/build` directory has been deleted, the `sample-pipeline/build-env.sh` script has been executed, and we've used `runjava cluster init` to set up the cluster (see the articles on [Building a Pipeline](building-pipeline.md) and [Running the Cluster](running-pipeline.md) for more information on these topics). Once that's done, use `runjava cluster start console &` to start the cluster and bring up a console instance. 
+Note that for these examples, the sample pipeline has been restored to its original state. That is to say, the `sample-pipeline/build` directory has been deleted, the `sample-pipeline/build-env.sh` script has been executed, and we've used `ziggy cluster init` to set up the cluster (see the articles on [Building a Pipeline](building-pipeline.md) and [Running the Cluster](running-pipeline.md) for more information on these topics). Once that's done, use `ziggy cluster start console &` to start the cluster and bring up a console instance.
 
 ### A Simple Example: One Ready File
 
@@ -27,46 +27,44 @@ nasa_logo-set-2-file-2.png
 nasa_logo-set-2-file-3.png
 sample-model.txt
 sample-pipeline-manifest.xml
-$ 
+$
 ```
 
 A bunch of data files, a model, and a manifest. Seems like this is a directory that is ready to be imported and run through the sample pipeline!
 
 To make that happen, we need to do two things.
 
-First, we need to turn on the data receipt event handler. To do that, select the Configurations tab, Event Definitions button. You'll see this (except without the redaction bar covering the front part of the directory name):
-
-![](images/event-handler-display-1.png)
+First, we need to turn on the data receipt event handler. To do that, go to the event definitions panel. You'll see this (the directory path here and elsewhere will be fully qualified):
 
-This display is mostly pretty self-explanatory: for each event handler it shows the name, the directory it watches for the ready files, and the pipeline that will be started when the event is detected. The last column tells you whether the event handler is currently watching for events. It's a checkbox, which in this case is not checked, meaning that the event handler isn't watching the data-receipt directory for ready files. 
+<img src="images/event-handler-display-1.png" style="width:32cm;"/>
 
-Click on the check box and you'll now see this:
+This display is mostly pretty self-explanatory: for each event handler it shows the name, the directory it watches for the ready files, and the pipeline that will be started when the event is detected. The last column tells you whether the event handler is currently watching for events. It's a checkbox, which in this case is not checked, meaning that the event handler isn't watching the data-receipt directory for ready files.
 
-![](images/event-handler-display-2.png)
+Click on the check box to enable this event handler.
 
-The second thing we need to do is to create the ready file. Before you do that, go to the Instances tab of the Operations tab so that you can see what happens as it happens. Once you've done that, create the ready file:
+The second thing we need to do is to create the ready file. Before you do that, go to the instances panel so that you can see what happens as it happens. Once you've done that, create the ready file:
 
 ```bash
 $ touch sample-pipeline/build/pipeline-results/data-receipt/READY.test1.1
 $
 ```
 
-Once you do this, the Pi light on the console will quickly turn green. After a few seconds, you'll see a new pipeline instance appear:
+Once you do this, the Pi light on the console will quickly turn green. After a few seconds, you'll see a new pipeline instance appear in the instances panel:
 
-![](images/event-handler-instances-1.png)
+<img src="images/event-handler-instances-1.png" style="width:19cm;"/>
 
-The event handler automatically names the pipeline with the "bare" pipeline name ("sample"), the event handler name ("data-receipt"), and the timestamp of the event that started the processing. Meanwhile, the task table looks like this:
+The event handler automatically names the pipeline with the "bare" pipeline name ("sample"), the event handler name ("data-receipt"), and the timestamp of the event that started the processing. The Event name column shows the name of the event handler as well ("data-receipt"). Note that the Event name column is initially hidden as it duplicates the information in the pipeline name. If you want to sort the table by the event handler name, use the context menu in the table header to enable to Event name column. Then you can click in the header to update the sort. Meanwhile, the tasks table looks like this:
 
-![](images/event-handler-tasks-1.png)
+<img src="images/event-handler-tasks-1.png" style="width:19cm;"/>
 
-The data receipt task ran to completion before the display could even update, and the pipeline went on to its `permuter` tasks. After the usual few seconds, the pipeline will finish, with `flip` and `averaging` tasks. 
+The data receipt task ran to completion before the display could even update, and the pipeline went on to its `permuter` tasks. After the usual few seconds, the pipeline will finish, with `flip` and `averaging` tasks.
 
 ### A More Involved Example: Multiple Deliveries, Multiple Directories
 
 For the next trick, the first step is to copy the contents of the `multi-data` directory into `data-receipt`:
 
 ```bash
-$ cp -r sample-pipeline/multi-data/* sample-data/build/pipeline-results/data-receipt
+$ cp -r sample-pipeline/multi-data/* sample-pipeline/build/pipeline-results/data-receipt
 $
 ```
 
@@ -78,24 +76,24 @@ Listing for: sample-pipeline/build/pipeline-results/data-receipt/
 sample-1
 sample-2
 sample-3
-$ 
+$
 ```
 
 You can confirm for yourself that `sample-1`, `sample-2`, and `sample-3` are directories, each of which contains data files and a manifest. In this case, we've made things more complicated than the initial example, to wit: each of the sample directories contains 2 sets of data (`set-3` and `set-4` in `sample-1`, `set-5` and `set-6` in `sample-2`, and `set-7` and `set-8` in `sample-3`. )
 
-For this example, we're going to simulate the following situation: 
+For this example, we're going to simulate the following situation:
 
-Two different sources are pushing data into the data-receipt directory. The first source is responsible for `sample-1` and `sample-2`; the other is responsible for `sample-3`. At some point, the first source has finished its deliveries but the second has not. This is the point at which the example will start. 
+Two different sources are pushing data into the data-receipt directory. The first source is responsible for `sample-1` and `sample-2`; the other is responsible for `sample-3`. At some point, the first source has finished its deliveries but the second has not. This is the point at which the example will start.
 
 Before we do that, though, let's reconfigure the pipeline a bit. First, we need to tell data receipt that it should expect files to be in the subdirectories of data-receipt. To do this, return to Configuration > Parameter Library, select `Data receipt configuration`, and modify the `taskDirectoryRegex`:
 
-<img src="images/data-receipt-use-subdirs.png" style="zoom:50%;" />
+<img src="images/data-receipt-use-subdirs.png" style="width:11cm;" />
 
 Second, let's tell the pipeline that we only want it to process new data that's never been processed, and it should leave alone any data that's been successfully processed before this. To do so, select the `Multiple subtask configuration` and the `Single subtask configuration` parameter sets, and uncheck the reprocess box:
 
-<img src="images/disable-reprocess.png" style="zoom:50%;" />
+<img src="images/disable-reprocess.png" style="width:11cm;" />
 
-Now return to the Operations > Instances tab, and finally create the ready files. Remember that you need two ready files because we are simulating a complete delivery from the first source, and it's delivering to the `sample-1` and `sample-2` directories. 
+Now return to the instances panel, and finally create the ready files. Remember that you need two ready files because we are simulating a complete delivery from the first source, and it's delivering to the `sample-1` and `sample-2` directories.
 
 ```bash
 $ touch sample-pipeline/build/pipeline-results/data-receipt/sample-1.READY.test2.2
@@ -105,45 +103,45 @@ $
 
 As soon as the second ready file is created, a new pipeline instance will start:
 
-![](images/event-handler-instances-2.png)
+<img src="images/event-handler-instances-2.png" style="width:19cm;"/>
 
 The tasks display will look like this:
 
-![](images/event-handler-tasks-2.png)
+<img src="images/event-handler-tasks-2.png" style="width:19cm;"/>
 
 There's a fair amount of interesting stuff going on here, so let's dig into this display!
 
 #### Data Receipt Tasks
 
-There are two data receipt tasks, `sample-1` and `sample-2`. These are the tasks that ran against the `sample-1` and `sample-2` subdirectories, respectively, of the main data receipt directory. As we expected and advertised, by giving the ready files labels of `sample-1` and `sample-2`, we were able to get Ziggy to import from those directories while leaving the `sample-3` directory alone. 
+There are two data receipt tasks, `sample-1` and `sample-2`. These are the tasks that ran against the `sample-1` and `sample-2` subdirectories, respectively, of the main data receipt directory. As we expected and advertised, by giving the ready files labels of `sample-1` and `sample-2`, we were able to get Ziggy to import from those directories while leaving the `sample-3` directory alone.
 
 #### Permuter Tasks for UOWs 3, 4, 5, and 6
 
-The two directories that were imported by data receipt contained a total of 4 data sets: `set-3`, `set-4`, `set-5`, and `set-6`. These ran with task IDs 11, 12, 13, and 14. Note that the data sets didn't get mapped to task IDs in the way that a person would do it, i.e., making `set-3` the first task, then `set-4`, etc. As a general matter, when Ziggy needs to make multiple tasks for a given pipeline module, it creates them in no particular order, so you can wind up with situations like the one we see above. 
+The two directories that were imported by data receipt contained a total of 4 data sets: `set-3`, `set-4`, `set-5`, and `set-6`. These ran with task IDs 11, 12, 13, and 14. Note that the data sets didn't get mapped to task IDs in the way that a person would do it, i.e., making `set-3` the first task, then `set-4`, etc. As a general matter, when Ziggy needs to make multiple tasks for a given pipeline module, it creates them in no particular order, so you can wind up with situations like the one we see above.
 
-Another curious thing that's happened is that tasks 11 and 12 got as far as processing state `Ac` (Algorithm Complete, see the article on the [Instances Panel](instances-panel.md) for more information). At that point, we would have expected those tasks to store outputs and then go to processing state `C` (Complete). Instead, tasks 11 and 12 seem to wait in state `Ac` while tasks 13 and 14 execute their algorithms. Why is that? 
+Another curious thing that's happened is that tasks 11 and 12 got as far as processing state `Ac` (Algorithm Complete, see the article on the [Instances Panel](instances-panel.md) for more information). At that point, we would have expected those tasks to store outputs and then go to processing state `C` (Complete). Instead, tasks 11 and 12 seem to wait in state `Ac` while tasks 13 and 14 execute their algorithms. Why is that?
 
-Take a quick look at the properties file, `sample-pipeline/etc/sample.properties`, and you'll see the following line: 
+Take a quick look at the properties file, `sample-pipeline/etc/sample.properties`, and you'll see the following line:
 
 ```
-pi.worker.threadCount = 2
+ziggy.worker.count = 2
 ```
 
-(See the article on [Properties](properties.md) to refresh your memory on this). This means that the worker has 2 and only 2 worker threads that can be used for assorted task processing activities. In this case, that creates a problem: there are only 2 worker threads but 6 tasks that need to run, and each task needs to perform several steps (marshaling, algorithm execution, storing results). Ziggy needs to prioritize users of its limited number of worker threads, and it does so by putting algorithm execution at a higher priority than storing results. Thus, we wind up with 2 tasks that have produced results, but they're waiting for worker threads to store those results; and the worker threads won't be available for this purpose until all the tasks have completed algorithm execution. 
+(See the article on [Properties](properties.md) to refresh your memory on this). This means that the supervisor has 2 and only 2 workers that can be used for assorted task processing activities. In this case, that creates a problem: there are only 2 workers but 6 tasks that need to run, and each task needs to perform several steps (marshaling, algorithm execution, storing results). Ziggy needs to prioritize users of its limited number of worker threads, and it does so by putting algorithm execution at a higher priority than storing results. Thus, we wind up with 2 tasks that have produced results, but they're waiting for workers to store those results; and the workers won't be available for this purpose until all the tasks have completed algorithm execution.
 
 #### Permuter Task for UOW 2
 
 Meanwhile, before any of the `sample-1` or `sample-2` data sets got processed, we see a task with ID 10, permuter module, running on data set 2. Oddly, its subtask "scoreboard" is `(0 / 0 / 0)`. What happened?!?!
 
-Well -- remember that we set up this example so that it wouldn't process any data that got processed before (i.e., we are doing "keep-up" processing, not reprocessing). All of the data in `set-2` was processed in the first example, so there were no `set-2` subtasks that needed to be processed in this example. 
+Well -- remember that we set up this example so that it wouldn't process any data that got processed before (i.e., we are doing "keep-up" processing, not reprocessing). All of the data in `set-2` was processed in the first example, so there were no `set-2` subtasks that needed to be processed in this example.
 
 Okay, but in that case, why did Ziggy create a task for `set-2` processing? Well, the situation is this:
 
-Ziggy's order of operations is that it has to first create its tasks, and only then can it go and figure out how many subtasks need to be processed in each task. Ziggy found that its datastore held a total of 6 units of work for permuter, went ahead and created one task for each unit of work, and only then realized that two of the tasks had no subtasks that needed processing! Once it's gotten that far, it lets the zero-subtask tasks run through the system. This prevents some potential user confusion ("Hey, why did Ziggy go from task 9 to task 11? Why isn't there a task 10?" "Why isn't there a task for set 1?"). It also avoids some other problems too boring to get into here. 
+Ziggy's order of operations is that it has to first create its tasks, and only then can it go and figure out how many subtasks need to be processed in each task. Ziggy found that its datastore held a total of 6 units of work for permuter, went ahead and created one task for each unit of work, and only then realized that two of the tasks had no subtasks that needed processing! Once it's gotten that far, it lets the zero-subtask tasks run through the system. This prevents some potential user confusion ("Hey, why did Ziggy go from task 9 to task 11? Why isn't there a task 10?" "Why isn't there a task for set 1?"). It also avoids some other problems too boring to get into here.
 
 #### Permuter Task for UOW 1
 
-Finally, task 15 is the permuter task for `set-1`. In the task display, it's state is `SUBMITTED`, with a p-state of `I` (for initializing). This is the result of two features we've already talked about. First, Ziggy doesn't try to put its tasks into any particular order, so the set-1 task wound up being the final permuter task. Second, there are only 2 worker threads that need to service the demands of 6 tasks. What's happened is that task 15 is waiting for a worker thread to become available to process it. Of course, like `set-2`, `set-1` has no subtasks that need processing in this example, so as soon as `set-1` gets a worker, it will instantly jump to state COMPLETED. 
+Finally, task 15 is the permuter task for `set-1`. In the task display, it's state is `SUBMITTED`, with a p-state of `I` (for initializing). This is the result of two features we've already talked about. First, Ziggy doesn't try to put its tasks into any particular order, so the set-1 task wound up being the final permuter task. Second, there are only 2 workers that need to service the demands of 6 tasks. What's happened is that task 15 is waiting for a worker to become available to process it. Of course, like `set-2`, `set-1` has no subtasks that need processing in this example, so as soon as `set-1` gets a worker, it will instantly jump to state COMPLETED.
 
 #### Meanwhile, Back in the Data Receipt Directory...
 
@@ -153,34 +151,16 @@ If we look at the contents of the data receipt directory, this is what we see:
 $ ls -1 sample-pipeline/build/pipeline-results/data-receipt/
 Listing for: sample-pipeline/build/pipeline-results/data-receipt/
 sample-3
-$ 
+$
 ```
 
-The sample-1 and sample-2 directories are gone. The ready files for sample-1 and sample-2 are gone. All that's left is the sample-3 directory. This is exactly what we'd hoped (and asserted) would happen: Ziggy was able to figure out which of the deliveries were complete, and process them, while leaving the incomplete delivery alone. 
+The sample-1 and sample-2 directories are gone. The ready files for sample-1 and sample-2 are gone. All that's left is the sample-3 directory. This is exactly what we'd hoped (and asserted) would happen: Ziggy was able to figure out which of the deliveries were complete, and process them, while leaving the incomplete delivery alone.
 
 #### Finally...
 
-If you keep watching the console, you'll see that once the permuter tasks are done, Ziggy will create flip tasks for all 6 datasets, then averaging tasks for all 6. The tasks for `set-1` and `set-2` will always have zero subtasks to process and will complete instantly; the other tasks will take a finite time to process their subtasks. 
-
-### Pipeline Events Display
-
-After doing all of the above, you may be thinking, "This event handler seems pretty awesome!" But you're probably tempering that opinion with a bit of ... unease. 
-
-Why unease? 
-
-Unease because once the event handler has run successfully, there isn't a straightforward way to see what, if anything, it did. The data files it imported are gone from the data receipt directory. The ready files are gone from the data receipt directory. How do we tell the difference between, "The event handler handled all these events," versus, "There were no events and Ziggy hasn't done anything lately"?
-
-There's two ways to know this.
-
-The first way is what we discussed before: when the event handler detects an event, it starts a pipeline. The pipeline instance appears in the instances table, with a name that indicates that an event handler caused that instance to start. 
-
-The second way is more direct. 
-
-If you go to Configuration > Pipeline Events, you'll get the following display:
-
-![](images/events-display.png)
+If you keep watching the console, you'll see that once the permuter tasks are done, Ziggy will create flip tasks for all 6 datasets, then averaging tasks for all 6. The tasks for `set-1` and `set-2` will always have zero subtasks to process and will complete instantly; the other tasks will take a finite time to process their subtasks.
 
-The first column is the event ID -- this is a simple, monotonically-increasing integer value. The second column is the event handler that detected the event, the third is the name of the pipeline that was started in response to the event. The fourth column is the timestamp at which the pipeline started. The final column is the instance ID of the resulting pipeline instance. A permanent record is kept of every single pipeline event, all of which are visible in this display. 
+To review the files that were ingested, refer to the [Data Receipt Display](data-receipt-display.md) article.
 
 [[Previous]](event-handler-definition.md)
 [[Up]](event-handler.md)
diff --git a/doc/user-manual/event-handler-intro.md b/doc/user-manual/event-handler-intro.md
index 7b270e5..2206961 100644
--- a/doc/user-manual/event-handler-intro.md
+++ b/doc/user-manual/event-handler-intro.md
@@ -6,9 +6,9 @@
 
 ## Introduction to Event Handlers
 
-Ziggy's predecessors in the pipeline infrastructure field (the Kepler SOC's PI module and TESS SPOC's Spiffy)  were designed to require a lot of in-person handling by pipeline users. In particular, they had no capacity to take actions without somebody, somewhere, issuing a command or pressing a button on the console. 
+Ziggy's predecessors in the pipeline infrastructure field (the Kepler SOC's PI module and TESS SPOC's Spiffy)  were designed to require a lot of in-person handling by pipeline users. In particular, they had no capacity to take actions without somebody, somewhere, issuing a command or pressing a button on the console.
 
-This design choice was acceptable for the aforementioned Kepler and TESS missions, which had data deliveries approximately once a month and always followed a constant sequence of processing activities. For future missions with much larger data rates, data deliveries are likely to be much more frequent, potentially every day or even more often. Future missions are also likely to have non-standard, high urgency processing requirements arise at unpredictable intervals (something along the lines of, "We need to process this chunk of data through this special-purpose pipeline, and we need to get it turned around in 12 hours"). Both of these expectations led to the decision that Ziggy required some means of taking autonomous action. In short, it needs an event handler: a system that allows the user to define some form of event that Ziggy should watch for, and an action that it should take when the event happens. 
+This design choice was acceptable for the aforementioned Kepler and TESS missions, which had data deliveries approximately once a month and always followed a constant sequence of processing activities. For future missions with much larger data rates, data deliveries are likely to be much more frequent, potentially every day or even more often. Future missions are also likely to have non-standard, high urgency processing requirements arise at unpredictable intervals (something along the lines of, "We need to process this chunk of data through this special-purpose pipeline, and we need to get it turned around in 12 hours"). Both of these expectations led to the decision that Ziggy required some means of taking autonomous action. In short, it needs an event handler: a system that allows the user to define some form of event that Ziggy should watch for, and an action that it should take when the event happens.
 
 ### The Action
 
@@ -18,38 +18,38 @@ The action Ziggy takes in response to an event is pretty straightforward: it sta
 
 What are the necessary characteristics of an event? Put another way, what are the requirements we have that define an event?
 
-From the outset, we knew that data receipt, or a pipeline that starts with data receipt and runs through all the various processing steps, was the event handler's "killer app." An event handler that can start the pipeline automatically when new data comes in relieves human beings of that burden, and if data comes in every day, or at unpredictable intervals, managing data delivery is a major burden indeed. We also knew that we didn't want the system design to tie the event handler so closely to data receipt that it couldn't be used for anything else. Thus we allowed data receipt to inform our design, while staying on the lookout for design choices that coupled the two systems too tightly together. 
+From the outset, we knew that data receipt, or a pipeline that starts with data receipt and runs through all the various processing steps, was the event handler's "killer app." An event handler that can start the pipeline automatically when new data comes in relieves human beings of that burden, and if data comes in every day, or at unpredictable intervals, managing data delivery is a major burden indeed. We also knew that we didn't want the system design to tie the event handler so closely to data receipt that it couldn't be used for anything else. Thus we allowed data receipt to inform our design, while staying on the lookout for design choices that coupled the two systems too tightly together.
 
 With all that introductory material out of the way, we turn to the question: what are the requirements for the "event" part of the event handler?
 
 - The event has to be something that unambiguously declares, "This event is ready to be handled!" In particular, this means that the event can't be a regular file that has content of some type (i.e., it can't be something like the manifest files used by data receipt). The problem with those files is that the file can appear on the system where Ziggy runs, but not be completely delivered (i.e., the file is there but the source is still copying the contents of the file across to the Ziggy system). In other words, the event must be atomic.
 - The event needs to be similarly unambiguous about which pipeline Ziggy needs to start when the event happens. This is important because Ziggy might have a number of different kinds of events it wants to handle, and it needs to be able to clearly tell them apart.
 - In the specific case of data receipt, the data source might deliver files to the main data receipt directory, or it might deliver subdirectories of files (see [the article on data receipt](data-receipt.md) for more information). Whatever system we devise must support either option.
-- It may be the case that multiple data sources deliver separate data streams to Ziggy simultaneously. Ziggy needs to be able to manage such a situation. In particular, in the case of data delivery, Ziggy needs to be able to identify which subdirectories in the data receipt directory are from each data stream: each stream needs its own pipeline instance to perform the processing, and the different data streams cannot be expected to complete their deliveries simultaneously (i.e., Ziggy needs to know that one stream is done, and start processing that data, while also waiting for one or more other streams to complete). 
-- The overall system needs to give the user some ability to monitor what's going on, whether progress is being made, etc. In the case of data receipt, this means that the user wants to know ahead of time how many directories to expect, and wants to know at runtime which ones are done and which are in progress. 
+- It may be the case that multiple data sources deliver separate data streams to Ziggy simultaneously. Ziggy needs to be able to manage such a situation. In particular, in the case of data delivery, Ziggy needs to be able to identify which subdirectories in the data receipt directory are from each data stream: each stream needs its own pipeline instance to perform the processing, and the different data streams cannot be expected to complete their deliveries simultaneously (i.e., Ziggy needs to know that one stream is done, and start processing that data, while also waiting for one or more other streams to complete).
+- The overall system needs to give the user some ability to monitor what's going on, whether progress is being made, etc. In the case of data receipt, this means that the user wants to know ahead of time how many directories to expect, and wants to know at runtime which ones are done and which are in progress.
 
 Based on the requirements above, we designed a solution as follows:
 
-- Events are defined by zero-length files. In the case of data receipt, the data delivery source can push files to the system that hosts Ziggy, and once that file transfer is complete the source can create the necessary zero-length file. 
-- Each event handler has a distinct directory that it watches for these zero-length files (henceforth we'll call these "ready files", because they indicate to Ziggy a degree of readiness). For data receipt, we traditionally use the data receipt directory (though we could have defined a totally separate directory for the ready files). For additional event handlers, the user would need to create other directories that can be watched for ready files, one directory per event handler. 
+- Events are defined by zero-length files. In the case of data receipt, the data delivery source can push files to the system that hosts Ziggy, and once that file transfer is complete the source can create the necessary zero-length file.
+- Each event handler has a distinct directory that it watches for these zero-length files (henceforth we'll call these "ready files", because they indicate to Ziggy a degree of readiness). For data receipt, we traditionally use the data receipt directory (though we could have defined a totally separate directory for the ready files). For additional event handlers, the user would need to create other directories that can be watched for ready files, one directory per event handler.
 - An event can have more than one ready file, and Ziggy will only proceed when all the ready files for an event have appeared. Because a zero-length file has no content other than its name, the naming convention for ready files must encompass:
   - Some way of indicating which ready files go with a particular event.
   - The total number of ready files for a given event.
-  - Additional information that is unique to each ready file: in the case of data receipt, since a ready file may be associated with a particular subdirectory in the data receipt directory, the name of the subdirectory needs to be in the name of the ready file. 
+  - Additional information that is unique to each ready file: in the case of data receipt, since a ready file may be associated with a particular subdirectory in the data receipt directory, the name of the subdirectory needs to be in the name of the ready file.
 
 ### The Ready File
 
 Without further ado, here's the naming convention for the ready file:
 
 ```
-<label>.READY.<name>.<count> 
+<label>.READY.<name>.<count>
 ```
 
 Let's tackle these:
 
 #### Name
 
-This is the name of an event. All the ready files that go with a particular event have the same name. 
+This is the name of an event. All the ready files that go with a particular event have the same name.
 
 #### Count
 
@@ -63,13 +63,13 @@ The presence of `READY` in all caps in the file name specifies that, well, this
 
 The label is the part of the ready file that is unique within the set of ready files for an event. For the data receipt event handler, the label is the name of the data receipt subdirectory that goes with the ready file. For other types of events, the label can have some meaning related to the event.
 
-Note that the label is optional. If, for example, a data source uses the main data receipt directory to deliver files, rather than a subdirectory, it will only have one ready file. In this case, there's no additional information needed by Ziggy to manage the event so the ready file can be `READY.<name>.1`. 
+Note that the label is optional. If, for example, a data source uses the main data receipt directory to deliver files, rather than a subdirectory, it will only have one ready file. In this case, there's no additional information needed by Ziggy to manage the event so the ready file can be `READY.<name>.1`.
 
 ### Putting it All Together
 
-Let's make this concrete with a data receipt example. Let's assume that there are two sources that are delivering data at the same time. One of the sources, by a convention agreed within the mission, always uses the event name `reeves-gabrels`; the other always uses the name `mick-ronson`. 
+Let's make this concrete with a data receipt example. Let's assume that there are two sources that are delivering data at the same time. One of the sources, by a convention agreed within the mission, always uses the event name `reeves-gabrels`; the other always uses the name `mick-ronson`.
 
-One particular day, `reeves-gabrels` sets up to deliver 5 subdirectories of data to the data receipt directory (specifically, `outside`, `earthling`, `hours`, `heathen`, `reality`), while `mick-ronson` sets up to deliver 3 subdirectories of data to the data receipt directory (specifically `world`, `hunky`, `stardust`). Let's assume that `reeves-gabrels` starts its delivery earlier than the `mick-ronson`. 
+One particular day, `reeves-gabrels` sets up to deliver 5 subdirectories of data to the data receipt directory (specifically, `outside`, `earthling`, `hours`, `heathen`, `reality`), while `mick-ronson` sets up to deliver 3 subdirectories of data to the data receipt directory (specifically `world`, `hunky`, `stardust`). Let's assume that `reeves-gabrels` starts its delivery earlier than the `mick-ronson`.
 
 At some point, the data receipt directory will look like this:
 
@@ -86,8 +86,8 @@ outside.READY.reeves-gabrels.5
 
 What the user can tell from this is that:
 
-- `reeves-gabrels` is going to deliver a total of 5 subdirectories. 
-- The first of these, `outside`, is complete. 
+- `reeves-gabrels` is going to deliver a total of 5 subdirectories.
+- The first of these, `outside`, is complete.
 
 As `reeves-gabrels` moves on to the next directory, we see this:
 
@@ -106,7 +106,7 @@ earthling
 earthling.READY.reeves-gabrels.5
 ```
 
-Time marches on and `reeves-gabrels` completes additional directories, meanwhile `mick-ronson` starts its delivery: 
+Time marches on and `reeves-gabrels` completes additional directories, meanwhile `mick-ronson` starts its delivery:
 
 ```bash
 outside
@@ -156,7 +156,7 @@ hunky
 hunky.READY.mick-ronson.3
 ```
 
-As soon as the pipeline starts, Ziggy deletes the ready files for reeves-gabrels. This prevents Ziggy from trying to respond to this event a second time. 
+As soon as the pipeline starts, Ziggy deletes the ready files for reeves-gabrels. This prevents Ziggy from trying to respond to this event a second time.
 
 [[Previous]](event-handler.md)
 [[Up]](event-handler.md)
diff --git a/doc/user-manual/event-handler-labels.md b/doc/user-manual/event-handler-labels.md
index e3bd2cc..99f7acc 100644
--- a/doc/user-manual/event-handler-labels.md
+++ b/doc/user-manual/event-handler-labels.md
@@ -6,19 +6,19 @@
 
 ## Sending Event Information to Algorithms
 
-The event handler, and all of the information associated with it, is mainly intended for use by Ziggy: Ziggy uses the information to select a pipeline to start, to figure out which data receipt directories it can import, etc. That said, it's possible that event information can be useful to the algorithms as well. In the case when an algorithm runs in a pipeline that got kicked off by an event, there can be some value in giving the algorithm information about the handler and the event. 
+The event handler, and all of the information associated with it, is mainly intended for use by Ziggy: Ziggy uses the information to select a pipeline to start, to figure out which data receipt directories it can import, etc. That said, it's possible that event information can be useful to the algorithms as well. In the case when an algorithm runs in a pipeline that got kicked off by an event, there can be some value in giving the algorithm information about the handler and the event.
 
-If that's the case for your application, we've got you covered. 
+If that's the case for your application, we've got you covered.
 
 ### Event Information in the Algorithm Inputs
 
-Recall that every subtask has its own inputs file, in HDF5 format (see the article on [Configuring a Pipeline](configuring-pipeline.md) for more information). Thus each permuter subtask has its own `permuter-inputs-0.h5` file. 
+Recall that every subtask has its own inputs file, in HDF5 format (see the article on [Configuring a Pipeline](configuring-pipeline.md) for more information). Thus each permuter subtask has its own `permuter-inputs-0.h5` file.
 
 When a task is created by a pipeline that started in response to an event, the `moduleParameters` field in that task's inputs has a subfield named `ZiggyEventLabels`. The `ZiggyEventLabels` parameter set has, in turn, the following fields:
 
 - `eventHandlerName`: the name of the event handler that kicked off this processing activity (in the case of our examples, `data-receipt`).
 - `eventName`: the value of the name portion of the ready files (in our examples, `test1` and `test2`).
-- `eventLabels`: a list of the ready file labels for this event. Note that every subtask sees all the labels that were part of the given event. In our multi-directory import example, one of the labels (`sample-1`) went with some tasks, the other label (`sample-2`) went with some other tasks. Ziggy doesn't have any way to figure out this relationship, so it just gives every run of the algorithm all of the labels. 
+- `eventLabels`: a list of the ready file labels for this event. Note that every subtask sees all the labels that were part of the given event. In our multi-directory import example, one of the labels (`sample-1`) went with some tasks, the other label (`sample-2`) went with some other tasks. Ziggy doesn't have any way to figure out this relationship, so it just gives every run of the algorithm all of the labels.
 
 [[Previous]](event-handler-examples.md)
 [[Up]](event-handler.md)
diff --git a/doc/user-manual/event-handler.md b/doc/user-manual/event-handler.md
index 51e949c..e18b16b 100644
--- a/doc/user-manual/event-handler.md
+++ b/doc/user-manual/event-handler.md
@@ -6,22 +6,30 @@
 
 ## Event Handler
 
-Up to now, Ziggy has relied entirely on "operator in the loop" execution logic. In all the examples, you, the user / operator, has to do -- something -- to get Ziggy to take an action. 
+Up to now, Ziggy has relied entirely on "operator in the loop" execution logic. In all the examples, you, the user / operator, has to do -- something -- to get Ziggy to take an action.
 
-That's fine when dealing with a pipeline as simple-minded as the sample pipeline, but what happens when you've got a complex pipeline and a fire hose of mission data coming at you like Batman running at the Joker? For that matter, even if your pipeline is as simple as the sample pipeline, it would be a hassle if you were receiving data ten times a day and every time you had to manually import the data and start the pipeline. 
+That's fine when dealing with a pipeline as simple-minded as the sample pipeline, but what happens when you've got a complex pipeline and a fire hose of mission data coming at you like Batman running at the Joker? For that matter, even if your pipeline is as simple as the sample pipeline, it would be a hassle if you were receiving data ten times a day and every time you had to manually import the data and start the pipeline.
 
-For these reasons, Ziggy provides a capability that lets it operate without a user in the loop. In this case, Ziggy watches for an event that the user has defined, and when the event occurs Ziggy responds by starting a pipeline. 
+For these reasons, Ziggy provides a capability that lets it operate without a user in the loop. In this case, Ziggy watches for an event that the user has defined, and when the event occurs Ziggy responds by starting a pipeline.
 
 Here's how it works:
 
-[Introduction to Event Handlers](event-handler-intro.md) -- discussion of the concept and the design requirements that led us to the solution we implemented in Ziggy.
+### [Introduction to Event Handlers](event-handler-intro.md)
 
-[Defining Event Handlers](event-handler-definition.md) -- how you go about defining your own event handler (spoiler alert: more XML).
+Discussion of the concept and the design requirements that led us to the solution we implemented in Ziggy.
 
-[Event Handler Examples](event-handler-examples.md) -- allows you to get some hands-on experience with the event handler.
+### [Defining Event Handlers](event-handler-definition.md)
 
-[Sending Event Information to Algorithms](event-handler-labels.md) -- got a use-case in which the processing algorithms need to know something about the event that set them running? We've got you covered. 
+How you go about defining your own event handler (spoiler alert: more XML).
+
+### [Event Handler Examples](event-handler-examples.md)
+
+Allows you to get some hands-on experience with the event handler.
+
+### [Sending Event Information to Algorithms](event-handler-labels.md)
+
+Got a use-case in which the processing algorithms need to know something about the event that set them running? We've got you covered.
 
 [[Previous]](data-receipt-display.md)
 [[Up]](user-manual.md)
-[[Next]](event-handler-intro.md)
\ No newline at end of file
+[[Next]](event-handler-intro.md)
diff --git a/doc/user-manual/hpc-cost.md b/doc/user-manual/hpc-cost.md
index 508cae2..431e6f3 100644
--- a/doc/user-manual/hpc-cost.md
+++ b/doc/user-manual/hpc-cost.md
@@ -6,19 +6,19 @@
 
 ## HPC Cost Estimation
 
-The Remote Parameters Dialog allows you to get a prior estimate of the cost of processing a task on HPC. This is great, but a post-run estimate is also valuable. The post-run can differ from the pre-run for two reasons: First, the pre-run estimate might have been an overestimate, in which case the jobs would finish ahead of schedule and the true cost would be lower; alternately, if the jobs all ran out of wall time and the task was resubmitted, then the total cost will be higher than the pre-run estimate. 
+The Remote Parameters Dialog allows you to get a prior estimate of the cost of processing a task on HPC. This is great, but a post-run estimate is also valuable. The post-run can differ from the pre-run for two reasons: First, the pre-run estimate might have been an overestimate, in which case the jobs would finish ahead of schedule and the true cost would be lower; alternately, if the jobs all ran out of wall time and the task was resubmitted, then the total cost will be higher than the pre-run estimate.
 
-Ziggy keeps a running track of the costs of all jobs associated with a task and can display them for the user. Note that even after the tasks have finished, the costs are considered estimates. This is because they don't actually tap into any job accounting system at the HPC facility, which would provide a definitive cost (i.e., what you were actually charged). Instead, Ziggy computes the cost by considering the execution time of each job and its node type. Since this isn't the definitive value, we always call it an estimate. 
+Ziggy keeps a running track of the costs of all jobs associated with a task and can display them for the user. Note that even after the tasks have finished, the costs are considered estimates. This is because they don't actually tap into any job accounting system at the HPC facility, which would provide a definitive cost (i.e., what you were actually charged). Instead, Ziggy computes the cost by considering the execution time of each job and its node type. Since this isn't the definitive value, we always call it an estimate.
 
 Anyway:
 
 ### Viewing the HPC Cost Estimates
 
-Go to the Instances tab, right-click on an instance, and select the Cost estimate option. You'll get a new dialog box:
+Go to the instances panel, right-click on an instance, and run the Estimate cost command. You'll get a new dialog box:
 
-![](images/hpc-cost-est.png)
+<img src="images/hpc-cost-est.png" style="width:11cm;"/>
 
-In our case, we ran all our tasks on the local system so all the estimates are zero! However: if you'd run on an HPC system, the `Cost Estimate` column would show the running total for each task during execution, and would show a final estimate after execution completed. 
+In our case, we ran all our tasks on the local system so all the estimates are zero! However: if you'd run on an HPC system, the `Cost estimate` column would show the running total for each task during execution, and would show a final estimate after execution completed.
 
 [[Previous]](remote-dialog.md)
 [[Up]](select-hpc.md)
diff --git a/doc/user-manual/images/blue-jean-event.png b/doc/user-manual/images/blue-jean-event.png
deleted file mode 100644
index 1b3ded5..0000000
Binary files a/doc/user-manual/images/blue-jean-event.png and /dev/null differ
diff --git a/doc/user-manual/images/data-receipt-2-task-event.png b/doc/user-manual/images/data-receipt-2-task-event.png
deleted file mode 100644
index 1a91923..0000000
Binary files a/doc/user-manual/images/data-receipt-2-task-event.png and /dev/null differ
diff --git a/doc/user-manual/images/data-receipt-display.png b/doc/user-manual/images/data-receipt-display.png
index a638092..e26a30f 100644
Binary files a/doc/user-manual/images/data-receipt-display.png and b/doc/user-manual/images/data-receipt-display.png differ
diff --git a/doc/user-manual/images/data-receipt-list.png b/doc/user-manual/images/data-receipt-list.png
index 5c6c1e7..c27a441 100644
Binary files a/doc/user-manual/images/data-receipt-list.png and b/doc/user-manual/images/data-receipt-list.png differ
diff --git a/doc/user-manual/images/data-receipt-param-set.png b/doc/user-manual/images/data-receipt-param-set.png
deleted file mode 100644
index 0099172..0000000
Binary files a/doc/user-manual/images/data-receipt-param-set.png and /dev/null differ
diff --git a/doc/user-manual/images/data-receipt-use-subdirs.png b/doc/user-manual/images/data-receipt-use-subdirs.png
index 88ab00c..1cbb8ef 100644
Binary files a/doc/user-manual/images/data-receipt-use-subdirs.png and b/doc/user-manual/images/data-receipt-use-subdirs.png differ
diff --git a/doc/user-manual/images/delete-task-menu-item.png b/doc/user-manual/images/delete-task-menu-item.png
deleted file mode 100644
index 7e10e21..0000000
Binary files a/doc/user-manual/images/delete-task-menu-item.png and /dev/null differ
diff --git a/doc/user-manual/images/disable-reprocess.png b/doc/user-manual/images/disable-reprocess.png
index 2e778dc..4dddea4 100644
Binary files a/doc/user-manual/images/disable-reprocess.png and b/doc/user-manual/images/disable-reprocess.png differ
diff --git a/doc/user-manual/images/edit-array-1.png b/doc/user-manual/images/edit-array-1.png
index c070ff1..06df183 100644
Binary files a/doc/user-manual/images/edit-array-1.png and b/doc/user-manual/images/edit-array-1.png differ
diff --git a/doc/user-manual/images/edit-array-2.png b/doc/user-manual/images/edit-array-2.png
index 016498b..50f219f 100644
Binary files a/doc/user-manual/images/edit-array-2.png and b/doc/user-manual/images/edit-array-2.png differ
diff --git a/doc/user-manual/images/edit-param-set.png b/doc/user-manual/images/edit-param-set.png
index c41ccbd..bd638a7 100644
Binary files a/doc/user-manual/images/edit-param-set.png and b/doc/user-manual/images/edit-param-set.png differ
diff --git a/doc/user-manual/images/edit-pipeline.png b/doc/user-manual/images/edit-pipeline.png
new file mode 100644
index 0000000..092b469
Binary files /dev/null and b/doc/user-manual/images/edit-pipeline.png differ
diff --git a/doc/user-manual/images/edit-trigger.png b/doc/user-manual/images/edit-trigger.png
deleted file mode 100644
index 442dd30..0000000
Binary files a/doc/user-manual/images/edit-trigger.png and /dev/null differ
diff --git a/doc/user-manual/images/event-handler-display-1.png b/doc/user-manual/images/event-handler-display-1.png
index 495f223..e69760f 100644
Binary files a/doc/user-manual/images/event-handler-display-1.png and b/doc/user-manual/images/event-handler-display-1.png differ
diff --git a/doc/user-manual/images/event-handler-display-2.png b/doc/user-manual/images/event-handler-display-2.png
deleted file mode 100644
index e1aafec..0000000
Binary files a/doc/user-manual/images/event-handler-display-2.png and /dev/null differ
diff --git a/doc/user-manual/images/event-handler-instances-1.png b/doc/user-manual/images/event-handler-instances-1.png
index 42bc6cb..1b724bc 100644
Binary files a/doc/user-manual/images/event-handler-instances-1.png and b/doc/user-manual/images/event-handler-instances-1.png differ
diff --git a/doc/user-manual/images/event-handler-tasks-1.png b/doc/user-manual/images/event-handler-tasks-1.png
index f41da1a..d2f0ba3 100644
Binary files a/doc/user-manual/images/event-handler-tasks-1.png and b/doc/user-manual/images/event-handler-tasks-1.png differ
diff --git a/doc/user-manual/images/events-display.png b/doc/user-manual/images/events-display.png
deleted file mode 100644
index 1c64909..0000000
Binary files a/doc/user-manual/images/events-display.png and /dev/null differ
diff --git a/doc/user-manual/images/exception-1.png b/doc/user-manual/images/exception-1.png
index 3b3b7d8..9786684 100644
Binary files a/doc/user-manual/images/exception-1.png and b/doc/user-manual/images/exception-1.png differ
diff --git a/doc/user-manual/images/exception-2.png b/doc/user-manual/images/exception-2.png
index a67ecb8..1b98a72 100644
Binary files a/doc/user-manual/images/exception-2.png and b/doc/user-manual/images/exception-2.png differ
diff --git a/doc/user-manual/images/fire-trigger.png b/doc/user-manual/images/fire-trigger.png
deleted file mode 100644
index ad44882..0000000
Binary files a/doc/user-manual/images/fire-trigger.png and /dev/null differ
diff --git a/doc/user-manual/images/flip-tasks.png b/doc/user-manual/images/flip-tasks.png
index e914043..33e42ff 100644
Binary files a/doc/user-manual/images/flip-tasks.png and b/doc/user-manual/images/flip-tasks.png differ
diff --git a/doc/user-manual/images/gui-start-end-adjusted.png b/doc/user-manual/images/gui-start-end-adjusted.png
index 11f475b..762beb1 100644
Binary files a/doc/user-manual/images/gui-start-end-adjusted.png and b/doc/user-manual/images/gui-start-end-adjusted.png differ
diff --git a/doc/user-manual/images/gui.png b/doc/user-manual/images/gui.png
index 421a983..4b99487 100644
Binary files a/doc/user-manual/images/gui.png and b/doc/user-manual/images/gui.png differ
diff --git a/doc/user-manual/images/hpc-cost-est.png b/doc/user-manual/images/hpc-cost-est.png
index fba059c..c62388f 100644
Binary files a/doc/user-manual/images/hpc-cost-est.png and b/doc/user-manual/images/hpc-cost-est.png differ
diff --git a/doc/user-manual/images/instances-running.png b/doc/user-manual/images/instances-running.png
index 9f11bba..3bd8234 100644
Binary files a/doc/user-manual/images/instances-running.png and b/doc/user-manual/images/instances-running.png differ
diff --git a/doc/user-manual/images/delete-alert.png b/doc/user-manual/images/kill-alert.png
similarity index 100%
rename from doc/user-manual/images/delete-alert.png
rename to doc/user-manual/images/kill-alert.png
diff --git a/doc/user-manual/images/delete-in-progress.png b/doc/user-manual/images/kill-in-progress.png
similarity index 100%
rename from doc/user-manual/images/delete-in-progress.png
rename to doc/user-manual/images/kill-in-progress.png
diff --git a/doc/user-manual/images/kill-task-menu-item.png b/doc/user-manual/images/kill-task-menu-item.png
new file mode 100644
index 0000000..c37bfe0
Binary files /dev/null and b/doc/user-manual/images/kill-task-menu-item.png differ
diff --git a/doc/user-manual/images/logs-list.png b/doc/user-manual/images/logs-list.png
index 8f64f13..3970913 100644
Binary files a/doc/user-manual/images/logs-list.png and b/doc/user-manual/images/logs-list.png differ
diff --git a/doc/user-manual/images/monitor-processes.png b/doc/user-manual/images/monitor-processes.png
index 9d97715..acd5044 100644
Binary files a/doc/user-manual/images/monitor-processes.png and b/doc/user-manual/images/monitor-processes.png differ
diff --git a/doc/user-manual/images/monitoring-alerts.png b/doc/user-manual/images/monitoring-alerts.png
index cb88cb5..288524a 100644
Binary files a/doc/user-manual/images/monitoring-alerts.png and b/doc/user-manual/images/monitoring-alerts.png differ
diff --git a/doc/user-manual/images/monitoring-worker-2.png b/doc/user-manual/images/monitoring-worker-2.png
new file mode 100644
index 0000000..116fc83
Binary files /dev/null and b/doc/user-manual/images/monitoring-worker-2.png differ
diff --git a/doc/user-manual/images/monitoring-worker.png b/doc/user-manual/images/monitoring-worker.png
index 5c65389..24990b1 100644
Binary files a/doc/user-manual/images/monitoring-worker.png and b/doc/user-manual/images/monitoring-worker.png differ
diff --git a/doc/user-manual/images/ops-panel.png b/doc/user-manual/images/ops-panel.png
deleted file mode 100644
index 56c3b0a..0000000
Binary files a/doc/user-manual/images/ops-panel.png and /dev/null differ
diff --git a/doc/user-manual/images/param-import-dialog-box.png b/doc/user-manual/images/param-import-dialog-box.png
index 709e90c..38cfa32 100644
Binary files a/doc/user-manual/images/param-import-dialog-box.png and b/doc/user-manual/images/param-import-dialog-box.png differ
diff --git a/doc/user-manual/images/param-lib-all-groups-expanded.png b/doc/user-manual/images/param-lib-all-groups-expanded.png
new file mode 100644
index 0000000..8346831
Binary files /dev/null and b/doc/user-manual/images/param-lib-all-groups-expanded.png differ
diff --git a/doc/user-manual/images/param-lib-context-menu.png b/doc/user-manual/images/param-lib-context-menu.png
new file mode 100644
index 0000000..a97617d
Binary files /dev/null and b/doc/user-manual/images/param-lib-context-menu.png differ
diff --git a/doc/user-manual/images/param-lib-group-assigned.png b/doc/user-manual/images/param-lib-group-assigned.png
new file mode 100644
index 0000000..e69cbe0
Binary files /dev/null and b/doc/user-manual/images/param-lib-group-assigned.png differ
diff --git a/doc/user-manual/images/param-lib-modified.png b/doc/user-manual/images/param-lib-modified.png
index 2178499..27608b5 100644
Binary files a/doc/user-manual/images/param-lib-modified.png and b/doc/user-manual/images/param-lib-modified.png differ
diff --git a/doc/user-manual/images/param-lib-unused.png b/doc/user-manual/images/param-lib-unused.png
deleted file mode 100644
index ea9c90b..0000000
Binary files a/doc/user-manual/images/param-lib-unused.png and /dev/null differ
diff --git a/doc/user-manual/images/param-lib-used.png b/doc/user-manual/images/param-lib-used.png
index 7681459..8ff7d4a 100644
Binary files a/doc/user-manual/images/param-lib-used.png and b/doc/user-manual/images/param-lib-used.png differ
diff --git a/doc/user-manual/images/parameter-library.png b/doc/user-manual/images/parameter-library.png
index 7df6d81..e51c253 100644
Binary files a/doc/user-manual/images/parameter-library.png and b/doc/user-manual/images/parameter-library.png differ
diff --git a/doc/user-manual/images/permuter-tasks.png b/doc/user-manual/images/permuter-tasks.png
index b662fe9..f0f8a3c 100644
Binary files a/doc/user-manual/images/permuter-tasks.png and b/doc/user-manual/images/permuter-tasks.png differ
diff --git a/doc/user-manual/images/pipeline-done.png b/doc/user-manual/images/pipeline-done.png
index 51d2718..b6c5783 100644
Binary files a/doc/user-manual/images/pipeline-done.png and b/doc/user-manual/images/pipeline-done.png differ
diff --git a/doc/user-manual/images/pipeline-simplified.png b/doc/user-manual/images/pipeline-simplified.png
deleted file mode 100644
index 173af15..0000000
Binary files a/doc/user-manual/images/pipeline-simplified.png and /dev/null differ
diff --git a/doc/user-manual/images/pipelines-config-1.png b/doc/user-manual/images/pipelines-config-1.png
index e97e15c..5be97c0 100644
Binary files a/doc/user-manual/images/pipelines-config-1.png and b/doc/user-manual/images/pipelines-config-1.png differ
diff --git a/doc/user-manual/images/pipelines-config-2.png b/doc/user-manual/images/pipelines-config-2.png
index e19a780..d9d332a 100644
Binary files a/doc/user-manual/images/pipelines-config-2.png and b/doc/user-manual/images/pipelines-config-2.png differ
diff --git a/doc/user-manual/images/pipelines-panel.png b/doc/user-manual/images/pipelines-panel.png
new file mode 100644
index 0000000..8388062
Binary files /dev/null and b/doc/user-manual/images/pipelines-panel.png differ
diff --git a/doc/user-manual/images/remote-dialog-1.png b/doc/user-manual/images/remote-dialog-1.png
index bbb8a71..4585b49 100644
Binary files a/doc/user-manual/images/remote-dialog-1.png and b/doc/user-manual/images/remote-dialog-1.png differ
diff --git a/doc/user-manual/images/remote-dialog-2.png b/doc/user-manual/images/remote-dialog-2.png
index bc869cc..7a39a4e 100644
Binary files a/doc/user-manual/images/remote-dialog-2.png and b/doc/user-manual/images/remote-dialog-2.png differ
diff --git a/doc/user-manual/images/remote-dialog-3.png b/doc/user-manual/images/remote-dialog-3.png
index 5e0d92b..10e10c1 100644
Binary files a/doc/user-manual/images/remote-dialog-3.png and b/doc/user-manual/images/remote-dialog-3.png differ
diff --git a/doc/user-manual/images/remote-dialog-4.png b/doc/user-manual/images/remote-dialog-4.png
index f34f760..734f481 100644
Binary files a/doc/user-manual/images/remote-dialog-4.png and b/doc/user-manual/images/remote-dialog-4.png differ
diff --git a/doc/user-manual/images/remote-dialog-5.png b/doc/user-manual/images/remote-dialog-5.png
index 788956f..357bffa 100644
Binary files a/doc/user-manual/images/remote-dialog-5.png and b/doc/user-manual/images/remote-dialog-5.png differ
diff --git a/doc/user-manual/images/select-group-dialog.png b/doc/user-manual/images/select-group-dialog.png
new file mode 100644
index 0000000..437bc8b
Binary files /dev/null and b/doc/user-manual/images/select-group-dialog.png differ
diff --git a/doc/user-manual/images/select-group-with-test-group.png b/doc/user-manual/images/select-group-with-test-group.png
new file mode 100644
index 0000000..71044a3
Binary files /dev/null and b/doc/user-manual/images/select-group-with-test-group.png differ
diff --git a/doc/user-manual/images/start-end-nodes.png b/doc/user-manual/images/start-end-nodes.png
index 41bb409..d2d24cc 100644
Binary files a/doc/user-manual/images/start-end-nodes.png and b/doc/user-manual/images/start-end-nodes.png differ
diff --git a/doc/user-manual/images/start-pipeline.png b/doc/user-manual/images/start-pipeline.png
new file mode 100644
index 0000000..763d76c
Binary files /dev/null and b/doc/user-manual/images/start-pipeline.png differ
diff --git a/doc/user-manual/images/task-log-display.png b/doc/user-manual/images/task-log-display.png
index 95c89ab..ec35080 100644
Binary files a/doc/user-manual/images/task-log-display.png and b/doc/user-manual/images/task-log-display.png differ
diff --git a/doc/user-manual/images/task-log-showing-problem.png b/doc/user-manual/images/task-log-showing-problem.png
index d29152c..17682ea 100644
Binary files a/doc/user-manual/images/task-log-showing-problem.png and b/doc/user-manual/images/task-log-showing-problem.png differ
diff --git a/doc/user-manual/images/tasks-done.png b/doc/user-manual/images/tasks-done.png
index 31f47d3..e150f56 100644
Binary files a/doc/user-manual/images/tasks-done.png and b/doc/user-manual/images/tasks-done.png differ
diff --git a/doc/user-manual/images/tasks-menu.png b/doc/user-manual/images/tasks-menu.png
index afeefbe..16cbedd 100644
Binary files a/doc/user-manual/images/tasks-menu.png and b/doc/user-manual/images/tasks-menu.png differ
diff --git a/doc/user-manual/images/triggers.png b/doc/user-manual/images/triggers.png
deleted file mode 100644
index 05b749e..0000000
Binary files a/doc/user-manual/images/triggers.png and /dev/null differ
diff --git a/doc/user-manual/instances-panel.md b/doc/user-manual/instances-panel.md
index 92e3a74..24fe040 100644
--- a/doc/user-manual/instances-panel.md
+++ b/doc/user-manual/instances-panel.md
@@ -16,7 +16,7 @@ And now you know as much as you did when we started. Okay, keep reading.
 
 #### Instances
 
-A pipeline instance is just what it sounds like: it's a single instance of one of the pipelines defined in the `pd-*.xml` files. Recall that the sample pipeline has 4 nodes: data receipt, permuter, flip, and averaging. When you pressed the `Fire!` button, Ziggy created a copy of that pipeline, in a form that Ziggy knows how to execute.
+A pipeline instance is just what it sounds like: it's a single instance of one of the pipelines defined in the `pd-*.xml` files. Recall that the sample pipeline has 4 nodes: data receipt, permuter, flip, and averaging. When you pressed the `Start` button, Ziggy created a copy of that pipeline, in a form that Ziggy knows how to execute.
 
 Each instance has a unique ID number, with instance 1 being the first (so 1-based, not 0-based). The instance contains its own copies of all the parameter sets used in the pipeline, and these are stored permanently. Thus, even if you later change the values of some parameters, the copies that were made for the instance won't change.
 
@@ -38,7 +38,7 @@ Subtasks, confusingly, are numbered from zero. Also, subtask numbers are "recycl
 
 With all that in mind, let's look at the instances panel again:
 
-![](images/pipeline-done.png)
+<img src="images/pipeline-done.png" style="width:32cm;"/>
 
 The instance on the left, instance 1, is the pipeline instance that's going to plow through the entire pipeline, from data receipt to averaging. On the right, we see the tasks that instance 1 uses for the processing: one task for data receipt, two each for permuter, flip, and averaging. The numbers in the `P-state` column represent subtask counts: the first number is total number of subtasks, the second is number completed, the third is number failed. Each of permuter and flip used 4 subtasks per task; averaging ran with just 1 subtask per task.
 
@@ -98,61 +98,6 @@ The way it does this is to create a subtask for each input data file. If we look
 
 The file names in the datastore are going to be things like `set-1/L0/nasa-logo-file-0.png`, `set-1/L0/nasa-logo-file-1.png`, and so on. So -- cool! All the files in `set-1/L0` will be processed in the task for `set-1` data; there will be a subask for `nasa-logo-file-0.png`, another for `nasa-logo-file-1.png`, and so on.
 
-### Unit of Work
-
-In the midst of all this is a column under tasks labeled `UOW`, which stands for "Unit of Work." As a general matter, "Unit of Work" is a $10 word for, "What's the chunk of data that this task is in charge of?" 
-
-The parameter set that Ziggy uses to figure out how to divide work up into tasks also provides a means by which the user can specify a name that gets associated with each task. This is what's displayed in the `UOW` column. In the event that some tasks for a given algorithm module succeed and others fail, the `UOW` label lets you figure out where Ziggy got the data that caused the failed task. This can be useful, as I'm sure you can imagine. 
-
-#### Can You be a Bit More Specific About That?
-
-Sure! Let's look again at the definition of the permuter node from [The Pipeline Definition article](pipeline-definition.md):
-
-```XML
-    <node moduleName="permuter" childNodeNames="flip">
-        <inputDataFileType name="raw data"/>
-        <outputDataFileType name="permuted colors"/>
-        <modelType name="dummy model"/>
-        <moduleParameter name="Remote Parameters (permute color)"/>
-        <moduleParameter name="Multiple subtask configuration"/>
-    </node>
-```
-
-The definition of the node includes a parameter set, `Multiple subtask configuration`, which is an instance of the `TaskConfigurationParameters`. From [the article on The Task Configuration Parameter Sets](task-configuration.md), we see that it looks like this:
-
-```XML
-    <parameter-set name="Multiple subtask configuration" 
-        classname="gov.nasa.ziggy.uow.TaskConfigurationParameters">
-        <parameter name="taskDirectoryRegex" value="set-([0-9]{1})"/>
-        <parameter name="singleSubtask" value="false"/>
-        <parameter name="maxFailedSubtaskCount" value="0" />
-        <parameter name="reprocess" value="true"/>
-        <parameter name="reprocessingTasksExclude" value="0"/>
-      	<parameter name="maxAutoResubmits" value="0"/>
-    </parameter-set>
-```
-
-The `taskDirectoryRegex` parameter is `set-([0-9]{1})`. In plain (but New York accented) English, what this means is, "Go to the datastore and find every directory that matches the regex. Every one of those, you turn into a task. You got a problem with that?" Thus you wind up with a task for `set-1` and another for `set-2`. 
-
-Meanwhile, the `taskDirectoryRegex` has a regex group in it, `([0-9]{1})`. This tells Ziggy to take that part of the directory name (i.e., a digit) and make it the name of the unit of work on the tasks table. If I had been smarter and written the `taskDirectoryRegex` as `(set-[0-9]{1})`, the UOW display would have shown `set-1` and `set-2` instead of `1` and `2`. 
-
-#### What About Subtask Definition?
-
-Now we've seen how Ziggy uses the `TaskConfigurationParameters` instance to define multiple tasks for a given pipeline node. How do subtasks get defined? This uses a combination of 2 things: the `TaskConfigurationParameters` and the definition of input data file types for the node. Let's look at how that works. 
-
-In TaskConfigurationParameters, there's a boolean parameter, `singleSubtask`. This does what it says: if set to `true`, Ziggy creates one and only one subtask for each task, and copies all the inputs into that subtask's directory. When set to false, as here, it generates multiple subtasks for the task.
-
-The way it does this is to create a subtask for each input data file. If we look at how the inputs to the permuter are defined in [the article on Data File Types](data-file-types.md), we see this:
-
-```XML
-<dataFileType name="raw data"
-    fileNameRegexForTaskDir="(\\S+)-(set-[0-9])-(file-[0-9]).png"
-    fileNameWithSubstitutionsForDatastore="$2/L0/$1-$3.png"
-/>
-```
-
-The file names in the datastore are going to be things like `set-1/L0/nasa-logo-file-0.png`, `set-1/L0/nasa-logo-file-1.png`, and so on. So -- cool! All the files in `set-1/L0` will be processed in the task for `set-1` data; there will be a subask for `nasa-logo-file-0.png`, another for `nasa-logo-file-1.png`, and so on. 
-
 ### Pipeline States
 
 The instances panel also has numerous indicators named `State` and `p-State` that deserve some explanation.
@@ -179,7 +124,7 @@ The possible states for a pipeline task are described below.
 | State       | Description                                                  |
 | ----------- | ------------------------------------------------------------ |
 | INITIALIZED | Task has been created and is waiting for some kind of attention. |
-| SUBMITTED   | The task will run as soon as the worker has available resources to devote to it. |
+| SUBMITTED   | The task will run as soon as the supervisor has available resources to devote to it. |
 | PROCESSING  | The task is running.                                         |
 | ERROR       | All subtasks have run, and at least one subtask has failed.  |
 | COMPLETED   | All subtasks completed successfully and results were copied back to the datastore. |
@@ -202,11 +147,11 @@ When a task is in the `PROCESSING` state, it's useful to have a more fine-graine
 
 ### Worker
 
-The `Worker` column on the tasks table shows which worker is managing task execution, and which thread on that worker.
+The `Worker` column on the tasks table shows which worker is managing task execution.
 
-At the moment, the "which worker" question is kind of dull, since there's only one worker per cluster, and the console has to run on the same computer as the worker. This is why the worker is always listed as "localhost". This may not be true in the future, so we've left this information on the display.
+Right now, the workers all run on the same system as the supervisor, which is also the same system that runs the console. As a result, all the workers are "localhost" workers. At some point this may change, and the supervisor, workers, and console can conceivably run on different systems. For this reason we've left the "localhost" part of the display, in an effort to future-proof it. 
 
-Recall from the discussion on [Running the Cluster](running-pipeline.md) that the worker has multiple threads that can execute in parallel. The thread number tells you which of these is occupied with a given task.
+Recall from the discussion on [Running the Cluster](running-pipeline.md) that the supervisor can create multiple worker processes that can execute in parallel. The worker number tells you which of these is occupied with a given task.
 
 ### P-Time
 
diff --git a/doc/user-manual/intermediate-topics.md b/doc/user-manual/intermediate-topics.md
index 8e6bff3..9c0fbd6 100644
--- a/doc/user-manual/intermediate-topics.md
+++ b/doc/user-manual/intermediate-topics.md
@@ -1,6 +1,6 @@
 <!-- -*-visual-line-*- -->
 
-[[Previous]](change-param-values.md)
+[[Previous]](organize-tables.md)
 [[Up]](user-manual.md)
 [[Next]](datastore-task-dir.md)
 
@@ -14,12 +14,8 @@ The permanent, and temporary, storage areas for data and other files.
 
 ### [The Task Configuration Parameter Sets](task-configuration.md)
 
-How Ziggy knows how to divide work up into tasks, and much, much more. 
+How Ziggy knows how to divide work up into tasks, and much, much more.
 
-### [The Properties File](properties.md)
-
-Everything you never wanted to know about how Ziggy sets paths, but were forced to find out.
-
-[[Previous]](change-param-values.md)
+[[Previous]](organize-tables.md)
 [[Up]](user-manual.md)
 [[Next]](datastore-task-dir.md)
diff --git a/doc/user-manual/kill-tasks.md b/doc/user-manual/kill-tasks.md
new file mode 100644
index 0000000..0e8815e
--- /dev/null
+++ b/doc/user-manual/kill-tasks.md
@@ -0,0 +1,35 @@
+<!-- -*-visual-line-*- -->
+
+[[Previous]](rerun-task.md)
+[[Up]](ziggy-gui-troubleshooting.md)
+[[Next]](select-hpc.md)
+
+## Killing Tasks
+
+Sometimes it's necessary to stop the execution of tasks after they start running. Tasks that are running as jobs under control of a batch system at an HPC facility will provide command line tools for this, but they're a hassle to use when you're trying to kill a large number of jobs. Trying to kill tasks running locally is likewise hassle-tastic.
+
+Fortunately, Ziggy will let you do this from the console.
+
+### Kill all Jobs for a Task
+
+To kill all jobs for a task, go to the tasks table on the instances panel, right click the task, and run the `Kill selected tasks` command:
+
+<img src="images/kill-task-menu-item.png" style="width:15cm;"/>
+
+You'll be prompted to confirm that you want to kill the task. When you do that, you'll see something like this:
+
+<img src="images/kill-in-progress.png" style="width:32cm;"/>
+
+The state of the task will be immediately moved to `ERROR`, P-state `ALGORITHM_COMPLETE`. The instance will go to state `ERRORS_RUNNING` because the other task is still running; once it completes, the instance will go to `ERRORS_STALLED`. Meanwhile, the alert looks like this:
+
+<img src="images/kill-alert.png" style="width:32cm;"/>
+
+As expected, it notifies you that the task stopped because it was killed and not due to an error of some kind.
+
+### Kill all Tasks for an Instance
+
+This is the same idea, except it's the pop-up menu for the instance table, and you select `Kill all incomplete tasks`.
+
+[[Previous]](rerun-task.md)
+[[Up]](ziggy-gui-troubleshooting.md)
+[[Next]](select-hpc.md)
diff --git a/doc/user-manual/log-files.md b/doc/user-manual/log-files.md
index 95fb097..4915b2e 100644
--- a/doc/user-manual/log-files.md
+++ b/doc/user-manual/log-files.md
@@ -12,7 +12,7 @@ Anyways, if you look at the logs directory, you'll see this:
 
 ```console
 logs$ ls
-algorithms    cli    db    manifests    state    worker    ziggy
+algorithms    cli    db    manifests    state    supervisor    ziggy
 logs$
 ```
 
@@ -20,11 +20,11 @@ Let us consider each of these directories in turn.
 
 ### db Directory
 
-This is where the log files from the relational database application are stored. We're using Postgresql, so the main content of this directory is `pg.log`. If a system database is being used, this directory will not be present (since the sysadmin and DBA get to decide where the logs go, not you).
+This is where the log files from relational database applications may be stored. If you're using an non-system PostgreSQL database, this directory should contain `pg.log`. If a system database is being used, this directory will not be present since the sysadmin and DBA get to decide where the logs go, not you. It is also not present for databases such as HSQLDB.
 
 ### state Directory
 
-These aren't -- quite -- log files as such. They're actually files that are used to communicate between the algorithm processing system and the worker system (remember that the computer with the worker might not be the one trying to run the algorithm). Here's the contents of that directory:
+These aren't -- quite -- log files as such. They're actually files that are used to communicate between the algorithm processing system and the supervisor system (remember that the computer with the supervisor might not be the one trying to run the algorithm). Here's the contents of that directory:
 
 ```console
 logs$ ls state
@@ -43,7 +43,7 @@ ziggy.3.13.permuter.COMPLETE_4-3-1
 logs$
 ```
 
-Each task has a state file that the task execution system updates with the task processing state and the subtask counts for that task; by which we mean, the task execution system keeps changing the name of the file to reflect the current state of the task. The monitoring subsystem in the worker looks at these files to determine the current state of each task, which is then reflected on the GUI.
+Each task has a state file that the task execution system updates with the task processing state and the subtask counts for that task; by which we mean, the task execution system keeps changing the name of the file to reflect the current state of the task. The monitoring subsystem in the supervisor looks at these files to determine the current state of each task, which is then reflected on the GUI.
 
 In this case, we see that instance 3, task 12 has completed (i.e., the algorithm is no longer running) with final score 4 / 3 / 1, which we already knew.
 
@@ -57,19 +57,19 @@ cluster.log    console.log
 logs$
 ```
 
-The `cluster.log` file is logging from all the cluster commands; `console.log` captures all logging from the console. You'll sometimes see another file, `runjava.log`, which is the logging from other commands executed by `runjava`. Feel free to look into these, but none of them will provide any insight to the exception we're trying to understand.
+The `cluster.log` file is logging from all the cluster commands; `console.log` captures all logging from the console. You'll sometimes see another file, `ziggy.log`, which is the logging from other commands executed by `ziggy`. Feel free to look into these, but none of them will provide any insight to the exception we're trying to understand.
 
-### worker Directory
+### Supervisor Directory
 
-The worker directory's contents look like this:
+The supervisor directory's contents look like this:
 
 ```console
-logs$ ls worker
-metrics-dump-90188.txt          metrics-dump-90188.txt.old      worker.log
+logs$ ls supervisor
+metrics-dump-90188.txt          metrics-dump-90188.txt.old      supervisor.log
 logs$
 ```
 
-The `worker.log` file logs everything the worker does. This is useful for troubleshooting problems that are more directly focused on misbehavior by the worker itself, which isn't our problem today.
+The `supervisor.log` file logs everything the supervisor does. This is useful for troubleshooting problems that are more directly focused on misbehavior by the supervisor itself, which isn't our problem today.
 
 ### ziggy Directory
 
diff --git a/doc/user-manual/monitoring.md b/doc/user-manual/monitoring.md
index b3c078f..1fcab7b 100644
--- a/doc/user-manual/monitoring.md
+++ b/doc/user-manual/monitoring.md
@@ -4,31 +4,41 @@
 [[Up]](ziggy-gui-troubleshooting.md)
 [[Next]](alerts.md)
 
-## Monitoring Tab
+## Status Panel
 
-When stuff goes wrong, it's often worthwhile to click over to the `Monitoring` tab. In the current situation, you'll see something like this:
+When stuff goes wrong, it's often worthwhile to select the `Status` content menu item. In the current situation, you'll see something like this:
 
-![](images/monitoring-worker.png)
+<img src="images/monitoring-worker.png" style="width:32cm;"/>
 
-The first thing you should notice is that the colored boxes on the left mirror the colors of the stoplights. From this you can see that the stoplights are for pipelines (`Pi`), workers (`W`), Processes (`Pr`), and alerts (`A`).
+The first thing you should notice is that the colored boxes in the content menu for the status panel mirror the colors of the stoplights. From this you can see that the stoplights are for pipelines (`Pi`), workers (`W`), Processes (`Pr`), and alerts (`A`).
 
-The next thing you'll notice is that if you click on the titles of the boxes on the left, the content of the panel on the right changes. This allows you to see the state of assorted Ziggy components.
+The next thing you'll notice is that if you select one of the content menu items in the status panel, the content of the panel on the right changes. This allows you to see the state of assorted Ziggy components.
 
 ### Pipelines Status
 
-The `Pipelines` box, when clicked, just takes you back to the `Operations` tab. There's no better set of information for the status of running / completed pipelines than that.
+The `Pipelines` status panel displays all of the pipelines that have ever run.
 
 ### Workers Status
 
-The view shown above is the `Workers` status panel. This shows what each of the worker's processing threads is doing. The colored box and the stoplight are grey, which indicate that all the workers are currently idle. When stuff's happening, the box and stoplight turn green, and the table on the worker status panel shows what each thread is doing.
+The view shown above is the `Workers` status panel. This shows what each of the workers is doing. The colored box and the stoplight are grey, which indicate that at the moment there are no workers. When stuff's happening, the box and stoplight turn green, and the table on the worker status panel shows what each worker is doing.
+
+Why are there no workers? 
+
+Workers are created as needed, and each worker is assigned to perform a particular pipeline task (or a portion of a particular task). Once the worker's job is done, the worker is closed down, and if the supervisor later needs a worker process, it will create one on-the-fly. Thus when you run a pipeline that has a total of 6 tasks, and has a worker count of 2, the supervisor will create a total of 6 workers over the course of execution, but only 2 will be running at any given time.
+
+Thus the blank workers display: when there are no tasks running, there are no workers running; and when a worker isn't running, it ceases to exist. If you were to start a new pipeline with 2 workers, after the delay mentioned in the first point you'd see something like this:
+
+<img src="images/monitoring-worker-2.png" style="width:32cm;"/>
+
+Most of this table is (hopefully) self-explanatory. The thing that might not be is the content of the first column. This shows the worker ID for a given task (which you've seen before on the operations monitoring panel); the host ID (ditto); and the worker's process ID. The process ID is useful if you want to use one of your system's utilities (such as the `ps` or `top` commands) to get more information on what that worker is doing.
 
 ### Processes Status
 
 The `Processes` status panel looks like this:
 
-<img src="images/monitor-processes.png" style="zoom:50%;"/>
+<img src="images/monitor-processes.png" style="width:32cm;"/>
 
-The panel shows the current status and helpful parameters for three processes: the worker, the database, and the messaging system. Ziggy's messaging system is Java's Remote Method Invocation (RMI). RMI is actually in the family of Remote Procedure Calls (RPCs), which are a way that one process can request that another process execute a method, function, procedure, or other program unit. In this case, RMI allows the worker (a Java program) and the console (another Java program) to communicate with one another.
+The panel shows the current status and helpful parameters for three processes: the supervisor, the database, and the messaging system. Ziggy's messaging system is Java's Remote Method Invocation (RMI). RMI is actually in the family of Remote Procedure Calls (RPCs), which are a way that one process can request that another process execute a method, function, procedure, or other program unit. In this case, RMI allows the supervisor (a Java program), the console (another Java program), and the workers (yet more Java programs) to communicate with one another.
 
 In our experience, it's really unusual for any of these processes to fail, but if they do then the colored bar for that process will change to yellow or red. In that case, the best place to look for further clues is the worker log.
 
@@ -42,8 +52,8 @@ The colors on the left-hand panel match the colors of the stoplights at the top-
 
 |           | Grey                | Green                 | Yellow                                               | Red                                                    |
 | --------- | ------------------- | --------------------- | ---------------------------------------------------- | ------------------------------------------------------ |
-| Pipelines | No pipeline running | Pipeline(s) running   | Pipeline in `ERRORS_RUNNING` state                   | Pipeline in `ERRORS_STALLED` state                     |
-| Workers   | All workers idle    | Worker(s) active      | Not used                                             | Not used                                               |
+| Pipelines | No pipeline running | Pipeline(s) running   | Pipeline in `ERRORS_RUNNING` state                 | Pipeline in `ERRORS_STALLED` state                   |
+| Workers   | No workers running  | Worker(s) active      | Not used                                             | Not used                                               |
 | Processes | Not used            | All processes healthy | Process(es) in a failed state, attempting to recover | Process(es) in a failed state, recovery efforts failed |
 | Alerts    | Not used            | No new alerts         | New warning level alert(s)                           | New error-level alert(s)                               |
 
diff --git a/doc/user-manual/more-parameter-sets.md b/doc/user-manual/more-parameter-sets.md
index 08a6ea2..c526676 100644
--- a/doc/user-manual/more-parameter-sets.md
+++ b/doc/user-manual/more-parameter-sets.md
@@ -2,7 +2,7 @@
 
 [[Previous]](more-rdbms.md)
 [[Up]](dusty-corners.md)
-[[Next]](parameter-overrides.md)
+[[Next]](redefine-pipeline.md)
 
 ## More on Parameter Sets
 
@@ -10,27 +10,27 @@ Without further ado, let's talk parameter sets!
 
 ### Parameter Set Version Control
 
-When you first start the cluster and launch a console, after initializing the cluster, the parameter set screen looks like this:
+When you first start the cluster and launch a console, after initializing the cluster, the parameter set panel looks like this:
 
-![](images/param-lib-unused.png)
+<img src="images/parameter-library.png" style="width:32cm;"/>
 
-All the parameter sets are listed as version 0, the "Locked" boxes are all unchecked, and the "Mod. Time" column values are all pretty close to the same. 
+All the parameter sets are listed as version 0, the "Locked" boxes are all unchecked, and the "Mod. Time" column values are all pretty close to the same.
 
 After running the sample pipeline, what you see is more like this:
 
-![](images/param-lib-used.png)
+<img src="images/param-lib-used.png" style="width:32cm;"/>
 
-The same as before, but all the "Locked" boxes are checked. 
+The same as before, but all the "Locked" boxes are checked.
 
 Now let's modify the `Algorithm Parameters` parameter set in any old way and save the result:
 
-![](images/param-lib-modified.png)
+<img src="images/param-lib-modified.png" style="width:32cm;"/>
 
-The modified parameter set has a new version number, and its "Locked" box is unchecked. 
+The modified parameter set has a new version number, and its "Locked" box is unchecked.
 
-What you're seeing here is the parameter set version control system at work. A parameter set that's never been used is unlocked. This means that you can make whatever changes you want, and it will still show the same version number (so for example, if you were to further modify `Algorithm Parameters`, the version number would still be 1). Once a parameter set is passed to a pipeline instance, the parameter set is locked. At this point, any changes you make will result in a new version number (and the new version will be unlocked). 
+What you're seeing here is the parameter set version control system at work. A parameter set that's never been used is unlocked. This means that you can make whatever changes you want, and it will still show the same version number (so for example, if you were to further modify `Algorithm Parameters`, the version number would still be 1). Once a parameter set is passed to a pipeline instance, the parameter set is locked. At this point, any changes you make will result in a new version number (and the new version will be unlocked).
 
-Ziggy preserves all versions of all parameter sets in its relational database. It also preserves the linkage between a given version of a parameter set and all the pipeline tasks that used that version. This means that you can always look back at some processing activity and see the parameter sets, and the values of their parameters, that were used for that activity. 
+Ziggy preserves all versions of all parameter sets in its relational database. It also preserves the linkage between a given version of a parameter set and all the pipeline tasks that used that version. This means that you can always look back at some processing activity and see the parameter sets, and the values of their parameters, that were used for that activity.
 
 ### Import and Export
 
@@ -38,7 +38,7 @@ The `Import` and `Export` buttons control relations between the cluster and para
 
 #### Parameter Export
 
-The `Export` button writes the current state of the parameter library to an XML file, in the same format used for the initial definition of the parameter library (see [the article on module parameters](module-parameters.md) for more information). You'll get a `Save As`-style dialog box that allows you to select the directory and the filename for the export. 
+The `Export` button writes the current state of the parameter library to an XML file, in the same format used for the initial definition of the parameter library (see [the article on module parameters](module-parameters.md) for more information). You'll get a `Save As`-style dialog box that allows you to select the directory and the filename for the export.
 
 The exported file will provide a modicum of additional information relative to the original XML you used to import the parameters. To see what I mean, let's look at the representation of the `Algorithm Parameters` parameter set in the export file:
 
@@ -51,44 +51,40 @@ The exported file will provide a modicum of additional information relative to t
 </parameter-set>
 ```
 
-One thing you see is that Ziggy includes the Java class that supports the parameter set. In this case, that's the `DefaultParameters` class. As we saw earlier, parameter sets like `Algorithm Parameters` don't need to specify their Java class, because Ziggy knows that if there's no class specified, it should use `DefaultParameters`. Nonetheless, on export Ziggy always specified the Java class, even for parameter sets where the user didn't need to define the class during import. 
+One thing you see is that Ziggy includes the Java class that supports the parameter set. In this case, that's the `DefaultParameters` class. As we saw earlier, parameter sets like `Algorithm Parameters` don't need to specify their Java class, because Ziggy knows that if there's no class specified, it should use `DefaultParameters`. Nonetheless, on export Ziggy always specified the Java class, even for parameter sets where the user didn't need to define the class during import.
 
-The other thing you notice is that the version number and the lock state are explicitly shown. 
+The other thing you notice is that the version number and the lock state are explicitly shown.
 
 #### Parameter Import
 
-The `Import` button does the reverse of `Export`: it allows the user to specify an XML file that should be imported into the cluster. 
+The `Import` button does the reverse of `Export`: it allows the user to specify an XML file that should be imported into the cluster.
 
 Let's try this: use the `Import` button to read in the XML file that the `Export` command wrote out. When you do this, the following dialog box pops up:
 
-![](images/param-import-dialog-box.png)
+<img src="images/param-import-dialog-box.png" style="width:16cm;"/>
 
-What's this all about? 
+What's this all about?
 
 The `Action` column tells you how, if at all, each parameter set differs from the current version of that set in the database. None of these parameters have been touched, so they're all `SAME`. The other options for the `Action` column are as follows:
 
-- `UPDATE`: the parameter set exists in the database, but the values in the XML file are different. If this parameter set is imported, the database version will be updated (including the creation of a new version, if the current database version is locked).
-- `CREATE`: the parameter set does not exist in the database. If this parameter set is imported, it will be created in the database with version 0 and in the unlocked state.
-- `LIBRARY_ONLY`: the parameter set exists in the database but not in the XML file. Obviously, if you "import" this parameter set, nothing will happen because there's nothing to import. 
+- `UPDATE`: the parameter set exists in the database and also in the XML file, but the values in the XML file are different. If this parameter set is imported, the database version will be updated (including the creation of a new version, if the current database version is locked).
+- `CREATE`: the parameter set exists in the XML file but not in the database. If this parameter set is imported, it will be created in the database with version 0 and in the unlocked state.
+- `LIBRARY_ONLY`: the parameter set exists in the database but not in the XML file. Obviously, if you "import" this parameter set, nothing will happen because there's nothing to import.
 
-The `Include` column lets you select exactly which parameter sets you're going to import. This means that if you have an XML file that has a bunch of changed parameter sets, you can pick and choose which ones will be imported and which will be left as-is in the database. 
+The `Include` column lets you select exactly which parameter sets you're going to import. This means that if you have an XML file that has a bunch of changed parameter sets, you can pick and choose which ones will be imported and which will be left as-is in the database.
 
 ### New Parameter Set
 
-This allows a user to create a new parameter set via the console, without an XML file. Or at least it's supposed to. It doesn't work correctly at the moment. We'll let you know when it's fixed. 
+This allows a user to create a new parameter set via the console, without an XML file. Or at least it's supposed to. It doesn't work correctly at the moment. We'll let you know when it's fixed.
 
-### Adding or Removing Parameters
+### Modifying an Existing Parameter Set
 
-As we discussed in [the module parameters article](module-parameters.md), the user can define parameter sets for use by the processing algorithms in a fairly general way: in one of the parameter library files (i.e., the `pl-*.xml` files), define the parameter set name, the names of each parameter, the type of each parameter (including whether it's a scalar value or a 1-d array), and the initial value of the parameter. When you initialize the cluster, the parameter library XML files are read into the database. If you need to change a parameter value, you have numerous options, as described above. 
+Recall that, for parameter sets supported by the DefaultParameters Java class, the user can specify any parameters they like, in any of the supported classes (`boolean, byte, short, int, long, float, double, string`), and can specify them to be scalars or 1-d arrays. Thus, for example, the `Algorithm Parameters` set doesn't have to conform to any particular combination of parameters. This is different from parameters like the `RemoteParameters` instances, where the parameters need to match the ones in the underlying Java class.
 
-So far, so good. But now imagine that, as your mission continues, the algorithms are gradually improved in ways that require additional module parameters. What are your options?
+Users are generally going to be more involved with instances of `DefaultParameters`, because these are the parameter sets that are needed by the algorithms. That said: as time passes, the algorithms change, and that may mean that they need different parameters in their parameter sets! What's to be done in this case?
 
-Option one is to define a new parameter set for the new parameters, put it into a parameter library file, and use `runjava pl-import` to pull it into the database. This works, but it's kind of unsatisfying. For one thing, you also need to redefine the pipeline so that the new parameter set is provided to the algorithm (see [the article on redefining pipelines](redefine-pipeline.md) for more information). For another thing, it may be the case that the logical way to organize parameters would've put the new ones into an existing parameter set; if you use a new parameter set, you wind up diluting the benefits of organizing parameters into parameter sets in the first place. Also, once you've gone through a few cycles of algorithm improvement, you can wind up with a lot of parameter sets that really should be merged together. 
-
-Given the above, what you really want is the ability to add or remove parameters from existing parameter sets, either from the console or via an XML file. 
-
-As it happens, this capability is broken, too. We'll let you know when it's fixed. 
+As it happens, this capability is broken, too. We'll let you know when it's fixed.
 
 [[Previous]](more-rdbms.md)
 [[Up]](dusty-corners.md)
-[[Next]](parameter-overrides.md)
\ No newline at end of file
+[[Next]](redefine-pipeline.md)
diff --git a/doc/user-manual/more-rdbms.md b/doc/user-manual/more-rdbms.md
index 1c016ef..cab119c 100644
--- a/doc/user-manual/more-rdbms.md
+++ b/doc/user-manual/more-rdbms.md
@@ -14,9 +14,9 @@ The relational database is the system Ziggy uses to store its permanent records
 
 ### Is the Database Used for Anything Relevant to Algorithm Execution?
 
-Experience with prior missions has given us a sense that Ziggy's records are well-suited to be stored in a relational database, while the algorithms mainly need data that's not well-suited to such storage. This is why Ziggy stores models and data files in the datastore and never attempts to open those files up and manipulate the contents. 
+Experience with prior missions has given us a sense that Ziggy's records are well-suited to be stored in a relational database, while the algorithms mainly need data that's not well-suited to such storage. This is why Ziggy stores models and data files in the datastore and never attempts to open those files up and manipulate the contents.
 
-The limited amount of database information that's potentially needed for algorithm execution is the stuff that's provided in the algorithm inputs files: module parameters, names of model and data files, data file type definitions, etc. 
+The limited amount of database information that's potentially needed for algorithm execution is the stuff that's provided in the algorithm inputs files: module parameters, names of model and data files, data file type definitions, etc.
 
 ### What if We Need to Change Pipeline Definitions?
 
@@ -24,7 +24,7 @@ Ziggy's storage of things like parameter sets and pipeline definitions is done i
 
 ### Is it Possible to use the Database for Mission-Related Data?
 
-Short answer: yes. 
+Short answer: yes.
 
 Longer answer:
 
@@ -32,7 +32,7 @@ There are definitely cases in which some portion of the mission's data belongs i
 
 1. The amount of information in the catalog is large.
 2. The portion of the catalog needed by any particular processing task is tiny. Hence:
-3. It makes sense to query the database for the part of the catalog that a given task needs, and provide the results of that query to the task. 
+3. It makes sense to query the database for the part of the catalog that a given task needs, and provide the results of that query to the task.
 
 #### The Bad News
 
diff --git a/doc/user-manual/nicknames.md b/doc/user-manual/nicknames.md
new file mode 100644
index 0000000..f5b42b4
--- /dev/null
+++ b/doc/user-manual/nicknames.md
@@ -0,0 +1,35 @@
+<!-- -*-visual-line-*- -->
+
+[[Previous]](edit-pipeline.md)
+[[Up]](dusty-corners.md)
+[[Next]](contact-us.md)
+
+## Creating Ziggy Nicknames
+
+Ziggy nicknames were introduced in the article (Running the Pipeline)[running-pipeline.md]. Those nicknames are defined by properties in `ziggy.properties` with `ziggy.nickname.` prefixes. There is another property called `ziggy.default.jvm.args` that is added to any JVM arguments that appear in those properties.
+
+You can add your own nicknames to your own property file that is referred to by `PIPELINE_CONFIG_PATH`. You can find examples of the format in `ziggy.properties`, which is this:
+
+```
+ziggy.nickname.<nickname> = <fully qualified class name>|<logfile basename>|<space-delimited JVM args>|<space-delimited program args>
+```
+
+The pieces of this entry are as follows:
+
+| Item | Description |
+| ---- | ----------- |
+| nickname | The nickname you'd like to use such as `ziggy console`. |
+| fully qualified class name | The classname for the console is `gov.nasa.ziggy.ui.ZiggyConsole`. |
+| logfile basename | This item for the console is, namely, console, which results in a logfile in `${ziggy.pipeline.results.dir}/logs/cli/console.log`. If this is left blank, then the log filename will be `ziggy.log`. |
+| JVM arguments | If you need to raise the default heap size, this is the place to do it. |
+| program arguments | These arguments will always be passed on to the program in addition to any you pass on the `ziggy` command line. |
+
+Your nickname's entry may make use of other properties in your property file. Refer to that property like this: `${property}`.
+
+For more information, try `perldoc ziggy`.
+
+Once you've added some nicknames, you can create a symbolic link to the ziggy program and make it your own. For example, in the Science Processing Operations Center (SPOC) in TESS, we linked spocops to ziggy so that we could run `spocops import-target-list`.
+
+[[Previous]](edit-pipeline.md)
+[[Up]](dusty-corners.md)
+[[Next]](contact-us.md)
diff --git a/doc/user-manual/organizing-tables.md b/doc/user-manual/organizing-tables.md
new file mode 100644
index 0000000..8f57ee3
--- /dev/null
+++ b/doc/user-manual/organizing-tables.md
@@ -0,0 +1,58 @@
+<!-- -*-visual-line-*- -->
+
+[[Previous]](change-param-values)
+[[Up]](ziggy-gui.md)
+[[Next]](intermediate-topics.md)
+
+## Organizing Pipelines and Parameter Sets
+
+The sample pipeline, as discussed earlier, is a pretty trivial example of what you can do with Ziggy. There's only one pipeline defined (`sample`), and only 5 parameter sets.
+
+In real life, you may well wind up with a configuration that is, shall we say, somewhat richer. For example, the current TESS science data processing system has over a dozen pipelines and over 100 parameter sets! There are pipelines and parameter sets that are only used in system testing; pipelines and parameter sets that are targeted to one of the three types of flight data acquired by the instruments; pipelines and parameter sets that were used earlier in the mission but are now obsolete; and so on.
+
+In a system as complex as the TESS pipeline, how is a user supposed to be able to manage the potential deluge of pipeline elements that potentially need to be used, updated, and configured?
+
+### Introducing Groups
+
+Let's take another look at the parameter library display:
+
+<img src="images/parameter-library.png" style="width:32cm;"/>
+
+The display shows all of the parameter sets under an icon labeled `<Default Group>`. If you right-click on a parameter set, you get the following context menu:
+
+<img src="images/param-lib-context-menu.png" style="width:32cm;"/>
+
+You probably get an intuitive sense that the `Assign group...` command is something that will assist you in organizing the content of the parameter library display. Run the `Assign group...` command, and you get a dialog box:
+
+<img src="images/select-group-dialog.png" style="width:6cm;"/>
+
+Well, that's underwhelming.
+
+The issue here is that there aren't any groups defined "out of the box" except for the default group. To add a group, enter a group name in the text box under `Add/remove group`, and press the `+` button:
+
+<img src="images/select-group-with-test-group.png" style="width:6cm;"/>
+
+If you now press the `OK` button, you'll see the following change to the parameter library display:
+
+<img src="images/param-lib-group-assigned.png" style="width:32cm;"/>
+
+The `Single subtask configuration` parameter set is no longer visible, but there's a spot in the table for the `Test` group defined previously. If you click the `+` button next to `Test` to expand the group, you see this:
+
+<img src="images/param-lib-all-groups-expanded.png" style="width:32cm;"/>
+
+Okay, now this is starting to look promising! To summarize:
+
+- The user can define groups, which are a kind of container that parameter sets can be assigned to.
+- Once assigned to a group, a parameter set shows up in the display table as belonging to the group it's been assigned to.
+- Groups can be expanded or collapsed using appropriate mouse clicks on the table (or via the `Expand all` and `Collapse all` buttons at the top). This allows you to, in effect, conceal parameter sets when they aren't relevant to your current activity (by collapsing the groups of not-currently-relevant parameter sets) so you can focus on the ones you currently care about.
+- Though we haven't demonstrated it here, you can move a parameter set back to the `Default Group` via the `Select group` dialog box: check the box next to `Default group`, and press the `OK` button.
+
+With this wisdom in hand, let's look again at the `Pipelines` panel:
+
+<img src="images/pipelines-panel.png" style="width:32cm;"/>
+
+Based on our experience with parameter sets, it's now clear that we can group pipelines in the same way that we can group parameter sets. Given that there's only one pipeline in the sample, it would be really ludicrous to do so, but someday when you've got a couple of dozen actual pipelines you'll thank us for this.
+
+[[Previous]](change-param-values)
+[[Up]](ziggy-gui.md)
+[[Next]](intermediate-topics.md)
\ No newline at end of file
diff --git a/doc/user-manual/parameter-overrides.md b/doc/user-manual/parameter-overrides.md
index fcc7753..f41deba 100644
--- a/doc/user-manual/parameter-overrides.md
+++ b/doc/user-manual/parameter-overrides.md
@@ -16,11 +16,11 @@ So far, so good. But consider the following scenario:
 
 Imagine that you have lots of parameter sets, with lots and lots of parameters, and for some reason you have a situation in which you want to change a handful of parameters while leaving all the others unchanged. How do you do that?
 
-One way would be to [use the console to manually change the parameters](change-param-values.md). This is a bit cumbersome. It's especially cumbersome if you're changing the parameters to values that are specified by some other person or entity. In that case, they're writing down the changes they want on a Post-It or something, and you're going through implementing their changes (or worse, they just verbally tell you what they want and hope you remember everything they said). 
+One way would be to [use the console to manually change the parameters](change-param-values.md). This is a bit cumbersome. It's especially cumbersome if you're changing the parameters to values that are specified by some other person or entity. In that case, they're writing down the changes they want on a Post-It or something, and you're going through implementing their changes (or worse, they just verbally tell you what they want and hope you remember everything they said).
 
-Another way is to export the parameter library using the `Export` button, edit the resulting file to incorporate the changes, and then import the library using the `Import` button. This is a better option, especially if you're incorporating changes that come from somebody else (in that case you can tell that other person to edit the file), but it's potentially a bit of a hassle. It also introduces some potential for screwups because whoever edits the file has to find the exact parameters, in the exact parameter sets, that need to be modified. If there are a lot of parameters, and not too many need to be changed, this proves to be onerous and error-prone. 
+Another way is to export the parameter library using the `Export` button, edit the resulting file to incorporate the changes, and then import the library using the `Import` button. This is a better option, especially if you're incorporating changes that come from somebody else (in that case you can tell that other person to edit the file), but it's potentially a bit of a hassle. It also introduces some potential for screwups because whoever edits the file has to find the exact parameters, in the exact parameter sets, that need to be modified. If there are a lot of parameters, and not too many need to be changed, this proves to be onerous and error-prone.
 
-Fortunately, there's a tool that lets you get around this problem: you can write a parameter library XML file that specifies only the parameters you want to change. When it imports, the specified parameters will change and the rest remain the same. 
+Fortunately, there's a tool that lets you get around this problem: you can write a parameter library XML file that specifies only the parameters you want to change. When it imports, the specified parameters will change and the rest remain the same.
 
 ### The Parameter Override File
 
@@ -32,19 +32,19 @@ To see what's involved, take a look at `sample-pipeline/config-extra/pl-with-ove
     <parameter-set name="Algorithm Parameters">
         <parameter name="throw exception subtask_0" value="true" type="boolean"/>
     </parameter-set>
-    <parameter-set name="Multiple subtask configuration" 
+    <parameter-set name="Multiple subtask configuration"
     classname="gov.nasa.ziggy.uow.TaskConfigurationParameters">
         <parameter name="reprocess" value="true"/>
     </parameter-set>
 </parameterLibrary>
 ```
 
-In this file, the `parameterLibrary` element has its `override-only` attribute set to `true`. Other than that, only two parameters are defined: the `throw exception subtask_0` parameter in `Algorithm Parameters`, and the `reprocess` parameter in `Multiple subtask configuration` . 
+In this file, the `parameterLibrary` element has its `override-only` attribute set to `true`. Other than that, only two parameters are defined: the `throw exception subtask_0` parameter in `Algorithm Parameters`, and the `reprocess` parameter in `Multiple subtask configuration` .
 
-By specifying that override-only is true, Ziggy knows that the user doesn't want any other parameter in any parameter set to be altered. 
+By specifying that override-only is true, Ziggy knows that the user doesn't want any other parameter in any parameter set to be altered.
 
-The resulting file can be imported in the usual ways: either by the `Import` button on the `Parameter Library` item in `Configuration`, or by using the `runjava` command `pl-import` . In either case, examining the parameter library via the console shows that the two selected parameters are changed, and the remainder are unchanged. 
+The resulting file can be imported in the usual ways: either by the `Import` button on the `Parameter Library` item in `Configuration`, or by using the `ziggy` command `import-parameters`. In either case, examining the parameter library via the console shows that the two selected parameters are changed, and the remainder are unchanged.
 
 [[Previous]](more-parameter-sets.md)
 [[Up]](dusty-corners.md)
-[[Next]](redefine-pipeline.md)
\ No newline at end of file
+[[Next]](redefine-pipeline.md)
diff --git a/doc/user-manual/pipeline-architecture.md b/doc/user-manual/pipeline-architecture.md
index 02a6f6f..7ce2a79 100644
--- a/doc/user-manual/pipeline-architecture.md
+++ b/doc/user-manual/pipeline-architecture.md
@@ -6,13 +6,13 @@
 
 ## Pipeline Architecture
 
-As a general matter, it's not necessary to know much about the inner workings of Ziggy in order to use it. In the sections below we cover the things you actually do need to know. 
+As a general matter, it's not necessary to know much about the inner workings of Ziggy in order to use it. In the sections below we cover the things you actually do need to know.
 
 ### Architecture Diagram
 
-<img src="images/architecture-diagram.png">
+<img src="images/architecture-diagram.png" style="width:21cm;"/>
 
-The figure above shows Ziggy's architecture. Boxes in green (Algorithms, Pipeline Configuration, System Configuration) are the components that users need to supply or manage. Boxes in black (Datastore, Worker, User Interface) are parts of Ziggy. Boxes in red (Batch System, Cloud Computing Nodes, Local CPUs, Supercomputer, Working Directory File System) are system resources (note that you don't need to have *all* the components in red to make Ziggy work, so if you don't own a supercomputer or a batch system, don't panic). The box in purple is a relational database management system (RDBMS): Ziggy uses a Commercial Off-the-Shelf (COTS) database program (specifically, Postgresql), but the content in that database is generated by Ziggy. The blue box is mission data: this includes data from the instrument(s), instrument models (i.e., descriptions of the instruments that are needed for processing), etc. This is information that presumably flows to the pipeline at regular intervals and gets processed or reprocessed. 
+The figure above shows Ziggy's architecture. Boxes in green (Algorithms, Pipeline Configuration, System Configuration) are the components that users need to supply or manage. Boxes in black (Datastore, Supervisor and Workers, User Interface) are parts of Ziggy. Boxes in red (Batch System, Cloud Computing Nodes, Local CPUs, Supercomputer, Working Directory File System) are system resources (note that you don't need to have *all* the components in red to make Ziggy work, so if you don't own a supercomputer or a batch system, don't panic). The box in purple is a relational database management system (RDBMS): Ziggy uses a Commercial Off-the-Shelf (COTS) database program such as PostgreSQL, but the content in that database is generated by Ziggy. The blue box is mission data: this includes data from the instrument(s), instrument models (i.e., descriptions of the instruments that are needed for processing), etc. This is information that presumably flows to the pipeline at regular intervals and gets processed or reprocessed.
 
 A particular instance of the system above is called a **cluster**. A complete processing system may consist of more than one cluster: for example, the TESS processing pipeline has 4 clusters, each of which processes a different subset of TESS data. A single server can run multiple pipeline clusters, though that gets potentially messy. For now, let's stick with the assumption that on a given computer there's only one cluster in existence at a time.
 
diff --git a/doc/user-manual/properties.md b/doc/user-manual/properties.md
index 21d0110..0b6a3c6 100644
--- a/doc/user-manual/properties.md
+++ b/doc/user-manual/properties.md
@@ -1,10 +1,9 @@
 <!-- -*-visual-line-*- -->
 
-[[Previous]](task-configuration.md)
-[[Up]](intermediate-topics.md)
-[[Next]](troubleshooting.md)
+[[Previous]](contact-us.md)
+[[Up]](user-manual.md)
 
-## The Properties File
+## Appendix A. The Properties File
 
 When we discussed [configuring the pipeline](configuring-pipeline.md), we mentioned the properties file, which provides Ziggy with all of its global configuration. Let's get into detail on this now.
 
@@ -17,10 +16,10 @@ The properties file is a flat text file that consists of name-value pairs separa
 Properties can be defined in terms of the values of other properties by use of the `${...}` syntax. For example, in the [sample.properties](../../sample-pipeline/etc/sample.properties) file, we see these definition:
 
 ```
-pipeline.results.dir = ${pipeline.home.dir}/pipeline-results
+ziggy.pipeline.results.dir = ${ziggy.pipeline.home.dir}/pipeline-results
 ```
 
-When Ziggy needs the value of `pipeline.results.dir`, it first finds the value of `build.dir`, and then appends `/pipeline-results` onto the end of that string. Note that for some reason this is sometimes referred to as "interpolation."
+When Ziggy needs the value of `ziggy.pipeline.results.dir`, it first finds the value of `build.dir`, and then appends `/pipeline-results` onto the end of that string. Note that for some reason this is sometimes referred to as "interpolation."
 
 #### Use of Environment Variables
 
@@ -34,7 +33,7 @@ hibernate.connection.username = ${env:USER}
 
 Ziggy actually uses two properties files.
 
-The pipeline properties file contains the properties that you, the pipeline user, are more likely to want to edit. This is the file that `PIPELINE_CONFIG_PATH` needs to point to.
+The pipeline properties file contains the properties that you, the pipeline user, are more likely to want to edit. This is the file that `PIPELINE_CONFIG_PATH` needs to point to. You likely seeded your file with the copy in `ZIGGY_ROOT/etc/pipeline.properties.EXAMPLE`.
 
 The other properties file is the Ziggy properties file, which is stored with the main Ziggy code, at `etc/ziggy.properties`. These are properties that you, the pipeline user, are unlikely to ever want to mess with. Ziggy finds the latter via -- yeah, you got it -- a property in the former, specifically `ziggy.config.path`.
 
@@ -44,94 +43,61 @@ In a real, normal pipeline, our recommendation is to put the pipeline properties
 
 Without further ado, here's the list of properties that Ziggy gets from the properties files. Note that these are the properties that Ziggy itself uses. You can define any other properties you like, and define the ones in this section in terms of the new ones you've defined, if that makes your properties file easier to use or maintain.
 
-#### General Path-Setting
-
-| Property Name           | Description                                                  | File     |
-| ----------------------- | ------------------------------------------------------------ | -------- |
-| pipeline.home.dir       | Top-level directory for the pipeline code.                   | Pipeline |
-| pipeline.results.dir    | Location for working directories, log files, etc.            | Pipeline |
-| pipeline.definition.dir | Location for XML files that define the pipeline              | Pipeline |
-| pipeline.classpath      | Java classpath for pipeline-side Java classes                | Pipeline |
-| pipeline.logoFile       | Location and name of the image logo file to be used as an icon (supported formats: PNG, JPEG, BMP, GIF, WBMP) | Pipeline |
-| data.receipt.dir        | Directory used by data receipt                               | Pipeline |
-| database.dir            | Directory used by RDBMS; if empty, the system database is used | Pipeline |
-| datastore.root.dir      | Root directory for datastore                                 | Pipeline |
-| java.home               | Location of Java to be used by runjava (see the article on [running the cluster](running-pipeline.md) for more information on runjava) | Pipeline |
-
-#### Paths to Ziggy
-
-| Property Name     | Description                                 | File     |
-| ----------------- | ------------------------------------------- | -------- |
-| ziggy.home.dir    | Location of the `build` directory for Ziggy | Pipeline |
-| ziggy.config.path | Location of Ziggy's configuration file      | Pipeline |
-
-#### Algorithm Module Paths
-
-In order to avoid conflicts with the rest of the user's environment configuration, when Ziggy runs an algorithm module it creates an environment in which the executable and library paths are replaced by values specified in the pipeline configuration file. This means that the user isn't obligated to put any pipeline-related paths into their `PATH` or `LD_LIBRARY_PATH` environment variables.
-
-| Property Name               | Description                                                  | File     |
-| --------------------------- | ------------------------------------------------------------ | -------- |
-| pi.worker.moduleExe.binPath | Colon-separated list of directories to search for algorithm executables | Pipeline |
-| pi.worker.moduleExe.libPath | Colon-separated list of directories to search for shared libraries (i.e., files with .so or .dylib suffix) | Pipeline |
-
-#### Algorithm Environment
-
-| Property Name            | Description                                                  | File     |
-| ------------------------ | ------------------------------------------------------------ | -------- |
-| pi.moduleExe.environment | Comma-separated list of name-value pairs of environment variables that should be provided to the algorithm at runtime. | Pipeline |
-
-#### Database Properties
-
-| Property Name          | Description                                                  | File     |
-| ---------------------- | ------------------------------------------------------------ | -------- |
-| database.software.name | The flavor of database in use, also used in the database URI. Currently, only postgresql is supported. | Pipeline |
-| database.name          | Name of the database (you're going to be stuck with this forever once you pick it, so choose wisely) | Pipeline |
-| database.port          | Connection port for RDBMS. Each cluster on a given system must have its own database port. More generally, each cluster must have a port that is not already in use on the system, so you need to avoid trying to use a port that some other joker has already taken. | Pipeline |
-| database.host          | Hostname for RDBMS (usually localhost)                       | Ziggy    |
-| database.connections   | Number of connections database will accept. Might not be used  if the database is a system database. | Pipeline |
-
-#### Worker Resources
-
-| Property Name         | Description                                                  | File     |
-| --------------------- | ------------------------------------------------------------ | -------- |
-| rmi.registry.port     | Port used for connections between worker and UI. Same conditions as for the database port (i.e., each cluster must have a port that's unique and not in use by some other joker). | Pipeline |
-| pi.worker.heapSize    | Size of Java heap for worker process, in MB (can be overridden by the `--workerHeapSize` option in `runjava cluster start`) | Pipeline |
-| pi.worker.threadCount | Number of worker threads (can be overridden by the `--workerThreadCount` option in `runjava cluster start`); set to zero to have 1 thread per CPU "core" | Pipeline |
-
-#### Remote Execution Properties
-
-| Property Name       | Description                                                  | File     |
-| ------------------- | ------------------------------------------------------------ | -------- |
-| remote.user         | Username to be used when submitting jobs to batch system     | Pipeline |
-| remote.group        | Group ID to be used when submitting jobs to batch system     | Pipeline |
-| remote.cluster.name | Flavor of remote system used. Supported values are "NAS" (i.e., the HPC facility at NASA Ames Research Center), "AWS" (i.e., Amazon Web Services). | Pipeline |
-
-#### Behavior Properties
-
-| Property Name                   | Description                                                  | File     |
-| ------------------------------- | ------------------------------------------------------------ | -------- |
-| moduleExe.useSymlinks           | Use symbolic links rather than copies when staging files to working directory | Pipeline |
-| moduleExe.memdrone.enabled      | Enable/disable memory consumption tracker                    | Pipeline |
-| moduleExe.memdrone.sleepSeconds | Sample interval for memory consumption tracker               | Pipeline |
-| pi.processing.halt.step         | Automatically halt pipeline after a given processing step (marshaling, submitting, etc.). Mainly for debugging. See the article on [The Instances Panel](instances-panel.md) for more about processing steps. | Pipeline |
-
-#### Hibernate Properties
-
-These properties control the behavior of Hibernate, the API that links Ziggy to the database.
-
-| Property Name                       | Description                                                  | File     |
-| ----------------------------------- | ------------------------------------------------------------ | -------- |
-| hibernate.connection.username       | Username for use when connecting to database                 | Pipeline |
-| hibernate.show_sql                  | Write generated queries to log file                          | Ziggy    |
-| hibernate.format_sql                | "Pretty-print" generated queries written to log file         | Ziggy    |
-| hibernate.use_sql_comments          | Generate comments in generated queries                       | Ziggy    |
-| hibernate.jdbc.batch_size           | Size of batches used in updates                              | Ziggy    |
-| hibernate.id.new_generator_mappings | Allow sequence generators to have initial values             | Ziggy    |
-| hibernate.connection.url            | URL for database connections (default: jdbc:${database.software.name}://${database.host}:${database.port}/${database.name})                                 | Ziggy    |
-| hibernate.connection.password       | Password for database connections                            | Ziggy    |
-| hibernate.controller.driver_class   | Java class used by Hibernate to manage connections. Only needed if using a database application not supported by Ziggy. | Ziggy    |
-| hibernate.dialect                   | Database dialect used by Hibernate. Only needed if using a database application not supported by Ziggy. | Ziggy    |
-
-[[Previous]](task-configuration.md)
-[[Up]](intermediate-topics.md)
-[[Next]](troubleshooting.md)
+The default value is either defined by code or by `ziggy.properties`. If the default value is None, you must define the property in your `PIPELINE_CONFIG_PATH` file.
+
+| Name | Description | Default |
+| ---- | ----------- | -------- |
+| hibernate.connection.driver_class | Java class used by Hibernate to manage connections. Only needed if using a database application not supported by Ziggy. | Supported database default |
+| hibernate.connection.password | Password for database connections | None |
+| hibernate.connection.url | URL for database connections | jdbc:${ziggy.database.software.name}:${ziggy.database.protocol}//${ziggy.database.host}:${ziggy.database.port}/${ziggy.database.name} |
+| hibernate.connection.username | Username for use when connecting to database | None |
+| hibernate.dialect | Database dialect used by Hibernate. Only needed if using a database application not supported by Ziggy. | Supported database default |
+| hibernate.format_sql | "Pretty-print" generated queries written to log file | true |
+| hibernate.jdbc.batch_size | Size of batches used in updates | 30 |
+| hibernate.show_sql | Write generated queries to log file | false |
+| hibernate.use_sql_comments | Generate comments in generated queries | false |
+| java.home | Location of Java used by the ziggy program to override the Java on your search path (see the article on [running the cluster](running-pipeline.md) for more information on the ziggy program) | $JAVA_HOME |
+| ziggy.config.path | Location of Ziggy's configuration file | ./etc/ziggy.properties |
+| ziggy.database.bin.dir | Location of the RDBMS executables | $PATH |
+| ziggy.database.conf.file | Location of the database configuration file; not used with a system database | "" |
+| ziggy.database.connections | Number of connections database will accept; not used with a system database | None |
+| ziggy.database.dir | Directory used by RDBMS; if empty, the system database is used | "" |
+| ziggy.database.host | Hostname for RDBMS (usually localhost) | None |
+| ziggy.database.name | Name of the database (you're going to be stuck with this forever once you pick it, so choose wisely) | None |
+| ziggy.database.port | Connection port for RDBMS. Each cluster on a given system must have its own database port. More generally, each cluster must have a port that is not already in use on the system, so you need to avoid trying to use a port that some other joker has already taken. | None |
+| ziggy.database.protocol | Protocol for RDBMS if applicable plus any punctuation used before the // in the URL such as colon (:) as in `hsql:`. | "" |
+| ziggy.database.software.name | The flavor of database in use (postgresql, hsqldb). | "" |
+| ziggy.home.dir | Location of the `build` directory for Ziggy | None |
+| ziggy.logoFile | Location and name of the image logo file to be used as an icon (supported formats: PNG, JPEG, BMP, GIF, WBMP) | "" |
+| ziggy.pipeline.binPath | Colon-separated list of directories to search for algorithm executables (PATH is ignored by Ziggy) | ${ziggy.pipeline.home.dir}/bin |
+| ziggy.pipeline.classpath | Java classpath for pipeline-side Java classes | "" |
+| ziggy.pipeline.data.importer.classname | Implementation class of DataImporter used by data receipt | gov.nasa.ziggy.data.management.DefaultDataImporter |
+| ziggy.pipeline.data.receipt.dir | Directory used by data receipt | None |
+| ziggy.pipeline.data.receipt.validation.maxFailurePercentage | Maximum percentage of files that can fail validation before DR throws an exception | 100 |
+| ziggy.pipeline.datastore.dir | Root directory for datastore | None |
+| ziggy.pipeline.definition.dir | Location for XML files that define the pipeline | None |
+| ziggy.pipeline.environment | Comma-separated list of name-value pairs of environment variables that should be provided to the algorithm at runtime. | "" |
+| ziggy.pipeline.home.dir | Top-level directory for the pipeline code. | None |
+| ziggy.pipeline.libPath | Colon-separated list of directories to search for shared libraries such as files with .so or .dylib suffix (LD_LIBRARY_PATH is ignored by Ziggy) | "" |
+| ziggy.pipeline.mcrRoot | Location of the MATLAB Compiler Runtime (MCR), including the version, if MATLAB algorithm executables are used | "" |
+| ziggy.pipeline.memdrone.enabled | Enable/disable memory consumption tracker | false |
+| ziggy.pipeline.memdrone.sleepSeconds | Sample interval for memory consumption tracker | 60 |
+| ziggy.pipeline.processing.halt.step | Automatically halt pipeline after a given processing step (marshaling, submitting, etc.). Mainly for debugging. See the article on [The Instances Panel](instances-panel.md) for more about processing steps. | C |
+| ziggy.pipeline.results.dir | Location for working directories, log files, etc. | None |
+| ziggy.pipeline.uow.defaultIdentifier.classname | Class used to identify default UOWs that are defined in the pipeline (not Ziggy) | DatastoreDirectoryUnitOfWorkGenerator.class or DataReceiptUnitOfWorkGenerator.class as appropriate |
+| ziggy.pipeline.useSymlinks | Use symbolic links rather than copies when staging files to working directory | false |
+| ziggy.remote.cluster.name | Flavor of remote system used. Supported values are "NAS" (i.e., the HPC facility at NASA Ames Research Center), "AWS" (i.e., Amazon Web Services). | NAS |
+| ziggy.remote.group | Group ID to be used when submitting jobs to batch system | "" |
+| ziggy.remote.host | Colon-separated list of remote host names, in order from most- to least-desired | "" |
+| ziggy.remote.nasa.directorate | NASA directorate to be used for calculating likely NAS queue wait times | SMD |
+| ziggy.remote.queuecommand.classname | Implementation class of QueueCommandManager for use by Ziggy | gov.nasa.ziggy.module.remote.QueueLocalCommandManager |
+| ziggy.remote.user | Username to be used when submitting jobs to batch system | "" |
+| ziggy.test.working.dir | Allows the user to specify a working directory other than user.dir. For testing only. | ${user.dir} |
+| ziggy.worker.allowPartialTasks | Allow persisting to continue although one or more subtasks failed | true |
+| ziggy.worker.heapSize | Maximum cumulative size of the Java heap for all worker processes, in MB (can be overridden by the `--workerHeapSize` option in `ziggy cluster start`) | 16,000 |
+| ziggy.supervisor.heartbeat.interval.millis | Interval between messages from the supervisor to RMI clients to ensure that connections remain intact | 15,000 |
+| ziggy.supervisor.port | Port used for connections between supervisor, worker, and UI. Same conditions as for the database port (i.e., each cluster must have a port that's unique and not in use by some other joker). | 1099 |
+| ziggy.worker.count | Maximum number of workers (can be overridden by the `--workerCount` option in `ziggy cluster start`); set to zero to have 1 worker per CPU "core" | 1 |
+
+[[Previous]](contact-us.md)
+[[Up]](user-manual.md)
diff --git a/doc/user-manual/rdbms.md b/doc/user-manual/rdbms.md
index cd57507..d9ef5dc 100644
--- a/doc/user-manual/rdbms.md
+++ b/doc/user-manual/rdbms.md
@@ -1,65 +1,71 @@
 <!-- -*-visual-line-*- -->
 
-[[Previous]](building-pipeline.md)
+[[Previous]](task-configuration.md)
 [[Up]](user-manual.md)
-[[Next]](running-pipeline.md)
+[[Next]](troubleshooting.md)
 
-## Setting up the Relational Database Management System (RDBMS)
+## Setting up a Relational Database Management System (RDBMS)
 
-Ziggy uses a commercial off-the-shelf (COTS) database application to keep track of a lot of the details of pipeline operations and generally to provide permanent records of lots and lots of information. For this purpose, pretty much any RDBMS will suffice, but Ziggy "ships" with support for Postgresql. Postgresql is free and open-source, has great support and documentation, and performs well.
+Ziggy uses commercial off-the-shelf (COTS) database applications to keep track of a lot of the details of pipeline operations and generally to provide permanent records of lots and lots of information. For this purpose, pretty much any RDBMS will suffice, but Ziggy "ships" with support for HSQLDB and PostgreSQL.
 
-That said, we found it impossible to integrate "download and build" support for Postgresql into the Ziggy build system. We're also aware that you may not want to download and build Postgresql yourself. You may want to use a Postgresql database that is set up and maintained by your system administrator (the "system database"). You may want to use a system database that's not Postgresql at all. For this reason, this article will walk you through three options: using your own copy of Postgresql; using the system Postgresql database; and using a non-Postgresql database, either one that you create and run or one that your sysadmin sets up on your system database.
+### HSQLDB
 
-### Your own private Postgresql
+The sample pipeline properties file is configured to use the included HSQLDB database so you can be productive immediately. HSQLDB is an in-memory database, which is both a benefit as it makes it fast, and a limitation, as it limits the size of your database<sup>1</sup>.
 
-This is in many ways the easiest solution, especially if all you really want to do at this point is set up Ziggy, see that it runs, and get a sense for the features. It's easiest in that it doesn't require a sysadmin to set anything up for you, and it's integrated into the rest of Ziggy's systems.
+### PostgreSQL
+
+As your system grows, you may consider switching to PostgreSQL, which is free and open-source, has great support and documentation, and performs well.
+
+You may already have a PostgreSQL database that is set up and maintained by your system administrator (the "system database"). If not, you'll need to download and install PostgreSQL yourself. The following sections walk you through these two options.
+
+#### Your own private PostgreSQL
+
+This is in many ways the easiest solution in that it doesn't require a sysadmin to set anything up for you, and it's integrated into the rest of Ziggy's systems.
 
 Anyway, the steps look like this:
 
-#### Install Postgresql
+##### Install PostgreSQL
 
-On a Macbook you can use Homebrew or Macports to install Postgresql in your home directory, assuming you have the permissions for that. On Linux you can use the system's package manager if you have permissions for that. Users of any OS can go to [the Postgresql website](https://www.postgresql.org/download/) and download executables or source code. We've historically used the now-somewhat-outdated Postgresql 10, but testing indicates that any version up to 14 will work. Not surprising, as our demands on the database are relatively simple.
+On a Macbook you can use Homebrew or Macports to install PostgreSQL in your home directory, assuming you have the permissions for that. On Linux you can use the system's package manager if you have permissions for that. Users of any OS can go to [the PostgreSQL website](https://www.postgresql.org/download/) and download executables or source code. We've currently developing with the older PostgreSQL 12, but testing indicates that any version up to 14 will work. Not surprising, as our demands on the database are relatively simple.
 
-#### Put the Postgresql Executables on your Search Path
+##### Put the PostgreSQL Executables on your Search Path
 
-In other words, "make sure that the postgresql bin directory is part of your PATH environment variable." Alternately, you can fill in `database.bin.dir` in [the properties file](properties.md).
+In other words, "make sure that the postgresql bin directory is part of your PATH environment variable." Alternately, you can fill in `ziggy.database.bin.dir` in [the properties file](properties.md).
 
-#### That's it.
+##### Update the Properties File
 
-With the steps above done, you should be ready to [configure your pipeline](configuring-pipeline.md).
+If you're on a system where other people are using PostgreSQL for Ziggy or other programs, you'll need to change the property `ziggy.database.port` in your properties file and set it to a free port. Try the `ss -tulw` command to see what ports are not free. Otherwise, you can use the value in pipeline.properties.EXAMPLE, which is the default PostgreSQL port (5432).
 
-### System Postgresql
+#### System PostgreSQL
 
 This case is a bit more involved for the database and/or system administrators. On the other hand, it's less work for the user in that it delegates installation, care and feeding of the database application to the system administrators. Anyway:
 
-#### Create the Database
+##### Create the Database
 
-The system database is a system-level instance of Postgresql that can run multiple relational databases simultaneously. This means that Postgresql needs to be installed by your system administrator, if it isn't already installed, and your Ziggy database needs to be created for you by the database administrator (DBA).
+The system database is a system-level instance of PostgreSQL that can run multiple relational databases simultaneously. This means that PostgreSQL needs to be installed by your system administrator, if it isn't already installed, and your Ziggy database needs to be created for you by the database administrator (DBA).
 
-#### Update the Properties File
+##### Update the Properties File
 
-In order to use the system Postgresql executable, you'll need to set some values in [the properties file](properties.md). Specifically:
+In order to use the system PostgreSQL executable, you'll need to set some values in [the properties file](properties.md). Specifically:
 
-- The property `database.port` needs to be set to whatever port the system database uses for connections. The value in `pipeline.properties.EXAMPLE` is the default Postgresql port (5432), so you might not need to change it.
-- The property `database.dir` needs to be removed. This tells Ziggy where it should put the files that are the content of the database, and in this case you don't need that because Ziggy isn't making that decision, your sysadmin is.
-- The property `database.conf.file` needs to be removed. This tells Postgresql how to configure itself; again, in this case, your sysadmin has made all those decisions for you.
+- The property `ziggy.database.port` needs to be set to whatever port the system database uses for connections. The value in `pipeline.properties.EXAMPLE` is the default PostgreSQL port (5432), so you might not need to change it.
+- The property `ziggy.database.dir` needs to be removed. This tells Ziggy where it should put the files that are the content of the database, and in this case you don't need that because Ziggy isn't making that decision, your sysadmin is.
+- The property `ziggy.database.conf.file` needs to be removed. This tells PostgreSQL how to configure itself; again, in this case, your sysadmin has made all those decisions for you.
 - Other database properties need to be set according to instructions from your system administrator.
 
-#### One Last Thing
+##### One Last Thing
 
 If Ziggy's database runs in the context of the system's RDBMS, then Ziggy won't attempt to start or stop the database when it starts and stops the rest of its systems (again, see [the article on running the cluster](running-pipeline.md)). In essence, the database is "running" all the time.
 
 However, this also means that if the database goes down (for example when the system is shut down), it may need a system administrator to bring it back to life.
 
-### Non-Postgresql RDBMS
+### Some Other RDBMS
 
-This is the most complex option to use, and I recommend that you not go this route right from the start. Instead, try using a private Postgresql database while you're trying out Ziggy and figuring out whether you ever want to do anything further with it! Once you've made that call, then it might be time to think about which RDBMS you're going to use.
+This is the most complex option to use, and I recommend that you not go this route right from the start. But if your favorite RDBMS isn't HSQLDB or PostgreSQL, read on.
 
-In case you've already done the above and definitely want to run Ziggy, but definitely don't want to use Postgresql; or if creating any kind of Postgresql database is out of the question for you for whatever reason (usually privilege issues), read on.
+The best way to accomplish this is to contact the Ziggy team and ask us whether we'd be willing and able to add support for another RDBMS application.
 
-The best way to accomplish this is to contact the Ziggy team and ask us whether we'd be willing and able to add support for RDBMS applications other than Postgresql.
-
-The main reason we only support Postgresql is that we haven't had any requests yet to add another RDBMS, and in the absence of such a request we wouldn't know which ones to add and don't want to needlessly make work for ourselves. That said, in principle Ziggy is written in a way that should make it straightforward to add support for additional databases. If somebody actually wants to use one, then by definition it's not needless work, so we'll do it if we can!
+The main reason we only support HSQLDB and PostgreSQL is that we haven't had any requests yet to add another RDBMS, and in the absence of such a request we wouldn't know which ones to add and don't want to needlessly make work for ourselves. That said, in principle Ziggy is written in a way that should make it straightforward to add support for additional databases. If somebody actually wants to use one, then by definition it's not needless work, so we'll do it if we can!
 
 In the event of impatience or bravery on your part, you can make a different RDBMS work for you without any help from us. Here's what you need to do:
 
@@ -69,18 +75,18 @@ Either you (in the case of a private database) or your DBA (in the case of a sys
 
 #### Get the Appropriate Database JAR File
 
-A database JAR file is the glue that connects Ziggy's Java code to the database application. Ziggy downloads the JAR files for Postgresql and HSQLDB, but no other RDBMS applications. For other applications, you'll need to get the JAR file.
+A database JAR file is the glue that connects Ziggy's Java code to the database application. Ziggy downloads the JAR files for PostgreSQL and HSQLDB, but no other RDBMS applications. For other applications, you'll need to get the JAR file.
 
-In order to tell Ziggy where to find the JAR file, you'll want to put the file system path to the JAR file into the `pipeline.classpath` property of the properties file. Alternately, you could put it into `ziggy/build/libs`, but if you do that then whenever you run `./gradlew clean`, the JAR file will get deleted and won't get replaced.
+In order to tell Ziggy where to find the JAR file, you'll want to put the file system path to the JAR file into the `ziggy.pipeline.classpath` property of the properties file. Alternately, you could put it into `ziggy/build/libs`, but if you do that then whenever you run `./gradlew clean`, the JAR file will get deleted and won't get replaced.
 
 This JAR file will contain the database driver class definition; you'll need that classname for the next couple of steps.
 
 #### Generate The Database Schema
 
-Ziggy generates the schema for its database tables in Postgresql format (and also HSQLDB, but never mind that for now). This may or may not work for some other kind of database. You can generate the tables for some other database using a utility that Ziggy provides:
+Ziggy generates the schema for its database tables in PostgreSQL and HSQLDB format. You can generate the tables for some other database using a utility that Ziggy provides:
 
 ```console
-$ runjava -Dhibernate.connection.driver_class=<classname> -Dhibernate.dialect=<dialect> gov.nasa.ziggy.services.database.ZiggySchemaExport --create --output=<output-file>
+$ ziggy -Dhibernate.connection.driver_class=<classname> -Dhibernate.dialect=<dialect> gov.nasa.ziggy.services.database.ZiggySchemaExport --create --output=<output-file>
 ```
 
 You'll need to substitute in the name of the driver class for `<classname>`, the name of the dialect for `<dialect>` , and the output file name and location for `<output-file>`. For the dialect, use the fully-qualified name of one of the classes in the `org.hibernate.dialect` package as a string.
@@ -93,28 +99,26 @@ Using the files created in the previous step, create the necessary tables in the
 
 You'll need to make several changes:
 
-- The property `database.port` needs to be set to whatever port the database uses for connections.
-- The property `database.sofware.name` must be removed.
+- The property `ziggy.database.port` needs to be set to whatever port the database uses for connections.
+- The property `database.software.name` must be removed.
 - The properties `hibernate.dialect` and `hibernate.connection.driver_class` need to be set to the values you used a couple steps ago when generating the schema.
 
 #### Populate the Database Tables
 
-This amounts to manually importing into the database the XML files that define the pipeline, parameters, and data types. Fortunately, there are runjava commands you can use for all of these actions:
+This amounts to manually importing into the database the XML files that define the pipeline, parameters, and data types. Fortunately, there are ziggy commands you can use for all of these actions:
 
-- The command `runjava pl-import` allows you to read in the parameter library files.
-- The command `runjava pt-import` allows you to read in the data file type definitions.
-- The command `runjava pd-import` allows you to read in the pipeline definitions.
+- The command `ziggy import-parameters` allows you to read in the parameter library files.
+- The command `ziggy import-types` allows you to read in the data file type definitions.
+- The command `ziggy import-pipelines` allows you to read in the pipeline definitions.
 
-All of the commands listed above will allow you to get help to know the exact syntax, order of arguments, etc. For more information on runjava, take a look at [the article on running the cluster](running-pipeline.md). Most importantly: **Be sure to run the commands in the order shown above**, and specifically **be sure to run pd-import last!**
+All of the commands listed above will allow you to get help to know the exact syntax, order of arguments, etc. For more information on the ziggy program, take a look at [the article on running the cluster](running-pipeline.md). Most importantly: **Be sure to run the commands in the order shown above**, and specifically **be sure to run import-pipelines last!**
 
 #### One Last Thing
 
-As with a Postgresql system database, a database that uses some other RDBMS application will be controlled by you, or your system administrator, and not Ziggy. Ziggy will not attempt to stop or start the database.
-
-### Okay, What Next?
+As with a PostgreSQL system database, a database that uses some other RDBMS application will be controlled by you, or your system administrator, and not Ziggy. Ziggy will not attempt to stop or start the database.
 
-Now we move on to running a [pipeline in a cluster!](running-pipeline.md)
+<sup>1</sup> HSQLDB can be configured to run from on-disk catalogs and can theoretically handle 64 TB of data but that is beyond the scope of this document.
 
-[[Previous]](building-pipeline.md)
+[[Previous]](task-configuration.md)
 [[Up]](user-manual.md)
-[[Next]](running-pipeline.md)
+[[Next]](troubleshooting.md)
diff --git a/doc/user-manual/redefine-pipeline.md b/doc/user-manual/redefine-pipeline.md
index 9644219..e547d4e 100644
--- a/doc/user-manual/redefine-pipeline.md
+++ b/doc/user-manual/redefine-pipeline.md
@@ -2,42 +2,42 @@
 
 [[Previous]](parameter-overrides.md)
 [[Up]](dusty-corners.md)
-[[Next]](edit-trigger.md)
+[[Next]](edit-pipeline.md)
 
 ## Redefining a Pipeline
 
-Something that does happen in the course of a typical science mission is that the mission's data analysis needs change. Sometimes this is because the subject matter experts come up with a better or more efficient set of algorithms. Sometimes this is because, once the mission is collecting real data, folks realize that the original algorithms aren't sufficient and need to be updated, including occasionally adding whole new algorithms into the processing sequence. Sometimes it's because the science instruments change with time in ways that require algorithm changes or new parameter sets or ... something. 
+Something that does happen in the course of a typical science mission is that the mission's data analysis needs change. Sometimes this is because the subject matter experts come up with a better or more efficient set of algorithms. Sometimes this is because, once the mission is collecting real data, folks realize that the original algorithms aren't sufficient and need to be updated, including occasionally adding whole new algorithms into the processing sequence. Sometimes it's because the science instruments change with time in ways that require algorithm changes or new parameter sets or ... something.
 
-The good news is that it's straightforward to update a pipeline definition in Ziggy, and that Ziggy preserves a permanent record of all versions of all pipelines, so you don't lose the records of what you did in the past when you change what you want to do in the future. The bad news is that this can't be done from the console, but only via a `runjava` command (see [the article on running the cluster](running-pipeline.md) for a refresher on the `runjava` command system). 
+The good news is that it's straightforward to update a pipeline definition in Ziggy, and that Ziggy preserves a permanent record of all versions of all pipelines, so you don't lose the records of what you did in the past when you change what you want to do in the future. The bad news is that this can't be done from the console, but only via a `ziggy` command (see [the article on running the cluster](running-pipeline.md) for a refresher on the `ziggy` command system).
 
-To see this in action, let's take a look at the Pipelines item on the Configuration tab. Selecting that item puts up a list of pipelines (in this case there's only one), and when you select the sample pipeline you see this:
+To see this in action, open up the Pipelines panel, select the sample pipeline, and run the `View` command from the context menu. You'll see this:
 
-![](images/pipelines-config-1.png)
+<img src="images/pipelines-config-1.png" style="width:11cm;"/>
 
-This shows the modules in the pipeline and their order of execution. 
+This shows the modules in the pipeline and their order of execution.
 
 Now let's assume that something has happened and you decide that you want to get rid of the averaging step at the end. Here's how you go about that:
 
-**Create a New Pipeline Definition XML File:** first you need a new version of the pd-sample.xml file that has your changes. In the interest of saving everyone time and effort, we've included a modified file for you, it's `sample-pipeline/config-extras/pd-sample.xml` . Here we've deleted the `averaging` node from the end of the pipeline, and removed from `flip` the name of its child node (since it no longer has a child node). 
+**Create a New Pipeline Definition XML File:** first you need a new version of the pd-sample.xml file that has your changes. In the interest of saving everyone time and effort, we've included a modified file for you, it's `sample-pipeline/config-extras/pd-sample.xml` . Here we've deleted the `averaging` node from the end of the pipeline, and removed from `flip` the name of its child node (since it no longer has a child node).
 
-Note that in this case we've done the simplest possible change, but in real life you can add nodes, rearrange nodes, change parameter sets, etc. 
+Note that in this case we've done the simplest possible change, but in real life you can add nodes, rearrange nodes, change parameter sets, etc.
 
-**Run the Pipeline Definition Importer:** The relevant runjava command here is:
+**Run the Pipeline Definition Importer:** The relevant ziggy command here is:
 
 ```bash
-$ runjava pd-import sample-pipeline/config-extras/pd-sample.xml
+$ ziggy import-pipelines sample-pipeline/config-extra/pd-sample.xml
 ```
 
-You'll get a big spew of logging output that should end without any Java stack traces. 
+You'll get a big spew of logging output that should not end with any Java stack traces.
 
-**Refresh the Pipelines Configuration Table:** Select `Pipelines` on the `Configuration` tab. When it displays the table of pipelines, hit the `refresh` button. Once you've done that, if you select the sample pipeline again, you'll now see this:
+**Refresh the Pipelines Panel:** Press the `Refresh` button in the pipelines panel. Again, select the sample pipeline, and run the `View` command from the context menu. You'll now see this:
 
-![](images/pipelines-config-2.png)
+<img src="images/pipelines-config-2.png" style="width:11cm;"/>
 
-As advertised, the averaging module has been removed from the end of the pipeline. 
+As advertised, the averaging module has been removed from the end of the pipeline.
 
 And that's all there is to it!
 
 [[Previous]](parameter-overrides.md)
 [[Up]](dusty-corners.md)
-[[Next]](edit-trigger.md)
\ No newline at end of file
+[[Next]](edit-pipeline.md)
diff --git a/doc/user-manual/remote-dialog.md b/doc/user-manual/remote-dialog.md
index 05ffe12..701914b 100644
--- a/doc/user-manual/remote-dialog.md
+++ b/doc/user-manual/remote-dialog.md
@@ -1,6 +1,6 @@
 <!-- -*-visual-line-*- -->
 
-[[Previous]](select-hpc.md)
+[[Previous]](remote-parameters.md)
 [[Up]](select-hpc.md)
 [[Next]](hpc-cost.md)
 
@@ -12,21 +12,21 @@ Ziggy provides a tool that can get you from what you know and/or care about to w
 
 ### Opening the Remote Execution Dialog Box
 
-Go to the `Triggers` tab and double-click on the sample pipeline row in the table. You'll see this:
+Go to the `Pipelines` panel and double-click on the sample pipeline row in the table. You'll see this:
 
-<img src="images/edit-trigger.png" style="width:15cm;"/>
+<img src="images/edit-pipeline.png" style="width:13cm;"/>
 
-A whole new dialog box we've never seen before! But actually we're just going to use it to get to yet another one. Select `permuter` from the modules list and press `Remote Execution`. You'll see this:
+A whole new dialog box we've never seen before! But actually we're just going to use it to get to yet another one. Select `permuter` from the modules list and press `Remote execution`. You'll see this:
 
-![](images/remote-dialog-1.png)
+<img src="images/remote-dialog-1.png" style="width:12cm;"/>
 
 ### Using the Remote Parameters Dialog Box
 
-Notice that the values you've set in the `RemoteParameters` instance for permuter have been populated, as has the total number of subtasks that Ziggy found for this node, based on the contents of the datastore. In the interest of making this more realistic, change the number in `Total subtasks` to 1000, then hit the `Calculate PBS Parameters` button. You'll see this:
+Notice that the values you've set in the `RemoteParameters` instance for permuter have been populated, as has the total number of subtasks that Ziggy found for this node, based on the contents of the datastore. In the interest of making this more realistic, change the number in `Total subtasks` to 1000, then hit the `Calculate` button. You'll see this:
 
-![](images/remote-dialog-2.png)
+<img src="images/remote-dialog-2.png" style="width:12cm;"/>
 
-The parameters that will be used in the request to PBS are shown in the `PBS Parameters` box. Ziggy will ask for 84 nodes of the Haswell type, for 15 minutes each; the total cost in Standard Billing Units (SBUs) will be 16.8.
+The parameters that will be used in the request to PBS are shown in the `PBS parameters` section. Ziggy will ask for 84 nodes of the Haswell type, for 15 minutes each; the total cost in Standard Billing Units (SBUs) will be 16.8.
 
 A Haswell node at the NAS has 24 cores and 128 GB of RAM. Since we've asserted that each subtask takes 10 GB, then a maximum of 12 subtasks will run in parallel on each node, and thus there will be 12 active cores per node (and 12 idled).
 
@@ -34,15 +34,15 @@ What did Ziggy actually do here? Given the parameters we supplied, Ziggy looked
 
 #### Setting the Maximum Number of Nodes
 
-Given the above, it might be smarter to ask for fewer nodes. If we change the `Max Nodes` value to 10 and press `Calculate PBS Parameters`, this is what we see:
+Given the above, it might be smarter to ask for fewer nodes. If we change the `Max nodes` value to 10 and press `Calculate`, this is what we see:
 
-![](images/remote-dialog-3.png)
+<img src="images/remote-dialog-3.png" style="width:12cm;"/>
 
 As expected, the number of remote nodes went down and the wall time went up. What's unexpected is that the total cost also went down! What happened?
 
 This is due to the confluence of two factors. First, Ziggy always rounds its wall time requests up to the nearest quarter-hour. Second, Ziggy doesn't use the max nodes as a parameter it tries to adjust to minimize the cost.
 
-In the first example, Each node was really going to be needed for 0.15 hours, based on the wall time estimates we provided. Because of the round-up, it asked for them for 0.25 hours each. Thus the request was asking for an extra 0.1 hours per node; multiply by 84 nodes and it starts to add up.
+In the first example, each node was really going to be needed for 0.15 hours, based on the wall time estimates we provided. Because of the round-up, it asked for them for 0.25 hours each. Thus the request was asking for an extra 0.1 hours per node; multiply by 84 nodes and it starts to add up.
 
 In the second example, given the parameters requested, the actual wall time needed would be -- 1.25 hours, so exactly what Ziggy requested (i.e., the round-up is miniscule). Thus the second example has a lower total cost.
 
@@ -62,22 +62,34 @@ So far we've implicitly assumed that each compute node can run subtasks in paral
 
 There are cases when this won't be true -- when it won't be safe to try to force a node to run many subtasks in parallel. In those cases, you can uncheck the Node Sharing check box and run the PBS parameter calculation. You get this:
 
-![](images/remote-dialog-4.png)
+<img src="images/remote-dialog-4.png" style="width:12cm;"/>
 
 Ziggy no longer asks about GB per subtask, because only 1 subtask will run at a time on each node, so there's an assumption that the available RAM on any architecture will be sufficient. The cost has ballooned, which is expected since now each node can only process 1 subtask at a time. Somewhat unexpectedly, the optimal architecture has changed. This is because, with each node processing 1 subtask at a time, the benefits to having a lot of cores in a compute node go away and architectures with fewer cores are potentially favored.
 
 Now: hopefully, the reason you're disabling node sharing is because your algorithm program has its own, internal concurrency support, and that support spreads the work of the subtask onto all the available cores on the compute node. When this is the case, check the `Wall Time Scaling` box. When this box is checked, Ziggy assumes that the wall times provided by the user are wall times for processing on 1 core, and that the actual time will go inversely with the number of cores (i.e., the parallelization benefit is perfect). When you do this and calculate the parameters, you see this:
 
-![](images/remote-dialog-5.png)
+<img src="images/remote-dialog-5.png" style="width:12cm;"/>
 
 This results in a cost even lower than what we saw before! This is because, in this configuration, Ziggy assumes that every core can be utilized regardless of how much RAM per core the architecture has.
 
+#### Selecting A Batch Queue
+
+Under ordinary circumstances, it's best to leave the Queue selection blank so that it can be selected based on the required execution time resources. There are two non-ordinary circumstances in which it makes sense to select a queue manually.
+
+The first circumstance is when you want to use either the `DEVEL` or the `DEBUG` queue on the NASA Advanced Supercomputer (NAS). These are special purpose queues that allow users to execute jobs at higher priority but which set a low limit on the number of nodes and amount of wall time that can be requested. Ziggy will never select these queues for you, but if you think you should use them you can select them yourself. 
+
+The second circumstance is when you are using a reserved queue. In this case, when you select RESERVED in the Queue selection box, you'll be prompted for a queue name (and you won't be able to get rid of the prompt until you enter a valid queue name). When you save the results from the remote parameters dialog box to the database, the queue name you entered will be put into the remote parameters instance for the pipeline module. 
+
 ### Keeping or Discarding Changes
 
-After some amount of fiddling around, you may reach a configuration that you like, and you'd like to ensure that Ziggy uses that configuration when it actually submits your jobs. To make that happen, press the `Save to DB` button. Ziggy will update the `RemoteParameters` instance that goes with this node according to your settings.
+After some amount of fiddling around, you may reach a configuration that you like, and you'd like to ensure that Ziggy uses that configuration when it actually submits your jobs. Alternately, you might realize that you've made a total mess and you want to discard all the changes you've made and start over (or just go home). 
+
+Let's start with the total mess case. If you press the `Reset` button, the remote parameters will be set back to their values from when the remote execution dialog opened. At this point you can try again. Alternately, if you've decided to give up on this activity completely, press the `Cancel` button: this will discard all your changes and close the remote execution dialog box. 
+
+Alternately, you might think that your changes are pretty good and you want to hold onto them. If this is the case, press the `Close` button. This button saves your changes to the remote parameters, but **it only saves them to the Edit pipeline dialog box!** What this means is that if you hit `Close` and then press the `Remote execution` button on the Edit pipeline dialog box again, the values you see in the remote execution dialog box will be the ones you saved earlier with the `Close` button. Relatedly, if you make a bunch of changes now and decide to use the `Reset` button, the values are reset to the ones you saved via the `Close` button in your prior session with the remote execution dialog. 
 
-Alternately, you may want to discard all your changes and start over tuning the remote configuration from the original values. To do this, select `Reset to DB Values`.
+If you decide that you're so happy with your edits to remote execution that you want Ziggy to actually store them and use them when running the pipeline, you need to press the `Save` button on the Edit pipeline dialog. This will save all the changes you've made since you started the Edit pipeline dialog box. Alternately, if you realize that you've messed something up and want Ziggy to forget all about this session, you can use the `Cancel` button. 
 
-[[Previous]](select-hpc.md)
+[[Previous]](remote-parameters.md)
 [[Up]](select-hpc.md)
 [[Next]](hpc-cost.md)
diff --git a/doc/user-manual/remote-parameters.md b/doc/user-manual/remote-parameters.md
index ac3d0f4..fa900d5 100644
--- a/doc/user-manual/remote-parameters.md
+++ b/doc/user-manual/remote-parameters.md
@@ -1,5 +1,9 @@
 <!-- -*-visual-line-*- -->
 
+[[Previous]](select-hpc.md)
+[[Up]](select-hpc.md)
+[[Next]](remote-dialog.md)
+
 ## Remote Parameters
 
 The way that you set up a pipeline module to run on a remote (i.e., high-performance computing / cloud computing) system is to create a `ParameterSet` of the `RemoteParameters` class, and then make it a module parameter set for the desired node.
@@ -53,7 +57,7 @@ Anyway, let's talk now about all those parameters.
 
 ##### enabled (boolean)
 
-The `enabled` parameter does what it sounds like: if `enabled` is true, the node will use remote execution; if it's false, it will run locally (i.e., on the same system where the worker process runs).
+The `enabled` parameter does what it sounds like: if `enabled` is true, the node will use remote execution; if it's false, it will run locally (i.e., on the same system where the supervisor process runs).
 
 Note that, since you can edit the parameters, you can use this parameter to decide at runtime whether to run locally or remotely.
 
@@ -123,7 +127,7 @@ This is a more direct way to force Ziggy to a solution with a smaller number of
 
 Note that Ziggy can request a number of nodes that is smaller than the value for `maxNodes` (which is why it's called `maxNodes` in the first place). This happens if the number of subtasks is small: if you only have 8 subtasks, and `maxNodes` is set to 30, it would clearly be useless to actually ask for 30 nodes, since most of them will be idle but you'll get charged for them anyway. In these sorts of situations (where even the value of `maxNodes` is too large, given the number of subtasks to process), Ziggy will select a number of nodes that ensures that none of the nodes sits idle.
 
-Note that Ziggy can request a number of nodes that is smaller than the value for `maxNodes` (which is why it's called `maxNodes` in the first place). This happens if the number of subtasks is small: if you only have 8 subtasks, and `maxNodes` is set to 30, it would clearly be useless to actually ask for 30 nodes, since most of them will be idle but you'll get charged for them anyway. In these sorts of situations (where even the value of `maxNodes` is too large, given the number of subtasks to process), Ziggy will select a number of nodes that ensures that none of the nodes sits idle. 
+Note that Ziggy can request a number of nodes that is smaller than the value for `maxNodes` (which is why it's called `maxNodes` in the first place). This happens if the number of subtasks is small: if you only have 8 subtasks, and `maxNodes` is set to 30, it would clearly be useless to actually ask for 30 nodes, since most of them will be idle but you'll get charged for them anyway. In these sorts of situations (where even the value of `maxNodes` is too large, given the number of subtasks to process), Ziggy will select a number of nodes that ensures that none of the nodes sits idle.
 
 ##### nodeSharing (boolean)
 
@@ -144,3 +148,7 @@ A close reading of the paragraph above reveals a potential problem: what happens
 If Ziggy determines that it can't ask for enough resources to run your task, it will throw an exception at runtime, and your pipeline will stop. You'll then need to adjust the parameters and restart.
 
 The best way to avoid this outcome is to use the [remote execution dialog](remote-dialog.md) to set the optional parameters. The remote execution dialog won't allow you to save your parameter values if they result in tasks that can't finish because they're starved of compute resources.
+
+[[Previous]](select-hpc.md)
+[[Up]](select-hpc.md)
+[[Next]](remote-dialog.md)
\ No newline at end of file
diff --git a/doc/user-manual/rerun-task.md b/doc/user-manual/rerun-task.md
index d228b16..fb4277d 100644
--- a/doc/user-manual/rerun-task.md
+++ b/doc/user-manual/rerun-task.md
@@ -2,62 +2,62 @@
 
 [[Previous]](display-logs.md)
 [[Up]](ziggy-gui-troubleshooting.md)
-[[Next]](delete-tasks.md)
+[[Next]](kill-tasks.md)
 
 ## Re-Run or Resume a Failed Task
 
-Let's assume at this point that you've investigated the cause of your failed task. Maybe you've made software changes that address the problem, so now you want to re-run the failed task. Or maybe you've decided that it's not worth the effort to try to salvage the failed subtasks but you would like to capture the results of the successful ones. In either case, the restart dialog is what you need to use. 
+Let's assume at this point that you've investigated the cause of your failed task. Maybe you've made software changes that address the problem, so now you want to re-run the failed task. Or maybe you've decided that it's not worth the effort to try to salvage the failed subtasks but you would like to capture the results of the successful ones. In either case, the restart dialog is what you need to use.
 
 ### The Restart Dialog Box
 
-To view the restart dialog box, select your failed task or tasks, right click, and select `Restart` from the tasks menu. You'll see this:
+To view the restart dialog box, select your failed task or tasks, right click, and run the `Restart failed tasks` command. You'll see this:
 
-![](images/restart-dialog.png)
+<img src="images/restart-dialog.png" style="width:15cm;"/>
 
-If you right-click on the `Restart Mode` field, you'll get a menu that offers several restart options. 
+If you right-click on the `Restart Mode` field, you'll get a menu that offers several restart options.
 
 #### Restart from Beginning
 
-This does pretty much what it sounds like. Go back, redo marshaling, then run the algorithm code, etc. It's pretty unlikely that you'll want to use this option unless you've made a change that will cause marshaling to retrieve different inputs, but it's there if you need to do that. 
+This does pretty much what it sounds like. Go back, redo marshaling, then run the algorithm code, etc. It's pretty unlikely that you'll want to use this option unless you've made a change that will cause marshaling to retrieve different inputs, but it's there if you need to do that.
 
-If you restart a task from the beginning, this will also wipe out the information on which subtasks failed and which were successful, so Ziggy will have to re-run all the subtasks. 
+If you restart a task from the beginning, this will also wipe out the information on which subtasks failed and which were successful, so Ziggy will have to re-run all the subtasks.
 
 #### Resubmit
 
 This resumes execution immediately after marshaling, when Ziggy hands off execution to the algorithm management system. This is the option you'll want to use if you've made a code change that will address the problem.
 
-Note that if you do this, only the failed subtasks will be run! All the subtasks that ran successfully will be left alone. If your code change was such that you want to go back and re-run those other subtasks as well, you'll need to launch a new pipeline instance or use the Restart from Beginning option. 
+Note that if you do this, only the failed subtasks will be run! All the subtasks that ran successfully will be left alone. If your code change was such that you want to go back and re-run those other subtasks as well, you'll need to launch a new pipeline instance or use the Restart from Beginning option.
 
 #### Resume Current Step
 
-This tells Ziggy to try to pick up where it left off, in effect to force the P-state to advance and see what happens. 
+This tells Ziggy to try to pick up where it left off, in effect to force the P-state to advance and see what happens.
 
-Generally the case where you'd use this is the one we're in now: some subtasks ran, others didn't, the task made it to `ALGORITHM_COMPLETE` and then halted. Selecting this option will cause Ziggy to advance to `STORING`, at which point it will store the results from the 3 successful subtasks and abandon efforts to get results from the failed one. 
+Generally the case where you'd use this is the one we're in now: some subtasks ran, others didn't, the task made it to `ALGORITHM_COMPLETE` and then halted. Selecting this option will cause Ziggy to advance to `STORING`, at which point it will store the results from the 3 successful subtasks and abandon efforts to get results from the failed one.
 
 #### Resume Monitoring
 
-In somewhat unusual cases, it may happen that the monitoring subsystem will lose track of what's going on with one or more tasks. In this case, you may see signs that execution is progressing, but the console doesn't show any updates. In this case, the `Resume Monitoring` option tells the monitoring subsystem to try to reconnect with the running task. 
+In somewhat unusual cases, it may happen that the monitoring subsystem will lose track of what's going on with one or more tasks. In this case, you may see signs that execution is progressing, but the console doesn't show any updates. In this case, the `Resume monitoring` option tells the monitoring subsystem to try to reconnect with the running task.
 
 ### Restarting Multiple Tasks
 
 If you have a bunch of tasks for a given node, it may be that some will fail while others don't, and you want to restart all the failed tasks. There are two ways to do this.
 
-The first is to select all the failed tasks from the tasks menu (by shift-clicking or control-clicking), then right-click to get the tasks menu and select `Restart`. Note that this allows you to also restart a subset of failed tasks, which you might want to do. You can select the restart mode for each task you restart this way.
+The first is to select all the failed tasks from the tasks table (by shift-clicking or control-clicking), then right-click to get the context menu and run the `Restart failed tasks` command. Note that this allows you to also restart a subset of failed tasks, which you might want to do. You can select the restart mode for each task you restart this way.
 
-The other option, when you know that you want to restart all the failed tasks, is to select the instance from the instance table on the left, right-click to bring up the instances menu, and select the Restart all failed tasks menu item. In this case all tasks will use the same restart mode. 
+The other option, when you know that you want to restart all the failed tasks, is to select the instance from the instance table on the left, right-click to bring up the context menu, and run the `Restart all failed tasks` command. In this case all tasks will use the same restart mode.
 
 ### Note on Restarting the Failed Permuter Task
 
-Remember how we started all this by ordering subtask 0 in each `permuter` task to fail? Here's an annoying subtlety: there's no way to get `permuter` to successfully run that subtask! 
+Remember how we started all this by ordering subtask 0 in each `permuter` task to fail? Here's an annoying subtlety: there's no way to get `permuter` to successfully run that subtask!
 
 Why not?
 
-If the subtask had failed because of a real problem, we would be able to fix the problem and resubmit the task, or restart from the beginning. But what actually happened is that we set a module parameter that told `permuter` to throw an exception in subtask 0. 
+If the subtask had failed because of a real problem, we would be able to fix the problem and resubmit the task, or restart from the beginning. But what actually happened is that we set a module parameter that told `permuter` to throw an exception in subtask 0.
 
-If we re-run the task, it will re-run with the same values for all parameters (except for the remote execution parameters, but we're not using those at all for this example). This means that the `throw_exception_subtask_0 parameter` will still be true, and subtask 0 will fail again. 
+If we re-run the task, it will re-run with the same values for all parameters (except for the remote execution parameters, but we're not using those at all for this example). This means that the `throw_exception_subtask_0 parameter` will still be true, and subtask 0 will fail again.
 
-In real life, it's possible that you'll encounter a situation like this one, in which a task fails and the only way to get it to run successfully is to change the values of some module parameters. In that case, you won't be able to re-run because re-run doesn't let you change the parameters. In that case, you'll need to change the parameters and use the triggers panel to start a new pipeline instance. In the more common cases (software bug that had to be fixed, failure due to some sort of hardware problem, etc.), re-running a task offers the possibility of getting failed subtasks to run to completion. 
+In real life, it's possible that you'll encounter a situation like this one, in which a task fails and the only way to get it to run successfully is to change the values of some module parameters. In that case, you won't be able to re-run because re-run doesn't let you change the parameters. In that case, you'll need to change the parameters and use the triggers panel to start a new pipeline instance. In the more common cases (software bug that had to be fixed, failure due to some sort of hardware problem, etc.), re-running a task offers the possibility of getting failed subtasks to run to completion.
 
 [[Previous]](display-logs.md)
 [[Up]](ziggy-gui-troubleshooting.md)
-[[Next]](delete-tasks.md)
+[[Next]](kill-tasks.md)
diff --git a/doc/user-manual/running-pipeline.md b/doc/user-manual/running-pipeline.md
index a4443b5..7e2da67 100644
--- a/doc/user-manual/running-pipeline.md
+++ b/doc/user-manual/running-pipeline.md
@@ -1,59 +1,57 @@
 <!-- -*-visual-line-*- -->
 
-[[Previous]](rdbms.md)
+[[Previous]](building-pipeline.md)
 [[Up]](user-manual.md)
 [[Next]](ziggy-gui.md)
 
-## Running the Cluster
+## Running the Pipeline
 
-At last, we are ready to start up the pipeline! First, though, we need to have a minor digression about the `runjava` program.
+At last, we are ready to start up the pipeline! First, though, we need to have a minor digression about the `ziggy` program.
 
-### Runjava
+### Ziggy
 
 Running a piece of Java code should be simple: you use the `java` command at the command line, followed by the class name. Awesome!
 
-Well, almost. In reality, there are often issues with the `java` command: specifying the correct class path, giving the fully-qualified name of the class (without typos), etc. 
+Well, almost. In reality, there are often issues with the `java` command: specifying the correct class path, giving the fully-qualified name of the class (without typos), etc.
 
 For this reason, Ziggy provides a program that inserts a layer of abstraction over the `java` command. This layer of abstraction allows the program to use the Ziggy configuration system (like the properties file) to specify the things that the user would otherwise need to put at the command line. It also allows for nicknames: rather than the fully-qualified names, shorter names are provided for some classes. It's like having a version of the `java` command that's purpose-built to work with Ziggy.
 
-The name of this software is `runjava`, and it's a Perl program that's in Ziggy's `build/bin` directory (the Ziggy one, not the sample pipeline one). The `runjava` program is so useful that you should probably create an alias for it, or else add Ziggy's `build/bin` directory to your search path. Just so you don't have to type the whole path to `runjava` every time you want to use it. 
+The name of this software is `ziggy`, and it's a Perl program that's in Ziggy's `build/bin` directory (the Ziggy one, not the sample pipeline one). The `ziggy` program is so useful that you should probably create an alias for it, or else add Ziggy's `build/bin` directory to your search path. Just so you don't have to type the whole path to `ziggy` every time you want to use it.
 
-You can see the full set of nicknames by running the runjava command with no arguments:
+You can see the full set of nicknames by running the ziggy command with no arguments:
 
 ```console
-$ runjava
-              NICKNAME      CLASSNAME
-               cluster      gov.nasa.ziggy.ui.ClusterController
-   compute-node-master      gov.nasa.ziggy.module.ComputeNodeMaster
-               console      gov.nasa.ziggy.ui.ZiggyConsole
-              dump-err      gov.nasa.ziggy.module.io.DumpMatlabErrCli
-            dump-props      gov.nasa.ziggy.services.configuration.DumpSystemProperties
-dump-system-properties      gov.nasa.ziggy.services.config.DumpSystemProperties
-               execsql      gov.nasa.ziggy.dbservice.SqlRunner
-     generate-manifest      gov.nasa.ziggy.data.management.Manifest
-               metrics      gov.nasa.ziggy.metrics.report.MetricsCli
-             pd-export      gov.nasa.ziggy.pipeline.definition.PipelineDefinitionCli
-             pd-import      gov.nasa.ziggy.pipeline.definition.PipelineDefinitionCli
-             pe-import      gov.nasa.ziggy.services.events.ZiggyEventHandlerDefinitionFileImporter
-           perf-report      gov.nasa.ziggy.metrics.report.PerformanceReport
-             pl-export      gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli
-             pl-import      gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli
-           pl-override      gov.nasa.ziggy.parameters.ParameterLibraryOverrideCli
-             pt-import      gov.nasa.ziggy.data.management.DataFileTypeImporter
-         seed-security      gov.nasa.ziggy.services.security.SecuritySeedData
-          spoc-version      gov.nasa.ziggy.common.version.ZiggyVersionCli
-       status-listener      gov.nasa.ziggy.services.process.StatusMessageLogger
-$ 
+$ ziggy
+NICKNAME                CLASS NAME
+cluster                 gov.nasa.ziggy.ui.ClusterController
+compute-node-master     gov.nasa.ziggy.module.ComputeNodeMaster
+console                 gov.nasa.ziggy.ui.ZiggyConsole
+dump-system-properties  gov.nasa.ziggy.services.config.DumpSystemProperties
+execsql                 gov.nasa.ziggy.dbservice.SqlRunner
+export-parameters       gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli
+export-pipelines        gov.nasa.ziggy.pipeline.definition.PipelineDefinitionCli
+generate-manifest       gov.nasa.ziggy.data.management.Manifest
+import-events           gov.nasa.ziggy.services.events.ZiggyEventHandlerDefinitionImporter
+import-parameters       gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli
+import-pipelines        gov.nasa.ziggy.pipeline.definition.PipelineDefinitionCli
+import-types            gov.nasa.ziggy.data.management.DataFileTypeImporter
+metrics                 gov.nasa.ziggy.metrics.report.MetricsCli
+perf-report             gov.nasa.ziggy.metrics.report.PerformanceReport
+$
 ```
 
-### Runjava Cluster Commands
+You can view more help with `ziggy --help` and even more help with `perldoc ziggy`.
 
-For coarse, on-off control for the cluster, the fundamental `runjava` command is `runjava cluster`. As described [elsewhere](pipeline-architecture.md),  **cluster** is the word we use to refer to a particular instance of a pipeline, its data storage, etc. 
+If you should happen to write some Java to manage your pipeline and want to use the `ziggy` program to run it, please refer to the article on [Creating Ziggy Nicknames](nicknames.md).
 
-To see the options for this command, do `runjava cluster`with no additional arguments:
+### Ziggy Cluster Commands
+
+For coarse, on-off control for the cluster, the fundamental `ziggy` command is `ziggy cluster`. As described [elsewhere](pipeline-architecture.md),  **cluster** is the word we use to refer to a particular instance of a pipeline, its data storage, etc.
+
+To see the options for this command, do `ziggy cluster`with no additional arguments:
 
 ```console
-$ runjava cluster
+$ ziggy cluster
 usage: ClusterController [options] command...
 
 Commands:
@@ -62,96 +60,107 @@ start                   Start the cluster
 stop                    Stop the cluster
 status                  Check cluster status
 console                 Start pipeline console GUI
+version                 Display the version (as a Git tag)
 
 Options:
- -f,--force                     Force initialization if cluster is already
-                                initialized
-    --workerHeapSize <arg>      Total heap size used by all workers (MB)
-    --workerThreadCount <arg>   Number of worker threads or 0 to use all
-                                cores
-$ 
+ -f,--force                  Force initialization if cluster is already
+                             initialized
+ -h,--help                   Show this help
+    --workerCount <arg>      Number of worker threads or 0 to use all
+                             cores
+    --workerHeapSize <arg>   Total heap size used by all workers (MB)
+$
 ```
 
 The first thing you need to do is to initialize the cluster (hence the name).
 
 #### Cluster Initialization
 
-Cluster initialization is something you only do once per cluster. It populates the database with Ziggy's standard tables; sets up the datastore directories; and reads in the pipeline configuration from the XML files. 
+Cluster initialization is something you only do once per cluster. It populates the database with Ziggy's standard tables; sets up the datastore directories; and reads in the pipeline configuration from the XML files.
 
-The command `runjava cluster init` causes the initialization to occur. When you do this, after a few seconds you'll either have a nice spew of logging that ends with the message: 
+The command `ziggy cluster init` causes the initialization to occur. When you do this, after a few seconds you'll either have a nice spew of logging that ends with the message:
 
-`[ClusterController.initializeCluster] INIT: database initialization and creation complete`
+`[ClusterController.initializeCluster] Database initialization and creation complete`
 
 or else you'll see a Java stack trace that tells you that something went wrong. The most common problem that causes initialization to fail is a problem with the XML files that describe the pipeline, so that's the place to look first. Hopefully the exception provides informative messages that will help you track down the problem (they help me, but YMMV).
 
 Once you've initialized the cluster, Ziggy will prevent you from doing so again:
 
 ```
-system:sample-pipeline user$ runjava cluster init
+system:sample-pipeline user$ ziggy cluster init
 [ZiggyConfiguration.getConfiguration] Loading configuration from: /xxx/yyy/zzz/ziggy/sample-pipeline/etc/sample.properties
 [ZiggyConfiguration.getConfiguration] Loading configuration from: /xxx/yyy/zzz/ziggy/sample-pipeline/etc/../../build/etc/ziggy.properties
 Cannot re-initialize an initialized cluster without --force option
-system3465:sample-pipeline user$ 
+system:sample-pipeline user$
 ```
 
-Like it says: if you want to do this, you can do it; you need to use the `--force` (or `-f`) option.  Be aware, though: **if you reinitialize the cluster, you will delete all of the existing contents!** That's why Ziggy tries to keep you from doing it by accident. Reinitialize and all the database content, all the data files that have been generated as results -- all gone. 
+Like it says: if you want to do this, you can do it; you need to use the `--force` (or `-f`) option.  Be aware, though: **if you reinitialize the cluster, you will delete all of the existing contents!** That's why Ziggy tries to keep you from doing it by accident. Reinitialize and all the database content, all the data files that have been generated as results -- all gone.
 
 That said: if your cluster initialization fails because of a problem in the XML, you will need to use the `--force` option. This is because the database was successfully created with all its tables. Thus, even though you failed to put actual information in the tables, you'd need to use the `--force` option to try again.
 
 ##### What if I don't want to reinitialize?
 
-If the failure was in the import of the contents of the pipeline-defining XML files, there's an alternative to using `runjava cluster init`. Specifically, you can use other runjava commands that import the XML files without performing initialization.
+If the failure was in the import of the contents of the pipeline-defining XML files, there's an alternative to using `ziggy cluster init`. Specifically, you can use other ziggy commands that import the XML files without performing initialization.
 
-If you look at the list of runjava nicknames in the top screen shot, there are 3 that will be helpful here: `pl-import`, `pt-import`, and `pd-import`. These do what they say: import the parameter library, data type definition, and pipeline definition files, respectively. 
+If you look at the list of ziggy nicknames in the top screen shot, there are 3 that will be helpful here: `import-parameters`, `import-types`, and `import-pipelines`. These do what they say: import the parameter library, data type definition, and pipeline definition files, respectively.
 
-Important note: if you decide to manually import the XML files, **you must do so in the order shown above:** parameters, then data types, then the pipeline definitions. This is because some items can't import correctly unless other items that they depend upon have already been pulled in. 
+Important note: if you decide to manually import the XML files, **you must do so in the order shown above:** parameters, then data types, then the pipeline definitions. This is because some items can't import correctly unless other items that they depend upon have already been pulled in.
 
 #### Cluster Start and Cluster Status
 
-To start the cluster, you use -- wait for it -- `runjava cluster start`. If you're using a private (non-system) database, this command starts it. The worker process is then started. The worker, as the name suggests, does all of Ziggy's actual work: generates tasks, starts them running, monitors them, persists outputs, records instances of failures, and much, much more. It's an exaggeration to say that the worker **is** Ziggy, but not much of one. 
+To start the cluster, you use -- wait for it -- `ziggy cluster start`. If you're using a private (non-system) database, this command starts it. The supervisor process is then started. The supervisor, as the name suggests, manages all of Ziggy's actual work: generates tasks, starts them running, monitors them, persists outputs, records instances of failures, and much, much more. It's an exaggeration to say that the supervisor **is** Ziggy, but not much of one.
 
-Once you've done this, both the worker and the database software run as what Linux folks like to call "daemons". This means that they're running even though they gave you back the command prompt in the shell where you started them. To see this, use runjava cluster status:
+Once you've done this, both the supervisor and the database software run as what Linux folks like to call "daemons". This means that they're running even though they gave you back the command prompt in the shell where you started them. To see this, use `ziggy cluster status`:
 
 ```console
 [ZiggyConfiguration.getConfiguration] Loading configuration from: /xxx/yyy/zzz/ziggy/sample-pipeline/etc/../../build/etc/ziggy.properties
-[ClusterController.status] Cluster initialized
-[ClusterController.status] Worker running
-[ClusterController.status] Database running
-[ClusterController.status] Cluster running
-sample-pipeline$ 
+[ClusterController.status] Cluster is initialized
+[ClusterController.status] Supervisor is running
+[ClusterController.status] Database is available
+[ClusterController.status] Cluster is running
 ```
 
 The status command shows that the cluster is running, which is great! But so far it's not obvious how you're supposed to do anything with it. To make use of the cluster, you'll need Ziggy's graphical user interface.
 
-##### Threads and Heap Size
+##### Workers and Heap Size
 
-If you look at the command options, there are two options that are relevant to starting the cluster. These are `workerHeapSize` and `workerThreadCount`. 
+If you look at the command options, there are two options that are relevant to starting the cluster. These are `workerHeapSize` and `workerCount`.
 
-The `workerHeapSize` is the number of MB that the worker process is allowed to use. If you ever encounter an error message complaining that the worker is out of memory or out of "GC Overhead" (i.e., additional RAM needed by the Java garbage collector), you can stop the cluster, then restart it with a larger heap size specified via this option.
+The `workerHeapSize` is the total number of MB of Java "heap" (aka memory) that the supervisor is permitted to request for its workers.  If you ever encounter an error message complaining that a worker is out of memory or out of "GC Overhead" (i.e., additional RAM needed by the Java garbage collector), you can stop the cluster, then restart it with a larger heap size specified via this option.
 
-Ziggy's worker is a multi-threaded application. This means that the worker can marshal, persist, and execute multiple tasks simultaneously. The maximum number of tasks that can execute in parallel is set by the `workerThreadCount` option. 
+Ziggy's supervisor can run and manage multiple worker processes, which means that the supervisor can marshal, persist, and execute multiple tasks simultaneously. The maximum number of tasks that can execute in parallel is set by the `workerCount` option. 
 
-Note that these options are, well, optional. The pipeline properties file specifies a default value for the heap space and a default for the thread count. If you don't use these options at the command line, Ziggy will use the values in the properties file. For more information, see the article on [The Properties File](properties.md).
+Note that these options are, well, optional. The pipeline properties file specifies a default value for the heap size and a default for the worker count. If you don't use these options at the command line, Ziggy will use the values in the properties file. For more information, see the article on [The Properties File](properties.md).
 
 How should you decide how to set these values? Here are a few rough rules of thumb:
 
-1. Your pipeline will have a maximum number of tasks that it will ever need to execute for a given node in the pipeline. This is determined by your design of the pipeline. In the sample pipeline, there are 2 datasets that get processed in parallel, `set-1` and `set-2`. Thus the sample pipeline can benefit from having 2 worker threads, but wouldn't be any faster if it had more. 
-2. The system that runs the worker process will have a fixed number of CPUs ("cores"). As a general rule, there is no benefit to selecting a worker thread count that is larger than the number of CPUs; this will simply result in too many threads competing for too few CPUs. 
-3. The more threads you have, the larger the heap will need to be in order to support them. That said, you can probably get by with 1-2 GB per worker thread. 
+1. Your pipeline will have a maximum number of tasks that it will ever need to execute for a given node in the pipeline. This is determined by your design of the pipeline. In the sample pipeline, there are 2 datasets that get processed in parallel, `set-1` and `set-2`. Thus the sample pipeline can benefit from having 2 workers, but wouldn't be any faster if it had more.
+2. The system that runs the supervisor will have a fixed number of CPUs ("cores"). As a general rule, there is no benefit to selecting a worker count that is larger than the number of CPUs; this will simply result in too many processes competing for too few CPUs.
+3. The more processes you have, the larger the heap will need to be in order to support them. That said, you can probably get by with 1-2 GB per worker.
+4. The supervisor always takes the total heap size and divides it equally among all the workers. Thus, if you know that each worker needs, say, 8 GB, and you specify 4 workers, you should set the heap size to 32 GB. 
+5. When running locally, each algorithm process is managed by a worker process. This means that the total number of algorithm processes that run locally will never exceed the total number of workers. Thus, one reason to limit the number of worker processes is that you have algorithms that run locally and you don't want your local system to run out of cores and/or RAM when it's running them. Note that this doesn't apply to algorithms that are run remotely, on a High Performance Computing (HPC) or cloud computing system. In those cases, the worker hands execution over to a remote compute node for the algorithm and is then free to find some other work to do. For more information on this, see [the section on High Performance Computing](select-hpc.md). 
+
+One last detail on this: the worker heap size controls the amount of RAM available to the worker processes, and thus the amount of RAM available for marshaling and persisting. It doesn't control the amount of RAM available to the algorithms. The reason for this is technical and probably not all that interesting, but the point is that even if you know that your algorithm needs 10 GB per task, you still can give each worker 1-2 GB per thread and everything will run just fine.
+
+##### What if My Algorithms Need Different Numbers of Workers?
+
+Excellent question! To answer it, we first need to understand why this sort of issue would arise in the first place. 
+
+The most likely way for this to happen is if you have algorithms that have significantly different resource requirements, in particular RAM requirements. Imagine that you have a server with 256 GB of RAM, and on this you need to run an algorithm that needs 16 GB per process and another that needs 10 GB per process. This means that you can run 25 processes at a time for the algorithm that needs 10 GB each, but only 16 processes at a time for the one that needs 16 GB each. If you set the number of workers to 16, then you're not taking full advantage of your server's capacity when running the leaner algorithm (i.e., you're forcing it to take longer than it should); if you set it to 25, the more memory-intensive algorithm will run out of RAM and will start to use "virtual memory" (i.e., it will get extremely slow). 
 
-One last detail on this: the worker heap size controls the amount of RAM available to the worker threads, and thus the amount of RAM available for marshaling and persisting. It doesn't control the amount of RAM available to the algorithms. The reason for this is technical and probably not all that interesting, but the point is that even if you know that your algorithm needs 10 GB per task, you still can give the worker 1-2 GB per thread and everything will run just fine. 
+If this is your situation, you're in luck, because Ziggy allows you to assign a different max worker value for each module in a pipeline. To see how this is done, take a look at [the article on the Edit Pipeline Dialog](edit-pipeline.md). If you decide to use this per-module worker setting, then the value you set via the methods described above acts as a default: it's used by any pipeline module that doesn't have its own max worker setting.
 
 #### Cluster console
 
-To get the console to show up use the command `runjava cluster console`. After a few seconds and a few lines of logging, you'll see this appear:
+To get the console to show up use the command `ziggy cluster console` or simply `ziggy console`. After a few seconds and a few lines of logging, you'll see this appear:
 
-![](images/gui.png)
+<img src="images/gui.png" style="width:32cm;"/>
 
 Now you're ready to do some stuff!
 
-##### Runjava cluster start console &
+##### Ziggy cluster start console &
 
-Personally, I find that when I start the pipeline I generally want a console window immediately. For this reason, you can put the two commands together: `runjava cluster start console & `. That final `&` sign causes the command to run in the background so you get your command prompt back in the window where you issued the command. So that you don't go around filling your display with terminal windows that are just there to keep the console running.
+Personally, I find that when I start the pipeline I generally want a console window immediately. For this reason, you can put the two commands together: `ziggy cluster start console & `. That final `&` sign causes the command to run in the background so you get your command prompt back in the window where you issued the command. So that you don't go around filling your display with terminal windows that are just there to keep the console running.
 
 ##### Important Note: The Cluster and the Console
 
@@ -159,7 +168,7 @@ It is important to remember that the console is not the cluster! Most importantl
 
 #### Cluster stop
 
-When you're done with the cluster and want to shut it down, the command is `runjava cluster stop`. This will stop the worker and stop the database (for a non-system database). It will also cause any console windows to shut down.
+When you're done with the cluster and want to shut it down, the command is `ziggy cluster stop`. This will stop the worker and stop the database (for a non-system database). It will also cause any console windows to shut down.
 
 That said: don't do it now! Because you'll want the cluster running and the console up when we ...
 
@@ -167,6 +176,6 @@ That said: don't do it now! Because you'll want the cluster running and the cons
 
 ... [use the console](ziggy-gui.md) to do some cool stuff!
 
-[[Previous]](rdbms.md)
+[[Previous]](building-pipeline.md)
 [[Up]](user-manual.md)
 [[Next]](ziggy-gui.md)
diff --git a/doc/user-manual/select-hpc.md b/doc/user-manual/select-hpc.md
index bd7beac..5ec2849 100644
--- a/doc/user-manual/select-hpc.md
+++ b/doc/user-manual/select-hpc.md
@@ -1,8 +1,8 @@
 <!-- -*-visual-line-*- -->
 
-[[Previous]](delete-tasks.md)
+[[Previous]](kill-tasks.md)
 [[Up]](user-manual.md)
-[[Next]](remote-dialog.md)
+[[Next]](remote-parameters.md)
 
 ## High Performance Computing Overview
 
@@ -53,7 +53,7 @@ If you change the value of `enabled` to true, then any node that includes this p
 
 That's all it takes. Well, that and access to the NAS.
 
-Note the implications here. First, for a given pipeline the user can select which nodes will run on HPC and which will run locally (here "locally" means "on the system that hosts the worker process", or more generally, "on the system where the cluster runs"). Second, even for nodes that have an instance of `RemoteParameters` connected to them, you can decide at runtime whether you want to run locally or on HPC!
+Note the implications here. First, for a given pipeline the user can select which nodes will run on HPC and which will run locally (here "locally" means "on the system that hosts the supervisor process", or more generally, "on the system where the cluster runs"). Second, even for nodes that have an instance of `RemoteParameters` connected to them, you can decide at runtime whether you want to run locally or on HPC!
 
 The RemoteParameters class is discussed in greater detail in [the Remote Parameters article](remote-parameters.md).
 
@@ -85,7 +85,7 @@ In the event that a really small number of subtasks haven't run when your jobs e
 
 ##### Options for Automatic Resubmission
 
-In the discussion above, we suggested that, in the event that execution times out, you can resubmit the task and the subtasks that didn't run to completion will then be run (subject to the possibility that some of them will then also time out). We also offered the option to disable remote execution if the number of subtasks gets small enough that your local system (i.e., the system that runs the worker process) can readily handle them. This is all true, but it can be a nuisance. For this reason, there are some additional options to consider.
+In the discussion above, we suggested that, in the event that execution times out, you can resubmit the task and the subtasks that didn't run to completion will then be run (subject to the possibility that some of them will then also time out). We also offered the option to disable remote execution if the number of subtasks gets small enough that your local system (i.e., the system that runs the supervisor process) can readily handle them. This is all true, but it can be a nuisance. For this reason, there are some additional options to consider.
 
 First: Ziggy can automatically resubmit tasks that don't complete successfully. This is discussed in [the article on TaskConfigurationParameters](task-configuration.md). You can specify that, in the event that a task doesn't complete, Ziggy should resubmit it. In fact, you can specify the number of times that Ziggy should resubmit the task: after the number of automatic resubmits is exhausted, the task will wait in the ALGORITHM_COMPLETE processing state for you to decide what to do with it (i.e., try to resubmit it again, or fix underlying software problems, or decide that the number of completed subtasks is sufficient and that you want to move on to persisting the results).
 
@@ -95,7 +95,6 @@ Second: Ziggy allows you to automate the decision on whether a given number of s
 
 By using these two parameters, you can, in effect, tell Ziggy in advance about your decisions about whether to resubmit a task and whether to use remote execution even if the number of subtasks to process is fairly small.
 
-[[Previous]](delete-tasks.md)
+[[Previous]](kill-tasks.md)
 [[Up]](user-manual.md)
-[[Next]](remote-dialog.md)
-
+[[Next]](remote-parameters.md)
diff --git a/doc/user-manual/start-end-nodes.md b/doc/user-manual/start-end-nodes.md
index a10bea5..10a2c10 100644
--- a/doc/user-manual/start-end-nodes.md
+++ b/doc/user-manual/start-end-nodes.md
@@ -10,13 +10,13 @@ As you perform your data processing activities, it won't always be necessary to
 
 Fortunately, Ziggy provides tools that allow you to manage these conditions.
 
-To see how to do this, return to the `Triggers` panel, select the `sample` pipeline, and click the `Fire` Button. This time, though, when the Launch Pipeline dialog box appears, don't hit the `Fire!` button on the dialog box just yet. Instead, click the `Override Start` and `Override Stop` check boxes. This will allow you to use the pull-down menus to select a different start and end node. For example:
+To see how to do this, return to the `Pipelines` panel, select the `sample` pipeline, and press the `Start` Button. This time, though, when the Start pipeline dialog box appears, don't hit the `Start` button on the dialog box just yet. Instead, click the `Override start` and `Override stop` check boxes. This will allow you to use the pull-down menus to select a different start and end node. For example:
 
-<img src="images/start-end-nodes.png" style="width: 12cm;/"/>
+<img src="images/start-end-nodes.png" style="width: 9cm;/"/>
 
-Now press the `Fire!` button and return to the `Instances` panel. The pipeline will be running instance 2, which will start with the `permuter` tasks. Eventually the panel will look like this:
+Now press the `Start` button and return to the `Instances` panel. The pipeline will be running instance 2, which will start with the `permuter` tasks. Eventually the panel will look like this:
 
-![](images/gui-start-end-adjusted.png)
+<img src="images/gui-start-end-adjusted.png" style="width: 32cm;/"/>
 
 As advertised, the pipeline ran again but this time it skipped data receipt and stopped short of the averaging tasks.
 
diff --git a/doc/user-manual/start-pipeline.md b/doc/user-manual/start-pipeline.md
index 5e794f0..b717acd 100644
--- a/doc/user-manual/start-pipeline.md
+++ b/doc/user-manual/start-pipeline.md
@@ -8,56 +8,58 @@
 
 Let's do this.
 
-### Get to the Triggers Panel
+### Get to the Pipelines Panel
 
-On the top-left of the console is a tab, `Operations`. Select that and you should see this:
+The left-hand column is a *content menu* for the application. Select the `Pipelines` item and you should see this:
 
-![](images/ops-panel.png)
+<img src="images/pipelines-panel.png" style="width:32cm;"/>
 
-You see that there are now 2 tabs within the operations panel: `Instances` (where we are now) and `Triggers`. Select `Triggers` and you'll see this:
+The table lists all the pipelines that are defined on this cluster, which in this case is just one, the sample pipeline.
 
-![](images/triggers.png)
+Before we move on, there is a feature of the table headers that's worth pointing out. You can resize the columns by dragging the separators between the column names in the header. Double-clicking on a separator will shrink-wrap or enlarge the column to fit the data. Finally, columns can be hidden or exposed by using the context menu in the table header and checking or unchecking the boxes next to the column names in the popup menu. These features will come in handy later.
 
-The table lists all the pipelines that are defined on this cluster, which in this case is just one, the sample pipeline. Since that's the only one we've got, select it and click the `Fire` button.
+Moving on, select the sample pipeline since it's the only one we've got, and press the `Start` button.
 
-### Launch the Pipeline
+### Start the Pipeline
 
 A new dialog box will pop up that looks like this:
 
-<img src="images/fire-trigger.png" style="width:15cm;"/>
+<img src="images/start-pipeline.png" style="width:9cm;"/>
 
-A lot of options! For now, just put some kind of identifying text in the `Pipeline Instance Name` text box and press the `Fire!` button.
+A lot of options! For now, just put some kind of identifying text in the `Pipeline instance name` text box and press the `Start` button.
 
 ### Monitor Progress
 
-As soon as the dialog box disappears, click back to the `Instances` panel. The left side should look something like this:
+As soon as the dialog box disappears, select the `Instances` content menu item. The left side should look something like this<sup>1</sup>:
 
-![](images/instances-running.png)
+<img src="images/instances-running.png" style="width:14cm;"/>
 
-Note: I cheated a bit and clicked on the one row in the table on the left. On the right you see this:
+Select your pipeline instance in the table. On the right you see this:
 
-![permuter-tasks](images/permuter-tasks.png)
+<img src="images/permuter-tasks.png" style="width:15cm;"/>
 
 Notice a few things:
 
-1. In the upper-right corner, the grey lights for `Pi` (pipeline) and `W` (worker threads) have turned green. These 4 lights are known as Ziggy's "stoplights" (or somewhat more derisively, "idiot lights"). The first green light means that a pipeline is running; the second one means that one or more of Ziggy's worker threads are occupied. For more information, take a look at the article on the [Monitoring Tab](monitoring.md).
+1. In the upper-right corner (not shown in the screen shot), the grey lights for `Pi` (pipeline) and `W` (workers) have turned green. These 4 lights are known as Ziggy's "stoplights" (or somewhat more derisively, "idiot lights"). The first green light means that a pipeline is running; the second one means that Ziggy has one or more running workers. For more information, take a look at the article on the [Monitoring Tab](monitoring.md).
 2. The left-hand table is now populated. It shows one entry, with ID 1. This is known as the `Instances` table.
 3. There are 2 right-hand tables that are populated as well.
-   1. The lower table is the "tasks table." It shows that data receipt already ran to completion, and that there are 2 permuter tasks that are running in parallel.
+   1. The lower table is the "tasks table." It shows that data receipt already ran to completion, and that there are 2 permuter tasks that are running in series.
    2. The upper table is the "scoreboard." It shows -- something. Actually, the tasks table is pretty cryptic as well.
 
-As you watch, the mysterious numbers in the last column of the task table change from `Ae (4 / 0 / 0)` to `Ae (4 / 1 / 0)`. The mysterious numbers in the scoreboard change in unison with the ones in the task table. Eventually the two peruter tasks each hits `Ae (4 / 4 / 0)`. When that happens, they instantly change to `C (4 / 4 / 0)`, the State columns turn to `COMPLETED`, and two new tasks appear:
+As you watch, the mysterious numbers in the last column of the task table change from `Ae (4 / 0 / 0)` to `Ae (4 / 1 / 0)`. The mysterious numbers in the scoreboard change in unison with the ones in the task table. Eventually the two pemruter tasks each hits `Ae (4 / 4 / 0)`. When that happens, they instantly change to `C (4 / 4 / 0)`, the State columns turn to `COMPLETED`, and two new tasks appear:
 
-![flip-tasks](images/flip-tasks.png)
+<img src="images/flip-tasks.png" style="width:15cm;"/>
 
 Finally, after a few more seconds, two new tasks, named `averaging`, appear. Shortly after that, we get to this state:
 
-![tasks-done](images/tasks-done.png)
+<img src="images/tasks-done.png" style="width:15cm;"/>
 
 The pipeline and worker lights are grey again, the instance and all the tasks show `COMPLETED`. Congratulations! You've just run your first Ziggy pipeline!
 
 At this point, you'd probably like an explanation of just what everything on the `Instances` panel is trying to tell you. If so, read on! Specifically, the article on [The Instances Panel](instances-panel.md).
 
+<sup>1</sup> Although the Event name column appears in these screenshots, it is now initially hidden to save space. See the article [Event Handler Examples](event-handler-examples.md) for information on how to show and use this column.
+
 [[Previous]](ziggy-gui.md)
 [[Up]](ziggy-gui.md)
 [[Next]](instances-panel.md)
diff --git a/doc/user-manual/system-requirements.md b/doc/user-manual/system-requirements.md
index 3c22d66..bee71a8 100644
--- a/doc/user-manual/system-requirements.md
+++ b/doc/user-manual/system-requirements.md
@@ -10,21 +10,21 @@
 
 Ziggy is supported on Linux and macOS.
 
-For Linux, the following versions have been tested: SLES 11, SLES 12, RHEL 7, RHEL 8, and Debian through version 11 (bullseye). That said, we expect that any relatively recent version of Linux will suffice. 
+For Linux, the following versions have been tested: SLES 11, SLES 12, RHEL 7, RHEL 8, and Debian through version 11 (bullseye). That said, we expect that any relatively recent version of Linux will suffice.
 
 For macOS, All versions from Snow Leopard (10.6) to Monterey (12.6) have been used to build and run Ziggy. Both Intel and Apple M1 CPUs have been used. Compability of Ventura (13.x) is to be determined.
 
 ### RAM and Disk Space
 
-Ziggy itself is quite lightweight, hence we expect that the RAM and disk space requirements will be set by the dataset you want to process and the algorithms it runs, not by Ziggy. That said: we have run Ziggy on laptops with 16 GB RAM, and the total disk space footprint for Ziggy when fully built is under 3 GB. 
+Ziggy itself is quite lightweight, hence we expect that the RAM and disk space requirements will be set by the dataset you want to process and the algorithms it runs, not by Ziggy. That said: we have run Ziggy on laptops with 16 GB RAM, and the total disk space footprint for Ziggy when fully built is under 3 GB.
 
 ### Compilers and Interpreters
 
 Ziggy requires the following computer language resources:
 
-- Java: JDK 17 or later. 
+- Java: JDK 17 or later.
 - Perl 5.16 or later.
-- C/C++ compiler that supports the 2011 C++ standard. Historically we've used gcc but we expect that any compiler that's 2011-compliant will do. We've also used clang, just to prove that we could. 
+- C/C++ compiler that supports the 2011 C++ standard. Historically we've used gcc but we expect that any compiler that's 2011-compliant will do. We've also used clang, just to prove that we could.
 - Python 3 and Pip 3. Note that these are only for the sample pipeline, not for Ziggy itself.
 
 [[Previous]](../../README.md)
diff --git a/doc/user-manual/task-configuration.md b/doc/user-manual/task-configuration.md
index 29ab966..66921e0 100644
--- a/doc/user-manual/task-configuration.md
+++ b/doc/user-manual/task-configuration.md
@@ -2,7 +2,7 @@
 
 [[Previous]](datastore-task-dir.md)
 [[Up]](intermediate-topics.md)
-[[Next]](properties.md)
+[[Next]](rdbms.md)
 
 ## The Task Configuration Parameter Sets
 
@@ -90,8 +90,6 @@ Under normal circumstances, as we'll see shortly, if even a single subtask fails
 
 The default for `maxFailedSubtaskCount` is zero.
 
-The default for `maxFailedSubtaskCount` is zero.
-
 #### reprocess
 
 Most missions don't get all their data all at once. Most missions get data at some regular interval: every day, every month, whatever.
@@ -112,17 +110,7 @@ Thus, when Ziggy marshals inputs for a new task, and that task's `TaskConfigurat
 
 One subtlety: Ziggy not only tracks which pipeline tasks consumed a given file as input; it also looks to see whether they did so successfully. If a task consumes a file as input, but then the algorithm process that was running on that data bombs, Ziggy doesn't record that task as a consumer of that file. That way, the next time Ziggy processes "new" data, it will also include any "old" data that was only used in failed processing attempts.
 
-The default for `reprocess` is `false`. 
-
-##### How does Ziggy Know Whether Data is "New" or "Old"?
-
-Excellent question! Here's a long answer:
-
-Ziggy keeps track of the "producer-consumer" information for every file in the datastore. That is, it knows which pipeline task produced each file, and it knows which pipeline tasks used each file as input ("consumed" it). Ziggy also knows what algorithm was employed by every task it's ever run. 
-
-Thus, when Ziggy marshals inputs for a new task, and that task's `TaskConfigurationParameters` instance has `reprocess` set to `false`, the system filters out any inputs that have been, at some point in the past, processed using the same algorithm as the task that's being marshaled. Result: a task directory that has only data files that haven't been processed before. 
-
-One subtlety: Ziggy not only tracks which pipeline tasks consumed a given file as input; it also looks to see whether they did so successfully. If a task consumes a file as input, but then the algorithm process that was running on that data bombs, Ziggy doesn't record that task as a consumer of that file. That way, the next time Ziggy processes "new" data, it will also include any "old" data that was only used in failed processing attempts. 
+The default for `reprocess` is `false`.
 
 #### reprocessingTasksExclude
 
@@ -157,4 +145,4 @@ The default for `maxAutoResubmits` is zero.
 
 [[Previous]](datastore-task-dir.md)
 [[Up]](intermediate-topics.md)
-[[Next]](properties.md)
+[[Next]](rdbms.md)
diff --git a/doc/user-manual/troubleshooting.md b/doc/user-manual/troubleshooting.md
index f6ffc37..582e34d 100644
--- a/doc/user-manual/troubleshooting.md
+++ b/doc/user-manual/troubleshooting.md
@@ -1,6 +1,6 @@
 <!-- -*-visual-line-*- -->
 
-[[Previous]](properties.md)
+[[Previous]](rdbms.md)
 [[Up]](user-manual.md)
 [[Next]](log-files.md)
 
@@ -10,17 +10,17 @@ It's been said that the only things in life that are guaranteed are death and ta
 
 ### Creating an "Exception" in the Sample Pipeline
 
-On the console, go back to the `Configuration` tab, select `Parameter Library`, and double-click `Algorithm Parameters`. You'll see that there's a boolean parameter, `throw exception subtask_0`. Check the check box and save the parameter set.
+On the console, go back to the `Parameter Library` panel and double-click `Algorithm Parameters`. You'll see that there's a boolean parameter, `throw exception subtask_0`. Check the check box and save the parameter set.
 
 What this does is to tell the permuter's Python-side "glue" code that it should deliberately throw an exception during the processing of subtask zero. Obviously you shouldn't put such a parameter into your own pipeline! But in this case it's useful because it allows us to generate an exception in a controlled manner and watch what happens.
 
-Now go to the `Operations` tab, to its Triggers tab, and set up to run `permuter` and `flip` nodes in the sample pipeline. Launch the pipeline and return to the `Instances` tab. After a few seconds you'll see something like this:
+Now go to the `Pipelines` panel and set up to run `permuter` and `flip` nodes in the sample pipeline. Start the pipeline and return to the `Instances` panel. After a few seconds you'll see something like this:
 
-![](images/exception-1.png)
+<img src="images/exception-1.png" style="width:32cm;"/>
 
 What you see is that at the moment when I took my screen shot, 2 subtasks had completed and 1 had failed in each task, which is why each has a `P-state` that includes `(4 / 2 / 1)` (i.e., total subtasks, completed subtasks, failed subtasks). After a little more time has passed, you'll see this:
 
-![](images/exception-2.png)
+<img src="images/exception-2.png" style="width:32cm;"/>
 
 What indications do we have that all is not well? Let me recount the signs and portents:
 
@@ -37,7 +37,6 @@ The first stop for understanding what went wrong is the log files. Ziggy produce
 
 In most cases, you wan't want or need to resort to manually pawing through log files. In most cases, you can use Ziggy for troubleshooting and to respond to problems.
 
-[[Previous]](properties.md)
+[[Previous]](rdbms.md)
 [[Up]](user-manual.md)
-[[Next]](log-files.md)
-
+[[Next]](log-files.md)
\ No newline at end of file
diff --git a/doc/user-manual/user-manual.md b/doc/user-manual/user-manual.md
index f29aace..3b248a9 100644
--- a/doc/user-manual/user-manual.md
+++ b/doc/user-manual/user-manual.md
@@ -8,7 +8,7 @@
 
 # Welcome to Ziggy!
 
-Ziggy is "A Pipeline management system for Data Analysis Pipelines." This is the user guide and assorted documentation. 
+Ziggy is "A Pipeline management system for Data Analysis Pipelines." This is the user guide and assorted documentation.
 
 ## Table of Contents
 
@@ -30,108 +30,116 @@ Ziggy is "A Pipeline management system for Data Analysis Pipelines." This is the
 
 6. [Building a Pipeline](building-pipeline.md)
 
-7. [Setting up the Relational Database Management System (RDBMS)](rdbms.md)
+7. [Running the Cluster](running-pipeline.md)
 
-8. [Running the Cluster](running-pipeline.md)
+8. [Using the Ziggy Console, Part 1](ziggy-gui.md)
 
-9. [Using the Ziggy Console, Part 1](ziggy-gui.md)
+    8.1​. [Starting a Pipeline](start-pipeline.md)
 
-    9.1​. [Starting a Pipeline](start-pipeline.md)
+    8.2​. [The Instances Panel](instances-panel.md)
 
-    9.2​. [The Instances Panel](instances-panel.md)
+    8.3.​ [Changing the Start and End Nodes](start-end-nodes.md)
 
-    9.3.​ [Changing the Start and End Nodes](start-end-nodes.md)
+    8.4.​ [Changing Module Parameter Values](change-param-values.md)
 
-    9.4.​ [Changing Module Parameter Values](change-param-values.md)
+    8.5.​ [Organizing Pipelines and Parameter Sets](organizing-tables.md)
 
-10. [Intermediate Topics](intermediate-topics.md)
+9. [Intermediate Topics](intermediate-topics.md)
 
-    10.1. ​ [The Datastore and the Task Directory](datastore-task-dir.md)
+    9.1. [The Datastore and the Task Directory](datastore-task-dir.md)
 
-    10.2​. [The Task Configuration Parameter Sets](task-configuration.md)
+    9.2​. [The Task Configuration Parameter Sets](task-configuration.md)
 
-    10.3​. [The Properties File](properties.md)
+    9.3. [Setting up a Relational Database Management System (RDBMS)](rdbms.md)
 
-11. [Troubleshooting Pipeline Execution](troubleshooting.md)
+10. [Troubleshooting Pipeline Execution](troubleshooting.md)
 
-      11.1​. [Log Files in Ziggy](log-files.md)
+      10.1​. [Log Files in Ziggy](log-files.md)
 
-12. [Using the Ziggy Console, Part 2: Troubleshooting](ziggy-gui-troubleshooting.md)
+11. [Using the Ziggy Console, Part 2: Troubleshooting](ziggy-gui-troubleshooting.md)
 
-      12.1.​ [Monitoring Tab](monitoring.md)
+      11.1.​ [Monitoring Tab](monitoring.md)
 
-      12.2.​ [Alerts Panel](alerts.md)
+      11.2.​ [Alerts Panel](alerts.md)
 
-      12.3.​ [Log Files Display](display-logs.md)
+      11.3.​ [Log Files Display](display-logs.md)
 
-      12.4.​ [Re-Run or Resume a Failed Task](rerun-task.md)
+      11.4.​ [Re-Run or Resume a Failed Task](rerun-task.md)
 
-      12.5.​ [Deleting Tasks](delete-tasks.md)
+      11.5.​ [Killing Tasks](kill-tasks.md)
 
-13. [High Performance Computing](select-hpc.md)
+12. [High Performance Computing](select-hpc.md)
 
-      13.1​. [The Remote Execution Dialog Box](remote-dialog.md)
+      12.1​. [Remote Parameters](remote-parameters.md)
 
-      13.2​. [HPC Cost Estimation](hpc-cost.md)
+      12.2​. [The Remote Execution Dialog Box](remote-dialog.md)
 
-14. Cloud Computing (TBD)
+      12.23. [HPC Cost Estimation](hpc-cost.md)
 
-15. [Data Receipt](data-receipt.md)
+13. Cloud Computing (TBD)
 
-      15.1​. [Execution Flow](data-receipt-execution.md)
+14. [Data Receipt](data-receipt.md)
 
-      15.2.​ [Console Display](data-receipt-display.md)
+      14.1​. [Execution Flow](data-receipt-execution.md)
 
-16. [Event Handler](event-handler.md)
+      14.2.​ [Console Display](data-receipt-display.md)
 
-      16.1​. [Introduction to Event Handlers](event-handler-intro.md)
+15. [Event Handler](event-handler.md)
 
-      16.2​. [Defining Event Handlers](event-handler-definition.md)
+      15.1​. [Introduction to Event Handlers](event-handler-intro.md)
 
-      16.3​. [Event Handler Examples](event-handler-examples.md)
+      15.2​. [Defining Event Handlers](event-handler-definition.md)
 
-      16.4​. [Sending Event Information to Algorithms](event-handler-labels.md)
+      15.3​. [Event Handler Examples](event-handler-examples.md)
 
-17. Reports and Performance Tracking (TBD) 
+      15.4​. [Sending Event Information to Algorithms](event-handler-labels.md)
+
+16. Reports and Performance Tracking (TBD)
 
      <!--
 
-      17.1​. [Memdrone](memdrone.md)
+      16.1​. [Memdrone](memdrone.md)
 
-      17.2​. [Metrics](metrics.md)
+      16.2​. [Metrics](metrics.md)
 
-      17.3​. [Instance Reports](instance-reports.md)
+      16.3​. [Instance Reports](instance-reports.md)
 
-      17.4​. [Data Accountability](data-accountability.md) 
+      16.4​. [Data Accountability](data-accountability.md)
 
      -->
 
-18. Alternative User Interface Options (TBD) 
+17. Alternative User Interface Options (TBD)
 
      <!--
 
-      18.1​. [Assistive Technologies](assistive-technologies.md)
+      17.1​. [Assistive Technologies](assistive-technologies.md)
 
-      18.2​. [Mouse-Overs](mouse-overs.md)
+      17.2​. [Mouse-Overs](mouse-overs.md)
 
-      18.3​. [Console Appearance Control](appearance-control.md)
+      17.3​. [Console Appearance Control](appearance-control.md)
 
-      18.1​. [Command Line Interface](console-cli.md)
+      17.1​. [Command Line Interface](console-cli.md)
 
      -->
 
-19. Security (TBD)
+18. Security (TBD)
+
+19. [Ziggy's Dustier Corners](dusty-corners.md)
+
+      19.1​. [More on the Relational Database](more-rdbms.md)
+
+      19.2​. [More on Parameter Sets](more-parameter-sets.md)
 
-20. [Ziggy's Dustier Corners](dusty-corners.md)
+      19.3​. [Parameter Overrides](parameter-overrides.md)
 
-      20.1​. [More on the Relational Database](more-rdbms.md) 
+      19.4​. [Redefining a Pipeline](redefine-pipeline.md)
 
-      20.2​. [More on Parameter Sets](more-parameter-sets.md)
+      19.5​. [The Edit Pipeline Dialog Box](edit-pipeline.md)
 
-      20.3​. [Parameter Overrides](parameter-overrides.md)
+      19.6. [Creating Ziggy Nicknames](nicknames.md)
 
-      20.4​. [Redefining a Pipeline](redefine-pipeline.md)
+      <!-- 19.7. [Customizing Ziggy](customizing-ziggy.md) -->
 
-      20.5​. [The Edit Trigger Dialog Box](edit-trigger.md)
+20. [Contact Us](contact-us.md)
 
-21. [Contact Us](contact-us.md)
+Appendix A. [The Properties File](properties.md)
diff --git a/doc/user-manual/ziggy-gui-troubleshooting.md b/doc/user-manual/ziggy-gui-troubleshooting.md
index 86151c8..6388bc2 100644
--- a/doc/user-manual/ziggy-gui-troubleshooting.md
+++ b/doc/user-manual/ziggy-gui-troubleshooting.md
@@ -8,13 +8,13 @@
 
 Here are some articles on things you can use the Ziggy console for that relate to troubleshooting and recovery from problems.
 
-### [Monitoring Tab](monitoring.md)
+### [Status Panel](monitoring.md)
 
-There's a whole bunch of stuff you can see on the Monitoring tab.
+There's a whole bunch of stuff you can see on the `Status` panel.
 
 ### [Alerts Panel](alerts.md)
 
-When things happen that the operator should know about, they show up at the `Alerts` panel. 
+When things happen that the operator should know about, they show up at the `Alerts` panel.
 
 ### [Log Files Display](display-logs.md)
 
@@ -24,7 +24,7 @@ For any given task you can display the task's log files directly from the consol
 
 Ziggy also gives you options when you've decided what you want to do about a failed task.
 
-### [Deleting Tasks](delete-tasks.md)
+### [Killing Tasks](kill-tasks.md)
 
 You can stop a job or two if necessary.
 
diff --git a/doc/user-manual/ziggy-gui.md b/doc/user-manual/ziggy-gui.md
index e5992ae..b933176 100644
--- a/doc/user-manual/ziggy-gui.md
+++ b/doc/user-manual/ziggy-gui.md
@@ -6,13 +6,13 @@
 
 ## Using the Ziggy Console, Part 1
 
-I ain't gonna lie to you: getting a full understanding of the Ziggy console is a tall order. For this reason, we've broken it down into several parts, and then broken those parts down into even smaller parts. Here in Part 1, we'll concentrate on things that are relevant to starting and running a pipeline under relatively normal circumstances. 
+I ain't gonna lie to you: getting a full understanding of the Ziggy console is a tall order. For this reason, we've broken it down into several parts, and then broken those parts down into even smaller parts. Here in Part 1, we'll concentrate on things that are relevant to starting and running a pipeline under relatively normal circumstances.
 
-As we go through it, we'll always use the sample pipeline to show what we're talking about in the most concrete way we can. 
+As we go through it, we'll always use the sample pipeline to show what we're talking about in the most concrete way we can.
 
 ### [Starting a Pipeline](start-pipeline.md)
 
-This is probably the first thing you want to do: see an actual pipeline run! 
+This is probably the first thing you want to do: see an actual pipeline run!
 
 ### [The Instances Panel](instances-panel.md)
 
@@ -24,7 +24,7 @@ There's no law that says you have to run the pipeline straight through from its
 
 ### [Changing Module Parameter Values](change-param-values.md)
 
-How the user adjusts the user-adjustable parameters. 
+How the user adjusts the user-adjustable parameters.
 
 [[Previous]](running-pipeline.md)
 [[Up]](user-manual.md)
diff --git a/etc/hsqldb.wrapper.conf b/etc/hsqldb.wrapper.conf
new file mode 100644
index 0000000..4db93b7
--- /dev/null
+++ b/etc/hsqldb.wrapper.conf
@@ -0,0 +1,66 @@
+#********************************************************************
+#
+# Wrapper Properties for the HSQLDB server
+#
+#********************************************************************
+
+# main() entry point
+wrapper.app.parameter.1 = gov.nasa.ziggy.services.database.HsqldbController
+
+# Title to use when running as a console
+wrapper.console.title = Ziggy HSQLDB Server
+
+# Initial Java Heap Size (in MB)
+wrapper.java.initmemory = 512
+
+# Additional Java parameters.
+# ClusterController.workerCommand() adds additional parameters starting at 5.
+wrapper.java.additional.1 = -Dlog4j2.configurationFile=etc/log4j2.xml
+wrapper.java.additional.2 = -Dlog4j.logfile.prefix=logs/hsqldb
+wrapper.java.additional.3 = -XX:+UseCompressedOops
+wrapper.java.additional.4 = -XX:-OmitStackTraceInFastThrow
+
+# Disable timeouts because the workers used to get killed when
+# MATLAB processes consumed 100% CPU for extended periods of time.
+wrapper.ping.timeout = 0
+
+# Java Application
+wrapper.java.command = java
+
+# Java Main class.  This class must implement the WrapperListener interface
+#  or guarantee that the WrapperManager class is initialized.  Helper
+#  classes are provided to do this for you.  See the Integration section
+#  of the documentation for details.
+wrapper.java.mainclass = org.tanukisoftware.wrapper.WrapperSimpleApp
+
+wrapper.working.dir = ../
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Format of output for the console.  (See docs for formats)
+wrapper.console.format = PM
+
+# Log Level for console output.  (See docs for log levels)
+wrapper.console.loglevel = INFO
+
+# Format of output for the log file.  (See docs for formats)
+wrapper.logfile.format = LPTM
+
+# Log Level for log file output.  (See docs for log levels)
+wrapper.logfile.loglevel = INFO
+
+# Maximum size that the log file will be allowed to grow to before
+#  the log is rolled. Size is specified in bytes.  The default value
+#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
+#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize = 8192k
+
+# Maximum number of rolled log files which will be allowed before old
+#  files are deleted.  The default value of 0 implies no limit.
+wrapper.logfile.maxfiles = 4
+
+# Log Level for sys/event log output.  (See docs for log levels)
+wrapper.syslog.loglevel = NONE
+
+
diff --git a/etc/log4j-matlab-interactive.xml b/etc/log4j-matlab-interactive.xml
deleted file mode 100644
index 60ccd99..0000000
--- a/etc/log4j-matlab-interactive.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d %-5p [%t:%C{1}.%M] %m%n"/>
-    </layout>
-  </appender>
-
-  <appender name="file" class="org.apache.log4j.RollingFileAppender">
-    <param name="File" value="${log4j.logfile.prefix}matlab-interactive.log"/>
-    <param name="Append" value="true"/>
-    <param name="MaxFileSize" value="8192kb"/>
-    <param name="MaxBackupIndex" value="8"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d %-5p [%t:%C{1}.%M] %m%n"/>
-    </layout>
-  </appender>
-
-  <appender name="err-file" class="org.apache.log4j.RollingFileAppender">
-    <param name="Threshold" value="WARN"/>
-    <param name="File" value="${log4j.logfile.prefix}matlab-interactive-err.log"/>
-    <param name="Append" value="true"/>
-    <param name="MaxFileSize" value="8192kb"/>
-    <param name="MaxBackupIndex" value="8"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d %-5p [%t:%C{1}.%M] %m%n"/>
-    </layout>
-  </appender>
-
-<!-- Set this to a different value from the Spiffy version of this file as a test of
-     the config override system (which is just "copy the pipeline files to dist after
-    copying the Spiffy files there" -->
-  <category name="org.hibernate.cfg.annotations.EntityBinder">
-    <priority value="WARN" />
-  </category>
-
-  <category name="org.hibernate.cfg.AnnotationBinder">
-    <priority value="WARN" />
-  </category>
-
-  <category name="org.hibernate">
-    <priority value="WARN" />
-  </category>
-
-  <root>
-    <priority value ="warn"/>
-    <appender-ref ref="console"/>
-    <appender-ref ref="file"/>
-    <appender-ref ref="err-file"/>
-  </root>
-</log4j:configuration>
diff --git a/etc/log4j2.xml b/etc/log4j2.xml
index 84f3700..9527edf 100644
--- a/etc/log4j2.xml
+++ b/etc/log4j2.xml
@@ -1,33 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration>
 
-    <Properties>
-        <Property name="pattern">%d %-5p [%t:%C{1}.%M] %X{logStreamIdentifier} %m%n</Property>
-        <Property name="filename">${sys:cli.logfile:-/dev/null}</Property>
-    </Properties>
-    <Appenders>
-    
-        <!--  NB the name of the console appender must match the value of 
-            TaskLog.CONSOLE_APPENDER_TYPE. -->
-        <Console name="console"> <!-- Console wants to be plain because wrapper formats for us -->
-            <PatternLayout pattern="[%C{1}.%M] %m%n"/>
-        </Console>
-        <File name="cli" filename="${filename}">
-            <PatternLayout pattern="${pattern}"/>
-        </File>
-    </Appenders>
+  <Properties>
+    <Property name="pattern">%d %-5p [%t:%C{1}.%M] %X{logStreamIdentifier} %m%n</Property>
+    <Property name="filename">${sys:ziggy.logfile:-/dev/null}</Property>
+    <!-- TODO
+	 1. Rename ziggy.logfile to ziggy.logfile.prefix when we introduce alternate files like ziggy-err.log.
+	 2. When we introduce a prefix, consider an alternative to /dev/null such as "ziggy"
+	 since /dev/null.log is bound to cause trouble.
+    -->
+  </Properties>
+  <Appenders>
+    <!-- The name of the console appender must match the value of TaskLog.CONSOLE_APPENDER_NAME. -->
+    <!-- Console wants to be plain because wrapper formats for us. -->
+    <Console name="console">
+      <PatternLayout pattern="[%C{1}.%M] %m%n"/>
+    </Console>
+
+    <!-- The name of the file appender must match the value of TaskLog.CLI_APPENDER_NAME. -->
+    <File name="cli" filename="${filename}">
+      <PatternLayout pattern="${pattern}"/>
+    </File>
+
+    <!--
+    <RollingFile name="cli" fileName="${filename}" filePattern="${filename}.%i.gz">
+      <LevelRangeFilter minLevel="INFO" maxLevel="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+      <PatternLayout pattern="${pattern}"/>
+      <Policies>
+        <SizeBasedTriggeringPolicy size="8192kb"/>
+      </Policies>
+      <DefaultRolloverStrategy max="4"/>
+    </RollingFile>
+    -->
+  </Appenders>
+  
+  <Loggers>
     
-    <Loggers>
+    <!-- Can specify an AppenderRef, but then add additivity="false" to the parameters
+	 to avoid duplicate log messages if that appender is found in Root. -->
+    <Logger name="gov.nasa.ziggy.services.database" level="info"/>
+    <Logger name="gov.nasa.ziggy.services.messaging" level="info"/>
+    <Logger name="gov.nasa.ziggy.ui" level="info"/>
+    <Logger name="gov.nasa.ziggy.util.ClasspathScanner" level="info"/>
+    <Logger name="gov.nasa.ziggy" level="info"/>
+    <Logger name="org.hibernate" level="warn"/>
+
+    <!--
+        To view the stack trace whenever DatabaseTransactionFactory.performTransaction is called, uncomment the following.
+        <Logger name="gov.nasa.ziggy.services.database.DatabaseTransactionFactory" level="trace"/>
+    -->
+
+    <!--
+        To view SQL, uncomment the following and add the following VM arguments to your run configuration in Eclipse.
+        -Dlog4j2.configurationFile=etc/log4j2.xml -Dhibernate.show_sql=true -Dhibernate.format_sql=true -Dhibernate.use_sql_comments=true
+        <Logger name="org.hibernate.SQL" level="debug"/>
+    -->
     
-        <Logger name="gov.nasa.ziggy.util.ClasspathScanner" level="info"/>
-        <Logger name="gov.nasa.ziggy" level="info"/>
-        <Logger name="org.hibernate" level="warn"/>
+    <Root level="info">
+      <AppenderRef ref="console"/>
+      <AppenderRef ref="cli"/>
+    </Root>
     
-        <Root level="info">
-            <AppenderRef ref="console"/>
-            <AppenderRef ref="cli"/>
-        </Root>
-        
-    </Loggers>
+  </Loggers>
 
 </Configuration>
diff --git a/etc/pipeline.properties.EXAMPLE b/etc/pipeline.properties.EXAMPLE
index b9259b9..ccc1df1 100644
--- a/etc/pipeline.properties.EXAMPLE
+++ b/etc/pipeline.properties.EXAMPLE
@@ -1,32 +1,35 @@
 # See the Properties File article in the user manual for descriptions
 # of these properties and especially for properties not listed.
 
-data.receipt.dir = ${pipeline.results.dir}/data-receipt
-database.connections = 100
-database.host = localhost
-database.name = majortom
-database.port = 5432
-database.software.name = postgresql
-datastore.root.dir = ${pipeline.results.dir}/datastore
 hibernate.connection.password = <your-password>
-hibernate.connection.username = ${env:USER}
-moduleExe.memdrone.enabled = true
-moduleExe.memdrone.sleepSeconds = 10
-moduleExe.useSymlinks = true
-pi.worker.heapSize = 12000
-pi.worker.moduleExe.binPath = ${env:JAVA_HOME}/bin:/bin:/usr/bin
-pi.worker.moduleExe.mcrRoot = ${env:MATLAB_HOME}
-pi.worker.threadCount = 2
-pipeline.classpath = "${pipeline.home.dir}/libs/*"
-pipeline.definition.dir = ${pipeline.root.dir}/sample-pipeline/config
-pipeline.home.dir = ${pipeline.root.dir}/sample-pipeline/build
-pipeline.logoFile = ${pipeline.definition.dir}/pipeline-logo.png
-pipeline.results.dir = ${pipeline.root.dir}/pipeline-results
+hibernate.connection.username = sa
 pipeline.root.dir = /path/to/pipeline/directories
-remote.cluster.name = nas
-remote.group = 1234
-remote.host = host1.example.com,host2.example.come
-remote.user = user
-rmi.registry.port = 1099
 ziggy.config.path = ${ziggy.home.dir}/etc/ziggy.properties
+ziggy.database.connections = 100
+ziggy.database.dir = ${ziggy.pipeline.results.dir}/db
+ziggy.database.host = localhost
+ziggy.database.name = majortom
+ziggy.database.port = 9001
+ziggy.database.protocol = hsql:
+ziggy.database.schema.dir = ${ziggy.home.dir}/schema
+ziggy.database.software.name = hsqldb
 ziggy.home.dir = ${pipeline.root.dir}/ziggy/build
+ziggy.logoFile = ${ziggy.pipeline.definition.dir}/pipeline-logo.png
+ziggy.pipeline.binPath = ${env:JAVA_HOME}/bin:/bin:/usr/bin
+ziggy.pipeline.classpath = ${ziggy.pipeline.home.dir}/libs/*
+ziggy.pipeline.data.receipt.dir = ${ziggy.pipeline.results.dir}/data-receipt
+ziggy.pipeline.datastore.dir = ${ziggy.pipeline.results.dir}/datastore
+ziggy.pipeline.definition.dir = ${pipeline.root.dir}/config
+ziggy.pipeline.home.dir = ${pipeline.root.dir}/build
+ziggy.pipeline.mcrRoot = ${env:MATLAB_HOME}
+ziggy.pipeline.memdrone.enabled = true
+ziggy.pipeline.memdrone.sleepSeconds = 10
+ziggy.pipeline.results.dir = ${pipeline.root.dir}/pipeline-results
+ziggy.pipeline.useSymlinks = true
+ziggy.remote.cluster.name = nas
+ziggy.remote.group = 1234
+ziggy.remote.host = host1.example.com,host2.example.come
+ziggy.remote.user = user
+ziggy.worker.count = 2
+ziggy.worker.heapSize = 12000
+ziggy.worker.port = 1099
diff --git a/etc/runjava.conf b/etc/runjava.conf
deleted file mode 100644
index 7ffab19..0000000
--- a/etc/runjava.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Runjava configuration file
-#
-# FORMAT: 
-#
-# [DEFAULT_JVM_ARGS|LOGFILE_PREFIX]=value
-# nickname|fully.specified.classname|space-delimited JVM args|space-delimited program args
-
-# This is the runjava configuration file for Ziggy.
-#
-# The LOGFILE_PREFIX causes the logging from subsequent nicknames to
-# flow into a particular file in the pipeline results logs/cli
-# directory. For example, all the nicknames below
-# LOGFILE_PREFIX=runjava will log to logs/cli/runjava.log; the one
-# under LOGFILE_PREFIX=cluster logs to logs/cli/cluster.log and so on.
-# You can use this mechanism to divert logging for your Java classes
-# to specific files in logs/cli so that you can find your log messages
-# more easily after running.
-
-# These are the runjava defaults, which can be overridden.
-DEFAULT_JVM_ARGS=-Dlog4j2.configurationFile=${ziggy.home.dir}/etc/log4j2.xml -Djava.library.path=${ziggy.home.dir}/lib
-
-compute-node-master|gov.nasa.ziggy.module.ComputeNodeMaster|-XX:ParallelGCThreads=2 -XX:+UseParallelGC -XX:OnOutOfMemoryError="kill -QUIT %p"|
-
-LOGFILE_PREFIX=cluster
-cluster|gov.nasa.ziggy.ui.ClusterController||
-
-LOGFILE_PREFIX=console
-console|gov.nasa.ziggy.ui.ZiggyConsole|-Dsun.java2d.xrender=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Xmx2G -Dlog4j.configuration=file:${pipeline.home.dir}/etc/log4j-console-rolling-file.xml|
-
-LOGFILE_PREFIX=runjava
-dump-err|gov.nasa.ziggy.module.io.DumpMatlabErrCli||
-dump-props|gov.nasa.ziggy.services.configuration.DumpSystemProperties||
-dump-system-properties|gov.nasa.ziggy.services.config.DumpSystemProperties|-Drunjava.env.ziggy.home.dir=%ZIGGY_HOME%|
-execsql|gov.nasa.ziggy.dbservice.SqlRunner||
-metrics|gov.nasa.ziggy.metrics.report.MetricsCli||
-pd-export|gov.nasa.ziggy.pipeline.definition.PipelineDefinitionCli||-export
-pd-import|gov.nasa.ziggy.pipeline.definition.PipelineDefinitionCli||-import
-pe-import|gov.nasa.ziggy.services.events.ZiggyEventHandlerDefinitionFileImporter||
-perf-report|gov.nasa.ziggy.metrics.report.PerformanceReport||
-pl-export|gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli||-export
-pl-import|gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli||-import
-pl-override|gov.nasa.ziggy.parameters.ParameterLibraryOverrideCli||
-pt-import|gov.nasa.ziggy.data.management.DataFileTypeImporter||
-spoc-version|gov.nasa.ziggy.common.version.ZiggyVersionCli||
-status-listener|gov.nasa.ziggy.services.process.StatusMessageLogger||
-generate-manifest|gov.nasa.ziggy.data.management.Manifest||
diff --git a/etc/worker.wrapper.conf b/etc/supervisor.wrapper.conf
similarity index 76%
rename from etc/worker.wrapper.conf
rename to etc/supervisor.wrapper.conf
index eb7c7c9..e80618a 100644
--- a/etc/worker.wrapper.conf
+++ b/etc/supervisor.wrapper.conf
@@ -1,28 +1,28 @@
 #********************************************************************
 #
-# Wrapper Properties for Worker
+# Wrapper Properties for Supervisor
 #
 #********************************************************************
 
 # main() entry point
-# ClusterController.workerCommand() adds additional parameters starting at 2.
-wrapper.app.parameter.1=gov.nasa.ziggy.worker.WorkerPipelineProcess
+# ClusterController.supervisorCommand() adds additional parameters starting at 2.
+wrapper.app.parameter.1=gov.nasa.ziggy.supervisor.PipelineSupervisor
 
 # Title to use when running as a console
-wrapper.console.title=Ziggy Worker
+wrapper.console.title=Ziggy Supervisor
 
 # Initial Java Heap Size (in MB)
 wrapper.java.initmemory=512
 
 # Additional Java parameters. 
-# ClusterController.workerCommand() adds additional parameters starting at 5.
+# ClusterController.supervisorCommand() adds additional parameters starting at 5.
 wrapper.java.additional.1=-Dlog4j2.configurationFile=etc/log4j2.xml
-wrapper.java.additional.2=-Dlog4j.logfile.prefix=logs/worker
+wrapper.java.additional.2=-Dlog4j.logfile.prefix=logs/supervisor
 wrapper.java.additional.3=-XX:+UseCompressedOops
 wrapper.java.additional.4=-XX:-OmitStackTraceInFastThrow
 
-# Disable timeouts because the workers are getting killed when
-# MATLAB processes are consuming 100% CPU for extended periods of time
+# Disable timeouts because the workers used to get killed when
+# MATLAB processes consumed 100% CPU for extended periods of time.
 wrapper.ping.timeout=0
 
 # Java Application
@@ -36,11 +36,6 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
 
 wrapper.working.dir=../
 
-# limit the # of wrapper logfiles
-wrapper.logfile.maxfiles=4
-wrapper.logfile.rollmode=SIZE
-wrapper.logfile.maxsize=8192k
-
 #********************************************************************
 # Wrapper Logging Properties
 #********************************************************************
@@ -64,7 +59,7 @@ wrapper.logfile.maxsize=8192k
 
 # Maximum number of rolled log files which will be allowed before old
 #  files are deleted.  The default value of 0 implies no limit.
-wrapper.logfile.maxfiles=8
+wrapper.logfile.maxfiles=4
 
 # Log Level for sys/event log output.  (See docs for log levels)
 wrapper.syslog.loglevel=NONE
diff --git a/etc/ziggy.properties b/etc/ziggy.properties
index 7238775..8c5882d 100644
--- a/etc/ziggy.properties
+++ b/etc/ziggy.properties
@@ -1,37 +1,29 @@
-#
-# Properties file for Ziggy processes.
-#
-# Lookup order for properties is as follows:
-# 1. System properties (System.getProperty())
-# 2. Pipeline properties file
-# 3. Ziggy properties file (this file)
-
-hibernate.c3p0.idle_test_period = 100
-hibernate.c3p0.max_size = 115
-hibernate.c3p0.max_statements = 50
-hibernate.c3p0.min_size = 1
-hibernate.c3p0.timeout = 300
-hibernate.connection.url = jdbc:${database.software.name}://${database.host}:${database.port}/${database.name}
+# See the Properties File article in the user manual for descriptions
+# of these properties and especially for properties not listed.
+# Increased hibernate.jdbc.batch_size size from 0 to 30 to drop
+# collateral pixel table ingest time from 10 minutes to 2 minutes.
+hibernate.connection.url = jdbc:${ziggy.database.software.name}:${ziggy.database.protocol}//${ziggy.database.host}:${ziggy.database.port}/${ziggy.database.name}
 hibernate.format_sql = true
-hibernate.id.new_generator_mappings = true
-# Increased batch size from 0 to 30 to drop collateral pixel table ingest time from 10 minutes to 2 minutes.
 hibernate.jdbc.batch_size = 30
 hibernate.show_sql = false
-hibernate.use_sql_comments = false
-
+hibernate.use_sql_comments = true
 matlab.log4j.config = ${ziggy.home.dir}/etc/log4j-matlab-interactive.xml
 matlab.log4j.initialize = true
-
-pi.metrics.reaper.checkIntervalMins = 5
-pi.metrics.reaper.maxRows = 10000
-
-pi.worker.moduleExe.saveMatFiles = true
-pi.worker.taskMetrics.Algorithm = pipeline.module.executeAlgorithm.matlab.controller.execTime
-pi.worker.taskMetrics.Commit = pipeline.module.commitTime
-pi.worker.taskMetrics.Filestore = fs.client.
-pi.worker.taskMetrics.Framework = pipeline.module.executeAlgorithm.java.serializationTime,pipeline.module.executeAlgorithm.matlab.serializationTime
-pi.worker.taskMetrics.MatIO = pipeline.module.executeAlgorithm.matlab.readWriteMatfilesTime
-pi.worker.taskMetrics.categories = Filestore,Commit,Framework,Algorithm,MatIO
-
-# Used by ConfigurationServiceTest
-test.file.property = from.default.location
+ziggy.database.protocol =
+ziggy.default.jvm.args = -Dlog4j2.configurationFile=${ziggy.home.dir}/etc/log4j2.xml -Djava.library.path=${ziggy.home.dir}/lib
+ziggy.nickname.cluster = gov.nasa.ziggy.ui.ClusterController|cluster||
+ziggy.nickname.compute-node-master = gov.nasa.ziggy.module.ComputeNodeMaster||-XX:ParallelGCThreads=2 -XX:+UseParallelGC -XX:OnOutOfMemoryError="kill -QUIT %p"|
+ziggy.nickname.console = gov.nasa.ziggy.ui.ZiggyConsole|console|-Dsun.java2d.xrender=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Xmx2G|
+ziggy.nickname.dump-system-properties = gov.nasa.ziggy.services.config.DumpSystemProperties||-Denv.ziggy.home=${ziggy.home.dir}|
+ziggy.nickname.execsql = gov.nasa.ziggy.services.database.SqlRunner|||
+ziggy.nickname.export-parameters = gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli|||-export
+ziggy.nickname.export-pipelines = gov.nasa.ziggy.pipeline.definition.PipelineDefinitionCli|||-export
+ziggy.nickname.generate-manifest = gov.nasa.ziggy.data.management.Manifest|||
+ziggy.nickname.hsqlgui = org.hsqldb.util.DatabaseManagerSwing|||
+ziggy.nickname.import-events = gov.nasa.ziggy.services.events.ZiggyEventHandlerDefinitionImporter|||
+ziggy.nickname.import-parameters = gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli|||-import
+ziggy.nickname.import-pipelines = gov.nasa.ziggy.pipeline.definition.PipelineDefinitionCli|||-import
+ziggy.nickname.import-types = gov.nasa.ziggy.data.management.DataFileTypeImporter|||
+ziggy.nickname.metrics = gov.nasa.ziggy.metrics.report.MetricsCli|||
+ziggy.nickname.perf-report = gov.nasa.ziggy.metrics.report.PerformanceReport|||
+ziggy.test.file.property = from.default.location
diff --git a/gradle.properties b/gradle.properties
index c13f482..12e9483 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,10 @@ org.gradle.daemon = true
 org.gradle.jvmargs = -Xms256m -Xmx2048m
 org.gradle.parallel = true
 
-# Property for ziggy-dependencies directory relative to ziggy or $rootDir.
-# Because $rootDir can't be used in this context, this property is prefaced
-# by $rootDir in build.gradle.
-ziggyDependencies = buildSrc/build
+// The version is updated when the first release candidate is created
+// while following Release Branches in Appendix C of the SMP, Git
+// Workflow. This property is used when publishing Ziggy.
+version = 0.4.0
+
+// The Maven group for the published Ziggy libraries.
+group = gov.nasa
diff --git a/ide/ziggy-eclipse-clean-up.xml b/ide/ziggy-eclipse-clean-up.xml
index 45dc0a8..8de47d6 100644
--- a/ide/ziggy-eclipse-clean-up.xml
+++ b/ide/ziggy-eclipse-clean-up.xml
@@ -11,6 +11,7 @@
         <setting id="cleanup.add_missing_override_annotations" value="true"/>
         <setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
         <setting id="cleanup.add_serial_version_id" value="false"/>
+        <setting id="cleanup.also_simplify_lambda" value="true"/>
         <setting id="cleanup.always_use_blocks" value="true"/>
         <setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
         <setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
@@ -76,7 +77,7 @@
         <setting id="cleanup.push_down_negation" value="true"/>
         <setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
         <setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
-        <setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
+        <setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="false"/>
         <setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
         <setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
         <setting id="cleanup.reduce_indentation" value="true"/>
@@ -94,7 +95,7 @@
         <setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
         <setting id="cleanup.remove_unused_imports" value="true"/>
         <setting id="cleanup.remove_unused_local_variables" value="true"/>
-        <setting id="cleanup.remove_unused_method_parameters" value="true"/>
+        <setting id="cleanup.remove_unused_method_parameters" value="false"/>
         <setting id="cleanup.remove_unused_private_fields" value="true"/>
         <setting id="cleanup.remove_unused_private_members" value="false"/>
         <setting id="cleanup.remove_unused_private_methods" value="true"/>
@@ -110,6 +111,7 @@
         <setting id="cleanup.stringbuffer_to_stringbuilder" value="true"/>
         <setting id="cleanup.stringbuilder" value="true"/>
         <setting id="cleanup.stringbuilder_for_local_vars" value="true"/>
+        <setting id="cleanup.stringconcat_stringbuffer_stringbuilder" value="false"/>
         <setting id="cleanup.stringconcat_to_textblock" value="true"/>
         <setting id="cleanup.substring" value="true"/>
         <setting id="cleanup.switch" value="false"/>
diff --git a/ide/ziggy-eclipse-formatter.xml b/ide/ziggy-eclipse-formatter.xml
index 1bd5126..f62c5a2 100644
--- a/ide/ziggy-eclipse-formatter.xml
+++ b/ide/ziggy-eclipse-formatter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="22">
-    <profile kind="CodeFormatterProfile" name="Ziggy" version="22">
+<profiles version="23">
+    <profile kind="CodeFormatterProfile" name="Ziggy" version="23">
         <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
         <setting id="org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line" value="false"/>
@@ -41,6 +41,7 @@
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
@@ -59,7 +60,7 @@
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="-1"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
@@ -103,6 +104,7 @@
         <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
@@ -361,8 +363,8 @@
         <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="-1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="-1"/>
         <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
diff --git a/licenses/licenses.md b/licenses/licenses.md
index b0b3c43..a8b2eb8 100644
--- a/licenses/licenses.md
+++ b/licenses/licenses.md
@@ -39,6 +39,7 @@ This file lists the third-party software that is used by Ziggy. Links to the sof
 |[jfreechart](https://www.jfree.org/jfreechart/) [(docs)](https://www.jfree.org/jfreechart/javadoc/index.html) [(license)](org.jfree--jfreechart--1.0.x)|||
 |[jgoodies-forms](https://www.jgoodies.com/freeware/libraries/forms/) [(docs)](https://javadoc.io/doc/com.jgoodies/jgoodies-forms/latest/index.html) [(license)](com.jgoodies--jgoodies-forms--1.9.x)|||
 |[jgoodies-looks](https://www.jgoodies.com/freeware/libraries/looks/) [(docs)](https://javadoc.io/doc/com.jgoodies/jgoodies-looks/latest/index.html) [(license)](com.jgoodies--jgoodies-looks--2.7.x)|||
+|[jsoup](https://jsoup.org/) [(docs)](https://jsoup.org/apidocs/) [(license)](org.jsoup--jsoup--1.16.x)|||
 |[junit](https://junit.org/junit4/) [(docs)](https://junit.org/junit4/javadoc/latest/index.html) [(license)](junit--junit--4.x)|SWE-062|TestNG|
 |[l2fprod-properties-editor](https://bitbucket.org/trosorg/l2fprod-properties-editor/src/master/) [(docs)](https://bitbucket.org/trosorg/l2fprod-properties-editor/src/master/) [(license)](org.tros--l2fprod-properties-editor--1.3.x)|||
 |[log4j-api](https://logging.apache.org/log4j/2.x/index.html) [(docs)](https://logging.apache.org/log4j/2.x/manual/index.html) [(license)](org.apache.logging.log4j--log4j-api--2.19.x)|||
diff --git a/licenses/org.jsoup--jsoup--1.16.x b/licenses/org.jsoup--jsoup--1.16.x
new file mode 100644
index 0000000..4980e65
--- /dev/null
+++ b/licenses/org.jsoup--jsoup--1.16.x
@@ -0,0 +1,25 @@
+jsoup License
+The jsoup code-base (including source and compiled packages) are
+distributed under the open source MIT license as described below.
+
+The MIT License
+Copyright © 2009 - 2023 Jonathan Hedley (https://jsoup.org/)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+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 AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/sample-pipeline/config-extra/pd-sample.xml b/sample-pipeline/config-extra/pd-sample.xml
index 31621de..4cb8121 100644
--- a/sample-pipeline/config-extra/pd-sample.xml
+++ b/sample-pipeline/config-extra/pd-sample.xml
@@ -10,7 +10,7 @@ and outputs, information about models, and parameter sets. Enjoy! -->
 
   <!-- Pipeline modules. The name of each module must correspond to the name of
        a program that can execute from the command line; the program has to be on
-       the path set by property pi.worker.moduleExe.binPath. -->
+       the path set by property ziggy.pipeline.binPath. -->
   <module name="permuter" description="Color Permuter"/>
   <module name="flip" description="Flip Up-Down and Left-Right"/>
   <module name="averaging" description="Average Images Together"/>
diff --git a/sample-pipeline/config/pd-sample.xml b/sample-pipeline/config/pd-sample.xml
index 65c55f1..8243d9d 100644
--- a/sample-pipeline/config/pd-sample.xml
+++ b/sample-pipeline/config/pd-sample.xml
@@ -10,7 +10,7 @@ and outputs, information about models, and parameter sets. Enjoy! -->
 
   <!-- Pipeline modules. The name of each module must correspond to the name of
        a program that can execute from the command line; the program has to be on
-       the path set by property pi.worker.moduleExe.binPath. -->
+       the path set by property ziggy.pipeline.binPath. -->
   <module name="permuter" description="Color Permuter"/>
   <module name="flip" description="Flip Up-Down and Left-Right"/>
   <module name="averaging" description="Average Images Together"/>
diff --git a/sample-pipeline/config/pe-sample.xml b/sample-pipeline/config/pe-sample.xml
index 5f473a3..0900b0e 100644
--- a/sample-pipeline/config/pe-sample.xml
+++ b/sample-pipeline/config/pe-sample.xml
@@ -4,6 +4,6 @@
 
   <pipelineEvent name="data-receipt" pipelineName="sample"
 		 enableOnClusterStart="false"
-		 directory="${data.receipt.dir}"/>
+		 directory="${ziggy.pipeline.data.receipt.dir}"/>
 
 </pipelineEventDefinition>
diff --git a/sample-pipeline/etc/sample.properties b/sample-pipeline/etc/sample.properties
index 0e9eeaa..63939be 100644
--- a/sample-pipeline/etc/sample.properties
+++ b/sample-pipeline/etc/sample.properties
@@ -1,30 +1,33 @@
-data.receipt.dir = ${pipeline.results.dir}/data-receipt
-database.connections = 100
-database.dir = ${pipeline.results.dir}/pg
-database.host = localhost
-database.name = majortom
-database.port = 5438
-database.software.name = postgresql
-datastore.root.dir = ${pipeline.results.dir}/datastore
-hibernate.connection.username=${env:USER}
+hibernate.connection.password =
+hibernate.connection.username = sa
 java.home=${env:JAVA_HOME}
-moduleExe.memdrone.enabled = false
-moduleExe.memdrone.sleepSeconds = 10
-moduleExe.useSymlinks = true
-pi.moduleExe.environment = ZIGGY_HOME=${env:ZIGGY_HOME}
-pi.worker.heapSize = 12000
-pi.worker.moduleExe.binPath = ${env:JAVA_HOME}/bin:/bin:/usr/bin
-pi.worker.threadCount = 2
-pipeline.definition.dir = ${pipeline.root.dir}/config
-pipeline.home.dir = ${pipeline.root.dir}/build
-pipeline.logoFile = ${ziggy.home.dir}/resources/main/images/nasa-logo.png
-pipeline.results.dir = ${pipeline.home.dir}/pipeline-results
 pipeline.root.dir = ${ziggy.root}/sample-pipeline
-remote.cluster.name = nas
-remote.group = phony
-remote.host = phony
-remote.user = phony
-rmi.registry.port = 1099
 ziggy.config.path = ${ziggy.home.dir}/etc/ziggy.properties
+ziggy.database.connections = 100
+ziggy.database.dir = ${ziggy.pipeline.results.dir}/db
+ziggy.database.host = localhost
+ziggy.database.name = majortom
+ziggy.database.port = 9001
+ziggy.database.protocol = hsql:
+ziggy.database.schema.dir = ${ziggy.home.dir}/schema
+ziggy.database.software.name = hsqldb
 ziggy.home.dir = ${ziggy.root}/build
-ziggy.root = ${env:ZIGGY_ROOT}
\ No newline at end of file
+ziggy.logoFile = ${ziggy.home.dir}/resources/main/images/nasa-logo.png
+ziggy.pipeline.binPath = ${env:JAVA_HOME}/bin:/bin:/usr/bin
+ziggy.pipeline.data.receipt.dir = ${ziggy.pipeline.results.dir}/data-receipt
+ziggy.pipeline.datastore.dir = ${ziggy.pipeline.results.dir}/datastore
+ziggy.pipeline.definition.dir = ${pipeline.root.dir}/config
+ziggy.pipeline.environment = ZIGGY_HOME=${env:ZIGGY_HOME}
+ziggy.pipeline.home.dir = ${pipeline.root.dir}/build
+ziggy.pipeline.memdrone.enabled = false
+ziggy.pipeline.memdrone.sleepSeconds = 10
+ziggy.pipeline.results.dir = ${ziggy.pipeline.home.dir}/pipeline-results
+ziggy.pipeline.useSymlinks = true
+ziggy.remote.cluster.name = nas
+ziggy.remote.group = phony
+ziggy.remote.host = phony
+ziggy.remote.user = phony
+ziggy.root = ${env:ZIGGY_ROOT}
+ziggy.worker.count = 2
+ziggy.worker.heapSize = 12000
+ziggy.worker.port = 1099
diff --git a/sample-pipeline/src/main/python/major_tom/averaging.py b/sample-pipeline/src/main/python/major_tom/averaging.py
index ec4959b..4a39be2 100644
--- a/sample-pipeline/src/main/python/major_tom/averaging.py
+++ b/sample-pipeline/src/main/python/major_tom/averaging.py
@@ -25,7 +25,7 @@
         # Read inputs: note that the inputs contain the names of all the files
         # that are to be used in this process, as well as model names and 
         # parameters. All files are in the working directory. 
-        inputs = hdf5_module_interface.read_file("averaging-inputs-0.h5")
+        inputs = hdf5_module_interface.read_file("averaging-inputs.h5")
         data_files = inputs.dataFilenames
         parameters = inputs.moduleParameters.Algorithm_Parameters
         models = inputs.modelFilenames
diff --git a/sample-pipeline/src/main/python/major_tom/flip.py b/sample-pipeline/src/main/python/major_tom/flip.py
index d2d26bd..a2f13a4 100644
--- a/sample-pipeline/src/main/python/major_tom/flip.py
+++ b/sample-pipeline/src/main/python/major_tom/flip.py
@@ -25,7 +25,7 @@
         # Read inputs: note that the inputs contain the names of all the files
         # that are to be used in this process, as well as model names and 
         # parameters. All files are in the working directory. 
-        inputs = hdf5_module_interface.read_file("flip-inputs-0.h5")
+        inputs = hdf5_module_interface.read_file("flip-inputs.h5")
         data_file = inputs.dataFilenames
         parameters = inputs.moduleParameters.Algorithm_Parameters
         models = inputs.modelFilenames
diff --git a/sample-pipeline/src/main/python/major_tom/permuter.py b/sample-pipeline/src/main/python/major_tom/permuter.py
index d520693..fe28c0f 100644
--- a/sample-pipeline/src/main/python/major_tom/permuter.py
+++ b/sample-pipeline/src/main/python/major_tom/permuter.py
@@ -25,7 +25,7 @@
         # Read inputs: note that the inputs contain the names of all the files
         # that are to be used in this process, as well as model names and 
         # parameters. All files are in the working directory. 
-        inputs = hdf5_module_interface.read_file("permuter-inputs-0.h5")
+        inputs = hdf5_module_interface.read_file("permuter-inputs.h5")
         data_file = inputs.dataFilenames
         parameters = inputs.moduleParameters.Algorithm_Parameters
         models = inputs.modelFilenames
diff --git a/script-plugins/copy-hdf5.gradle b/script-plugins/copy-hdf5.gradle
deleted file mode 100644
index cf09e88..0000000
--- a/script-plugins/copy-hdf5.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-task copyHdf5Lib(type: Copy) {
-    from(file("$ziggyDependencies/lib")) {
-        include "*hdf5*"
-    }
-    into "$buildDir/lib"
-}
-
-assemble.dependsOn copyHdf5Lib
-
-task copyHdf5Libs(type: Copy) {
-    from(file("$ziggyDependencies/lib")) {
-        include "jarhdf5-1.12.2.jar"
-    }
-    into "$buildDir/libs"
-}
-
-assemble.dependsOn copyHdf5Libs
diff --git a/script-plugins/copy.gradle b/script-plugins/copy.gradle
index 4af0064..fe7c7f0 100644
--- a/script-plugins/copy.gradle
+++ b/script-plugins/copy.gradle
@@ -1,24 +1,25 @@
-task copySh(type: Copy) {
+task copyPrograms(type: Copy) {
     from(fileTree("src/main/sh").files) {
         include('*.sh')
         rename('(.+)\\.sh$', '$1')
-        fileMode(0755)
     }
-    into "$buildDir/bin"
-}
-
-assemble.dependsOn copySh
-
-task copyPerl(type: Copy) {
     from(fileTree("src/main/perl").files) {
         include('*.pl')
         rename('(.+)\\.pl$', '$1')
-        fileMode(0755)
     }
+    fileMode(0755)
     into "$buildDir/bin"
 }
 
-assemble.dependsOn copyPerl
+assemble.dependsOn copyPrograms
+
+task copyMatlab(type: Copy) {
+    from("src/main/matlab")
+    include("**/*.m")
+    into "$buildDir/src/main/matlab"
+}
+
+assemble.dependsOn copyMatlab
 
 task copyEtc(type: Copy) {
     from("$projectDir/etc")
@@ -26,8 +27,19 @@ task copyEtc(type: Copy) {
 }
 
 assemble.dependsOn copyEtc
+test.dependsOn copyEtc
+
+task copyBuildSrc(type: Copy) {
+    from("$rootDir/buildSrc/build/repository")
+    into "$buildDir/repository"
+}
+
+assemble.dependsOn copyBuildSrc
 
-task copyLibs(type: Copy) {
+// Any task that depends on $buildDir/libs should depend on this task.
+// This task depends on all tasks that populate $buildDir/libs.
+// The relative path to testJar is used because it hasn't been defined yet.
+task copyLibs(type: Copy, dependsOn: [copyOutsideLibs, jar, 'testJar', sourcesJar]) {
     from(configurations.runtimeClasspath) {
         fileMode(0644)
     }
diff --git a/script-plugins/database-schemas.gradle b/script-plugins/database-schemas.gradle
index 3d5c7b2..ac02061 100644
--- a/script-plugins/database-schemas.gradle
+++ b/script-plugins/database-schemas.gradle
@@ -1,16 +1,22 @@
 // The logging.captureStandard* settings squelch Hibernate's output. Use gradle --info to see it.
 
-task generateHsqldbCreateScript(type: JavaExec, dependsOn: [jar, copyLibs, copyHdf5Libs]) {
-    inputs.dir "$projectDir/build/libs"
-    outputs.dir "$projectDir/build/schema"
-    outputs.file "$projectDir/build/schema/ddl.hsqldb-create.sql"
+// TODO Disable connection pooling altogether
+// While the HSQLDB memory database allows the tasks to run, it is 10
+// seconds slower then running without a connection pool. Find a
+// property that will disable connection pooling and use it instead of
+// hibernate.connection.url.
+
+task generateHsqldbCreateScript(type: JavaExec, dependsOn: copyLibs) {
+    inputs.dir "$buildDir/libs"
+    outputs.dir "$buildDir/schema"
+    outputs.file "$buildDir/schema/ddl.hsqldb-create.sql"
 
     mainClass.set("gov.nasa.ziggy.services.database.ZiggySchemaExport")
-    classpath fileTree(dir: "$projectDir/build/libs", include: "*.jar")
-    jvmArgs "-Dhibernate.connection.driver_class=org.hsqldb.jdbcDriver",
-        "-Dhibernate.dialect=org.hibernate.dialect.HSQLDialect", "-Dhibernate.jdbc.batch_size=0",
-        "-Dlog4j2.configurationFile=$rootDir/etc/log4j2.xml"
-    args "--create", "--output=$projectDir/build/schema/ddl.hsqldb-create.sql"
+    classpath fileTree(dir: "$buildDir/libs", include: "*.jar")
+    jvmArgs "-Dhibernate.dialect=org.hibernate.dialect.HSQLDialect",
+        "-Djava.library.path=$outsideDir/lib",
+        "-Dhibernate.connection.url=jdbc:hsqldb:mem:test"
+    args "--create", "--output=$buildDir/schema/ddl.hsqldb-create.sql"
 
     logging.captureStandardOutput LogLevel.INFO
     logging.captureStandardError LogLevel.INFO
@@ -19,17 +25,17 @@ task generateHsqldbCreateScript(type: JavaExec, dependsOn: [jar, copyLibs, copyH
 test.dependsOn generateHsqldbCreateScript
 assemble.dependsOn generateHsqldbCreateScript
 
-task generateHsqldbDropScript(type: JavaExec, dependsOn: [jar, copyLibs, copyHdf5Libs]) {
-    inputs.dir "$projectDir/build/libs"
-    outputs.dir "$projectDir/build/schema"
-    outputs.file "$projectDir/build/schema/ddl.hsqldb-drop.sql"
+task generateHsqldbDropScript(type: JavaExec, dependsOn: copyLibs) {
+    inputs.dir "$buildDir/libs"
+    outputs.dir "$buildDir/schema"
+    outputs.file "$buildDir/schema/ddl.hsqldb-drop.sql"
 
     mainClass.set("gov.nasa.ziggy.services.database.ZiggySchemaExport")
-    classpath fileTree(dir: "$projectDir/build/libs", include: "*.jar")
-    jvmArgs "-Dhibernate.connection.driver_class=org.hsqldb.jdbcDriver",
-        "-Dhibernate.dialect=org.hibernate.dialect.HSQLDialect", "-Dhibernate.jdbc.batch_size=0",
-        "-Dlog4j2.configurationFile=$rootDir/etc/log4j2.xml"
-    args "--drop", "--output=$projectDir/build/schema/ddl.hsqldb-drop.sql"
+    classpath fileTree(dir: "$buildDir/libs", include: "*.jar")
+    jvmArgs "-Dhibernate.dialect=org.hibernate.dialect.HSQLDialect",
+        "-Djava.library.path=$outsideDir/lib",
+        "-Dhibernate.connection.url=jdbc:hsqldb:mem:test"
+    args "--drop", "--output=$buildDir/schema/ddl.hsqldb-drop.sql"
 
     logging.captureStandardOutput LogLevel.INFO
     logging.captureStandardError LogLevel.INFO
@@ -38,17 +44,17 @@ task generateHsqldbDropScript(type: JavaExec, dependsOn: [jar, copyLibs, copyHdf
 test.dependsOn generateHsqldbDropScript
 assemble.dependsOn generateHsqldbDropScript
 
-task generatePostgresqlCreateScript(type: JavaExec, dependsOn: [jar, copyLibs, copyHdf5Libs]) {
-    inputs.dir "$projectDir/build/libs"
-    outputs.dir "$projectDir/build/schema"
-    outputs.file "$projectDir/build/schema/ddl.postgresql-create.sql"
+task generatePostgresqlCreateScript(type: JavaExec, dependsOn: copyLibs) {
+    inputs.dir "$buildDir/libs"
+    outputs.dir "$buildDir/schema"
+    outputs.file "$buildDir/schema/ddl.postgresql-create.sql"
 
     mainClass.set("gov.nasa.ziggy.services.database.ZiggySchemaExport")
-    classpath fileTree(dir: "$projectDir/build/libs", include: "*.jar")
-    jvmArgs "-Dhibernate.connection.driver_class=org.postgresql.Driver",
-        "-Dhibernate.dialect=org.hibernate.dialect.PostgreSQLDialect",
-        "-Dlog4j2.configurationFile=$rootDir/etc/log4j2.xml"
-    args "--create", "--output=$projectDir/build/schema/ddl.postgresql-create.sql"
+    classpath fileTree(dir: "$buildDir/libs", include: "*.jar")
+    jvmArgs "-Dhibernate.dialect=org.hibernate.dialect.PostgreSQLDialect",
+        "-Djava.library.path=$outsideDir/lib",
+        "-Dhibernate.connection.url=jdbc:hsqldb:mem:test"
+    args "--create", "--output=$buildDir/schema/ddl.postgresql-create.sql"
 
     logging.captureStandardOutput LogLevel.INFO
     logging.captureStandardError LogLevel.INFO
@@ -56,17 +62,17 @@ task generatePostgresqlCreateScript(type: JavaExec, dependsOn: [jar, copyLibs, c
 
 assemble.dependsOn generatePostgresqlCreateScript
 
-task generatePostgresqlDropScript(type: JavaExec, dependsOn: [jar, copyLibs, copyHdf5Libs]) {
-    inputs.dir "$projectDir/build/libs"
-    outputs.dir "$projectDir/build/schema"
-    outputs.file "$projectDir/build/schema/ddl.postgresql-drop.sql"
+task generatePostgresqlDropScript(type: JavaExec, dependsOn: copyLibs) {
+    inputs.dir "$buildDir/libs"
+    outputs.dir "$buildDir/schema"
+    outputs.file "$buildDir/schema/ddl.postgresql-drop.sql"
 
     mainClass.set("gov.nasa.ziggy.services.database.ZiggySchemaExport")
-    classpath fileTree(dir: "$projectDir/build/libs", include: "*.jar")
-    jvmArgs "-Dhibernate.connection.driver_class=org.postgresql.Driver",
-        "-Dhibernate.dialect=org.hibernate.dialect.PostgreSQLDialect",
-        "-Dlog4j2.configurationFile=$rootDir/etc/log4j2.xml"
-    args "--drop", "--output=$projectDir/build/schema/ddl.postgresql-drop.sql"
+    classpath fileTree(dir: "$buildDir/libs", include: "*.jar")
+    jvmArgs  "-Dhibernate.dialect=org.hibernate.dialect.PostgreSQLDialect",
+        "-Djava.library.path=$outsideDir/lib",
+        "-Dhibernate.connection.url=jdbc:hsqldb:mem:test"
+    args "--drop", "--output=$buildDir/schema/ddl.postgresql-drop.sql"
 
     logging.captureStandardOutput LogLevel.INFO
     logging.captureStandardError LogLevel.INFO
diff --git a/script-plugins/eclipse.gradle b/script-plugins/eclipse.gradle
index adfed87..956e780 100644
--- a/script-plugins/eclipse.gradle
+++ b/script-plugins/eclipse.gradle
@@ -15,7 +15,7 @@ eclipse {
             entries.each { entry ->
                 if (entry.kind == "src" && entry.hasProperty("output")) {
                     // The use of $buildDir does not return build.
-                    entry.output = entry.output.replace("bin", "build/eclipse")
+                    entry.output = entry.output.replace("bin/", "build/eclipse/")
                 }
             }
         }
@@ -31,7 +31,12 @@ eclipse {
             // TODO Get the following pseudocode to work to avoid hardcoding path
             //File jar = findFileInConfiguration(configurations.runtime, 'jarhdf5-1.12.2')
             //hdf5.setNativeLibraryLocation(jar.getParent())
-            hdf5.setNativeLibraryLocation("$ziggyDependencies/lib")
+            hdf5.setNativeLibraryLocation("$outsideDir/lib")
+        }
+
+        // Add the JPA metamodel directory compiled by Gradle to the Eclipse classpath.
+        file.withXml { xml ->
+            xml.asNode().appendNode("classpathentry", [ kind: "src", path: "build/generated/sources/annotationProcessor/java/main" ])
         }
     }
 }
diff --git a/script-plugins/gcc.gradle b/script-plugins/gcc.gradle
deleted file mode 100644
index c6ddf4e..0000000
--- a/script-plugins/gcc.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-// Default C / C++ options for regular and mexfile builds that can be
-// overridden in build.gradle files.
-
-ext.defaultCppCompileOptions = ["Wall", "fPIC", "std=c++11"];
-ext.defaultCppReleaseOptimizations = ["O2", "DNDEBUG", "g"];
-ext.defaultCppDebugOptimizations = ["Og", "g"];
-ext.defaultCppMexCompileOptions = ["Wall", "fPIC", "std=c++11", "D_GNU_SOURCE", "fexceptions",
-                                   "fno-omit-frame-pointer", "pthread", "fno-reorder-blocks", "fstack-protector-all",
-                                   "fpermissive"]
-ext.defaultCppMexReleaseOptimizations = ["O2", "DNDEBUG", "g"]
-ext.defaultCppMexDebugOptimizations = ["Og", "g"]
-ext.defaultCppMexLinkOptions = ["lstdc++"]
-
diff --git a/script-plugins/hdf5.gradle b/script-plugins/hdf5.gradle
index cf09e88..586c040 100644
--- a/script-plugins/hdf5.gradle
+++ b/script-plugins/hdf5.gradle
@@ -1,17 +1,72 @@
-task copyHdf5Lib(type: Copy) {
-    from(file("$ziggyDependencies/lib")) {
-        include "*hdf5*"
+// Download and build HDF5.
+
+ext.hdf5Version = "1.12.2"
+
+task buildHdf5() {
+    def tmp = file("$outsideDir/tmp/hdf5")
+    def hdf5 = file("$tmp/hdf5-$hdf5Version")
+    def lib = file("$outsideDir/lib")
+
+    outputs.file "$rootDir/outside/lib/jarhdf5-${hdf5Version}.jar"
+
+    doLast() {
+        tmp.mkdirs()
+
+        // Use the SHA256 links at https://www.hdfgroup.org/downloads/hdf5/source-code/ to determine the URL.
+        exec {
+            workingDir tmp
+            commandLine "curl", "--remote-name", "https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF5/HDF5_1_12_2/source/hdf5-1.12.2.tar.bz2"
+        }
+        exec {
+            workingDir tmp
+            commandLine "curl", "--remote-name", "https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF5/HDF5_1_12_2/source/hdf5-1.12.2.sha256"
+        }
+        exec {
+            workingDir tmp
+            commandLine "tar", "-xf", "hdf5-${hdf5Version}.tar.bz2"
+        }
+        exec {
+            workingDir hdf5
+            commandLine "sh", "-c", "./configure --with-zlib=/usr --prefix=$outsideDir --enable-threadsafe --with-pthread=/usr --enable-unsupported --enable-java"
+        }
+        exec {
+            workingDir hdf5
+            commandLine "make"
+        }
+        exec {
+            workingDir hdf5
+            commandLine "make", "install"
+        }
+        copy {
+            from("$tmp/lib") {
+                include "*.jar"
+            }
+            into "$lib"
+        }
+    }
+}
+
+task copyHdf5Lib(type: Copy, dependsOn: buildHdf5) {
+    from(file("$outsideDir/lib")) {
+        include "libhdf5*"
     }
     into "$buildDir/lib"
 }
 
 assemble.dependsOn copyHdf5Lib
 
-task copyHdf5Libs(type: Copy) {
-    from(file("$ziggyDependencies/lib")) {
-        include "jarhdf5-1.12.2.jar"
+task copyHdf5Libs(type: Copy, dependsOn: buildHdf5) {
+    from(file("$outsideDir/lib")) {
+        include "jarhdf5-*.jar"
     }
-    into "$buildDir/libs"
+    into "$outsideGroupDir"
 }
 
-assemble.dependsOn copyHdf5Libs
+copyOutsideLibs.dependsOn copyHdf5Libs
+
+task copyHdf5Inc(type: Copy, dependsOn: buildHdf5) {
+    from(file("$outsideDir/include")) {
+        include "*"
+    }
+    into "$buildDir/include"
+}
diff --git a/script-plugins/matlab.gradle b/script-plugins/matlab.gradle
deleted file mode 100644
index c5605c5..0000000
--- a/script-plugins/matlab.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-ext.generatedSrcMatlabDir = file("$buildDir/src/main/matlab")
-
-task makeMatlabDirs {
-    outputs.dir generatedSrcMatlabDir
-    doLast() {
-        generatedSrcMatlabDir.mkdirs()
-    }
-}
-
-assemble.dependsOn makeMatlabDirs
-
-// All MATLAB source files. Use sourceSets.main.allJava for all Java files.
-ext.allMatlab = fileTree(dir: "src/main/matlab").matching {
-    include "**/*.m"
-}
-
-ext.allMatlabProxy = fileTree(dir: "$buildDir/src/main/matlab").matching {
-    include "**/*.m"
-}
diff --git a/script-plugins/misc.gradle b/script-plugins/misc.gradle
index f3106e5..a3b3a73 100644
--- a/script-plugins/misc.gradle
+++ b/script-plugins/misc.gradle
@@ -4,20 +4,26 @@ task allDeps(type: DependencyReportTask) {}
 // Generate the Ziggy version information.
 import gov.nasa.ziggy.buildutil.ZiggyVersionGenerator
 
+def gitVersion = new ByteArrayOutputStream()
+exec {
+    commandLine "git", "rev-parse", "HEAD"
+    standardOutput = gitVersion
+}
+gitVersion = gitVersion.toString().trim()
+
 task ziggyVersion(type: ZiggyVersionGenerator) {
-    outputFile = file("$buildDir/src/main/java/gov/nasa/ziggy/util/ZiggyVersion.java")
-    // TODO Add a development property to suppress false upToDateWhen setting
-    // It causes the world to recompile.
-    outputs.upToDateWhen{false}
+    inputs.property "ziggyVersion", gitVersion
 }
 
-sourceSets.main.java.srcDir file("$buildDir/src/main/java")
-compileJava.dependsOn ziggyVersion
+processResources.dependsOn ziggyVersion
+compileTestJava.dependsOn processResources
+integrationTest.dependsOn processResources
+sourcesJar.dependsOn processResources
 
 clean.doFirst() {
-    File workerPidFile = new File("build/bin/worker.pid");
-    if (workerPidFile.isFile()) {
-	throw new GradleException("Can't clean while cluster is running (see build/bin/worker.pid)")
+    File supervisorPidFile = new File("$buildDir/bin/supervisor.pid");
+    if (supervisorPidFile.isFile()) {
+        throw new GradleException("Can't clean while cluster is running (run \"ziggy cluster stop\" to clear build/bin/supervisor.pid)")
     }
 }
 
diff --git a/script-plugins/publish.gradle b/script-plugins/publish.gradle
new file mode 100644
index 0000000..49658f7
--- /dev/null
+++ b/script-plugins/publish.gradle
@@ -0,0 +1,146 @@
+// Publish ziggy.jar (with "gradle publish") to build/repository/ziggy so
+// that other projects can easily access it (and its dependencies).
+// See also $rootDir/buildSrc/build.gradle.
+
+// Produces artifact for publishing tests.
+task testJar(type: Jar, dependsOn: testClasses) {
+    from sourceSets.test.output
+    archiveAppendix = "test"
+}
+
+publishing {
+    publications {
+        ziggy(MavenPublication) {
+            groupId group
+            from components.java
+            version version
+
+            // Maven doesn't understand 2.17.+ notation.
+            suppressPomMetadataWarningsFor('runtimeElements')
+
+            pom {
+                name = 'Ziggy'
+                description = 'A portable, scalable infrastructure for science data processing pipelines'
+                url = 'https://github.com/nasa/ziggy'
+                licenses {
+                    license {
+                        name = 'NASA Open Source Agreement Version 1.3'
+                        url = 'https://github.com/nasa/ziggy/blob/main/LICENSE.pdf'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'quarkpt'
+                        name = 'Peter Tenenbaum'
+                        email = 'Peter.Tenenbaum@nasa.gov'
+                    }
+                    developer {
+                        id = 'wohler'
+                        name = 'Bill Wohler'
+                        email = 'Bill.Wohler@nasa.gov'
+                    }
+                }
+                scm {
+                    connection = 'scm:git:https://github.com/nasa/ziggy.git'
+                    developerConnection = 'scm:git:git@github.com:nasa/ziggy.git'
+                    url = 'https://github.com/nasa/ziggy'
+                }
+            }
+        }
+
+        ziggyTest(MavenPublication) {
+            groupId group
+            artifactId "${project.name}-test"
+            artifact testJar
+            version version
+
+            // Maven doesn't understand 2.17.+ notation.
+            suppressPomMetadataWarningsFor('runtimeElements')
+
+            pom {
+                name = 'Ziggy Test'
+                description = 'Ziggy test fixtures'
+                url = 'https://github.com/nasa/ziggy'
+                licenses {
+                    license {
+                        name = 'NASA Open Source Agreement Version 1.3'
+                        url = 'https://github.com/nasa/ziggy/blob/main/LICENSE.pdf'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'quarkpt'
+                        name = 'Peter Tenenbaum'
+                        email = 'Peter.Tenenbaum@nasa.gov'
+                    }
+                    developer {
+                        id = 'wohler'
+                        name = 'Bill Wohler'
+                        email = 'Bill.Wohler@nasa.gov'
+                    }
+                }
+                scm {
+                    connection = 'scm:git:https://github.com/nasa/ziggy.git'
+                    developerConnection = 'scm:git:git@github.com:nasa/ziggy.git'
+                    url = 'https://github.com/nasa/ziggy'
+                }
+            }
+        }
+
+        hdf5(MavenPublication) {
+            groupId "$outsideGroup"
+            artifactId "jarhdf5"
+            artifact "${outsideGroupDir}/jarhdf5-${hdf5Version}.jar"
+            version "$hdf5Version"
+            pom {
+                name = 'HDF5'
+                description = 'HDF5'
+                url = 'https://www.hdfgroup.org/downloads/hdf5/'
+            }
+        }
+
+        wrapper(MavenPublication) {
+            groupId "$outsideGroup"
+            artifactId "wrapper"
+            artifact "${outsideGroupDir}/wrapper-${wrapperVersion}.jar"
+            version "$wrapperVersion"
+            pom {
+                name = 'Wrapper'
+                description = 'Java Service Wrapper'
+                url = 'https://wrapper.tanukisoftware.com/doc/english/home.html'
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            name = 'Ziggy'
+            url = layout.buildDirectory.dir("repository")
+        }
+    }
+}
+
+// Work around implicit dependency issues with MavenPublication.
+afterEvaluate {
+    tasks.named("generateMetadataFileForZiggyPublication") {
+        dependsOn("copyLibs")
+    }
+    tasks.named("publishZiggyPublicationToZiggyRepository") {
+        dependsOn("copyLibs")
+    }
+    tasks.named("publishZiggyTestPublicationToZiggyRepository") {
+        dependsOn("copyLibs")
+    }
+    tasks.named("publishHdf5PublicationToZiggyRepository") {
+        dependsOn("copyLibs")
+    }
+    tasks.named("publishWrapperPublicationToZiggyRepository") {
+        dependsOn("copyLibs")
+    }
+}
+
+// Ensure all artifacts are available to clients after running the
+// publish task, and ensure that the build task publishes as well.
+publish.dependsOn copyBuildSrc
+publish.dependsOn assemble
+build.dependsOn publish
diff --git a/script-plugins/test.gradle b/script-plugins/test.gradle
index d0b0fa7..834029d 100644
--- a/script-plugins/test.gradle
+++ b/script-plugins/test.gradle
@@ -13,6 +13,9 @@ task generateTestProg(type: Exec) {
     workingDir = "$projectDir/src/test/cpp/ExternalProcess"
     commandLine = [ "sh", "-c", "make -e" ]
     System.setProperty("OUTDIR", "$binDir")
+
+    logging.captureStandardOutput LogLevel.INFO
+    logging.captureStandardError LogLevel.INFO
 }
 
 compileTestJava.dependsOn generateTestProg
diff --git a/script-plugins/wrapper.gradle b/script-plugins/wrapper.gradle
index f4b4086..b3ddaba 100644
--- a/script-plugins/wrapper.gradle
+++ b/script-plugins/wrapper.gradle
@@ -1,5 +1,79 @@
-task copyWrapper(type: Copy) {
-    from(file("$ziggyDependencies/bin")) {
+// Download and build the wrapper.
+
+ext.wrapperVersion = "3.5.51"
+
+task buildWrapper() {
+    def tmp = file("$outsideDir/tmp/wrapper")
+    def bin = file("$outsideDir/bin")
+    def lib = file("$outsideDir/lib")
+    def format = ""
+    def libSuffixOriginal = ""
+    def libSuffixFinal = ""
+
+    // There's a peculiar problem with wrapper, to wit: The Mac OS
+    // "universal" tarball ships with a shared object that has suffix
+    // .jnilib . The M1 tarball ships with a shared object with
+    // .dylib. Meanwhile, it seems that at least some JVM
+    // implementations no longer accept the .jnilib suffix, and the
+    // suggested fix (per the internet) is to rename them to have the
+    // .dylib suffix. As far as can be tested, the following formalism
+    // will address all these issues correctly.
+    String opSys = System.getProperty("os.name").toLowerCase();
+    String arch = System.getProperty("os.arch").toLowerCase();
+    if (opSys.contains("linux")) {
+        format = "linux-x86-64"
+        libSuffixOriginal = "so"
+        libSuffixFinal = "so"
+    } else if (opSys.contains("mac")) {
+        if (arch.contains("aarch")) {
+            format = "macosx-arm-64"
+            libSuffixOriginal = "dylib"
+            libSuffixFinal = "dylib"
+        } else {
+            format = "macosx-universal-64"
+            libSuffixOriginal = "jnilib"
+            libSuffixFinal = "dylib"
+        }
+    }
+    def wrapperBaseName = "wrapper-$format-$wrapperVersion"
+    def wrapperDir = file("$tmp/$wrapperBaseName")
+    def wrapperLib = "libwrapper.$libSuffixOriginal"
+
+    outputs.file "$bin/wrapper"
+    outputs.file "$lib/$wrapperLib.$libSuffixFinal"
+    outputs.file "$lib/wrapper.jar"
+
+    doLast() {
+        tmp.mkdirs()
+
+        // See https://wrapper.tanukisoftware.com/doc/english/versions.jsp to determine the URL.
+        exec {
+            workingDir tmp
+            commandLine "curl", "-o", "wrapper-${wrapperVersion}.tar.gz", "https://download.tanukisoftware.com/wrapper/$wrapperVersion/${wrapperBaseName}.tar.gz"
+        }
+        exec {
+            workingDir tmp
+            commandLine "tar", "-xf", "wrapper-${wrapperVersion}.tar.gz"
+        }
+        copy {
+            from("$wrapperDir/bin") {
+                include "wrapper"
+            }
+            into "$bin"
+        }
+        copy {
+            from("$wrapperDir/lib") {
+                include "$wrapperLib", "wrapper.jar"
+            }
+            into "$lib"
+            rename ("$wrapperLib", "libwrapper.$libSuffixFinal")
+            rename ("wrapper.jar", "wrapper-${wrapperVersion}.jar")
+        }
+    }
+}
+
+task copyWrapper(type: Copy, dependsOn: buildWrapper) {
+    from(file("$outsideDir/bin")) {
         include "wrapper"
     }
     into "$buildDir/bin"
@@ -7,11 +81,20 @@ task copyWrapper(type: Copy) {
 
 assemble.dependsOn copyWrapper
 
-task copyWrapperLibs(type: Copy) {
-    from(file("$ziggyDependencies/lib")) {
+task copyWrapperLib(type: Copy, dependsOn: buildWrapper) {
+    from(file("$outsideDir/lib")) {
         include "libwrapper.*"
     }
     into "$buildDir/lib"
 }
 
-assemble.dependsOn copyWrapperLibs
+assemble.dependsOn copyWrapperLib
+
+task copyWrapperLibs(type: Copy, dependsOn: buildWrapper) {
+    from(file("$outsideDir/lib")) {
+        include "wrapper-*.jar"
+    }
+    into "$outsideGroupDir"
+}
+
+copyOutsideLibs.dependsOn copyWrapperLibs
diff --git a/script-plugins/xlint.gradle b/script-plugins/xlint.gradle
index 5ddbb18..ebdd30c 100644
--- a/script-plugins/xlint.gradle
+++ b/script-plugins/xlint.gradle
@@ -1,7 +1,7 @@
 allprojects {
-	gradle.projectsEvaluated {
-		tasks.withType(JavaCompile) {
-			options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
-		}
-	}
-}
\ No newline at end of file
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+        }
+    }
+}
diff --git a/script-plugins/xml-schemas.gradle b/script-plugins/xml-schemas.gradle
index 2fa7c22..5189e74 100644
--- a/script-plugins/xml-schemas.gradle
+++ b/script-plugins/xml-schemas.gradle
@@ -1,10 +1,12 @@
 // Generate XML schemas.
-task generateXmlSchemas(type: JavaExec, dependsOn: [jar, copyLibs, copyHdf5Libs]) {
+task generateXmlSchemas(type: JavaExec, dependsOn: [copyLibs, processResources]) {
     outputs.dir "$projectDir/build/schema/xml"
 
     mainClass.set("gov.nasa.ziggy.pipeline.xml.XmlSchemaExporter")
-    classpath fileTree(dir: "$projectDir/build/libs", include: "*.jar")
+    classpath files(sourceSets.main.runtimeClasspath)
+    jvmArgs "-Djava.library.path=$outsideDir/lib"
 }
 
 test.dependsOn generateXmlSchemas
+integrationTest.dependsOn generateXmlSchemas
 assemble.dependsOn generateXmlSchemas
diff --git a/script-plugins/ziggy-libraries.gradle b/script-plugins/ziggy-libraries.gradle
index 22282be..0840739 100644
--- a/script-plugins/ziggy-libraries.gradle
+++ b/script-plugins/ziggy-libraries.gradle
@@ -7,17 +7,22 @@ task buildLibZiggy(type: ZiggyCpp) {
     outputType = "static"
     cppFilePaths = ["$projectDir/src/main/cpp/libziggy"]
     includeFilePaths = ["$projectDir/src/main/cpp/libziggy"]
+
+    logging.captureStandardOutput LogLevel.INFO
+    logging.captureStandardError LogLevel.INFO
 }
 
 assemble.dependsOn buildLibZiggy
 
 // Build the libziggymi shared object.
-task buildLibZiggyMi(type: ZiggyCpp) {
+task buildLibZiggyMi(type: ZiggyCpp, dependsOn: copyHdf5Inc) {
     outputName = "ziggymi"
     outputType = "static"
     cppFilePaths = ["$projectDir/src/main/cpp/libziggymi"]
     includeFilePaths = ["$projectDir/src/main/cpp/libziggymi", "$projectDir/src/main/cpp/libziggy",
-                        "$ziggyDependencies/include"]
+                        "$buildDir/include"]
+    logging.captureStandardOutput LogLevel.INFO
+    logging.captureStandardError LogLevel.INFO
 }
 
 assemble.dependsOn buildLibZiggyMi
diff --git a/settings.gradle b/settings.gradle
index 8b13789..e410ddf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-
+rootProject.name = "ziggy"
diff --git a/src/main/cpp/libziggy/ziggy_exceptions.cpp b/src/main/cpp/libziggy/ziggy_exceptions.cpp
index f7f8abc..9d673e3 100644
--- a/src/main/cpp/libziggy/ziggy_exceptions.cpp
+++ b/src/main/cpp/libziggy/ziggy_exceptions.cpp
@@ -2,18 +2,4 @@
 
 using namespace std;
 
-void ZiggyException::exceptionMessage(ZiggyException exception, const char* file, const char* functionName,
-		int line, const char* exceptionName, const char* msg) {
-
-	cerr << file << "(" << line << "): exception in function " << functionName << endl;
-	cerr << "Exception: " << exceptionName << endl;
-	cerr << "What: " << exception.what() << endl;
-	if (msg != NULL) {
-		cerr << "Message: " << msg << endl;
-	}
-
-	//	now that the output is complete, we can throw the actual error
-	throw exception;
-}
-
 
diff --git a/src/main/cpp/libziggy/ziggy_exceptions.h b/src/main/cpp/libziggy/ziggy_exceptions.h
index 16ec35c..c1d4da7 100644
--- a/src/main/cpp/libziggy/ziggy_exceptions.h
+++ b/src/main/cpp/libziggy/ziggy_exceptions.h
@@ -16,6 +16,7 @@
 #include <execinfo.h>
 #include <stdlib.h>
 
+
 #define MAX_STACK_DEPTH 128
 #define RUN_TIME_STACK_TRACE \
 { \
@@ -47,13 +48,24 @@ class ZiggyException : public virtual std::exception {
     virtual ~ZiggyException() {
     }
 
-    static void exceptionMessage(ZiggyException exception, const char* file, const char* function, int line,
-    		const char* name, const char* msg);
-
 private:
     std::string whatMessage_m;
 };
 
+template<typename T>
+void exceptionMessage(T exception, const char* file, const char* functionName,
+		int line, const char* exceptionName, const char* msg) {
+
+	std::cerr << file << "(" << line << "): exception in function " << functionName << std::endl;
+	std::cerr << "Exception: " << exceptionName << std::endl;
+	std::cerr << "What: " << exception.what() << std::endl;
+	if (msg != NULL) {
+		std::cerr << "Message: " << msg << std::endl;
+	}
+
+	//	now that the output is complete, we can throw the actual error
+	throw exception;
+}
 
 /**
  * Base class for I/O errors.
@@ -70,14 +82,14 @@ class IoException : public ZiggyException {
 
 #define ZIGGY_THROW(ExceptionTypeName) \
 { \
-	ZiggyException::exceptionMessage(ExceptionTypeName(#ExceptionTypeName), __FILE__, __FUNCTION__, __LINE__, \
+	exceptionMessage(ExceptionTypeName(#ExceptionTypeName), __FILE__, __FUNCTION__, __LINE__, \
 		#ExceptionTypeName, NULL); \
 \}
 
 
 #define ZIGGY_THROW_MSG(ExceptionTypeName, Msg) \
 { \
-	ZiggyException::exceptionMessage(ExceptionTypeName(#ExceptionTypeName), __FILE__, __FUNCTION__, __LINE__, \
+	exceptionMessage(ExceptionTypeName(#ExceptionTypeName), __FILE__, __FUNCTION__, __LINE__, \
 		#ExceptionTypeName, Msg); \
 }
 
diff --git a/src/main/cpp/libziggymi/IOHandler.cpp b/src/main/cpp/libziggymi/IOHandler.cpp
index 4f1830d..343f477 100644
--- a/src/main/cpp/libziggymi/IOHandler.cpp
+++ b/src/main/cpp/libziggymi/IOHandler.cpp
@@ -12,13 +12,13 @@
 #include "IOHandler.h"
 #include "hdf5.h"
 
-IOHandler::IOHandler(const std::string& dir_p, const std::string& id_p, const std::string& binaryName_p) : 
-    dir(dir_p), id(id_p), binaryName(binaryName_p) {
+IOHandler::IOHandler(const std::string& dir_p, const std::string& binaryName_p) : 
+    dir(dir_p), binaryName(binaryName_p) {
     
     if (binaryName.rfind("/") != std::string::npos) {
         binaryName = binaryName.substr(binaryName.rfind("/") + 1);
-        inputFilename = dir + "/" + binaryName + "-inputs-" + id + ".h5";
-        outputFilename = dir + "/" + binaryName + "-outputs-" + id + ".h5";
+        inputFilename = dir + "/" + binaryName + "-inputs.h5";
+        outputFilename = dir + "/" + binaryName + "-outputs.h5";
     }
 }
     
diff --git a/src/main/cpp/libziggymi/IOHandler.h b/src/main/cpp/libziggymi/IOHandler.h
index 50d5499..ff7ad03 100644
--- a/src/main/cpp/libziggymi/IOHandler.h
+++ b/src/main/cpp/libziggymi/IOHandler.h
@@ -13,7 +13,7 @@
 class IOHandler {
 public:
 
-    IOHandler(const std::string& dir, const std::string& id, const std::string& binaryName);
+    IOHandler(const std::string& dir, const std::string& binaryName);
 
     virtual ~IOHandler() {
     }
@@ -24,7 +24,6 @@ class IOHandler {
 
 private:
     std::string dir;
-    std::string id;
     std::string binaryName;
     std::string inputFilename;
     std::string outputFilename;
diff --git a/src/main/java/gov/nasa/ziggy/collections/HyperRectangle.java b/src/main/java/gov/nasa/ziggy/collections/HyperRectangle.java
index c730955..44c3e6c 100644
--- a/src/main/java/gov/nasa/ziggy/collections/HyperRectangle.java
+++ b/src/main/java/gov/nasa/ziggy/collections/HyperRectangle.java
@@ -71,7 +71,6 @@ private boolean checkParameters() {
             }
         }
         return parametersOkay;
-
     }
 
     /**
diff --git a/src/main/java/gov/nasa/ziggy/collections/HyperRectangleIterator.java b/src/main/java/gov/nasa/ziggy/collections/HyperRectangleIterator.java
index df00ec5..0904f81 100644
--- a/src/main/java/gov/nasa/ziggy/collections/HyperRectangleIterator.java
+++ b/src/main/java/gov/nasa/ziggy/collections/HyperRectangleIterator.java
@@ -188,7 +188,7 @@ public HyperRectangle next() {
         // to return false)
         for (int iDim = counter.length - 1; iDim >= 0; iDim--) {
             counter[iDim]++;
-            if ((counter[iDim] != nRectangles[iDim]) || (iDim <= 0)) {
+            if (counter[iDim] != nRectangles[iDim] || iDim <= 0) {
                 break;
             }
             counter[iDim] = 0;
@@ -220,5 +220,4 @@ public int getMaxElementsPerHyperRectangle() {
     public int[] getCounter() {
         return counter;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/collections/RemovableArrayList.java b/src/main/java/gov/nasa/ziggy/collections/RemovableArrayList.java
index 9cd89a9..86ef620 100644
--- a/src/main/java/gov/nasa/ziggy/collections/RemovableArrayList.java
+++ b/src/main/java/gov/nasa/ziggy/collections/RemovableArrayList.java
@@ -14,7 +14,7 @@
  * @author Sean McCauliff
  */
 public class RemovableArrayList<T> extends ArrayList<T> {
-    private static final long serialVersionUID = -7536249496170417383L;
+    private static final long serialVersionUID = 20230511L;
 
     public RemovableArrayList() {
     }
diff --git a/src/main/java/gov/nasa/ziggy/collections/ZiggyArrayUtils.java b/src/main/java/gov/nasa/ziggy/collections/ZiggyArrayUtils.java
index 48b7453..1e01653 100644
--- a/src/main/java/gov/nasa/ziggy/collections/ZiggyArrayUtils.java
+++ b/src/main/java/gov/nasa/ziggy/collections/ZiggyArrayUtils.java
@@ -1,5 +1,6 @@
 package gov.nasa.ziggy.collections;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static gov.nasa.ziggy.collections.ZiggyDataType.ZIGGY_BOOLEAN;
 import static gov.nasa.ziggy.collections.ZiggyDataType.ZIGGY_DOUBLE;
 import static gov.nasa.ziggy.collections.ZiggyDataType.ZIGGY_ENUM;
@@ -28,6 +29,8 @@
 import com.google.common.primitives.Longs;
 
 import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Utility methods for single- and multi-dimensional arrays, with a few utilities for primitive
@@ -40,7 +43,6 @@
 public class ZiggyArrayUtils {
 
     private ZiggyArrayUtils() {
-
     }
 
     /**
@@ -101,6 +103,7 @@ public static boolean isBoxedPrimitive(Object arrayObject) {
         return isBoxedPrimitive(arrayObject.getClass());
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     public static boolean isBoxedPrimitive(Class<?> clazz) {
         Class<?> testClass = null;
         String className = truncateClassName(clazz.getName());
@@ -110,7 +113,9 @@ public static boolean isBoxedPrimitive(Class<?> clazz) {
         try {
             testClass = Class.forName(className);
         } catch (ClassNotFoundException e) {
-            throw new PipelineException("Unable to determine class with name: " + className, e);
+            // This can never occur. The name comes from the Class instance passed
+            // as argument to the method.
+            throw new AssertionError(e);
         }
         Class<?> numberClass = Number.class;
         return testClass.equals(numberClass) || testClass.equals(Boolean.class)
@@ -145,7 +150,6 @@ public static long[] getArraySize(Object dataObject) {
             } else {
                 isArray = false;
             }
-
         }
 
         return Longs.toArray(arrayDimensionList);
@@ -445,8 +449,10 @@ public static Object constructBoxedArray(int dimensionCount, int length,
      * @param box if true, return an array of boxed types, otherwise primitives
      * @return Array of the desired type and size.
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     static Object constructArray(int dimensionCount, int length, ZiggyDataType ziggyDataType,
         boolean box) {
+        checkArgument(length >= 0, "Negative array length");
         String arrayClass = arrayClassToConstruct(dimensionCount, ziggyDataType, box);
         try {
 
@@ -459,7 +465,9 @@ static Object constructArray(int dimensionCount, int length, ZiggyDataType ziggy
             // cannot use the class name...
             return Array.newInstance(ziggyDataType.getJavaClass(), length);
         } catch (NegativeArraySizeException | ClassNotFoundException e) {
-            throw new PipelineException("Unable to construct new array for class " + arrayClass, e);
+            // This can never occur. The array size is checked as an argument, and
+            // the class comes from an instance of ZiggyDataType.
+            throw new AssertionError(e);
         }
     }
 
@@ -631,7 +639,6 @@ public static Object getValue(Object array, int[] location) {
                 ArrayUtils.subarray(location, 1, location.length));
         } else {
             obj = Array.get(array, location[0]);
-
         }
         return obj;
     }
@@ -741,5 +748,4 @@ public static Object stringToArray(String commaSeparatedValues, ZiggyDataType da
         }
         return array;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/collections/ZiggyDataType.java b/src/main/java/gov/nasa/ziggy/collections/ZiggyDataType.java
index 9ddbf49..44ab248 100644
--- a/src/main/java/gov/nasa/ziggy/collections/ZiggyDataType.java
+++ b/src/main/java/gov/nasa/ziggy/collections/ZiggyDataType.java
@@ -13,6 +13,8 @@
 
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.module.io.Persistable;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import hdf.hdf5lib.HDF5Constants;
 
 /**
@@ -78,7 +80,6 @@ public String scalarToString(Object obj) {
         public Object typedValue(String value) {
             return StringUtils.isEmpty(value) ? Boolean.valueOf(false) : Boolean.valueOf(value);
         }
-
     },
     ZIGGY_BYTE(byte.class, "B", true, ZiggyDataTypeConstants.BYTE_TYPE_INT,
         HDF5Constants.H5T_NATIVE_INT8, "H5T_NATIVE_INT8") {
@@ -852,7 +853,8 @@ private static ZiggyDataType getDataTypeFromList(List<? extends Object> object)
      * @param clazz
      * @return ZiggyDataType associated with the class.
      */
-    static ZiggyDataType getDataTypeFromClass(Class<?> clazz) {
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public static ZiggyDataType getDataTypeFromClass(Class<?> clazz) {
         ZiggyDataType hdf5Type = null;
         String simpleName = clazz.getSimpleName().toLowerCase();
         int bracketLocation = simpleName.indexOf("[");
@@ -879,8 +881,10 @@ static ZiggyDataType getDataTypeFromClass(Class<?> clazz) {
                 hdf5Type = ZIGGY_PERSISTABLE;
             }
         } catch (ClassNotFoundException e) {
-            throw new PipelineException(
-                "Unable to perform forName operation for class " + simpleName, e);
+            // This can never occur. The class name comes from an actual
+            // instance of the class, so by definition it can't be "not
+            // found."
+            throw new AssertionError(e);
         }
 
         // if it's still null, then this isn't something we can persist...
@@ -908,6 +912,7 @@ public static String truncateClassName(String fullClassName) {
     /**
      * Determines the ZiggyDataType of a {@link Field}.
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     public static ZiggyDataType getDataType(Field field) {
         field.setAccessible(true);
         Class<?> clazz = null;
@@ -923,23 +928,27 @@ public static ZiggyDataType getDataType(Field field) {
             }
             return getDataTypeFromClass(clazz);
         } catch (ClassNotFoundException e) {
-            throw new PipelineException("Unable to determine HDF5 class of " + fieldClass.getName(),
-                e);
+            // This can never occur. The class name comes from an actual
+            // instance of the class, so by definition it can't be "not
+            // found."
+            throw new AssertionError(e);
         }
     }
 
     /**
      * Returns the contents of a {@link Field}, as a {@link String}. Assumes that the type of the
      * {@link Field} is one of the {@link ZiggyDataType} types, or a 1-dimensional array of same.
-     *
-     * @throws IllegalAccessException
-     * @throws IllegalArgumentException
      */
-    public static String objectToString(Object obj, Field field)
-        throws IllegalArgumentException, IllegalAccessException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static String objectToString(Object obj, Field field) {
         field.setAccessible(true);
-        return objectToString(field.get(obj), ZiggyDataType.getDataType(field),
-            field.getType().isArray());
+        try {
+            return objectToString(field.get(obj), ZiggyDataType.getDataType(field),
+                field.getType().isArray());
+        } catch (IllegalAccessException e) {
+            throw new IllegalArgumentException("Unable to convert field " + field.getName()
+                + " to string on object of class " + obj.getClass().getName(), e);
+        }
     }
 
     public static String objectToString(Object obj) {
@@ -983,12 +992,17 @@ private static String arrayToString(Object arrayObject, ZiggyDataType dataType)
      * Sets the value of a {@link Field} in an {@link Object}. The {@param value} argument is
      * converted from a {@link String} to a scalar or 1-d array of values of the appropriate type.
      */
-    public static void setField(Object obj, Field field, String value)
-        throws IllegalArgumentException, IllegalAccessException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static void setField(Object obj, Field field, String value) {
         ZiggyDataType dataType = getDataType(field);
         boolean isArray = field.getType().isArray();
         field.setAccessible(true);
-        field.set(obj, stringToObject(value, dataType, isArray));
+        try {
+            field.set(obj, stringToObject(value, dataType, isArray));
+        } catch (IllegalAccessException e) {
+            throw new IllegalArgumentException("Unable to set field " + field.getName()
+                + " in object of class " + obj.getClass().getName(), e);
+        }
     }
 
     /**
@@ -1003,14 +1017,19 @@ public static Object stringToObject(String value, ZiggyDataType dataType, boolea
         return ZiggyArrayUtils.stringToArray(value, dataType);
     }
 
-    public static int elementSizeBytes(ZiggyDataType dataType)
-        throws IllegalArgumentException, IllegalAccessException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static int elementSizeBytes(ZiggyDataType dataType) {
         int elementSize = 1;
         Class<?> boxedClass = dataType.javaBoxedClass;
         for (Field field : boxedClass.getFields()) {
-            if (field.getName().contentEquals("BYTES")) {
-                elementSize = field.getInt(null);
-                break;
+            try {
+                if (field.getName().contentEquals("BYTES")) {
+                    elementSize = field.getInt(null);
+                    break;
+                }
+            } catch (IllegalAccessException e) {
+                throw new IllegalArgumentException("Unable to get size of field " + field.getName(),
+                    e);
             }
         }
         return elementSize;
diff --git a/src/main/java/gov/nasa/ziggy/crud/AbstractCrud.java b/src/main/java/gov/nasa/ziggy/crud/AbstractCrud.java
index d122765..1400f78 100644
--- a/src/main/java/gov/nasa/ziggy/crud/AbstractCrud.java
+++ b/src/main/java/gov/nasa/ziggy/crud/AbstractCrud.java
@@ -1,26 +1,18 @@
 package gov.nasa.ziggy.crud;
 
-import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.SQLQuery;
 import org.hibernate.Session;
-import org.hibernate.criterion.Disjunction;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Lists;
+import org.hibernate.query.Query;
+import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 
 import gov.nasa.ziggy.collections.ListChunkIterator;
-import gov.nasa.ziggy.pipeline.definition.ExternalIdAssignable;
 import gov.nasa.ziggy.services.database.DatabaseService;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.CriteriaUpdate;
 
 /**
  * The parent class for all CRUD classes.
@@ -32,8 +24,7 @@
  * @author Bill Wohler
  * @author PT
  */
-public abstract class AbstractCrud implements AbstractCrudInterface {
-    private static final Logger log = LoggerFactory.getLogger(AbstractCrud.class);
+public abstract class AbstractCrud<U> implements AbstractCrudInterface<U> {
 
     /**
      * This is the maximum number of dynamically-created expressions sent to the database. This
@@ -45,7 +36,6 @@ public abstract class AbstractCrud implements AbstractCrudInterface {
     public static final int MAX_EXPRESSIONS = 950;
 
     private DatabaseService databaseService;
-    private boolean readOnly;
 
     /**
      * Creates a {@link AbstractCrud} whose read-only property is set to {@code false}.
@@ -53,17 +43,6 @@ public abstract class AbstractCrud implements AbstractCrudInterface {
     protected AbstractCrud() {
     }
 
-    /**
-     * Creates a {@link AbstractCrud} with the given read-only property. CRUD classes can
-     * instantiate themselves with this parameter set to {@code true} to avoid dirty checking and
-     * therefore save on CPU usage.
-     * <p>
-     * Use {@link #createQuery(String)} to take advantage of this property.
-     */
-    protected AbstractCrud(boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
     /**
      * Creates a {@link AbstractCrud} with the given database service whose read-only property is
      * set to {@code false}.
@@ -72,18 +51,6 @@ protected AbstractCrud(DatabaseService databaseService) {
         this.databaseService = databaseService;
     }
 
-    /**
-     * Creates a {@link AbstractCrud} with the given database service and read-only property. CRUD
-     * classes can instantiate themselves this parameter set to {@code true} to avoid dirty checking
-     * and therefore save on CPU usage.
-     * <p>
-     * Use {@link #createQuery(String)} to take advantage of this property.
-     */
-    protected AbstractCrud(DatabaseService databaseService, boolean readOnly) {
-        this(databaseService);
-        this.readOnly = readOnly;
-    }
-
     /**
      * Returns the database service used by this CRUD object.
      */
@@ -112,10 +79,8 @@ protected final Session getSession() {
      * @param id the object ID
      * @return the retrieved object
      */
-    @SuppressWarnings("unchecked")
-    public final <T> T get(Class<T> clazz, Serializable id) {
-        Object r = getSession().get(clazz, id);
-        return (T) r;
+    public final <T> T get(Class<T> clazz, Object id) {
+        return getSession().get(clazz, id);
     }
 
     /**
@@ -129,23 +94,14 @@ public void evict(Object o) {
 
     /**
      * Makes an object persistent.
-     * <p>
-     * <strong>Note:</strong> This should be &lsquo;final&rsquo;, but cannot be, because unit tests
-     * want to mock it.
      */
     @Override
-    public void create(Object o) {
-        getSession().save(o);
-    }
-
-    @Override
-    public void update(Object o) {
-        getSession().update(o);
+    public void persist(Object o) {
+        getSession().persist(o);
     }
 
-    @Override
-    public void createOrUpdate(Object o) {
-        getSession().saveOrUpdate(o);
+    public <T> T merge(T o) {
+        return getSession().merge(o);
     }
 
     /**
@@ -153,15 +109,15 @@ public void createOrUpdate(Object o) {
      *
      * @param collection the collection of items to persist
      */
-    public void create(Collection<?> collection) {
+    @Override
+    public void persist(Collection<?> collection) {
         for (Object item : collection) {
-            create(item);
+            persist(item);
         }
     }
 
-    @Override
-    public final void delete(Object o) {
-        getSession().delete(o);
+    public final void remove(Object o) {
+        getSession().remove(o);
     }
 
     /**
@@ -169,132 +125,65 @@ public final void delete(Object o) {
      *
      * @param collection the collection of items to delete
      */
-    public void delete(Collection<?> collection) {
+    public void remove(Collection<?> collection) {
         for (Object item : collection) {
-            delete(item);
+            remove(item);
         }
     }
 
-    /**
-     * Creates a new instance of {@link Query} for the given HQL query string using this object's
-     * local properties.
-     * <p>
-     * Note that the read-only property only extends to the queried objects. Objects that are lazily
-     * loaded later must be explicitly marked read-only.
-     *
-     * @param queryString the HQL query string
-     * @return a {@link Query} object
-     */
-    @Override
-    public Query createQuery(String queryString) {
-        Query query = getSession().createQuery(queryString);
-        query.setReadOnly(readOnly);
-
-        return query;
-    }
-
-    /**
-     * Creates a new instance of {@link SQLQuery} for the given SQL query string using this object's
-     * local properties.
-     * <p>
-     * Note that the read-only property only extends to the queried objects. Objects that are lazily
-     * loaded later must be explicitly marked read-only.
-     *
-     * @param queryString the SQL query string
-     * @return a {@link SQLQuery} object
-     */
-    @Override
-    public SQLQuery createSQLQuery(String queryString) {
-        SQLQuery query = getSession().createSQLQuery(queryString);
-        query.setReadOnly(readOnly);
-
-        return query;
-    }
-
-    /**
-     * Creates a new {@link Criteria} instance, for the given entity class, or a superclass of an
-     * entity class using this object's local properties.
-     * <p>
-     * Note that the read-only property does not apply to this method. However, use of this method
-     * will allow the CRUD class to take advantage of future properties.
-     *
-     * @param persistentClass the persistent class
-     * @return a {@link Criteria} object
-     */
-    public Criteria createCriteria(Class<?> persistentClass) {
-        return getSession().createCriteria(persistentClass);
+    /** Returns a {@link CriteriaBuilder} object for use in building queries. */
+    public HibernateCriteriaBuilder createCriteriaBuilder() {
+        return getSession().getCriteriaBuilder();
     }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public <E> List<E> list(Query query) {
+    public <R> List<R> list(Query<R> query) {
         return query.list();
     }
 
-    @SuppressWarnings("unchecked")
-    public <E> List<E> list(Criteria criteria) {
-        return criteria.list();
+    protected <R> int executeUpdate(CriteriaDelete<R> criteria) {
+        return getSession().createMutationQuery(criteria).executeUpdate();
     }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> T uniqueResult(Query query) {
-        return (T) query.uniqueResult();
+    protected <R> int executeUpdate(CriteriaUpdate<R> criteria) {
+        return getSession().createMutationQuery(criteria).executeUpdate();
     }
 
-    @SuppressWarnings("unchecked")
-    protected <T> T uniqueResult(Criteria criteria) {
-        return (T) criteria.uniqueResult();
+    protected void lock(Object entity, LockModeType lockMode) {
+        getSession().lock(entity, lockMode);
     }
 
     /**
-     * Produce a query for the next chunk. Used by aggregateResults() to collect all the results
-     * needed when a single query would have too many expressions.
-     *
-     * @param <T> The type used in the expression used to build the query.
-     * @param <R> The result type of the query.
+     * Creates an instance of {@link ZiggyQuery} in which the user wants to return entire rows of
+     * the table (or, on the Java side, the user wants to return whole instances of the class that's
+     * the target of the query).
      */
-    @FunctionalInterface
-    public interface QueryFactory<T, R> {
-        Query produceQuery(List<T> nextChunk);
+    @Override
+    public <R> ZiggyQuery<R, R> createZiggyQuery(Class<R> returnClass) {
+        return createZiggyQuery(returnClass, returnClass);
     }
 
     /**
-     * Use this to produce a complete list of results when queries must be broken into many distinct
-     * queries in order to satisify database query language limitations.
-     *
-     * @param source The complete list of elements to query.
-     * @param queryFactory creates a new query or sets query parameters for the next chunk of
-     * expressions to evaluate.
-     * @return list of type R, the result type.
+     * Creates an instance of {@link ZiggyQuery} in which the user returns column values from the
+     * query result rather than entire rows (or, on the Java side, the user returns fields rather
+     * than entire instances of the class that's the target of the query).
      */
-    protected <T, R> List<R> aggregateResults(Collection<T> source,
-        QueryFactory<T, R> queryFactory) {
-        if (source.isEmpty()) {
-            return Collections.emptyList();
-        }
-        List<R> results = Lists.newArrayListWithCapacity(MAX_EXPRESSIONS * 2);
-        ListChunkIterator<T> it = new ListChunkIterator<>(source.iterator(), MAX_EXPRESSIONS);
-        for (List<T> chunk : it) {
-            Query q = queryFactory.produceQuery(chunk);
-            List<R> resultChunk = list(q);
-            results.addAll(resultChunk);
-        }
-        return results;
+    @Override
+    public <T, R> ZiggyQuery<T, R> createZiggyQuery(Class<T> databaseClass, Class<R> returnClass) {
+        return new ZiggyQuery<>(databaseClass, returnClass, this);
     }
 
-    /**
-     * Use this to produce a Critieron query Restrictions.in() when the number of values in the in()
-     * is potentially too large for the database to manage unless it is first chunked up. Based on:
-     * https://stackoverflow.com/a/59828331 .
-     */
-    protected <T> Disjunction restrictionPropertyIn(String property, Collection<T> values) {
-        Disjunction criterion = Restrictions.disjunction();
-        List<T> valuesList = new ArrayList<>(values);
-        for (List<T> idSubset : Lists.partition(valuesList, MAX_EXPRESSIONS)) {
-            criterion.add(Restrictions.in(property, idSubset));
-        }
-        return criterion;
+    @Override
+    public <T, R> R uniqueResult(ZiggyQuery<T, R> query) {
+        return getSession()
+            .createQuery(query.constructSelectClause().constructWhereClause().getCriteriaQuery())
+            .uniqueResult();
+    }
+
+    @Override
+    public <T, R> List<R> list(ZiggyQuery<T, R> query) {
+        return getSession()
+            .createQuery(query.constructSelectClause().constructWhereClause().getCriteriaQuery())
+            .getResultList();
     }
 
     /**
@@ -333,51 +222,4 @@ public void clearHibernateCache(boolean skipFlush) {
         }
         clear();
     }
-
-    /**
-     * Gets the maximum ID for existing database entries on a given table.
-     *
-     * @return Max ID value for existing database entries, as a long, or -1 if no entries are
-     * present.
-     */
-    @SuppressWarnings("unchecked")
-    private <T extends Number> T retrieveMaxDatabaseId(ExternalIdAssignable table) {
-        Class<? extends ExternalIdAssignable> clazz = table.getClass();
-        log.info("Class name: " + clazz.getName());
-        Criteria criteria = createCriteria(clazz);
-        criteria.setProjection(Projections.max("id"));
-        T maxDatabaseId = uniqueResult(criteria);
-        return maxDatabaseId != null ? maxDatabaseId : (T) Integer.valueOf(-1);
-    }
-
-    /**
-     * Determines a model ID for assignment.
-     *
-     * @return A valid model ID that can be assigned. If there are no entries in the relevant
-     * database table, or all the entries are smaller than the min permitted assigned value, the min
-     * permitted assigned value will be returned. If there are values in the database greater than
-     * the min assigned value, the max value in the database + 1 will be returned.
-     */
-    @SuppressWarnings("unchecked")
-    private <T extends Number> T tableIdForAssignment(ExternalIdAssignable table) {
-
-        T maxDatabaseId = retrieveMaxDatabaseId(table);
-        return maxDatabaseId.intValue() >= table.minAllowedAssignedIdNumber()
-            ? (T) Integer.valueOf(maxDatabaseId.intValue() + 1)
-            : (T) Integer.valueOf(table.minAllowedAssignedIdNumber());
-    }
-
-    /**
-     * Returns a valid table ID for a table that implements the ExternalIdAssignable interface
-     *
-     * @param table Table that requires a valid ID
-     * @return the existing table ID if it is valid, otherwise an assigned ID based on values in the
-     * database and the table-specific min valid assigned ID value.
-     */
-    protected int validTableId(ExternalIdAssignable table) {
-
-        // default is to use the table's ID
-        int tableId = table.externalId();
-        return tableId != 0 ? tableId : tableIdForAssignment(table).intValue();
-    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/crud/AbstractCrudInterface.java b/src/main/java/gov/nasa/ziggy/crud/AbstractCrudInterface.java
index 97125e9..d46d045 100644
--- a/src/main/java/gov/nasa/ziggy/crud/AbstractCrudInterface.java
+++ b/src/main/java/gov/nasa/ziggy/crud/AbstractCrudInterface.java
@@ -1,49 +1,32 @@
 package gov.nasa.ziggy.crud;
 
+import java.util.Collection;
 import java.util.List;
 
-import org.hibernate.Query;
-import org.hibernate.SQLQuery;
-
 /**
  * @author Miles Cote
  */
-public interface AbstractCrudInterface {
-    /**
-     * Makes an object persistent. The object must not have previously been persisted with the same
-     * key.
-     *
-     * @param o the object to persist
-     */
-    void create(Object o);
-
-    /**
-     * Updates a persistent object with new values.
-     *
-     * @param o the object to update
-     */
-    void update(Object o);
-
-    /**
-     * Makes an object persistent or updates an exsiting persistent object, depending on whether the
-     * object has already been persisted.
-     *
-     * @param o the object to create or update
-     */
-    void createOrUpdate(Object o);
-
-    /**
-     * Deletes an object.
-     *
-     * @param o the object to be deleted.
-     */
-    void delete(Object o);
-
-    Query createQuery(String queryString);
-
-    SQLQuery createSQLQuery(String queryString);
-
-    <E> List<E> list(Query query);
-
-    <T> T uniqueResult(Query query);
+public interface AbstractCrudInterface<U> {
+
+    <T, R> ZiggyQuery<T, R> createZiggyQuery(Class<T> databaseClass, Class<R> resultClass);
+
+    <R> ZiggyQuery<R, R> createZiggyQuery(Class<R> databaseClass);
+
+    <T, R> List<R> list(ZiggyQuery<T, R> query);
+
+    <T, R> R uniqueResult(ZiggyQuery<T, R> query);
+
+    void persist(Object o);
+
+    void persist(Collection<?> collection);
+
+    Class<U> componentClass();
+
+    default U finalize(U result) {
+        return result;
+    }
+
+    default List<U> finalize(List<U> result) {
+        return result;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/crud/HibernateClassCrud.java b/src/main/java/gov/nasa/ziggy/crud/HibernateClassCrud.java
deleted file mode 100644
index 957f4cf..0000000
--- a/src/main/java/gov/nasa/ziggy/crud/HibernateClassCrud.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package gov.nasa.ziggy.crud;
-
-/**
- * @author Miles Cote
- */
-public interface HibernateClassCrud<T> extends AbstractCrudInterface {
-
-    String getHibernateClassName();
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/crud/ProtectedEntityInterceptor.java b/src/main/java/gov/nasa/ziggy/crud/ProtectedEntityInterceptor.java
index 78b0a25..d8c3c0e 100644
--- a/src/main/java/gov/nasa/ziggy/crud/ProtectedEntityInterceptor.java
+++ b/src/main/java/gov/nasa/ziggy/crud/ProtectedEntityInterceptor.java
@@ -1,19 +1,16 @@
 package gov.nasa.ziggy.crud;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.hibernate.CallbackException;
-import org.hibernate.EmptyInterceptor;
+import org.hibernate.Interceptor;
 import org.hibernate.Transaction;
 import org.hibernate.type.Type;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ProtectedEntityInterceptor extends EmptyInterceptor {
-
-    private static final long serialVersionUID = 1L;
+public class ProtectedEntityInterceptor implements Interceptor {
 
     private static final Logger log = LoggerFactory.getLogger(ProtectedEntityInterceptor.class);
 
@@ -36,33 +33,31 @@ public static void addPackageForClass(Class<?> clazz) {
     }
 
     @Override
-    public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames,
+    public boolean onSave(Object entity, Object id, Object[] state, String[] propertyNames,
         Type[] types) {
 
         checkModificationOK(entity);
-        return super.onSave(entity, id, state, propertyNames, types);
+        return true;
     }
 
     @Override
-    public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames,
+    public void onDelete(Object entity, Object id, Object[] state, String[] propertyNames,
         Type[] types) {
 
         checkModificationOK(entity);
-        super.onDelete(entity, id, state, propertyNames, types);
     }
 
     @Override
-    public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState,
+    public boolean onFlushDirty(Object entity, Object id, Object[] currentState,
         Object[] previousState, String[] propertyNames, Type[] types) {
 
         checkModificationOK(entity);
-        return super.onFlushDirty(entity, id, currentState, previousState, propertyNames, types);
+        return true;
     }
 
     @Override
     public void afterTransactionCompletion(Transaction tx) {
         allowedPrefixes.clear();
-        super.afterTransactionCompletion(tx);
     }
 
     private void checkModificationOK(Object entity) {
@@ -94,5 +89,4 @@ private boolean flushAllowed(String className) {
 
         return true;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/crud/SimpleCrud.java b/src/main/java/gov/nasa/ziggy/crud/SimpleCrud.java
new file mode 100644
index 0000000..faf6f70
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/crud/SimpleCrud.java
@@ -0,0 +1,15 @@
+package gov.nasa.ziggy.crud;
+
+/**
+ * A simple CRUD class that provides access to {@link AbstractCrud}.
+ *
+ * @author Bill Wohler
+ */
+public class SimpleCrud<U> extends AbstractCrud<U> {
+
+    @Override
+    public Class<U> componentClass() {
+        throw new UnsupportedOperationException(
+            "SimpleCrud doesn't support any one particular class");
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/crud/ZiggyQuery.java b/src/main/java/gov/nasa/ziggy/crud/ZiggyQuery.java
new file mode 100644
index 0000000..9ad49cc
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/crud/ZiggyQuery.java
@@ -0,0 +1,426 @@
+package gov.nasa.ziggy.crud;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import org.hibernate.query.criteria.HibernateCriteriaBuilder;
+
+import com.google.common.collect.Lists;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Selection;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+
+/**
+ * Abstraction of the JPA {@link CriteriaQuery}, the JPA {@link Root}, and the Hibernate
+ * {@link HibernateCriteriaBuilder} that allows construction and manipulation of multiple related
+ * query artifacts in a single class.
+ * <p>
+ * The JPA Criteria API is extremely verbose and typically requires 3 separate objects to construct
+ * and perform queries: the {@link CriteriaQuery}, which is defined in terms of the class that the
+ * query returns; the {@link Root}, which is defined in terms of the database table that is the
+ * target of the query; and the {@link CriteriaBuilder}, which provides the options that configure
+ * the query actions (sorting, filtering, projecting, etc.). Most of Ziggy's query requirements can
+ * be satisfied using a small fraction of the JPA system's capabilities. Thus the JPA API is
+ * abstracted into the {@link ZiggyQuery}, which automatically constructs those queries and the
+ * necessary objects and hides all the underlying verbosity and complexity from the user, who
+ * generally could care less.
+ * <p>
+ * The JPA API requires that queries include a component with a type parameter that corresponds to
+ * the class of object returned by the query and a component that is parameterized based on the
+ * class that is the target of the query. For this reason, the {@link AbstractCrud} class has two
+ * methods that return instances of {@link ZiggyQuery}. The simpler method returns an object for
+ * which the query return class and query target class are the same, hence this method takes one
+ * class argument; the other returns an object for which the query return class and query target
+ * class are different, hence this method takes two arguments. The latter method returns a
+ * {@link ZiggyQuery} that is suitable for projection / selection (i.e., returning individual fields
+ * of the object instead of the entire object).
+ * <p>
+ * The {@link ZiggyQuery} uses a fluent ("builder") pattern to the extent possible. As such, most
+ * methods return the {@link ZiggyQuery} object, which makes it easier to chain together elements of
+ * the query in a single line.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class ZiggyQuery<T, R> {
+
+    protected HibernateCriteriaBuilder builder;
+    protected CriteriaQuery<R> criteriaQuery;
+    protected Root<T> root;
+    protected Class<T> databaseClass;
+    protected Class<R> returnClass;
+
+    private SingularAttribute<T, ?> attribute;
+    private SetAttribute<T, ?> set;
+    private String columnName;
+
+    private List<Predicate> predicates = new ArrayList<>();
+    private List<Selection<?>> selections = new ArrayList<>();
+
+    /** For testing only. */
+    private List<List<Object>> queryChunks = new ArrayList<>();
+
+    public ZiggyQuery(Class<T> databaseClass, Class<R> returnClass, AbstractCrud<?> crud) {
+        builder = crud.createCriteriaBuilder();
+        criteriaQuery = builder.createQuery(returnClass);
+        root = criteriaQuery.from(databaseClass);
+        this.databaseClass = databaseClass;
+        this.returnClass = returnClass;
+    }
+
+    /**
+     * Defines a column for later use in a query operation. The column is either a scalar or
+     * collection.
+     * <p>
+     * N.B. This call is not type-safe. Use {@link #column(SingularAttribute)} or
+     * {@link #column(SetAttribute)} if at all possible.
+     */
+    public ZiggyQuery<T, R> column(String columnName) {
+        attribute = null;
+        set = null;
+        this.columnName = columnName;
+        return this;
+    }
+
+    /**
+     * Defines a column for later use in a query operation. The column is a scalar.
+     * <p>
+     * Queries typically need to restrict the query results based on column values, return column
+     * values rather than the entire object that's queried, etc. This is accomplished using this
+     * method, which accepts the column to be used in all subsequent operations.
+     */
+    public <Y> ZiggyQuery<T, R> column(SingularAttribute<T, Y> attribute) {
+        this.attribute = attribute;
+        set = null;
+        columnName = null;
+        return this;
+    }
+
+    /**
+     * Defines a column for later use in a query operation. The column is a set.
+     * <p>
+     * Queries typically need to restrict the query results based on column values, return column
+     * values rather than the entire object that's queried, etc. This is accomplished using this
+     * method, which accepts the column to be used in all subsequent operations.
+     */
+    public <Y> ZiggyQuery<T, R> column(SetAttribute<T, Y> set) {
+        attribute = null;
+        this.set = set;
+        columnName = null;
+        return this;
+    }
+
+    /**
+     * Use when a method can take either a scalar or collection attribute.
+     */
+    private boolean hasAttribute() {
+        return hasScalarAttribute() || set != null;
+    }
+
+    /**
+     * Use when a method can take either a scalar or collection attribute.
+     */
+    private boolean hasScalarAttribute() {
+        return attribute != null || columnName != null;
+    }
+
+    /**
+     * Applies a query constraint that the value of a column must contain the specified value.
+     */
+    @SuppressWarnings("unchecked")
+    public <Y> ZiggyQuery<T, R> in(Y value) {
+        checkState(hasScalarAttribute(), "a column has not been defined");
+        predicates.add(
+            attribute != null ? builder.in((Path<? extends Y>) root.get(attribute), Set.of(value))
+                : builder.in(root.get(columnName), Set.of(value)));
+        return this;
+    }
+
+    /**
+     * Applies a query constraint that the value of a column must be one of a collection of
+     * specified values.
+     */
+    @SuppressWarnings("unchecked")
+    public <Y> ZiggyQuery<T, R> in(Collection<Y> values) {
+        checkState(hasScalarAttribute(), "a column has not been defined");
+        predicates
+            .add(attribute != null ? builder.in((Path<? extends Y>) root.get(attribute), values)
+                : builder.in(root.get(columnName), values));
+        return this;
+    }
+
+    public <Y> CriteriaBuilder.In<Y> in(Expression<? extends Y> expression, Collection<Y> values) {
+        return builder.in(expression, values);
+    }
+
+    public <Y> CriteriaBuilder.In<Y> in(Expression<? extends Y> expression, Y value) {
+        return builder.in(expression, Set.of(value));
+    }
+
+    /**
+     * Performs the action of the {@link #in(Collection)} method, but performs the query in chunks.
+     * This allows queries in which the collection of values is too large for a single query. The
+     * number of values in a chunk is set by the {@link AbstractCrud#MAX_EXPRESSIONS} constant.
+     */
+    @SuppressWarnings("unchecked")
+    public <Y> ZiggyQuery<T, R> chunkedIn(Collection<Y> values) {
+        checkState(hasScalarAttribute(), "a column has not been defined");
+        List<Y> valuesList = new ArrayList<>(values);
+        Predicate criterion = builder.disjunction();
+        for (List<Y> valuesSubset : Lists.partition(valuesList, maxExpressions())) {
+            queryChunks.add((List<Object>) valuesSubset);
+            criterion = builder.or(criterion,
+                attribute != null
+                    ? builder.in((Path<? extends Y>) root.get(attribute), valuesSubset)
+                    : builder.in(root.get(columnName), valuesSubset));
+        }
+        predicates.add(criterion);
+        return this;
+    }
+
+    /**
+     * Applies a query constraint that the value of a column must be between a specified minimum
+     * value and a specified maximum value, inclusive.
+     */
+    @SuppressWarnings("unchecked")
+    public <Y extends Comparable<? super Y>> ZiggyQuery<T, R> between(Y minValue, Y maxValue) {
+        checkState(hasScalarAttribute(), "a column has not been defined");
+        predicates.add(attribute != null
+            ? builder.between((Expression<? extends Y>) root.get(attribute), minValue, maxValue)
+            : builder.between(root.get(columnName), minValue, maxValue));
+        return this;
+    }
+
+    /**
+     * Applies a query constraint that the results of the query must be sorted in ascending order
+     * based on a column value.
+     */
+    public ZiggyQuery<T, R> ascendingOrder() {
+        checkState(hasScalarAttribute(), "a column has not been defined");
+        criteriaQuery.orderBy(attribute != null ? builder.asc(root.get(attribute))
+            : builder.asc(root.get(columnName)));
+        return this;
+    }
+
+    /**
+     * Applies a query constraint that the results of the query must be sorted in descending order
+     * based on a column value.
+     */
+    public ZiggyQuery<T, R> descendingOrder() {
+        checkState(hasScalarAttribute(), "a column has not been defined");
+        criteriaQuery.orderBy(attribute != null ? builder.desc(root.get(attribute))
+            : builder.desc(root.get(columnName)));
+        return this;
+    }
+
+    /**
+     * Selects a column of the query target class for projection.
+     */
+    public ZiggyQuery<T, R> select() {
+        checkState(hasAttribute(), "a column has not been defined");
+        if (attribute != null) {
+            select(attribute);
+        } else if (set != null) {
+            select(set);
+        } else {
+            select(columnName);
+        }
+        return this;
+    }
+
+    /**
+     * Performs projection on a specified field of the query target class.
+     */
+    public <Y> ZiggyQuery<T, R> select(SingularAttribute<T, Y> attribute) {
+        selections.add(root.get(attribute));
+        return this;
+    }
+
+    public <Y> ZiggyQuery<T, R> select(SetAttribute<T, Y> set) {
+        selections.add(root.get(set));
+        return this;
+    }
+
+    public ZiggyQuery<T, R> select(Selection<? extends R> selection) {
+        selections.add(selection);
+        return this;
+    }
+
+    private void select(String columnName) {
+        selections.add(root.get(columnName));
+    }
+
+    @SuppressWarnings("unchecked")
+    public <Y extends Comparable<? super Y>> ZiggyQuery<T, R> min() {
+        checkState(hasScalarAttribute(), "a column has not been defined");
+        selections.add(attribute != null ? builder.least((Expression<Y>) root.get(attribute))
+            : builder.least(root.<Y> get(columnName)));
+        return this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <Y extends Comparable<? super Y>> ZiggyQuery<T, R> max() {
+        checkState(hasScalarAttribute(), "a column has not been defined");
+        selections.add(attribute != null ? builder.greatest((Expression<Y>) root.get(attribute))
+            : builder.max(root.get(columnName)));
+        return this;
+    }
+
+    /**
+     * Applies a query constraint that projects the minimum and maximum value of a column.
+     */
+    public ZiggyQuery<T, R> minMax() {
+        min();
+        max();
+        return this;
+    }
+
+    /**
+     * Selects the sum of a specified column.
+     */
+    @SuppressWarnings("unchecked")
+    public <N extends Number> ZiggyQuery<T, R> sum() {
+        checkState(hasScalarAttribute(), "a column has not been defined");
+        selections.add(attribute != null ? builder.sum((Expression<N>) root.get(attribute))
+            : builder.sum(root.get(columnName)));
+        return this;
+    }
+
+    /**
+     * Selects a count of results.
+     */
+    public ZiggyQuery<T, R> count() {
+        selections.add(builder.count(root));
+        return this;
+    }
+
+    /**
+     * Allows the user to specify an arbitrary {@link Predicate}. This allows the predicate to be
+     * stored along with the ones generated internally by the {@link ZiggyQuery}, so that the
+     * user-supplied predicate can be combined with internally generated ones prior to evaluating
+     * the query.
+     */
+    public ZiggyQuery<T, R> where(Predicate predicate) {
+        predicates.add(predicate);
+        return this;
+    }
+
+    /**
+     * Combines multiple stored constraints into a {@link CriteriaQuery#where(Predicate...)} clause.
+     * <p>
+     * Ziggy requires that constraints be specified one at a time via the {@link #in(Object)},
+     * {@link #between(Comparable, Comparable)}, etc., methods. Meanwhile, the {@link CriteriaQuery}
+     * API accepts only one {@link CriteriaQuery#where(Predicate...)} statement. This mismatch is
+     * addressed by capturing all the {@link Predicate} instances created in the query and then
+     * using {@link #constructWhereClause()} to apply them to the {@link CriteriaQuery}.
+     * <p>
+     * The {@link #constructWhereClause()} must be called before the query is executed.
+     */
+    public ZiggyQuery<T, R> constructWhereClause() {
+        if (predicates.isEmpty()) {
+            return this;
+        }
+        Predicate[] predicatesArray = predicates.toArray(new Predicate[0]);
+        criteriaQuery = criteriaQuery.where(predicatesArray);
+        return this;
+    }
+
+    /**
+     * Combines multiple stored selections into a {@link CriteriaQuery#multiselect(List)} clause.
+     * <p>
+     * Ziggy requires that selections be specified one at a time via the {@link #select()},
+     * {@link #min()}, etc., methods. Meanwhile, the {@link CriteriaQuery} API accepts only one
+     * {@link CriteriaQuery#multiselect(List)} statement. This mismatch is addressed by capturing
+     * all the {@link Selection} instances created in the query and then using
+     * {@link #constructSelectClause()} to apply them to the {@link CriteriaQuery}.
+     * <p>
+     * The {@link #constructSelectClause()} must be called before the query is executed.
+     */
+    public ZiggyQuery<T, R> constructSelectClause() {
+        if (selections.isEmpty()) {
+            return this;
+        }
+        if (selections.size() == 1) {
+
+            // A single select is a special case. In this case, the type of the Selection instance
+            // must match the return type for the query, which is R. We can achieve this via a cast,
+            // as long as we don't mind the resulting unchecked cast warning.
+            Selection<?> selection = selections.get(0);
+            @SuppressWarnings("unchecked")
+            Selection<R> selectionR = (Selection<R>) selection;
+            criteriaQuery = criteriaQuery.select(selectionR);
+            return this;
+        }
+        criteriaQuery = criteriaQuery.multiselect(selections);
+        return this;
+    }
+
+    /**
+     * Applies a query constraint that specifies whether all values are returned, or whether the
+     * returned values are filtered to eliminate duplicates.
+     * <p>
+     * In order to use the {@link #minMax()} constraint, the user must specify a {@link ZiggyQuery}
+     * that returns Object[]. The minimum value will be the first element of the array, the maximum
+     * value will be the second value.
+     */
+    public ZiggyQuery<T, R> distinct(boolean distinct) {
+        criteriaQuery = criteriaQuery.distinct(distinct);
+        return this;
+    }
+
+    /**
+     * Returns the {@link CriteriaBuilder} instance in the {@link ZiggyQuery}. This allows users to
+     * build queries that aren't directly supported by {@link ZiggyQuery} and instead require more
+     * direct use of the JPA API.
+     */
+    public HibernateCriteriaBuilder getBuilder() {
+        return builder;
+    }
+
+    /**
+     * Returns the {@link CriteriaQuery} instance in the {@link ZiggyQuery}. This allows users to
+     * build queries that aren't directly supported by {@link ZiggyQuery} and instead require more
+     * direct use of the JPA API.
+     */
+    public CriteriaQuery<R> getCriteriaQuery() {
+        return criteriaQuery;
+    }
+
+    /**
+     * Returns the {@link Root} instance in the {@link ZiggyQuery}. This allows users to build
+     * queries that aren't directly supported by {@link ZiggyQuery} and instead require more direct
+     * use of the JPA API.
+     */
+    public Root<T> getRoot() {
+        return root;
+    }
+
+    public <Y> Path<Y> get(SingularAttribute<? super T, Y> attribute) {
+        return root.get(attribute);
+    }
+
+    /**
+     * Maximum expressions allowed in each chunk of {@link #chunkedIn(Collection)}. Broken out into
+     * a package-private method so that tests can reduce this value to something small enough to
+     * exercise in test.
+     */
+    int maxExpressions() {
+        return AbstractCrud.MAX_EXPRESSIONS;
+    }
+
+    /** For testing only. */
+    List<List<Object>> queryChunks() {
+        return queryChunks;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/data/accounting/DataAccountabilityReport.java b/src/main/java/gov/nasa/ziggy/data/accounting/DataAccountabilityReport.java
index e6bbb08..7907735 100644
--- a/src/main/java/gov/nasa/ziggy/data/accounting/DataAccountabilityReport.java
+++ b/src/main/java/gov/nasa/ziggy/data/accounting/DataAccountabilityReport.java
@@ -1,6 +1,7 @@
 package gov.nasa.ziggy.data.accounting;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -14,6 +15,8 @@
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Given a set of task ids indicating where data originated from generate the the multi-graph
@@ -36,11 +39,10 @@ public DataAccountabilityReport(Set<Long> initialTaskIds, PipelineTaskCrud taskC
         this.taskRenderer = taskRenderer;
     }
 
-    public String produceReport() throws IOException {
+    public String produceReport() {
         Map<Long, Set<Long>> consumerProducer = calculateClosure();
         Map<Long, Set<Long>> producerConsumer = invertMap(consumerProducer);
         Set<Long> roots = findRoots(producerConsumer.keySet(), consumerProducer, producerConsumer);
-
         return formatReport(producerConsumer, roots);
     }
 
@@ -132,7 +134,7 @@ Set<Long> findRoots(Set<Long> producers, Map<Long, Set<Long>> consumerProducer,
 
         for (Long producer : producersWithInit) {
             Set<Long> parents = consumerProducer.get(producer);
-            if ((parents == null) || (parents.size() == 0)) {
+            if (parents == null || parents.size() == 0) {
                 roots.add(producer);
             }
         }
@@ -148,13 +150,11 @@ Set<Long> findRoots(Set<Long> producers, Map<Long, Set<Long>> consumerProducer,
      * @throws PipelineException
      */
 
-    protected String formatReport(Map<Long, Set<Long>> producerConsumer, Set<Long> roots)
-        throws IOException {
+    protected String formatReport(Map<Long, Set<Long>> producerConsumer, Set<Long> roots) {
         List<Long> sortedRoots = new ArrayList<>(roots);
         Collections.sort(sortedRoots);
 
         StringBuilder bldr = new StringBuilder();
-
         for (long root : sortedRoots) {
             Set<Long> visited = new HashSet<>();
             printTask(bldr, root, producerConsumer, 0, visited);
@@ -164,7 +164,7 @@ protected String formatReport(Map<Long, Set<Long>> producerConsumer, Set<Long> r
     }
 
     protected void printTask(Appendable bldr, long taskId, Map<Long, Set<Long>> producerConsumer,
-        int level, Set<Long> visited) throws IOException {
+        int level, Set<Long> visited) {
         renderLine(bldr, taskId, level);
 
         Set<Long> consumers = producerConsumer.get(taskId);
@@ -187,16 +187,21 @@ protected void printTask(Appendable bldr, long taskId, Map<Long, Set<Long>> prod
         }
     }
 
-    protected void renderLine(Appendable bldr, long taskId, int level) throws IOException {
-        for (int i = 0; i < level; i++) {
-            bldr.append("    ");
-        }
-        if (taskId == DATA_RECEIPT_ID) {
-            bldr.append(taskRenderer.renderDefaultTask()).append('\n');
-        } else {
-            PipelineTask task = taskCrud.retrieve(taskId);
-            bldr.append(taskRenderer.renderTask(task));
-            bldr.append("\n");
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    protected void renderLine(Appendable bldr, long taskId, int level) {
+        try {
+            for (int i = 0; i < level; i++) {
+                bldr.append("    ");
+            }
+            if (taskId == DATA_RECEIPT_ID) {
+                bldr.append(taskRenderer.renderDefaultTask()).append('\n');
+            } else {
+                PipelineTask task = taskCrud.retrieve(taskId);
+                bldr.append(taskRenderer.renderTask(task));
+                bldr.append("\n");
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException("IOException occurred rendering line ", e);
         }
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/accounting/DetailedPipelineTaskRenderer.java b/src/main/java/gov/nasa/ziggy/data/accounting/DetailedPipelineTaskRenderer.java
index 165e1df..a982a5e 100644
--- a/src/main/java/gov/nasa/ziggy/data/accounting/DetailedPipelineTaskRenderer.java
+++ b/src/main/java/gov/nasa/ziggy/data/accounting/DetailedPipelineTaskRenderer.java
@@ -1,6 +1,5 @@
 package gov.nasa.ziggy.data.accounting;
 
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 
 /**
@@ -11,11 +10,7 @@
 public class DetailedPipelineTaskRenderer implements PipelineTaskRenderer {
     @Override
     public String renderTask(PipelineTask task) {
-        try {
-            return task.prettyPrint();
-        } catch (PipelineException e) {
-            throw new IllegalStateException(e);
-        }
+        return task.prettyPrint();
     }
 
     @Override
diff --git a/src/main/java/gov/nasa/ziggy/data/accounting/SimpleTaskRenderer.java b/src/main/java/gov/nasa/ziggy/data/accounting/SimpleTaskRenderer.java
index 4d20190..5950e77 100644
--- a/src/main/java/gov/nasa/ziggy/data/accounting/SimpleTaskRenderer.java
+++ b/src/main/java/gov/nasa/ziggy/data/accounting/SimpleTaskRenderer.java
@@ -1,6 +1,5 @@
 package gov.nasa.ziggy.data.accounting;
 
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 
 /**
@@ -11,11 +10,7 @@
 public class SimpleTaskRenderer implements PipelineTaskRenderer {
     @Override
     public String renderTask(PipelineTask task) {
-        try {
-            return task.uowTaskInstance().briefState();
-        } catch (PipelineException e) {
-            throw new IllegalStateException(e);
-        }
+        return task.uowTaskInstance().briefState();
     }
 
     @Override
diff --git a/src/main/java/gov/nasa/ziggy/data/management/Acknowledgement.java b/src/main/java/gov/nasa/ziggy/data/management/Acknowledgement.java
index 3b5c3aa..4f9508f 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/Acknowledgement.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/Acknowledgement.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.data.management;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -16,7 +16,6 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.io.FilenameUtils;
-import org.xml.sax.SAXException;
 
 import gov.nasa.ziggy.data.management.Manifest.ManifestEntry;
 import gov.nasa.ziggy.module.PipelineException;
@@ -25,10 +24,11 @@
 import gov.nasa.ziggy.pipeline.xml.ValidatingXmlManager;
 import gov.nasa.ziggy.services.alert.AlertService;
 import gov.nasa.ziggy.services.alert.AlertService.Severity;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.ZiggyShutdownHook;
-import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -98,9 +98,7 @@ public Acknowledgement(ChecksumType checksumType) {
      * Writes the acknowledgement to the specified directory. The manifest name must be set to a
      * valid value; if not, a {@link PipelineException} will occur.
      */
-    public void write(Path directory) throws InstantiationException, IllegalAccessException,
-        SAXException, JAXBException, IllegalArgumentException, InvocationTargetException,
-        NoSuchMethodException, SecurityException {
+    public void write(Path directory) {
 
         ValidatingXmlManager<Acknowledgement> xmlManager = new ValidatingXmlManager<>(
             Acknowledgement.class);
@@ -137,22 +135,15 @@ public static String nameFromManifestName(Manifest manifest) {
      * whether the manifest has already been acknowledged, which can occur if the data receipt
      * process is interrupted after validation but prior to completion of file imports.
      */
-    public static boolean validAcknowledgementExists(Path workingDir, Manifest manifest)
-        throws IllegalArgumentException, InvocationTargetException, NoSuchMethodException,
-        SecurityException {
+    public static boolean validAcknowledgementExists(Path workingDir, Manifest manifest) {
         Path acknowledgementPath = workingDir.resolve(nameFromManifestName(manifest));
         if (!Files.exists(acknowledgementPath)) {
             return false;
         }
         ValidatingXmlManager<Acknowledgement> xmlManager;
-        try {
-            xmlManager = new ValidatingXmlManager<>(Acknowledgement.class);
-            Acknowledgement ack = xmlManager.unmarshal(acknowledgementPath.toFile());
-            return ack.transferStatus.equals(DataReceiptStatus.VALID);
-        } catch (InstantiationException | IllegalAccessException | SAXException | JAXBException e) {
-            throw new PipelineException(
-                "Unable to read acknowledgement " + acknowledgementPath.toString(), e);
-        }
+        xmlManager = new ValidatingXmlManager<>(Acknowledgement.class);
+        Acknowledgement ack = xmlManager.unmarshal(acknowledgementPath.toFile());
+        return ack.transferStatus.equals(DataReceiptStatus.VALID);
     }
 
     public Map<String, AcknowledgementEntry> fileNameToAckEntry() {
@@ -183,6 +174,7 @@ public List<String> namesOfValidFiles() {
      * @return {@link Acknowledgement} that includes validation status of all files referenced in
      * the manifest.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public static Acknowledgement of(Manifest manifest, Path dir, long taskId) {
 
         Acknowledgement acknowledgement = new Acknowledgement(manifest.getChecksumType());
@@ -192,7 +184,7 @@ public static Acknowledgement of(Manifest manifest, Path dir, long taskId) {
 
         int maxValidationFailures = (int) (acknowledgement.getFileCount()
             * ZiggyConfiguration.getInstance()
-                .getDouble(PropertyNames.MAX_FAILURE_PERCENTAGE_PROP_NAME,
+                .getDouble(PropertyName.MAX_FAILURE_PERCENTAGE.property(),
                     DEFAULT_MAX_FAILURE_PERCENTAGE)
             / 100);
 
@@ -201,17 +193,8 @@ public static Acknowledgement of(Manifest manifest, Path dir, long taskId) {
         // perform entry-by-entry validation in the dedicated thread pool for same.
         List<Future<AcknowledgementEntry>> futures = new ArrayList<>();
         for (ManifestEntry manifestEntry : manifest.getManifestEntries()) {
-            futures.add(checksumThreadPool.submit(() -> {
-                AcknowledgementEntry ackEntry = null;
-                try {
-                    ackEntry = AcknowledgementEntry.of(manifestEntry, dir,
-                        acknowledgement.getChecksumType());
-                } catch (IOException e) {
-                    throw new PipelineException("Unable to calculate checksum or file size "
-                        + " of file " + manifestEntry.getName(), e);
-                }
-                return ackEntry;
-            }));
+            futures.add(checksumThreadPool.submit(() -> AcknowledgementEntry.of(manifestEntry, dir,
+                acknowledgement.getChecksumType())));
         }
 
         // Capture the AcknowledgementEntry instances as they complete.
@@ -338,34 +321,39 @@ public DataReceiptStatus overallStatus() {
          * {@link ManifestEntry}. Validation of the file represented by the ManifestEntry is
          * performed, and the validation results are stored in the AcknowledgementEntry.
          */
+        @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
         public static AcknowledgementEntry of(ManifestEntry manifestEntry, Path dir,
-            ChecksumType checksumType) throws IOException {
+            ChecksumType checksumType) {
 
-            AcknowledgementEntry ackEntry = new AcknowledgementEntry();
-            ackEntry.setName(manifestEntry.getName());
-            Path file = dir.resolve(manifestEntry.getName());
             Path realFile = null;
-            ackEntry.setTransferStatus(DataReceiptStatus.ABSENT);
-            ackEntry.setValidationStatus(DataReceiptStatus.INVALID);
+            try {
+                AcknowledgementEntry ackEntry = new AcknowledgementEntry();
+                ackEntry.setName(manifestEntry.getName());
+                Path file = dir.resolve(manifestEntry.getName());
+                ackEntry.setTransferStatus(DataReceiptStatus.ABSENT);
+                ackEntry.setValidationStatus(DataReceiptStatus.INVALID);
+
+                // Start by making sure the file exists and is a regular file (or symlink to same)
+                if (Files.exists(file) || Files.isSymbolicLink(file)) {
+                    realFile = DataFileManager.realSourceFile(file);
+                    ackEntry.setTransferStatus(DataReceiptStatus.PRESENT);
+                }
+                if (ackEntry.getTransferStatus() == DataReceiptStatus.ABSENT) {
+                    return ackEntry;
+                }
 
-            // Start by making sure the file exists and is a regular file (or symlink to same)
-            if (Files.exists(file) || Files.isSymbolicLink(file)) {
-                realFile = DataFileManager.realSourceFile(file);
-                ackEntry.setTransferStatus(DataReceiptStatus.PRESENT);
-            }
-            if (ackEntry.getTransferStatus() == DataReceiptStatus.ABSENT) {
+                // If the transfer was successful, we can set the validation status
+                ackEntry.setSize(Files.size(realFile));
+                ackEntry.setChecksum(checksumType.checksum(realFile));
+                if (ackEntry.getSize() == manifestEntry.getSize()
+                    && ackEntry.getChecksum().equals(manifestEntry.getChecksum())) {
+                    ackEntry.setValidationStatus(DataReceiptStatus.VALID);
+                }
                 return ackEntry;
+            } catch (IOException e) {
+                throw new UncheckedIOException("Unable to get size of file " + realFile.toString(),
+                    e);
             }
-
-            // If the transfer was successful, we can set the validation status
-            ackEntry.setSize(Files.size(realFile));
-            ackEntry.setChecksum(checksumType.checksum(realFile));
-            if (ackEntry.getSize() == manifestEntry.getSize()
-                && ackEntry.getChecksum().equals(manifestEntry.getChecksum())) {
-                ackEntry.setValidationStatus(DataReceiptStatus.VALID);
-            }
-            return ackEntry;
-
         }
 
         public String getName() {
@@ -426,6 +414,5 @@ public boolean equals(Object obj) {
                 && size == other.size && transferStatus == other.transferStatus
                 && validationStatus == other.validationStatus;
         }
-
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/ChecksumType.java b/src/main/java/gov/nasa/ziggy/data/management/ChecksumType.java
index 2a17cbe..08ac0ef 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/ChecksumType.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/ChecksumType.java
@@ -2,11 +2,14 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 
 import org.apache.commons.codec.digest.DigestUtils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import jakarta.xml.bind.annotation.XmlEnum;
 
 /**
@@ -23,30 +26,54 @@ public enum ChecksumType {
             Checksums used for integrity, not security, hence
                weak checksums are acceptable.
                """)
-        public String checksum(Path file) throws IOException {
-            return DigestUtils.md5Hex(new FileInputStream(file.toFile()));
+        @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+        public String checksum(Path file) {
+            try {
+                return DigestUtils.md5Hex(new FileInputStream(file.toFile()));
+            } catch (IOException e) {
+                throw new UncheckedIOException(
+                    "Unable to open file input stream for " + file.toString(), e);
+            }
         }
     },
     SHA1 {
         @Override
-        public String checksum(Path file) throws IOException {
-            return DigestUtils.sha1Hex(new FileInputStream(file.toFile()));
+        @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+        public String checksum(Path file) {
+            try {
+                return DigestUtils.sha1Hex(new FileInputStream(file.toFile()));
+            } catch (IOException e) {
+                throw new UncheckedIOException(
+                    "Unable to open file input stream for " + file.toString(), e);
+            }
         }
     },
     SHA256 {
         @Override
-        public String checksum(Path file) throws IOException {
-            return DigestUtils.sha256Hex(new FileInputStream(file.toFile()));
+        @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+        public String checksum(Path file) {
+            try {
+                return DigestUtils.sha256Hex(new FileInputStream(file.toFile()));
+            } catch (IOException e) {
+                throw new UncheckedIOException(
+                    "Unable to open file input stream for " + file.toString(), e);
+            }
         }
     },
     SHA512 {
         @Override
-        public String checksum(Path file) throws IOException {
-            return DigestUtils.sha512Hex(new FileInputStream(file.toFile()));
+        @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+        public String checksum(Path file) {
+            try {
+                return DigestUtils.sha512Hex(new FileInputStream(file.toFile()));
+            } catch (IOException e) {
+                throw new UncheckedIOException(
+                    "Unable to open file input stream for " + file.toString(), e);
+            }
         }
     };
 
-    public abstract String checksum(Path file) throws IOException;
+    public abstract String checksum(Path file);
 
     public String value() {
         return name();
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DataFileInfo.java b/src/main/java/gov/nasa/ziggy/data/management/DataFileInfo.java
index ec1398d..dc7c6fc 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DataFileInfo.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DataFileInfo.java
@@ -90,5 +90,4 @@ public int compareTo(DataFileInfo other) {
     public String toString() {
         return name.toString();
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DataFileManager.java b/src/main/java/gov/nasa/ziggy/data/management/DataFileManager.java
index 3bcde6b..d33e1ef 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DataFileManager.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DataFileManager.java
@@ -5,6 +5,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
@@ -43,9 +44,11 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.uow.TaskConfigurationParameters;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
@@ -144,7 +147,7 @@ public DataFileManager(Path datastoreRoot, Path taskDirectory, PipelineTask pipe
     private DatastoreCopyType taskDirCopyType() {
         DatastoreCopyType copyType = null;
         boolean useSymlinks = ZiggyConfiguration.getInstance()
-            .getBoolean(PropertyNames.USE_SYMLINKS_PROP_NAME, false);
+            .getBoolean(PropertyName.USE_SYMLINKS.property(), false);
         if (useSymlinks) {
             copyType = DatastoreCopyType.SYMLINK;
         } else {
@@ -331,6 +334,7 @@ public void copyFilesByNameFromTaskDirToWorkingDir(Collection<String> filenames)
      *
      * @param dataFileTypes Set of DataFileType instances to use in deletion.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void deleteDataFilesByTypeFromTaskDirectory(Set<DataFileType> dataFileTypes) {
 
         Map<DataFileType, Set<Path>> dataFileTypesMap = taskDirectoryDataFilesMap(dataFileTypes);
@@ -346,9 +350,7 @@ public void deleteDataFilesByTypeFromTaskDirectory(Set<DataFileType> dataFileTyp
                         FileUtils.deleteDirectory(fullPath.toFile());
                     }
                 } catch (IOException e) {
-                    throw new PipelineException(
-                        "Unable to delete file " + fullPath.getFileName().toString()
-                            + " from task directory " + taskDirectory.toString(),
+                    throw new UncheckedIOException("IO Exception for file " + fullPath.toString(),
                         e);
                 }
             }
@@ -456,6 +458,7 @@ public Map<Class<? extends DataFileInfo>, Set<? extends DataFileInfo>> dataFiles
      * objects are generated from the files in a specified directory. The search for the objects
      * runs through a collection of directories.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public Map<Class<? extends DataFileInfo>, Set<? extends DataFileInfo>> dataFilesMap(
         Collection<Path> dirs, Set<Class<? extends DataFileInfo>> dataFileInfoClasses) {
 
@@ -467,7 +470,7 @@ public Map<Class<? extends DataFileInfo>, Set<? extends DataFileInfo>> dataFiles
             try {
                 filesSet = Files.list(dir).collect(Collectors.toCollection(TreeSet::new));
             } catch (IOException e) {
-                throw new PipelineException("Unable to list files in " + dir.toString(), e);
+                throw new UncheckedIOException("Unable to list files in dir " + dir.toString(), e);
             }
 
             for (Class<? extends DataFileInfo> clazz : dataFileInfoClasses) {
@@ -481,7 +484,6 @@ public Map<Class<? extends DataFileInfo>, Set<? extends DataFileInfo>> dataFiles
                     datastoreMap.put(clazz, dataFilesOfClass);
                 }
             }
-
         }
         return datastoreMap;
     }
@@ -539,24 +541,21 @@ private Map<DataFileInfo, Path> findInputFiles(Set<? extends DataFileInfo> dataF
      * @param dataFiles Set of instances of DataFileInfo subclasses that represent the files to be
      * deleted.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void deleteFromTaskDirectory(Set<? extends DataFileInfo> dataFiles) {
         for (DataFileInfo dataFileInfo : dataFiles) {
             Path taskDirLocation = taskDirectory.resolve(dataFileInfo.getName());
             try {
                 if (Files.isRegularFile(taskDirLocation) || Files.isSymbolicLink(taskDirLocation)) {
                     Files.deleteIfExists(taskDirLocation);
-
                 } else {
                     FileUtils.deleteDirectory(taskDirLocation.toFile());
                 }
             } catch (IOException e) {
-                throw new PipelineException(
-                    "Unable to delete file " + dataFileInfo.getName().toString()
-                        + " from task directory " + taskDirectory.toString(),
-                    e);
+                throw new UncheckedIOException(
+                    "IOException occurred on file " + taskDirLocation.toString(), e);
             }
         }
-
     }
 
     /**
@@ -565,17 +564,21 @@ public void deleteFromTaskDirectory(Set<? extends DataFileInfo> dataFiles) {
      * @param dataFiles Set of instances of DataFileInfo subclasses that represent the files to be
      * moved.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void moveToDatastore(Set<? extends DataFileInfo> dataFiles) {
         Set<Path> datastoreFiles = new HashSet<>();
         for (DataFileInfo dataFileInfo : dataFiles) {
             Path taskDirLocation = taskDirectory.resolve(dataFileInfo.getName());
             Path datastoreLocation = datastorePathLocator.datastorePath(dataFileInfo);
             Path datastoreLocationParent = datastoreLocation.getParent();
+            if (datastoreLocationParent == null) {
+                throw new PipelineException("Unable to obtain parent of datastore location");
+            }
             try {
                 Files.createDirectories(datastoreLocationParent);
             } catch (IOException e) {
-                throw new PipelineException("Unable to create directory " + datastoreLocationParent,
-                    e);
+                throw new UncheckedIOException(
+                    "Unable to create directory " + datastoreLocationParent.toString(), e);
             }
             datastoreCopyType.copy(taskDirLocation, datastoreLocation);
             datastoreFiles.add(datastoreRoot.relativize(datastoreLocation));
@@ -688,8 +691,6 @@ private Map<DataFileType, Set<Path>> dataFilesMap(Collection<Path> directories,
                 final Path finalPathToRelativize = pathToRelativize;
                 filesSet = pathStream.map(s -> finalPathToRelativize.relativize(s))
                     .collect(Collectors.toCollection(TreeSet::new));
-            } catch (IOException e) {
-                throw new PipelineException("Unable to list files in " + directory.toString(), e);
             } finally {
                 if (pathStream != null) {
                     pathStream.close();
@@ -713,7 +714,6 @@ private Map<DataFileType, Set<Path>> dataFilesMap(Collection<Path> directories,
             }
         }
         return dataFilesMap;
-
     }
 
     /**
@@ -726,6 +726,8 @@ private Map<DataFileType, Set<Path>> dataFilesMap(Collection<Path> directories,
      * @return Set of all Paths in files argument that correspond to the specified subclass of
      * DataFileInfo.
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     private <T extends DataFileInfo> Set<T> dataFilesOfClass(Class<T> clazz, Set<Path> files) {
         Set<T> dataFiles = new TreeSet<>();
         Set<Path> foundFiles = new HashSet<>();
@@ -737,8 +739,9 @@ private <T extends DataFileInfo> Set<T> dataFilesOfClass(Class<T> clazz, Set<Pat
             dataFileInfoForPatternCheck = noArgConstructor.newInstance();
         } catch (NoSuchMethodException | SecurityException | InstantiationException
             | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-            throw new PipelineException(
-                "Unable to perform reflection on " + clazz.getCanonicalName(), e);
+            // Can never occur. All DataFileInfo classes can be constructed in the manner
+            // used above.
+            throw new AssertionError(e);
         }
         for (Path file : files) {
 
@@ -749,12 +752,12 @@ private <T extends DataFileInfo> Set<T> dataFilesOfClass(Class<T> clazz, Set<Pat
                     dataFiles.add(stringArgConstructor.newInstance(file.getFileName().toString()));
                 } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
                     | InvocationTargetException e) {
-                    throw new PipelineException("Unable to instantiate class "
-                        + clazz.getCanonicalName() + " with file " + file.toString(), e);
+                    // Can never occur. DataFileInfo instances can always be instantiated in
+                    // the manner shown above.
+                    throw new AssertionError(e);
                 }
                 foundFiles.add(file);
             }
-
         }
 
         return dataFiles;
@@ -790,7 +793,6 @@ private Map<DataFileType, Set<Path>> copyDataFilesByTypeToDestination(
                     taskDirectory, dataFileType, dataFile);
                 datastoreFiles.add(datastoreRoot.relativize(dataFilePaths.getDatastorePath()));
                 copyType.copy(dataFilePaths.getSourcePath(), dataFilePaths.getDestinationPath());
-
             }
             if (destination.equals(RegexType.DATASTORE)) {
                 copiedFiles.put(dataFileType, datastoreFiles);
@@ -820,7 +822,6 @@ private List<Path> completedSubtaskDirectories(Predicate<? super File> predicate
             .filter(predicate)
             .map(File::toPath)
             .collect(Collectors.toList());
-
     }
 
     private Set<Path> filterDataFiles(Set<Path> allDataFiles, RegexType destination) {
@@ -879,7 +880,6 @@ private Set<Path> filterDataFilesForKeepUpProcessing(Set<Path> allDataFiles) {
             .filter(s -> Collections.disjoint(s.getAllConsumers(), consumersWithMatchingNode))
             .map(s -> Paths.get(s.getFilename()))
             .collect(Collectors.toSet());
-
     }
 
     /**
@@ -921,11 +921,17 @@ private Set<Path> filterDataFilesForBugfixProcessing(Set<Path> allDataFiles,
      * path. Thus the "actual source" is either a non-symlink file that the src file is a link to,
      * or it's a file (symlink or regular file) that lies inside the datastore.
      */
-    public static Path realSourceFile(Path src) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static Path realSourceFile(Path src) {
         Path datastoreRoot = DirectoryProperties.datastoreRootDir();
         Path trueSrc = src;
         if (Files.isSymbolicLink(src) && !src.startsWith(datastoreRoot)) {
-            trueSrc = realSourceFile(Files.readSymbolicLink(src));
+            try {
+                trueSrc = realSourceFile(Files.readSymbolicLink(src));
+            } catch (IOException e) {
+                throw new UncheckedIOException("Unable to resolve symbolic link " + src.toString(),
+                    e);
+            }
         }
         return trueSrc;
     }
@@ -964,56 +970,60 @@ public static Path realSourceFile(Path src) throws IOException {
     private enum DatastoreCopyType {
         COPY {
             @Override
-            protected void copyInternal(Path src, Path dest) throws IOException {
-                checkout(src, dest);
-                if (Files.isRegularFile(src)) {
-                    Files.copy(src, dest, StandardCopyOption.REPLACE_EXISTING);
-                } else {
-                    FileUtils.copyDirectory(src.toFile(), dest.toFile());
+            @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+            protected void copyInternal(Path src, Path dest) {
+                try {
+                    checkout(src, dest);
+                    if (Files.isRegularFile(src)) {
+                        Files.copy(src, dest, StandardCopyOption.REPLACE_EXISTING);
+                    } else {
+                        FileUtils.copyDirectory(src.toFile(), dest.toFile());
+                    }
+                } catch (IOException e) {
+                    throw new UncheckedIOException(
+                        "Unable to copy " + src.toString() + " to " + dest.toString(), e);
                 }
             }
-
-            @Override
-            protected String pipelineExceptionFormat() {
-                return "Unable to copy file %s to %s\n";
-            }
         },
         MOVE {
             @Override
-            protected void copyInternal(Path src, Path dest) throws IOException {
-                checkout(src, dest);
-                Path trueSrc = DataFileManager.realSourceFile(src);
-                if (Files.exists(dest)) {
-                    FileUtil.prepareDirectoryTreeForOverwrites(dest);
-                }
-                Files.move(trueSrc, dest, StandardCopyOption.REPLACE_EXISTING,
-                    StandardCopyOption.ATOMIC_MOVE);
-                FileUtil.writeProtectDirectoryTree(dest);
-                if (src != trueSrc) {
-                    Files.delete(src);
-                    Files.createSymbolicLink(trueSrc, dest);
+            @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+            protected void copyInternal(Path src, Path dest) {
+                try {
+                    checkout(src, dest);
+                    Path trueSrc = DataFileManager.realSourceFile(src);
+                    if (Files.exists(dest)) {
+                        FileUtil.prepareDirectoryTreeForOverwrites(dest);
+                    }
+                    Files.move(trueSrc, dest, StandardCopyOption.REPLACE_EXISTING,
+                        StandardCopyOption.ATOMIC_MOVE);
+                    FileUtil.writeProtectDirectoryTree(dest);
+                    if (src != trueSrc) {
+                        Files.delete(src);
+                        Files.createSymbolicLink(trueSrc, dest);
+                    }
+                } catch (IOException e) {
+                    throw new UncheckedIOException(
+                        "Unable to move or symlink " + src.toString() + " to " + dest.toString(),
+                        e);
                 }
             }
-
-            @Override
-            protected String pipelineExceptionFormat() {
-                return "Unable to move file %s to %s\n";
-            }
         },
         SYMLINK {
             @Override
-            protected void copyInternal(Path src, Path dest) throws IOException {
-                checkout(src, dest);
-                Path trueSrc = DataFileManager.realSourceFile(src);
-                if (Files.exists(dest)) {
-                    Files.delete(dest);
+            @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+            protected void copyInternal(Path src, Path dest) {
+                try {
+                    checkout(src, dest);
+                    Path trueSrc = DataFileManager.realSourceFile(src);
+                    if (Files.exists(dest)) {
+                        Files.delete(dest);
+                    }
+                    Files.createSymbolicLink(dest, trueSrc);
+                } catch (IOException e) {
+                    throw new UncheckedIOException(
+                        "Unable to symlink from " + src.toString() + " to " + dest.toString(), e);
                 }
-                Files.createSymbolicLink(dest, trueSrc);
-            }
-
-            @Override
-            protected String pipelineExceptionFormat() {
-                return "Unable to create symlink %s from %s\n";
             }
         };
 
@@ -1021,26 +1031,15 @@ protected String pipelineExceptionFormat() {
          * Copy operation that allows / forces the caller to manage any {@link IOException} that
          * occurs.
          */
-        protected abstract void copyInternal(Path src, Path dest) throws IOException;
-
-        /**
-         * Provides a formatting string for the {@link PipelineException} thrown by
-         * {@link #copy(Path, Path)}.
-         */
-        protected abstract String pipelineExceptionFormat();
+        protected abstract void copyInternal(Path src, Path dest);
 
         /**
-         * Copy operation that manages any resulting {@link IOException}}. In this event, a
-         * {@link PipelineException} is thrown, which terminates execution of the datastore
+         * Copy operation that manages any resulting {@link IOException}}. In this event, an
+         * {@link UncheckedIOException} is thrown, which terminates execution of the datastore
          * operations.
          */
         public void copy(Path src, Path dest) {
-            try {
-                copyInternal(src, dest);
-            } catch (IOException e) {
-                throw new PipelineException(
-                    String.format(pipelineExceptionFormat(), src.toString(), dest.toString()), e);
-            }
+            copyInternal(src, dest);
         }
 
         private static void checkout(Path src, Path dest) {
@@ -1049,7 +1048,6 @@ private static void checkout(Path src, Path dest) {
             checkArgument(Files.exists(src, LinkOption.NOFOLLOW_LINKS),
                 "Source file " + src + " does not exist");
         }
-
     }
 
     /**
@@ -1058,8 +1056,6 @@ private static void checkout(Path src, Path dest) {
      * symbolic link at the destination that links to the true source file and removal of the
      * symbolic link that was used as the source file. Sources that are not symbolic links will use
      * the {@link DatastoreCopyType#MOVE} operation.
-     *
-     * @throws IOException if any such occurs during the underlying file operations.
      */
     public static void moveOrSymlink(Path src, Path dest) throws IOException {
 
@@ -1070,5 +1066,4 @@ public static void moveOrSymlink(Path src, Path dest) throws IOException {
             DatastoreCopyType.MOVE.copy(src, dest);
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DataFilePaths.java b/src/main/java/gov/nasa/ziggy/data/management/DataFilePaths.java
index 9a0dd09..1412d1d 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DataFilePaths.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DataFilePaths.java
@@ -32,5 +32,4 @@ public Path getDestinationPath() {
     public Path getDatastorePath() {
         return datastorePath;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DataFileType.java b/src/main/java/gov/nasa/ziggy/data/management/DataFileType.java
index 44363c2..697ff46 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DataFileType.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DataFileType.java
@@ -1,6 +1,7 @@
 package gov.nasa.ziggy.data.management;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -14,16 +15,16 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.module.io.Persistable;
 import gov.nasa.ziggy.module.io.ProxyIgnore;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.RegexBackslashManager;
 import gov.nasa.ziggy.util.RegexGroupCounter;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -50,7 +51,7 @@
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_DATA_FILE_TYPE")
+@Table(name = "ziggy_DataFileType")
 public class DataFileType implements Persistable {
 
     public enum RegexType {
@@ -73,15 +74,20 @@ public DataFilePaths dataFilePaths(Path datastoreRoot, Path taskDirectory,
             }
 
             @Override
-            public Stream<Path> pathStream(Path directory) throws IOException {
-                return Files.list(directory);
+            @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+            public Stream<Path> pathStream(Path directory) {
+                try {
+                    return Files.list(directory);
+                } catch (IOException e) {
+                    throw new UncheckedIOException(
+                        "Unable to list files of dir " + directory.toString(), e);
+                }
             }
 
             @Override
             public Path pathToRelativize(Path directory, Path datastoreRoot) {
                 return directory;
             }
-
         },
         DATASTORE {
             @Override
@@ -90,6 +96,7 @@ public Pattern getPattern(DataFileType dataFileType) {
             }
 
             @Override
+            @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
             public DataFilePaths dataFilePaths(Path datastoreRoot, Path taskDirectory,
                 DataFileType dataFileType, Path dataFile) {
                 Path sourcePath = taskDirectory.resolve(dataFile);
@@ -99,8 +106,8 @@ public DataFilePaths dataFilePaths(Path datastoreRoot, Path taskDirectory,
                 try {
                     Files.createDirectories(destinationPath.getParent());
                 } catch (IOException e) {
-                    throw new PipelineException(
-                        "Unable to create directory " + destinationPath.getParent(), e);
+                    throw new UncheckedIOException(
+                        "Unable to create directory " + destinationPath.getParent().toString(), e);
                 }
                 DataFilePaths paths = new DataFilePaths(sourcePath, destinationPath);
                 paths.setDatastorePathToDestination();
@@ -108,15 +115,20 @@ public DataFilePaths dataFilePaths(Path datastoreRoot, Path taskDirectory,
             }
 
             @Override
-            public Stream<Path> pathStream(Path directory) throws IOException {
-                return Files.walk(directory);
+            @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+            public Stream<Path> pathStream(Path directory) {
+                try {
+                    return Files.walk(directory);
+                } catch (IOException e) {
+                    throw new UncheckedIOException(
+                        "Unable to walk directory tree " + directory.toString(), e);
+                }
             }
 
             @Override
             public Path pathToRelativize(Path directory, Path datastoreRoot) {
                 return datastoreRoot;
             }
-
         };
 
         public abstract Pattern getPattern(DataFileType dataFileType);
@@ -124,10 +136,9 @@ public Path pathToRelativize(Path directory, Path datastoreRoot) {
         public abstract DataFilePaths dataFilePaths(Path datastoreRoot, Path taskDirectory,
             DataFileType dataFileType, Path dataFile);
 
-        public abstract Stream<Path> pathStream(Path directory) throws IOException;
+        public abstract Stream<Path> pathStream(Path directory);
 
         public abstract Path pathToRelativize(Path directory, Path datastoreRoot);
-
     }
 
     @Transient
@@ -163,7 +174,6 @@ public abstract DataFilePaths dataFilePaths(Path datastoreRoot, Path taskDirecto
 
     // Used by Hibernate, do not remove.
     public DataFileType() {
-
     }
 
     /**
@@ -424,7 +434,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         DataFileType other = (DataFileType) obj;
@@ -433,5 +443,4 @@ public boolean equals(Object obj) {
         }
         return true;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DataFileTypeImporter.java b/src/main/java/gov/nasa/ziggy/data/management/DataFileTypeImporter.java
index 413532b..66ca2b1 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DataFileTypeImporter.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DataFileTypeImporter.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -35,7 +35,6 @@
 package gov.nasa.ziggy.data.management;
 
 import java.io.File;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -50,7 +49,6 @@
 import org.apache.commons.cli.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
 
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.ModelType;
@@ -58,6 +56,8 @@
 import gov.nasa.ziggy.pipeline.definition.crud.ModelCrud;
 import gov.nasa.ziggy.pipeline.xml.ValidatingXmlManager;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import jakarta.xml.bind.JAXBException;
 
 /**
@@ -81,14 +81,45 @@ public class DataFileTypeImporter {
     private static List<String> databaseDataFileTypeNames = new ArrayList<>();
     private static Set<String> databaseModelTypes = new HashSet<>();
 
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    public static void main(String[] args) {
+
+        CommandLineParser parser = new DefaultParser();
+        Options options = new Options();
+        options.addOption("dryrun", false,
+            "Parses and creates objects but does not persist to database");
+        CommandLine cmdLine = null;
+        try {
+            cmdLine = parser.parse(options, args);
+        } catch (ParseException e) {
+            System.err.println("Illegal argument: " + e.getMessage());
+        }
+        String[] filenames = cmdLine.getArgs();
+        boolean dryrun = cmdLine.hasOption("dryrun");
+        DataFileTypeImporter importer = new DataFileTypeImporter(Arrays.asList(filenames), dryrun);
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            databaseDataFileTypeNames = new DataFileTypeCrud().retrieveAllNames();
+            databaseModelTypes = new ModelCrud().retrieveModelTypeMap().keySet();
+            return null;
+        });
+        if (!dryrun) {
+            DatabaseTransactionFactory.performTransaction(() -> {
+                importer.importFromFiles();
+                return null;
+            });
+        } else {
+            importer.importFromFiles();
+        }
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public DataFileTypeImporter(List<String> filenames, boolean dryrun) {
         this.filenames = filenames;
         this.dryrun = dryrun;
         try {
             xmlManager = new ValidatingXmlManager<>(DatastoreConfigurationFile.class);
-        } catch (InstantiationException | IllegalAccessException | SAXException | JAXBException
-            | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
-            | SecurityException e) {
+        } catch (IllegalArgumentException | SecurityException e) {
             throw new PipelineException(
                 "Unable to construct ValidatingXmlManager for class DatastoreConfigurationFile", e);
         }
@@ -104,7 +135,10 @@ public DataFileTypeImporter(List<String> filenames, boolean dryrun) {
      *
      * @throws JAXBException
      */
-    public void importFromFiles() throws JAXBException {
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    public void importFromFiles() {
 
         List<DataFileType> dataFileTypes = new ArrayList<>();
         List<ModelType> modelTypes = new ArrayList<>();
@@ -172,7 +206,6 @@ public void importFromFiles() throws JAXBException {
             log.info("Imported " + modelTypesFromFile.size() + " ModelType definitions from file "
                 + filename);
             modelTypes.addAll(modelTypesFromFile);
-
         } // end loop over files
 
         List<String> dataFileTypeNames = dataFileTypes.stream()
@@ -187,8 +220,7 @@ public void importFromFiles() throws JAXBException {
         List<String> modelTypeNames = modelTypes.stream()
             .map(ModelType::getType)
             .collect(Collectors.toList());
-        Set<String> uniqueModelTypeNames = new HashSet<>();
-        uniqueModelTypeNames.addAll(modelTypeNames);
+        Set<String> uniqueModelTypeNames = new HashSet<>(modelTypeNames);
         if (modelTypeNames.size() != uniqueModelTypeNames.size()) {
             throw new IllegalStateException("Unable to persist model types due to duplicate names");
         }
@@ -196,45 +228,13 @@ public void importFromFiles() throws JAXBException {
         if (!dryrun) {
             log.info(
                 "Persisting to datastore " + dataFileTypes.size() + " DataFileType definitions");
-            dataFileTypeCrud().create(dataFileTypes);
+            dataFileTypeCrud().persist(dataFileTypes);
             log.info("Persisting to datastore " + modelTypes.size() + " model definitions");
-            modelCrud().create(modelTypes);
+            modelCrud().persist(modelTypes);
             log.info("Persist step complete");
         } else {
             log.info("Not persisting because of dryrun option");
         }
-
-    }
-
-    public static void main(String[] args) throws JAXBException {
-
-        CommandLineParser parser = new DefaultParser();
-        Options options = new Options();
-        options.addOption("dryrun", false,
-            "Parses and creates objects but does not persist to database");
-        CommandLine cmdLine = null;
-        try {
-            cmdLine = parser.parse(options, args);
-        } catch (ParseException e) {
-            System.err.println("Illegal argument: " + e.getMessage());
-        }
-        String[] filenames = cmdLine.getArgs();
-        boolean dryrun = cmdLine.hasOption("dryrun");
-        DataFileTypeImporter importer = new DataFileTypeImporter(Arrays.asList(filenames), dryrun);
-
-        DatabaseTransactionFactory.performTransaction(() -> {
-            databaseDataFileTypeNames = new DataFileTypeCrud().retrieveAllNames();
-            databaseModelTypes = new ModelCrud().retrieveModelTypeMap().keySet();
-            return null;
-        });
-        if (!dryrun) {
-            DatabaseTransactionFactory.performTransaction(() -> {
-                importer.importFromFiles();
-                return null;
-            });
-        } else {
-            importer.importFromFiles();
-        }
     }
 
 // default scope for mocking in unit tests
@@ -259,5 +259,4 @@ int getDataFileImportedCount() {
     int getModelFileImportedCount() {
         return modelFileImportedCount;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DataImporter.java b/src/main/java/gov/nasa/ziggy/data/management/DataImporter.java
index f6178e3..683d203 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DataImporter.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DataImporter.java
@@ -110,7 +110,6 @@ public void importFilesToDatastore(List<String> namesOfFilesToImport) {
         // Preserve import records for use by callers.
         successfulImports = new TreeSet<>(dataFiles.values());
         failedImports = new TreeSet<>(invalidDataFilesMap.values());
-
     }
 
     public PipelineTask getPipelineTask() {
@@ -152,5 +151,4 @@ public Set<Path> getFailedImports() {
     public void setFailedImports(Set<Path> failedImports) {
         this.failedImports = failedImports;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DataReceiptPipelineModule.java b/src/main/java/gov/nasa/ziggy/data/management/DataReceiptPipelineModule.java
index b24ad49..fc23174 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DataReceiptPipelineModule.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DataReceiptPipelineModule.java
@@ -3,6 +3,7 @@
 import static com.google.common.base.Preconditions.checkState;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
@@ -18,11 +19,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
 
 import gov.nasa.ziggy.data.management.DatastoreProducerConsumer.DataReceiptFileType;
 import gov.nasa.ziggy.models.ModelImporter;
@@ -41,14 +41,14 @@
 import gov.nasa.ziggy.services.alert.AlertService;
 import gov.nasa.ziggy.services.alert.AlertService.Severity;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.DatabaseService;
 import gov.nasa.ziggy.uow.DirectoryUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.UnitOfWork;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
-import gov.nasa.ziggy.worker.WorkerTaskRequestDispatcher;
-import jakarta.xml.bind.JAXBException;
 
 /**
  * Pipeline module that performs data receipt, defined as the process that brings science data and
@@ -101,15 +101,14 @@ public DataReceiptPipelineModule(PipelineTask pipelineTask, RunMode runMode) {
     }
 
     @Override
-    public boolean processTask() throws PipelineException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public boolean processTask() {
 
         // Get the top-level DR directory and the datastore root directory
-        Configuration config = ZiggyConfiguration.getInstance();
-        dataReceiptDir = config.getString(PropertyNames.DATA_RECEIPT_DIR_PROP_NAME);
-        checkState(dataReceiptDir != null,
-            PropertyNames.DATA_RECEIPT_DIR_PROP_NAME + " missing or empty");
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+        dataReceiptDir = config.getString(PropertyName.DATA_RECEIPT_DIR.property());
         datastoreRoot = DirectoryProperties.datastoreRootDir();
-        UnitOfWork uow = pipelineTask.getUowTask().getInstance();
+        UnitOfWork uow = pipelineTask.uowTaskInstance();
         dataReceiptTopLevelPath = Paths.get(dataReceiptDir);
         dataImportPathForTask = dataReceiptTopLevelPath
             .resolve(DirectoryUnitOfWorkGenerator.directory(uow));
@@ -117,16 +116,18 @@ public boolean processTask() throws PipelineException {
             dataImportPathForTask.toString() + " not a directory");
 
         boolean containsNonHiddenFiles = false;
+        Path filePathForException = null;
         try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(dataImportPathForTask)) {
             for (Path filePath : dirStream) {
+                filePathForException = filePath;
                 if (!Files.isHidden(filePath)) {
                     containsNonHiddenFiles = true;
                     break;
                 }
             }
         } catch (IOException e) {
-            throw new PipelineException(
-                "Unable to list directory " + dataImportPathForTask.toString());
+            throw new UncheckedIOException(
+                "Unable to check hidden status of " + filePathForException.toString(), e);
         }
 
         if (!containsNonHiddenFiles) {
@@ -167,10 +168,6 @@ public List<ProcessingState> processingStates() {
     public void processingMainLoop() {
 
         while (!processingComplete) {
-            if (WorkerTaskRequestDispatcher.isTaskDeleted(pipelineTask.getId())) {
-                log.error("Exiting Data Receipt pipeline module due to task deletion");
-                return;
-            }
             getProcessingState().taskAction(this);
         }
     }
@@ -209,7 +206,7 @@ && manifestCrud().datasetIdExists(manifest.getDatasetId())) {
 
         // Save the manifest information in the database.
         manifest.setAcknowledged(true);
-        manifestCrud().create(manifest);
+        manifestCrud().persist(manifest);
 
         // Make sure that all the regular files in the directory tree have been validated
         // (i.e., there are no files in the directory tree that are absent from the
@@ -220,18 +217,10 @@ && manifestCrud().datasetIdExists(manifest.getDatasetId())) {
     }
 
     private void readManifest() {
-
-        try {
-            manifest = Manifest.readManifest(dataImportPathForTask);
-            if (manifest == null) {
-                throw new PipelineException(
-                    "No manifest file present in directory " + dataImportPathForTask.toString());
-            }
-        } catch (InstantiationException | IllegalAccessException | IOException | SAXException
-            | JAXBException | IllegalArgumentException | SecurityException
-            | InvocationTargetException | NoSuchMethodException e) {
-            throw new PipelineException("Unable to read manifest from directory " + dataReceiptDir,
-                e);
+        manifest = Manifest.readManifest(dataImportPathForTask);
+        if (manifest == null) {
+            throw new PipelineException(
+                "No manifest file present in directory " + dataImportPathForTask.toString());
         }
         log.info("Read manifest from file " + manifest.getName());
     }
@@ -241,14 +230,8 @@ private void acknowledgeManifest() {
         ack = Acknowledgement.of(manifest, dataImportPathForTask, pipelineTask.getId());
 
         // Write the acknowledgement to the directory.
-        try {
-            ack.write(dataImportPathForTask);
-            log.info("Acknowledgement file written: " + ack.getName());
-        } catch (InstantiationException | IllegalAccessException | SAXException | JAXBException
-            | IllegalArgumentException | SecurityException | InvocationTargetException
-            | NoSuchMethodException e) {
-            throw new PipelineException("Unable to write manifest acknowledgement", e);
-        }
+        ack.write(dataImportPathForTask);
+        log.info("Acknowledgement file written: " + ack.getName());
 
         // If the acknowledgement has bad status, throw an exception now.
         if (ack.getTransferStatus().equals(DataReceiptStatus.INVALID)) {
@@ -264,36 +247,27 @@ private void checkForFilesNotInManifest() {
         // be the set of all names in the manifest)
         List<String> namesOfValidFiles = ack.namesOfValidFiles();
 
-        try {
-            Map<Path, Path> regularFilesInDirTree = FileUtil
-                .regularFilesInDirTree(dataImportPathForTask);
-            List<String> filenamesInDirTree = regularFilesInDirTree.keySet()
-                .stream()
-                .map(Path::toString)
-                .collect(Collectors.toList());
-            filenamesInDirTree.removeAll(namesOfValidFiles);
-            filenamesInDirTree.remove(manifest.getName());
-            filenamesInDirTree.remove(ack.getName());
-            if (filenamesInDirTree.size() != 0) {
-                log.error("Data receipt directory " + dataImportPathForTask.toString()
-                    + " contains files not listed in manifest ");
-                for (String filename : filenamesInDirTree) {
-                    log.error("File missing from manifest: " + filename);
-                }
-                ack.write(dataImportPathForTask);
-                manifest.setAcknowledged(true);
-                log.info("Acknowledgement file written: " + ack.getName());
-                throw new PipelineException("Unable to import files from data receipt directory "
-                    + dataImportPathForTask.toString()
-                    + " due to presence of files not listed in manifest");
+        Map<Path, Path> regularFilesInDirTree = FileUtil
+            .regularFilesInDirTree(dataImportPathForTask);
+        List<String> filenamesInDirTree = regularFilesInDirTree.keySet()
+            .stream()
+            .map(Path::toString)
+            .collect(Collectors.toList());
+        filenamesInDirTree.removeAll(namesOfValidFiles);
+        filenamesInDirTree.remove(manifest.getName());
+        filenamesInDirTree.remove(ack.getName());
+        if (filenamesInDirTree.size() != 0) {
+            log.error("Data receipt directory " + dataImportPathForTask.toString()
+                + " contains files not listed in manifest ");
+            for (String filename : filenamesInDirTree) {
+                log.error("File missing from manifest: " + filename);
             }
-        } catch (IOException e1) {
-            throw new PipelineException(
-                "Unable to find regular files in directory " + dataImportPathForTask.toString(),
-                e1);
-        } catch (InvocationTargetException | NoSuchMethodException | InstantiationException
-            | IllegalAccessException | SAXException | JAXBException e) {
-            throw new PipelineException("Unable to write manifest acknowledgement", e);
+            ack.write(dataImportPathForTask);
+            manifest.setAcknowledged(true);
+            log.info("Acknowledgement file written: " + ack.getName());
+            throw new PipelineException("Unable to import files from data receipt directory "
+                + dataImportPathForTask.toString()
+                + " due to presence of files not listed in manifest");
         }
     }
 
@@ -327,27 +301,24 @@ public void storingTaskAction() {
         incrementProcessingState();
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_IN_RUNNABLE)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     private void generateFilenamesForImport() {
         try (Stream<Path> filestream = Files.list(dataImportPathForTask)) {
             namesOfFilesToImport = filestream.filter(t -> {
-
-                // Seriously, JDK? You're going to force me to have a try-catch block
-                // inside a stream if I ever want to use any java.nio.file methods within
-                // the stream? You can't simply manage it on the basis of the entire stream
-                // operation sitting inside a try-catch block?
                 try {
                     return !Files.isHidden(t);
                 } catch (IOException e) {
-                    throw new PipelineException(
-                        "IOException when checking hidden status of file " + t.toString(), e);
+                    throw new UncheckedIOException(
+                        "Unable to check hidden status of file" + t.toString(), e);
                 }
             })
                 .map(s -> dataImportPathForTask.relativize(s))
                 .map(Path::toString)
                 .collect(Collectors.toList());
         } catch (IOException e1) {
-            throw new PipelineException(
-                "Unable to stream file list in directory " + dataImportPathForTask.toString(), e1);
+            throw new UncheckedIOException(
+                "Unable to list files in directory " + dataImportPathForTask.toString(), e1);
         }
     }
 
@@ -410,7 +381,7 @@ private void importModels() {
 
             Path dataReceiptPath = Paths.get(dataReceiptDir);
             // get the unit of work from the pipeline task
-            UnitOfWork uow = pipelineTask.getUowTask().getInstance();
+            UnitOfWork uow = pipelineTask.uowTaskInstance();
             Path importDirectory = dataReceiptPath
                 .resolve(DirectoryUnitOfWorkGenerator.directory(uow));
             log.info("Importing models from directory: " + importDirectory.toString());
@@ -448,7 +419,6 @@ private void importModels() {
                         pipelineTask.getId(), AlertService.Severity.WARNING,
                         "Failed to import " + failedImports.size() + " model files (out of "
                             + (successfulImports.size() + failedImports.size()) + ")");
-
                 }
                 // Flush the session so that as soon as the next task starts importing model files
                 // it already has an up to date registry
@@ -465,12 +435,14 @@ protected void flushDatabase() {
     }
 
     // Allows a caller to supply a data receipt instance for test purposes
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     DataImporter dataImporter(Path dataReceiptPath, Path datastoreRootPath) {
         if (dataImporter == null) {
 
             // Get the data importer implementation
-            Configuration config = ZiggyConfiguration.getInstance();
-            String classname = config.getString(PropertyNames.DATA_RECEIPT_CLASS_PROP_NAME,
+            ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+            String classname = config.getString(PropertyName.DATA_IMPORTER_CLASS.property(),
                 DEFAULT_DATA_RECEIPT_CLASS);
             Class<?> dataReceiptClass = null;
             try {
@@ -490,10 +462,10 @@ DataImporter dataImporter(Path dataReceiptPath, Path datastoreRootPath) {
                     .newInstance(pipelineTask, dataReceiptPath, datastoreRootPath);
             } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
                 | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-                throw new PipelineException("Unable to instantiate object of class " + classname,
-                    e);
+                // Can never occur. By construction, the data importer class is known and has
+                // a constructor with an appropriate signature.
+                throw new AssertionError(e);
             }
-
         }
         return dataImporter;
     }
@@ -505,6 +477,7 @@ DataImporter dataImporter(Path dataReceiptPath, Path datastoreRootPath) {
      * acknowledgement directory. If the UOW used a subdirectory of the main DR directory, that
      * directory is deleted.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void performDirectoryCleanup() {
 
         try {
@@ -538,10 +511,10 @@ public void performDirectoryCleanup() {
             if (!dataImportPathForTask.equals(dataReceiptTopLevelPath)) {
                 FileUtils.deleteDirectory(dataImportPathForTask.toFile());
             }
-
         } catch (IOException e) {
-            throw new PipelineException(
-                "Unable to perform post-import cleanup of directory " + dataImportPathForTask, e);
+            throw new UncheckedIOException(
+                "IOException occurred cleaning up directory " + dataImportPathForTask.toString(),
+                e);
         }
     }
 
@@ -577,7 +550,7 @@ void updateModelRegistryForPipelineInstance() {
         PipelineInstance dbInstance = pipelineInstanceCrud
             .retrieve(pipelineTask.getPipelineInstance().getId());
         dbInstance.setModelRegistry(modelRegistry);
-        pipelineInstanceCrud.update(dbInstance);
+        pipelineInstanceCrud.merge(dbInstance);
         pipelineTask.getPipelineInstance().setModelRegistry(modelRegistry);
     }
 
@@ -608,7 +581,6 @@ protected List<RunMode> restartModes() {
     @Override
     protected List<RunMode> defaultRestartModes() {
         return Arrays.asList(RunMode.RESUME_CURRENT_STEP);
-
     }
 
     @Override
@@ -616,7 +588,7 @@ protected void restartFromBeginning() {
     }
 
     @Override
-    protected void resumeCurrentStep() throws PipelineException {
+    protected void resumeCurrentStep() {
         processingMainLoop();
     }
 
@@ -629,7 +601,7 @@ protected void resumeMonitoring() {
     }
 
     @Override
-    protected void runStandard() throws PipelineException {
+    protected void runStandard() {
         processingMainLoop();
     }
 
@@ -666,7 +638,5 @@ public static PipelineModuleDefinition createDataReceiptPipelineForDb() {
             DataReceiptPipelineModule.class);
         dataReceiptModule.setPipelineModuleClass(moduleClassWrapper);
         return dataReceiptModule;
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DataReceiptStatus.java b/src/main/java/gov/nasa/ziggy/data/management/DataReceiptStatus.java
index 72c11c6..4bbc434 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DataReceiptStatus.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DataReceiptStatus.java
@@ -36,7 +36,6 @@ public enum DataReceiptStatus {
         public DataReceiptStatus and(DataReceiptStatus other) {
             return INVALID;
         }
-
     },
     PRESENT {
         @Override
@@ -46,12 +45,10 @@ public DataReceiptStatus and(DataReceiptStatus other) {
             }
             if (other.equals(ABSENT) || other.equals(INVALID)) {
                 return INVALID;
-            } else {
-                throw new IllegalArgumentException(
-                    "Cannot AND DataReceiptStatus of " + toString() + " with PRESENT");
             }
+            throw new IllegalArgumentException(
+                "Cannot AND DataReceiptStatus of " + toString() + " with PRESENT");
         }
-
     },
     VALID {
         @Override
@@ -61,20 +58,16 @@ public DataReceiptStatus and(DataReceiptStatus other) {
             }
             if (other.equals(ABSENT) || other.equals(INVALID)) {
                 return INVALID;
-            } else {
-                throw new IllegalArgumentException(
-                    "Cannot AND DataReceiptStatus of " + toString() + " with VALID");
             }
-
+            throw new IllegalArgumentException(
+                "Cannot AND DataReceiptStatus of " + toString() + " with VALID");
         }
-
     },
     INVALID {
         @Override
         public DataReceiptStatus and(DataReceiptStatus other) {
             return INVALID;
         }
-
     },
     IMPORTED {
         @Override
@@ -82,7 +75,6 @@ public DataReceiptStatus and(DataReceiptStatus other) {
             throw new IllegalArgumentException(
                 "Cannot AND DataReceiptStatus of IMPORTED with other DataReceiptStatus");
         }
-
     },
     NOT_IMPORTED {
         @Override
@@ -90,7 +82,6 @@ public DataReceiptStatus and(DataReceiptStatus other) {
             throw new IllegalArgumentException(
                 "Cannot AND DataReceiptStatus of NOT_IMPORTED with other DataReceiptStatus");
         }
-
     };
 
     public abstract DataReceiptStatus and(DataReceiptStatus other);
@@ -104,15 +95,13 @@ public DataReceiptStatus and(DataReceiptStatus other) {
     public static class DataReceiptStatusAdapter extends XmlAdapter<String, DataReceiptStatus> {
 
         @Override
-        public DataReceiptStatus unmarshal(String status) throws Exception {
+        public DataReceiptStatus unmarshal(String status) {
             return DataReceiptStatus.valueOf(status.toUpperCase());
         }
 
         @Override
-        public String marshal(DataReceiptStatus status) throws Exception {
+        public String marshal(DataReceiptStatus status) {
             return status.toString().toLowerCase();
         }
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DatastoreConfigurationFile.java b/src/main/java/gov/nasa/ziggy/data/management/DatastoreConfigurationFile.java
index 050b529..7256ac2 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DatastoreConfigurationFile.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DatastoreConfigurationFile.java
@@ -70,5 +70,4 @@ public void setModelTypes(Collection<ModelType> modelTypes) {
     public String getXmlSchemaFilename() {
         return XML_SCHEMA_FILE_NAME;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumer.java b/src/main/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumer.java
index 0e7e3ed..15b0416 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumer.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumer.java
@@ -8,21 +8,20 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import gov.nasa.ziggy.pipeline.definition.ModelRegistry;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 /**
  * Database table that tracks the producer task ID for each file in the datastore, and also the IDs
@@ -41,7 +40,7 @@
  */
 
 @Entity
-@Table(name = "PI_DATASTORE_PRODUCER_CONSUMER")
+@Table(name = "ziggy_DatastoreProducerConsumer")
 public class DatastoreProducerConsumer {
 
     public enum DataReceiptFileType {
@@ -49,10 +48,11 @@ public enum DataReceiptFileType {
     }
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_PROD_CONS_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,
+        generator = "ziggy_DatastoreProducerConsumer_generator")
+    @SequenceGenerator(name = "ziggy_DatastoreProducerConsumer_generator", initialValue = 1,
+        sequenceName = "ziggy_DatastoreProducerConsumer_sequence", allocationSize = 1)
+    private Long id;
 
     @Column(nullable = false, columnDefinition = "varchar(1000000)", unique = true)
     private String filename;
@@ -64,12 +64,11 @@ public enum DataReceiptFileType {
     private DataReceiptFileType dataReceiptFileType;
 
     @ElementCollection
-    @JoinTable(name = "PI_DATASTORE_CONSUMERS")
+    @JoinTable(name = "ziggy_DatastoreProducerConsumer_consumers")
     private Set<Long> consumers = new TreeSet<>();
 
     // Needed by Hibernate.
     public DatastoreProducerConsumer() {
-
     }
 
     public DatastoreProducerConsumer(long producerId, String filename,
@@ -147,5 +146,4 @@ public boolean equals(Object obj) {
         }
         return true;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumerCrud.java b/src/main/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumerCrud.java
index 1186712..c59e917 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumerCrud.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumerCrud.java
@@ -2,18 +2,13 @@
 
 import java.nio.file.Path;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.hibernate.Criteria;
-import org.hibernate.criterion.CriteriaSpecification;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
-
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.data.management.DatastoreProducerConsumer.DataReceiptFileType;
 import gov.nasa.ziggy.pipeline.definition.ModelRegistry;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
@@ -37,7 +32,7 @@
  *
  * @author PT
  */
-public class DatastoreProducerConsumerCrud extends AbstractCrud {
+public class DatastoreProducerConsumerCrud extends AbstractCrud<DatastoreProducerConsumer> {
 
     public DatastoreProducerConsumerCrud() {
     }
@@ -74,7 +69,7 @@ public void createOrUpdateProducer(PipelineTask pipelineTask, Collection<Path> d
             datastoreNames(datastoreFiles), type);
         for (DatastoreProducerConsumer datastoreProducerConsumer : datastoreProducerConsumers) {
             datastoreProducerConsumer.setProducer(pipelineTask.getId());
-            super.createOrUpdate(datastoreProducerConsumer);
+            merge(datastoreProducerConsumer);
         }
     }
 
@@ -87,11 +82,13 @@ public List<DatastoreProducerConsumer> retrieveByFilename(Set<Path> datastoreFil
      */
     public Set<String> retrieveFilesConsumedByTask(long taskId) {
 
-        Criteria criteria = createCriteria(DatastoreProducerConsumer.class);
-        criteria.setProjection(Projections.property("filename"));
-        criteria.createAlias("consumers", "consumers");
-        criteria.add(Restrictions.in("consumers.elements", Collections.singleton(taskId)));
-        return new HashSet<>(list(criteria));
+        ZiggyQuery<DatastoreProducerConsumer, String> query = createZiggyQuery(
+            DatastoreProducerConsumer.class, String.class);
+        query.select(DatastoreProducerConsumer_.filename);
+        query.where(query.getBuilder()
+            .isMember(taskId, query.getRoot().get(DatastoreProducerConsumer_.consumers)));
+
+        return new HashSet<>(list(query));
     }
 
     /**
@@ -142,7 +139,7 @@ public void addNonProducingConsumer(PipelineTask pipelineTask, Set<String> datas
     private void addConsumer(DatastoreProducerConsumer datastoreProducerConsumer,
         long pipelineTaskId) {
         datastoreProducerConsumer.addConsumer(pipelineTaskId);
-        super.createOrUpdate(datastoreProducerConsumer);
+        merge(datastoreProducerConsumer);
     }
 
     private Set<String> datastoreNames(Collection<Path> datastoreFiles) {
@@ -157,17 +154,19 @@ private Set<String> datastoreNames(Collection<Path> datastoreFiles) {
      * @param pipelineTask Producer task for constructed entries, if null a value of zero will be
      * used for the producer ID of constructed entries
      * @param filenames Names of datastore files to be located in the database table of
-     * {@link DatastoreProducerConsumer} instances
+     * {@link DatastoreProducerConsumer} instances. Must be mutable.
      * @return A {@link List} of {@link DatastoreProducerConsumer} instances, with the database
      * versions for files that have database entries and new instances for those that do not.
      */
-    private List<DatastoreProducerConsumer> retrieveOrCreate(PipelineTask pipelineTask,
+    protected List<DatastoreProducerConsumer> retrieveOrCreate(PipelineTask pipelineTask,
         Set<String> filenames, DataReceiptFileType type) {
 
-        // Start by finding all the files that already have entries
-        Criteria q = createCriteria(DatastoreProducerConsumer.class);
-        q.add(restrictionPropertyIn("filename", filenames));
-        List<DatastoreProducerConsumer> datastoreProducerConsumers = list(q);
+        // Start by finding all the files that already have entries.
+        ZiggyQuery<DatastoreProducerConsumer, DatastoreProducerConsumer> query = createZiggyQuery(
+            DatastoreProducerConsumer.class);
+        query.column(DatastoreProducerConsumer_.filename).chunkedIn(filenames);
+        List<DatastoreProducerConsumer> datastoreProducerConsumers = list(query);
+
         List<String> locatedFilenames = datastoreProducerConsumers.stream()
             .map(DatastoreProducerConsumer::getFilename)
             .collect(Collectors.toList());
@@ -176,8 +175,10 @@ private List<DatastoreProducerConsumer> retrieveOrCreate(PipelineTask pipelineTa
         long producerId = pipelineTask != null ? pipelineTask.getId() : 0;
         filenames.removeAll(locatedFilenames);
         for (String filename : filenames) {
-            datastoreProducerConsumers
-                .add(new DatastoreProducerConsumer(producerId, filename, type));
+            DatastoreProducerConsumer instance = new DatastoreProducerConsumer(producerId, filename,
+                type);
+            persist(instance);
+            datastoreProducerConsumers.add(instance);
         }
 
         // Now put the non-found filenames back into the filenames argument, just in case
@@ -196,9 +197,11 @@ public List<DatastoreProducerConsumer> retrieveForInstance(long pipelineInstance
         List<PipelineTask> tasks = new PipelineTaskCrud().retrieveTasksForModuleAndInstance(
             DataReceiptPipelineModule.DATA_RECEIPT_MODULE_NAME, pipelineInstanceId);
         Set<Long> taskIds = tasks.stream().map(PipelineTask::getId).collect(Collectors.toSet());
-        Criteria query = createCriteria(DatastoreProducerConsumer.class);
-        query.add(Restrictions.in("producerId", taskIds));
-        query.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
+
+        ZiggyQuery<DatastoreProducerConsumer, DatastoreProducerConsumer> query = createZiggyQuery(
+            DatastoreProducerConsumer.class);
+        query.column(DatastoreProducerConsumer_.producerId).in(taskIds).distinct(true);
+
         return list(query);
     }
 
@@ -214,9 +217,12 @@ public int retrieveCountForInstance(long pipelineInstanceId) {
      *
      * @return
      */
-    @SuppressWarnings("unchecked")
     public List<DatastoreProducerConsumer> retrieveAll() {
-        Criteria q = createCriteria(DatastoreProducerConsumer.class);
-        return q.list();
+        return list(createZiggyQuery(DatastoreProducerConsumer.class));
+    }
+
+    @Override
+    public Class<DatastoreProducerConsumer> componentClass() {
+        return DatastoreProducerConsumer.class;
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/DefaultDataImporter.java b/src/main/java/gov/nasa/ziggy/data/management/DefaultDataImporter.java
index 2c56760..12dcb7b 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/DefaultDataImporter.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/DefaultDataImporter.java
@@ -15,9 +15,13 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.services.alert.AlertService;
+import gov.nasa.ziggy.services.alert.AlertService.Severity;
 import gov.nasa.ziggy.uow.DataReceiptUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.DirectoryUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.UnitOfWork;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Default implementation of the {@link DataImporter} interface. This class can be used for data
@@ -35,13 +39,14 @@
 public class DefaultDataImporter extends DataImporter {
 
     private final Path dataImportPath;
+    private AlertService alertService;
 
     public DefaultDataImporter(PipelineTask pipelineTask, Path dataReceiptPath,
         Path datastoreRoot) {
         super(pipelineTask, dataReceiptPath, datastoreRoot);
 
         // Obtain the UOW
-        UnitOfWork uow = pipelineTask.getUowTask().getInstance();
+        UnitOfWork uow = pipelineTask.uowTaskInstance();
         dataImportPath = dataReceiptPath.resolve(DirectoryUnitOfWorkGenerator.directory(uow));
     }
 
@@ -85,7 +90,9 @@ public Map<Path, Path> dataFiles(List<String> namesOfValidFiles) {
     }
 
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public Set<Path> importFiles(Map<Path, Path> dataFiles) {
+        int exceptionCount = 0;
         Set<Path> importedFiles = new HashSet<>();
         Set<Path> datastoreDirectories = new HashSet<>();
         for (Path destPath : dataFiles.values()) {
@@ -101,9 +108,15 @@ public Set<Path> importFiles(Map<Path, Path> dataFiles) {
                 moveOrSymlink(fullSourcePath, fullDestPath);
                 importedFiles.add(sourceFile);
             } catch (IOException e) {
-                log.error("Unable to import data file " + sourceFile.toString(), e);
+                log.error("Failed to import file " + sourceFile.toString(), e);
+                exceptionCount++;
             }
         }
+        if (exceptionCount > 0) {
+            alertService().generateAlert("DefaultDataImporter", Severity.WARNING,
+                "Data file import encountered " + exceptionCount + " import failures, "
+                    + "see log file for details");
+        }
         return importedFiles;
     }
 
@@ -117,4 +130,10 @@ public Path getDataImportPath() {
         return dataImportPath;
     }
 
+    AlertService alertService() {
+        if (alertService == null) {
+            alertService = AlertService.getInstance();
+        }
+        return alertService;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/FailedImport.java b/src/main/java/gov/nasa/ziggy/data/management/FailedImport.java
index 112ea4b..9ff2fe3 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/FailedImport.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/FailedImport.java
@@ -2,18 +2,17 @@
 
 import java.nio.file.Path;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import gov.nasa.ziggy.data.management.DatastoreProducerConsumer.DataReceiptFileType;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 /**
  * Provides tracking information for mission data files and instrument models that fail to import.
@@ -23,14 +22,14 @@
  * @author PT
  */
 @Entity
-@Table(name = "PI_FAILED_IMPORT")
+@Table(name = "ziggy_FailedImport")
 public class FailedImport {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_FAILED_IMPORT_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ziggy_FailedImport_generator")
+    @SequenceGenerator(name = "ziggy_FailedImport_generator", initialValue = 1,
+        sequenceName = "ziggy_FailedImport_sequence", allocationSize = 1)
+    private Long id;
 
     @Column
     private long dataReceiptTaskId;
@@ -67,11 +66,11 @@ public FailedImport(PipelineTask task, Path filename, DataReceiptFileType dataRe
         this.dataReceiptFileType = dataReceiptFileType;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/data/management/FailedImportCrud.java b/src/main/java/gov/nasa/ziggy/data/management/FailedImportCrud.java
index 5529055..778d0e8 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/FailedImportCrud.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/FailedImportCrud.java
@@ -6,11 +6,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.hibernate.Criteria;
-import org.hibernate.criterion.CriteriaSpecification;
-import org.hibernate.criterion.Restrictions;
-
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 
@@ -19,7 +16,7 @@
  *
  * @author PT
  */
-public class FailedImportCrud extends AbstractCrud {
+public class FailedImportCrud extends AbstractCrud<FailedImport> {
 
     /**
      * Creates a collection of new {@link FailedImport} rows in the database.
@@ -28,7 +25,7 @@ public void create(PipelineTask pipelineTask, Collection<Path> filenames,
         DatastoreProducerConsumer.DataReceiptFileType type) {
 
         for (Path filename : filenames) {
-            create(new FailedImport(pipelineTask, filename, type));
+            persist(new FailedImport(pipelineTask, filename, type));
         }
     }
 
@@ -41,9 +38,8 @@ public List<FailedImport> retrieveForInstance(long pipelineInstanceId) {
         List<PipelineTask> tasks = new PipelineTaskCrud().retrieveTasksForModuleAndInstance(
             DataReceiptPipelineModule.DATA_RECEIPT_MODULE_NAME, pipelineInstanceId);
         Set<Long> taskIds = tasks.stream().map(PipelineTask::getId).collect(Collectors.toSet());
-        Criteria query = createCriteria(FailedImport.class);
-        query.add(Restrictions.in("dataReceiptTaskId", taskIds));
-        query.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
+        ZiggyQuery<FailedImport, FailedImport> query = createZiggyQuery(FailedImport.class);
+        query.column(FailedImport_.dataReceiptTaskId).in(taskIds).distinct(true);
         return list(query);
     }
 
@@ -57,7 +53,11 @@ public int retrieveCountForInstance(long pipelineInstanceId) {
      * @return All contents of the failed import table.
      */
     public List<FailedImport> retrieveAll() {
-        Criteria query = createCriteria(FailedImport.class);
-        return list(query);
+        return list(createZiggyQuery(FailedImport.class));
+    }
+
+    @Override
+    public Class<FailedImport> componentClass() {
+        return FailedImport.class;
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/Manifest.java b/src/main/java/gov/nasa/ziggy/data/management/Manifest.java
index 0136cab..8f73d98 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/Manifest.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/Manifest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -35,7 +35,7 @@
 package gov.nasa.ziggy.data.management;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
+import java.io.UncheckedIOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -51,28 +51,27 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.xml.sax.SAXException;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import gov.nasa.ziggy.data.management.Acknowledgement.AcknowledgementEntry;
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.xml.HasXmlSchemaFilename;
 import gov.nasa.ziggy.pipeline.xml.ValidatingXmlManager;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.ZiggyShutdownHook;
 import gov.nasa.ziggy.util.io.FileUtil;
-import jakarta.xml.bind.JAXBException;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -101,7 +100,7 @@
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_MANIFEST")
+@Table(name = "ziggy_Manifest")
 public class Manifest implements HasXmlSchemaFilename {
 
     private static final String SCHEMA_FILENAME = "manifest.xsd";
@@ -123,10 +122,10 @@ public class Manifest implements HasXmlSchemaFilename {
     public static final ChecksumType CHECKSUM_TYPE = ChecksumType.SHA1;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_MANIFEST_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ziggy_Manifest_generator")
+    @SequenceGenerator(name = "ziggy_Manifest_generator", initialValue = 1,
+        sequenceName = "ziggy_Manifest_sequence", allocationSize = 1)
+    private Long id;
 
     @Column
     @XmlAttribute(required = true)
@@ -178,7 +177,9 @@ public Map<String, ManifestEntry> fileNameToManifestEntry() {
      * regular files or symlinks to regular files, including files that are in subdirectories of the
      * directory provided as argument.
      */
-    public static Manifest generateManifest(Path directory, long datasetId) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static Manifest generateManifest(Path directory, long datasetId) {
 
         Manifest manifest = new Manifest();
         manifest.setDatasetId(datasetId);
@@ -199,8 +200,8 @@ public static Manifest generateManifest(Path directory, long datasetId) throws I
                     manifestEntry.setSize(Files.size(realFile));
                     manifestEntry.setChecksum(manifest.checksumType.checksum(realFile));
                 } catch (IOException e) {
-                    throw new PipelineException("Unable to calculate checksum or file size "
-                        + " of file " + manifestEntry.getName(), e);
+                    throw new UncheckedIOException(
+                        "Unable to get size of file " + realFile.toString(), e);
                 }
                 return manifestEntry;
             }));
@@ -221,9 +222,7 @@ public static Manifest generateManifest(Path directory, long datasetId) throws I
      * Writes the manifest to the specified directory. The manifest name must be set to a valid
      * value; if not, a {@link PipelineException} will occur.
      */
-    public void write(Path directory) throws InstantiationException, IllegalAccessException,
-        SAXException, JAXBException, IllegalArgumentException, InvocationTargetException,
-        NoSuchMethodException, SecurityException {
+    public void write(Path directory) {
 
         validateName(name);
         ValidatingXmlManager<Manifest> xmlManager = new ValidatingXmlManager<>(Manifest.class);
@@ -233,9 +232,8 @@ public void write(Path directory) throws InstantiationException, IllegalAccessEx
         xmlManager.marshal(this, fullPath.toFile());
     }
 
-    public static Manifest readManifest(Path directory) throws InstantiationException,
-        IllegalAccessException, IOException, SAXException, JAXBException, IllegalArgumentException,
-        InvocationTargetException, NoSuchMethodException, SecurityException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static Manifest readManifest(Path directory) {
         Manifest manifest = null;
         ValidatingXmlManager<Manifest> xmlManager = new ValidatingXmlManager<>(Manifest.class);
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory, entry -> {
@@ -251,6 +249,9 @@ public static Manifest readManifest(Path directory) throws InstantiationExceptio
                 manifest = xmlManager.unmarshal(DataFileManager.realSourceFile(entry).toFile());
                 manifest.setName(entry.getFileName().toString());
             }
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to obtain list of files in dir " + directory.toString(), e);
         }
         return manifest;
     }
@@ -265,25 +266,25 @@ public static Manifest readManifest(Path directory) throws InstantiationExceptio
         User must be able to specify location of files for manifest generation;
         files in the specified directory get size and checksum computed,
         hence no security risk to allowing the user to specify any dir they want.""")
-    public static void main(String[] args) throws IOException, InstantiationException,
-        IllegalAccessException, SAXException, JAXBException, IllegalArgumentException,
-        InvocationTargetException, NoSuchMethodException, SecurityException {
+    public static void main(String[] args) {
         String manifestName = args[0];
         long datasetId = Long.parseLong(args[1]);
-        String manifestDir = SystemUtils.USER_DIR;
+        String userDir = ZiggyConfiguration.getInstance()
+            .getString(PropertyName.WORKING_DIR.property());
+        String manifestDir = userDir;
         if (args.length > 2) {
             manifestDir = args[2];
         }
         Manifest manifest = Manifest.generateManifest(Paths.get(manifestDir), datasetId);
         manifest.setName(manifestName);
-        manifest.write(Paths.get(SystemUtils.USER_DIR));
+        manifest.write(Paths.get(userDir));
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -433,5 +434,4 @@ public static boolean manifestEntryAckEntryEquals(ManifestEntry mEntry,
         return mEntry.getName().equals(aEntry.getName()) && mEntry.getSize() == aEntry.getSize()
             && mEntry.getChecksum().equals(aEntry.getChecksum());
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/data/management/ManifestCrud.java b/src/main/java/gov/nasa/ziggy/data/management/ManifestCrud.java
index 3926692..08e60ff 100644
--- a/src/main/java/gov/nasa/ziggy/data/management/ManifestCrud.java
+++ b/src/main/java/gov/nasa/ziggy/data/management/ManifestCrud.java
@@ -1,36 +1,34 @@
 package gov.nasa.ziggy.data.management;
 
-import java.util.List;
-
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Restrictions;
-
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 
 /**
  * CRUD class for {@link Manifest} instances.
  *
  * @author PT
  */
-public class ManifestCrud extends AbstractCrud {
+public class ManifestCrud extends AbstractCrud<Manifest> {
 
     /**
      * Determines whether a given dataset ID has already been used.
      */
     public boolean datasetIdExists(long datasetId) {
-        Criteria criteria = createCriteria(Manifest.class);
-        criteria.add(Restrictions.eq("datasetId", datasetId));
-        List<Manifest> manifests = list(criteria);
-        return !manifests.isEmpty();
+        ZiggyQuery<Manifest, Manifest> query = createZiggyQuery(Manifest.class);
+        query.column(Manifest_.datasetId).in(datasetId);
+        return !list(query).isEmpty();
     }
 
     /**
      * Retrieves the {@link Manifest} for a given pipeline task ID.
      */
     public Manifest retrieveByTaskId(long taskId) {
-        Criteria criteria = createCriteria(Manifest.class);
-        criteria.add(Restrictions.eq("importTaskId", taskId));
-        return uniqueResult(criteria);
+        ZiggyQuery<Manifest, Manifest> query = createZiggyQuery(Manifest.class);
+        return uniqueResult(query.column(Manifest_.importTaskId).in(taskId));
     }
 
+    @Override
+    public Class<Manifest> componentClass() {
+        return Manifest.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/metrics/CounterMetric.java b/src/main/java/gov/nasa/ziggy/metrics/CounterMetric.java
index 2867806..6b6b27d 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/CounterMetric.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/CounterMetric.java
@@ -9,7 +9,7 @@
  * @author Todd Klaus
  */
 public class CounterMetric extends Metric implements Serializable {
-    private static final long serialVersionUID = -5164077933977735823L;
+    private static final long serialVersionUID = 20230511L;
 
     private final AtomicInteger count = new AtomicInteger(0);
 
diff --git a/src/main/java/gov/nasa/ziggy/metrics/IntervalMetric.java b/src/main/java/gov/nasa/ziggy/metrics/IntervalMetric.java
index 8967588..267febe 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/IntervalMetric.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/IntervalMetric.java
@@ -3,6 +3,9 @@
 import java.io.Serializable;
 import java.util.concurrent.Callable;
 
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.SystemTime;
 
 /**
@@ -11,14 +14,14 @@
  * @author Todd Klaus
  */
 public class IntervalMetric extends ValueMetric implements Serializable {
-    private static final long serialVersionUID = 6018286347911138007L;
+    private static final long serialVersionUID = 20230511L;
 
     @FunctionalInterface
     public interface Perform {
-        void apply() throws Exception;
+        void apply();
     }
 
-    public static void report(String metricName, Perform p) throws Exception {
+    public static void report(String metricName, Perform p) {
         IntervalMetricKey metricKey = start();
         try {
             p.apply();
@@ -57,11 +60,14 @@ public static IntervalMetric stop(String name, IntervalMetricKey key) {
      * @param name
      * @param target
      */
-    public static <V> V measure(String name, Callable<V> target) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static <V> V measure(String name, Callable<V> target) {
         IntervalMetricKey key = IntervalMetric.start();
 
         try {
             return target.call();
+        } catch (Exception e) {
+            throw new PipelineException("Exception in call()", e);
         } finally {
             IntervalMetric.stop(name, key);
         }
@@ -73,7 +79,7 @@ public static <V> V measure(String name, Callable<V> target) throws Exception {
      * @param name
      * @param target
      */
-    public static void measure(String name, Runnable target) throws Exception {
+    public static void measure(String name, Runnable target) {
         IntervalMetricKey key = IntervalMetric.start();
 
         try {
@@ -127,5 +133,4 @@ public synchronized ValueMetric makeCopy() {
         copy.count = count;
         return copy;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/metrics/Metric.java b/src/main/java/gov/nasa/ziggy/metrics/Metric.java
index 0ecac08..76398ea 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/Metric.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/Metric.java
@@ -11,6 +11,7 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -24,6 +25,8 @@
 import org.slf4j.LoggerFactory;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.SpotBugsUtils;
 import gov.nasa.ziggy.util.io.FileUtil;
 
@@ -35,7 +38,7 @@
 public abstract class Metric implements Serializable {
     private static final Logger log = LoggerFactory.getLogger(Metric.class);
 
-    private static final long serialVersionUID = -2723751150597278137L;
+    private static final long serialVersionUID = 20230511L;
 
     private static Logger metricsLogger = LoggerFactory.getLogger("metrics.logger");
 
@@ -46,8 +49,6 @@ public abstract class Metric implements Serializable {
 
     /**
      * get the name of this metric
-     *
-     * @return
      */
     public String getName() {
         return name;
@@ -69,8 +70,6 @@ public static Map<String, Metric> getGlobalMetricsSnapshot() {
     /**
      * Returns the map of thread metrics for the calling thread. May be null if thread metrics have
      * not been enabled for the calling thread.
-     *
-     * @return Map of metrics for the calling thread
      */
     public static Map<String, Metric> getThreadMetrics() {
         return threadMetrics.get();
@@ -87,8 +86,6 @@ public static Iterator<String> metricsIterator() {
 
     /**
      * Iterate over the metric names that start with the specified String
-     *
-     * @return
      */
     public static Iterator<String> metricsIterator(String startsWith) {
         return new StartsWithIterator(globalMetrics.keySet().iterator(), startsWith);
@@ -165,11 +162,9 @@ public final String getLogString() {
      * Persist the current set of global metrics to a file using Java serialization.
      * <p>
      * Used to transfer metrics collected in a sub-process to the parent process.
-     *
-     * @param path
-     * @throws IOException
      */
-    public static void persist(String path) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static void persist(String path) {
         File file = new File(path);
 
         if (file.isDirectory()) {
@@ -179,6 +174,8 @@ public static void persist(String path) throws IOException {
         try (ObjectOutputStream output = new ObjectOutputStream(
             new BufferedOutputStream(new FileOutputStream(file)))) {
             output.writeObject(globalMetrics);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to write to file " + file.toString(), e);
         }
     }
 
@@ -187,11 +184,8 @@ public static void persist(String path) throws IOException {
      * merged with the current set of metrics.
      * <p>
      * Used to transfer metrics collected in a sub-process to the parent process.
-     *
-     * @param path
-     * @throws Exception
      */
-    public static void merge(String path) throws Exception {
+    public static void merge(String path) {
         File file = new File(path);
 
         if (file.isDirectory()) {
@@ -238,10 +232,19 @@ public static void merge(String path) throws Exception {
     @SuppressWarnings("unchecked")
     @SuppressFBWarnings(value = "OBJECT_DESERIALIZATION",
         justification = SpotBugsUtils.DESERIALIZATION_JUSTIFICATION)
-    public static Map<String, Metric> loadMetricsFromSerializedFile(File file) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public static Map<String, Metric> loadMetricsFromSerializedFile(File file) {
         try (ObjectInputStream input = new ObjectInputStream(
             new BufferedInputStream(new FileInputStream(file)))) {
             return (Map<String, Metric>) input.readObject();
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to read from file " + file.toString(), e);
+        } catch (ClassNotFoundException e) {
+            // This can never occur. This class performs both the serialization and
+            // deserialization of the given object, so it is guaranteed that the
+            // correct class can be found and will be used to deserialize.
+            throw new AssertionError(e);
         }
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/metrics/MetricType.java b/src/main/java/gov/nasa/ziggy/metrics/MetricType.java
index 3f04dbb..c7d21a1 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/MetricType.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/MetricType.java
@@ -1,11 +1,11 @@
 package gov.nasa.ziggy.metrics;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
-@Table(name = "PI_METRIC_TYPE")
+@Table(name = "ziggy_MetricType")
 public class MetricType implements Comparable<MetricType> {
     public static final int TYPE_COUNTER = 1;
     public static final int TYPE_VALUE = 2;
@@ -78,7 +78,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object other) {
-        if ((other == null) || !(other instanceof MetricType)) {
+        if (other == null || !(other instanceof MetricType)) {
             return false;
         }
         MetricType otherMetricType = (MetricType) other;
diff --git a/src/main/java/gov/nasa/ziggy/metrics/MetricValue.java b/src/main/java/gov/nasa/ziggy/metrics/MetricValue.java
index 3967de3..7e8ff70 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/MetricValue.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/MetricValue.java
@@ -2,22 +2,22 @@
 
 import java.util.Date;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 @Entity
-@Table(name = "PI_METRIC_VALUE")
+@Table(name = "ziggy_MetricValue")
 public class MetricValue {
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_METRIC_TYPE_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ziggy_MetricValue_generator")
+    @SequenceGenerator(name = "ziggy_MetricValue_generator", initialValue = 1,
+        sequenceName = "ziggy_MetricValue_sequence", allocationSize = 1)
+    private Long id;
 
     @ManyToOne
     private MetricType metricType;
@@ -88,7 +88,7 @@ public void setValue(float value) {
     /**
      * @return the id
      */
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/metrics/MetricsCrud.java b/src/main/java/gov/nasa/ziggy/metrics/MetricsCrud.java
index b4216bc..34faaa0 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/MetricsCrud.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/MetricsCrud.java
@@ -3,15 +3,18 @@
 import java.util.Date;
 import java.util.List;
 
-import org.hibernate.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.services.database.DatabaseService;
 import gov.nasa.ziggy.util.TimeRange;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.Root;
 
-public class MetricsCrud extends AbstractCrud {
+public class MetricsCrud extends AbstractCrud<MetricType> {
     private static final Logger log = LoggerFactory.getLogger(MetricsCrud.class);
 
     protected DatabaseService databaseService = null;
@@ -24,40 +27,31 @@ public MetricsCrud(DatabaseService databaseService) {
     }
 
     public void createMetricType(MetricType metricType) {
-        create(metricType);
+        persist(metricType);
     }
 
     public void createMetricValue(MetricValue metricValue) {
-        create(metricValue);
+        persist(metricValue);
     }
 
     public List<MetricType> retrieveAllMetricTypes() {
-        Query q = createQuery("from MetricType");
-        return list(q);
+        return list(createZiggyQuery(MetricType.class));
     }
 
     public List<MetricValue> retrieveAllMetricValuesForType(MetricType metricType, Date start,
         Date end) {
-
-        Query q = createQuery(
-            "from MetricValue where metricType = :metricType and timestamp >= :start and timestamp <= :end order by timestamp asc");
-        q.setEntity("metricType", metricType);
-        q.setParameter("start", start);
-        q.setParameter("end", end);
-
-        List<MetricValue> l = list(q);
-
-        log.debug("num matches = " + l.size());
-
-        return l;
+        ZiggyQuery<MetricValue, MetricValue> query = createZiggyQuery(MetricValue.class);
+        query.column(MetricValue_.timestamp).between(start, end).ascendingOrder();
+        query.column(MetricValue_.metricType).in(metricType);
+        return list(query);
     }
 
     public TimeRange getTimestampRange(MetricType metricType) {
-        Query q = createQuery(
-            "select min(timestamp), max(timestamp) from MetricValue where metricType = :metricType");
-        q.setEntity("metricType", metricType);
-
-        Object[] results = uniqueResult(q);
+        ZiggyQuery<MetricValue, Object[]> query = createZiggyQuery(MetricValue.class,
+            Object[].class);
+        query.column(MetricValue_.timestamp).minMax();
+        query.column(MetricValue_.metricType).in(metricType);
+        Object[] results = uniqueResult(query);
 
         Date min = (Date) results[0];
         Date max = (Date) results[1];
@@ -65,28 +59,26 @@ public TimeRange getTimestampRange(MetricType metricType) {
         return new TimeRange(min, max);
     }
 
-    public int retrieveMetricValueRowCount() {
-        Query q = createQuery("select count(*) from MetricValue");
-
-        Number count = uniqueResult(q);
-
-        return count.intValue();
+    public long retrieveMetricValueRowCount() {
+        ZiggyQuery<MetricValue, Long> query = createZiggyQuery(MetricValue.class, Long.class);
+        query.select(query.getBuilder().count(query.getRoot()));
+        return uniqueResult(query);
     }
 
     public long retrieveMinimumId() {
-        Query q = createQuery("select min(id) from MetricValue");
-
-        Number minId = uniqueResult(q);
-
-        return minId.longValue();
+        ZiggyQuery<MetricValue, Object[]> query = createZiggyQuery(MetricValue.class,
+            Object[].class);
+        query.column(MetricValue_.id).minMax();
+        Object[] minMax = uniqueResult(query);
+        return (long) minMax[0];
     }
 
-    public int deleteOldMetrics(int maxRows) {
+    public long deleteOldMetrics(int maxRows) {
         log.info("Preparing to delete old rows from PI_METRIC_VALUE.  maxRows = " + maxRows);
 
-        int rowCount = 0;
-        int numRowsOverLimit = 0;
-        int numUpdated = 0;
+        long rowCount = 0;
+        long numRowsOverLimit = 0;
+        long numUpdated = 0;
 
         do {
             rowCount = retrieveMetricValueRowCount();
@@ -98,10 +90,12 @@ public int deleteOldMetrics(int maxRows) {
                 log.info("numRowsOverLimit = " + numRowsOverLimit);
 
                 long minId = retrieveMinimumId();
-                Query q = createQuery("delete from MetricValue where id <= :id");
-                long idToDelete = minId + numRowsOverLimit;
-                q.setParameter("id", idToDelete);
-                int numUpdatedThisChunk = q.executeUpdate();
+                long idToDelete = minId + numRowsOverLimit - 1;
+                CriteriaBuilder builder = createCriteriaBuilder();
+                CriteriaDelete<MetricValue> query = builder.createCriteriaDelete(MetricValue.class);
+                Root<MetricValue> root = query.from(MetricValue.class);
+                query.where(builder.lessThanOrEqualTo(root.get("id"), idToDelete));
+                int numUpdatedThisChunk = executeUpdate(query);
 
                 log.info(
                     "deleted " + numUpdatedThisChunk + " rows (where id <= " + idToDelete + ")");
@@ -116,4 +110,9 @@ public int deleteOldMetrics(int maxRows) {
 
         return numUpdated;
     }
+
+    @Override
+    public Class<MetricType> componentClass() {
+        return MetricType.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/metrics/MetricsDumper.java b/src/main/java/gov/nasa/ziggy/metrics/MetricsDumper.java
index 3c63be0..06c2642 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/MetricsDumper.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/MetricsDumper.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -17,6 +18,8 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
@@ -40,12 +43,18 @@ enum FileReuseMode {
     private CountingOutputStream countOut;
     private final File metricsFile;
 
-    public MetricsDumper(int pid) throws IOException {
-        this(pid, DirectoryProperties.workerLogDir());
+    public MetricsDumper(long pid) {
+        this(pid, DirectoryProperties.supervisorLogDir());
     }
 
-    public MetricsDumper(int pid, Path metricDumpDir) throws IOException {
-        Files.createDirectories(metricDumpDir);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public MetricsDumper(long pid, Path metricDumpDir) {
+        try {
+            Files.createDirectories(metricDumpDir);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to create directory " + metricDumpDir.toString(),
+                e);
+        }
         metricsFile = metricDumpDir.resolve("metrics-dump-" + pid + ".txt").toFile();
         openFile(RotateFile);
     }
@@ -56,29 +65,36 @@ public MetricsDumper(int pid, Path metricDumpDir) throws IOException {
      * @param metricsFile
      * @throws IOException
      */
-    private void openFile(FileReuseMode reuseMode) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void openFile(FileReuseMode reuseMode) {
         if (countOut != null && countOut.getCount() < MAX_FILE_SIZE_BYTES) {
             return;
         }
         if (printWriter != null) {
             printWriter.close();
         }
-        if (metricsFile.exists() && (reuseMode == RotateFile
-            || reuseMode == ReuseFile && metricsFile.length() >= MAX_FILE_SIZE_BYTES)) {
-            File oldFile = new File(metricsFile.getParent(), metricsFile.getName() + ".old");
-            if (oldFile.exists() && !oldFile.delete()) {
-                throw new IOException("Failed to delete file \"" + oldFile + "\".");
+        try {
+            if (metricsFile.exists() && (reuseMode == RotateFile
+                || reuseMode == ReuseFile && metricsFile.length() >= MAX_FILE_SIZE_BYTES)) {
+                File oldFile = new File(metricsFile.getParent(), metricsFile.getName() + ".old");
+                if (oldFile.exists() && !oldFile.delete()) {
+                    throw new IOException("Failed to delete file \"" + oldFile + "\".");
+                }
+                metricsFile.renameTo(oldFile);
             }
-            metricsFile.renameTo(oldFile);
+            FileOutputStream fout = new FileOutputStream(metricsFile, true /* append mode */);
+            BufferedOutputStream bout = new BufferedOutputStream(fout, BUF_SIZE_BYTES);
+            countOut = new CountingOutputStream(bout);
+            printWriter = new PrintWriter(new OutputStreamWriter(countOut, FileUtil.ZIGGY_CHARSET));
+        } catch (IOException e) {
+            throw new UncheckedIOException("IOException occurred on file " + metricsFile.toString(),
+                e);
         }
-        FileOutputStream fout = new FileOutputStream(metricsFile, true /* append mode */);
-        BufferedOutputStream bout = new BufferedOutputStream(fout, BUF_SIZE_BYTES);
-
-        countOut = new CountingOutputStream(bout);
-        printWriter = new PrintWriter(new OutputStreamWriter(countOut, FileUtil.ZIGGY_CHARSET));
     }
 
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_IN_RUNNABLE)
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public void run() {
         try {
             while (true) {
@@ -86,7 +102,6 @@ public void run() {
                 Metric.dump(printWriter);
                 printWriter.flush();
                 openFile(RotateFile);
-
             }
         } catch (InterruptedException ie) {
             log.debug("Metrics dumper exiting on interrupted exception.");
diff --git a/src/main/java/gov/nasa/ziggy/metrics/TaskMetrics.java b/src/main/java/gov/nasa/ziggy/metrics/TaskMetrics.java
index d974764..f7a833f 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/TaskMetrics.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/TaskMetrics.java
@@ -85,7 +85,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         TaskMetrics other = (TaskMetrics) obj;
diff --git a/src/main/java/gov/nasa/ziggy/metrics/TimeAndPercentile.java b/src/main/java/gov/nasa/ziggy/metrics/TimeAndPercentile.java
index 8be287f..858cb2a 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/TimeAndPercentile.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/TimeAndPercentile.java
@@ -14,7 +14,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         TimeAndPercentile other = (TimeAndPercentile) obj;
diff --git a/src/main/java/gov/nasa/ziggy/metrics/ValueMetric.java b/src/main/java/gov/nasa/ziggy/metrics/ValueMetric.java
index b6c43c0..18a925c 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/ValueMetric.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/ValueMetric.java
@@ -10,7 +10,7 @@
  * @author Todd Klaus
  */
 public class ValueMetric extends Metric implements Serializable {
-    private static final long serialVersionUID = -3921293669950350490L;
+    private static final long serialVersionUID = 20230511L;
 
     public static final String VALUE_TYPE = "V";
 
@@ -170,20 +170,11 @@ public synchronized boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if (!super.equals(obj) || (getClass() != obj.getClass())) {
+        if (!super.equals(obj) || getClass() != obj.getClass()) {
             return false;
         }
         final ValueMetric other = (ValueMetric) obj;
-        if (count != other.count) {
-            return false;
-        }
-        if (max != other.max) {
-            return false;
-        }
-        if (min != other.min) {
-            return false;
-        }
-        if (sum != other.sum) {
+        if (count != other.count || max != other.max || min != other.min || sum != other.sum) {
             return false;
         }
         return true;
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/AppendixReport.java b/src/main/java/gov/nasa/ziggy/metrics/report/AppendixReport.java
index b16edba..61fa63a 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/AppendixReport.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/AppendixReport.java
@@ -18,8 +18,7 @@ public AppendixReport(PdfRenderer pdfRenderer) {
         super(pdfRenderer);
     }
 
-    public void generateReport(PipelineInstance instance, List<PipelineInstanceNode> nodes)
-        throws Exception {
+    public void generateReport(PipelineInstance instance, List<PipelineInstanceNode> nodes) {
         // instance full (all tasks for specified nodes)
         PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
         List<PipelineTask> tasks = new ArrayList<>();
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/CategoryReport.java b/src/main/java/gov/nasa/ziggy/metrics/report/CategoryReport.java
index 6d8d1ed..7bedc01 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/CategoryReport.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/CategoryReport.java
@@ -18,8 +18,7 @@ public CategoryReport(String category, PdfRenderer pdfRenderer, boolean isTime)
         this.isTime = isTime;
     }
 
-    public void generateReport(String moduleName, DescriptiveStatistics stats, TopNList topTen)
-        throws Exception {
+    public void generateReport(String moduleName, DescriptiveStatistics stats, TopNList topTen) {
         String label = moduleName + " : " + category;
 
         HumanReadableStatistics histogramValues = null;
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/HumanReadableStatistics.java b/src/main/java/gov/nasa/ziggy/metrics/report/HumanReadableStatistics.java
index 5477bdd..ae662b5 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/HumanReadableStatistics.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/HumanReadableStatistics.java
@@ -38,7 +38,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         HumanReadableStatistics other = (HumanReadableStatistics) obj;
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/InstanceMetricsReport.java b/src/main/java/gov/nasa/ziggy/metrics/report/InstanceMetricsReport.java
index 91304c8..db751c6 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/InstanceMetricsReport.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/InstanceMetricsReport.java
@@ -81,7 +81,7 @@ public InstanceMetricsReport(File rootDirectory) {
         this.rootDirectory = rootDirectory;
     }
 
-    public void generateReport() throws Exception {
+    public void generateReport() {
         instancePdfRenderer = new PdfRenderer(
             new File(rootDirectory, "metrics-" + rootDirectory.getName() + "-instance-rpt.pdf"));
         taskPdfRenderer = new PdfRenderer(
@@ -119,7 +119,7 @@ public void generateReport() throws Exception {
         taskPdfRenderer.close();
     }
 
-    private void parseFiles() throws Exception {
+    private void parseFiles() {
         File[] taskDirs = rootDirectory
             .listFiles((FileFilter) f -> f.getName().contains("-matlab-") && f.isDirectory());
 
@@ -217,7 +217,7 @@ private double[] listToArray(List<Double> list) {
         return array;
     }
 
-    private JFreeChart generateHistogram(String label, List<Double> execTimes) throws Exception {
+    private JFreeChart generateHistogram(String label, List<Double> execTimes) {
         if (execTimes == null || execTimes.size() == 0) {
             return null;
         }
@@ -246,7 +246,7 @@ private JFreeChart generateHistogram(String label, List<Double> execTimes) throw
         return chart;
     }
 
-    private JFreeChart generateBoxAndWhiskers() throws Exception {
+    private JFreeChart generateBoxAndWhiskers() {
         DefaultBoxAndWhiskerCategoryDataset dataset = new DefaultBoxAndWhiskerCategoryDataset();
 
         Set<String> taskNames = subTaskExecTimesByTask.keySet();
@@ -283,8 +283,7 @@ private void dump(Map<String, Metric> metrics) {
         }
     }
 
-    private void dumpTopTen(PdfRenderer pdfRenderer, String title, TopNList topTenList)
-        throws Exception {
+    private void dumpTopTen(PdfRenderer pdfRenderer, String title, TopNList topTenList) {
         List<TopNListElement> list = topTenList.getList();
 
         pdfRenderer.printText("Top Stragglers", PdfRenderer.h1Font);
@@ -297,5 +296,4 @@ private void dumpTopTen(PdfRenderer pdfRenderer, String title, TopNList topTenLi
             index++;
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/InstanceReport.java b/src/main/java/gov/nasa/ziggy/metrics/report/InstanceReport.java
index fd6c2f0..ce35a50 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/InstanceReport.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/InstanceReport.java
@@ -29,8 +29,7 @@ public InstanceReport(PdfRenderer pdfRenderer) {
         super(pdfRenderer);
     }
 
-    public void generateReport(PipelineInstance instance, List<PipelineInstanceNode> nodes)
-        throws Exception {
+    public void generateReport(PipelineInstance instance, List<PipelineInstanceNode> nodes) {
         PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
 
         String instanceName = instance.getId() + ":" + instance.getName();
@@ -97,7 +96,7 @@ private String dateToDateString(java.util.Date date) {
         return date.toString();
     }
 
-    private void generateTransferStats(List<PipelineInstanceNode> nodes) throws Exception {
+    private void generateTransferStats(List<PipelineInstanceNode> nodes) {
         PdfPTable transfersTable = new PdfPTable(4);
 
         transfersTable.setWidthPercentage(100);
@@ -156,7 +155,7 @@ private void transfersForNode(PdfPTable transfersTable, PipelineInstanceNode nod
         log.info("millisForNode = " + millisForNode);
         log.info("bytesPerSecondForNode = " + bytesPerSecondForNode);
 
-        addCell(transfersTable, node.getPipelineDefinitionNode().getModuleName().getName());
+        addCell(transfersTable, node.getPipelineDefinitionNode().getModuleName());
         addCell(transfersTable, label);
         addCell(transfersTable, bytesFormatter.format(bytesForNode));
         addCell(transfersTable, rateFormatter.format(bytesPerSecondForNode));
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/MatlabMetrics.java b/src/main/java/gov/nasa/ziggy/metrics/report/MatlabMetrics.java
index d6852ce..488dd9e 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/MatlabMetrics.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/MatlabMetrics.java
@@ -6,9 +6,11 @@
 import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -20,6 +22,8 @@
 import gov.nasa.ziggy.metrics.IntervalMetric;
 import gov.nasa.ziggy.metrics.Metric;
 import gov.nasa.ziggy.module.SubtaskDirectoryIterator;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.SpotBugsUtils;
 
 public class MatlabMetrics {
@@ -45,7 +49,7 @@ public MatlabMetrics(File taskFilesDir, String moduleName) {
     }
 
     private static final class CacheContents implements Serializable {
-        private static final long serialVersionUID = -2905417458703562259L;
+        private static final long serialVersionUID = 20230511L;
         public DescriptiveStatistics totalTime;
         public HashMap<String, DescriptiveStatistics> function;
         public TopNList topTen;
@@ -53,51 +57,53 @@ private static final class CacheContents implements Serializable {
 
     @SuppressFBWarnings(value = "OBJECT_DESERIALIZATION",
         justification = SpotBugsUtils.DESERIALIZATION_JUSTIFICATION)
-    public void parseFiles() throws Exception {
-        if (!parsed) {
-            totalTimeStats = new DescriptiveStatistics();
-            functionStats = new HashMap<>();
-            topTen = new TopNList(10);
-
-            File cacheFile = new File(taskFilesDir, MATLAB_METRICS_CACHE_FILENAME);
-
-            if (cacheFile.exists()) {
-                log.info("Found cache file");
-                try (ObjectInputStream ois = new ObjectInputStream(
-                    new BufferedInputStream(new FileInputStream(cacheFile)))) {
-                    CacheContents cacheContents = (CacheContents) ois.readObject();
-
-                    totalTimeStats = cacheContents.totalTime;
-                    functionStats = cacheContents.function;
-                    topTen = cacheContents.topTen;
-                }
-            } else { // no cache
-                log.info("No cache file found, parsing files");
-                File[] taskDirs = taskFilesDir.listFiles(
-                    (FileFilter) f -> f.getName().startsWith(moduleName + "-") && f.isDirectory());
-
-                for (File taskDir : taskDirs) {
-                    log.info("Processing: " + taskDir);
-
-                    SubtaskDirectoryIterator directoryIterator = new SubtaskDirectoryIterator(
-                        taskDir);
-
-                    if (directoryIterator.hasNext()) {
-                        log.info(
-                            "Found " + directoryIterator.numSubTasks() + " sub-task directories");
-                    } else {
-                        log.info("No sub-task directories found");
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public void parseFiles() {
+        File cacheFile = new File(taskFilesDir, MATLAB_METRICS_CACHE_FILENAME);
+        try {
+            if (!parsed) {
+                totalTimeStats = new DescriptiveStatistics();
+                functionStats = new HashMap<>();
+                topTen = new TopNList(10);
+
+                if (cacheFile.exists()) {
+                    log.info("Found cache file");
+                    try (ObjectInputStream ois = new ObjectInputStream(
+                        new BufferedInputStream(new FileInputStream(cacheFile)))) {
+                        CacheContents cacheContents = (CacheContents) ois.readObject();
+
+                        totalTimeStats = cacheContents.totalTime;
+                        functionStats = cacheContents.function;
+                        topTen = cacheContents.topTen;
                     }
+                } else { // no cache
+                    log.info("No cache file found, parsing files");
+                    File[] taskDirs = taskFilesDir
+                        .listFiles((FileFilter) f -> f.getName().startsWith(moduleName + "-")
+                            && f.isDirectory());
+
+                    for (File taskDir : taskDirs) {
+                        log.info("Processing: " + taskDir);
+
+                        SubtaskDirectoryIterator directoryIterator = new SubtaskDirectoryIterator(
+                            taskDir);
 
-                    while (directoryIterator.hasNext()) {
-                        File subTaskDir = directoryIterator.next().getSubtaskDir();
+                        if (directoryIterator.hasNext()) {
+                            log.info("Found " + directoryIterator.numSubTasks()
+                                + " sub-task directories");
+                        } else {
+                            log.info("No sub-task directories found");
+                        }
 
-                        log.debug("STM: " + subTaskDir);
+                        while (directoryIterator.hasNext()) {
+                            File subTaskDir = directoryIterator.next().getSubtaskDir();
 
-                        File subTaskMetricsFile = new File(subTaskDir, MATLAB_METRICS_FILENAME);
+                            log.debug("STM: " + subTaskDir);
 
-                        if (subTaskMetricsFile.exists()) {
-                            try {
+                            File subTaskMetricsFile = new File(subTaskDir, MATLAB_METRICS_FILENAME);
+
+                            if (subTaskMetricsFile.exists()) {
                                 Map<String, Metric> subTaskMetrics = Metric
                                     .loadMetricsFromSerializedFile(subTaskMetricsFile);
 
@@ -133,30 +139,35 @@ public void parseFiles() throws Exception {
                                     log.warn("no metric found with name: "
                                         + MATLAB_CONTROLLER_EXEC_TIME_METRIC + " in:" + subTaskDir);
                                 }
-                            } catch (Exception e) {
-                                log.warn(
-                                    "Metrics file is corrupt: " + subTaskDir + ", caught e:" + e);
+                            } else {
+                                log.warn("No metrics file found in: " + subTaskDir);
                             }
-                        } else {
-                            log.warn("No metrics file found in: " + subTaskDir);
                         }
                     }
-                }
 
-                if (cacheResults) {
-                    try (ObjectOutputStream oos = new ObjectOutputStream(
-                        new BufferedOutputStream(new FileOutputStream(cacheFile)))) {
-                        CacheContents cache = new CacheContents();
-                        cache.totalTime = totalTimeStats;
-                        cache.function = functionStats;
-                        cache.topTen = topTen;
+                    if (cacheResults) {
+                        try (ObjectOutputStream oos = new ObjectOutputStream(
+                            new BufferedOutputStream(new FileOutputStream(cacheFile)))) {
+                            CacheContents cache = new CacheContents();
+                            cache.totalTime = totalTimeStats;
+                            cache.function = functionStats;
+                            cache.topTen = topTen;
 
-                        oos.writeObject(cache);
-                        oos.flush();
+                            oos.writeObject(cache);
+                            oos.flush();
+                        }
                     }
                 }
+                parsed = true;
             }
-            parsed = true;
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "IOException occurred accessing file " + cacheFile.toString(), e);
+        } catch (ClassNotFoundException e) {
+            // This exception can never occur. This class is the sole creator and consumer
+            // of the serialized object file, hence it is guaranteed that the class that is
+            // serialized is also the class that is retrieved.
+            throw new AssertionError(e);
         }
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/MatlabReport.java b/src/main/java/gov/nasa/ziggy/metrics/report/MatlabReport.java
index aed2197..b9f88a6 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/MatlabReport.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/MatlabReport.java
@@ -28,15 +28,13 @@ public MatlabReport(PdfRenderer pdfRenderer, File taskFilesDir, String moduleNam
     /**
      * Generate stacked bar chart Generate descriptive statistics and a histogram of the peak memory
      * usage for all matlab processes for all tasks for the specified module.
-     *
-     * @throws Exception
      */
-    public void generateReport() throws Exception {
+    public void generateReport() {
         generateExecTimeReport();
         generateMemoryReport();
     }
 
-    private void generateExecTimeReport() throws Exception {
+    private void generateExecTimeReport() {
         MatlabMetrics matlabMetrics = new MatlabMetrics(taskFilesDir, moduleName);
         matlabMetrics.parseFiles();
 
@@ -93,7 +91,7 @@ private void generateExecTimeReport() throws Exception {
         pdfRenderer.newPage();
     }
 
-    private void generateMemoryReport() throws Exception {
+    private void generateMemoryReport() {
         File[] taskDirs = taskFilesDir
             .listFiles((FileFilter) f -> f.getName().contains(moduleName + "-") && f.isDirectory());
 
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/Memdrone.java b/src/main/java/gov/nasa/ziggy/metrics/report/Memdrone.java
index a173c6b..ac29b29 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/Memdrone.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/Memdrone.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Date;
@@ -22,21 +23,23 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.ExecuteWatchdog;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
-import org.hibernate.service.config.spi.ConfigurationService;
+import org.hibernate.engine.config.spi.ConfigurationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.MatlabJavaInitialization;
 import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.Iso8601Formatter;
 import gov.nasa.ziggy.util.SpotBugsUtils;
 
@@ -78,7 +81,7 @@ public class Memdrone {
      */
     public static final boolean memdroneEnabled() {
         return ZiggyConfiguration.getInstance()
-            .getBoolean(PropertyNames.MEMDRONE_ENABLED_PROP_NAME, false);
+            .getBoolean(PropertyName.MEMDRONE_ENABLED.property(), false);
     }
 
     public Memdrone(String binaryName, long instanceId) {
@@ -93,12 +96,17 @@ public Memdrone(String binaryName, long instanceId) {
      * created with the current time as its timestamp and is returned as a {@link Path} instance.
      *
      * @return the {@link Path} for the new directory.
-     * @throws IOException if directory creation fails.
      */
-    Path createNewMemdronePath() throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    Path createNewMemdronePath() {
         Path memdronePath = memdroneRootPath
             .resolve(nameRoot + Iso8601Formatter.dateTimeLocalFormatter().format(date()));
-        Files.createDirectories(memdronePath);
+        try {
+            Files.createDirectories(memdronePath);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to create directory " + memdronePath.toString(),
+                e);
+        }
         return memdronePath;
     }
 
@@ -110,27 +118,33 @@ Path createNewMemdronePath() throws IOException {
      * @return {@link Path} for the most recent memory statistics directory.
      * @throws IOException if listing the files in the statistics main directory fails.
      */
-    public Path latestMemdronePath() throws IOException {
-        Path memdronePath = null;
-        if (Files.exists(memdroneRootPath) && Files.isDirectory(memdroneRootPath)) {
-            Pattern filenamePattern = Pattern.compile(nameRoot + "([0-9]{8})T([0-9]{6})");
-            try (Stream<Path> stream = Files.list(memdroneRootPath)) {
-                List<Path> matchingDirs = stream.filter(Files::isDirectory)
-                    .filter(s -> filenamePattern.matcher(s.getFileName().toString()).matches())
-                    .collect(Collectors.toList());
-                if (matchingDirs != null && !matchingDirs.isEmpty()) {
-                    Optional<Path> result = matchingDirs.stream()
-                        .max((o1, o2) -> o1.getFileName()
-                            .toString()
-                            .compareTo(o2.getFileName().toString()));
-                    memdronePath = result.get();
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public Path latestMemdronePath() {
+        try {
+            Path memdronePath = null;
+            if (Files.exists(memdroneRootPath) && Files.isDirectory(memdroneRootPath)) {
+                Pattern filenamePattern = Pattern.compile(nameRoot + "([0-9]{8})T([0-9]{6})");
+                try (Stream<Path> stream = Files.list(memdroneRootPath)) {
+                    List<Path> matchingDirs = stream.filter(Files::isDirectory)
+                        .filter(s -> filenamePattern.matcher(s.getFileName().toString()).matches())
+                        .collect(Collectors.toList());
+                    if (matchingDirs != null && !matchingDirs.isEmpty()) {
+                        Optional<Path> result = matchingDirs.stream()
+                            .max((o1, o2) -> o1.getFileName()
+                                .toString()
+                                .compareTo(o2.getFileName().toString()));
+                        memdronePath = result.get();
+                    }
                 }
             }
+            if (memdronePath == null) {
+                memdronePath = createNewMemdronePath();
+            }
+            return memdronePath;
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to list files in dir " + memdroneRootPath.toString(), e);
         }
-        if (memdronePath == null) {
-            memdronePath = createNewMemdronePath();
-        }
-        return memdronePath;
     }
 
     private String memdroneNameInvariantPart() {
@@ -140,16 +154,14 @@ private String memdroneNameInvariantPart() {
     /**
      * Starts the shell script that acquires memory usage information. Before executing this, the
      * user must create the directory for storing memory usage statistics.
-     *
-     * @throws IOException if the path for the memory statistics cannot be located.
      */
-    public void startMemdrone() throws IOException {
+    public void startMemdrone() {
 
-        Configuration config = ZiggyConfiguration.getInstance();
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
         CommandLine commandLine = new CommandLine(
             DirectoryProperties.ziggyBinDir().resolve("memdrone").toString());
         commandLine.addArgument(binaryName);
-        commandLine.addArgument(config.getString(PropertyNames.MEMDRONE_SLEEP_PROP_NAME, "60"));
+        commandLine.addArgument(config.getString(PropertyName.MEMDRONE_SLEEP.property(), "60"));
         Path memdronePath = latestMemdronePath();
         commandLine.addArgument(memdronePath.toString());
         if (watchdogMap.containsKey(nameRoot)) {
@@ -184,11 +196,12 @@ public void stopMemdrone() {
      * information has already been collected and serialized, it is deserialized and returned.
      *
      * @return a {@link Map} from process ID to memory usage time series.
-     * @throws Exception if any file operations fail.
      */
     @SuppressFBWarnings(value = "OBJECT_DESERIALIZATION",
         justification = SpotBugsUtils.DESERIALIZATION_JUSTIFICATION)
-    public Map<String, DescriptiveStatistics> statsByPid() throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public Map<String, DescriptiveStatistics> statsByPid() {
         Path cacheFile = latestMemdronePath().resolve(MEMDRONE_STATS_CACHE_FILENAME);
         Map<String, DescriptiveStatistics> taskStats = null;
 
@@ -200,6 +213,13 @@ public Map<String, DescriptiveStatistics> statsByPid() throws Exception {
                 Map<String, DescriptiveStatistics> obj = (Map<String, DescriptiveStatistics>) ois
                     .readObject();
                 taskStats = obj;
+            } catch (IOException e) {
+                throw new UncheckedIOException(
+                    "IOException occurred reading from " + cacheFile.toString(), e);
+            } catch (ClassNotFoundException e) {
+                // This can never occur. This class both writes and reads the serialized
+                // Java object so the existence and use of the correct class is guaranteed.
+                throw new AssertionError(e);
             }
         } else { // no cache
             log.info("Creating stats cache file");
@@ -218,7 +238,9 @@ public Map<String, DescriptiveStatistics> statsByPid() throws Exception {
      */
     @SuppressFBWarnings(value = "OBJECT_DESERIALIZATION",
         justification = SpotBugsUtils.DESERIALIZATION_JUSTIFICATION)
-    public Map<String, String> subTasksByPid() throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public Map<String, String> subTasksByPid() {
         Path cacheFile = latestMemdronePath().resolve(PID_MAP_CACHE_FILENAME);
         Map<String, String> pidToSubTask = null;
 
@@ -231,6 +253,13 @@ public Map<String, String> subTasksByPid() throws Exception {
                 pidToSubTask = obj;
 
                 log.debug("pid cache: " + obj);
+            } catch (IOException e) {
+                throw new UncheckedIOException(
+                    "IOException occurred reading from " + cacheFile.toString(), e);
+            } catch (ClassNotFoundException e) {
+                // This can never occur. The class used in the readObject() call is the
+                // same one used to write the file in the first place.
+                throw new AssertionError(e);
             }
         } else { // no cache
             log.info("Creating pid cache file");
@@ -242,10 +271,9 @@ public Map<String, String> subTasksByPid() throws Exception {
 
     /**
      * Generates and serializes the {@link Map} between process ID and memory usage time series.
-     *
-     * @throws Exception if any file operations fail.
      */
-    public Map<String, DescriptiveStatistics> createStatsCache() throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public Map<String, DescriptiveStatistics> createStatsCache() {
         Path latestMemdronePath = latestMemdronePath();
         Path cacheFile = latestMemdronePath.resolve(MEMDRONE_STATS_CACHE_FILENAME);
         Map<String, DescriptiveStatistics> taskStats = new HashMap<>();
@@ -275,8 +303,9 @@ public Map<String, DescriptiveStatistics> createStatsCache() throws Exception {
                 new BufferedOutputStream(new FileOutputStream(cacheFile.toFile())))) {
                 oos.writeObject(taskStats);
                 oos.flush();
-            } catch (Exception e) {
-                log.warn("failed to create cache file, caught e = " + e);
+            } catch (IOException e) {
+                throw new UncheckedIOException("Unable to write to file " + cacheFile.toString(),
+                    e);
             }
         }
 
@@ -285,10 +314,10 @@ public Map<String, DescriptiveStatistics> createStatsCache() throws Exception {
 
     /**
      * Generates and serializes the {@link} map between process ID and task/subtask.
-     *
-     * @throws Exception if any file operations fail.
      */
-    public Map<String, String> createPidMapCache() throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public Map<String, String> createPidMapCache() {
         Path cacheFile = latestMemdronePath().resolve(PID_MAP_CACHE_FILENAME);
         Map<String, String> pidToSubTask = new HashMap<>();
 
@@ -321,14 +350,18 @@ public Map<String, String> createPidMapCache() throws Exception {
                         File pidsFile = new File(subTaskDir,
                             MatlabJavaInitialization.MATLAB_PIDS_FILENAME);
                         if (pidsFile.exists()) {
-                            String hostPid = FileUtils.readFileToString(pidsFile,
-                                MatlabJavaInitialization.PID_FILE_CHARSET);
+                            String hostPid;
+                            try {
+                                hostPid = FileUtils.readFileToString(pidsFile,
+                                    MatlabJavaInitialization.PID_FILE_CHARSET);
+                            } catch (IOException e) {
+                                throw new UncheckedIOException(
+                                    "Unable to read from file " + pidsFile.toString(), e);
+                            }
 
                             pidToSubTask.put(hostPid, subTaskId);
-
                         }
                     }
-
                 }
             }
         }
@@ -339,8 +372,8 @@ public Map<String, String> createPidMapCache() throws Exception {
                 new FileOutputStream(cacheFile.toAbsolutePath().toString())))) {
             oos.writeObject(pidToSubTask);
             oos.flush();
-        } catch (Exception e) {
-            log.warn("failed to create cache file, caught e = " + e);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to write to file " + cacheFile.toString(), e);
         }
         return pidToSubTask;
     }
@@ -356,5 +389,4 @@ private Date date() {
     void setDate(Date date) {
         this.date = date;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/MemdroneLog.java b/src/main/java/gov/nasa/ziggy/metrics/report/MemdroneLog.java
index 42e7084..f8c947d 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/MemdroneLog.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/MemdroneLog.java
@@ -3,8 +3,11 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -13,6 +16,8 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
@@ -24,9 +29,11 @@ public class MemdroneLog {
     private InputStream input;
     private int lineCount = 0;
     private int skipCount = 0;
+    private File memdroneLogFile;
     // Map<ProcessId, DescriptiveStats>
     private Map<String, DescriptiveStatistics> logContents;
 
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public MemdroneLog(File memdroneLogFile) {
         if (!memdroneLogFile.exists()) {
             throw new PipelineException(
@@ -40,22 +47,20 @@ public MemdroneLog(File memdroneLogFile) {
 
         try {
             input = new FileInputStream(memdroneLogFile);
-            parse();
-        } catch (Exception e) {
-            throw new PipelineException("failed to parse file, caught e = " + e, e);
+        } catch (FileNotFoundException e) {
+            throw new UncheckedIOException("File " + memdroneLogFile.toString() + " not found", e);
         }
+        this.memdroneLogFile = memdroneLogFile;
+        parse();
     }
 
     public MemdroneLog(InputStream input) {
         this.input = input;
-        try {
-            parse();
-        } catch (Exception e) {
-            throw new PipelineException("failed to parse file, caught e = " + e, e);
-        }
+        parse();
     }
 
-    private void parse() throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void parse() {
         log.info("Parse started");
 
         logContents = new HashMap<>();
@@ -63,7 +68,6 @@ private void parse() throws Exception {
         try (BufferedReader br = new BufferedReader(
             new InputStreamReader(input, FileUtil.ZIGGY_CHARSET))) {
             String line = null;
-
             while ((line = br.readLine()) != null) {
                 lineCount++;
                 MemdroneSample s = new MemdroneSample(line);
@@ -78,6 +82,9 @@ private void parse() throws Exception {
                     skipCount++;
                 }
             }
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "IOException occurred reading from " + memdroneLogFile.toString(), e);
         }
 
         log.info("Parse complete");
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/MemdroneSample.java b/src/main/java/gov/nasa/ziggy/metrics/report/MemdroneSample.java
index 26c7020..88cb10f 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/MemdroneSample.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/MemdroneSample.java
@@ -6,6 +6,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+
 /**
  * A single line from a memdrone log file. Lines in the memdrone log take the following form:
  *
@@ -44,6 +47,7 @@ public MemdroneSample(String processName, String processId, long timestampMillis
         valid = true;
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     private boolean parse(String memdroneLogLine) {
         String[] elements = memdroneLogLine.split("\\s+");
 
@@ -63,8 +67,7 @@ private boolean parse(String memdroneLogLine) {
         try {
             timestampMillis = parseDate(timestampString);
             memoryKilobytes = Integer.parseInt(elements[7]);
-
-        } catch (Exception e) {
+        } catch (ParseException | NumberFormatException e) {
             log.warn("Parse error: " + e);
             return false;
         }
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/MetricsCli.java b/src/main/java/gov/nasa/ziggy/metrics/report/MetricsCli.java
index 222cda6..35738d5 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/MetricsCli.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/MetricsCli.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -52,7 +52,7 @@ public class MetricsCli {
     public MetricsCli() {
     }
 
-    private void processCommand(String[] args) throws Exception {
+    private void processCommand(String[] args) {
         String command = args[0];
         if (command.equals("available") || command.equals("a")) {
             dumpAvailableTypes();
@@ -66,7 +66,7 @@ private void processCommand(String[] args) throws Exception {
         System.exit(0);
     }
 
-    private void generateMetricsReportCommand(String[] args) throws Exception {
+    private void generateMetricsReportCommand(String[] args) {
         if (args.length == 2) {
             File file = new File(args[1]);
             if (!file.exists() || !file.isDirectory()) {
@@ -93,7 +93,7 @@ private void dumpAvailableTypes() {
         }
     }
 
-    private void dumpMetricsFileCommand(String[] args) throws Exception {
+    private void dumpMetricsFileCommand(String[] args) {
         if (args.length == 2) {
             File file = new File(args[1]);
             if (!file.exists() || !file.isFile()) {
@@ -137,7 +137,7 @@ private static void usage() {
             "    r[eport] DIR : Generate an aggregate report (PDF) from a tree of metrics.ser files");
     }
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         if (args.length < 1) {
             usage();
             System.exit(-1);
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/NodeIndexRange.java b/src/main/java/gov/nasa/ziggy/metrics/report/NodeIndexRange.java
index 92657d3..db2fb9d 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/NodeIndexRange.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/NodeIndexRange.java
@@ -30,7 +30,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         NodeIndexRange other = (NodeIndexRange) obj;
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/NodeReport.java b/src/main/java/gov/nasa/ziggy/metrics/report/NodeReport.java
index 5537bb2..c8d22f7 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/NodeReport.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/NodeReport.java
@@ -30,9 +30,8 @@ public NodeReport(PdfRenderer pdfRenderer) {
         super(pdfRenderer);
     }
 
-    public void generateReport(PipelineInstanceNode node, List<PipelineTask> tasks)
-        throws Exception {
-        String moduleName = node.getPipelineModuleDefinition().getName().getName();
+    public void generateReport(PipelineInstanceNode node, List<PipelineTask> tasks) {
+        String moduleName = node.getPipelineModuleDefinition().getName();
         pdfRenderer.printText("Pipeline Module: " + moduleName, PdfRenderer.h1Font);
 
         categoryStats = new HashMap<>();
@@ -196,5 +195,4 @@ public long getMetricValue() {
             return metricValue;
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/PdfRenderer.java b/src/main/java/gov/nasa/ziggy/metrics/report/PdfRenderer.java
index a0ec27c..50944dc 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/PdfRenderer.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/PdfRenderer.java
@@ -4,11 +4,12 @@
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 
 import org.jfree.chart.JFreeChart;
 
 import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
@@ -18,6 +19,9 @@
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
 
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+
 /**
  * Thin wrapper around Open PDF and JFreeChart
  *
@@ -38,11 +42,12 @@ public class PdfRenderer {
 
     private final boolean portrait;
 
-    public PdfRenderer(File outputFile) throws Exception {
+    public PdfRenderer(File outputFile) {
         this(outputFile, true);
     }
 
-    public PdfRenderer(File outputFile, boolean portrait) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public PdfRenderer(File outputFile, boolean portrait) {
         this.portrait = portrait;
 
         if (portrait) {
@@ -51,11 +56,16 @@ public PdfRenderer(File outputFile, boolean portrait) throws Exception {
             pdfDocument = new Document(PageSize.LETTER.rotate());
         }
 
-        FileOutputStream pdfFos = new FileOutputStream(outputFile);
-        BufferedOutputStream pdfBos = new BufferedOutputStream(pdfFos);
+        try {
+            FileOutputStream pdfFos = new FileOutputStream(outputFile);
+            BufferedOutputStream pdfBos = new BufferedOutputStream(pdfFos);
 
-        pdfWriter = PdfWriter.getInstance(pdfDocument, pdfBos);
-        pdfDocument.open();
+            pdfWriter = PdfWriter.getInstance(pdfDocument, pdfBos);
+            pdfDocument.open();
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to open " + outputFile.toString() + " for output", e);
+        }
     }
 
     public void close() {
@@ -73,10 +83,16 @@ public void close() {
      * @param height
      * @throws Exception
      */
-    public void printChart(JFreeChart chart, int width, int height) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void printChart(JFreeChart chart, int width, int height) {
         BufferedImage bufferedImage = chart.createBufferedImage(width, height);
-        Image image = Image.getInstance(pdfWriter, bufferedImage, 1.0f);
-        pdfDocument.add(image);
+        Image image;
+        try {
+            image = Image.getInstance(pdfWriter, bufferedImage, 1.0f);
+            pdfDocument.add(image);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
     }
 
     /**
@@ -88,22 +104,27 @@ public void printChart(JFreeChart chart, int width, int height) throws Exception
      * @param height
      * @throws Exception
      */
-    public void printChart(PdfPTable table, JFreeChart chart, int width, int height)
-        throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void printChart(PdfPTable table, JFreeChart chart, int width, int height) {
         BufferedImage bufferedImage = chart.createBufferedImage(width, height);
-        Image image = Image.getInstance(pdfWriter, bufferedImage, 1.0f);
-        table.addCell(image);
+        Image image;
+        try {
+            image = Image.getInstance(pdfWriter, bufferedImage, 1.0f);
+            table.addCell(image);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
     }
 
-    public void println() throws Exception {
+    public void println() {
         printText(" ");
     }
 
-    public void printText(String text) throws Exception {
+    public void printText(String text) {
         printText(text, bodyFont);
     }
 
-    public void printText(String text, Font font) throws Exception {
+    public void printText(String text, Font font) {
         Paragraph p = new Paragraph(text, font);
         if (font == titleFont) {
             p.setAlignment(Element.ALIGN_CENTER);
@@ -115,7 +136,7 @@ public void newPage() {
         pdfDocument.newPage();
     }
 
-    public void add(Element element) throws DocumentException {
+    public void add(Element element) {
         pdfDocument.add(element);
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/PerformanceReport.java b/src/main/java/gov/nasa/ziggy/metrics/report/PerformanceReport.java
index 1a12262..1b01795 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/PerformanceReport.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/PerformanceReport.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -35,6 +35,8 @@
 package gov.nasa.ziggy.metrics.report;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -57,6 +59,8 @@
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceNodeCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * @author Todd Klaus
@@ -79,7 +83,8 @@ public PerformanceReport(long instanceId, File taskFilesDir, NodeIndexRange node
         this.nodes = nodes;
     }
 
-    public Path generateReport() throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public Path generateReport() {
         log.info("Generating performance report");
 
         PipelineInstanceCrud pipelineInstanceCrud = new PipelineInstanceCrud();
@@ -94,9 +99,14 @@ public Path generateReport() throws Exception {
         }
 
         Path outputPath = ReportFilePaths.performanceReportPath(instanceId);
-        Files.createDirectories(outputPath.getParent());
+        try {
+            Files.createDirectories(outputPath.getParent());
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to create directory " + outputPath.getParent().toString(), e);
+        }
 
-        log.info("Writing report to: " + outputPath.toString());
+        log.info("Writing report to {}...", outputPath.toString());
 
         PdfRenderer pdfRenderer = new PdfRenderer(outputPath.toFile(), false);
 
@@ -137,7 +147,8 @@ public Path generateReport() throws Exception {
 
         pdfRenderer.close();
 
-        log.info("DONE Generating performance report");
+        log.info("Writing report to {}...done", outputPath.toString());
+
         return outputPath;
     }
 
@@ -156,8 +167,8 @@ private List<PipelineInstanceNode> selectNodes(List<PipelineInstanceNode> instan
     }
 
     private void generateNodeReport(PdfRenderer pdfRenderer, PipelineInstanceNode node,
-        List<PipelineTask> tasks) throws Exception {
-        String moduleName = node.getPipelineModuleDefinition().getName().getName();
+        List<PipelineTask> tasks) {
+        String moduleName = node.getPipelineModuleDefinition().getName();
 
         NodeReport nodeReport = new NodeReport(pdfRenderer);
         nodeReport.generateReport(node, tasks);
@@ -200,6 +211,8 @@ private static void usageAndExit(String msg, Options options) {
         System.exit(-1);
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.USAGE)
+    @AcceptableCatchBlock(rationale = Rationale.USAGE)
     private static NodeIndexRange parseNodesArg(String nodesArg, Options options) {
         String[] parts = nodesArg.split(":");
 
@@ -227,7 +240,9 @@ private static NodeIndexRange parseNodesArg(String nodesArg, Options options) {
         return new NodeIndexRange(startNodeIndex, endNodeIndex);
     }
 
-    public static void main(String[] args) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.USAGE)
+    @AcceptableCatchBlock(rationale = Rationale.USAGE)
+    public static void main(String[] args) {
         Options options = new Options();
         options.addOption(INSTANCE_ID_OPT, true, "Pipeline instance ID");
         options.addOption(TASK_FILES_OPT, true, "Top-level task file for instance");
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/Report.java b/src/main/java/gov/nasa/ziggy/metrics/report/Report.java
index 03ba14f..42925e0 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/Report.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/Report.java
@@ -141,7 +141,7 @@ protected HumanReadableStatistics toHumanReadable(DescriptiveStatistics stats, S
         return new HumanReadableStatistics(units, list);
     }
 
-    protected void dumpTopTen(PdfPTable pdfTable, TopNList topTenList, Format f) throws Exception {
+    protected void dumpTopTen(PdfPTable pdfTable, TopNList topTenList, Format f) {
         List<TopNListElement> list = topTenList.getList();
 
         PdfPTable topTenTable = new PdfPTable(2);
@@ -176,7 +176,7 @@ protected String formatTime(long timeMillis) {
     }
 
     protected void generateSummaryTable(String label, DescriptiveStatistics stats, TopNList topTen,
-        Format f) throws Exception {
+        Format f) {
         log.info("Generating report for: " + label);
 
         PdfPTable layoutTable = new PdfPTable(2);
@@ -218,7 +218,7 @@ protected void generateSummaryTable(String label, DescriptiveStatistics stats, T
     }
 
     protected JFreeChart generateHistogram(String title, String xCaption, String yCaption,
-        List<Double> values, int numBins) throws Exception {
+        List<Double> values, int numBins) {
         if (values == null || values.size() == 0) {
             return null;
         }
@@ -282,12 +282,11 @@ protected JFreeChart generatePieChart(String title, PieDataset dataset) {
         return chart;
     }
 
-    protected void printDisplayModel(String title, DisplayModel displayModel) throws Exception {
+    protected void printDisplayModel(String title, DisplayModel displayModel) {
         printDisplayModel(title, displayModel, null);
     }
 
-    protected void printDisplayModel(String title, DisplayModel displayModel, float[] colsWidth)
-        throws Exception {
+    protected void printDisplayModel(String title, DisplayModel displayModel, float[] colsWidth) {
         pdfRenderer.printText(title, PdfRenderer.h1Font);
         pdfRenderer.println();
 
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/ReportFilePaths.java b/src/main/java/gov/nasa/ziggy/metrics/report/ReportFilePaths.java
index 7d0e700..45b0fab 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/ReportFilePaths.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/ReportFilePaths.java
@@ -31,5 +31,4 @@ public static Path performanceReportPath(long instanceId) {
             + Iso8601Formatter.dateTimeLocalFormatter().format(new Date()) + ".pdf";
         return DirectoryProperties.reportsDir().resolve(filename);
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/TopNList.java b/src/main/java/gov/nasa/ziggy/metrics/report/TopNList.java
index d6779a2..a37e23b 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/TopNList.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/TopNList.java
@@ -11,7 +11,7 @@
  * @author Todd Klaus
  */
 public class TopNList implements Serializable {
-    private static final long serialVersionUID = -7121174750685488713L;
+    private static final long serialVersionUID = 20230511L;
 
     private int listMaxLength = 0;
     private final LinkedList<TopNListElement> list = new LinkedList<>();
diff --git a/src/main/java/gov/nasa/ziggy/metrics/report/TopNListElement.java b/src/main/java/gov/nasa/ziggy/metrics/report/TopNListElement.java
index bde50d6..4092a98 100644
--- a/src/main/java/gov/nasa/ziggy/metrics/report/TopNListElement.java
+++ b/src/main/java/gov/nasa/ziggy/metrics/report/TopNListElement.java
@@ -6,7 +6,7 @@
  * @author Todd Klaus
  */
 public class TopNListElement implements Serializable {
-    private static final long serialVersionUID = 4305627034623079699L;
+    private static final long serialVersionUID = 20230511L;
 
     private long value;
     private String label = null;
diff --git a/src/main/java/gov/nasa/ziggy/models/ModelImporter.java b/src/main/java/gov/nasa/ziggy/models/ModelImporter.java
index 0608105..ad22b96 100644
--- a/src/main/java/gov/nasa/ziggy/models/ModelImporter.java
+++ b/src/main/java/gov/nasa/ziggy/models/ModelImporter.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -21,12 +22,13 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.data.management.DataFileManager;
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.ModelMetadata;
 import gov.nasa.ziggy.pipeline.definition.ModelRegistry;
 import gov.nasa.ziggy.pipeline.definition.ModelType;
 import gov.nasa.ziggy.pipeline.definition.crud.ModelCrud;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Imports models of all types from a specified directory.
@@ -117,7 +119,7 @@ public boolean importModels(List<String> filenames) {
         for (ModelType modelType : modelTypeFileNamesMap.keySet()) {
             addModels(modelRegistry, modelType, modelTypeFileNamesMap.get(modelType));
         }
-        modelCrud().createOrUpdate(modelRegistry);
+        modelCrud().merge(modelRegistry);
         log.info("Update of model registry complete");
         long unlockedModelRegistryId = modelCrud().retrieveUnlockedRegistryId();
         log.info("Current unlocked model registry ID == " + unlockedModelRegistryId);
@@ -161,7 +163,6 @@ public Map<String, String> findFilenamesForModelType(List<String> filenames,
                 "Unable to import multiple models of an unversioned model type");
         }
         return versionNumberFileNamesMap;
-
     }
 
     /**
@@ -174,6 +175,7 @@ public Map<String, String> findFilenamesForModelType(List<String> filenames,
      * @param modelType Type of model to be imported.
      * @param versionNumberFileNamesMap Map from version numbers to file names.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     private void addModels(ModelRegistry modelRegistry, ModelType modelType,
         Map<String, String> versionNumberFileNamesMap) {
 
@@ -183,8 +185,8 @@ private void addModels(ModelRegistry modelRegistry, ModelType modelType,
             try {
                 Files.createDirectories(modelDir);
             } catch (IOException e) {
-                throw new PipelineException(
-                    "Unable to create models directory " + modelDir.toString(), e);
+                throw new UncheckedIOException("Unable to create directory " + modelDir.toString(),
+                    e);
             }
         }
 
@@ -208,6 +210,8 @@ private void addModels(ModelRegistry modelRegistry, ModelType modelType,
      * @param modelDir Directory for models of this type in the datastore.
      * @param modelName File name for the model in the import directory.
      */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     private void createModel(ModelRegistry modelRegistry, ModelType modelType, Path modelDir,
         String modelName) {
 
@@ -240,7 +244,7 @@ private void createModel(ModelRegistry modelRegistry, ModelType modelType, Path
         }
 
         // If all that worked, then we can update the model registry
-        modelCrud().create(modelMetadata);
+        modelCrud().persist(modelMetadata);
         modelRegistry.updateModelMetadata(modelMetadata);
         log.info("Imported file " + modelName + " to models directory as "
             + modelMetadata.getDatastoreFileName() + " of type " + modelType.getType());
diff --git a/src/main/java/gov/nasa/ziggy/models/ModelMetadataCli.java b/src/main/java/gov/nasa/ziggy/models/ModelMetadataCli.java
deleted file mode 100644
index 80c36a8..0000000
--- a/src/main/java/gov/nasa/ziggy/models/ModelMetadataCli.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
- *
- * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
- * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
- * 80NSSC18M0068 & 80NSSC21M0079.
- *
- * This file is available under the terms of the NASA Open Source Agreement (NOSA). You should have
- * received a copy of this agreement with the Ziggy source code; see the file LICENSE.pdf.
- *
- * Disclaimers
- *
- * No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SUBJECT
- * SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL BE
- * ERROR FREE, OR ANY WARRANTY THAT DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT
- * SOFTWARE. THIS AGREEMENT DOES NOT, IN ANY MANNER, CONSTITUTE AN ENDORSEMENT BY GOVERNMENT AGENCY
- * OR ANY PRIOR RECIPIENT OF ANY RESULTS, RESULTING DESIGNS, HARDWARE, SOFTWARE PRODUCTS OR ANY
- * OTHER APPLICATIONS RESULTING FROM USE OF THE SUBJECT SOFTWARE. FURTHER, GOVERNMENT AGENCY
- * DISCLAIMS ALL WARRANTIES AND LIABILITIES REGARDING THIRD-PARTY SOFTWARE, IF PRESENT IN THE
- * ORIGINAL SOFTWARE, AND DISTRIBUTES IT "AS IS."
- *
- * Waiver and Indemnity: RECIPIENT AGREES TO WAIVE ANY AND ALL CLAIMS AGAINST THE UNITED STATES
- * GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT. IF RECIPIENT'S
- * USE OF THE SUBJECT SOFTWARE RESULTS IN ANY LIABILITIES, DEMANDS, DAMAGES, EXPENSES OR LOSSES
- * ARISING FROM SUCH USE, INCLUDING ANY DAMAGES FROM PRODUCTS BASED ON, OR RESULTING FROM,
- * RECIPIENT'S USE OF THE SUBJECT SOFTWARE, RECIPIENT SHALL INDEMNIFY AND HOLD HARMLESS THE UNITED
- * STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT, TO THE
- * EXTENT PERMITTED BY LAW. RECIPIENT'S SOLE REMEDY FOR ANY SUCH MATTER SHALL BE THE IMMEDIATE,
- * UNILATERAL TERMINATION OF THIS AGREEMENT.
- */
-
-package gov.nasa.ziggy.models;
-
-import gov.nasa.ziggy.services.database.DatabaseTransaction;
-import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
-
-/**
- * @author Todd Klaus
- */
-public class ModelMetadataCli {
-    private final String filename;
-
-    public ModelMetadataCli(String filename) {
-        this.filename = filename;
-    }
-
-    public void go() throws Exception {
-        ModelRegistryOperations modelRegOps = new ModelRegistryOperations();
-
-        modelRegOps.exportModelRegistry(filename);
-    }
-
-    public static void main(String[] args) {
-
-        String filename = args[0];
-
-        DatabaseTransactionFactory.performTransaction(new DatabaseTransaction<Void>() {
-            @Override
-            public void catchBlock(Throwable e) {
-                System.err.println("ERROR: " + e);
-                e.printStackTrace();
-            }
-
-            @Override
-            public Void transaction() throws Exception {
-                ModelMetadataCli cli = new ModelMetadataCli(filename);
-                cli.go();
-                System.out.println("Completed successfully.");
-                return null;
-            }
-        });
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/models/ModelRegistryOperations.java b/src/main/java/gov/nasa/ziggy/models/ModelRegistryOperations.java
index 6c8d5ae..efa7fcc 100644
--- a/src/main/java/gov/nasa/ziggy/models/ModelRegistryOperations.java
+++ b/src/main/java/gov/nasa/ziggy/models/ModelRegistryOperations.java
@@ -1,8 +1,6 @@
 package gov.nasa.ziggy.models;
 
 import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -10,16 +8,13 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
 
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.ModelMetadata;
 import gov.nasa.ziggy.pipeline.definition.ModelRegistry;
 import gov.nasa.ziggy.pipeline.definition.ModelType;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.crud.ModelCrud;
 import gov.nasa.ziggy.pipeline.xml.ValidatingXmlManager;
-import jakarta.xml.bind.JAXBException;
 
 /**
  * Operations class for the model metadata registry. This registry maintains metadata about models
@@ -33,21 +28,12 @@ public class ModelRegistryOperations {
     private ValidatingXmlManager<ModelRegistry> xmlManager;
 
     public ModelRegistryOperations() {
-        try {
-            xmlManager = new ValidatingXmlManager<>(ModelRegistry.class);
-        } catch (InstantiationException | IllegalAccessException | SAXException | JAXBException
-            | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
-            | SecurityException e) {
-            throw new PipelineException(
-                "Unable to construct ValidatingXmlManager for class ModelRegistry", e);
-        }
+        xmlManager = new ValidatingXmlManager<>(ModelRegistry.class);
     }
 
     /**
      * Returns a String containing a textual report of the latest version of the metadata for all
      * models in the registry.
-     *
-     * @return The report
      */
     public String report() {
         ModelCrud modelCrud = new ModelCrud();
@@ -62,9 +48,6 @@ public String report() {
     /**
      * Returns a String containing a textual report of the model registry associated with the
      * specified pipeline instance.
-     *
-     * @param pipelineInstance
-     * @return
      */
     public String report(PipelineInstance pipelineInstance) {
         ModelRegistry registry = pipelineInstance.getModelRegistry();
@@ -77,9 +60,6 @@ public String report(PipelineInstance pipelineInstance) {
 
     /**
      * Produce a report for the specified ModelRegistry
-     *
-     * @param registry
-     * @return
      */
     private String report(ModelRegistry registry) {
         StringBuilder sb = new StringBuilder();
@@ -111,12 +91,8 @@ private String report(ModelRegistry registry) {
 
     /**
      * Export the current contents of the Data Model Registry to an XML file.
-     *
-     * @param destinationPath
-     * @throws IOException
-     * @throws JAXBException
      */
-    public void exportModelRegistry(String destinationPath) throws IOException, JAXBException {
+    public void exportModelRegistry(String destinationPath) {
         File destinationFile = new File(destinationPath);
         if (destinationFile.exists() && destinationFile.isDirectory()) {
             throw new IllegalArgumentException(
@@ -131,7 +107,5 @@ public void exportModelRegistry(String destinationPath) throws IOException, JAXB
         } else {
             log.warn("Unable to export model registry as no registries present in database");
         }
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/models/SemanticVersionNumber.java b/src/main/java/gov/nasa/ziggy/models/SemanticVersionNumber.java
index d956684..9fc32ad 100644
--- a/src/main/java/gov/nasa/ziggy/models/SemanticVersionNumber.java
+++ b/src/main/java/gov/nasa/ziggy/models/SemanticVersionNumber.java
@@ -65,9 +65,8 @@ public int compareTo(SemanticVersionNumber o) {
         }
         if (minor != o.minor) {
             return minor - o.minor;
-        } else {
-            return patch - o.patch;
         }
+        return patch - o.patch;
     }
 
     public int getMajor() {
@@ -104,20 +103,13 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         SemanticVersionNumber other = (SemanticVersionNumber) obj;
-        if (major != other.major) {
-            return false;
-        }
-        if (minor != other.minor) {
-            return false;
-        }
-        if (patch != other.patch) {
+        if (major != other.major || minor != other.minor || patch != other.patch) {
             return false;
         }
         return true;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/AlgorithmExecutor.java b/src/main/java/gov/nasa/ziggy/module/AlgorithmExecutor.java
index e3bec8b..c4ac353 100644
--- a/src/main/java/gov/nasa/ziggy/module/AlgorithmExecutor.java
+++ b/src/main/java/gov/nasa/ziggy/module/AlgorithmExecutor.java
@@ -1,8 +1,7 @@
 package gov.nasa.ziggy.module;
 
-import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -18,8 +17,8 @@
 import gov.nasa.ziggy.pipeline.definition.crud.ParameterSetCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.ProcessingSummaryOperations;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.services.process.ExternalProcess;;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;;
 
 /**
  * Superclass for algorithm execution. This includes local execution via the
@@ -32,7 +31,8 @@ public abstract class AlgorithmExecutor {
 
     private static final Logger log = LoggerFactory.getLogger(AlgorithmExecutor.class);
 
-    protected static final String EXECUTABLE_NAME = "runjava";
+    public static final String ZIGGY_PROGRAM = "ziggy";
+
     protected static final String NODE_MASTER_NAME = "compute-node-master";
 
     protected final PipelineTask pipelineTask;
@@ -85,24 +85,24 @@ static final AlgorithmExecutor newInstance(PipelineTask pipelineTask,
             return new LocalAlgorithmExecutor(pipelineTask);
         }
         return newRemoteInstance(pipelineTask);
-
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     public static final AlgorithmExecutor newRemoteInstance(PipelineTask pipelineTask) {
-        AlgorithmExecutor executor = null;
         Constructor<? extends AlgorithmExecutor> ctor;
-        Class<? extends AlgorithmExecutor> implementationClass = null;
+        Class<? extends AlgorithmExecutor> implementationClass = SupportedRemoteClusters
+            .remoteCluster()
+            .getRemoteExecutorClass();
         try {
-            implementationClass = SupportedRemoteClusters.remoteCluster().getRemoteExecutorClass();
             ctor = implementationClass.getDeclaredConstructor(PipelineTask.class);
             ctor.setAccessible(true);
-            executor = ctor.newInstance(pipelineTask);
-        } catch (Exception e) {
-            throw new PipelineException(
-                "Unable to instantiate instance of class " + implementationClass.getName(), e);
+            return ctor.newInstance(pipelineTask);
+        } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
+            | IllegalArgumentException | InvocationTargetException e) {
+            // This can never occur. By construction the desired constructor signature
+            // must exist.
+            throw new AssertionError(e);
         }
-        return executor;
-
     }
 
     protected AlgorithmExecutor(PipelineTask pipelineTask) {
@@ -129,25 +129,19 @@ protected AlgorithmExecutor(PipelineTask pipelineTask) {
     public void submitAlgorithm(TaskConfigurationManager inputsHandler) {
 
         prepareToSubmitAlgorithm(inputsHandler);
-        try {
 
-            IntervalMetric.measure(PipelineMetrics.SEND_METRIC, () -> {
-                log.info("Submitting task for execution (taskId=" + pipelineTask.getId() + ")");
-
-                Files.createDirectories(algorithmLogDir());
-                Files.createDirectories(DirectoryProperties.stateFilesDir());
-                Files.createDirectories(taskDataDir());
-                SubtaskUtils.clearStaleAlgorithmStates(WorkingDirManager.workingDir(pipelineTask));
-
-                log.info("Start remote monitoring (taskId=" + pipelineTask.getId() + ")");
-                addToMonitor(stateFile);
-                submitForExecution(stateFile);
-                return null;
-            });
-        } catch (Exception e) {
-            throw new PipelineException(e);
-        }
+        IntervalMetric.measure(PipelineMetrics.SEND_METRIC, () -> {
+            log.info("Submitting task for execution (taskId=" + pipelineTask.getId() + ")");
 
+            Files.createDirectories(algorithmLogDir());
+            Files.createDirectories(DirectoryProperties.stateFilesDir());
+            Files.createDirectories(taskDataDir());
+            SubtaskUtils.clearStaleAlgorithmStates(WorkingDirManager.workingDir(pipelineTask));
+
+            log.info("Start remote monitoring (taskId=" + pipelineTask.getId() + ")");
+            submitForExecution(stateFile);
+            return null;
+        });
     }
 
     private void prepareToSubmitAlgorithm(TaskConfigurationManager inputsHandler) {
@@ -193,7 +187,7 @@ private void prepareToSubmitAlgorithm(TaskConfigurationManager inputsHandler) {
 
     /**
      * Resubmit the pipeline task to the appropriate {@link AlgorithmMonitor}. This is used in the
-     * case where the worker has been stopped and restarted but tasks are still running (usually
+     * case where the supervisor has been stopped and restarted but tasks are still running (usually
      * remotely). This notifies the monitor that there are tasks that it should be looking out for.
      */
     public void resumeMonitoring() {
@@ -203,7 +197,7 @@ public void resumeMonitoring() {
 
     protected abstract void addToMonitor(StateFile stateFile);
 
-    protected abstract void submitForExecution(StateFile stateFile) throws Exception;
+    protected abstract void submitForExecution(StateFile stateFile);
 
     /**
      * Generates an updated instance of {@link PbsParameters}. The method is abstract because each
@@ -213,18 +207,18 @@ public void resumeMonitoring() {
     public abstract PbsParameters generatePbsParameters(RemoteParameters remoteParameters,
         int totalSubtaskCount);
 
-    protected abstract Path algorithmLogDir();
+    protected Path algorithmLogDir() {
+        return DirectoryProperties.algorithmLogsDir();
+    }
 
-    protected abstract Path taskDataDir();
+    protected Path taskDataDir() {
+        return DirectoryProperties.taskDataDir();
+    }
 
     protected Path workingDir() {
         return taskDataDir().resolve(pipelineTask.taskBaseName());
     }
 
-    protected File pipelineConfigFile() {
-        return ZiggyConfiguration.getConfigServicesFile();
-    }
-
     public abstract AlgorithmType algorithmType();
 
     // For testing purposes we need to be able to insert a mocked ParameterSetCrud instance,
@@ -257,66 +251,12 @@ public StateFile getStateFile() {
         return stateFile;
     }
 
-    /**
-     * Convenience class that packages the strings needed to call the task master via an instance of
-     * {@link ExternalProcess}.
-     *
-     * @author PT
-     */
-    public class JobSubmissionPaths {
-
-        private final String workingDirPath;
-        private final String homeDirPath;
-        private final String stateFilePath;
-        private final String pipelineConfigPath;
-        private final String binPath;
-
-        public JobSubmissionPaths() throws IOException {
-
-            workingDirPath = workingDir().toString();
-            homeDirPath = DirectoryProperties.ziggyHomeDir().toString();
-            binPath = DirectoryProperties.ziggyBinDir().toString();
-            stateFilePath = DirectoryProperties.stateFilesDir()
-                .resolve(stateFile.name())
-                .toString();
-            pipelineConfigPath = pipelineConfigFile().getCanonicalPath();
-
-            log.info("location of working directory: " + workingDirPath);
-            log.info("Location of home directory: " + homeDirPath);
-            log.info("Location of state file: " + stateFilePath);
-            log.info("Location of pipeline config file: " + pipelineConfigPath);
-
-        }
-
-        public String getWorkingDirPath() {
-            return workingDirPath;
-        }
-
-        public String getHomeDirPath() {
-            return homeDirPath;
-        }
-
-        public String getBinPath() {
-            return binPath;
-        }
-
-        public String getStateFilePath() {
-            return stateFilePath;
-        }
-
-        public String getPipelineConfigPath() {
-            return pipelineConfigPath;
-        }
-
-    }
-
     public enum AlgorithmType {
         /** local execution only */
         LOCAL,
 
         /** Pleiades execution (database server is inside NAS enclave) */
-        REMOTE;
+        REMOTE
 
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/AlgorithmLifecycle.java b/src/main/java/gov/nasa/ziggy/module/AlgorithmLifecycle.java
index fe92364..e5036e2 100644
--- a/src/main/java/gov/nasa/ziggy/module/AlgorithmLifecycle.java
+++ b/src/main/java/gov/nasa/ziggy/module/AlgorithmLifecycle.java
@@ -31,5 +31,4 @@ public interface AlgorithmLifecycle {
     boolean isRemote();
 
     AlgorithmExecutor getExecutor();
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/AlgorithmLifecycleManager.java b/src/main/java/gov/nasa/ziggy/module/AlgorithmLifecycleManager.java
index b02fc9d..18987b7 100644
--- a/src/main/java/gov/nasa/ziggy/module/AlgorithmLifecycleManager.java
+++ b/src/main/java/gov/nasa/ziggy/module/AlgorithmLifecycleManager.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 
 import org.hibernate.Hibernate;
 import org.slf4j.Logger;
@@ -11,8 +12,10 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
-import gov.nasa.ziggy.worker.TaskFileCopy;
-import gov.nasa.ziggy.worker.TaskFileCopyParameters;
+import gov.nasa.ziggy.supervisor.TaskFileCopy;
+import gov.nasa.ziggy.supervisor.TaskFileCopyParameters;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * This class manages the lifecycle of a pipeline algorithm.
@@ -41,7 +44,7 @@ public void executeAlgorithm(TaskConfigurationManager inputs) {
 
         // Replace the pipeline task and the executor now, since we have new information
         // about the task's subtask counts.
-        pipelineTask = (PipelineTask) DatabaseTransactionFactory.performTransactionInThread(() -> {
+        pipelineTask = (PipelineTask) DatabaseTransactionFactory.performTransaction(() -> {
             PipelineTask p = new PipelineTaskCrud().retrieve(pipelineTask.getId());
             Hibernate.initialize(p.getModuleParameterSets());
             Hibernate.initialize(p.getPipelineInstance());
@@ -58,6 +61,7 @@ public void doPostProcessing() {
     }
 
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public File getTaskDir(boolean cleanExisting) {
         File taskDir = allocateWorkingDir(cleanExisting);
         if (isRemote()) {
@@ -65,13 +69,14 @@ public File getTaskDir(boolean cleanExisting) {
             try {
                 stateFileLockFile.createNewFile();
             } catch (IOException e) {
-                throw new PipelineException("Unable to create lock file for state file", e);
+                throw new UncheckedIOException(
+                    "Unable to create file " + stateFileLockFile.toString(), e);
             }
         }
         return taskDir;
     }
 
-    private void doTaskFileCopy() throws PipelineException {
+    private void doTaskFileCopy() {
         if (pipelineTask != null) {
             TaskFileCopyParameters copyParams = pipelineTask
                 .getParameters(TaskFileCopyParameters.class, false);
@@ -80,14 +85,10 @@ private void doTaskFileCopy() throws PipelineException {
 
                 log.info("Starting copy of task files for pipelineTask : " + pipelineTask.getId());
 
-                try {
-                    IntervalMetric.measure(PipelineMetrics.COPY_TASK_FILES_METRIC, () -> {
-                        copier.copyTaskFiles();
-                        return null;
-                    });
-                } catch (Exception e) {
-                    throw new PipelineException(e);
-                }
+                IntervalMetric.measure(PipelineMetrics.COPY_TASK_FILES_METRIC, () -> {
+                    copier.copyTaskFiles();
+                    return null;
+                });
 
                 log.info("Finished copy of task files for pipelineTask : " + pipelineTask.getId());
             }
@@ -134,17 +135,9 @@ private File allocateWorkingDir(PipelineTask pipelineTask, boolean cleanExisting
         }
 
         if (defaultWorkingDir == null) {
-            try {
-                defaultWorkingDir = workingDirManager.allocateWorkingDir(pipelineTask,
-                    cleanExisting);
-                log.info("defaultWorkingDir = " + defaultWorkingDir);
-
-            } catch (IOException e) {
-                throw new ModuleFatalProcessingException(
-                    "failed to execute external program, e = " + e);
-            }
+            defaultWorkingDir = workingDirManager.allocateWorkingDir(pipelineTask, cleanExisting);
+            log.info("defaultWorkingDir = " + defaultWorkingDir);
         }
         return defaultWorkingDir;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/AlgorithmMonitor.java b/src/main/java/gov/nasa/ziggy/module/AlgorithmMonitor.java
index 6d3001e..92d6ec2 100644
--- a/src/main/java/gov/nasa/ziggy/module/AlgorithmMonitor.java
+++ b/src/main/java/gov/nasa/ziggy/module/AlgorithmMonitor.java
@@ -3,7 +3,6 @@
 import static gov.nasa.ziggy.services.database.DatabaseTransactionFactory.performTransaction;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -19,7 +18,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.module.AlgorithmExecutor.AlgorithmType;
 import gov.nasa.ziggy.pipeline.PipelineExecutor;
+import gov.nasa.ziggy.pipeline.PipelineOperations;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.ProcessingState;
@@ -30,6 +31,13 @@
 import gov.nasa.ziggy.services.alert.AlertService.Severity;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.services.messages.MonitorAlgorithmRequest;
+import gov.nasa.ziggy.services.messages.TaskCompletionNotification;
+import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.supervisor.TaskRequestHandlerLifecycleManager;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Monitors algorithm processing by monitoring state files.
@@ -51,10 +59,10 @@ public class AlgorithmMonitor implements Runnable {
     private static AlgorithmMonitor remoteMonitoringInstance = null;
     private static ScheduledThreadPoolExecutor threadPool = new ScheduledThreadPoolExecutor(2);
 
-    private String stateFileDirPath = null;
     private List<String> corruptedStateFileNames = new ArrayList<>();
     private boolean startLogMessageWritten = false;
-    private boolean monitorRemoteJobs;
+    private AlgorithmType algorithmType;
+    private String monitorVersion;
 
     JobMonitor jobMonitor = null;
 
@@ -73,8 +81,8 @@ public void performActions(AlgorithmMonitor monitor, PipelineTask pipelineTask)
                 DatabaseTransactionFactory.performTransaction(() -> {
                     PipelineTaskCrud pipelineTaskCrud = monitor.pipelineTaskCrud();
                     PipelineTask dbTask = pipelineTaskCrud.retrieve(pipelineTask.getId());
-                    // Submit tasks for persistence at highest priority.
-                    monitor.pipelineExecutor().sendWorkerMessageForTask(dbTask, 0);
+                    // Submit tasks for persistence at high priority.
+                    monitor.pipelineExecutor().persistTaskResults(dbTask);
                     return null;
                 });
             }
@@ -90,54 +98,40 @@ public void performActions(AlgorithmMonitor monitor, PipelineTask pipelineTask)
                     .generateAndBroadcastAlert("Algorithm Monitor", pipelineTask.getId(),
                         Severity.WARNING, "Resubmitting task for further processing");
                 PipelineExecutor pipelineExecutor = monitor.pipelineExecutor();
+                PipelineOperations pipelineOperations = monitor.pipelineOperations();
                 PipelineTask databaseTask = (PipelineTask) DatabaseTransactionFactory
                     .performTransaction(() -> {
                         PipelineTaskCrud pipelineTaskCrud = monitor.pipelineTaskCrud();
                         PipelineTask dbTask = pipelineTaskCrud.retrieve(pipelineTask.getId());
                         dbTask.incrementAutoResubmitCount();
-                        dbTask.setState(PipelineTask.State.ERROR);
-                        dbTask.stopExecutionClock();
-                        pipelineTaskCrud.update(dbTask);
-                        pipelineExecutor.updateTaskCountsForCurrentNode(dbTask, false);
-                        pipelineExecutor.updateInstanceState(dbTask.getPipelineInstance());
+                        pipelineOperations.setTaskState(pipelineTask, PipelineTask.State.ERROR);
+                        pipelineTaskCrud.merge(dbTask);
                         return dbTask;
                     });
 
                 // Submit tasks for resubmission at highest priority.
                 DatabaseTransactionFactory.performTransaction(() -> {
-                    pipelineExecutor.restartFailedTask(databaseTask, false);
-                    pipelineExecutor.sendWorkerMessageForTask(databaseTask, 0, false,
+                    pipelineExecutor.restartFailedTasks(List.of(databaseTask), false,
                         RunMode.RESUBMIT);
                     return null;
                 });
             }
         },
 
-        // Algorithm was deleted or has failures but can't be resubmitted. Mark as
+        // Algorithm was killed or has failures but can't be resubmitted. Mark as
         // failed.
         FAIL {
             @Override
             public void performActions(AlgorithmMonitor monitor, PipelineTask pipelineTask) {
                 log.error("Task with id " + pipelineTask.getId() + " failed on remote system, "
                     + "marking task as errored and not restarting.");
-
-                // If the state file was deleted, no alert is needed since one was already
-                // issued;
-                // if it's failed, an alert is still needed.
-                StateFile stateFile = monitor.state.get(StateFile.invariantPart(pipelineTask));
-                if (!stateFile.getState().equals(StateFile.State.DELETED)) {
-                    monitor.handleFailedOrDeletedTask(
-                        monitor.state.get(StateFile.invariantPart(pipelineTask)));
-                }
+                monitor.handleFailedTask(monitor.state.get(StateFile.invariantPart(pipelineTask)));
                 DatabaseTransactionFactory.performTransaction(() -> {
                     PipelineTaskCrud pipelineTaskCrud = monitor.pipelineTaskCrud();
                     PipelineTask databaseTask = pipelineTaskCrud.retrieve(pipelineTask.getId());
-                    databaseTask.setState(PipelineTask.State.ERROR);
-                    databaseTask.stopExecutionClock();
-                    pipelineTaskCrud.update(databaseTask);
-                    PipelineExecutor pipelineExecutor = monitor.pipelineExecutor();
-                    pipelineExecutor.updateTaskCountsForCurrentNode(databaseTask, false);
-                    pipelineExecutor.updateInstanceState(databaseTask.getPipelineInstance());
+                    PipelineOperations pipelineOperations = monitor.pipelineOperations();
+                    pipelineOperations.setTaskState(pipelineTask, PipelineTask.State.ERROR);
+                    pipelineTaskCrud.merge(databaseTask);
                     return null;
                 });
             }
@@ -157,24 +151,47 @@ public void performActions(AlgorithmMonitor monitor, PipelineTask pipelineTask)
 
     public static void initialize() {
         synchronized (AlgorithmMonitor.class) {
+            if (localMonitoringInstance == null || remoteMonitoringInstance == null) {
+                ZiggyMessenger.subscribe(MonitorAlgorithmRequest.class, message -> {
+                    if (message.getAlgorithmType().equals(AlgorithmType.LOCAL)) {
+                        AlgorithmMonitor.startLocalMonitoring(
+                            message.getStateFile().newStateFileFromDiskFile());
+                    } else {
+                        AlgorithmMonitor.startRemoteMonitoring(
+                            message.getStateFile().newStateFileFromDiskFile());
+                    }
+                });
+            }
             if (localMonitoringInstance == null) {
-                localMonitoringInstance = new AlgorithmMonitor(false);
+                localMonitoringInstance = new AlgorithmMonitor(AlgorithmType.LOCAL);
                 localMonitoringInstance.startMonitoringThread();
             }
             if (remoteMonitoringInstance == null) {
-                remoteMonitoringInstance = new AlgorithmMonitor(true);
+                remoteMonitoringInstance = new AlgorithmMonitor(AlgorithmType.REMOTE);
                 remoteMonitoringInstance.startMonitoringThread();
             }
+
+            // Whenever a worker sends a "last message," run an unscheduled
+            // update of the monitors and tell the ops instances panel to refresh.
+            ZiggyMessenger.subscribe(WorkerStatusMessage.class, message -> {
+                if (message.isLastMessageFromWorker()) {
+                    localMonitoringInstance.run();
+                    remoteMonitoringInstance.run();
+                    ZiggyMessenger.publish(
+                        new TaskCompletionNotification(Long.parseLong(message.getTaskId())));
+                }
+            });
         }
     }
 
     /**
      * Constructor. Default scope for use in unit tests.
      */
-    AlgorithmMonitor(boolean monitorRemoteJobs) {
-        stateFileDirPath = DirectoryProperties.stateFilesDir().toString();
-        this.monitorRemoteJobs = monitorRemoteJobs;
-        log.info("Starting new monitor for: " + stateFileDirPath);
+    AlgorithmMonitor(AlgorithmType algorithmType) {
+        this.algorithmType = algorithmType;
+        monitorVersion = algorithmType.name().toLowerCase();
+
+        log.info("Starting new monitor for: " + DirectoryProperties.stateFilesDir().toString());
         initializeJobMonitor();
     }
 
@@ -182,7 +199,10 @@ public static void initialize() {
      * Start the monitoring thread for a given monitor.
      */
     void startMonitoringThread() {
-        if (pollingIntervalMillis() > 0) {
+        long pollingIntervalMillis = pollingIntervalMillis();
+        if (pollingIntervalMillis > 0) {
+            log.info("Starting polling on " + monitorVersion + " with " + pollingIntervalMillis
+                + " msec interval");
             threadPool.scheduleWithFixedDelay(this, 0, pollingIntervalMillis(),
                 TimeUnit.MILLISECONDS);
         }
@@ -197,41 +217,23 @@ private String username() {
     }
 
     public static void startLocalMonitoring(StateFile task) {
-        startMonitoring(task, false);
+        startMonitoring(task, AlgorithmType.LOCAL);
     }
 
     public static void startRemoteMonitoring(StateFile task) {
-        startMonitoring(task, true);
+        startMonitoring(task, AlgorithmType.REMOTE);
     }
 
-    /**
-     * Moves state files for locally-executing tasks to the DELETED state, based on a {@link List}
-     * of task IDs that the caller wishes to delete. Returns the task IDs of tasks that were
-     * successfully deleted (since some tasks on the list may have been in the submitted state, or
-     * running remotely).
-     *
-     * @throws IOException
-     */
-    public static List<Long> deleteLocalTasks(List<Long> taskIds) throws IOException {
-        List<Long> deletedTaskIds = new ArrayList<>();
-        for (StateFile stateFile : localMonitoringInstance.state.values()) {
-            if (taskIds.contains(stateFile.getPipelineTaskId())) {
-                localMonitoringInstance.moveStateFileToDeletedState(stateFile);
-                deletedTaskIds.add(stateFile.getPipelineTaskId());
-            }
-        }
-        return deletedTaskIds;
-    }
-
-    private static void startMonitoring(StateFile task, boolean remoteExecution) {
-        AlgorithmMonitor instance = remoteExecution ? remoteMonitoringInstance
+    private static void startMonitoring(StateFile task, AlgorithmType algorithmType) {
+        AlgorithmMonitor instance = algorithmType.equals(AlgorithmType.REMOTE)
+            ? remoteMonitoringInstance
             : localMonitoringInstance;
         instance.startMonitoring(task);
-
     }
 
     void startMonitoring(StateFile task) {
-        log.info("Starting monitoring for: " + task.invariantPart());
+        log.info("Starting monitoring for: " + task.invariantPart() + " on " + monitorVersion
+            + " algorithm monitor");
         state.put(task.invariantPart(), new StateFile(task));
         jobMonitor().addToMonitoring(task);
     }
@@ -241,7 +243,7 @@ private List<File> stateFiles() {
         List<File> stateDirListing = new LinkedList<>();
 
         // get the raw list, excluding directories
-        File stateDirFile = new File(stateFileDirPath);
+        File stateDirFile = DirectoryProperties.stateFilesDir().toFile();
         List<File> allFiles = new ArrayList<>();
         if (stateDirFile != null) {
             File[] files = stateDirFile.listFiles();
@@ -253,17 +255,16 @@ private List<File> stateFiles() {
                 .collect(Collectors.toList());
         }
 
-        // throw away everything that doesn't have the correct prefix, and everything
+        // throw away everything that doesn't have the correct pattern, and everything
         // that is on the corrupted list
         List<File> filteredFiles = stateDirListing.stream()
-            .filter(s -> s.getName().startsWith(StateFile.PREFIX))
+            .filter(s -> StateFile.STATE_FILE_NAME_PATTERN.matcher(s.getName()).matches())
             .filter(s -> !corruptedStateFileNames.contains(s.getName()))
             .collect(Collectors.toList());
         return new LinkedList<>(filteredFiles);
     }
 
-    private void performStateFileChecks(StateFile oldState, StateFile remoteState)
-        throws IOException {
+    private void performStateFileChecks(StateFile oldState, StateFile remoteState) {
 
         String key = remoteState.invariantPart();
 
@@ -283,10 +284,6 @@ private void performStateFileChecks(StateFile oldState, StateFile remoteState)
                 attrOps.updateProcessingState(taskId, ProcessingState.ALGORITHM_EXECUTING);
             }
 
-            if (remoteState.isDeleted()) {
-                handleFailedOrDeletedTask(remoteState);
-            }
-
             if (remoteState.isDone()) {
                 // update processing state
                 attrOps.updateProcessingState(taskId, ProcessingState.ALGORITHM_COMPLETE);
@@ -317,6 +314,7 @@ private void performStateFileChecks(StateFile oldState, StateFile remoteState)
     }
 
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public void run() {
 
         if (!startLogMessageWritten) {
@@ -332,11 +330,15 @@ public void run() {
                     dumpRemoteState(stateDirListing);
                 }
                 performStateFileLoop(stateDirListing);
-            } // end non-empty state map
-
+            }
         } catch (Exception e) {
-            log.warn("top: caught e=" + e, e);
-        } // end try-catch
+            // We don't want transient problems with the remote monitoring tool
+            // (which is third party software and not under our control) to bring
+            // down the monitor, so we catch all exceptions here including runtime
+            // ones in the hope and expectation that the next time we call the
+            // monitor the transient problem will have resolved itself.
+            log.warn("Task monitor: exception has occurred", e);
+        }
     }
 
     /**
@@ -347,6 +349,7 @@ public void run() {
      *
      * @param stateDirListing
      */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     private void performStateFileLoop(List<File> stateDirListing) {
         for (File remoteFile : stateDirListing) {
             String name = remoteFile.getName();
@@ -395,14 +398,14 @@ private void sendTaskToWorker(StateFile remoteState) {
 
     /**
      * Handles a task for which processing has failed (either due to error or because the user
-     * deleted it). In this case, several actions need to be taken: the information about the cause
+     * killed it). In this case, several actions need to be taken: the information about the cause
      * of the error has to be captured via qstat and logged locally; the pipeline task entry in the
      * database needs its TaskExecutionLog updated; the remote state file needs to be renamed to
      * indicate that the job errored.
      *
      * @param stateFile StateFile instance for deleted task.
      */
-    private void handleFailedOrDeletedTask(StateFile stateFile) {
+    private void handleFailedTask(StateFile stateFile) {
 
         // get the exit code and comment via qstat
         String exitStatus = taskStatusValues(stateFile);
@@ -430,7 +433,7 @@ private void handleFailedOrDeletedTask(StateFile stateFile) {
         }
 
         // issue an alert about the deletion
-        String message = monitorRemoteJobs
+        String message = algorithmType.equals(AlgorithmType.REMOTE)
             ? "Task " + exitState + ", return codes = " + exitStatus + ", comments = " + exitComment
             : "Task " + exitState;
         alertService().generateAndBroadcastAlert("Algorithm Monitor", stateFile.getPipelineTaskId(),
@@ -471,7 +474,6 @@ private String taskCommentValues(StateFile stateFile) {
         }
         sb.setLength(sb.length() - 1);
         return sb.toString();
-
     }
 
     /**
@@ -480,30 +482,18 @@ private String taskCommentValues(StateFile stateFile) {
      * detected via qstat calls.
      *
      * @param stateFile State file for failed job.
-     * @throws IOException
-     */
-    private void moveStateFileToCompleteState(StateFile stateFile) throws IOException {
-        stateFile.setStateAndPersist(StateFile.State.COMPLETE, stateFileDirPath);
-    }
-
-    /**
-     * Moves the state file to the DELETED state. This indicates to the {@link ComputeNodeMaster}
-     * that the worker wants processing of the task to end.
-     *
-     * @param stateFile State file for failed job.
-     * @throws IOException
      */
-    private void moveStateFileToDeletedState(StateFile stateFile) throws IOException {
-        stateFile.setStateAndPersist(StateFile.State.DELETED, stateFileDirPath);
+    private void moveStateFileToCompleteState(StateFile stateFile) {
+        stateFile.setStateAndPersist(StateFile.State.COMPLETE);
     }
 
     private Disposition determineDisposition(StateFile state, PipelineTask pipelineTask) {
 
-        // Deleted tasks are automatically regarded as failed.
-        if (state.isDeleted()) {
+        // A task that was deliberately killed must be marked as failed regardless of
+        // how many subtasks completed.
+        if (taskIsKilled(pipelineTask.getId())) {
             return Disposition.FAIL;
         }
-
         // The total number of bad subtasks includes both the ones that failed and the
         // ones that never ran / never finished. If there are few enough bad subtasks,
         // then we can persist results.
@@ -557,39 +547,40 @@ PipelineExecutor pipelineExecutor() {
         return new PipelineExecutor();
     }
 
-    /**
-     * Replace with mocked method for unit testing.
-     */
+    /** Obtains a new {@link PipelineOperations}. Replace with mocked unit for testing. */
+    PipelineOperations pipelineOperations() {
+        return new PipelineOperations();
+    }
+
+    /** Replace with mocked method for unit testing. */
     ProcessingSummaryOperations processingSummaryOperations() {
         return new ProcessingSummaryOperations();
     }
 
-    /**
-     * Replace with mocked method for unit testing.
-     */
+    /** Replace with mocked method for unit testing. */
     PipelineTaskOperations pipelineTaskOperations() {
         return new PipelineTaskOperations();
     }
 
-    /**
-     * Replace with mocked method for unit testing.
-     */
+    /** Replace with mocked method for unit testing. */
     AlertService alertService() {
         return AlertService.getInstance();
     }
 
+    /** Replace with mocked method for unit testing. */
+    boolean taskIsKilled(long taskId) {
+        return TaskRequestHandlerLifecycleManager.taskOnKilledTaskList(taskId);
+    }
+
     /**
      * Returns the polling interval, in milliseconds. Replace with mocked method for unit testing.
-     *
-     * @return
      */
     long pollingIntervalMillis() {
-        return monitorRemoteJobs ? SSH_POLL_INTERVAL_MILLIS : LOCAL_POLL_INTERVAL_MILLIS;
+        return algorithmType.equals(AlgorithmType.REMOTE) ? SSH_POLL_INTERVAL_MILLIS
+            : LOCAL_POLL_INTERVAL_MILLIS;
     }
 
-    /**
-     * Stops the thread pool and replaces it. For testing only.
-     */
+    /** Stops the thread pool and replaces it. For testing only. */
     static void resetThreadPool() {
         if (threadPool != null) {
             threadPool.shutdownNow();
@@ -597,20 +588,16 @@ static void resetThreadPool() {
         threadPool = new ScheduledThreadPoolExecutor(2);
     }
 
-    /**
-     * Gets the {@link StateFile} from the state {@link Map}. For testing only.
-     */
+    /** Gets the {@link StateFile} from the state {@link Map}. For testing only. */
     StateFile getStateFile(StateFile stateFile) {
         return state.get(stateFile.invariantPart());
     }
 
     private void initializeJobMonitor() {
-        jobMonitor = JobMonitor.newInstance(username(), monitorRemoteJobs);
+        jobMonitor = JobMonitor.newInstance(username(), algorithmType);
     }
 
-    /**
-     * Replace with mocked method for unit testing.
-     */
+    /** Replace with mocked method for unit testing. */
     JobMonitor jobMonitor() {
         return jobMonitor;
     }
diff --git a/src/main/java/gov/nasa/ziggy/module/AlgorithmStateFileMonitor.java b/src/main/java/gov/nasa/ziggy/module/AlgorithmStateFileMonitor.java
deleted file mode 100644
index 750a301..0000000
--- a/src/main/java/gov/nasa/ziggy/module/AlgorithmStateFileMonitor.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package gov.nasa.ziggy.module;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.AlgorithmStateFiles.SubtaskState;
-import gov.nasa.ziggy.module.StateFile.State;
-
-/**
- * This class updates the task {@link StateFile} files based on a roll up of the sub-task
- * {@link AlgorithmStateFiles}s.
- * <p>
- * This file-based mechanism is used to communicate state between the worker process and a remote
- * CPU cluster.
- * <p>
- * This code performs a single pass through the current state files.
- *
- * @author Todd Klaus
- */
-public class AlgorithmStateFileMonitor implements Runnable {
-    private static final Logger log = LoggerFactory.getLogger(AlgorithmStateFileMonitor.class);
-
-    /**
-     * Indicates that the task is currently executing on the Pleiades back-end A task is not
-     * considered complete until this file has been deleted
-     */
-    private static final String IN_PROGRESS = ".IN_PROGRESS";
-
-    /** How often we update state */
-    private static final int POLL_INTERVAL_MILLIS = 10 * 1000; // 10 secs
-
-    private final File stateFileDir;
-    private final File taskRootDir;
-
-    public AlgorithmStateFileMonitor(File stateFileDir, File taskRootDir) {
-        this.stateFileDir = stateFileDir;
-        this.taskRootDir = taskRootDir;
-    }
-
-    @Override
-    public void run() {
-        log.info("Remote monitor starting");
-        log.info("Updating state for existing tasks...");
-        while (true) {
-            try {
-                updateStateForRunningTasks();
-            } catch (Exception e) {
-                log.error("updateStateForRunningTasks failed, caught e = " + e, e);
-            }
-
-            try {
-                Thread.sleep(POLL_INTERVAL_MILLIS);
-            } catch (InterruptedException e) {
-            }
-        }
-    }
-
-    private void updateStateForRunningTasks() throws Exception {
-        List<State> stateFilters = new ArrayList<>();
-        stateFilters.add(StateFile.State.PROCESSING);
-
-        List<StateFile> runningTasks = StateFile.fromDirectory(stateFileDir, stateFilters);
-
-        // for each PROCESSING and ERRORSRUNNING task, scan the sub-task dirs
-        // to update the counts and overall state, if necessary
-        for (StateFile stateFile : runningTasks) {
-            String taskDirName = stateFile.taskDirName();
-            File taskDir = new File(taskRootDir, taskDirName);
-            File[] subTaskDirs = taskDir.listFiles();
-            int numTotal = stateFile.getNumTotal();
-            int numComplete = 0;
-            int numFailed = 0;
-
-            if (subTaskDirs != null) {
-                for (File subTaskDir : subTaskDirs) {
-                    AlgorithmStateFiles currentSubTaskStateFile = new AlgorithmStateFiles(
-                        subTaskDir);
-                    SubtaskState currentSubTaskState = currentSubTaskStateFile
-                        .currentSubtaskState();
-
-                    if (currentSubTaskState == null) {
-                        // no algorithm state file exists yet
-                        continue;
-                    }
-
-                    switch (currentSubTaskState) {
-                        case COMPLETE:
-                            numComplete++;
-                            break;
-                        case FAILED:
-                            numFailed++;
-                            break;
-                        case PROCESSING:
-                            break;
-                        default:
-                            throw new IllegalArgumentException(
-                                "Unexpected type: " + currentSubTaskState);
-                    }
-                }
-            }
-
-            File inProgressFile = new File(taskDir, IN_PROGRESS);
-            boolean inProgress = inProgressFile.exists();
-
-            StateFile newStateFile = new StateFile(stateFile);
-
-            newStateFile.setNumTotal(numTotal);
-            newStateFile.setNumComplete(numComplete);
-            newStateFile.setNumFailed(numFailed);
-
-            if (numComplete + numFailed == numTotal && !inProgress) {
-                // done!
-                newStateFile.setState(StateFile.State.COMPLETE);
-            }
-
-            if (!newStateFile.equals(stateFile)) {
-                log.info("Updating state: " + stateFile + " -> " + newStateFile);
-                // update the state file
-                if (!StateFile.updateStateFile(stateFile, newStateFile, stateFileDir)) {
-                    throw new PipelineException("Failed to update state file: " + stateFile);
-                }
-            } else {
-                log.debug("No changes for: " + stateFile);
-            }
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/module/AlgorithmStateFiles.java b/src/main/java/gov/nasa/ziggy/module/AlgorithmStateFiles.java
index 72942a0..4096c59 100644
--- a/src/main/java/gov/nasa/ziggy/module/AlgorithmStateFiles.java
+++ b/src/main/java/gov/nasa/ziggy/module/AlgorithmStateFiles.java
@@ -2,11 +2,13 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.io.Files;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * This class manages zero-length files whose names are used to represent the state of an executing
@@ -96,45 +98,57 @@ public void clearStaleState() {
         failedFlag.delete();
     }
 
-    public void updateCurrentState(SubtaskState newState) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void updateCurrentState(SubtaskState newState) {
         clearState();
 
-        switch (newState) {
-            case COMPLETE:
-                completeFlag.createNewFile();
-                break;
-
-            case PROCESSING:
-                processingFlag.createNewFile();
-                break;
-
-            case FAILED:
-                failedFlag.createNewFile();
-                break;
-
-            default:
-                throw new IllegalStateException("Unknown state: " + newState);
+        try {
+            switch (newState) {
+                case COMPLETE:
+                    completeFlag.createNewFile();
+                    break;
+
+                case PROCESSING:
+                    processingFlag.createNewFile();
+                    break;
+
+                case FAILED:
+                    failedFlag.createNewFile();
+                    break;
+
+                case NULL:
+                    throw new IllegalArgumentException(
+                        "Unable to create new algorithm state file for state " + newState);
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to create new algorithm state file", e);
         }
     }
 
-    public void setResultsFlag() throws IOException {
-        resultsFlag.createNewFile();
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void setResultsFlag() {
+        try {
+            resultsFlag.createNewFile();
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to create new file " + resultsFlag.toString(),
+                e);
+        }
     }
 
     public SubtaskState currentSubtaskState() {
         SubtaskState current = SubtaskState.NULL;
 
-        if (robustExists(processingFlag)) {
+        if (processingFlag.exists()) {
             current = SubtaskState.PROCESSING;
         }
-        if (robustExists(completeFlag)) {
+        if (completeFlag.exists()) {
             if (current != SubtaskState.NULL) {
                 log.warn("Duplicate algorithm state files found!");
                 return null;
             }
             current = SubtaskState.COMPLETE;
         }
-        if (robustExists(failedFlag)) {
+        if (failedFlag.exists()) {
             if (current != SubtaskState.NULL) {
                 log.warn("Duplicate algorithm state files found!");
                 return null;
@@ -151,24 +165,7 @@ public SubtaskState currentSubtaskState() {
      * @return
      */
     public boolean subtaskStateExists() {
-        return robustExists(completeFlag) || robustExists(processingFlag)
-            || robustExists(failedFlag);
-    }
-
-    /**
-     * Verifies that a file exists by attempting to read it instead of just using File.exists() in
-     * order to bypass the NFS client cache
-     *
-     * @param f
-     * @return
-     */
-    private boolean robustExists(File f) {
-        try {
-            Files.toByteArray(f);
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
+        return completeFlag.exists() || processingFlag.exists() || failedFlag.exists();
     }
 
     public boolean isProcessing() {
@@ -210,5 +207,4 @@ public int getCompletedSubtasks() {
             return completedSubtasks;
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/ComputeNodeMaster.java b/src/main/java/gov/nasa/ziggy/module/ComputeNodeMaster.java
index 2de323b..1d7cf2d 100644
--- a/src/main/java/gov/nasa/ziggy/module/ComputeNodeMaster.java
+++ b/src/main/java/gov/nasa/ziggy/module/ComputeNodeMaster.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -36,6 +36,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -46,8 +47,6 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,9 +54,13 @@
 
 import gov.nasa.ziggy.module.StateFile.State;
 import gov.nasa.ziggy.module.remote.TimestampFile;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.logging.TaskLog;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.HostNameUtils;
 import gov.nasa.ziggy.util.TimeFormatter;
-import gov.nasa.ziggy.util.ZiggyBuild;
 import gov.nasa.ziggy.util.io.LockManager;
 
 /**
@@ -69,6 +72,8 @@
  * starts a {@link SubtaskServer} instance to dispatch subtasks to the {@link SubtaskMaster}
  * instances as they complete existing subtasks and are free to start new ones.
  * <p>
+ * The {@link ComputeNodeMaster} requires that the environment variable PIPELINE_CONFIG_PATH be set
+ * on the computer that runs the {@ComputeNodeMaster} instance.
  *
  * @author Todd Klaus
  * @author PT
@@ -80,16 +85,12 @@ public class ComputeNodeMaster implements Runnable {
     private static final long SLEEP_INTERVAL_MILLIS = 10000;
 
     private final String workingDir;
-    private final String homeDir;
-    private final String pipelineConfigPath;
-    private final TaskLog algorithmLog;
     private int coresPerNode;
 
     private final StateFile stateFile;
-    private final File stateFileDir;
     private final File taskDir;
     private final File stateFileLockFile;
-    private String nodeName;
+    private String nodeName = "<unknown>";
     private TaskMonitor monitor;
 
     private SubtaskServer subtaskServer;
@@ -101,30 +102,16 @@ public class ComputeNodeMaster implements Runnable {
 
     private TaskConfigurationManager inputsHandler;
 
-    /**
-     * @param workingDir
-     * @param homeDir
-     * @param stateFilePath
-     * @param pipelineConfigPath
-     * @param algorithmLog
-     * @throws Exception
-     */
-    public ComputeNodeMaster(String workingDir, String homeDir, String stateFilePath,
-        String pipelineConfigPath, TaskLog algorithmLog) throws Exception {
+    public ComputeNodeMaster(String workingDir, TaskLog algorithmLog) {
         this.workingDir = workingDir;
-        this.homeDir = homeDir;
-        this.pipelineConfigPath = pipelineConfigPath;
-        this.algorithmLog = algorithmLog;
 
         log.info("RemoteTaskMaster START");
         log.info(" workingDir = " + workingDir);
-        log.info(" homeDir = " + homeDir);
-        log.info(" stateFilePath = " + stateFilePath);
-        log.info(" pipelineConfigPath = " + pipelineConfigPath);
         log.info(" algorithmLog = " + algorithmLog);
 
-        stateFile = StateFile.newStateFileFromDiskFile(new File(stateFilePath), true);
-        stateFileDir = new File(stateFilePath).getParentFile();
+        nodeName = HostNameUtils.shortHostName();
+
+        stateFile = StateFile.of(Paths.get(workingDir)).newStateFileFromDiskFile();
         taskDir = new File(workingDir);
         stateFileLockFile = stateFile.lockFile();
     }
@@ -135,26 +122,16 @@ public ComputeNodeMaster(String workingDir, String homeDir, String stateFilePath
      * {@link SubtaskMaster} instances. For the node that is going to host the {@link SubtaskServer}
      * instance it also starts the server, updates the {@link StateFile}, creates symlinks, and
      * creates task-start timestamps.
-     *
-     * @throws IOException if unable to lock a file in the task directory or determine the host name
-     * of the node.
-     * @throws InterruptedException if the start of the {@link SubtaskServer} or the
-     * {@link SubtaskMaster}s are interrupted.
-     * @throws IllegalStateException if thrown while attempting to update the state file.
-     * @throws ConfigurationException if thrown while attempting to update the state file.
      */
-    public void initialize()
-        throws IOException, InterruptedException, ConfigurationException, IllegalStateException {
-        ZiggyBuild.logVersionInfo(log);
+    public void initialize() {
 
-        log.info("jvm version:");
-        log.info("  java.runtime.name=" + SystemUtils.JAVA_RUNTIME_NAME);
-        log.info("  sun.boot.library.path=" + System.getProperty("sun.boot.library.path"));
-        log.info("  java.vm.version=" + SystemUtils.JAVA_VM_VERSION);
+        log.info("Starting ComputeNodeMaster ({})",
+            ZiggyConfiguration.getInstance().getString(PropertyName.ZIGGY_VERSION.property()));
+        ZiggyConfiguration.logJvmProperties();
 
         // It's possible that this node isn't starting until all of the subtasks are
         // complete! In that case, it should just exit without doing anything else.
-        monitor = new TaskMonitor(getInputsHandler(), stateFile, stateFileDir, taskDir);
+        monitor = new TaskMonitor(getInputsHandler(), stateFile, taskDir);
         monitor.updateState();
         if (monitor.allSubtasksProcessed()) {
             log.info("All subtasks processed, ComputeNodeMaster exiting");
@@ -176,7 +153,7 @@ public void initialize()
      *
      * @throws IOException if unable to release write lock on state file.
      */
-    private void updateStateFile() throws IOException {
+    private void updateStateFile() {
 
         // NB: If there are multiple jobs associated with a single task, this update only
         // needs to be performed if this job is the first to start
@@ -188,7 +165,7 @@ private void updateStateFile() throws IOException {
                 stateFile.setState(StateFile.State.PROCESSING);
                 log.info("Updating state: " + previousStateFile + " -> " + stateFile);
 
-                if (!StateFile.updateStateFile(previousStateFile, stateFile, stateFileDir)) {
+                if (!StateFile.updateStateFile(previousStateFile, stateFile)) {
                     log.error("Failed to update state file: " + previousStateFile);
                 }
             } else {
@@ -217,10 +194,9 @@ private void createTimestamps() {
      * Starts the {@link SubtaskMaster} instances in the threads of a thread pool, one thread per
      * active cores on this node. A {@link Semaphore} is used to track the number of
      * {@link SubtaskMaster} instances currently running.
-     *
-     * @throws InterruptedException if the semaphore acquire method is interrupted.
      */
-    private void startSubtaskMasters() throws InterruptedException {
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    private void startSubtaskMasters() {
 
         int timeoutSecs = (int) TimeFormatter
             .timeStringHhMmSsToTimeInSeconds(stateFile.getRequestedWallTime());
@@ -229,9 +205,15 @@ private void startSubtaskMasters() throws InterruptedException {
         ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("SubtaskMaster[%d]")
             .build();
         for (int i = 0; i < coresPerNode; i++) {
-            subtaskMasterSemaphore.acquire();
+            try {
+                subtaskMasterSemaphore.acquire();
+            } catch (InterruptedException e) {
+                // This can never occur. The number of permits is equal to the number of threads,
+                // thus there is no need to wait for a permit to become available.
+                throw new AssertionError(e);
+            }
             SubtaskMaster subtaskMaster = new SubtaskMaster(i, nodeName, subtaskMasterSemaphore,
-                stateFile.getModuleName(), workingDir, timeoutSecs, homeDir, pipelineConfigPath);
+                stateFile.getModuleName(), workingDir, timeoutSecs);
             subtaskMasters.add(subtaskMaster);
             threadPool.submit(subtaskMaster, threadFactory);
         }
@@ -249,17 +231,22 @@ private void startSubtaskMasters() throws InterruptedException {
      * <li>All of the {@link SubtaskMaster} threads have completed.
      * <li>All of the subtasks are either completed or failed.
      * </ol>
-     *
-     * @throws InterruptedException if the call to wait is interrupted.
      */
-    public void monitor() throws InterruptedException {
+    @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
+    public void monitor() {
 
         log.info("Waiting for subtasks to complete");
 
         ScheduledThreadPoolExecutor monitoringThreadPool = new ScheduledThreadPoolExecutor(1);
         monitoringThreadPool.scheduleAtFixedRate(this, 0L, SLEEP_INTERVAL_MILLIS,
             TimeUnit.MILLISECONDS);
-        monitoringLatch.await();
+        try {
+            monitoringLatch.await();
+        } catch (InterruptedException e) {
+            // If the ComputeNodeMaster main thread is interrupted, it means that the entire
+            // ComputeNodeMaster is shutting down. We can simply allow it to shut down and don't
+            // need to do anything further.
+        }
         monitoringThreadPool.shutdownNow();
     }
 
@@ -281,18 +268,7 @@ public void run() {
 
         // Do state checks and updates
         boolean allSubtasksProcessed = monitor.allSubtasksProcessed();
-        try {
-            monitor.updateState();
-        } catch (IOException e) {
-            throw new PipelineException("Unable to update state file", e);
-        }
-
-        // If the task is slated for deletion, exit monitoring immediately.
-        if (monitor.isDeleted()) {
-            log.info("Task in deleted state, exiting");
-            endMonitoring();
-            return;
-        }
+        monitor.updateState();
 
         // If all the subtasks are either completed or failed, exit monitoring
         // immediately
@@ -319,10 +295,8 @@ private synchronized void endMonitoring() {
     /**
      * If monitoring ended with successful completion of the job, create a timestamp for the
      * completion time in the task directory and mark the task's {@link StateFile} as done.
-     *
-     * @throws IOException if unable to mark the state file as done.
      */
-    public void finish() throws InterruptedException, IOException {
+    public void finish() {
 
         TimestampFile.create(taskDir, TimestampFile.Event.PBS_JOB_FINISH);
         if (monitor.allSubtasksProcessed()) {
@@ -340,7 +314,6 @@ public void cleanup() {
             threadPool.shutdownNow();
         }
         subtaskServer().shutdown();
-        algorithmLog.endLogging();
     }
 
     // The following getter methods are intended for testing purposes only. They do not expose any
@@ -394,14 +367,14 @@ TaskConfigurationManager getInputsHandler() {
      *
      * @return true if lock obtained, false otherwise.
      */
-    boolean getWriteLockWithoutBlocking(File lockFile) throws IOException {
+    boolean getWriteLockWithoutBlocking(File lockFile) {
         return LockManager.getWriteLockWithoutBlocking(lockFile);
     }
 
     /**
      * Releases the write lock on a file. Broken out as a separate method to support testing.
      */
-    void releaseWriteLock(File lockFile) throws IOException {
+    void releaseWriteLock(File lockFile) {
         LockManager.releaseWriteLock(lockFile);
     }
 
@@ -432,18 +405,15 @@ ExecutorService subtaskMasterThreadPool() {
         return Executors.newFixedThreadPool(coresPerNode);
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
     public static void main(String[] args) {
-        if (args.length != 5) {
-            System.err.println("USAGE: ComputeNodeMaster workingDir homeDir "
-                + "stateFilePath pipelineConfigPath logFilePath");
+        if (args.length != 2) {
+            System.err.println("USAGE: ComputeNodeMaster workingDir logFilePath");
             System.exit(-1);
         }
 
         String workingDir = args[0];
-        String homeDir = args[1];
-        String stateFilePath = args[2];
-        String spiffyConfigPath = args[3];
-        String logFilePath = args[4];
+        String logFilePath = args[1];
 
         // Start up logging
         TaskLog algorithmLog = new TaskLog(logFilePath);
@@ -453,8 +423,7 @@ public static void main(String[] args) {
 
         // Startup: constructor and initialization
         try {
-            computeNodeMaster = new ComputeNodeMaster(workingDir, homeDir, stateFilePath,
-                spiffyConfigPath, algorithmLog);
+            computeNodeMaster = new ComputeNodeMaster(workingDir, algorithmLog);
             computeNodeMaster.initialize();
         } catch (Exception e) {
 
@@ -469,24 +438,11 @@ public static void main(String[] args) {
 
         // Monitoring: wait for subtasks to finish, subtask masters to finish, or exceptions
         // to be thrown
-        try {
-            computeNodeMaster.monitor();
-        } catch (InterruptedException e) {
-            log.error("ComputeNodeMaster monitoring failed", e);
-            computeNodeMaster.cleanup();
-            System.exit(1);
-        }
+        computeNodeMaster.monitor();
 
         // Wrap-up: finalize and clean up
-        try {
-            computeNodeMaster.finish();
-        } catch (InterruptedException | IOException e) {
-            log.error("ComputeNodeMaster wrap-up failed", e);
-            System.exit(1);
-        } finally {
-            computeNodeMaster.cleanup();
-        }
+        computeNodeMaster.finish();
+        computeNodeMaster.cleanup();
         System.exit(0);
-
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/DefaultPipelineInputs.java b/src/main/java/gov/nasa/ziggy/module/DefaultPipelineInputs.java
index 6c43eca..62ccbaf 100644
--- a/src/main/java/gov/nasa/ziggy/module/DefaultPipelineInputs.java
+++ b/src/main/java/gov/nasa/ziggy/module/DefaultPipelineInputs.java
@@ -1,6 +1,7 @@
 package gov.nasa.ziggy.module;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -21,9 +22,9 @@
 import gov.nasa.ziggy.data.management.DataFileType;
 import gov.nasa.ziggy.data.management.DatastorePathLocator;
 import gov.nasa.ziggy.module.io.ProxyIgnore;
-import gov.nasa.ziggy.parameters.DefaultParameters;
 import gov.nasa.ziggy.parameters.ModuleParameters;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.ModelMetadata;
 import gov.nasa.ziggy.pipeline.definition.ModelRegistry;
@@ -35,6 +36,8 @@
 import gov.nasa.ziggy.uow.DatastoreDirectoryUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.DirectoryUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.UnitOfWork;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Default pipeline inputs class for use by pipeline modules that employ DataFileType instances to
@@ -97,7 +100,7 @@ public Set<Path> findDatastoreFilesForInputs(PipelineTask pipelineTask) {
         Set<DataFileType> dataFileTypes = pipelineTask.getPipelineDefinitionNode()
             .getInputDataFileTypes();
 
-        UnitOfWork uow = pipelineTask.getUowTask().getInstance();
+        UnitOfWork uow = pipelineTask.uowTaskInstance();
 
         // find the data files for the task
         DataFileManager dataFileManager = dataFileManager(DirectoryProperties.datastoreRootDir(),
@@ -130,7 +133,7 @@ public void copyDatastoreFilesToTaskDirectory(TaskConfigurationManager taskConfi
             .addAll(pipelineTask.getPipelineDefinitionNode().getOutputDataFileTypes());
 
         // Obtain the unit of work
-        UnitOfWork uow = pipelineTask.getUowTask().getInstance();
+        UnitOfWork uow = pipelineTask.uowTaskInstance();
         String directory = DirectoryUnitOfWorkGenerator.directory(uow);
         log.info("Unit of work directory: " + directory);
 
@@ -162,7 +165,7 @@ public void copyDatastoreFilesToTaskDirectory(TaskConfigurationManager taskConfi
         // for each truncated file name
         Map<String, Set<Path>> subtaskPathsMap = new TreeMap<>();
         for (String truncatedFileName : truncatedFilenames) {
-            subtaskPathsMap.put(truncatedFileName, new HashSet<Path>());
+            subtaskPathsMap.put(truncatedFileName, new HashSet<>());
         }
 
         // Loop over DataFileType instances from the dataFilesMap
@@ -213,7 +216,6 @@ public void copyDatastoreFilesToTaskDirectory(TaskConfigurationManager taskConfi
         log.info("Writing parameters to task directory");
         writeToTaskDir(pipelineTask, taskDirectory.toFile());
         log.info("Task directory preparation complete");
-
     }
 
     /**
@@ -312,9 +314,8 @@ public void populateSubTaskInputs() {
             dataFileManager.copyFilesByNameFromTaskDirToWorkingDir(modelFilenames);
         }
         log.info("Persisting inputs information to subtask directory");
-        writeSubTaskInputs(0);
+        writeSubTaskInputs();
         log.info("Persisting inputs completed");
-
     }
 
     /**
@@ -322,6 +323,7 @@ public void populateSubTaskInputs() {
      * ExternalProcessPipelineModule after the module processing has completed successfully.
      */
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void deleteTempInputsFromTaskDirectory(PipelineTask pipelineTask, Path taskDirectory) {
 
         // Obtain the data file types that the module requires
@@ -344,12 +346,11 @@ public void deleteTempInputsFromTaskDirectory(PipelineTask pipelineTask, Path ta
                 try {
                     Files.delete(modelFile);
                 } catch (IOException e) {
-                    throw new PipelineException("Unable to delete model file "
-                        + modelFile.getFileName().toString() + " from task directory");
+                    throw new UncheckedIOException("Unable to delete file " + modelFile.toString(),
+                        e);
                 }
             }
         }
-
     }
 
     /**
@@ -357,7 +358,7 @@ public void deleteTempInputsFromTaskDirectory(PipelineTask pipelineTask, Path ta
      */
     protected void populateModuleParameters(PipelineTask pipelineTask) {
 
-        List<Parameters> allParameters = new ArrayList<>();
+        List<ParametersInterface> allParameters = new ArrayList<>();
         log.info("Retrieving module and pipeline parameters");
         allParameters.addAll(
             getModuleParameters(pipelineTask.getPipelineInstance().getPipelineParameterSets()));
@@ -375,7 +376,7 @@ protected void populateModuleParameters(PipelineTask pipelineTask) {
      */
     @Override
     public SubtaskInformation subtaskInformation(PipelineTask pipelineTask) {
-        UnitOfWork uow = pipelineTask.getUowTask().getInstance();
+        UnitOfWork uow = pipelineTask.uowTaskInstance();
         if (DatastoreDirectoryUnitOfWorkGenerator.singleSubtask(uow)) {
             return new SubtaskInformation(pipelineTask.getModuleName(), uow.briefState(), 1, 1);
         }
@@ -394,21 +395,20 @@ public SubtaskInformation subtaskInformation(PipelineTask pipelineTask) {
     /**
      * Inner method for parameter retrieval.
      */
-    private List<Parameters> getModuleParameters(
-        Map<ClassWrapper<Parameters>, ParameterSet> parameterSetMap) {
-        List<Parameters> parameters = new ArrayList<>();
+    private List<ParametersInterface> getModuleParameters(
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetMap) {
+        List<ParametersInterface> parameters = new ArrayList<>();
 
         Collection<ParameterSet> parameterSets = parameterSetMap.values();
         for (ParameterSet parameterSet : parameterSets) {
             Parameters instance = parameterSet.parametersInstance();
-            if (instance instanceof DefaultParameters) {
-                DefaultParameters defaultInstance = (DefaultParameters) instance;
-                defaultInstance.setName(parameterSet.getName().getName());
+            if (instance instanceof Parameters) {
+                Parameters defaultInstance = instance;
+                defaultInstance.setName(parameterSet.getName());
             }
             parameters.add(instance);
         }
         return parameters;
-
     }
 
     public void setDataFilenames(List<String> filenames) {
@@ -454,5 +454,4 @@ private AlertService alertService() {
         }
         return alertService;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/DefaultPipelineOutputs.java b/src/main/java/gov/nasa/ziggy/module/DefaultPipelineOutputs.java
index 0df91ad..30cb2e6 100644
--- a/src/main/java/gov/nasa/ziggy/module/DefaultPipelineOutputs.java
+++ b/src/main/java/gov/nasa/ziggy/module/DefaultPipelineOutputs.java
@@ -42,7 +42,6 @@ public class DefaultPipelineOutputs extends PipelineOutputs {
     private DataFileManager dataFileManager;
 
     public DefaultPipelineOutputs() {
-
     }
 
     /**
@@ -75,8 +74,7 @@ private Set<DataFileType> outputDataFileTypes() {
         DefaultPipelineInputs inputs = new DefaultPipelineInputs();
         String filename = ModuleInterfaceUtils.inputsFileName(moduleName());
         hdf5ModuleInterface.readFile(new File(taskDir.toFile(), filename), inputs, true);
-        Set<DataFileType> dataFileTypes = new HashSet<>(inputs.getOutputDataFileTypes());
-        return dataFileTypes;
+        return new HashSet<>(inputs.getOutputDataFileTypes());
     }
 
     /**
@@ -143,5 +141,4 @@ protected boolean subtaskProducedResults() {
         return dataFileManager(null, PipelineInputsOutputsUtils.taskDir(), null)
             .workingDirHasFilesOfTypes(outputDataFileTypes());
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/ExternalProcessPipelineModule.java b/src/main/java/gov/nasa/ziggy/module/ExternalProcessPipelineModule.java
index 7d0d552..f6de5c1 100644
--- a/src/main/java/gov/nasa/ziggy/module/ExternalProcessPipelineModule.java
+++ b/src/main/java/gov/nasa/ziggy/module/ExternalProcessPipelineModule.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,9 +46,8 @@
 import gov.nasa.ziggy.pipeline.definition.ProcessingStatePipelineModule;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.services.alert.AlertService;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.worker.WorkerTaskRequestDispatcher;
 
 /**
  * Pipeline modules that executes an external process, either directly via a command line run in a
@@ -62,8 +61,6 @@ public class ExternalProcessPipelineModule extends PipelineModule
 
     private static final Logger log = LoggerFactory.getLogger(ExternalProcessPipelineModule.class);
 
-    public static final String ALLOW_PARTIAL_TASKS_PROP = "pi.worker.allowPartialTasks";
-
     /**
      * List of valid processing states
      */
@@ -82,7 +79,7 @@ public class ExternalProcessPipelineModule extends PipelineModule
     private PipelineOutputs pipelineOutputs;
 
     protected boolean processingSuccessful;
-    private boolean doneLooping;
+    protected boolean doneLooping;
 
     /**
      * Copy datastore files needed as inputs to the specified working directory.
@@ -118,8 +115,8 @@ protected void persistResultsAndDeleteTempFiles(PipelineTask pipelineTask,
     public ExternalProcessPipelineModule(PipelineTask pipelineTask, RunMode runMode) {
         super(pipelineTask, runMode);
         instanceId = pipelineTask.getPipelineInstance().getId();
-        Configuration config = ZiggyConfiguration.getInstance();
-        haltStep = config.getString(PropertyNames.PIPELINE_HALT_PROP_NAME, "C");
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+        haltStep = config.getString(PropertyName.PIPELINE_HALT.property(), "C");
 
         PipelineModuleDefinition pipelineModuleDefinition = pipelineTask.getPipelineInstanceNode()
             .getPipelineModuleDefinition();
@@ -142,7 +139,7 @@ public boolean processTaskRequiresDatabaseTransaction() {
      * Main processing method accessible to callers.
      */
     @Override
-    public boolean processTask() throws PipelineException {
+    public boolean processTask() {
 
         runMode.run(this);
         return processingSuccessful;
@@ -171,7 +168,7 @@ public void initializingTaskAction() {
         processingSuccessful = false;
     }
 
-    void checkHaltRequest(ProcessingState state) {
+    public void checkHaltRequest(ProcessingState state) {
         String stateShortName = state.shortName();
         if (haltStep.equals(stateShortName)) {
             throw new PipelineException("Halting processing at end of step " + state.toString()
@@ -194,20 +191,16 @@ public void marshalingTaskAction() {
         boolean successful;
         File taskDir = algorithmManager().getTaskDir(true);
         performTransaction(() -> {
-            try {
-                IntervalMetric.measure(CREATE_INPUTS_METRIC, () -> {
-
-                    // Note: here we retrieve a copy of the pipeline task from the database and
-                    // update its producer task IDs. The existing copy of the task in this object
-                    // is also replaced with the updated task.
-                    pipelineTask = pipelineTaskCrud().retrieve(taskId());
-                    pipelineTask.clearProducerTaskIds();
-                    copyDatastoreFilesToTaskDirectory(taskConfigurationManager(), pipelineTask,
-                        taskDir);
-                });
-            } catch (Exception e) {
-                throw new PipelineException(e);
-            }
+            IntervalMetric.measure(CREATE_INPUTS_METRIC, () -> {
+
+                // Note: here we retrieve a copy of the pipeline task from the database and
+                // update its producer task IDs. The existing copy of the task in this object
+                // is also replaced with the updated task.
+                pipelineTask = pipelineTaskCrud().retrieve(taskId());
+                pipelineTask.clearProducerTaskIds();
+                copyDatastoreFilesToTaskDirectory(taskConfigurationManager(), pipelineTask,
+                    taskDir);
+            });
             taskConfigurationManager().validate();
             return null;
         });
@@ -230,7 +223,6 @@ public void marshalingTaskAction() {
         log.info("Processing step MARSHALING complete");
         doneLooping = !successful;
         processingSuccessful = doneLooping;
-
     }
 
     /**
@@ -251,7 +243,6 @@ public void submittingTaskAction() {
         checkHaltRequest(ProcessingState.ALGORITHM_SUBMITTING);
         doneLooping = true;
         processingSuccessful = false;
-
     }
 
     /**
@@ -267,7 +258,6 @@ public void queuedTaskAction() {
         checkHaltRequest(ProcessingState.ALGORITHM_QUEUED);
         doneLooping = true;
         processingSuccessful = false;
-
     }
 
     /**
@@ -337,8 +327,9 @@ public void storingTaskAction() {
             for (String failedSubTask : failureSummary.getFailedSubTaskDirs()) {
                 log.info("    " + failedSubTask);
             }
-            Configuration config = ZiggyConfiguration.getInstance();
-            boolean allowPartialTasks = config.getBoolean(ALLOW_PARTIAL_TASKS_PROP, true);
+            ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+            boolean allowPartialTasks = config
+                .getBoolean(PropertyName.ALLOW_PARTIAL_TASKS.property(), true);
             abandonPersisting = !allowPartialTasks;
         }
         if (failureSummary.isAllTasksFailed()) {
@@ -350,15 +341,11 @@ public void storingTaskAction() {
         }
 
         performTransaction(() -> {
-            try {
-                IntervalMetric.measure(STORE_OUTPUTS_METRIC, () -> {
-                    // process outputs
-                    persistResultsAndDeleteTempFiles(pipelineTask, failureSummary);
-                    return null;
-                });
-            } catch (Exception e) {
-                throw new PipelineException(e);
-            }
+            IntervalMetric.measure(STORE_OUTPUTS_METRIC, () -> {
+                // process outputs
+                persistResultsAndDeleteTempFiles(pipelineTask, failureSummary);
+                return null;
+            });
             return null;
         });
 
@@ -430,15 +417,9 @@ public void processingMainLoop() {
 
         while (!doneLooping) {
 
-            if (WorkerTaskRequestDispatcher.isTaskDeleted(pipelineTask.getId())) {
-                log.info("Exiting task execution due to task deletion");
-                return;
-            }
-
             // Perform the current action (including advancing to the next
             // processing state, if appropriate).
             getProcessingState().taskAction(this);
-
         }
     }
 
@@ -587,7 +568,7 @@ ProcessingFailureSummary processingFailureSummary() {
         return new ProcessingFailureSummary(pipelineTask.getModuleName(), getTaskDir());
     }
 
-    AlgorithmLifecycle algorithmManager() {
+    public AlgorithmLifecycle algorithmManager() {
         if (algorithmManager == null) {
             algorithmManager = new AlgorithmLifecycleManager(pipelineTask);
         }
@@ -646,5 +627,4 @@ void setDoneLooping(boolean doneLooping) {
     public long pipelineTaskId() {
         return taskId();
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/JobMonitor.java b/src/main/java/gov/nasa/ziggy/module/JobMonitor.java
index 81eb01c..802e09a 100644
--- a/src/main/java/gov/nasa/ziggy/module/JobMonitor.java
+++ b/src/main/java/gov/nasa/ziggy/module/JobMonitor.java
@@ -4,9 +4,11 @@
 import java.util.Map;
 import java.util.Set;
 
+import gov.nasa.ziggy.module.AlgorithmExecutor.AlgorithmType;
 import gov.nasa.ziggy.module.remote.QstatMonitor;
 import gov.nasa.ziggy.module.remote.QueueCommandManager;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.util.HostNameUtils;
 
 /**
  * Interface for classes that monitor remote jobs. This allows a dummy implementation to be supplied
@@ -23,28 +25,24 @@ public interface JobMonitor {
      * returned, while for local tasks a dummy instance, with no actual functionality, will be
      * returned.
      */
-    static JobMonitor newInstance(String username, boolean remoteJobs) {
-        if (remoteJobs) {
-            return new QstatMonitor(username, System.getenv("HOST"));
+    static JobMonitor newInstance(String username, AlgorithmType algorithmType) {
+        if (algorithmType.equals(AlgorithmType.REMOTE)) {
+            return new QstatMonitor(username, HostNameUtils.shortHostName());
         }
         return new JobMonitor() {
         };
     }
 
     default void addToMonitoring(StateFile stateFile) {
-
     }
 
     default void addToMonitoring(PipelineTask pipelineTask) {
-
     }
 
     default void endMonitoring(StateFile stateFile) {
-
     }
 
     default void update() {
-
     }
 
     default Set<Long> allIncompleteJobIds(PipelineTask pipelineTask) {
@@ -82,5 +80,4 @@ default QueueCommandManager getQstatCommandManager() {
     default Set<String> getJobsInMonitor() {
         return Collections.emptySet();
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/LocalAlgorithmExecutor.java b/src/main/java/gov/nasa/ziggy/module/LocalAlgorithmExecutor.java
index 2c58f2f..380014e 100644
--- a/src/main/java/gov/nasa/ziggy/module/LocalAlgorithmExecutor.java
+++ b/src/main/java/gov/nasa/ziggy/module/LocalAlgorithmExecutor.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 
 import org.apache.commons.exec.CommandLine;
@@ -14,7 +15,11 @@
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.services.messages.MonitorAlgorithmRequest;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
 import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.ZiggyShutdownHook;
 
 /**
@@ -50,34 +55,34 @@ protected Path taskDataDir() {
 
     @Override
     protected void addToMonitor(StateFile stateFile) {
-        AlgorithmMonitor.startLocalMonitoring(stateFile);
+        ZiggyMessenger.publish(new MonitorAlgorithmRequest(stateFile, algorithmType()));
     }
 
     @Override
-    protected void submitForExecution(StateFile stateFile) throws Exception {
+    protected void submitForExecution(StateFile stateFile) {
 
         stateFile.setPbsSubmitTimeMillis(System.currentTimeMillis());
         stateFile.persist();
+        addToMonitor(stateFile);
 
-        JobSubmissionPaths jobSubmissionPaths = new JobSubmissionPaths();
-
-        CommandLine cmdLine = algorithmCommandLine(jobSubmissionPaths);
+        CommandLine cmdLine = algorithmCommandLine();
 
         // Increment the task log index.
         DatabaseTransactionFactory.performTransaction(() -> {
             PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
             PipelineTask task = pipelineTaskCrud.retrieve(pipelineTask.getId());
             task.incrementTaskLogIndex();
-            pipelineTaskCrud.update(task);
+            task.setRemoteExecution(false);
+            pipelineTaskCrud.merge(task);
             return null;
         });
 
         // Start the external process -- note that it will cause execution to block until
         // the algorithm has completed or failed.
-        // NB: it may seem strange to use an external process to execute "runjava" and
-        // then to use runjava to run the ComputeNodeMaster, given that the ComputeNodeMaster
-        // can simply be run from this method directly! This is done to preserve as much as
-        // possible the symmetry between local and remote execution.
+        // NB: it may seem strange to use an external process to execute the "ziggy" program and
+        // then to use the ziggy program to run the ComputeNodeMaster, given that the
+        // ComputeNodeMaster can simply be run from this method directly! This is done to preserve
+        // as much as possible the symmetry between local and remote execution.
         ExternalProcess externalProcess = ExternalProcess.allLoggingExternalProcess(cmdLine);
         int exitCode = externalProcess.execute();
 
@@ -94,28 +99,31 @@ protected void submitForExecution(StateFile stateFile) throws Exception {
     }
 
     /**
-     * Generates the "runjava compute-note-master" command line, plus the arguments to same that are
+     * Generates the "ziggy compute-note-master" command line, plus the arguments to same that are
      * constant across local and all remote execution modes (specifically: the task directory, the
      * pipeline home directory, the state file, and the pipeline configuration file).
      */
-    protected CommandLine algorithmCommandLine(JobSubmissionPaths jobSubmissionPaths)
-        throws IOException {
-        CommandLine cmdLine = new CommandLine(
-            new File(jobSubmissionPaths.getBinPath(), EXECUTABLE_NAME).getCanonicalPath());
-        cmdLine.addArgument(NODE_MASTER_NAME);
-        cmdLine.addArgument(jobSubmissionPaths.getWorkingDirPath());
-        cmdLine.addArgument(jobSubmissionPaths.getHomeDirPath());
-        cmdLine.addArgument(jobSubmissionPaths.getStateFilePath());
-        cmdLine.addArgument(jobSubmissionPaths.getPipelineConfigPath());
-        cmdLine.addArgument(DirectoryProperties.algorithmLogsDir()
-            .resolve(pipelineTask.logFilename(JOB_INDEX_FOR_LOCAL_EXECUTION))
-            .toString());
-        return cmdLine;
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    protected CommandLine algorithmCommandLine() {
+        CommandLine cmdLine;
+        try {
+            cmdLine = new CommandLine(
+                new File(DirectoryProperties.ziggyBinDir().toFile(), ZIGGY_PROGRAM)
+                    .getCanonicalPath());
+            cmdLine.addArgument(NODE_MASTER_NAME);
+            cmdLine.addArgument(workingDir().toString());
+            cmdLine.addArgument(DirectoryProperties.algorithmLogsDir()
+                .resolve(pipelineTask.logFilename(JOB_INDEX_FOR_LOCAL_EXECUTION))
+                .toString());
+            return cmdLine;
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Error getting path to file " + DirectoryProperties.ziggyBinDir().toString(), e);
+        }
     }
 
     @Override
     public AlgorithmType algorithmType() {
         return AlgorithmType.LOCAL;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/ModuleFatalProcessingException.java b/src/main/java/gov/nasa/ziggy/module/ModuleFatalProcessingException.java
index d23bb79..8ec74b8 100644
--- a/src/main/java/gov/nasa/ziggy/module/ModuleFatalProcessingException.java
+++ b/src/main/java/gov/nasa/ziggy/module/ModuleFatalProcessingException.java
@@ -17,7 +17,7 @@
  * @author Todd Klaus
  */
 public class ModuleFatalProcessingException extends PipelineException {
-    private static final long serialVersionUID = -5155087029123765745L;
+    private static final long serialVersionUID = 20230511L;
 
     public ModuleFatalProcessingException(String errorText, Throwable t) {
         super(errorText, t);
diff --git a/src/main/java/gov/nasa/ziggy/module/PipelineCategories.java b/src/main/java/gov/nasa/ziggy/module/PipelineCategories.java
index b8233f6..1ec4ef1 100644
--- a/src/main/java/gov/nasa/ziggy/module/PipelineCategories.java
+++ b/src/main/java/gov/nasa/ziggy/module/PipelineCategories.java
@@ -55,5 +55,4 @@ public class PipelineCategories {
         Units.TIME, // commit time
         Units.BYTES // archive size
     };
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/PipelineException.java b/src/main/java/gov/nasa/ziggy/module/PipelineException.java
index 49da1c8..bf47fb7 100644
--- a/src/main/java/gov/nasa/ziggy/module/PipelineException.java
+++ b/src/main/java/gov/nasa/ziggy/module/PipelineException.java
@@ -9,7 +9,7 @@
  * @author Todd Klaus
  */
 public class PipelineException extends RuntimeException {
-    private static final long serialVersionUID = -5067765463060718311L;
+    private static final long serialVersionUID = 20230511L;
 
     /**
      * Determines whether a given exception has an exception of a particular class in its "Caused
diff --git a/src/main/java/gov/nasa/ziggy/module/PipelineInputs.java b/src/main/java/gov/nasa/ziggy/module/PipelineInputs.java
index b530eed..361d68f 100644
--- a/src/main/java/gov/nasa/ziggy/module/PipelineInputs.java
+++ b/src/main/java/gov/nasa/ziggy/module/PipelineInputs.java
@@ -23,7 +23,7 @@
 import gov.nasa.ziggy.module.io.ModuleInterfaceUtils;
 import gov.nasa.ziggy.module.io.Persistable;
 import gov.nasa.ziggy.module.io.ProxyIgnore;
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 
@@ -80,7 +80,7 @@ public abstract class PipelineInputs implements Persistable {
      *
      * @return List of parameter classes.
      */
-    public List<Class<? extends Parameters>> requiredParameters() {
+    public List<Class<? extends ParametersInterface>> requiredParameters() {
         return new ArrayList<>();
     }
 
@@ -129,7 +129,7 @@ public abstract void copyDatastoreFilesToTaskDirectory(
     public SubtaskInformation subtaskInformation(PipelineTask pipelineTask) {
 
         return new SubtaskInformation(pipelineTask.getModuleName(),
-            pipelineTask.getUowTask().getInstance().briefState(), 1, 1);
+            pipelineTask.uowTaskInstance().briefState(), 1, 1);
     }
 
     /**
@@ -251,16 +251,14 @@ public <S extends DataFileInfo, T extends PipelineResults> void readResultsFile(
      *
      * @param seqNum
      */
-    public void writeSubTaskInputs(int seqNum) {
+    public void writeSubTaskInputs() {
         String moduleName = moduleName();
-        String filename = ModuleInterfaceUtils.inputsFileName(moduleName, seqNum);
+        String filename = ModuleInterfaceUtils.inputsFileName(moduleName);
         log.info("Writing file " + filename + " to sub-task directory");
         hdf5ModuleInterface.writeFile(DirectoryProperties.workingDir()
-            .resolve(ModuleInterfaceUtils.inputsFileName(moduleName, seqNum))
+            .resolve(ModuleInterfaceUtils.inputsFileName(moduleName))
             .toFile(), this, true);
-//        hdf5ModuleInterface.writeFile(
-//            new File(ModuleInterfaceUtils.inputsFileName(moduleName, seqNum)), this, true);
-        ModuleInterfaceUtils.writeCompanionXmlFile(this, moduleName, seqNum);
+        ModuleInterfaceUtils.writeCompanionXmlFile(this, moduleName);
     }
 
     /**
diff --git a/src/main/java/gov/nasa/ziggy/module/PipelineInputsOutputsUtils.java b/src/main/java/gov/nasa/ziggy/module/PipelineInputsOutputsUtils.java
index 4e0df54..38ebe56 100644
--- a/src/main/java/gov/nasa/ziggy/module/PipelineInputsOutputsUtils.java
+++ b/src/main/java/gov/nasa/ziggy/module/PipelineInputsOutputsUtils.java
@@ -38,5 +38,4 @@ public static void putLogStreamIdentifier() {
         String subtaskName = DirectoryProperties.workingDir().getFileName().toString();
         SubtaskUtils.putLogStreamIdentifier(subtaskName);
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/PipelineMetrics.java b/src/main/java/gov/nasa/ziggy/module/PipelineMetrics.java
index 0791dcb..be5bdc9 100644
--- a/src/main/java/gov/nasa/ziggy/module/PipelineMetrics.java
+++ b/src/main/java/gov/nasa/ziggy/module/PipelineMetrics.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.module;
 
-import gov.nasa.ziggy.worker.WorkerTaskRequestDispatcher;
+import gov.nasa.ziggy.worker.TaskExecutor;
 
 /**
  * Metrics used by the pipeline in various contexts.
@@ -31,11 +31,10 @@ public class PipelineMetrics {
     static final String[] REMOTE_METRICS = { CREATE_INPUTS_METRIC, SEND_METRIC,
         REMOTE_WORKER_WAIT_METRIC, PLEIADES_QUEUE_METRIC, PLEIADES_WALL_METRIC,
         PENDING_RECEIVE_METRIC, RECEIVE_METRIC, STORE_OUTPUTS_METRIC, COPY_TASK_FILES_METRIC,
-        WorkerTaskRequestDispatcher.PIPELINE_MODULE_COMMIT_METRIC, TF_INPUTS_SIZE_METRIC,
+        TaskExecutor.PIPELINE_MODULE_COMMIT_METRIC, TF_INPUTS_SIZE_METRIC,
         TF_PFE_OUTPUTS_SIZE_METRIC, TF_ARCHIVE_SIZE_METRIC };
 
     static final String[] LOCAL_METRICS = { CREATE_INPUTS_METRIC,
         SubtaskExecutor.MATLAB_PROCESS_EXEC_METRIC, STORE_OUTPUTS_METRIC, COPY_TASK_FILES_METRIC,
-        WorkerTaskRequestDispatcher.PIPELINE_MODULE_COMMIT_METRIC, TF_ARCHIVE_SIZE_METRIC };
-
+        TaskExecutor.PIPELINE_MODULE_COMMIT_METRIC, TF_ARCHIVE_SIZE_METRIC };
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/PipelineOutputs.java b/src/main/java/gov/nasa/ziggy/module/PipelineOutputs.java
index 004d383..4bcd726 100644
--- a/src/main/java/gov/nasa/ziggy/module/PipelineOutputs.java
+++ b/src/main/java/gov/nasa/ziggy/module/PipelineOutputs.java
@@ -5,7 +5,6 @@
 
 import java.io.File;
 import java.io.FileFilter;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Map;
@@ -95,7 +94,7 @@ public Set<Class<? extends DataFileInfo>> requiredDataFileInfoClasses() {
      * subtask, whether or not that subtask produced results. Note that a subtask can run to
      * completion but not produce results.
      */
-    public void setResultsState() throws IOException {
+    public void setResultsState() {
         if (subtaskProducedResults()) {
             new AlgorithmStateFiles(DirectoryProperties.workingDir().toFile()).setResultsFlag();
         }
@@ -240,7 +239,9 @@ public void updateInputFileConsumers(PipelineInputs pipelineInputs, PipelineTask
         filenames = fileManager
             .filesInCompletedSubtasksWithoutResults(pipelineInputs.requiredDataFileInfoClasses());
         producerConsumerCrud.addNonProducingConsumer(pipelineTask, filenames);
-
     }
 
+    protected Hdf5ModuleInterface hdf5ModuleInterface() {
+        return hdf5ModuleInterface;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/ProcessingFailureSummary.java b/src/main/java/gov/nasa/ziggy/module/ProcessingFailureSummary.java
index 3e055fb..bf17eee 100644
--- a/src/main/java/gov/nasa/ziggy/module/ProcessingFailureSummary.java
+++ b/src/main/java/gov/nasa/ziggy/module/ProcessingFailureSummary.java
@@ -33,15 +33,15 @@ public ProcessingFailureSummary(String moduleName, File taskDirectory) {
         allTasksFailed = failedSubTaskDirs.size() == numSubTasks;
     }
 
-    boolean isAllTasksFailed() {
+    public boolean isAllTasksFailed() {
         return allTasksFailed;
     }
 
-    List<String> getFailedSubTaskDirs() {
+    public List<String> getFailedSubTaskDirs() {
         return failedSubTaskDirs;
     }
 
-    boolean isAllTasksSucceeded() {
+    public boolean isAllTasksSucceeded() {
         return failedSubTaskDirs.size() == 0;
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/StateFile.java b/src/main/java/gov/nasa/ziggy/module/StateFile.java
index dc896cf..3b0efde 100644
--- a/src/main/java/gov/nasa/ziggy/module/StateFile.java
+++ b/src/main/java/gov/nasa/ziggy/module/StateFile.java
@@ -5,20 +5,22 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.fluent.Configurations;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.slf4j.Logger;
@@ -28,6 +30,8 @@
 import gov.nasa.ziggy.module.remote.RemoteParameters;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.Iso8601Formatter;
 import gov.nasa.ziggy.util.TimeFormatter;
 import gov.nasa.ziggy.util.io.FileUtil;
@@ -87,7 +91,9 @@
  * @author Bill Wohler
  * @author Todd Klaus
  */
-public class StateFile implements Comparable<StateFile> {
+public class StateFile implements Comparable<StateFile>, Serializable {
+    private static final long serialVersionUID = 20230511L;
+
     private static final Logger log = LoggerFactory.getLogger(StateFile.class);
 
     public static final Pattern TASK_DIR_PATTERN = Pattern.compile("([0-9]+)-([0-9]+)-(\\S+)");
@@ -95,7 +101,9 @@ public class StateFile implements Comparable<StateFile> {
     public static final int TASK_DIR_TASK_ID_GROUP_NUMBER = 2;
     public static final int TASK_DIR_MODULE_NAME_GROUP_NUMBER = 3;
 
-    public static final String PREFIX = "ziggy.";
+    public static final String PREFIX_BARE = "ziggy";
+    public static final String PREFIX = PREFIX_BARE + ".";
+    public static final String PREFIX_WITH_BACKSLASHES = PREFIX_BARE + "\\.";
 
     public static final String DEFAULT_REMOTE_NODE_ARCHITECTURE = "none";
     public static final String DEFAULT_WALL_TIME = "24:00:00";
@@ -104,8 +112,6 @@ public class StateFile implements Comparable<StateFile> {
 
     public static final String LOCK_FILE_NAME = ".state-file.lock";
 
-    private static final String FORMAT = PREFIX + "PIID.PTID.MODNAME.STATE_TOTAL-COMPLETE-FAILED";
-
     private static final String REMOTE_NODE_ARCHITECTURE_PROP_NAME = "remoteNodeArchitecture";
     private static final String MIN_CORES_PER_NODE_PROP_NAME = "minCoresPerNode";
     private static final String MIN_GIGS_PER_NODE_PROP_NAME = "minGigsPerNode";
@@ -140,12 +146,41 @@ public enum State {
         COMPLETE,
 
         /** The final state for this task has been acknowledged by the worker. */
-        CLOSED,
+        CLOSED;
 
-        /** The user has requested that the task be shut down. */
-        DELETED;
     }
 
+    private static String statesPatternElement;
+
+    // Concatenate all of the states into a single String for use in the state file
+    // name pattern.
+    static {
+        StringBuilder sb = new StringBuilder();
+        for (State state : State.values()) {
+            sb.append(state.toString());
+            sb.append("|");
+        }
+        sb.setLength(sb.length() - 1);
+        statesPatternElement = sb.toString();
+    }
+
+    // Pattern and regex for a state file name
+    private static final String STATE_FILE_NAME_REGEX = PREFIX_WITH_BACKSLASHES
+        + "([0-9]+)\\.([0-9]+)\\.(\\S+)\\." + "(" + statesPatternElement + ")"
+        + "_([0-9]+)-([0-9]+)-([0-9])";
+    public static final Pattern STATE_FILE_NAME_PATTERN = Pattern.compile(STATE_FILE_NAME_REGEX);
+    private static final int STATE_FILE_NAME_INSTANCE_ID_GROUP_NUMBER = 1;
+    private static final int STATE_FILE_NAME_TASK_ID_GROUP_NUMBER = 2;
+    private static final int STATE_FILE_NAME_MODULE_GROUP_NUMBER = 3;
+    private static final int STATE_FILE_NAME_STATE_GROUP_NUMBER = 4;
+    private static final int STATE_FILE_NAME_TOTAL_SUBTASKS_GROUP_NUMBER = 5;
+    private static final int STATE_FILE_NAME_COMPLETE_SUBTASKS_GROUP_NUMBER = 6;
+    private static final int STATE_FILE_NAME_FAILED_SUBTASKS_GROUP_NUMBER = 7;
+
+    // This is a slightly more informative explanation of the file name format,
+    // used in log files so the user knows exactly what was expected.
+    private static final String FORMAT = PREFIX + "PIID.PTID.MODNAME.STATE_TOTAL-COMPLETE-FAILED";
+
     // Fields in the file name.
     private long pipelineInstanceId = 0;
     private long pipelineTaskId = 0;
@@ -156,7 +191,7 @@ public enum State {
     private int numFailed = 0;
 
     /** Contains all properties from the file. */
-    private PropertiesConfiguration props = new PropertiesConfiguration();
+    private transient PropertiesConfiguration props = new PropertiesConfiguration();
 
     public StateFile() {
     }
@@ -201,52 +236,20 @@ public StateFile(String name) {
      * Parses a string of the form: PREFIX + MODNAME.PIID.PTID.STATE_TOTAL-COMPLETE-FAILED)
      */
     private void parse(String name) {
-        if (!name.startsWith(PREFIX)) {
-            throw new IllegalArgumentException(name + " does not match expected format: " + FORMAT);
-        }
-
-        String nameSansPrefix = name.substring(PREFIX.length());
-        String[] elements = nameSansPrefix.split("\\.");
-
-        if (elements.length != 4) {
+        Matcher matcher = STATE_FILE_NAME_PATTERN.matcher(name);
+        if (!matcher.matches()) {
             throw new IllegalArgumentException(name + " does not match expected format: " + FORMAT);
         }
 
-        moduleName = elements[2];
-
-        try {
-            pipelineInstanceId = Long.parseLong(elements[0]);
-            pipelineTaskId = Long.parseLong(elements[1]);
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException(
-                name + ": One of the IDs is not a number, expected format: " + FORMAT);
-        }
-
-        String stateElement = elements[3];
-
-        try {
-            state = State.valueOf(stateElement.substring(0, stateElement.indexOf("_")));
-        } catch (Exception e) {
-            throw new IllegalArgumentException(
-                name + ": failed to parse state, expected format: " + FORMAT);
-        }
-
-        String counts = elements[3].substring(stateElement.indexOf("_") + 1);
-        String[] countElements = counts.split("-");
-
-        if (countElements.length != 3) {
-            throw new IllegalArgumentException(
-                name + " failed to parse counts, expected format: " + FORMAT);
-        }
-
-        try {
-            numTotal = Integer.parseInt(countElements[0]);
-            numComplete = Integer.parseInt(countElements[1]);
-            numFailed = Integer.parseInt(countElements[2]);
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException(
-                name + ": non-number found in counts, expected format: " + FORMAT);
-        }
+        pipelineInstanceId = Long
+            .parseLong(matcher.group(STATE_FILE_NAME_INSTANCE_ID_GROUP_NUMBER));
+        pipelineTaskId = Long.parseLong(matcher.group(STATE_FILE_NAME_TASK_ID_GROUP_NUMBER));
+        moduleName = matcher.group(STATE_FILE_NAME_MODULE_GROUP_NUMBER);
+        state = State.valueOf(matcher.group(STATE_FILE_NAME_STATE_GROUP_NUMBER));
+        numTotal = Integer.parseInt(matcher.group(STATE_FILE_NAME_TOTAL_SUBTASKS_GROUP_NUMBER));
+        numComplete = Integer
+            .parseInt(matcher.group(STATE_FILE_NAME_COMPLETE_SUBTASKS_GROUP_NUMBER));
+        numFailed = Integer.parseInt(matcher.group(STATE_FILE_NAME_FAILED_SUBTASKS_GROUP_NUMBER));
     }
 
     /**
@@ -286,7 +289,6 @@ private List<String> getSortedPropertyNames() {
         }
         Collections.sort(propertyNames);
         return propertyNames;
-
     }
 
     /**
@@ -328,37 +330,37 @@ public static StateFile generateStateFile(PipelineTask pipelineTask,
 
     /**
      * Persists this {@link StateFile} to the state file directory.
-     *
-     * @throws IOException
-     * @throws ConfigurationException
      */
-    public File persist() throws IOException, ConfigurationException {
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public File persist() {
         File directory = DirectoryProperties.stateFilesDir().toFile();
-        if (!directory.exists() || !directory.isDirectory()) {
-            throw new IllegalArgumentException(
-                "Specified directory does not exist or is not a directory: " + directory);
-        }
-
         File file = new File(directory, name());
         try (Writer fw = new OutputStreamWriter(new FileOutputStream(file),
             FileUtil.ZIGGY_CHARSET)) {
-            props.save(fw);
+            props.write(fw);
 
             // Also, move any old state files that are for the same instance and
             // task as this one.
             moveOldStateFiles(directory);
+        } catch (ConfigurationException e) {
+            // This can never occur. The construction of the props field is guaranteed
+            // to be correct.
+            throw new AssertionError(e);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to write to file " + file.toString(), e);
         }
         return file;
     }
 
-    private void moveOldStateFiles(File stateFileDir) throws IOException {
+    private void moveOldStateFiles(File stateFileDir) {
 
         String stateFileName = name();
         FileFilter fileFilter = new WildcardFileFilter(invariantPart() + "*");
         File[] matches = stateFileDir.listFiles(fileFilter);
 
         if (matches == null || matches.length == 0) {
-            throw new IOException(
+            throw new PipelineException(
                 "State file \"" + stateFileName + "\" does not exist or there was an I/O error.");
         }
 
@@ -378,151 +380,88 @@ private void moveOldStateFiles(File stateFileDir) throws IOException {
                 match.renameTo(newFile);
                 log.warn("File " + match.getName() + " in directory " + stateFileDir
                     + " renamed to " + newFile.getName());
-
             }
         }
     }
 
-    public static boolean updateStateFile(StateFile oldStateFile, StateFile newStateFile,
-        File stateFileDir) {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static boolean updateStateFile(StateFile oldStateFile, StateFile newStateFile) {
 
+        File stateFileDir = DirectoryProperties.stateFilesDir().toFile();
         if (oldStateFile.equals(newStateFile)) {
             log.debug("Old state file " + oldStateFile.name() + " is the same as new state file "
                 + newStateFile.name() + ", not changing");
         }
         // Update the state file.
-        try {
-            log.info("Updating state: " + oldStateFile + " -> " + newStateFile);
-            File oldFile = new File(stateFileDir, oldStateFile.name());
-            File newFile = new File(stateFileDir, newStateFile.name());
+        log.info("Updating state: " + oldStateFile + " -> " + newStateFile);
+        File oldFile = new File(stateFileDir, oldStateFile.name());
+        File newFile = new File(stateFileDir, newStateFile.name());
 
-            log.debug("  renaming file: " + oldFile + " -> " + newFile);
+        log.debug("  renaming file: " + oldFile + " -> " + newFile);
 
+        try {
             FileUtils.moveFile(oldFile, newFile);
-        } catch (Exception e) {
-            log.warn("Failed to update state file, e=" + e, e);
-            return false;
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to move file " + oldFile.toString(), e);
         }
 
         return true;
     }
 
     /**
-     * Returns a list of {@link StateFile}s in the specified directory where the state matches the
-     * specified stateFilter.
-     */
-    public static List<StateFile> fromDirectory(File directory, final List<State> stateFilters)
-        throws Exception {
-        return fromDirectory(directory, stateFilters, 0);
-    }
-
-    /**
-     * Returns a list of {@link StateFile}s in the specified directory where the state matches the
-     * specified stateFilter and the state file is at least as old as the specified minimum age.
+     * Returns a {@link List} of {@link StateFile} instances from the state files directory that are
+     * in the {@link State#PROCESSING} state.
      */
-    private static List<StateFile> fromDirectory(File directory, final List<State> stateFilters,
-        final long minimumAgeMillis) throws Exception {
-
-        if (!directory.exists() || !directory.isDirectory()) {
-            throw new IllegalArgumentException(
-                directory + ": does not exist or is not a directory");
-        }
-
-        String[] files = directory.list((dir, name) -> {
-            boolean accept = false;
-
-            if (stateFilters != null) {
-                if (name.startsWith(PREFIX)) {
-                    for (State stateFilter : stateFilters) {
-                        if (name.contains(stateFilter.toString())) {
-                            accept = true;
-                            break;
-                        }
-                    }
-                }
-            } else {
-                accept = name.startsWith(PREFIX);
-            }
+    public static List<StateFile> processingStateFilesFromDisk() {
+        File directory = DirectoryProperties.stateFilesDir().toFile();
 
-            if (accept && minimumAgeMillis > 0) {
-                File f = new File(dir, name);
-                long age = System.currentTimeMillis() - f.lastModified();
-                if (age < minimumAgeMillis) {
-                    // too young
-                    accept = false;
-                }
-            }
-            return accept;
+        String[] filenames = directory.list((dir, name) -> {
+            Matcher matcher = STATE_FILE_NAME_PATTERN.matcher(name);
+            return matcher.matches() && matcher.group(STATE_FILE_NAME_STATE_GROUP_NUMBER)
+                .equals(State.PROCESSING.toString());
         });
-
-        List<StateFile> stateFiles = new LinkedList<>();
-        for (String filename : files) {
-            StateFile stateFile = null;
-            try {
-                stateFile = StateFile.newStateFileFromDiskFile(new File(directory, filename),
-                    false);
-                stateFiles.add(stateFile);
-            } catch (Exception e) {
-                log.warn("failed to parse statefile: " + filename + ", e=" + e, e);
-            }
+        List<StateFile> stateFiles = new ArrayList<>();
+        for (String filename : filenames) {
+            stateFiles.add(new StateFile(filename));
         }
-
-        Collections.sort(stateFiles);
-
         return stateFiles;
     }
 
     /**
      * Constructs a new {@link StateFile} from an existing file.
      *
-     * @param stateFilePath File of the desired existing state file
-     * @param useAnyWithCorrectInvariant when false forces the new state file to have the exact name
-     * specified by stateFilePath; when true, any state file with the invariant part of the
-     * stateFilePath name will be used
-     * @return a StateFile object derived from the specified file on disk
-     * @throws PipelineException
+     * @return a {@link StateFile} object derived from the specified file on disk
      */
-    public static StateFile newStateFileFromDiskFile(File stateFilePath,
-        boolean useAnyWithCorrectInvariant) throws PipelineException {
-        return newStateFileFromDiskFile(stateFilePath, useAnyWithCorrectInvariant, false);
+    public StateFile newStateFileFromDiskFile() {
+        return newStateFileFromDiskFile(false);
     }
 
     /**
      * Constructs a new {@link StateFile} from an existing file.
      *
-     * @param stateFilePath File of the desired existing state file
-     * @param useAnyWithCorrectInvariant when false forces the new state file to have the exact name
-     * specified by stateFilePath; when true, any state file with the invariant part of the
-     * stateFilePath name will be used
      * @param silent when true suppresses the logging message from matching the disk file.
      * @return a StateFile object derived from the specified file on disk
-     * @throws PipelineException if unable to construct a {@link PropertiesConfiguration} instance
-     * or if the state file contains no properties.
      */
-    public static StateFile newStateFileFromDiskFile(File stateFilePath,
-        boolean useAnyWithCorrectInvariant, boolean silent) throws PipelineException {
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public StateFile newStateFileFromDiskFile(boolean silent) {
 
-        File stateFilePathToUse = null;
-        if (useAnyWithCorrectInvariant) {
-            stateFilePathToUse = StateFile.getDiskFileFromInvariantNamePart(stateFilePath);
-        } else {
-            stateFilePathToUse = stateFilePath;
-        }
+        File stateFilePathToUse = StateFile.getDiskFileFromInvariantNamePart(this);
 
         if (!silent) {
             log.info("Matched statefile: " + stateFilePathToUse);
         }
         StateFile stateFile = new StateFile(stateFilePathToUse.getName());
-        PropertiesConfiguration props;
         try {
-            props = new PropertiesConfiguration(stateFilePathToUse);
+            PropertiesConfiguration props = new Configurations().properties(stateFilePathToUse);
+            if (props.isEmpty()) {
+                throw new PipelineException("State file contains no properties!");
+            }
+            stateFile.props = props;
         } catch (ConfigurationException e) {
-            throw new PipelineException("Unable to construct PropertiesConfiguration object", e);
+            // This can never occur. By construction, the props field is guaranteee
+            // to be constructed correctly.
+            throw new AssertionError(e);
         }
-        if (props.isEmpty()) {
-            throw new PipelineException("State file contains no properties!");
-        }
-        stateFile.props = props;
 
         return stateFile;
     }
@@ -531,7 +470,7 @@ public static StateFile newStateFileFromDiskFile(File stateFilePath,
      * Searches a directory for a state file where the name's invariant part matches that provided
      * by the caller.
      *
-     * @param stateFilePath File with a valid StateFile name
+     * @param oldStateFile existing {@link StateFile} instance
      * @return the file in the directory of the stateFilePath that has a name for which the
      * invariant part matches the invariant part of the stateFilePath name (i.e.,
      * ziggy.pa.6.23.QUEUED.10.0.0 will match ziggy.pa.6.23.* on disk)
@@ -539,12 +478,11 @@ public static StateFile newStateFileFromDiskFile(File stateFilePath,
      * @exception IllegalStateException if there isn't only one StateFile that matches the invariant
      * part of stateFilePath
      */
-    private static File getDiskFileFromInvariantNamePart(File stateFilePath) {
+    private static File getDiskFileFromInvariantNamePart(StateFile oldStateFile) {
 
         // Sadly, this is probably the easiest way to do this.
-        StateFile tempStateFile = new StateFile(stateFilePath.getName());
-        String invariantPart = tempStateFile.invariantPart();
-        File directory = stateFilePath.getParentFile();
+        String invariantPart = oldStateFile.invariantPart();
+        File directory = DirectoryProperties.stateFilesDir().toFile();
         if (!directory.exists() || !directory.isDirectory()) {
             throw new IllegalArgumentException(
                 "Specified directory does not exist or is not a directory: " + directory);
@@ -595,17 +533,13 @@ public String taskDirName() {
             getModuleName());
     }
 
-    public void setStateAndPersist(State state, String stateFileDir) throws IOException {
-        setStateAndPersist(state, new File(stateFileDir));
-    }
-
-    public void setStateAndPersist(State state, File stateFileDirFile) throws IOException {
+    public void setStateAndPersist(State state) {
         LockManager.getWriteLockOrBlock(lockFile());
         try {
-            StateFile oldState = newStateFileFromDiskFile(new File(stateFileDirFile, name()), true);
+            StateFile oldState = newStateFileFromDiskFile(true);
             StateFile newState = new StateFile(oldState);
             newState.setState(state);
-            StateFile.updateStateFile(oldState, newState, stateFileDirFile);
+            StateFile.updateStateFile(oldState, newState);
         } finally {
             LockManager.releaseWriteLock(lockFile());
         }
@@ -619,17 +553,13 @@ public File lockFile() {
     }
 
     public boolean isDone() {
-        return state == State.COMPLETE || state == State.CLOSED || state == State.DELETED;
+        return state == State.COMPLETE || state == State.CLOSED;
     }
 
     public boolean isRunning() {
         return state == State.PROCESSING;
     }
 
-    public boolean isDeleted() {
-        return state == State.DELETED;
-    }
-
     public boolean isQueued() {
         return state == State.QUEUED;
     }
diff --git a/src/main/java/gov/nasa/ziggy/module/SubtaskAllocator.java b/src/main/java/gov/nasa/ziggy/module/SubtaskAllocator.java
index f5aa3e5..639714f 100644
--- a/src/main/java/gov/nasa/ziggy/module/SubtaskAllocator.java
+++ b/src/main/java/gov/nasa/ziggy/module/SubtaskAllocator.java
@@ -146,5 +146,4 @@ private void populateWaitingPool() {
     public boolean isEmpty() {
         return subtaskCompleted == null || subtaskCompleted.length == 0;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/SubtaskClient.java b/src/main/java/gov/nasa/ziggy/module/SubtaskClient.java
index 85c4194..75951d8 100644
--- a/src/main/java/gov/nasa/ziggy/module/SubtaskClient.java
+++ b/src/main/java/gov/nasa/ziggy/module/SubtaskClient.java
@@ -9,6 +9,8 @@
 import gov.nasa.ziggy.module.SubtaskServer.RequestType;
 import gov.nasa.ziggy.module.SubtaskServer.Response;
 import gov.nasa.ziggy.module.SubtaskServer.ResponseType;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Client class used to communicate with a {@link SubtaskServer} instance in another JVM. The client
@@ -22,10 +24,6 @@
  * the client to dispense with busy loops and simply block until they are called upon to do
  * something.
  * <p>
- * All of the methods in this class can throw {@link InterruptedException}. This indicates that the
- * {@link ComputeNodeMaster} is attempting to shut down all the instances of {@link SubtaskMaster},
- * so any instances of {@link SubtaskClient} that are blocked and waiting for the
- * {@link SubtaskServer} need to be interrupted.
  *
  * @author PT
  */
@@ -42,37 +40,27 @@ public SubtaskClient() {
 
     /**
      * Client method to report that a sub-task has completed
-     *
-     * @throws InterruptedException if the thread was interrupted because a different thread was
-     * unable to reach the subtask server.
      */
-    public Response reportSubtaskComplete(int subTaskIndex) throws InterruptedException {
+    public Response reportSubtaskComplete(int subTaskIndex) {
         return request(RequestType.REPORT_DONE, subTaskIndex);
     }
 
     /**
      * Client method to report that a sub-task is locked by another compute node.
-     *
-     * @throws InterruptedException if the thread was interrupted because a different thread was
-     * unable to reach the subtask server.
      */
-    public Response reportSubtaskLocked(int subTaskIndex) throws InterruptedException {
+    public Response reportSubtaskLocked(int subTaskIndex) {
         return request(RequestType.REPORT_LOCKED, subTaskIndex);
     }
 
     /**
      * Get the next subtask for processing.
-     *
-     * @throws InterruptedException if the thread was interrupted because a different thread was
-     * unable to reach the subtask server.
-     * @return non-null.
      */
-    public Response nextSubtask() throws InterruptedException {
+    public Response nextSubtask() {
         Response response = null;
 
         while (true) {
             response = request(RequestType.GET_NEXT);
-            if (response.status != ResponseType.TRY_AGAIN) {
+            if (response == null || response.status != ResponseType.TRY_AGAIN) {
                 break;
             }
         }
@@ -80,36 +68,34 @@ public Response nextSubtask() throws InterruptedException {
         return response;
     }
 
-    public void submitResponse(Response response) throws InterruptedException {
-        responseQueue.put(response);
+    @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
+    public void submitResponse(Response response) {
+        try {
+            responseQueue.put(response);
+        } catch (InterruptedException ignored) {
+            // If this thread is ever interrupted, it's in the process of the ComputeNodeMaster
+            // shutting down, hence there is nothing to be done, hence we can swallow this
+            // exception.
+        }
     }
 
     /**
      * Sends a message to the {@link SubtaskServer} that is not associated with a subtask index.
      *
      * @return non-null.
-     * @throws InterruptedException
      */
-    private Response request(RequestType command) throws InterruptedException {
+    private Response request(RequestType command) {
         return request(command, -1);
     }
 
     /**
      * Send a request to the subtask server and receive a response.
      *
-     * @throws InterruptedException if the thread is interrupted (indicates that the
-     * {@link ComputeNodeMaster} has interrupted all algorithm threads).
      * @return non-null.
      */
-    private Response request(RequestType command, int subtaskIndex) throws InterruptedException {
+    private Response request(RequestType command, int subtaskIndex) {
 
         log.debug("Sending request " + command + " with subtaskIndex " + subtaskIndex);
-        // If another thread has detected that the server has failed, then there will be
-        // an attempt to interrupt this thread; if so, detect it and then don't even bother
-        // to try to talk to the server, it's gone.
-        if (Thread.interrupted()) {
-            throw new InterruptedException();
-        }
         send(command, subtaskIndex);
         return receive();
     }
@@ -118,7 +104,7 @@ private Response request(RequestType command, int subtaskIndex) throws Interrupt
      * Sends a request to the {@link SubtaskServer}. This is acomplished by creating a new instance
      * of {@link Request}, which is then put onto the server's {@link ArrayBlockingQueue}.
      */
-    private void send(RequestType command, int subTaskIndex) throws InterruptedException {
+    private void send(RequestType command, int subTaskIndex) {
         log.debug("Connected to subtask server, sending request");
         Request request = new Request(command, subTaskIndex, this);
         SubtaskServer.submitRequest(request);
@@ -128,8 +114,15 @@ private void send(RequestType command, int subTaskIndex) throws InterruptedExcep
      * Receives a {@link Response) from the {@link SubtaskServer} to a prior {@link Request}. The
      * method will block until the server responds or an {@link InterruptedException} occurs.
      */
-    private Response receive() throws InterruptedException {
-        return responseQueue.take();
+    @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
+    private Response receive() {
+        try {
+            return responseQueue.take();
+        } catch (InterruptedException ignored) {
+            // Here we can swallow the InterruptedException. If this thread has been
+            // interrupted, it means that the entire ComputeNodeMaster is in the process
+            // of shutting down, so we can simply return null and exit.
+            return null;
+        }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/SubtaskDirectoryIterator.java b/src/main/java/gov/nasa/ziggy/module/SubtaskDirectoryIterator.java
index 560610a..2551e58 100644
--- a/src/main/java/gov/nasa/ziggy/module/SubtaskDirectoryIterator.java
+++ b/src/main/java/gov/nasa/ziggy/module/SubtaskDirectoryIterator.java
@@ -138,7 +138,7 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if ((obj == null) || (getClass() != obj.getClass())) {
+            if (obj == null || getClass() != obj.getClass()) {
                 return false;
             }
             GroupSubtaskDirectory other = (GroupSubtaskDirectory) obj;
diff --git a/src/main/java/gov/nasa/ziggy/module/SubtaskExecutor.java b/src/main/java/gov/nasa/ziggy/module/SubtaskExecutor.java
index 9861ffd..138e7a2 100644
--- a/src/main/java/gov/nasa/ziggy/module/SubtaskExecutor.java
+++ b/src/main/java/gov/nasa/ziggy/module/SubtaskExecutor.java
@@ -1,12 +1,14 @@
 package gov.nasa.ziggy.module;
 
+import static gov.nasa.ziggy.module.AlgorithmExecutor.ZIGGY_PROGRAM;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.UncheckedIOException;
 import java.io.Writer;
-import java.net.InetAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -15,7 +17,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;
 import org.apache.commons.exec.environment.EnvironmentUtils;
@@ -27,9 +29,13 @@
 import gov.nasa.ziggy.module.io.ModuleInterfaceUtils;
 import gov.nasa.ziggy.module.io.matlab.MatlabUtils;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.services.process.ExternalProcessUtils;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.HostNameUtils;
 import gov.nasa.ziggy.util.io.FileUtil;
 import gov.nasa.ziggy.util.os.OperatingSystemType;
 
@@ -60,8 +66,6 @@ public class SubtaskExecutor {
     private final File taskDir;
     private final File workingDir;
     private final int timeoutSecs;
-    private final String pipelineHomeDir;
-    private final String pipelineConfigPath;
 
     private CommandLine commandLine;
     private Map<String, String> environment = new HashMap<>();
@@ -73,31 +77,29 @@ public class SubtaskExecutor {
     private File binaryDir;
 
     // Constructor is private, use the builder instead.
-    private SubtaskExecutor(File taskDir, int subtaskIndex, String binaryName, int timeoutSecs,
-        String pipelineHomeDir, String pipelineConfigPath) {
+    private SubtaskExecutor(File taskDir, int subtaskIndex, String binaryName, int timeoutSecs) {
         this.taskDir = taskDir;
         workingDir = TaskConfigurationManager.subtaskDirectory(taskDir, subtaskIndex);
-        this.pipelineHomeDir = pipelineHomeDir;
-        this.pipelineConfigPath = pipelineConfigPath;
         this.timeoutSecs = timeoutSecs;
         this.binaryName = binaryName;
     }
 
     // Initialization is private, use the builder instead.
-    private void initialize() throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void initialize() {
         SubtaskUtils.putLogStreamIdentifier(workingDir);
-        Configuration config = ZiggyConfiguration.getInstance();
-        libPath = config.getString(PropertyNames.MODULE_EXE_LIBPATH_PROPERTY_NAME, "");
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+        libPath = config.getString(PropertyName.LIBPATH.property(), "");
 
-        String mcrRoot = config.getString(PropertyNames.MODULE_EXE_MCRROOT_PROPERTY_NAME, null);
+        String mcrRoot = config.getString(PropertyName.MCRROOT.property(), null);
         if (mcrRoot != null && !mcrRoot.isEmpty()) {
             libPath = libPath + (!libPath.isEmpty() ? File.pathSeparator : "")
                 + MatlabUtils.mcrPaths(mcrRoot);
         }
 
         // Search for the application first in the path specified by the
-        // MODULE_EXE_BINPATH_PROPERTY_NAME property followed by the pipeline's bin directory.
-        binPath = config.getString(PropertyNames.MODULE_EXE_BINPATH_PROPERTY_NAME, null);
+        // BINPATH property followed by the pipeline's bin directory.
+        binPath = config.getString(PropertyName.BINPATH.property(), null);
         if (binPath == null || binPath.isEmpty()) {
             binPath = DirectoryProperties.pipelineBinDir().toString();
         } else {
@@ -112,12 +114,7 @@ private void initialize() throws IOException {
                 "Unable to locate executable file " + binaryName + " in pathset " + binPath);
         }
 
-        String hostname = "<unknown>";
-        try {
-            hostname = InetAddress.getLocalHost().getHostName();
-        } catch (Exception e) {
-            log.warn("failed to get hostname", e);
-        }
+        String hostname = HostNameUtils.shortHostName();
 
         log.info("osType = " + osType.toString());
         log.info("hostname = " + hostname);
@@ -129,11 +126,16 @@ private void initialize() throws IOException {
         environment.put(MCR_CACHE_ROOT_ENV_VAR_NAME,
             Paths.get("/tmp", "mcr_cache_" + taskDir.getName()).toString());
         environment.put("PATH", binPath);
-        environment.put(CODE_ROOT_ENV_NAME, Paths.get(pipelineHomeDir).getParent().toString());
-        environment.put(ZiggyConfiguration.CONFIG_SERVICE_PROPERTIES_PATH_ENV, pipelineConfigPath);
+        environment.put(CODE_ROOT_ENV_NAME,
+            DirectoryProperties.pipelineHomeDir().getParent().toString());
 
         // Create the MCR cache directory if needed
-        Files.createDirectories(Paths.get(environment.get(MCR_CACHE_ROOT_ENV_VAR_NAME)));
+        try {
+            Files.createDirectories(Paths.get(environment.get(MCR_CACHE_ROOT_ENV_VAR_NAME)));
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to create dir "
+                + Paths.get(environment.get(MCR_CACHE_ROOT_ENV_VAR_NAME)).toString(), e);
+        }
 
         // Populate the environment from the properties file.
         populateEnvironmentFromPropertiesFile();
@@ -206,9 +208,9 @@ private File binPathFile(String binPath, String[] pathSuffix) {
      */
     private void populateEnvironmentFromPropertiesFile() {
 
-        Configuration config = ZiggyConfiguration.getInstance();
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
         String environmentFromProperties = config
-            .getString(PropertyNames.RUNTIME_ENVIRONMENT_PROPERTY_NAME, null);
+            .getString(PropertyName.RUNTIME_ENVIRONMENT.property(), null);
         if (environmentFromProperties == null) {
             return;
         }
@@ -237,13 +239,13 @@ private void populateEnvironmentFromPropertiesFile() {
         sb.setLength(sb.length() - 2);
         sb.append("]");
         log.info("Execution environment: " + sb.toString());
-
     }
 
     /**
      * Executes the algorithm on the subtask (including input and output handling) and returns the
      * exit code.
      */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public int execAlgorithm() {
 
         if (!workingDir.exists() || !workingDir.isDirectory()) {
@@ -255,12 +257,12 @@ public int execAlgorithm() {
         int retCode = -1;
 
         try {
-            File errorFile = ModuleInterfaceUtils.errorFile(workingDir, binaryName, 0);
+            File errorFile = ModuleInterfaceUtils.errorFile(workingDir, binaryName);
             if (errorFile.exists()) {
                 log.info("Deleting stale error file prior to start of processing");
                 errorFile.delete();
             }
-            retCode = execAlgorithmInternal(0);
+            retCode = execAlgorithmInternal();
 
             if (retCode != 0) {
                 log.warn("Marking subtask as failed because retCode = " + retCode);
@@ -278,11 +280,16 @@ public int execAlgorithm() {
         return retCode;
     }
 
-    public int execAlgorithmInternal(int sequenceNum) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public int execAlgorithmInternal() {
         List<String> commandLineArgs = new LinkedList<>();
-        String exePath = workingDir.getCanonicalPath();
-        commandLineArgs.add(exePath);
-        commandLineArgs.add("" + sequenceNum);
+        try {
+            String exePath = workingDir.getCanonicalPath();
+            commandLineArgs.add(exePath);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to get path for dir " + workingDir.toString(),
+                e);
+        }
 
         AlgorithmStateFiles stateFile = new AlgorithmStateFiles(workingDir);
         stateFile.updateCurrentState(AlgorithmStateFiles.SubtaskState.PROCESSING);
@@ -299,7 +306,7 @@ public int execAlgorithmInternal(int sequenceNum) throws IOException {
             retCode = runInputsOutputsCommand(inputsClass);
             if (retCode == 0) {
                 inputsProcessingSucceeded = true;
-                retCode = runCommandline(commandLineArgs, binaryName, "" + sequenceNum);
+                retCode = runCommandline(commandLineArgs, binaryName);
             }
             if (retCode == 0) {
                 algorithmProcessingSucceeded = true;
@@ -311,19 +318,7 @@ public int execAlgorithmInternal(int sequenceNum) throws IOException {
             IntervalMetric.stop(MATLAB_PROCESS_EXEC_METRIC, key);
         }
 
-        File errorFile = ModuleInterfaceUtils.errorFile(workingDir, binaryName, sequenceNum);
-
-        // If the state file for the task is in the DELETED state, then the subtask should
-        // not be put into the COMPLETED or FAILED states, but rather should be left in
-        // PROCESSING. This preserves the symmetry with the way that remote execution subtasks
-        // are left in the PROCESSING state when their parent jobs get deleted from PBS.
-        StateFile taskStateFile = StateFile.of(workingDir.toPath().getParent());
-        taskStateFile = StateFile.newStateFileFromDiskFile(
-            DirectoryProperties.stateFilesDir().resolve(taskStateFile.name()).toFile(), true);
-        if (taskStateFile.getState().equals(StateFile.State.DELETED)) {
-            log.error("Task deleted, ending execution of sub-task");
-            return 0;
-        }
+        File errorFile = ModuleInterfaceUtils.errorFile(workingDir, binaryName);
 
         if (retCode == 0 && !errorFile.exists()) {
             stateFile.updateCurrentState(AlgorithmStateFiles.SubtaskState.COMPLETE);
@@ -351,10 +346,10 @@ public int execAlgorithmInternal(int sequenceNum) throws IOException {
 
     /**
      * Run an arbitrary process with caller-specified arguments. No {@link AlgorithmStateFiles} is
-     * created and a default logSuffix of "0" is used.
+     * created.
      */
-    public int execSimple(List<String> commandLineArgs) throws IOException {
-        int retCode = runCommandline(commandLineArgs, binaryName + "-", "0");
+    public int execSimple(List<String> commandLineArgs) {
+        int retCode = runCommandline(commandLineArgs, binaryName);
         log.info("execSimple: retCode = " + retCode);
 
         return retCode;
@@ -366,41 +361,36 @@ public int execSimple(List<String> commandLineArgs) throws IOException {
      * process that generates results files in the task directory.
      * <p>
      * Given that {@link TaskFileManager} is a Java class, and this is a Java class, why is the
-     * {@link TaskFileManager} invoked using runjava and an external process? By using an external
-     * process, the inputs and outputs classes can use software libraries that do not support
-     * concurrency (for example, HDF5). By running each subtask in a separate process, the subtask
-     * input and output processing can execute in parallel even in cases in which the processing
-     * uses non-concurrent libraries. Running a bunch of instances of {@link TaskFileManager} in
-     * separate threads within a common JVM would not permit this.
+     * {@link TaskFileManager} invoked using the ziggy program and an external process? By using an
+     * external process, the inputs and outputs classes can use software libraries that do not
+     * support concurrency (for example, HDF5). By running each subtask in a separate process, the
+     * subtask input and output processing can execute in parallel even in cases in which the
+     * processing uses non-concurrent libraries. Running a bunch of instances of
+     * {@link TaskFileManager} in separate threads within a common JVM would not permit this.
      *
      * @param inputsOutputsClass Class to be used as argument to TaskFileManager.
-     * @return exit code from runjava, or -1 if an IOException occurs during the command.
-     * @throws IOException if the environment cannot be obtained
+     * @return exit code from the ziggy program
      */
-    int runInputsOutputsCommand(Class<?> inputsOutputsClass) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    int runInputsOutputsCommand(Class<?> inputsOutputsClass) {
 
-        // Locate the runjava executable, which can be someplace other than the bin directories for
+        // Locate the ziggy executable, which can be someplace other than the bin directories for
         // the pipeline.
-        String runjavaCommand = DirectoryProperties.ziggyBinDir() + "/runjava";
+        String ziggyCommand = DirectoryProperties.ziggyBinDir().resolve(ZIGGY_PROGRAM).toString();
+        String javaLibPathArg = ExternalProcessUtils.javaLibraryPath();
+        String log4jConfig = ExternalProcessUtils.log4jConfigString();
 
-        // Build the string that sets up that location as the Java library path
-        String javaLibPathArg = "-Djava.library.path=" + DirectoryProperties.ziggyLibDir();
-
-        // Build the string that sets up the Log4j config file location
-        String log4jConfig = "-Dlog4j2.configurationFile=" + DirectoryProperties.ziggyHomeDir()
-            + "/etc/log4j2.xml";
-
-        // Construct the class arguments for runjava.
+        // Construct the class arguments for the ziggy program.
         String taskFileManagerClassName = TaskFileManager.class.getCanonicalName();
         String inputsOutputsClassName = inputsOutputsClass.getCanonicalName();
 
         // Put it all together.
-        commandLine = new CommandLine(runjavaCommand);
+        commandLine = new CommandLine(ziggyCommand);
         commandLine.addArgument("--verbose");
         commandLine.addArgument(javaLibPathArg);
         commandLine.addArgument(log4jConfig);
 
-        commandLine.addArgument(taskFileManagerClassName);
+        commandLine.addArgument("--class=" + taskFileManagerClassName);
         commandLine.addArgument(inputsOutputsClassName);
 
         // Run the command and return the exit code.
@@ -408,22 +398,27 @@ int runInputsOutputsCommand(Class<?> inputsOutputsClass) throws IOException {
         externalProcess.setLogStreamIdentifier(workingDir.getName());
         externalProcess.setWorkingDirectory(workingDir);
         externalProcess.setCommandLine(commandLine);
-        externalProcess.setEnvironment(mergeWithEnvironment(EnvironmentUtils.getProcEnvironment()));
+        try {
+            externalProcess
+                .setEnvironment(mergeWithEnvironment(EnvironmentUtils.getProcEnvironment()));
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to get process environment ", e);
+        }
 
         log.info("Executing command: " + commandLine.toString());
         return externalProcess.execute();
     }
 
-    int runCommandline(List<String> commandline, String logPrefix, String logSuffix)
-        throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    int runCommandline(List<String> commandline, String logPrefix) {
         try (
             Writer stdOutWriter = new OutputStreamWriter(
-                new FileOutputStream(new File(workingDir,
-                    ModuleInterfaceUtils.stdoutFileName(logPrefix, logSuffix))),
+                new FileOutputStream(
+                    new File(workingDir, ModuleInterfaceUtils.stdoutFileName(logPrefix))),
                 FileUtil.ZIGGY_CHARSET);
             Writer stdErrWriter = new OutputStreamWriter(
-                new FileOutputStream(new File(workingDir,
-                    ModuleInterfaceUtils.stderrFileName(logPrefix, logSuffix))),
+                new FileOutputStream(
+                    new File(workingDir, ModuleInterfaceUtils.stderrFileName(logPrefix))),
                 FileUtil.ZIGGY_CHARSET)) {
             File binary = new File(binaryDir.getPath(), binaryName);
             if ((!binary.exists() || !binary.isFile())
@@ -454,8 +449,8 @@ int runCommandline(List<String> commandline, String logPrefix, String logSuffix)
              * MATLABHOME is always set to MCRROOT. If not, the application will run as though it is
              * running inside MATLAB. Hence, the licensing server will be contacted."
              */
-            Configuration config = ZiggyConfiguration.getInstance();
-            String mcrRoot = config.getString(PropertyNames.MODULE_EXE_MCRROOT_PROPERTY_NAME, null);
+            ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+            String mcrRoot = config.getString(PropertyName.MCRROOT.property(), null);
 
             if (mcrRoot != null) {
                 env.put(MATLABHOME_ENV_NAME, mcrRoot);
@@ -492,8 +487,10 @@ int runCommandline(List<String> commandline, String logPrefix, String logSuffix)
             }
 
             return retCode;
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to create and run command line " + commandLine.toString(), e);
         }
-
     }
 
     private Map<String, String> mergeWithEnvironment(Map<String, String> additionalEnvironment) {
@@ -506,11 +503,7 @@ private Map<String, String> mergeWithEnvironment(Map<String, String> additionalE
     private static void markSubtaskFailed(File workingDir) {
         AlgorithmStateFiles subTaskState = new AlgorithmStateFiles(workingDir);
         if (subTaskState.currentSubtaskState() != AlgorithmStateFiles.SubtaskState.FAILED) {
-            try {
-                subTaskState.updateCurrentState(AlgorithmStateFiles.SubtaskState.FAILED);
-            } catch (IOException e1) {
-                log.error("failed to create .FAILED file for subTask: " + workingDir);
-            }
+            subTaskState.updateCurrentState(AlgorithmStateFiles.SubtaskState.FAILED);
         }
     }
 
@@ -553,8 +546,6 @@ public static class Builder {
         private File taskDir;
         private int subtaskIndex = -1;
         private int timeoutSecs = -1;
-        private String pipelineHomeDir;
-        private String pipelineConfigPath;
         private String binaryName;
 
         public Builder() {
@@ -575,22 +566,12 @@ public Builder timeoutSecs(int timeoutSecs) {
             return this;
         }
 
-        public Builder pipelineHomeDir(String pipelineHomeDir) {
-            this.pipelineHomeDir = pipelineHomeDir;
-            return this;
-        }
-
-        public Builder pipelineConfigPath(String pipelineConfigPath) {
-            this.pipelineConfigPath = pipelineConfigPath;
-            return this;
-        }
-
         public Builder binaryName(String binaryName) {
             this.binaryName = binaryName;
             return this;
         }
 
-        public SubtaskExecutor build() throws IOException {
+        public SubtaskExecutor build() {
             StringBuilder sb = new StringBuilder();
             if (taskDir == null) {
                 sb.append("taskDir ");
@@ -601,12 +582,6 @@ public SubtaskExecutor build() throws IOException {
             if (timeoutSecs <= 0) {
                 sb.append("timeoutSecs ");
             }
-            if (pipelineHomeDir == null) {
-                sb.append("pipelineHomeDir ");
-            }
-            if (pipelineConfigPath == null) {
-                sb.append("pipelineConfigPath ");
-            }
             if (binaryName == null) {
                 sb.append("binaryName ");
             }
@@ -616,10 +591,9 @@ public SubtaskExecutor build() throws IOException {
                     "Unable to build SubtaskExecutor, bad fields: " + sb.toString());
             }
             SubtaskExecutor subtaskExecutor = new SubtaskExecutor(taskDir, subtaskIndex, binaryName,
-                timeoutSecs, pipelineHomeDir, pipelineConfigPath);
+                timeoutSecs);
             subtaskExecutor.initialize();
             return subtaskExecutor;
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/SubtaskInformation.java b/src/main/java/gov/nasa/ziggy/module/SubtaskInformation.java
index 65a4028..01d31ed 100644
--- a/src/main/java/gov/nasa/ziggy/module/SubtaskInformation.java
+++ b/src/main/java/gov/nasa/ziggy/module/SubtaskInformation.java
@@ -35,5 +35,4 @@ public int getSubtaskCount() {
     public int getMaxParallelSubtasks() {
         return maxParallelSubtasks;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/SubtaskLocator.java b/src/main/java/gov/nasa/ziggy/module/SubtaskLocator.java
index c75595c..43d34c1 100644
--- a/src/main/java/gov/nasa/ziggy/module/SubtaskLocator.java
+++ b/src/main/java/gov/nasa/ziggy/module/SubtaskLocator.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -46,6 +46,8 @@
 import org.apache.commons.cli.ParseException;
 
 import gov.nasa.ziggy.module.hdf5.Hdf5ModuleInterface;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Locates the subtask or subtasks within a task that use a specified file as an input or an
@@ -59,6 +61,7 @@
  */
 public class SubtaskLocator {
 
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public static void main(String[] args) {
 
         Option directoryOption = new Option("d", "directory", true, "Task directory");
@@ -71,12 +74,11 @@ public static void main(String[] args) {
         try {
             cmdLine = new DefaultParser().parse(options, args);
         } catch (ParseException e) {
-            throw new PipelineException("Unable to parse SubtaskLocator command line", e);
+            throw new PipelineException("Unable to parse options", e);
         }
         if (!cmdLine.hasOption(directoryOption.getOpt())
             || !cmdLine.hasOption(fileOption.getOpt())) {
             throw new PipelineException("SubtaskLocator requires both directory and file options");
-
         }
 
         String taskDir = cmdLine.getOptionValue(directoryOption.getOpt());
diff --git a/src/main/java/gov/nasa/ziggy/module/SubtaskMaster.java b/src/main/java/gov/nasa/ziggy/module/SubtaskMaster.java
index a999e81..d6dfe1d 100644
--- a/src/main/java/gov/nasa/ziggy/module/SubtaskMaster.java
+++ b/src/main/java/gov/nasa/ziggy/module/SubtaskMaster.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.Objects;
 import java.util.concurrent.Semaphore;
 
@@ -9,7 +10,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.module.hdf5.Hdf5ModuleInterface;
+import gov.nasa.ziggy.module.io.AlgorithmErrorReturn;
+import gov.nasa.ziggy.module.io.ModuleInterfaceUtils;
 import gov.nasa.ziggy.module.remote.TimestampFile;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.LockManager;
 
 /**
@@ -40,21 +46,17 @@ public class SubtaskMaster implements Runnable {
     private final String binaryName;
     private final String taskDir;
     private final int timeoutSecs;
-    private final String homeDir;
-    private final String pipelineConfigPath;
     private final String jobId;
     private final String jobName;
 
     public SubtaskMaster(int threadNumber, String node, Semaphore complete, String binaryName,
-        String taskDir, int timeoutSecs, String homeDir, String pipelineConfigPath) {
+        String taskDir, int timeoutSecs) {
         this.threadNumber = threadNumber;
         this.node = node;
         this.complete = complete;
         this.binaryName = binaryName;
         this.taskDir = taskDir;
         this.timeoutSecs = timeoutSecs;
-        this.homeDir = homeDir;
-        this.pipelineConfigPath = pipelineConfigPath;
 
         String fullJobId = System.getenv("PBS_JOBID");
         if (fullJobId != null && !fullJobId.isEmpty()) {
@@ -74,9 +76,6 @@ public void run() {
             processSubtasks();
             log.info("Node: " + node + "[" + threadNumber
                 + "]: No more subtasks to process, thread exiting");
-        } catch (InterruptedException i) {
-            log.error(
-                "Exiting SubtaskMaster on thread " + threadNumber + " due to thread interruption");
         } finally {
             complete.release();
         }
@@ -86,60 +85,50 @@ public void run() {
      * Generate external processes to execute subtask algorithms. This method will block waiting for
      * the {@link SubtaskClient} to receive a reply to its request for the next subtask for
      * processing.
-     *
-     * @throws InterruptedException if the thread is interrupted.
      */
-    private void processSubtasks() throws InterruptedException {
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    private void processSubtasks() {
 
         SubtaskClient subtaskClient = null;
         SubtaskServer.Response response = null;
         int subtaskIndex = -1;
         while (true) {
-            try {
-                subtaskClient = subtaskClient();
+            subtaskClient = subtaskClient();
 
-                response = subtaskClient.nextSubtask();
+            response = subtaskClient.nextSubtask();
 
-                if (!response.successful()) {
-                    break;
-                }
-                subtaskIndex = response.subtaskIndex;
+            if (response == null || !response.successful()) {
+                break;
+            }
+            subtaskIndex = response.subtaskIndex;
 
-                log.debug(threadNumber + ": Processing sub-task: " + subtaskIndex);
+            log.debug(threadNumber + ": Processing sub-task: " + subtaskIndex);
 
-                File subtaskDir = TaskConfigurationManager.subtaskDirectory(new File(taskDir),
-                    subtaskIndex);
-                File lockFile = new File(subtaskDir, TaskConfigurationManager.LOCK_FILE_NAME);
-                if (getWriteLockWithoutBlocking(lockFile)) {
+            File subtaskDir = TaskConfigurationManager.subtaskDirectory(new File(taskDir),
+                subtaskIndex);
+            File lockFile = new File(subtaskDir, TaskConfigurationManager.LOCK_FILE_NAME);
 
-                    // Note: The SubtaskMaster must not exit due to an exception caused
-                    // during algorithm execution, since the SubtaskMaster instances persist
-                    // for the duration of their parent ComputeNodeMaster. Hence we use
-                    // a literal catch-all block that catches all Exceptions, writes an
-                    // error message, and moves on to try and process the next subtask.
-                    try {
-                        SubtaskUtils.putLogStreamIdentifier(subtaskDir);
-                        if (!checkSubtaskState(subtaskDir)) {
-                            executeSubtask(subtaskDir, threadNumber, subtaskIndex);
-                            subtaskClient.reportSubtaskComplete(subtaskIndex);
-                        }
-                    } catch (Exception e) {
-                        logException(subtaskIndex, e);
-                    } finally {
-                        SubtaskUtils.putLogStreamIdentifier((String) null);
-                        releaseWriteLock(lockFile);
+            try {
+                if (getWriteLockWithoutBlocking(lockFile)) {
+                    SubtaskUtils.putLogStreamIdentifier(subtaskDir);
+                    if (!checkSubtaskState(subtaskDir)) {
+                        executeSubtask(subtaskDir, threadNumber, subtaskIndex);
+                        subtaskClient.reportSubtaskComplete(subtaskIndex);
                     }
                 } else {
                     subtaskClient.reportSubtaskLocked(subtaskIndex);
                 }
-
-            } catch (IOException e) {
-
-                // If an IOException has occurred, it's possible that
-                // only the current subtask has failed and that other subtasks can still be
-                // processed, so don't halt the search for new subtasks.
+            } catch (Exception e) {
+                // We don't want any exception that occurred in processing a subtask
+                // (including runtime exceptions) to stop the SubtaskMaster instance
+                // from processing further subtasks, consequently we catch Exception
+                // here to prevent same. The higher-level monitoring will manage any
+                // cases in which a subtask's processing failed.
                 logException(subtaskIndex, e);
-
+            } finally {
+                SubtaskUtils.putLogStreamIdentifier((String) null);
+                releaseWriteLock(lockFile);
+                logAlgorithmStackTrace(subtaskDir, subtaskIndex);
             }
         }
     }
@@ -193,19 +182,16 @@ private boolean checkSubtaskState(File subtaskDir) {
 
     /**
      * Executes the processing algorithm on the current subtask via an external process.
-     *
-     * @throws IOException if an IO error occurs during the external process.
      */
-    private void executeSubtask(File subtaskDir, int threadNumber, int subtaskIndex)
-        throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void executeSubtask(File subtaskDir, int threadNumber, int subtaskIndex) {
 
         int retCode = 0;
 
+        // Put in the current correct job info file
+        String jobInfoFileName = JOB_INFO_PREFIX + "jobname." + jobName + ".jobid." + jobId
+            + ".node." + node;
         try {
-
-            // Put in the current correct job info file
-            String jobInfoFileName = JOB_INFO_PREFIX + "jobname." + jobName + ".jobid." + jobId
-                + ".node." + node;
             new File(subtaskDir, jobInfoFileName).createNewFile();
             TimestampFile.create(subtaskDir, TimestampFile.Event.SUB_TASK_START);
 
@@ -214,7 +200,9 @@ private void executeSubtask(File subtaskDir, int threadNumber, int subtaskIndex)
             log.info("START subtask: " + subtaskIndex + " on " + node + "[" + threadNumber + "]");
             retCode = subtaskExecutor.execAlgorithm();
             log.info("FINISH subtask " + subtaskIndex + " on " + node + ", rc: " + retCode);
-
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to create file " + new File(subtaskDir, jobInfoFileName).toString(), e);
         } finally {
             TimestampFile.create(subtaskDir, TimestampFile.Event.SUB_TASK_FINISH);
         }
@@ -237,7 +225,7 @@ SubtaskClient subtaskClient() {
      * Attempts to acquire a write lock on a lock file, but doesn't block when the lock file is
      * already locked by another user. Implemented as a separate method to support testing.
      */
-    boolean getWriteLockWithoutBlocking(File lockFile) throws IOException {
+    boolean getWriteLockWithoutBlocking(File lockFile) {
         return LockManager.getWriteLockWithoutBlocking(lockFile);
     }
 
@@ -245,7 +233,7 @@ boolean getWriteLockWithoutBlocking(File lockFile) throws IOException {
      * Releases a write lock held by this object. Implemented as a separate method to support
      * testing.
      */
-    void releaseWriteLock(File lockFile) throws IOException {
+    void releaseWriteLock(File lockFile) {
         LockManager.releaseWriteLock(lockFile);
     }
 
@@ -265,23 +253,31 @@ void logException(int subtaskIndex, Exception e) {
         log.error("Error occurred during processing of subtask " + subtaskIndex, e);
     }
 
+    /** Writes the algorithm stack trace, if any, to the algorithm log. */
+    void logAlgorithmStackTrace(File subtaskDir, int subtaskIndex) {
+        File errorFile = ModuleInterfaceUtils.errorFile(subtaskDir, binaryName);
+        if (errorFile.exists()) {
+            AlgorithmErrorReturn algorithmStack = new AlgorithmErrorReturn();
+            new Hdf5ModuleInterface().readFile(errorFile, algorithmStack, true);
+            algorithmStack.logStackTrace();
+        }
+    }
+
     /**
      * Constructs a new instance of {@link SubtaskExecutor}. Implemented as a separate method to
      * support testing.
      */
-    SubtaskExecutor subtaskExecutor(int subtaskIndex) throws IOException {
+    SubtaskExecutor subtaskExecutor(int subtaskIndex) {
         return new SubtaskExecutor.Builder().taskDir(new File(taskDir))
             .binaryName(binaryName)
             .subtaskIndex(subtaskIndex)
             .timeoutSecs(timeoutSecs)
-            .pipelineConfigPath(pipelineConfigPath)
-            .pipelineHomeDir(homeDir)
             .build();
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(binaryName, homeDir, jobId, jobName, node, taskDir, threadNumber);
+        return Objects.hash(binaryName, jobId, jobName, node, taskDir, threadNumber);
     }
 
     @Override
@@ -289,12 +285,11 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         SubtaskMaster other = (SubtaskMaster) obj;
-        return Objects.equals(binaryName, other.binaryName)
-            && Objects.equals(homeDir, other.homeDir) && Objects.equals(jobId, other.jobId)
+        return Objects.equals(binaryName, other.binaryName) && Objects.equals(jobId, other.jobId)
             && Objects.equals(jobName, other.jobName) && Objects.equals(node, other.node)
             && Objects.equals(taskDir, other.taskDir) && threadNumber == other.threadNumber;
     }
diff --git a/src/main/java/gov/nasa/ziggy/module/SubtaskServer.java b/src/main/java/gov/nasa/ziggy/module/SubtaskServer.java
index 28c123e..812a8db 100644
--- a/src/main/java/gov/nasa/ziggy/module/SubtaskServer.java
+++ b/src/main/java/gov/nasa/ziggy/module/SubtaskServer.java
@@ -6,6 +6,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+
 /**
  * Serves sub-tasks to clients using {@link SubtaskAllocator}. Clients should use
  * {@link SubtaskClient} to communicate with an instance of this class.
@@ -22,7 +25,6 @@ public class SubtaskServer implements Runnable {
 
     private SubtaskAllocator subtaskAllocator;
     private final CountDownLatch serverThreadReady = new CountDownLatch(1);
-    private boolean shuttingDown = false;
     private TaskConfigurationManager inputsHandler;
     private Thread listenerThread;
 
@@ -35,18 +37,23 @@ public static void initializeRequestQueue(int subtaskMasterCount) {
         requestQueue = new ArrayBlockingQueue<>(subtaskMasterCount);
     }
 
-    public void start() throws InterruptedException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void start() {
         log.info("Starting SubtaskServer for inputs: " + inputsHandler);
 
-        // NB: if the listener thread constructor and setDaemon() calls are moved
-        // to the class constructor, above, then the listener process will fail.
-        // Specifically, SubtaskClient requests will never get answered. I don't
-        // know why this should matter, but it does.
-        listenerThread = new Thread(this, "SubtaskServer-listener");
-        listenerThread.setDaemon(true);
-        listenerThread.start();
-        serverThreadReady.await();
-        log.info("SubtaskServer thread ready");
+        try {
+            // NB: if the listener thread constructor and setDaemon() calls are moved
+            // to the class constructor, above, then the listener process will fail.
+            // Specifically, SubtaskClient requests will never get answered. I don't
+            // know why this should matter, but it does.
+            listenerThread = new Thread(this, "SubtaskServer-listener");
+            listenerThread.setDaemon(true);
+            listenerThread.start();
+            serverThreadReady.await();
+            log.info("SubtaskServer thread ready");
+        } catch (InterruptedException e) {
+            throw new PipelineException("SubtaskServer start interrupted", e);
+        }
     }
 
     // request commands
@@ -65,7 +72,6 @@ public enum ResponseType {
      * an {@link InterruptException}.
      */
     public void shutdown() {
-        shuttingDown = true;
         listenerThread.interrupt();
     }
 
@@ -78,10 +84,21 @@ public boolean isListenerRunning() {
      * block until the request is accepted into the queue.
      *
      * @param request
-     * @throws InterruptedException
      */
-    public static void submitRequest(Request request) throws InterruptedException {
-        requestQueue.put(request);
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public static void submitRequest(Request request) {
+        try {
+            requestQueue.put(request);
+        } catch (InterruptedException e) {
+            // This can never occur. It happens if the put() operation is waiting
+            // for a slot to open up in the blocking queue, and the thread is
+            // interrupted while waiting. Because the queue size equals the number
+            // of SubtaskMaster instances, even if all the SubtaskMasters submit
+            // requests simultaneously there will be room enough in the queue for
+            // all the requests, and a SubtaskMaster can never have more than 1
+            // request on the queue at a time.
+            throw new AssertionError(e);
+        }
     }
 
     public static final class Request {
@@ -144,11 +161,18 @@ public String toString() {
 
     // Implements the request listener loop.
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_IN_RUNNABLE)
     public void run() {
         log.info("Initializing SubtaskServer server thread");
         serverThreadReady.countDown();
 
         while (true) {
+
+            // If the ComputeNodeMaster is shutting down, we can detect it here
+            // and halt the loop.
+            if (Thread.currentThread().isInterrupted()) {
+                break;
+            }
             try {
 
                 // Retrieve the next request, or block until one is provided.
@@ -186,15 +210,11 @@ public void run() {
 
                 // Send the response back to the client.
                 request.client.submitResponse(response);
-
             } catch (InterruptedException e) {
-
-                if (shuttingDown) {
-                    log.info("Got shutdown signal, exiting server thread");
-                } else {
-                    log.error("SubtaskServer interrupted, exiting");
-                }
-                return;
+                // If the ComputeNodeMaster started to shut down while
+                // this loop was blocked at the take() call, above, execution
+                // will end up here and we can exit the loop.
+                break;
             }
         }
     }
diff --git a/src/main/java/gov/nasa/ziggy/module/SubtaskUtils.java b/src/main/java/gov/nasa/ziggy/module/SubtaskUtils.java
index d2af768..61f8aaf 100644
--- a/src/main/java/gov/nasa/ziggy/module/SubtaskUtils.java
+++ b/src/main/java/gov/nasa/ziggy/module/SubtaskUtils.java
@@ -49,5 +49,4 @@ public static void clearStaleAlgorithmStates(File taskDir) {
             new AlgorithmStateFiles(subtaskDir).clearStaleState();
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/TaskConfigurationManager.java b/src/main/java/gov/nasa/ziggy/module/TaskConfigurationManager.java
index 566357d..dcdabb6 100644
--- a/src/main/java/gov/nasa/ziggy/module/TaskConfigurationManager.java
+++ b/src/main/java/gov/nasa/ziggy/module/TaskConfigurationManager.java
@@ -7,6 +7,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -19,6 +20,8 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.SpotBugsUtils;
 
 /**
@@ -42,7 +45,7 @@
  */
 public class TaskConfigurationManager implements Serializable {
     private static final Logger log = LoggerFactory.getLogger(TaskConfigurationManager.class);
-    private static final long serialVersionUID = 20220817L;
+    private static final long serialVersionUID = 20230511L;
     private static final String PERSISTED_FILE_NAME = ".task-configuration.ser";
     public static final String LOCK_FILE_NAME = ".lock";
 
@@ -65,6 +68,7 @@ public TaskConfigurationManager(File taskDir) {
      * Construct the current subtask directory and increment the subtask index. Add the subtask
      * files. Put the .lock file into the subtask directory.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void addFilesForSubtask(Set<String> files) {
 
         File subTaskDirectory = subtaskDirectory(taskDir, subtaskCount);
@@ -72,8 +76,9 @@ public void addFilesForSubtask(Set<String> files) {
         try {
             new File(subTaskDirectory, LOCK_FILE_NAME).createNewFile();
         } catch (IOException e) {
-            throw new PipelineException(
-                "Unable to create lock file in subtask " + subtaskCount + " directory");
+            throw new UncheckedIOException(
+                "Unable to create file " + new File(subTaskDirectory, LOCK_FILE_NAME).toString(),
+                e);
         }
         subtaskCount++;
     }
@@ -126,7 +131,6 @@ void validate() {
             log.error(message);
             throw new PipelineException(message);
         }
-
     }
 
     @Override
@@ -138,19 +142,22 @@ public void persist() {
         persist(getTaskDir());
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void persist(File dir) {
         File dest = persistedFile(dir);
         try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(dest))) {
             log.info("Persisting inputs metadata to: " + dest);
             oos.writeObject(this);
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Unable to persist to: " + dir + ", caught: " + e,
-                e);
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to persist task configuration manger to dir " + dir.toString(), e);
         }
     }
 
     @SuppressFBWarnings(value = "OBJECT_DESERIALIZATION",
         justification = SpotBugsUtils.DESERIALIZATION_JUSTIFICATION)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     public static TaskConfigurationManager restore(File taskDir) {
         File src = persistedFile(taskDir);
         try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(src))) {
@@ -160,9 +167,14 @@ public static TaskConfigurationManager restore(File taskDir) {
             s.taskDir = taskDir;
 
             return s;
-        } catch (Exception e) {
-            throw new IllegalArgumentException(
-                "Unable to read persisted object from: " + taskDir + ", caught: " + e, e);
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to load task configuration manager from dir " + taskDir.toString(), e);
+        } catch (ClassNotFoundException e) {
+            // This can never occur. By construction, the object deserialized here was
+            // serialized at some prior point by this same class, which means that it is
+            // guaranteed to be a TaskConfigurationManager instance.
+            throw new AssertionError(e);
         }
     }
 
@@ -200,11 +212,10 @@ public List<File> allSubTaskDirectories() {
      * @param subTaskIndex
      * @return
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public static File subtaskDirectory(File taskWorkingDir, int subTaskIndex) {
+        File subTaskDir = new File(taskWorkingDir, "st-" + subTaskIndex);
         try {
-            File subTaskDir = null;
-
-            subTaskDir = new File(taskWorkingDir, "st-" + subTaskIndex);
 
             // ensure that the directory exists
             if (!subTaskDir.exists()) {
@@ -213,7 +224,8 @@ public static File subtaskDirectory(File taskWorkingDir, int subTaskIndex) {
 
             return subTaskDir;
         } catch (IOException e) {
-            throw new PipelineException("Failed to create sub-task dir: " + e, e);
+            throw new UncheckedIOException("Unable to create directory " + subTaskDir.toString(),
+                e);
         }
     }
 
@@ -286,5 +298,4 @@ public void setOutputsClass(Class<? extends PipelineOutputs> outputsClass) {
     public Class<? extends PipelineOutputs> getOutputsClass() {
         return outputsClass;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/TaskFileManager.java b/src/main/java/gov/nasa/ziggy/module/TaskFileManager.java
index b318132..1de4d8e 100644
--- a/src/main/java/gov/nasa/ziggy/module/TaskFileManager.java
+++ b/src/main/java/gov/nasa/ziggy/module/TaskFileManager.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -34,6 +34,11 @@
 
 package gov.nasa.ziggy.module;
 
+import org.jfree.util.Log;
+
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+
 /**
  * Manages the movement of data files between the task directory and the subtask directories.
  * <p>
@@ -51,6 +56,7 @@
  */
 public final class TaskFileManager {
 
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
     public static void main(String[] args) {
 
         try {
@@ -73,11 +79,9 @@ public static void main(String[] args) {
                     + " does not implement PipelineInputsOutputs");
             }
             System.exit(0);
-        } catch (Throwable t) {
-            System.out.println("ERROR: TaskFileManager execution failed, stack trace follows");
-            t.printStackTrace();
+        } catch (Exception e) {
+            Log.error("TaskFileManager execution failed", e);
             System.exit(1);
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/TaskMonitor.java b/src/main/java/gov/nasa/ziggy/module/TaskMonitor.java
index 957453c..92461f7 100644
--- a/src/main/java/gov/nasa/ziggy/module/TaskMonitor.java
+++ b/src/main/java/gov/nasa/ziggy/module/TaskMonitor.java
@@ -1,7 +1,6 @@
 package gov.nasa.ziggy.module;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -34,16 +33,13 @@ public class TaskMonitor {
     private static final Logger log = LoggerFactory.getLogger(TaskMonitor.class);
 
     private final StateFile stateFile;
-    private final File stateFileDir;
     private final File taskDir;
     private final File lockFile;
     private final List<File> subtaskDirectories;
 
-    public TaskMonitor(TaskConfigurationManager inputsHandler, StateFile stateFile,
-        File stateFileDir, File taskDir) {
+    public TaskMonitor(TaskConfigurationManager inputsHandler, StateFile stateFile, File taskDir) {
         subtaskDirectories = inputsHandler.allSubTaskDirectories();
         this.stateFile = stateFile;
-        this.stateFileDir = stateFileDir;
         this.taskDir = taskDir;
         lockFile = new File(taskDir, StateFile.LOCK_FILE_NAME);
     }
@@ -81,18 +77,6 @@ public boolean allSubtasksProcessed() {
             .getNumTotal();
     }
 
-    /**
-     * Notifies the caller that the task in question has been marked for deletion.
-     * <p>
-     * Generally, this indicates that the pipeline worker has set the state in the state file on
-     * disk to DELETED, and that the {@link TaskMonitor} has detected this change and applied it to
-     * the {@link StateFile} instance in the {@link TaskMonitor}. This allows the caller (which is
-     * generally an instance of {@link ComputeNodeMaster}) that processing of this task must end.
-     */
-    public boolean isDeleted() {
-        return stateFile.getState().equals(StateFile.State.DELETED);
-    }
-
     /**
      * Makes a single pass through all of the subtask directories and updates the {@link StateFile}
      * based on the {@link AlgorithmStateFiles}s. This method does not update the status to COMPLETE
@@ -100,11 +84,10 @@ public boolean isDeleted() {
      * file is updated. The state file should be marked COMPLETE with the markStateFileDone()
      * method.
      */
-    public void updateState() throws IOException {
+    public void updateState() {
         try {
             LockManager.getWriteLockOrBlock(lockFile);
-            StateFile diskStateFile = StateFile
-                .newStateFileFromDiskFile(new File(stateFileDir, stateFile.name()), true, true);
+            StateFile diskStateFile = stateFile.newStateFileFromDiskFile(true);
 
             if (subtaskDirectories.isEmpty()) {
                 log.warn("No subtask dirs found in: " + taskDir);
@@ -114,27 +97,22 @@ public void updateState() throws IOException {
             stateFile.setNumComplete(stateCounts.getCompletedSubtasks());
             stateFile.setNumFailed(stateCounts.getFailedSubtasks());
             stateFile.setState(diskStateFile.getState());
-            if (diskStateFile.getState().equals(StateFile.State.DELETED)) {
-                stateFile.setState(StateFile.State.DELETED);
-            }
             updateStateFile(diskStateFile);
         } finally {
             LockManager.releaseWriteLock(lockFile);
         }
-
     }
 
     /**
      * Move the {@link StateFile} into the completed state if all subtasks are complete, or into the
      * failed state if some subtasks failed or were never processed.
      */
-    public void markStateFileDone() throws IOException {
+    public void markStateFileDone() {
 
         try {
             LockManager.getWriteLockOrBlock(lockFile);
 
-            StateFile previousStateFile = StateFile
-                .newStateFileFromDiskFile(new File(stateFileDir, stateFile.name()), true);
+            StateFile previousStateFile = stateFile.newStateFileFromDiskFile();
 
             if (stateFile.getNumComplete() + stateFile.getNumFailed() == stateFile.getNumTotal()) {
                 log.info("All subtasks complete or errored, marking state file COMPLETE");
@@ -158,7 +136,7 @@ private void updateStateFile(StateFile previousStateFile) {
         if (!previousStateFile.equals(stateFile)) {
             log.info("Updating state: " + previousStateFile + " -> " + stateFile);
 
-            if (!StateFile.updateStateFile(previousStateFile, stateFile, stateFileDir)) {
+            if (!StateFile.updateStateFile(previousStateFile, stateFile)) {
                 log.error("Failed to update state file: " + previousStateFile);
             }
         }
diff --git a/src/main/java/gov/nasa/ziggy/module/TestEnvDump.java b/src/main/java/gov/nasa/ziggy/module/TestEnvDump.java
deleted file mode 100644
index 70ae67f..0000000
--- a/src/main/java/gov/nasa/ziggy/module/TestEnvDump.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package gov.nasa.ziggy.module;
-
-import java.util.Map;
-
-import org.apache.commons.exec.environment.EnvironmentUtils;
-
-/**
- * @author Todd Klaus
- */
-public class TestEnvDump {
-    /**
-     * @param args
-     * @throws Exception
-     */
-    public static void main(String[] args) throws Exception {
-        Map<?, ?> env = EnvironmentUtils.getProcEnvironment();
-
-        for (Object key : env.keySet()) {
-            Object value = env.get(key);
-            System.out.println(key + "=" + value);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/module/WorkerMemoryManager.java b/src/main/java/gov/nasa/ziggy/module/WorkerMemoryManager.java
index e632975..4481fae 100644
--- a/src/main/java/gov/nasa/ziggy/module/WorkerMemoryManager.java
+++ b/src/main/java/gov/nasa/ziggy/module/WorkerMemoryManager.java
@@ -6,18 +6,20 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.os.MemInfo;
 import gov.nasa.ziggy.util.os.OperatingSystemType;
-import gov.nasa.ziggy.worker.WorkerTaskRequestDispatcher;
+import gov.nasa.ziggy.worker.TaskExecutor;
 
 /**
  * This class maintains a {@link Semaphore} that manages the amount of physical memory available for
  * external processes.
  * <p>
- * Before executing a task, the {@link WorkerTaskRequestDispatcher} should call this class to
- * acquire the necessary memory (as specified in the {@link PipelineModuleDefinition}) and call this
- * class again to release the memory once the task is complete. If insufficient memory is available,
- * the acquire() method will block until the memory becomes available.
+ * Before executing a task, the {@link TaskExecutor} should call this class to acquire the necessary
+ * memory (as specified in the {@link PipelineModuleDefinition}) and call this class again to
+ * release the memory once the task is complete. If insufficient memory is available, the acquire()
+ * method will block until the memory becomes available.
  *
  * @author Todd Klaus
  */
@@ -29,7 +31,7 @@ public class WorkerMemoryManager {
     private Semaphore memorySemaphore;
     private int availableMegaBytes;
 
-    public WorkerMemoryManager() throws Exception {
+    public WorkerMemoryManager() {
         MemInfo memInfo = OperatingSystemType.getInstance().getMemInfo();
         long physicalMemoryMegaBytes = memInfo.getTotalMemoryKB() / KILO;
 
@@ -83,18 +85,25 @@ private void initSemaphore() {
 
     /**
      * @param megaBytes
-     * @throws InterruptedException
      * @see java.util.concurrent.Semaphore#acquire(int)
      */
-    public void acquireMemoryMegaBytes(int megaBytes) throws InterruptedException {
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    public void acquireMemoryMegaBytes(int megaBytes) {
         if (megaBytes == 0) {
             return;
         }
         logAcquirePrediction(megaBytes);
 
-        memorySemaphore.acquire(megaBytes);
-
-        log.info(megaBytes + " megabytes acquired, new pool size: " + availableMemoryMegaBytes());
+        try {
+            memorySemaphore.acquire(megaBytes);
+            log.info(
+                megaBytes + " megabytes acquired, new pool size: " + availableMemoryMegaBytes());
+        } catch (InterruptedException ignored) {
+            // If we got here, it means that a worker thread was waiting for Java heap to become
+            // available but that thread was interrupted. It is therefore no longer waiting for
+            // Java heap! But all the other threads still need the memory manager to function,
+            // so we swallow this exception.
+        }
     }
 
     /**
diff --git a/src/main/java/gov/nasa/ziggy/module/WorkingDirManager.java b/src/main/java/gov/nasa/ziggy/module/WorkingDirManager.java
index ade3192..7d08b08 100644
--- a/src/main/java/gov/nasa/ziggy/module/WorkingDirManager.java
+++ b/src/main/java/gov/nasa/ziggy/module/WorkingDirManager.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
@@ -9,6 +10,8 @@
 
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
@@ -42,8 +45,8 @@ private static File workingDir(String taskBaseName) {
         return new File(workingDirParent(), taskBaseName);
     }
 
-    public synchronized File allocateWorkingDir(PipelineTask pipelineTask, boolean cleanExisting)
-        throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public synchronized File allocateWorkingDir(PipelineTask pipelineTask, boolean cleanExisting) {
         File workingDir = new File(rootWorkingDir, pipelineTask.taskBaseName());
 
         if (workingDir.exists() && cleanExisting) {
@@ -53,9 +56,12 @@ public synchronized File allocateWorkingDir(PipelineTask pipelineTask, boolean c
         }
 
         log.info("Creating task working dir: " + workingDir);
-        FileUtils.forceMkdir(workingDir);
+        try {
+            FileUtils.forceMkdir(workingDir);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to create dir " + workingDir.toString(), e);
+        }
 
         return workingDir;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/hdf5/AbstractHdf5Array.java b/src/main/java/gov/nasa/ziggy/module/hdf5/AbstractHdf5Array.java
index af4774d..e41e5db 100644
--- a/src/main/java/gov/nasa/ziggy/module/hdf5/AbstractHdf5Array.java
+++ b/src/main/java/gov/nasa/ziggy/module/hdf5/AbstractHdf5Array.java
@@ -22,6 +22,8 @@
 import gov.nasa.ziggy.collections.ZiggyDataType;
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.parameters.ModuleParameters;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
 
@@ -135,6 +137,38 @@ public static boolean isEmpty(Object object) {
         return isEmpty;
     }
 
+    private static boolean isEmptyList(Object object) {
+        if (List.class.isAssignableFrom(object.getClass())) {
+            List<?> objList = (List<?>) object;
+            if (objList.isEmpty()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isEmptyHdf5Array(AbstractHdf5Array array) {
+
+        // Array is null or its contents are null.
+        // Array contents are an empty list.
+        if (array == null || array.getArrayObject() == null
+            || isEmptyList(array.getArrayObject())) {
+            return true;
+        }
+
+        // Array contents are an empty Java array.
+        if (array.getArrayObject().getClass().isArray()) {
+            long[] dims = array.getDimensions();
+            for (long dim : dims) {
+                if (dim == 0) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Populates an Hdf5Array with an array object. The resulting arrayObject member of the class is
      * guaranteed to be an array of an unboxed primitive type, String, Enum, or a Persistable class.
@@ -239,6 +273,7 @@ Class<?> getClassForEnumOrPersistable(Object arrayObject) {
      * @param field Field from a Persistable object that will ultimately contain the data.
      * @return The class of the data type that the field is designed to contain.
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     Class<?> getClassForEnumOrPersistable(Field field) {
         Class<?> clazz = field.getType();
         String typeName;
@@ -249,7 +284,9 @@ Class<?> getClassForEnumOrPersistable(Field field) {
             try {
                 clazz = Class.forName(typeName);
             } catch (ClassNotFoundException e) {
-                throw new PipelineException("Unable to determine class from name " + typeName, e);
+                // This can never occur. By construction the argument to forName() comes
+                // from an instance of Class that is available to the code.
+                throw new AssertionError(e);
             }
         }
         return getClassForEnumOrPersistable(clazz);
@@ -261,13 +298,15 @@ Class<?> getClassForEnumOrPersistable(Field field) {
      * @param clazz Class of the object or field
      * @return Specific Enum or Persistable class
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     Class<?> getClassForEnumOrPersistable(Class<?> clazz) {
         String className = clazz.getName();
         try {
             return Class.forName(truncateClassName(className));
         } catch (ClassNotFoundException e) {
-            throw new PipelineException(
-                "Unable to determine data class for object of class: " + className);
+            // This can never occur. By construction, the name used in the forName() call
+            // comes from the getName() of a class that's available.
+            throw new AssertionError(e);
         }
     }
 
@@ -360,7 +399,6 @@ protected void writeStringAttribute(long groupId, String attributeName, String a
         H5.H5Awrite(attributeId, ZIGGY_BYTE.getHdf5Type(), attributeValueBytes);
         H5.H5Aclose(attributeId);
         H5.H5Sclose(attributeSpace);
-
     }
 
     /**
@@ -385,7 +423,6 @@ protected String readStringAttribute(long groupId, String attributeName) {
         H5.H5Aclose(attributeId);
 
         return new String(attributeValueBytes, CHARSET);
-
     }
 
     /**
@@ -399,7 +436,6 @@ protected void writeFieldOrderAttribute(long groupId, int fieldOrder) {
         H5.H5Awrite(orderAttributeId, ZIGGY_INT.getHdf5Type(), new int[] { fieldOrder });
         H5.H5Aclose(orderAttributeId);
         H5.H5Sclose(orderAttributeSpace);
-
     }
 
     /**
@@ -531,5 +567,4 @@ public long[] next() {
             return Arrays.copyOf(currentLocation, currentLocation.length);
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/hdf5/Hdf5ModuleInterface.java b/src/main/java/gov/nasa/ziggy/module/hdf5/Hdf5ModuleInterface.java
index f8d2cf1..a6f154d 100644
--- a/src/main/java/gov/nasa/ziggy/module/hdf5/Hdf5ModuleInterface.java
+++ b/src/main/java/gov/nasa/ziggy/module/hdf5/Hdf5ModuleInterface.java
@@ -14,12 +14,9 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.collections.ZiggyDataType;
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.module.io.Persistable;
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
-import hdf.hdf5lib.exceptions.HDF5Exception;
-import hdf.hdf5lib.exceptions.HDF5LibraryException;
 
 /**
  * Handles conversion between Persistable data objects and HDF5 files. The latter are used for data
@@ -76,29 +73,17 @@ public class Hdf5ModuleInterface {
      * @param dataObject Persistable object
      */
     public void writeFile(File file, Persistable dataObject, boolean createGroupsForMissingFields) {
-        long fileId = 0;
-        try {
-
-            // limit the interface to use of HDF5 1.8 functionality, so that hopefully
-            // MATLAB can read files written from here
-            H5.H5Pset_libver_bounds(HDF5Constants.H5P_FILE_ACCESS_DEFAULT,
-                HDF5Constants.H5F_LIBVER_V18, HDF5Constants.H5F_LIBVER_V18);
-            fileId = H5.H5Fcreate(file.getAbsolutePath(), HDF5Constants.H5F_ACC_TRUNC, H5P_DEFAULT,
-                H5P_DEFAULT);
-        } catch (NullPointerException | HDF5Exception | IllegalArgumentException e) {
-            throw new PipelineException("Unable to create HDF5 file " + file.getName()
-                + " in directory " + file.getParent(), e);
-        }
+        // limit the interface to use of HDF5 1.8 functionality, so that hopefully
+        // MATLAB can read files written from here
+        H5.H5Pset_libver_bounds(HDF5Constants.H5P_FILE_ACCESS_DEFAULT, HDF5Constants.H5F_LIBVER_V18,
+            HDF5Constants.H5F_LIBVER_V18);
+        long fileId = H5.H5Fcreate(file.getAbsolutePath(), HDF5Constants.H5F_ACC_TRUNC, H5P_DEFAULT,
+            H5P_DEFAULT);
         AbstractHdf5Array hdf5Array = AbstractHdf5Array.newInstance(dataObject);
         hdf5Array.setCreateGroupsForMissingFields(createGroupsForMissingFields);
         hdf5Array.write(fileId, "/");
-        try {
-            testForUnclosedHdf5Objects(fileId);
-            H5.H5Fclose(fileId);
-        } catch (HDF5LibraryException e) {
-            throw new PipelineException("Unable to close HDF5 file " + file.getName()
-                + " in directory " + file.getParent() + ", HDF5 file ID " + fileId, e);
-        }
+        testForUnclosedHdf5Objects(fileId);
+        H5.H5Fclose(fileId);
     }
 
     /**
@@ -166,18 +151,13 @@ static long chunkAndDeflateProperty(long elementCount, long[] chunkSize) {
      */
     static void writeDataTypeAttribute(long fieldGroupId, ZiggyDataType ziggyDataType,
         String fieldName) {
-        try {
-            long dataTypeAttributeSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
-            long dataTypeAttributeId = H5.H5Acreate(fieldGroupId, FIELD_DATA_TYPE_ATT_NAME,
-                ZIGGY_INT.getHdf5Type(), dataTypeAttributeSpace, H5P_DEFAULT, H5P_DEFAULT);
-            H5.H5Awrite(dataTypeAttributeId, ZIGGY_INT.getHdf5Type(),
-                new int[] { ziggyDataType.getAttributeTypeInt() });
-            H5.H5Aclose(dataTypeAttributeId);
-            H5.H5Sclose(dataTypeAttributeSpace);
-        } catch (NullPointerException | HDF5Exception e) {
-            throw new PipelineException(
-                "Unable to create data type attribute for field " + fieldName, e);
-        }
+        long dataTypeAttributeSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
+        long dataTypeAttributeId = H5.H5Acreate(fieldGroupId, FIELD_DATA_TYPE_ATT_NAME,
+            ZIGGY_INT.getHdf5Type(), dataTypeAttributeSpace, H5P_DEFAULT, H5P_DEFAULT);
+        H5.H5Awrite(dataTypeAttributeId, ZIGGY_INT.getHdf5Type(),
+            new int[] { ziggyDataType.getAttributeTypeInt() });
+        H5.H5Aclose(dataTypeAttributeId);
+        H5.H5Sclose(dataTypeAttributeSpace);
     }
 
     static String getFieldName(String fieldName, long[] arrayLocation) {
@@ -201,39 +181,21 @@ static String getFieldName(String fieldName, long[] arrayLocation) {
      */
     public boolean readFile(File file, Persistable dataObject, boolean allowMissingFields) {
         long fileId;
-        try {
-            fileId = H5.H5Fopen(file.getAbsolutePath(), HDF5Constants.H5F_ACC_RDONLY, H5P_DEFAULT);
-        } catch (HDF5LibraryException | NullPointerException e) {
-            throw new PipelineException("Unable to open HDF5 file " + file.getName()
-                + " in directory " + file.getParent() + " for reading", e);
-        }
+        fileId = H5.H5Fopen(file.getAbsolutePath(), HDF5Constants.H5F_ACC_RDONLY, H5P_DEFAULT);
         AbstractHdf5Array hdf5Array = AbstractHdf5Array.newInstance(dataObject);
         hdf5Array.setAllowMissingFields(allowMissingFields);
         hdf5Array.read(fileId);
-        try {
-            testForUnclosedHdf5Objects(fileId);
-            H5.H5Fclose(fileId);
-        } catch (HDF5LibraryException e) {
-            throw new PipelineException(
-                "Unable to close HDF5 file " + file.getName() + " in directory " + file.getParent(),
-                e);
-        }
+        testForUnclosedHdf5Objects(fileId);
+        H5.H5Fclose(fileId);
         hdf5Array.isMissingFieldsDetected();
         return hdf5Array.isMissingFieldsDetected();
     }
 
     static ZiggyDataType readDataTypeAttribute(long fieldGroupId, String fieldName) {
-        ZiggyDataType ziggyDataType = null;
-        try {
-            long dataTypeAttributeId = H5.H5Aopen(fieldGroupId, FIELD_DATA_TYPE_ATT_NAME,
-                H5P_DEFAULT);
-            int[] dataTypeArray = new int[1];
-            H5.H5Aread(dataTypeAttributeId, ZIGGY_LONG.getHdf5Type(), dataTypeArray);
-            H5.H5Aclose(dataTypeAttributeId);
-            ziggyDataType = ZiggyDataType.getDataTypeFromAttributeTypeInt(dataTypeArray[0]);
-        } catch (NullPointerException | HDF5Exception e) {
-            throw new PipelineException("Unable to read HDF5 data type of field " + fieldName, e);
-        }
-        return ziggyDataType;
+        long dataTypeAttributeId = H5.H5Aopen(fieldGroupId, FIELD_DATA_TYPE_ATT_NAME, H5P_DEFAULT);
+        int[] dataTypeArray = new int[1];
+        H5.H5Aread(dataTypeAttributeId, ZIGGY_LONG.getHdf5Type(), dataTypeArray);
+        H5.H5Aclose(dataTypeAttributeId);
+        return ZiggyDataType.getDataTypeFromAttributeTypeInt(dataTypeArray[0]);
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/hdf5/ModuleParametersHdf5Array.java b/src/main/java/gov/nasa/ziggy/module/hdf5/ModuleParametersHdf5Array.java
index db86e82..0bd632e 100644
--- a/src/main/java/gov/nasa/ziggy/module/hdf5/ModuleParametersHdf5Array.java
+++ b/src/main/java/gov/nasa/ziggy/module/hdf5/ModuleParametersHdf5Array.java
@@ -11,9 +11,9 @@
 
 import gov.nasa.ziggy.collections.ZiggyArrayUtils;
 import gov.nasa.ziggy.collections.ZiggyDataType;
-import gov.nasa.ziggy.parameters.DefaultParameters;
 import gov.nasa.ziggy.parameters.ModuleParameters;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
@@ -28,9 +28,9 @@
  * be set. Ordinarily any Parameters class would be a scalar Persistable member of a class and so
  * the member name could be used, but ModuleParameters contains a List of Parameters instances
  * without any such member names.
- * <li>Members that are DefaultParameters instances require the name management but also need to
- * translate from the name-value-type TypedProperty instances stored in the DefaultParameters
- * instance to HDF5 groups and datasets formatted the way that the end-users expect them.
+ * <li>Members that are Parameters instances require the name management but also need to translate
+ * from the name-value-type TypedProperty instances stored in the Parameters instance to HDF5 groups
+ * and datasets formatted the way that the end-users expect them.
  * </ol>
  * Note that the Parameters classes must also store their fully-qualified class names in the HDF5
  * file, because the List&#60;Parameters&#62; in a Persistable instance doesn't tell HDF5 how to
@@ -90,7 +90,7 @@ public Object toJava() {
      * Classed parameter sets are written using the standard PersistableHdf5Array approach, but they
      * use the class simple name as the group name.
      * <p>
-     * DefaultParameters instances are written using the parameter set name as the group name, with
+     * Parameters instances are written using the parameter set name as the group name, with
      * whitespace replaced with underscores. The name-value pairs are written individually using the
      * standard PrimitiveHdf5Array approach.
      */
@@ -105,11 +105,11 @@ public List<Long> write(long fieldGroupId, String fieldName) {
         int parameterInstanceGroupCounter = 0;
         long parametersInstanceGroupId;
         ModuleParameters parametersObject = (ModuleParameters) arrayObject;
-        for (Parameters parametersInstance : parametersObject.getModuleParameters()) {
+        for (ParametersInterface parametersInstance : parametersObject.getModuleParameters()) {
 
             // first the easy case: a classed Parameters instance, all that needs to happen
             // is that the field name needs to be changed to the Java class simple name
-            if (!(parametersInstance instanceof DefaultParameters)) {
+            if (!parametersInstance.getClass().equals(Parameters.class)) {
                 AbstractHdf5Array hdf5Array = AbstractHdf5Array.newInstance(parametersInstance);
                 hdf5Array.setCreateGroupsForMissingFields(createGroupsForMissingFields);
                 hdf5Array.setFieldName(parametersInstance.getClass().getSimpleName());
@@ -117,36 +117,32 @@ public List<Long> write(long fieldGroupId, String fieldName) {
                     H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
                 subGroupIds.add(parametersInstanceGroupId);
                 subGroupIds.addAll(hdf5Array.write(parametersInstanceGroupId, fieldName));
-
             } else {
 
-                // DefaultParameters:
-                List<Long> defaultParametersSubGroups = writeDefaultParametersInstance(fieldGroupId,
-                    (DefaultParameters) parametersInstance);
-                parametersInstanceGroupId = defaultParametersSubGroups.get(0);
-                subGroupIds.addAll(defaultParametersSubGroups);
-
+                // Parameters:
+                List<Long> parametersSubGroups = writeParametersInstance(fieldGroupId,
+                    (Parameters) parametersInstance);
+                parametersInstanceGroupId = parametersSubGroups.get(0);
+                subGroupIds.addAll(parametersSubGroups);
             }
 
             writeFieldOrderAttribute(parametersInstanceGroupId, parameterInstanceGroupCounter);
             H5.H5Gclose(parametersInstanceGroupId);
 
             parameterInstanceGroupCounter++;
-
         }
 
         return subGroupIds;
     }
 
     /**
-     * Write an instance of DefaultParameters to HDF5. The instance is written in a way that will
-     * appear to an algorithm user as identical in structure to the way that a classed Parameters
-     * instance does (i.e., a collection of array groups, with 1 parameter per group).
+     * Write an instance of Parameters to HDF5. The instance is written in a way that will appear to
+     * an algorithm user as identical in structure to the way that a classed Parameters instance
+     * does (i.e., a collection of array groups, with 1 parameter per group).
      */
-    private List<Long> writeDefaultParametersInstance(long fieldGroupId,
-        DefaultParameters defaultParameters) {
+    private List<Long> writeParametersInstance(long fieldGroupId, Parameters parameters) {
         List<Long> subGroupIds = new ArrayList<>();
-        String parameterSetName = defaultParameters.getName();
+        String parameterSetName = parameters.getName();
 
         // We need a group name that is acceptable as a variable name in all the
         // languages Ziggy supports; get that by replacing spaces in the parameter
@@ -165,13 +161,12 @@ private List<Long> writeDefaultParametersInstance(long fieldGroupId,
         // loop over parameters and, for each one, convert it to a name-value pair and
         // write it as a primitive array subgroup
         int parameterGroupCounter = 0;
-        for (TypedParameter parameter : defaultParameters.getParameters()) {
+        for (TypedParameter parameter : parameters.getParameters()) {
             subGroupIds.addAll(
                 writeTypedProperty(parametersInstanceGroupId, parameter, parameterGroupCounter));
             parameterGroupCounter++;
         }
         return subGroupIds;
-
     }
 
     /**
@@ -214,7 +209,7 @@ private List<Long> writeTypedProperty(long parametersInstanceGroupId,
     public void read(long fieldGroupId) {
 
         ModuleParameters moduleParameters = new ModuleParameters();
-        List<Parameters> parameterSets = new ArrayList<>();
+        List<ParametersInterface> parameterSets = new ArrayList<>();
 
         // get all the groups under the field group
         Set<String> parameterSetNames = getSubgroupNames(fieldGroupId);
@@ -225,7 +220,7 @@ public void read(long fieldGroupId) {
         for (String parameterSetName : parameterSetNames) {
 
             long parameterSetGroupId = H5.H5Gopen(fieldGroupId, parameterSetName, H5P_DEFAULT);
-            // check for an original parameter set name, which indicates a DefaultParameters
+            // check for an original parameter set name, which indicates a Parameters
             // instance
             if (!H5.H5Aexists(parameterSetGroupId,
                 Hdf5ModuleInterface.PARAMETER_SET_ORIGINAL_NAME_ATT_NAME)) {
@@ -238,29 +233,29 @@ public void read(long fieldGroupId) {
                 persistableHdf5Array.read(parameterSetGroupId);
                 missingFieldsDetected = missingFieldsDetected
                     || persistableHdf5Array.isMissingFieldsDetected();
-                parameterSets.add((Parameters) persistableHdf5Array.toJava());
+                parameterSets.add((ParametersInterface) persistableHdf5Array.toJava());
             } else {
 
-                // DefaultParameters instances are more complicated
-                DefaultParameters defaultParameters = new DefaultParameters();
-                Set<TypedParameter> parameters = new HashSet<>();
-                defaultParameters.setName(readStringAttribute(parameterSetGroupId,
+                // Parameters instances are more complicated.
+                Set<TypedParameter> typedParameters = new HashSet<>();
+                Parameters parameters = new Parameters();
+                parameters.setName(readStringAttribute(parameterSetGroupId,
                     Hdf5ModuleInterface.PARAMETER_SET_ORIGINAL_NAME_ATT_NAME));
                 Set<String> parameterNames = getSubgroupNames(parameterSetGroupId);
                 for (String parameterName : parameterNames) {
                     long parameterGroupId = H5.H5Gopen(parameterSetGroupId, parameterName,
                         H5P_DEFAULT);
                     PrimitiveHdf5Array primitiveHdf5Array = PrimitiveHdf5Array
-                        .forReadingDefaultParameters(parameterGroupId, parameterName);
+                        .forReadingParameters(parameterGroupId, parameterName);
                     primitiveHdf5Array.read(parameterGroupId);
                     boolean scalar = H5.H5Aexists(parameterGroupId,
                         Hdf5ModuleInterface.SCALAR_PARAMETER_ATT_NAME);
                     H5.H5Gclose(parameterGroupId);
                     Object javaArray = primitiveHdf5Array.toJava();
-                    parameters.add(toTypedParameter(javaArray, parameterName, scalar));
+                    typedParameters.add(toTypedParameter(javaArray, parameterName, scalar));
                 }
-                defaultParameters.setParameters(parameters);
-                parameterSets.add(defaultParameters);
+                parameters.setParameters(typedParameters);
+                parameterSets.add(parameters);
                 H5.H5Gclose(parameterSetGroupId);
             }
         } // end loop over parameter sets
@@ -314,5 +309,4 @@ TypedParameter toTypedParameter(Object arrayObject, String name, boolean scalar)
     public ZiggyDataType getDataTypeToSave() {
         return ZiggyDataType.ZIGGY_PERSISTABLE;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/hdf5/PersistableHdf5Array.java b/src/main/java/gov/nasa/ziggy/module/hdf5/PersistableHdf5Array.java
index 8cbb4a3..c08a9d0 100644
--- a/src/main/java/gov/nasa/ziggy/module/hdf5/PersistableHdf5Array.java
+++ b/src/main/java/gov/nasa/ziggy/module/hdf5/PersistableHdf5Array.java
@@ -1,5 +1,6 @@
 package gov.nasa.ziggy.module.hdf5;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static gov.nasa.ziggy.collections.ZiggyDataType.ZIGGY_BYTE;
 import static gov.nasa.ziggy.collections.ZiggyDataType.ZIGGY_LONG;
 import static gov.nasa.ziggy.collections.ZiggyDataType.getDataType;
@@ -14,21 +15,25 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import gov.nasa.ziggy.collections.ZiggyArrayUtils;
 import gov.nasa.ziggy.collections.ZiggyDataType;
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.module.io.Persistable;
 import gov.nasa.ziggy.module.io.ProxyIgnore;
-import gov.nasa.ziggy.parameters.DefaultParameters;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.ReflectionUtils;
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
-import hdf.hdf5lib.exceptions.HDF5Exception;
-import hdf.hdf5lib.exceptions.HDF5LibraryException;
 
 public class PersistableHdf5Array extends AbstractHdf5Array {
 
+    private static final Logger log = LoggerFactory.getLogger(PersistableHdf5Array.class);
+
     static final PersistableHdf5Array forReadingModuleParameterSet() {
         PersistableHdf5Array p = new PersistableHdf5Array();
         p.returnAs = ReturnAs.SCALAR;
@@ -61,7 +66,7 @@ static final PersistableHdf5Array forReadingModuleParameterSet() {
      * only the {@link forReadingModuleParameterSet} static method can use it.
      */
     private PersistableHdf5Array() {
-        super(new DefaultParameters());
+        super(new Parameters());
     }
 
     /**
@@ -180,7 +185,6 @@ public Object toJava() {
             javaStorageObject = Array.newInstance(auxiliaryClass, 0);
         }
         return javaStorageObject;
-
     }
 
     /**
@@ -274,7 +278,9 @@ Object constructFullArray(long[] dimensions) {
      * @return An array of the appropriate class and dimension (i.e., array[], array[][], etc) in
      * which all the array members are null (i.e., not populated with lower-level arrays).
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     Object constructArray(int nDims, int length) {
+        checkArgument(length >= 0, "array length");
 
         // determine the array class
         String arrayClass = arrayClassToConstruct(nDims);
@@ -283,7 +289,9 @@ Object constructArray(int nDims, int length) {
         try {
             return Array.newInstance(Class.forName(arrayClass), length);
         } catch (NegativeArraySizeException | ClassNotFoundException e) {
-            throw new PipelineException("Unable to instantiate array of class " + arrayClass, e);
+            // This can never occur. By construction, the class for the array is always
+            // available and the size is never negative.
+            throw new AssertionError(e);
         }
     }
 
@@ -322,6 +330,7 @@ String arrayClassToConstruct(int nDims) {
      * @return List of additional groups created during the write of this object *(typically these
      * come from writing objects that are members of the dataObject)
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     List<Long> writePersistableScalarObject(long fileId, String groupName) {
 
         Persistable[] dataObjectAsPersistableArray = (Persistable[]) getArrayObject();
@@ -343,60 +352,62 @@ List<Long> writePersistableScalarObject(long fileId, String groupName) {
             }
             field.setAccessible(true);
 
-            try {
-                // every field gets its own group, with a group order attribute
-
-                // convert the field's contents to an appropriate HDF5 array object
-                AbstractHdf5Array persistableField = AbstractHdf5Array
-                    .newInstance(field.get(dataObject));
-                if (!createGroupsForMissingFields
-                    && (persistableField == null || persistableField.getArrayObject() == null)) {
-                    continue;
-                }
-                if (persistableField != null) {
-                    persistableField
-                        .setCreateGroupsForMissingFields(isCreateGroupsForMissingFields());
-                }
+            // every field gets its own group, with a group order attribute
 
-                long fieldGroupId = H5.H5Gcreate(fileId, field.getName(), H5P_DEFAULT, H5P_DEFAULT,
-                    H5P_DEFAULT);
-                groupIds.add(fieldGroupId);
-                writeFieldOrderAttribute(fieldGroupId, iField);
-                iField++;
+            // convert the field's contents to an appropriate HDF5 array object
+            AbstractHdf5Array persistableField;
+            try {
+                persistableField = AbstractHdf5Array.newInstance(field.get(dataObject));
+            } catch (IllegalAccessException e) {
+                // This can never occur. We set the field to be accessible prior
+                // to this attempt call get() on it.
+                throw new AssertionError(e);
+            }
+            if (!createGroupsForMissingFields && isEmptyHdf5Array(persistableField)) {
+                log.debug("Not creating group for empty field {} in class {}", field.getName(),
+                    clazz.getName());
+                continue;
+            }
+            if (persistableField != null) {
+                persistableField.setCreateGroupsForMissingFields(isCreateGroupsForMissingFields());
+            }
 
-                // If this is an empty field, but we were instructed to create a group
-                // for it, mark it as empty and move on
-
-                if (persistableField == null || persistableField.getArrayObject() == null) {
-                    long orderAttributeSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
-                    long orderAttributeId = H5.H5Acreate(fieldGroupId,
-                        Hdf5ModuleInterface.EMPTY_FIELD_ATT_NAME, ZIGGY_BYTE.getHdf5Type(),
-                        orderAttributeSpace, H5P_DEFAULT, H5P_DEFAULT);
-                    H5.H5Aclose(orderAttributeId);
-                    H5.H5Sclose(orderAttributeSpace);
-                    H5.H5Gclose(fieldGroupId);
-                    continue;
-                }
+            long fieldGroupId = H5.H5Gcreate(fileId, field.getName(), H5P_DEFAULT, H5P_DEFAULT,
+                H5P_DEFAULT);
+            groupIds.add(fieldGroupId);
+            writeFieldOrderAttribute(fieldGroupId, iField);
+            iField++;
+
+            // If this is an empty field, but we were instructed to create a group
+            // for it, mark it as empty and move on
+
+            if (isEmptyHdf5Array(persistableField)) {
+                log.debug("Creating group for empty field {} in class {}", field.getName(),
+                    clazz.getName());
+                long orderAttributeSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
+                long orderAttributeId = H5.H5Acreate(fieldGroupId,
+                    Hdf5ModuleInterface.EMPTY_FIELD_ATT_NAME, ZIGGY_BYTE.getHdf5Type(),
+                    orderAttributeSpace, H5P_DEFAULT, H5P_DEFAULT);
+                H5.H5Aclose(orderAttributeId);
+                H5.H5Sclose(orderAttributeSpace);
+                H5.H5Gclose(fieldGroupId);
+                continue;
+            }
 
-                // add an attribute that contains the data type that will be
-                // contained in the group, because I'm tired of trying to infer
-                // it from the peculiar way that HDF5 stores data type information
+            // add an attribute that contains the data type that will be
+            // contained in the group, because I'm tired of trying to infer
+            // it from the peculiar way that HDF5 stores data type information
 
-                Hdf5ModuleInterface.writeDataTypeAttribute(fieldGroupId,
-                    persistableField.getDataTypeToSave(), field.getName());
+            Hdf5ModuleInterface.writeDataTypeAttribute(fieldGroupId,
+                persistableField.getDataTypeToSave(), field.getName());
 
-                // Use the HDF5 array's write method
+            // Use the HDF5 array's write method
 
-                if (persistableField != null) {
-                    List<Long> newGroupIds = persistableField.write(fieldGroupId, field.getName());
-                    groupIds.addAll(newGroupIds);
-                }
-                H5.H5Gclose(fieldGroupId);
-            } catch (NullPointerException | HDF5Exception | IllegalArgumentException
-                | IllegalAccessException e) {
-                throw new PipelineException(
-                    "Unable to write Persistable scalar " + field.getName() + " to HDF5 group", e);
+            if (persistableField != null) {
+                List<Long> newGroupIds = persistableField.write(fieldGroupId, field.getName());
+                groupIds.addAll(newGroupIds);
             }
+            H5.H5Gclose(fieldGroupId);
         } // end of loop over fields
 
         return groupIds;
@@ -413,78 +424,72 @@ public void setParameterClassNameAttribute(long groupId, Class<?> clazz) {
     @Override
     public List<Long> write(long fieldGroupId, String fieldName) {
         List<Long> subGroupIds = new ArrayList<>();
-        try {
-
-            // If this is a scalar object, then we can simply call the scalar
-            // object writer
-
-            if (isScalar()) {
-                subGroupIds = writePersistableScalarObject(fieldGroupId, fieldName);
-
-                // If the fields of the Persistable class are all primitive scalar,
-                // use the specialized code that writes them as parallel arrays
-            } else if (areAllFieldsPrimitiveScalar()) {
-
-                // add the parallel array attribute to the group so that downstream
-                // users know how to reconstruct this
-                long scalarSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
-                long parallelArrayAttribute = H5.H5Acreate(fieldGroupId,
-                    Hdf5ModuleInterface.PARALLEL_ARRAY_ATT_NAME, ZIGGY_BYTE.getHdf5Type(),
-                    scalarSpace, H5P_DEFAULT, H5P_DEFAULT);
-                H5.H5Aclose(parallelArrayAttribute);
-                H5.H5Sclose(scalarSpace);
-
-                // get the parallel primitive arrays from the Persistable array
-                List<PrimitiveHdf5Array> parallelArrays = toParallelArrays();
-
-                // write them to the HDF5 file
-                int iField = 0;
-                for (PrimitiveHdf5Array primitiveArray : parallelArrays) {
-                    long subGroupId = H5.H5Gcreate(fieldGroupId, primitiveArray.getFieldName(),
-                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-                    writeFieldOrderAttribute(subGroupId, iField);
-                    iField++;
-                    Hdf5ModuleInterface.writeDataTypeAttribute(subGroupId,
-                        primitiveArray.getDataTypeToSave(), primitiveArray.getFieldName());
-                    primitiveArray.write(subGroupId, primitiveArray.getFieldName());
-                    H5.H5Gclose(subGroupId);
-                    subGroupIds.add(subGroupId);
-                }
-            } else {
 
-                // if we're here then it's an array of unknown dimension, and
-                // needs to be written, with each object in its own sub-group of
-                // the main group for the array. We also need to
-                // tell future users that this group is the top of an object
-                // array
-
-                long scalarSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
-                long objectArrayAttribute = H5.H5Acreate(fieldGroupId,
-                    Hdf5ModuleInterface.OBJECT_ARRAY_ATT_NAME, ZIGGY_BYTE.getHdf5Type(),
-                    scalarSpace, H5P_DEFAULT, H5P_DEFAULT);
-                H5.H5Aclose(objectArrayAttribute);
-                H5.H5Sclose(scalarSpace);
-
-                // add an attribute that allows Java to know in advance the
-                // size and shape of the array
-
-                long[] persistableArrayDims = getDimensions();
-
-                long arraySpace = H5.H5Screate_simple(1, new long[] { persistableArrayDims.length },
-                    null);
-                long objectArrayDimsAttribute = H5.H5Acreate(fieldGroupId,
-                    Hdf5ModuleInterface.OBJECT_ARRAY_DIMS_ATT_NAME, ZIGGY_LONG.getHdf5Type(),
-                    arraySpace, H5P_DEFAULT, H5P_DEFAULT);
-                H5.H5Awrite(objectArrayDimsAttribute, ZIGGY_LONG.getHdf5Type(),
-                    persistableArrayDims);
-                H5.H5Aclose(objectArrayDimsAttribute);
-                H5.H5Sclose(arraySpace);
-
-                subGroupIds = writePersistableArray(fieldGroupId, fieldName);
+        // If this is a scalar object, then we can simply call the scalar
+        // object writer
+
+        if (isScalar()) {
+            subGroupIds = writePersistableScalarObject(fieldGroupId, fieldName);
+
+            // If the fields of the Persistable class are all primitive scalar,
+            // use the specialized code that writes them as parallel arrays
+        } else if (areAllFieldsPrimitiveScalar()) {
+
+            // add the parallel array attribute to the group so that downstream
+            // users know how to reconstruct this
+            long scalarSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
+            long parallelArrayAttribute = H5.H5Acreate(fieldGroupId,
+                Hdf5ModuleInterface.PARALLEL_ARRAY_ATT_NAME, ZIGGY_BYTE.getHdf5Type(), scalarSpace,
+                H5P_DEFAULT, H5P_DEFAULT);
+            H5.H5Aclose(parallelArrayAttribute);
+            H5.H5Sclose(scalarSpace);
+
+            // get the parallel primitive arrays from the Persistable array
+            List<PrimitiveHdf5Array> parallelArrays = toParallelArrays();
+
+            // write them to the HDF5 file
+            int iField = 0;
+            for (PrimitiveHdf5Array primitiveArray : parallelArrays) {
+                long subGroupId = H5.H5Gcreate(fieldGroupId, primitiveArray.getFieldName(),
+                    H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+                writeFieldOrderAttribute(subGroupId, iField);
+                iField++;
+                Hdf5ModuleInterface.writeDataTypeAttribute(subGroupId,
+                    primitiveArray.getDataTypeToSave(), primitiveArray.getFieldName());
+                primitiveArray.write(subGroupId, primitiveArray.getFieldName());
+                H5.H5Gclose(subGroupId);
+                subGroupIds.add(subGroupId);
             }
-        } catch (NullPointerException | IllegalArgumentException | HDF5Exception e) {
-            throw new PipelineException(
-                "Unable to write Persistable object/array " + fieldName + " to HDF5 group", e);
+        } else {
+
+            // if we're here then it's an array of unknown dimension, and
+            // needs to be written, with each object in its own sub-group of
+            // the main group for the array. We also need to
+            // tell future users that this group is the top of an object
+            // array
+
+            long scalarSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
+            long objectArrayAttribute = H5.H5Acreate(fieldGroupId,
+                Hdf5ModuleInterface.OBJECT_ARRAY_ATT_NAME, ZIGGY_BYTE.getHdf5Type(), scalarSpace,
+                H5P_DEFAULT, H5P_DEFAULT);
+            H5.H5Aclose(objectArrayAttribute);
+            H5.H5Sclose(scalarSpace);
+
+            // add an attribute that allows Java to know in advance the
+            // size and shape of the array
+
+            long[] persistableArrayDims = getDimensions();
+
+            long arraySpace = H5.H5Screate_simple(1, new long[] { persistableArrayDims.length },
+                null);
+            long objectArrayDimsAttribute = H5.H5Acreate(fieldGroupId,
+                Hdf5ModuleInterface.OBJECT_ARRAY_DIMS_ATT_NAME, ZIGGY_LONG.getHdf5Type(),
+                arraySpace, H5P_DEFAULT, H5P_DEFAULT);
+            H5.H5Awrite(objectArrayDimsAttribute, ZIGGY_LONG.getHdf5Type(), persistableArrayDims);
+            H5.H5Aclose(objectArrayDimsAttribute);
+            H5.H5Sclose(arraySpace);
+
+            subGroupIds = writePersistableArray(fieldGroupId, fieldName);
         }
         return subGroupIds;
     }
@@ -496,21 +501,17 @@ List<Long> writePersistableArray(long fieldGroupId, String fieldName) {
         while (arrayLocation != null) {
 
             String newFieldName = Hdf5ModuleInterface.getFieldName(fieldName, arrayLocation);
-            try {
-                // create the new group
-                long subGroupId = H5.H5Gcreate(fieldGroupId, newFieldName, H5P_DEFAULT, H5P_DEFAULT,
-                    H5P_DEFAULT);
-                subGroupIds.add(subGroupId);
-                PersistableHdf5Array persistableObject = new PersistableHdf5Array(
-                    getArrayMember(arrayLocation));
-                subGroupIds.addAll(persistableObject.write(subGroupId, newFieldName));
-
-                H5.H5Gclose(subGroupId);
-                arrayLocation = nextArrayLocation();
-            } catch (NullPointerException | IllegalArgumentException | HDF5Exception e) {
-                throw new PipelineException(
-                    "Unable to write Persistable object " + newFieldName + " to HDF5 group", e);
-            }
+            // create the new group
+            long subGroupId = H5.H5Gcreate(fieldGroupId, newFieldName, H5P_DEFAULT, H5P_DEFAULT,
+                H5P_DEFAULT);
+            subGroupIds.add(subGroupId);
+            PersistableHdf5Array persistableObject = new PersistableHdf5Array(
+                getArrayMember(arrayLocation));
+            persistableObject.setCreateGroupsForMissingFields(isCreateGroupsForMissingFields());
+            subGroupIds.addAll(persistableObject.write(subGroupId, newFieldName));
+
+            H5.H5Gclose(subGroupId);
+            arrayLocation = nextArrayLocation();
         }
         return subGroupIds;
     }
@@ -535,6 +536,7 @@ long openGroupIfPresent(long fileId, String groupName) {
      *
      * @param fileId The HDF5 group that contains the data for the object.
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     void readPersistableScalarObject(long fileId) {
 
         Object[] dataArray = (Object[]) arrayObject;
@@ -569,33 +571,26 @@ void readPersistableScalarObject(long fileId) {
             missingFieldsDetected = missingFieldsDetected || persistableField.missingFieldsDetected;
             try {
                 field.set(dataObject, persistableField.toJava());
-            } catch (IllegalArgumentException | IllegalAccessException e1) {
-                throw new PipelineException("Unable to set field " + field.getName(), e1);
+            } catch (IllegalAccessException e) {
+                // This can never occur. The field was set to accessible earlier in this
+                // method.
+                throw new AssertionError(e);
             }
-            try {
-                H5.H5Gclose(fieldGroupId);
-            } catch (HDF5LibraryException e) {
-                throw new PipelineException("Unable to close HDF5 group " + field.getName(), e);
-            }
-
+            H5.H5Gclose(fieldGroupId);
         }
     }
 
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     public void read(long fieldGroupId) {
         // If the return is an empty field, detect and handle that now
 
         boolean hasArrayDimsAttribute;
-        try {
-            if (H5.H5Aexists(fieldGroupId, Hdf5ModuleInterface.EMPTY_FIELD_ATT_NAME)) {
-                return;
-            }
-            hasArrayDimsAttribute = H5.H5Aexists(fieldGroupId,
-                Hdf5ModuleInterface.OBJECT_ARRAY_DIMS_ATT_NAME);
-        } catch (HDF5LibraryException | NullPointerException e1) {
-            throw new PipelineException(
-                "HDF5 error occurred attempting to detect empty field attribute", e1);
+        if (H5.H5Aexists(fieldGroupId, Hdf5ModuleInterface.EMPTY_FIELD_ATT_NAME)) {
+            return;
         }
+        hasArrayDimsAttribute = H5.H5Aexists(fieldGroupId,
+            Hdf5ModuleInterface.OBJECT_ARRAY_DIMS_ATT_NAME);
         if (!hasArrayDimsAttribute
             && (getReturnAs() == null || getReturnAs() == ReturnAs.UNKNOWN)) {
             returnAs = ReturnAs.SCALAR;
@@ -606,11 +601,12 @@ public void read(long fieldGroupId) {
             String parameterClassName = getParameterClassNameFromAttribute(fieldGroupId);
             try {
                 auxiliaryClass = Class.forName(parameterClassName);
-                setArray(newPersistableObject());
             } catch (ClassNotFoundException e) {
-                throw new PipelineException(
-                    "Unable to create Class object for class:" + parameterClassName, e);
+                // This can never occur. By construction the name of the class is available
+                // to Java.
+                throw new AssertionError(e);
             }
+            setArray(newPersistableObject());
         }
 
         // we must first check to see whether the HDF5 object is a scalar object with
@@ -639,63 +635,56 @@ public void read(long fieldGroupId) {
 
             // convert the parallel arrays into the array of Persistable objects
             forParallelArrays(allFields, primitiveHdf5Arrays);
-
         } else if (getReturnAs().equals(ReturnAs.SCALAR) || !hasArrayDimsAttribute) {
             if (arrayObject == null) {
                 setDimensions(new long[] { 1 });
                 setArrayMember(newPersistableObject(), new long[] { 0 });
             }
             readPersistableScalarObject(fieldGroupId);
-
         } else {
             // array, so slightly different activity:
 
-            try {
-                // get the dimensions
-                long attributeId = H5.H5Aopen(fieldGroupId,
-                    Hdf5ModuleInterface.OBJECT_ARRAY_DIMS_ATT_NAME, H5P_DEFAULT);
-                long dataSpaceId = H5.H5Aget_space(attributeId);
-                int nDims = H5.H5Sget_simple_extent_ndims(dataSpaceId);
-                long[] dims = new long[nDims];
-                long[] maxDims = new long[nDims];
-                H5.H5Sget_simple_extent_dims(dataSpaceId, dims, maxDims);
-                long[] persistableDims = new long[(int) dims[0]];
-                H5.H5Aread(attributeId, ZIGGY_LONG.getHdf5Type(), persistableDims);
-                H5.H5Sclose(dataSpaceId);
-                H5.H5Aclose(attributeId);
-
-                // Note that the group can be present, but the contents can be
-                // null! This is the case if the writing application's equivalent
-                // of createGroupsForMissingFields is set to true. Handle that
-                // case now
-                if (H5.H5Aexists(fieldGroupId, Hdf5ModuleInterface.EMPTY_FIELD_ATT_NAME)) {
-                    return;
-                }
+            // get the dimensions
+            long attributeId = H5.H5Aopen(fieldGroupId,
+                Hdf5ModuleInterface.OBJECT_ARRAY_DIMS_ATT_NAME, H5P_DEFAULT);
+            long dataSpaceId = H5.H5Aget_space(attributeId);
+            int nDims = H5.H5Sget_simple_extent_ndims(dataSpaceId);
+            long[] dims = new long[nDims];
+            long[] maxDims = new long[nDims];
+            H5.H5Sget_simple_extent_dims(dataSpaceId, dims, maxDims);
+            long[] persistableDims = new long[(int) dims[0]];
+            H5.H5Aread(attributeId, ZIGGY_LONG.getHdf5Type(), persistableDims);
+            H5.H5Sclose(dataSpaceId);
+            H5.H5Aclose(attributeId);
+
+            // Note that the group can be present, but the contents can be
+            // null! This is the case if the writing application's equivalent
+            // of createGroupsForMissingFields is set to true. Handle that
+            // case now
+            if (H5.H5Aexists(fieldGroupId, Hdf5ModuleInterface.EMPTY_FIELD_ATT_NAME)) {
+                return;
+            }
+
+            // set the dimensions and build the array
+            setDimensions(persistableDims);
 
-                // set the dimensions and build the array
-                setDimensions(persistableDims);
-
-                // iterate over array members
-                long[] location = nextArrayLocation();
-                while (location != null) {
-                    String arrayFieldName = Hdf5ModuleInterface.getFieldName(fieldName, location);
-                    long subGroupId = openGroupIfPresent(fieldGroupId, arrayFieldName);
-                    Object newObject = null;
-                    if (H5.H5Aexists(subGroupId,
-                        Hdf5ModuleInterface.PARAMETER_CLASS_NAME_ATT_NAME)) {
-                        String parameterClassName = getParameterClassNameFromAttribute(subGroupId);
-                        newObject = newPersistableObject(parameterClassName);
-                    } else {
-                        newObject = newPersistableObject();
-                    }
-                    PersistableHdf5Array newArray = new PersistableHdf5Array(newObject);
-                    newArray.readPersistableScalarObject(subGroupId);
-                    setArrayMember(newObject, location);
-                    location = nextArrayLocation();
+            // iterate over array members
+            long[] location = nextArrayLocation();
+            while (location != null) {
+                String arrayFieldName = Hdf5ModuleInterface.getFieldName(fieldName, location);
+                long subGroupId = openGroupIfPresent(fieldGroupId, arrayFieldName);
+                Object newObject = null;
+                if (H5.H5Aexists(subGroupId, Hdf5ModuleInterface.PARAMETER_CLASS_NAME_ATT_NAME)) {
+                    String parameterClassName = getParameterClassNameFromAttribute(subGroupId);
+                    newObject = newPersistableObject(parameterClassName);
+                } else {
+                    newObject = newPersistableObject();
                 }
-            } catch (NullPointerException | HDF5Exception e) {
-                throw new PipelineException("Unable to read field " + getFieldName() + " from HDF5",
-                    e);
+                PersistableHdf5Array newArray = new PersistableHdf5Array(newObject);
+                newArray.readPersistableScalarObject(subGroupId);
+                H5.H5Gclose(subGroupId);
+                setArrayMember(newObject, location);
+                location = nextArrayLocation();
             }
         }
     }
@@ -718,18 +707,18 @@ Object newPersistableObject() {
      * Returns a new instance of a class given its Class object. This signature is used when it is
      * necessary to return an instance of a Parameters class.
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     Object newPersistableObject(String className) {
         try {
             Constructor<?> constructor = Class.forName(className).getDeclaredConstructor();
             constructor.setAccessible(true);
             return constructor.newInstance();
-        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException
-            | SecurityException | IllegalArgumentException | InvocationTargetException
-            | ClassNotFoundException e) {
-            throw new PipelineException("Unable to instantiate new object of class " + className,
-                e);
+        } catch (ClassNotFoundException | NoSuchMethodException | SecurityException
+            | InstantiationException | IllegalAccessException | IllegalArgumentException
+            | InvocationTargetException e) {
+            // This can never occur. By construction, the class has a default constructor.
+            throw new AssertionError(e);
         }
-
     }
 
     /**
@@ -744,6 +733,7 @@ Object newPersistableObject(String className) {
      * @return List of PrimitiveHdf5Array objects that contain the contents of the Persistable
      * object array.
      */
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     List<PrimitiveHdf5Array> toParallelArrays() {
         if (!allFieldsPrimitiveScalar) {
             throw new PipelineException("Cannot convert array of objects of class "
@@ -772,9 +762,12 @@ List<PrimitiveHdf5Array> toParallelArrays() {
                 Field field = allFields.get(i);
                 PrimitiveHdf5Array primitiveArray = primitiveArrays.get(i);
                 try {
+                    field.setAccessible(true);
                     primitiveArray.setArrayMember(field.get(arrayMember), location);
-                } catch (IllegalArgumentException | IllegalAccessException e) {
-                    throw new PipelineException("Unable to convert to parallel arrays", e);
+                } catch (IllegalAccessException e) {
+                    // This can never occur. The field was set to accessible before the
+                    // get() was called.
+                    throw new AssertionError(e);
                 }
             }
         }
@@ -782,6 +775,7 @@ List<PrimitiveHdf5Array> toParallelArrays() {
         return primitiveArrays;
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     void forParallelArrays(List<Field> allFields, List<PrimitiveHdf5Array> primitiveArrays) {
 
         // set dimensions
@@ -805,9 +799,10 @@ void forParallelArrays(List<Field> allFields, List<PrimitiveHdf5Array> primitive
                 Object value = primitiveArrays.get(i).getArrayMember(location);
                 try {
                     field.set(newObject, value);
-                } catch (IllegalArgumentException | IllegalAccessException e) {
-                    throw new PipelineException(
-                        "Unable to set field " + field.getName() + " to value " + value, e);
+                } catch (IllegalAccessException e) {
+                    // This can never occur. The field was set to accessible earlier
+                    // in this same method.
+                    throw new AssertionError(e);
                 }
             }
 
@@ -824,5 +819,4 @@ public ZiggyDataType getDataTypeToSave() {
     public boolean areAllFieldsPrimitiveScalar() {
         return allFieldsPrimitiveScalar;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/hdf5/PrimitiveHdf5Array.java b/src/main/java/gov/nasa/ziggy/module/hdf5/PrimitiveHdf5Array.java
index c05a274..b33268b 100644
--- a/src/main/java/gov/nasa/ziggy/module/hdf5/PrimitiveHdf5Array.java
+++ b/src/main/java/gov/nasa/ziggy/module/hdf5/PrimitiveHdf5Array.java
@@ -26,8 +26,6 @@
 import gov.nasa.ziggy.module.PipelineException;
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
-import hdf.hdf5lib.exceptions.HDF5Exception;
-import hdf.hdf5lib.exceptions.HDF5LibraryException;
 
 /**
  * Main class that provides impedance matching as needed between Java storage of numeric, string,
@@ -40,13 +38,13 @@
 public class PrimitiveHdf5Array extends AbstractHdf5Array {
 
     /**
-     * Constructs a PrimitiveHdf5Array that is optimized for reading the contents of a
-     * DefaultParameters parameter.
+     * Constructs a PrimitiveHdf5Array that is optimized for reading the contents of a Parameters
+     * parameter.
      *
      * @param groupId HDF5 group of the parameter.
      * @param fieldName Name of the HDF5 group.
      */
-    static final PrimitiveHdf5Array forReadingDefaultParameters(long groupId, String fieldName) {
+    static final PrimitiveHdf5Array forReadingParameters(long groupId, String fieldName) {
         PrimitiveHdf5Array p = new PrimitiveHdf5Array();
         p.returnAs = ReturnAs.ARRAY;
         p.fieldName = fieldName;
@@ -290,9 +288,9 @@ Object returnEmptyToJava() {
         Object emptyReturn = null;
 
         if (returnAs.equals(ReturnAs.SCALAR)) {
-            if ((dataTypeOfReturn == ZiggyDataType.ZIGGY_STRING
-                || dataTypeOfReturn == ZiggyDataType.ZIGGY_ENUM)
-                || (dataTypeOfReturn == ZiggyDataType.ZIGGY_CHAR)) {
+            if (dataTypeOfReturn == ZiggyDataType.ZIGGY_STRING
+                || dataTypeOfReturn == ZiggyDataType.ZIGGY_ENUM
+                || dataTypeOfReturn == ZiggyDataType.ZIGGY_CHAR) {
                 emptyReturn = null;
             } else {
                 emptyReturn = dataTypeOfReturn.boxedZero();
@@ -380,7 +378,6 @@ Object convertToPrimitiveArray(Object arrayObject) {
             convertedObject = ZiggyArrayUtils.unbox(convertedObject);
         }
         return convertedObject;
-
     }
 
     public ZiggyDataType getDataTypeOfReturn() {
@@ -408,86 +405,77 @@ public List<Long> write(long fieldGroupId, String fieldName) {
             nElements *= iSize;
         }
 
-        try {
-            // create data space
-            long dataSpace = H5.H5Screate_simple(arraySize.length, arraySize, null);
+        // create data space
+        long dataSpace = H5.H5Screate_simple(arraySize.length, arraySize, null);
+
+        // set up compression if desired
+        long deflateProperty;
+
+        // if the array was originally a boolean array, but is now logical,
+        // we need to create an attribute that signals this to future users
+        // of the data
+        if (getHdf5DataType() == ZIGGY_BOOLEAN) {
+            long scalarSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
+            long logicalAttribute = H5.H5Acreate(fieldGroupId,
+                Hdf5ModuleInterface.BOOLEAN_ARRAY_ATT_NAME, ZIGGY_BYTE.getHdf5Type(), scalarSpace,
+                H5P_DEFAULT, H5P_DEFAULT);
+            H5.H5Aclose(logicalAttribute);
+            H5.H5Sclose(scalarSpace);
+        }
 
-            // set up compression if desired
-            long deflateProperty;
+        // set the data type
+        long dataType = getDataTypeToSave().getHdf5Type();
 
-            // if the array was originally a boolean array, but is now logical,
-            // we need to create an attribute that signals this to future users
-            // of the data
-            if (getHdf5DataType() == ZIGGY_BOOLEAN) {
+        // if this is a string array, there is considerable special preparation
+        // that needs to be made: we need to create a variable-length datatype,
+        // note whether the original data came from a string array
+
+        if (getDataTypeToSave() == ZIGGY_STRING) {
+            dataType = H5.H5Tcopy(ZIGGY_STRING.getHdf5Type());
+            H5.H5Tset_size(dataType, HDF5Constants.H5T_VARIABLE);
+            if (!isScalar()) {
                 long scalarSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
-                long logicalAttribute = H5.H5Acreate(fieldGroupId,
-                    Hdf5ModuleInterface.BOOLEAN_ARRAY_ATT_NAME, ZIGGY_BYTE.getHdf5Type(),
+                long stringArrayAttribute = H5.H5Acreate(fieldGroupId,
+                    Hdf5ModuleInterface.STRING_ARRAY_ATT_NAME, ZIGGY_BYTE.getHdf5Type(),
                     scalarSpace, H5P_DEFAULT, H5P_DEFAULT);
-                H5.H5Aclose(logicalAttribute);
+                H5.H5Aclose(stringArrayAttribute);
                 H5.H5Sclose(scalarSpace);
             }
+        }
 
-            // set the data type
-            long dataType = getDataTypeToSave().getHdf5Type();
-
-            // if this is a string array, there is considerable special preparation
-            // that needs to be made: we need to create a variable-length datatype,
-            // note whether the original data came from a string array
-
-            if (getDataTypeToSave() == ZIGGY_STRING) {
-                dataType = H5.H5Tcopy(ZIGGY_STRING.getHdf5Type());
-                H5.H5Tset_size(dataType, HDF5Constants.H5T_VARIABLE);
-                if (!isScalar()) {
-                    long scalarSpace = H5.H5Screate(HDF5Constants.H5S_SCALAR);
-                    long stringArrayAttribute = H5.H5Acreate(fieldGroupId,
-                        Hdf5ModuleInterface.STRING_ARRAY_ATT_NAME, ZIGGY_BYTE.getHdf5Type(),
-                        scalarSpace, H5P_DEFAULT, H5P_DEFAULT);
-                    H5.H5Aclose(stringArrayAttribute);
-                    H5.H5Sclose(scalarSpace);
-                }
-            }
-
-            // construct the dataset, write the data, close everything
-            long dataset;
-            if (getDataTypeToSave() == ZIGGY_STRING) {
-                deflateProperty = Hdf5ModuleInterface.chunkAndDeflateProperty(nElements, arraySize);
-                dataset = H5.H5Dcreate(fieldGroupId, fieldName, dataType, dataSpace, H5P_DEFAULT,
-                    deflateProperty, H5P_DEFAULT);
-                H5.H5Dwrite_VLStrings(dataset, dataType, HDF5Constants.H5S_ALL,
-                    HDF5Constants.H5S_ALL, H5P_DEFAULT, (Object[]) toHdf5());
-            } else {
-
-                // here we need to iterate over hyperslabs to stay below the HDF5-Java limit of
-                // 2.2 GB per hyperslab
-                PrimitiveHdf5Array.HyperslabIterator hI = new HyperslabIterator();
-                deflateProperty = Hdf5ModuleInterface.chunkAndDeflateProperty(nElements,
-                    hI.chunkSize());
-                dataset = H5.H5Dcreate(fieldGroupId, fieldName, dataType, dataSpace, H5P_DEFAULT,
-                    deflateProperty, H5P_DEFAULT);
-                while (hI.hasNext()) {
-                    PrimitiveHdf5Array.Hyperslab h = hI.next();
-                    H5.H5Sselect_hyperslab(dataSpace, HDF5Constants.H5S_SELECT_SET,
-                        h.hyperslabStart(), h.hyperslabStride(), h.hyperslabCount(),
-                        h.hyperslabBlock());
-                    long memSpace = H5.H5Screate_simple(arraySize.length, h.hyperslabBlock(), null);
-                    H5.H5Dwrite(dataset, dataType, memSpace, dataSpace, H5P_DEFAULT,
-                        toHdf5(h.getHyperslab()));
-                    H5.H5Sclose(memSpace);
-                }
-            }
-            H5.H5Dclose(dataset);
-            if (dataType != getDataTypeToSave().getHdf5Type()) {
-                H5.H5Tclose(dataType);
+        // construct the dataset, write the data, close everything
+        long dataset;
+        if (getDataTypeToSave() == ZIGGY_STRING) {
+            deflateProperty = Hdf5ModuleInterface.chunkAndDeflateProperty(nElements, arraySize);
+            dataset = H5.H5Dcreate(fieldGroupId, fieldName, dataType, dataSpace, H5P_DEFAULT,
+                deflateProperty, H5P_DEFAULT);
+            H5.H5Dwrite_VLStrings(dataset, dataType, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                H5P_DEFAULT, (Object[]) toHdf5());
+        } else {
+
+            // here we need to iterate over hyperslabs to stay below the HDF5-Java limit of
+            // 2.2 GB per hyperslab
+            PrimitiveHdf5Array.HyperslabIterator hI = new HyperslabIterator();
+            deflateProperty = Hdf5ModuleInterface.chunkAndDeflateProperty(nElements,
+                hI.chunkSize());
+            dataset = H5.H5Dcreate(fieldGroupId, fieldName, dataType, dataSpace, H5P_DEFAULT,
+                deflateProperty, H5P_DEFAULT);
+            while (hI.hasNext()) {
+                PrimitiveHdf5Array.Hyperslab h = hI.next();
+                H5.H5Sselect_hyperslab(dataSpace, HDF5Constants.H5S_SELECT_SET, h.hyperslabStart(),
+                    h.hyperslabStride(), h.hyperslabCount(), h.hyperslabBlock());
+                long memSpace = H5.H5Screate_simple(arraySize.length, h.hyperslabBlock(), null);
+                H5.H5Dwrite(dataset, dataType, memSpace, dataSpace, H5P_DEFAULT,
+                    toHdf5(h.getHyperslab()));
+                H5.H5Sclose(memSpace);
             }
-            H5.H5Pclose(deflateProperty);
-            H5.H5Sclose(dataSpace);
-        } catch (NullPointerException | IllegalArgumentException | HDF5Exception e) {
-            throw new PipelineException(
-                "Unable to write primitive array from field " + fieldName + " to HDF5 group", e);
-        } catch (IllegalAccessException | NoSuchFieldException | SecurityException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
         }
+        H5.H5Dclose(dataset);
+        if (dataType != getDataTypeToSave().getHdf5Type()) {
+            H5.H5Tclose(dataType);
+        }
+        H5.H5Pclose(deflateProperty);
+        H5.H5Sclose(dataSpace);
 
         return emptyGroupIdList;
     }
@@ -496,77 +484,60 @@ public List<Long> write(long fieldGroupId, String fieldName) {
     public void read(long fieldGroupId) {
         // If the return is an empty field, detect and handle that now
 
-        try {
-            if (H5.H5Aexists(fieldGroupId, Hdf5ModuleInterface.EMPTY_FIELD_ATT_NAME)) {
-                return;
-            }
-        } catch (HDF5LibraryException | NullPointerException e1) {
-            throw new PipelineException(
-                "HDF5 error occurred attempting to detect empty field attribute", e1);
+        if (H5.H5Aexists(fieldGroupId, Hdf5ModuleInterface.EMPTY_FIELD_ATT_NAME)) {
+            return;
         }
-        try {
-            // get the dataset for the numeric array, which will have the same name as the group,
-            // which in turn is the same as the name of the field
-            long dataSetId = H5.H5Dopen(fieldGroupId, getFieldName(), H5P_DEFAULT);
+        // get the dataset for the numeric array, which will have the same name as the group,
+        // which in turn is the same as the name of the field
+        long dataSetId = H5.H5Dopen(fieldGroupId, getFieldName(), H5P_DEFAULT);
 
-            // get the type and the dimensions of the HDF5 array
-            long hdf5TypeInt = H5.H5Dget_type(dataSetId);
+        // get the type and the dimensions of the HDF5 array
+        long hdf5TypeInt = H5.H5Dget_type(dataSetId);
 
-            long dataSpaceId = H5.H5Dget_space(dataSetId);
-            int nDims = H5.H5Sget_simple_extent_ndims(dataSpaceId);
-            long[] dimensions = new long[nDims];
-            long[] maxDimensions = new long[nDims];
-            H5.H5Sget_simple_extent_dims(dataSpaceId, dimensions, maxDimensions);
+        long dataSpaceId = H5.H5Dget_space(dataSetId);
+        int nDims = H5.H5Sget_simple_extent_ndims(dataSpaceId);
+        long[] dimensions = new long[nDims];
+        long[] maxDimensions = new long[nDims];
+        H5.H5Sget_simple_extent_dims(dataSpaceId, dimensions, maxDimensions);
 
-            // construct an array to capture the data in the dataset
+        // construct an array to capture the data in the dataset
 
-            ZiggyDataType hType = Hdf5ModuleInterface.readDataTypeAttribute(fieldGroupId,
-                getFieldName());
+        ZiggyDataType hType = Hdf5ModuleInterface.readDataTypeAttribute(fieldGroupId,
+            getFieldName());
 
-            // in the special case in which there is no data type to return set, set
-            // it to match the data type of the HDF5 data
-            if (dataTypeOfReturn == null) {
-                dataTypeOfReturn = hType;
-            }
-
-            // get the values out of the dataspace
-            if (hType == ZIGGY_STRING) {
-                Object dataArray = ZiggyArrayUtils.constructFullArray(dimensions, hType, false);
-                Object flattenedArray = flattenArray(dataArray);
-                long typeId = H5.H5Dget_type(dataSetId);
-                H5.H5Dread_VLStrings(dataSetId, typeId, HDF5Constants.H5S_ALL,
-                    HDF5Constants.H5S_ALL, H5P_DEFAULT, (Object[]) flattenedArray);
-                unflattenArray(flattenedArray, dataArray);
-                setArray(dataArray);
-            } else {
-                PrimitiveHdf5Array.HyperslabIterator hI = new HyperslabIterator(dimensions, hType);
-                while (hI.hasNext()) {
-                    PrimitiveHdf5Array.Hyperslab h = hI.next();
-                    H5.H5Sselect_hyperslab(dataSpaceId, HDF5Constants.H5S_SELECT_SET,
-                        h.hyperslabStart(), h.hyperslabStride(), h.hyperslabCount(),
-                        h.hyperslabBlock());
-                    long memSpace = H5.H5Screate_simple(dimensions.length, h.hyperslabBlock(),
-                        null);
-                    Object dataArray = ZiggyArrayUtils.constructFullArray(h.hyperslabBlock(), hType,
-                        false);
-                    H5.H5Dread(dataSetId, hdf5TypeInt, memSpace, dataSpaceId, H5P_DEFAULT,
-                        dataArray);
-                    h.putHyperslab(dataArray);
-                    H5.H5Sclose(memSpace);
-                }
+        // in the special case in which there is no data type to return set, set
+        // it to match the data type of the HDF5 data
+        if (dataTypeOfReturn == null) {
+            dataTypeOfReturn = hType;
+        }
+
+        // get the values out of the dataspace
+        if (hType == ZIGGY_STRING) {
+            Object dataArray = ZiggyArrayUtils.constructFullArray(dimensions, hType, false);
+            Object flattenedArray = flattenArray(dataArray);
+            long typeId = H5.H5Dget_type(dataSetId);
+            H5.H5Dread_VLStrings(dataSetId, typeId, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                H5P_DEFAULT, (Object[]) flattenedArray);
+            unflattenArray(flattenedArray, dataArray);
+            setArray(dataArray);
+        } else {
+            PrimitiveHdf5Array.HyperslabIterator hI = new HyperslabIterator(dimensions, hType);
+            while (hI.hasNext()) {
+                PrimitiveHdf5Array.Hyperslab h = hI.next();
+                H5.H5Sselect_hyperslab(dataSpaceId, HDF5Constants.H5S_SELECT_SET,
+                    h.hyperslabStart(), h.hyperslabStride(), h.hyperslabCount(),
+                    h.hyperslabBlock());
+                long memSpace = H5.H5Screate_simple(dimensions.length, h.hyperslabBlock(), null);
+                Object dataArray = ZiggyArrayUtils.constructFullArray(h.hyperslabBlock(), hType,
+                    false);
+                H5.H5Dread(dataSetId, hdf5TypeInt, memSpace, dataSpaceId, H5P_DEFAULT, dataArray);
+                h.putHyperslab(dataArray);
+                H5.H5Sclose(memSpace);
             }
-
-            H5.H5Sclose(dataSpaceId);
-            H5.H5Dclose(dataSetId);
-        } catch (HDF5Exception e) {
-            throw new PipelineException(
-                "Unable to read numeric array from HDF5 for field " + getFieldName(), e);
-        } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException
-            | SecurityException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
         }
 
+        H5.H5Sclose(dataSpaceId);
+        H5.H5Dclose(dataSetId);
     }
 
     /**
@@ -588,14 +559,6 @@ class Hyperslab extends HyperRectangle {
         Hyperslab(long[] size, long[] location) {
             super(longToInt1d(ZiggyArrayUtils.getArraySize(arrayObject)), longToInt1d(size),
                 longToInt1d(location));
-//            this.size = size;
-//            this.location = location;
-//            this.arrayObjectSize = ZiggyArrayUtils.getArraySize(arrayObject);
-//            if (!checkSlabParameters()) {
-//                throw new PipelineException("Unable to obtain hyperslab of size "
-//                    + Arrays.toString(size) + " and location " + Arrays.toString(location)
-//                    + " from array of size " + Arrays.toString(arrayObjectSize));
-//            }
         }
 
         /**
@@ -608,14 +571,6 @@ class Hyperslab extends HyperRectangle {
          */
         Hyperslab(long[] size, long[] location, long[] arrayObjectSize) {
             super(longToInt1d(arrayObjectSize), longToInt1d(size), longToInt1d(location));
-//            this.size = size;
-//            this.location = location;
-//            this.arrayObjectSize = arrayObjectSize;
-//            if (!checkSlabParameters()) {
-//                throw new PipelineException("Unable to obtain hyperslab of size "
-//                    + Arrays.toString(size) + " and location " + Arrays.toString(location)
-//                    + " from array of size " + Arrays.toString(arrayObjectSize));
-//            }
         }
 
         /**
@@ -806,7 +761,6 @@ void putHyperslab(Object array, long[] arraySize, long[] slabLocation, Object sl
                 System.arraycopy(slabArray, 0, array, location0, (int) slabSize[0]);
             }
         }
-
     }
 
     /**
@@ -821,14 +775,8 @@ class HyperslabIterator extends HyperRectangleIterator {
          * Constructor to use for writing to HDF5 -- in this case, we know the type and the size of
          * the array based on the arrayObject and dataTypeToSave members of the PrimitiveHdf5Array
          * object
-         *
-         * @throws SecurityException
-         * @throws NoSuchFieldException
-         * @throws IllegalAccessException
-         * @throws IllegalArgumentException
          */
-        HyperslabIterator() throws IllegalArgumentException, IllegalAccessException,
-            NoSuchFieldException, SecurityException {
+        HyperslabIterator() {
             this(ZiggyArrayUtils.getArraySize(arrayObject), dataTypeToSave);
         }
 
@@ -838,13 +786,8 @@ class HyperslabIterator extends HyperRectangleIterator {
          *
          * @param arraySize
          * @param dataType
-         * @throws SecurityException
-         * @throws NoSuchFieldException
-         * @throws IllegalAccessException
-         * @throws IllegalArgumentException
          */
-        HyperslabIterator(long[] arraySize, ZiggyDataType dataType) throws IllegalArgumentException,
-            IllegalAccessException, NoSuchFieldException, SecurityException {
+        HyperslabIterator(long[] arraySize, ZiggyDataType dataType) {
             this(arraySize, dataType, Hdf5ModuleInterface.MAX_BYTES_PER_HYPERSLAB);
         }
 
@@ -856,14 +799,8 @@ class HyperslabIterator extends HyperRectangleIterator {
          * @param arraySize
          * @param dataType
          * @param maxBytes
-         * @throws SecurityException
-         * @throws NoSuchFieldException
-         * @throws IllegalAccessException
-         * @throws IllegalArgumentException
          */
-        HyperslabIterator(long[] arraySize, ZiggyDataType dataType, long maxBytes)
-            throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException,
-            SecurityException {
+        HyperslabIterator(long[] arraySize, ZiggyDataType dataType, long maxBytes) {
             super(longToInt1d(arraySize), (int) maxBytes / elementSizeBytes(dataType));
         }
 
@@ -885,5 +822,4 @@ public long[] chunkSize() {
             return intToLong1d(getSize());
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/io/AlgorithmErrorReturn.java b/src/main/java/gov/nasa/ziggy/module/io/AlgorithmErrorReturn.java
new file mode 100644
index 0000000..7ab10a6
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/module/io/AlgorithmErrorReturn.java
@@ -0,0 +1,72 @@
+package gov.nasa.ziggy.module.io;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This class is a Persistable class that mirrors the structure of the MATLAB lasterror struct. It
+ * is used by all algorithms, regardless of language, in order to read and display the stack trace
+ * from algorithms in the log.
+ *
+ * @author Todd Klaus
+ * @author PT
+ */
+public class AlgorithmErrorReturn implements Persistable {
+
+    @ProxyIgnore
+    private static final Logger log = LoggerFactory.getLogger(AlgorithmErrorReturn.class);
+
+    private String message;
+    private String identifier;
+    private List<AlgorithmStack> stack;
+
+    public AlgorithmErrorReturn() {
+    }
+
+    public void logStackTrace() {
+        log.error("Algorithm Stack Trace: msg=" + message + ", id=" + identifier);
+
+        for (AlgorithmStack stackFrame : stack) {
+            stackFrame.logStackTrace();
+        }
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public List<AlgorithmStack> getStack() {
+        return stack;
+    }
+
+    public void setStack(List<AlgorithmStack> stack) {
+        this.stack = stack;
+    }
+
+    /** Models a single entry in an algorithm stack trace. */
+    private static class AlgorithmStack implements Persistable {
+
+        private String file;
+        private String name;
+        private int line;
+
+        public void logStackTrace() {
+            log.error(
+                "    Algorithm Stack Trace:    file=" + file + ", name=" + name + ", line=" + line);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/module/io/ModuleInterfaceUtils.java b/src/main/java/gov/nasa/ziggy/module/io/ModuleInterfaceUtils.java
index 39737a6..0f3334d 100644
--- a/src/main/java/gov/nasa/ziggy/module/io/ModuleInterfaceUtils.java
+++ b/src/main/java/gov/nasa/ziggy/module/io/ModuleInterfaceUtils.java
@@ -3,7 +3,9 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.util.regex.Pattern;
 
@@ -12,9 +14,11 @@
 
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.module.hdf5.Hdf5ModuleInterface;
-import gov.nasa.ziggy.module.io.matlab.MatlabErrorReturn;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.annotation.XmlRootElement;
 
@@ -32,11 +36,13 @@ public class ModuleInterfaceUtils {
     private ModuleInterfaceUtils() {
     }
 
-    public static void writeCompanionXmlFile(Persistable inputs, String moduleName, int seqNum) {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static void writeCompanionXmlFile(Persistable inputs, String moduleName) {
         if (!inputs.getClass().isAnnotationPresent(XmlRootElement.class)) {
             return;
         }
-        String companionXmlFile = xmlFileName(moduleName, seqNum);
+        String companionXmlFile = xmlFileName(moduleName);
         log.info("Writing companion xml file \"" + companionXmlFile + "\".");
         StringBuilder validationErrors = new StringBuilder();
         try {
@@ -57,22 +63,26 @@ public static void writeCompanionXmlFile(Persistable inputs, String moduleName,
                     FileUtil.ZIGGY_CHARSET);
                 BufferedWriter bufWriter = new BufferedWriter(fileWriter)) {
                 marshaller.marshal(inputs, bufWriter);
+            } catch (IOException e) {
+                throw new UncheckedIOException(
+                    "Unable to write to file " + companionXmlFile.toString(), e);
             }
             if (validationErrors.length() > 0) {
                 throw new PipelineException(validationErrors.toString());
             }
-        } catch (Exception e) {
+        } catch (JAXBException e) {
             throw new PipelineException(validationErrors.toString(), e);
         }
     }
 
-    public static MatlabErrorReturn dumpErrorFile(File errorFile, String moduleName) {
+    public static AlgorithmErrorReturn dumpErrorFile(File errorFile, String moduleName) {
 
         return dumpErrorFile(errorFile, true);
     }
 
-    public static MatlabErrorReturn dumpErrorFile(File errorFile, boolean logit) {
-        MatlabErrorReturn errorReturn = new MatlabErrorReturn();
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    public static AlgorithmErrorReturn dumpErrorFile(File errorFile, boolean logit) {
+        AlgorithmErrorReturn errorReturn = new AlgorithmErrorReturn();
         String errorMessage;
         try {
             Hdf5ModuleInterface hdf5Interface = new Hdf5ModuleInterface();
@@ -82,9 +92,12 @@ public static MatlabErrorReturn dumpErrorFile(File errorFile, boolean logit) {
 
             errorMessage = "MATLAB code generated an error file, message = "
                 + errorReturn.getMessage();
-        } catch (Throwable t) {
+        } catch (Exception e) {
+            // We want execution to continue regardless of what runtime or checked
+            // exception might have been thrown in the preceding, which is why
+            // Exception is caught.
             errorMessage = "MATLAB code generated an error file, but it was unreadable ("
-                + t.getMessage() + ")";
+                + e.getMessage() + ")";
             errorReturn.setMessage(errorMessage);
         }
         if (logit) {
@@ -104,22 +117,17 @@ public static MatlabErrorReturn dumpErrorFile(File errorFile, boolean logit) {
      *
      * @param dataDir
      * @param filenamePrefix
-     * @param seqNum
      */
-    public static void clearStaleErrorState(File dataDir, String filenamePrefix, int seqNum) {
-        File currentErrorFile = errorFile(dataDir, filenamePrefix, seqNum);
+    public static void clearStaleErrorState(File dataDir, String filenamePrefix) {
+        File currentErrorFile = errorFile(dataDir, filenamePrefix);
 
         if (currentErrorFile.exists()) {
             deleteErrorFile(currentErrorFile);
         }
     }
 
-    public static File errorFile(File dataDir, String filenamePrefix, int seqNum) {
-        return new File(dataDir, errorFileName(filenamePrefix, seqNum));
-    }
-
     public static File errorFile(File dataDir, String filenamePrefix) {
-        return errorFile(dataDir, filenamePrefix, 0);
+        return new File(dataDir, errorFileName(filenamePrefix));
     }
 
     private static void deleteErrorFile(File errorFileToDelete) {
@@ -129,17 +137,6 @@ private static void deleteErrorFile(File errorFileToDelete) {
         }
     }
 
-    /**
-     * Returns the name of the sub-task inputs file for a given module and sequence number.
-     *
-     * @param moduleName
-     * @param seqNum
-     * @return
-     */
-    public static String inputsFileName(String moduleName, int seqNum) {
-        return moduleName + "-inputs-" + seqNum + "." + BIN_FILE_TYPE;
-    }
-
     /**
      * Returns the name of the task inputs file for a given module. This is used only in the case
      * where a partially-populated inputs file is to be written into the task directory.
@@ -158,8 +155,8 @@ public static String inputsFileName(String moduleName) {
      * @param seqNum
      * @return
      */
-    public static String outputsFileName(String moduleName, int seqNum) {
-        return moduleName + "-outputs-" + seqNum + "." + BIN_FILE_TYPE;
+    public static String outputsFileName(String moduleName) {
+        return moduleName + "-outputs." + BIN_FILE_TYPE;
     }
 
     /**
@@ -170,7 +167,7 @@ public static String outputsFileName(String moduleName, int seqNum) {
      * @return
      */
     public static Pattern outputsFileNamePattern(String moduleName) {
-        String regex = moduleName + "-outputs-\\d+." + BIN_FILE_TYPE;
+        String regex = moduleName + "-outputs." + BIN_FILE_TYPE;
         return Pattern.compile(regex);
     }
 
@@ -181,8 +178,8 @@ public static Pattern outputsFileNamePattern(String moduleName) {
      * @param seqNum
      * @return
      */
-    public static String errorFileName(String moduleName, int seqNum) {
-        return moduleName + "-error-" + seqNum + "." + BIN_FILE_TYPE;
+    public static String errorFileName(String moduleName) {
+        return moduleName + "-error." + BIN_FILE_TYPE;
     }
 
     /**
@@ -192,8 +189,8 @@ public static String errorFileName(String moduleName, int seqNum) {
      * @param seqNum
      * @return
      */
-    public static String xmlFileName(String moduleName, int seqNum) {
-        return moduleName + "-digest-" + seqNum + ".xml";
+    public static String xmlFileName(String moduleName) {
+        return moduleName + "-digest.xml";
     }
 
     /**
@@ -203,8 +200,8 @@ public static String xmlFileName(String moduleName, int seqNum) {
      * @param logSuffix
      * @return
      */
-    public static String stdoutFileName(String moduleName, String logSuffix) {
-        return moduleName + "-stdout-" + logSuffix + ".log";
+    public static String stdoutFileName(String moduleName) {
+        return moduleName + "-stdout.log";
     }
 
     /**
@@ -214,7 +211,7 @@ public static String stdoutFileName(String moduleName, String logSuffix) {
      * @param logSuffix
      * @return
      */
-    public static String stderrFileName(String moduleName, String logSuffix) {
-        return moduleName + "-stdout-" + logSuffix + ".log";
+    public static String stderrFileName(String moduleName) {
+        return moduleName + "-stdout.log";
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabErrorReturn.java b/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabErrorReturn.java
deleted file mode 100644
index cce20d7..0000000
--- a/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabErrorReturn.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package gov.nasa.ziggy.module.io.matlab;
-
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.io.Persistable;
-import gov.nasa.ziggy.module.io.ProxyIgnore;
-
-/**
- * This class is a Persistable class that mirrors the structure of the MATLAB lasterror struct.
- * <p>
- * WARNING: Do not change the names of any of these fields, they must match the names in the MATLAB
- * lasterror struct.
- *
- * @author Todd Klaus
- */
-public class MatlabErrorReturn implements Persistable {
-    @ProxyIgnore
-    private static final Logger log = LoggerFactory.getLogger(MatlabErrorReturn.class);
-
-    private String message;
-    private String identifier;
-    private List<MatlabStack> stack;
-
-    public MatlabErrorReturn() {
-    }
-
-    public void logStackTrace() {
-        log.error("MATLAB Stack Trace: msg=" + message + ", id=" + identifier);
-
-        for (MatlabStack stackFrame : stack) {
-            stackFrame.logStackTrace();
-        }
-    }
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public List<MatlabStack> getStack() {
-        return stack;
-    }
-
-    public void setStack(List<MatlabStack> stack) {
-        this.stack = stack;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabStack.java b/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabStack.java
deleted file mode 100644
index f867ccc..0000000
--- a/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabStack.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package gov.nasa.ziggy.module.io.matlab;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.io.Persistable;
-import gov.nasa.ziggy.module.io.ProxyIgnore;
-
-/**
- * This class is a Persistable class that mirrors the structure of the MATLAB lasterror.stack
- * struct.
- * <p>
- * WARNING: Do not change the names of any of these fields, they must match the names in the MATLAB
- * lasterror.stack struct.
- *
- * @author Todd Klaus
- */
-public class MatlabStack implements Persistable {
-    @ProxyIgnore
-    private static final Logger log = LoggerFactory.getLogger(MatlabStack.class);
-
-    private String file;
-    private String name;
-    private int line;
-
-    public MatlabStack() {
-    }
-
-    public void logStackTrace() {
-        log.error("MATLAB Stack Trace:    file=" + file + ", name=" + name + ", line=" + line);
-    }
-
-    public String getFile() {
-        return file;
-    }
-
-    public void setFile(String file) {
-        this.file = file;
-    }
-
-    public int getLine() {
-        return line;
-    }
-
-    public void setLine(int line) {
-        this.line = line;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabUtils.java b/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabUtils.java
index d2c8673..0203df1 100644
--- a/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabUtils.java
+++ b/src/main/java/gov/nasa/ziggy/module/io/matlab/MatlabUtils.java
@@ -13,10 +13,10 @@
 public class MatlabUtils {
 
     private static OperatingSystemType osType;
+    private static String architecture;
 
     // Never try to instantiate this class.
     private MatlabUtils() {
-
     }
 
     /**
@@ -39,7 +39,11 @@ public static String mcrPaths(String mcrRoot) {
                 openGlString = "opengl" + File.separator + "lib";
                 break;
             case MAC_OS_X:
-                suffix = "maci64";
+                if (architecture().contains("aarch")) {
+                    suffix = "maca64";
+                } else {
+                    suffix = "maci64";
+                }
                 openGlString = "";
                 break;
             default:
@@ -66,8 +70,20 @@ private static OperatingSystemType osType() {
         return osType;
     }
 
+    private static String architecture() {
+        if (architecture == null) {
+            architecture = System.getProperty("os.arch").toLowerCase();
+        }
+        return architecture;
+    }
+
     // Use for unit test purposes only.
     static void setOsType(OperatingSystemType osTypeArg) {
         osType = osTypeArg;
     }
+
+    /** For testing only. */
+    static void setArchitecture(String arch) {
+        architecture = arch;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/PbsParameters.java b/src/main/java/gov/nasa/ziggy/module/remote/PbsParameters.java
index 5ad30c6..81b723a 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/PbsParameters.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/PbsParameters.java
@@ -7,6 +7,7 @@
 import static gov.nasa.ziggy.module.remote.RemoteNodeDescriptor.nodesWithSufficientRam;
 import static gov.nasa.ziggy.module.remote.RemoteQueueDescriptor.descriptorsSortedByMaxTime;
 
+import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -107,7 +108,7 @@ private void selectArchitecture(RemoteParameters remoteParameters, int totalSubt
     public void populateResourceParameters(RemoteParameters remoteParameters,
         int totalSubtaskCount) {
 
-        computeActiveCoresPerNode(remoteParameters);
+        computeActiveCoresPerNode(remoteParameters, totalSubtaskCount);
         double subtasksPerCore = subtasksPerCore(remoteParameters, totalSubtaskCount);
 
         // Set the number of nodes and the number of subtasks per node
@@ -181,7 +182,6 @@ private double subtasksPerCore(RemoteParameters remoteParameters, int totalSubta
             }
         }
         return subtasksPerCore;
-
     }
 
     /**
@@ -198,10 +198,12 @@ private void computeRequestedNodeCount(int totalSubtaskCount, double subtasksPer
     /**
      * Determine the number of active cores per node. This is the number of cores that can run given
      * the user-specified requirement on the amount of RAM needed for each subtask; the active
-     * number of cores is the lower of: the total number of cores in the node, or the number of GB
-     * of RAM in the node divided by the number of GB needed per subtask.
+     * number of cores is the lowest of: the total number of cores in the node; the number of GB of
+     * RAM in the node divided by the number of GB needed per subtask; the number of subtasks in the
+     * task.
      */
-    public void computeActiveCoresPerNode(RemoteParameters remoteParameters) {
+    public void computeActiveCoresPerNode(RemoteParameters remoteParameters,
+        int totalSubtaskCount) {
         if (!remoteParameters.isNodeSharing()) {
             activeCoresPerNode = 1;
             return;
@@ -209,6 +211,7 @@ public void computeActiveCoresPerNode(RemoteParameters remoteParameters) {
         double gigsPerNode = architecture.getGigsPerCore() * minCoresPerNode;
         activeCoresPerNode = (int) Math
             .min(Math.floor(gigsPerNode / remoteParameters.getGigsPerSubtask()), minCoresPerNode);
+        activeCoresPerNode = Math.min(activeCoresPerNode, totalSubtaskCount);
     }
 
     /**
@@ -247,11 +250,13 @@ private void computeWallTimeAndQueue(RemoteParameters remoteParameters,
             }
         } else {
             RemoteQueueDescriptor descriptor = RemoteQueueDescriptor
-                .fromName(remoteParameters.getQueueName());
+                .fromQueueName(remoteParameters.getQueueName());
             if (descriptor.equals(RemoteQueueDescriptor.UNKNOWN)) {
                 log.warn("Unable to determine max wall time for queue "
                     + remoteParameters.getQueueName());
                 queueName = remoteParameters.getQueueName();
+            } else if (descriptor.equals(RemoteQueueDescriptor.RESERVED)) {
+                queueName = remoteParameters.getQueueName();
             } else {
                 if (descriptor.getMaxWallTimeHours() < requestedWallTimeHours) {
                     throw new IllegalStateException("Queue " + descriptor.getQueueName()
@@ -278,6 +283,67 @@ private void computeEstimatedCost() {
             * requestedNodeCount * TimeFormatter.timeStringHhMmSsToTimeInHours(requestedWallTime);
     }
 
+    /**
+     * Aggregates PBS parameters across a {@link Collection} of parameter instances. For most
+     * parameters the value in the aggregated parameter instance is the same as the value in the
+     * last of the collection to be looped over, and it is assumed that all the members of the
+     * collection have the same value for these parameters (i.e., all of the instances in the
+     * collection have the same architecture, remote group, etc.). In the case of the wall time and
+     * the active cores per node, the aggregated value is the largest value across all instances in
+     * the collection. In the case of the queue name, the aggregated value is the queue with the
+     * longest maximum time. In the case of the number of nodes and the estimated cost, the
+     * aggregated value is the sum across all instances in the collection.
+     * <p>
+     * This method allows the estimation of the overall cost and parameters for running a given
+     * pipeline module, given the parameters for each task that will run in the module.
+     */
+    public static PbsParameters aggregatePbsParameters(
+        Collection<PbsParameters> pbsParametersCollection) {
+        PbsParameters aggregatedParameters = new PbsParameters();
+
+        // Loop over PbsParameters instances and collect values.
+        for (PbsParameters pbsParameters : pbsParametersCollection) {
+
+            // Start with the fields that are the same for all members of the collection.
+            aggregatedParameters.setEnabled(pbsParameters.isEnabled());
+            aggregatedParameters.setMinGigsPerNode(pbsParameters.getMinGigsPerNode());
+            aggregatedParameters.setMinCoresPerNode(pbsParameters.getMinCoresPerNode());
+            aggregatedParameters.setGigsPerSubtask(pbsParameters.getGigsPerSubtask());
+            aggregatedParameters.setRemoteGroup(pbsParameters.getRemoteGroup());
+            aggregatedParameters.setArchitecture(pbsParameters.getArchitecture());
+            aggregatedParameters.setRemoteGroup(pbsParameters.getRemoteGroup());
+
+            // Next the fields where we need to find the maximum value across all
+            // members of the collection.
+            double wallTimeHours = StringUtils.isEmpty(aggregatedParameters.getRequestedWallTime())
+                ? 0
+                : TimeFormatter
+                    .timeStringHhMmSsToTimeInHours(aggregatedParameters.getRequestedWallTime());
+            wallTimeHours = Math.max(wallTimeHours,
+                TimeFormatter.timeStringHhMmSsToTimeInHours(pbsParameters.getRequestedWallTime()));
+            aggregatedParameters
+                .setRequestedWallTime(TimeFormatter.timeInHoursToStringHhMmSs(wallTimeHours));
+            aggregatedParameters
+                .setActiveCoresPerNode(Math.max(aggregatedParameters.getActiveCoresPerNode(),
+                    pbsParameters.getActiveCoresPerNode()));
+            RemoteQueueDescriptor pbsQueue = RemoteQueueDescriptor
+                .fromQueueName(pbsParameters.getQueueName());
+            RemoteQueueDescriptor aggregatorQueue = StringUtils
+                .isEmpty(aggregatedParameters.getQueueName()) ? pbsQueue
+                    : RemoteQueueDescriptor.fromQueueName(aggregatedParameters.getQueueName());
+            RemoteQueueDescriptor longerQueue = RemoteQueueDescriptor.max(pbsQueue,
+                aggregatorQueue);
+            aggregatedParameters.setQueueName(longerQueue.getQueueName());
+
+            // Finally the fields where we need to sum across the collection.
+            aggregatedParameters.setRequestedNodeCount(aggregatedParameters.getRequestedNodeCount()
+                + pbsParameters.getRequestedNodeCount());
+            aggregatedParameters.setEstimatedCost(
+                aggregatedParameters.getEstimatedCost() + pbsParameters.getEstimatedCost());
+        }
+        return aggregatedParameters;
+    }
+
     public boolean isEnabled() {
         return enabled;
     }
@@ -365,5 +431,4 @@ public double getEstimatedCost() {
     public void setEstimatedCost(double estimatedCost) {
         this.estimatedCost = estimatedCost;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/QstatMonitor.java b/src/main/java/gov/nasa/ziggy/module/remote/QstatMonitor.java
index c03007d..83e85db 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/QstatMonitor.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/QstatMonitor.java
@@ -138,7 +138,6 @@ public Set<Long> allIncompleteJobIds(String taskName) {
             ids.add(entry.getId());
         }
         return ids;
-
     }
 
     /**
@@ -155,7 +154,7 @@ private Set<QstatEntry> qstatEntriesForTask(String taskName) {
 
         // get all the qstat entries, if any, for the specified task name
         List<String> qstatLines = cmdManager.getQstatInfoByTaskName(owner, taskName);
-        if (qstatLines.isEmpty() || (qstatLines.size() == 1 && qstatLines.get(0).isEmpty())) {
+        if (qstatLines.isEmpty() || qstatLines.size() == 1 && qstatLines.get(0).isEmpty()) {
             return Collections.emptySet();
         }
 
@@ -300,7 +299,6 @@ private Set<Long> idFromStateFile(StateFile stateFile) {
         String taskName = stateFile.taskBaseName();
         Set<QstatEntry> qstatEntries = taskNameQstatEntryMap.get(taskName);
         return qstatEntries.stream().map(QstatEntry::getId).collect(Collectors.toSet());
-
     }
 
     // getters
@@ -354,7 +352,6 @@ public QstatEntry(String qstatLine) {
             // The name, owner, and status are simple strings.
             status = qstatLineParts[QueueCommandManager.STATUS_INDEX];
             name = qstatLineParts[QueueCommandManager.NAME_INDEX];
-
         }
 
         /**
@@ -389,7 +386,7 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if ((obj == null) || (getClass() != obj.getClass())) {
+            if (obj == null || getClass() != obj.getClass()) {
                 return false;
             }
             QstatEntry other = (QstatEntry) obj;
@@ -403,7 +400,5 @@ public boolean equals(Object obj) {
         public String toString() {
             return id + "";
         }
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/Qsub.java b/src/main/java/gov/nasa/ziggy/module/remote/Qsub.java
index 2d7828d..de4020d 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/Qsub.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/Qsub.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -14,6 +15,8 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.Iso8601Formatter;
 
 /**
@@ -48,8 +51,8 @@ public class Qsub {
     private String datestamp = Iso8601Formatter.dateTimeLocalFormatter().format(new Date());
 
     private String scriptPath;
-    private String[] scriptArgs;
-    private String runjavaProgram;
+    private String taskDir;
+    private String ziggyProgram;
     private String pbsLogDir;
     private String nasLogDir;
     private SupportedRemoteClusters cluster;
@@ -59,7 +62,7 @@ public class Qsub {
     private Qsub() {
     }
 
-    public int[] submitMultipleJobsForTask() throws IOException {
+    public int[] submitMultipleJobsForTask() {
         int[] returnCodes = new int[numNodes];
         for (int iJob = 0; iJob < numNodes; iJob++) {
             returnCodes[iJob] = submit1Job(iJob);
@@ -67,10 +70,10 @@ public int[] submitMultipleJobsForTask() throws IOException {
         return returnCodes;
     }
 
-    private int submit1Job(int jobIndex) throws IOException {
+    private int submit1Job(int jobIndex) {
 
         String propertiesFileName = java.lang.System
-            .getenv(ZiggyConfiguration.CONFIG_SERVICE_PROPERTIES_PATH_ENV);
+            .getenv(ZiggyConfiguration.PIPELINE_CONFIG_PATH_ENV);
 
         CommandLine commandLine = new CommandLine("/PBS/bin/qsub");
         commandLine.addArgument("-N");
@@ -82,9 +85,11 @@ private int submit1Job(int jobIndex) throws IOException {
         commandLine.addArgument(resourceOptions(jobIndex < 0));
         commandLine.addArgument("-W");
         commandLine.addArgument("group_list=" + groupName);
+        commandLine.addArgument("-v");
+        commandLine.addArgument(ZiggyConfiguration.ZIGGY_HOME_ENV);
         if (propertiesFileName != null) {
             commandLine.addArgument("-v");
-            commandLine.addArgument(ZiggyConfiguration.CONFIG_SERVICE_PROPERTIES_PATH_ENV);
+            commandLine.addArgument(ZiggyConfiguration.PIPELINE_CONFIG_PATH_ENV);
         }
         commandLine.addArgument("-o");
         commandLine.addArgument(pbsLogFile(jobIndex));
@@ -92,11 +97,9 @@ private int submit1Job(int jobIndex) throws IOException {
         commandLine.addArgument("oe");
         commandLine.addArgument("--");
         commandLine.addArgument(scriptPath);
-        commandLine.addArgument(runjavaProgram);
+        commandLine.addArgument(ziggyProgram);
 
-        for (String scriptArg : scriptArgs) {
-            commandLine.addArgument(scriptArg);
-        }
+        commandLine.addArgument(taskDir);
         commandLine.addArgument(algorithmLogFile(jobIndex));
 
         log.info("commandLine: " + commandLine);
@@ -112,14 +115,26 @@ private String fullJobName(int jobIndex) {
         return pipelineTask.taskBaseName() + "." + jobIndex;
     }
 
-    private String pbsLogFile(int jobIndex) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private String pbsLogFile(int jobIndex) {
         File pbsLogFile = new File(pbsLogDir, "pbs-" + fullJobName(jobIndex) + "-" + datestamp);
-        return pbsLogFile.getCanonicalPath();
+        try {
+            return pbsLogFile.getCanonicalPath();
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to get path to file " + pbsLogFile.toString(),
+                e);
+        }
     }
 
-    private String algorithmLogFile(int jobIndex) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private String algorithmLogFile(int jobIndex) {
         File nasLogFile = new File(nasLogDir, pipelineTask.logFilename(jobIndex));
-        return nasLogFile.getCanonicalPath();
+        try {
+            return nasLogFile.getCanonicalPath();
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to get path to file " + nasLogFile.toString(),
+                e);
+        }
     }
 
     private String resourceOptions(boolean multiNodeJob) {
@@ -176,11 +191,11 @@ private void validate() {
         if (scriptPath == null) {
             unsetParameters.add("scriptPath");
         }
-        if (runjavaProgram == null) {
-            unsetParameters.add("runjavaProgram");
+        if (ziggyProgram == null) {
+            unsetParameters.add("ziggyProgram");
         }
-        if (scriptArgs == null) {
-            unsetParameters.add("scriptArgs");
+        if (taskDir == null) {
+            unsetParameters.add("taskDir");
         }
         if (pbsLogDir == null) {
             unsetParameters.add("pbsLogDir");
@@ -231,10 +246,6 @@ private void setScriptPath(String scriptPath) {
         this.scriptPath = scriptPath;
     }
 
-    private void setScriptArgs(String[] scriptArgs) {
-        this.scriptArgs = scriptArgs;
-    }
-
     private void setCluster(SupportedRemoteClusters cluster) {
         this.cluster = cluster;
     }
@@ -251,8 +262,12 @@ private void setPipelineTask(PipelineTask pipelineTask) {
         this.pipelineTask = pipelineTask;
     }
 
-    private void setRunjavaProgram(String runjavaProgram) {
-        this.runjavaProgram = runjavaProgram;
+    private void setZiggyProgram(String ziggyProgram) {
+        this.ziggyProgram = ziggyProgram;
+    }
+
+    private void setTaskDir(String taskDir) {
+        this.taskDir = taskDir;
     }
 
     /**
@@ -309,13 +324,8 @@ public Builder scriptPath(String scriptPath) {
             return this;
         }
 
-        public Builder scriptArgs(String[] scriptArgs) {
-            qsub.setScriptArgs(scriptArgs);
-            return this;
-        }
-
-        public Builder runjavaProgram(String runjavaProgram) {
-            qsub.setRunjavaProgram(runjavaProgram);
+        public Builder ziggyProgram(String ziggyProgram) {
+            qsub.setZiggyProgram(ziggyProgram);
             return this;
         }
 
@@ -339,6 +349,11 @@ public Builder pipelineTask(PipelineTask pipelineTask) {
             return this;
         }
 
+        public Builder taskDir(String taskDir) {
+            qsub.setTaskDir(taskDir);
+            return this;
+        }
+
         public Qsub build() {
 
             qsub.validate();
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/QsubLog.java b/src/main/java/gov/nasa/ziggy/module/remote/QsubLog.java
index e3d3028..e308645 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/QsubLog.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/QsubLog.java
@@ -3,11 +3,15 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.UncheckedIOException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
@@ -35,13 +39,14 @@ public QsubLog(File logDirectory) {
         logFile = new File(logDirectory, LOG_FILENAME);
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void log(String qsubCommandLine) {
         try (BufferedWriter bw = new BufferedWriter(
             new OutputStreamWriter(new FileOutputStream(logFile, true), FileUtil.ZIGGY_CHARSET))) {
             // append to existing file if it exists
             bw.write(qsubCommandLine + "\n");
-        } catch (Exception e) {
-            log.warn("Failed to write to qsub log file, caught: " + e, e);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to write to file " + logFile.toString(), e);
         }
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/QueueCommandManager.java b/src/main/java/gov/nasa/ziggy/module/remote/QueueCommandManager.java
index ecda6d2..742184b 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/QueueCommandManager.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/QueueCommandManager.java
@@ -10,7 +10,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,8 +19,10 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.RemoteJob;
 import gov.nasa.ziggy.pipeline.definition.RemoteJob.RemoteJobQstatInfo;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Executes batch commands and parses the text output from those commands.
@@ -67,10 +69,11 @@ public abstract class QueueCommandManager {
         .compile("\\s*" + SELECT + " = ([0-9]+):model=(\\S+)");
     public static final Pattern WALLTIME_PATTERN = Pattern.compile("\\s*" + WALLTIME + " = (\\S+)");
 
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public static QueueCommandManager newInstance() {
-        Configuration config = ZiggyConfiguration.getInstance();
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
         String queueCommandClassName;
-        queueCommandClassName = config.getString(PropertyNames.QUEUE_COMMAND_CLASS_PROP_NAME,
+        queueCommandClassName = config.getString(PropertyName.REMOTE_QUEUE_COMMAND_CLASS.property(),
             DEFAULT_LOCAL_CLASS);
 
         QueueCommandManager cmdManager;
@@ -335,5 +338,4 @@ protected String hostname() {
     protected String user() {
         return System.getenv("USER");
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/QueueLocalCommandManager.java b/src/main/java/gov/nasa/ziggy/module/remote/QueueLocalCommandManager.java
index 77a3ac1..d559a36 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/QueueLocalCommandManager.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/QueueLocalCommandManager.java
@@ -7,6 +7,8 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * A {@link QueueCommandManager} for issuing queue commands locally.
@@ -21,6 +23,7 @@ public class QueueLocalCommandManager extends QueueCommandManager {
     private static final String QDEL = "qdel ";
 
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     protected List<String> qstat(String commandArgs, String... targets) {
 
         List<String> qstatResults = new ArrayList<>();
@@ -33,6 +36,12 @@ protected List<String> qstat(String commandArgs, String... targets) {
             p.run(true, 0);
             qstatResults = p.stdout(targets);
         } catch (Exception e) {
+            // The qstat program is not under our control and can fail due to
+            // various transient file system and network issues. If this happens,
+            // and results a runtime exception, we don't want it to bring down
+            // the monitoring system, so we catch all possible exceptions here
+            // and keep going, in hopes that the next time the user calls qstat
+            // the transient problem has resolved itself.
             log.error("Error when attempting to run qstat command", e);
         }
         return qstatResults;
@@ -44,5 +53,4 @@ protected void qdel(String qdelArgs) {
         log.info("Executing command: " + qdelArgs);
         p.run(false, 0);
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/RemoteArchitectureOptimizer.java b/src/main/java/gov/nasa/ziggy/module/remote/RemoteArchitectureOptimizer.java
index 709ffd0..4c06852 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/RemoteArchitectureOptimizer.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/RemoteArchitectureOptimizer.java
@@ -6,6 +6,7 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.remote.nas.NasQueueTimeMetrics;
+import gov.nasa.ziggy.util.StringUtils;
 import gov.nasa.ziggy.util.TimeFormatter;
 
 /**
@@ -15,10 +16,11 @@
  */
 public enum RemoteArchitectureOptimizer {
 
-    // Minimizes the fraction of idled cores (they need to be idled due to the subtasks
-    // requiring more RAM than the architecture's gigs per core provides). If the user
-    // specifies one subtask at a time per node, this option is meaningless and
-    // cost will be used instead.
+    /**
+     * Minimizes the fraction of idled cores (they need to be idled due to the subtasks requiring
+     * more RAM than the architecture's gigs per core provides). If the user specifies one subtask
+     * at a time per node, this option is meaningless and cost will be used instead.
+     */
     CORES {
         @Override
         public RemoteNodeDescriptor optimalArchitecture(RemoteParameters remoteParameters,
@@ -43,8 +45,10 @@ public RemoteNodeDescriptor optimalArchitecture(RemoteParameters remoteParameter
         }
     },
 
-    // Selects the architecture that has the smallest queue, as indicated by the number of
-    // days it would take to run all queued jobs for a given architecture and NASA division.
+    /**
+     * Selects the architecture that has the smallest queue, as indicated by the number of days it
+     * would take to run all queued jobs for a given architecture and NASA division.
+     */
     QUEUE_DEPTH {
         @Override
         public RemoteNodeDescriptor optimalArchitecture(RemoteParameters remoteParameters,
@@ -69,8 +73,10 @@ public RemoteNodeDescriptor optimalArchitecture(RemoteParameters remoteParameter
         }
     },
 
-    // Selects the architecture that minimizes the run time when including queue time,
-    // using the "expansion" metric to estimate wait times in the queue.
+    /**
+     * Selects the architecture that minimizes the run time when including queue time, using the
+     * "expansion" metric to estimate wait times in the queue.
+     */
     QUEUE_TIME {
         @Override
         public RemoteNodeDescriptor optimalArchitecture(RemoteParameters remoteParameters,
@@ -103,7 +109,7 @@ public RemoteNodeDescriptor optimalArchitecture(RemoteParameters remoteParameter
         }
     },
 
-    // Selects the architecture that minimizes job cost.
+    /** Selects the architecture that minimizes job cost. */
     COST {
         @Override
         public RemoteNodeDescriptor optimalArchitecture(RemoteParameters remoteParameters,
@@ -141,8 +147,8 @@ public static RemoteArchitectureOptimizer fromName(String name) {
         RemoteArchitectureOptimizer option = null;
         for (RemoteArchitectureOptimizer o : RemoteArchitectureOptimizer.values()) {
             String cleanedUpOptimizerName = o.toString().replace("_", "");
-            String cleanedUpRequestName = name.toString().replace("_", "");
-            if (cleanedUpRequestName.toUpperCase().contentEquals(cleanedUpOptimizerName)) {
+            String cleanedUpRequestName = name.replace("_", "");
+            if (cleanedUpRequestName.equalsIgnoreCase(cleanedUpOptimizerName)) {
                 option = o;
             }
         }
@@ -158,4 +164,8 @@ public static String options() {
         return b.toString();
     }
 
+    @Override
+    public String toString() {
+        return StringUtils.constantToSentenceWithSpaces(super.toString());
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/RemoteExecutionProperties.java b/src/main/java/gov/nasa/ziggy/module/remote/RemoteExecutionProperties.java
index 3393813..552fedf 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/RemoteExecutionProperties.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/RemoteExecutionProperties.java
@@ -1,20 +1,20 @@
 package gov.nasa.ziggy.module.remote;
 
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_GROUP;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_HOST;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_USER;
+
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 
 public class RemoteExecutionProperties {
 
-    public static final String HOST_PROPERTY = "remote.host";
-    public static final String USER_PROPERTY = "remote.user";
-    public static final String GROUP_PROPERTY = "remote.group";
-
     /**
      * The hostnames that can be used on Pleiades.
      *
-     * @return Names of hosts, in order from most- to least-desired to use.
+     * @return names of hosts, in order from most- to least-desired to use
      */
     public static String[] getHost() {
-        String hosts = ZiggyConfiguration.getInstance().getString(HOST_PROPERTY, "");
+        String hosts = ZiggyConfiguration.getInstance().getString(REMOTE_HOST.property(), "");
         if (hosts.isEmpty()) {
             return new String[0];
         }
@@ -24,19 +24,18 @@ public static String[] getHost() {
     /**
      * The username to use on Pleiades.
      *
-     * @return The username to be used.
+     * @return the username to be used
      */
     public static String getUser() {
-        return ZiggyConfiguration.getInstance().getString(USER_PROPERTY, "");
+        return ZiggyConfiguration.getInstance().getString(REMOTE_USER.property(), "");
     }
 
     /**
      * The user group to use on Pleiades.
      *
-     * @return The group to be used.
+     * @return the group to be used
      */
     public static String getGroup() {
-        return ZiggyConfiguration.getInstance().getString(GROUP_PROPERTY, "");
+        return ZiggyConfiguration.getInstance().getString(REMOTE_GROUP.property(), "");
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/RemoteExecutor.java b/src/main/java/gov/nasa/ziggy/module/remote/RemoteExecutor.java
index 94b9dd2..a7935cf 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/RemoteExecutor.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/RemoteExecutor.java
@@ -2,14 +2,13 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.AlgorithmExecutor;
-import gov.nasa.ziggy.module.AlgorithmMonitor;
 import gov.nasa.ziggy.module.StateFile;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.ProcessingState;
@@ -20,6 +19,10 @@
 import gov.nasa.ziggy.services.alert.AlertService;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.services.messages.MonitorAlgorithmRequest;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 public abstract class RemoteExecutor extends AlgorithmExecutor {
 
@@ -32,96 +35,94 @@ protected RemoteExecutor(PipelineTask pipelineTask) {
     /**
      * A default method to submit tasks to PBS that can be used by all of the currently-supported
      * remote clusters.
-     *
-     * @throws IOException
-     * @throws ConfigurationException
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     protected void submitToPbsInternal(StateFile initialState, PipelineTask pipelineTask,
-        Path algorithmLogDir, Path taskDir) throws IOException, ConfigurationException {
-
-        getStateFile().setPbsSubmitTimeMillis(System.currentTimeMillis());
-        getStateFile().persist();
-
-        JobSubmissionPaths jobSubmissionPaths = new JobSubmissionPaths();
-
-        log.info("Launching jobs for state file: " + getStateFile());
-
-        int coresPerNode = getStateFile().getActiveCoresPerNode();
-
-        int numNodes = getStateFile().getRequestedNodeCount();
-        log.info("Number of nodes requested for jobs: " + numNodes);
-
-        log.info("Launching job, name=" + pipelineTask.taskBaseName() + ", coresPerNode="
-            + coresPerNode + ", numNodes=" + numNodes);
-
-        File pbsLogDirFile = DirectoryProperties.pbsLogDir().toFile();
-        pbsLogDirFile.mkdirs();
-        String pbsLogDir = pbsLogDirFile.getCanonicalPath();
-
-        String[] scriptArgs = { jobSubmissionPaths.getWorkingDirPath(),
-            jobSubmissionPaths.getHomeDirPath(), jobSubmissionPaths.getStateFilePath(),
-            jobSubmissionPaths.getPipelineConfigPath() };
-
-        Qsub.Builder b = new Qsub.Builder().queueName(getStateFile().getQueueName())
-            .wallTime(getStateFile().getRequestedWallTime())
-            .numNodes(numNodes)
-            .coresPerNode(getStateFile().getMinCoresPerNode())
-            .gigsPerNode(getStateFile().getMinGigsPerNode())
-            .model(getStateFile().getRemoteNodeArchitecture())
-            .groupName(getStateFile().getRemoteGroup())
-            .scriptPath(
-                new File(jobSubmissionPaths.getBinPath(), EXECUTABLE_NAME).getCanonicalPath())
-            .runjavaProgram(NODE_MASTER_NAME)
-            .pbsLogDir(pbsLogDir)
-            .nasLogDir(algorithmLogDir.toString())
-            .pipelineTask(pipelineTask)
-            .scriptArgs(scriptArgs);
-        b.cluster(RemoteQueueDescriptor.fromName(getStateFile().getQueueName()).getRemoteCluster());
-        Qsub qsub = b.build();
-
-        log.info("Submitting multiple jobs with 1 node per job for this task");
-        int[] returnCodes = qsub.submitMultipleJobsForTask();
-        int goodJobsCount = 0;
-        for (int returnCode : returnCodes) {
-            if (returnCode == 0) {
-                goodJobsCount++;
+        Path algorithmLogDir, Path taskDir) {
+
+        try {
+            getStateFile().setPbsSubmitTimeMillis(System.currentTimeMillis());
+            getStateFile().persist();
+            addToMonitor(getStateFile());
+
+            log.info("Launching jobs for state file: " + getStateFile());
+
+            int coresPerNode = getStateFile().getActiveCoresPerNode();
+
+            int numNodes = getStateFile().getRequestedNodeCount();
+            log.info("Number of nodes requested for jobs: " + numNodes);
+
+            log.info("Launching job, name=" + pipelineTask.taskBaseName() + ", coresPerNode="
+                + coresPerNode + ", numNodes=" + numNodes);
+
+            File pbsLogDirFile = DirectoryProperties.pbsLogDir().toFile();
+            pbsLogDirFile.mkdirs();
+            String pbsLogDir = pbsLogDirFile.getCanonicalPath();
+
+            Qsub.Builder b = new Qsub.Builder().queueName(getStateFile().getQueueName())
+                .wallTime(getStateFile().getRequestedWallTime())
+                .numNodes(numNodes)
+                .coresPerNode(getStateFile().getMinCoresPerNode())
+                .gigsPerNode(getStateFile().getMinGigsPerNode())
+                .model(getStateFile().getRemoteNodeArchitecture())
+                .groupName(getStateFile().getRemoteGroup())
+                .scriptPath(new File(DirectoryProperties.ziggyBinDir().toFile(), ZIGGY_PROGRAM)
+                    .getCanonicalPath())
+                .ziggyProgram(NODE_MASTER_NAME)
+                .pbsLogDir(pbsLogDir)
+                .nasLogDir(algorithmLogDir.toString())
+                .pipelineTask(pipelineTask)
+                .taskDir(workingDir().toString());
+            b.cluster(RemoteQueueDescriptor.fromQueueName(getStateFile().getQueueName())
+                .getRemoteCluster());
+            Qsub qsub = b.build();
+
+            log.info("Submitting multiple jobs with 1 node per job for this task");
+            int[] returnCodes = qsub.submitMultipleJobsForTask();
+            int goodJobsCount = 0;
+            for (int returnCode : returnCodes) {
+                if (returnCode == 0) {
+                    goodJobsCount++;
+                }
+            }
+            if (goodJobsCount < returnCodes.length) {
+                log.warn(returnCodes.length + " jobs submitted but only " + goodJobsCount
+                    + " successfully queued");
+                AlertService.getInstance()
+                    .generateAndBroadcastAlert("PI (Remote)", getStateFile().getPipelineTaskId(),
+                        AlertService.Severity.WARNING, "Attempted to submit " + returnCodes.length
+                            + " jobs but only successfully submitted " + goodJobsCount);
             }
-        }
-        if (goodJobsCount < returnCodes.length) {
-            log.warn(returnCodes.length + " jobs submitted but only " + goodJobsCount
-                + " successfully queued");
-            AlertService.getInstance()
-                .generateAndBroadcastAlert("PI (Remote)", getStateFile().getPipelineTaskId(),
-                    AlertService.Severity.WARNING, "Attempted to submit " + returnCodes.length
-                        + " jobs but only successfully submitted " + goodJobsCount);
-        }
-
-        // Update the task log index.
-        DatabaseTransactionFactory.performTransaction(() -> {
-            PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-            PipelineTask task = pipelineTaskCrud.retrieve(pipelineTask.getId());
-            task.incrementTaskLogIndex();
-            pipelineTaskCrud.update(task);
-            return null;
-        });
-
-        // Update the remote jobs in the database
-        new PipelineTaskOperations().createRemoteJobsFromQstat(pipelineTask.getId());
-
-        // update processing state
-        log.info("Updating processing state -> " + ProcessingState.ALGORITHM_QUEUED);
-
-        ProcessingSummaryOperations attrOps = new ProcessingSummaryOperations();
-
-        attrOps.updateProcessingState(pipelineTask.getId(), ProcessingState.ALGORITHM_QUEUED);
-        attrOps.updateSubTaskCounts(pipelineTask.getId(), initialState.getNumTotal(),
-            initialState.getNumComplete(), initialState.getNumFailed());
 
+            // Update the task log index.
+            DatabaseTransactionFactory.performTransaction(() -> {
+                PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
+                PipelineTask task = pipelineTaskCrud.retrieve(pipelineTask.getId());
+                task.incrementTaskLogIndex();
+                task.setRemoteExecution(true);
+                pipelineTaskCrud.merge(task);
+                return null;
+            });
+
+            // Update the remote jobs in the database
+            new PipelineTaskOperations().createRemoteJobsFromQstat(pipelineTask.getId());
+
+            // update processing state
+            log.info("Updating processing state -> " + ProcessingState.ALGORITHM_QUEUED);
+
+            ProcessingSummaryOperations attrOps = new ProcessingSummaryOperations();
+
+            attrOps.updateProcessingState(pipelineTask.getId(), ProcessingState.ALGORITHM_QUEUED);
+            attrOps.updateSubTaskCounts(pipelineTask.getId(), initialState.getNumTotal(),
+                initialState.getNumComplete(), initialState.getNumFailed());
+        } catch (IOException e) {
+            throw new UncheckedIOException("Submit to PBS failed due to IOException", e);
+        }
     }
 
     @Override
     protected void addToMonitor(StateFile stateFile) {
-        AlgorithmMonitor.startRemoteMonitoring(stateFile);
+        ZiggyMessenger.publish(new MonitorAlgorithmRequest(stateFile, algorithmType()));
     }
 
     @Override
@@ -148,5 +149,4 @@ protected void setProcessingSummaryOperations(ProcessingSummaryOperations crud)
     public AlgorithmType algorithmType() {
         return AlgorithmType.REMOTE;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/RemoteNodeDescriptor.java b/src/main/java/gov/nasa/ziggy/module/remote/RemoteNodeDescriptor.java
index b147b0e..bb93bb1 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/RemoteNodeDescriptor.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/RemoteNodeDescriptor.java
@@ -4,12 +4,17 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import gov.nasa.ziggy.util.StringUtils;
+
 /**
  * Defines the architectures of remote nodes that can be used for Ziggy batch jobs.
  */
 public enum RemoteNodeDescriptor {
 
     // Cost factors for the NAS systems are the SBU2 factors
+    /** Specifies that any architecture may be used. */
+    ANY,
+
     /**
      * The Sandy Bridge architecture. See <a href=
      * "https://www.nas.nasa.gov/hecc/support/kb/preparing-to-run-on-pleiades-sandy-bridge-nodes_322.html"
@@ -75,9 +80,9 @@ public enum RemoteNodeDescriptor {
     private double costFactor; // relative costs for each node in the family
     private SupportedRemoteClusters remoteCluster; // which cluster has the architecture
 
-    /**
-     * Creates a new instance.
-     */
+    RemoteNodeDescriptor() {
+    }
+
     RemoteNodeDescriptor(String nodeName, int minCores, int maxCores, double gigsPerCore,
         double costFactor, SupportedRemoteClusters cluster) {
         this.nodeName = nodeName;
@@ -152,7 +157,8 @@ public static RemoteNodeDescriptor selectArchitecture(SupportedRemoteClusters cl
 
         // loop over descriptors
         for (RemoteNodeDescriptor descriptor : RemoteNodeDescriptor.values()) {
-            if (descriptor.getRemoteCluster().equals(cluster)
+            if (descriptor.getRemoteCluster() != null
+                && descriptor.getRemoteCluster().equals(cluster)
                 && descriptor.getGigsPerCore() >= subtaskGigsPerCore
                 && descriptor.getGigsPerCore() < selectedArchitecture.getGigsPerCore()) {
                 selectedArchitecture = descriptor;
@@ -169,7 +175,8 @@ public static List<RemoteNodeDescriptor> descriptorsSortedByCost(
         SupportedRemoteClusters cluster) {
         List<RemoteNodeDescriptor> unsortedDescriptors = new ArrayList<>();
         for (RemoteNodeDescriptor descriptor : RemoteNodeDescriptor.values()) {
-            if (descriptor.getRemoteCluster().equals(cluster)) {
+            if (descriptor.getRemoteCluster() != null
+                && descriptor.getRemoteCluster().equals(cluster)) {
                 unsortedDescriptors.add(descriptor);
             }
         }
@@ -186,7 +193,8 @@ public static List<RemoteNodeDescriptor> descriptorsSortedByCores(
         SupportedRemoteClusters cluster) {
         List<RemoteNodeDescriptor> unsortedDescriptors = new ArrayList<>();
         for (RemoteNodeDescriptor descriptor : RemoteNodeDescriptor.values()) {
-            if (descriptor.getRemoteCluster().equals(cluster)) {
+            if (descriptor.getRemoteCluster() != null
+                && descriptor.getRemoteCluster().equals(cluster)) {
                 unsortedDescriptors.add(descriptor);
             }
         }
@@ -212,7 +220,8 @@ public static List<RemoteNodeDescriptor> descriptorsSortedByRamThenCost(
         SupportedRemoteClusters cluster) {
         List<RemoteNodeDescriptor> unsortedDescriptors = new ArrayList<>();
         for (RemoteNodeDescriptor descriptor : RemoteNodeDescriptor.values()) {
-            if (descriptor.getRemoteCluster().equals(cluster)) {
+            if (descriptor.getRemoteCluster() != null
+                && descriptor.getRemoteCluster().equals(cluster)) {
                 unsortedDescriptors.add(descriptor);
             }
         }
@@ -236,8 +245,9 @@ private static int compareByRamThenCost(RemoteNodeDescriptor d1, RemoteNodeDescr
     private static RemoteNodeDescriptor getArchWithMaxGigsPerCore(SupportedRemoteClusters cluster) {
         RemoteNodeDescriptor maxGigsArch = null;
         for (RemoteNodeDescriptor descriptor : RemoteNodeDescriptor.values()) {
-            if (descriptor.getRemoteCluster().equals(cluster) && (maxGigsArch == null
-                || descriptor.getGigsPerCore() > maxGigsArch.getGigsPerCore())) {
+            if (descriptor.getRemoteCluster() != null
+                && descriptor.getRemoteCluster().equals(cluster) && (maxGigsArch == null
+                    || descriptor.getGigsPerCore() > maxGigsArch.getGigsPerCore())) {
                 maxGigsArch = descriptor;
             }
         }
@@ -247,7 +257,7 @@ private static RemoteNodeDescriptor getArchWithMaxGigsPerCore(SupportedRemoteClu
     public static RemoteNodeDescriptor fromName(String name) {
         RemoteNodeDescriptor descriptor = null;
         for (RemoteNodeDescriptor d : RemoteNodeDescriptor.values()) {
-            if (d.getNodeName().contentEquals(name)) {
+            if (d.getNodeName() != null && d.getNodeName().equals(name)) {
                 descriptor = d;
             }
         }
@@ -281,13 +291,19 @@ public static boolean nodeHasSufficientRam(RemoteNodeDescriptor descriptor,
         return descriptor.getMaxGigs() >= requiredRamGigs;
     }
 
-    public static String[] allNames() {
+    public static RemoteNodeDescriptor[] allDescriptors() {
         List<RemoteNodeDescriptor> descriptors = descriptorsSortedByCost(
             SupportedRemoteClusters.remoteCluster());
-        String[] allNames = new String[descriptors.size()];
-        for (int i = 0; i < allNames.length; i++) {
-            allNames[i] = descriptors.get(i).name();
+        RemoteNodeDescriptor[] allDescriptors = new RemoteNodeDescriptor[descriptors.size() + 1];
+        allDescriptors[0] = ANY;
+        for (int i = 1; i < allDescriptors.length; i++) {
+            allDescriptors[i] = descriptors.get(i - 1);
         }
-        return allNames;
+        return allDescriptors;
+    }
+
+    @Override
+    public String toString() {
+        return StringUtils.constantToCamelWithSpaces(super.toString());
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/RemoteParameters.java b/src/main/java/gov/nasa/ziggy/module/remote/RemoteParameters.java
index 85ce17d..f6d7bd1 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/RemoteParameters.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/RemoteParameters.java
@@ -2,10 +2,15 @@
 
 import static com.google.common.base.Preconditions.checkState;
 
-import org.apache.commons.lang.math.NumberUtils;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 
+import gov.nasa.ziggy.collections.ZiggyDataType;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 
 /**
  * User-facing parameters that control remote execution (on the NAS, AWS, or other large-scale batch
@@ -15,11 +20,13 @@
  *
  * @author PT
  */
-public class RemoteParameters implements Parameters {
-
-    public RemoteParameters() {
+public class RemoteParameters extends Parameters {
 
-    }
+    // N.B.: If you add, remove, or rename fields, you will need to do the following:
+    // 1. Edit the default constructor to keep the TypedParameter instances matched to
+    // the fields.
+    // 2. In the setter methods, make sure that any changes to the setters set both the
+    // field value and the value of the corresponding TypedParameter instance.
 
     // REQUIRED parameters
     private boolean enabled;
@@ -78,29 +85,45 @@ public RemoteParameters() {
      */
     private boolean wallTimeScaling = true;
 
+    public RemoteParameters() {
+        Set<TypedParameter> typedParameters = new HashSet<>();
+        typedParameters
+            .add(new TypedParameter("enabled", "false", ZiggyDataType.ZIGGY_BOOLEAN, true));
+        typedParameters.add(
+            new TypedParameter("subtaskMaxWallTimeHours", "0", ZiggyDataType.ZIGGY_DOUBLE, true));
+        typedParameters.add(new TypedParameter("subtaskTypicalWallTimeHours", "0",
+            ZiggyDataType.ZIGGY_DOUBLE, true));
+        typedParameters
+            .add(new TypedParameter("gigsPerSubtask", "0", ZiggyDataType.ZIGGY_DOUBLE, true));
+        typedParameters.add(new TypedParameter("minSubtasksForRemoteExecution", "0",
+            ZiggyDataType.ZIGGY_INT, true));
+        typedParameters.add(
+            new TypedParameter("remoteNodeArchitecture", "", ZiggyDataType.ZIGGY_STRING, true));
+        typedParameters.add(new TypedParameter("queueName", "", ZiggyDataType.ZIGGY_STRING, true));
+        typedParameters
+            .add(new TypedParameter("subtasksPerCore", "", ZiggyDataType.ZIGGY_DOUBLE, true));
+        typedParameters.add(new TypedParameter("maxNodes", "", ZiggyDataType.ZIGGY_INT, true));
+        typedParameters
+            .add(new TypedParameter("minCoresPerNode", "", ZiggyDataType.ZIGGY_INT, true));
+        typedParameters
+            .add(new TypedParameter("minGigsPerNode", "", ZiggyDataType.ZIGGY_DOUBLE, true));
+        typedParameters
+            .add(new TypedParameter("optimizer", "CORES", ZiggyDataType.ZIGGY_STRING, true));
+        typedParameters
+            .add(new TypedParameter("nodeSharing", "true", ZiggyDataType.ZIGGY_BOOLEAN, true));
+        typedParameters
+            .add(new TypedParameter("wallTimeScaling", "true", ZiggyDataType.ZIGGY_BOOLEAN, true));
+        setParameters(typedParameters);
+    }
+
     /**
-     * Copy constructor.
+     * Copy constructor. Uses a copy of the {@link TypedParameter} instances from the original to
+     * instantiate the {@link TypedParameter} collection in the new object, and uses the
+     * {@link ParametersInterface#populate(Set<TypedParameter>)} method to ensure that the fields
+     * are updated with the typed parameter values.
      */
     public RemoteParameters(RemoteParameters original) {
-        enabled = original.enabled;
-        subtaskMaxWallTimeHours = original.subtaskMaxWallTimeHours;
-        subtaskTypicalWallTimeHours = original.subtaskTypicalWallTimeHours;
-        gigsPerSubtask = original.gigsPerSubtask;
-
-        remoteNodeArchitecture = copyOrEmptyString(original.remoteNodeArchitecture);
-        queueName = copyOrEmptyString(original.queueName);
-        subtasksPerCore = copyOrEmptyString(original.subtasksPerCore);
-        maxNodes = copyOrEmptyString(original.maxNodes);
-        minCoresPerNode = copyOrEmptyString(original.minCoresPerNode);
-        minGigsPerNode = copyOrEmptyString(original.minGigsPerNode);
-        optimizer = copyOrEmptyString(original.optimizer);
-
-        nodeSharing = original.nodeSharing;
-        wallTimeScaling = original.wallTimeScaling;
-    }
-
-    private String copyOrEmptyString(String s1) {
-        return s1 != null ? new String(s1) : new String();
+        populate(original.getParametersCopy());
     }
 
     public PbsParameters pbsParametersInstance() {
@@ -130,22 +153,20 @@ public void validate() {
             "Typical wall time must be <= maximum wall time");
         checkState(gigsPerSubtask > 0, "gigsPerSubtask must be > 0");
 
-        checkState(
-            subtasksPerCore.isEmpty()
-                || NumberUtils.isNumber(subtasksPerCore) && Double.parseDouble(subtasksPerCore) > 0,
+        checkState(subtasksPerCore.isEmpty()
+            || NumberUtils.isCreatable(subtasksPerCore) && Double.parseDouble(subtasksPerCore) > 0,
             "subtasksPerCore must be > 0");
         checkState(
-            maxNodes.isEmpty() || NumberUtils.isNumber(maxNodes) && Integer.parseInt(maxNodes) > 0,
+            maxNodes.isEmpty()
+                || NumberUtils.isCreatable(maxNodes) && Integer.parseInt(maxNodes) > 0,
             "maxNodes must be > 0");
-        checkState(
-            minCoresPerNode.isEmpty()
-                || NumberUtils.isNumber(minCoresPerNode) && Integer.parseInt(minCoresPerNode) > 0,
+        checkState(minCoresPerNode.isEmpty()
+            || NumberUtils.isCreatable(minCoresPerNode) && Integer.parseInt(minCoresPerNode) > 0,
             "minCoresPerNode must be > 0");
-        checkState(
-            minGigsPerNode.isEmpty()
-                || NumberUtils.isNumber(minGigsPerNode) && Double.parseDouble(minGigsPerNode) > 0,
+        checkState(minGigsPerNode.isEmpty()
+            || NumberUtils.isCreatable(minGigsPerNode) && Double.parseDouble(minGigsPerNode) > 0,
             "minGigsPerNode must be > 0");
-        checkState(queueName.isEmpty() || RemoteQueueDescriptor.fromName(queueName) != null,
+        checkState(queueName.isEmpty() || RemoteQueueDescriptor.fromQueueName(queueName) != null,
             "Queue name not recognized: " + queueName);
         checkState(
             remoteNodeArchitecture.isEmpty()
@@ -163,16 +184,19 @@ public void validate() {
 
     private boolean checkArchitectureAndQueue() {
         RemoteNodeDescriptor node = RemoteNodeDescriptor.fromName(remoteNodeArchitecture);
-        RemoteQueueDescriptor queue = RemoteQueueDescriptor.fromName(queueName);
+        RemoteQueueDescriptor queue = RemoteQueueDescriptor.fromQueueName(queueName);
         return node.getRemoteCluster().equals(queue.getRemoteCluster());
     }
 
+    // NB: the setters here must set both the RemoteParameters field and the value of the
+    // corresponding TypedParameter instance.
     public boolean isEnabled() {
         return enabled;
     }
 
     public void setEnabled(boolean enabled) {
         this.enabled = enabled;
+        getParameter("enabled").setValue(enabled);
     }
 
     public double getSubtaskMaxWallTimeHours() {
@@ -180,6 +204,7 @@ public double getSubtaskMaxWallTimeHours() {
     }
 
     public void setSubtaskMaxWallTimeHours(double subtaskMaxWallTimeHours) {
+        getParameter("subtaskMaxWallTimeHours").setValue(subtaskMaxWallTimeHours);
         this.subtaskMaxWallTimeHours = subtaskMaxWallTimeHours;
     }
 
@@ -188,6 +213,7 @@ public double getSubtaskTypicalWallTimeHours() {
     }
 
     public void setSubtaskTypicalWallTimeHours(double subtaskTypicalWallTimeHours) {
+        getParameter("subtaskTypicalWallTimeHours").setValue(subtaskTypicalWallTimeHours);
         this.subtaskTypicalWallTimeHours = subtaskTypicalWallTimeHours;
     }
 
@@ -196,6 +222,7 @@ public double getGigsPerSubtask() {
     }
 
     public void setGigsPerSubtask(double gigsPerSubtask) {
+        getParameter("gigsPerSubtask").setValue(gigsPerSubtask);
         this.gigsPerSubtask = gigsPerSubtask;
     }
 
@@ -204,6 +231,7 @@ public String getRemoteNodeArchitecture() {
     }
 
     public void setRemoteNodeArchitecture(String remoteNodeArchitecture) {
+        getParameter("remoteNodeArchitecture").setValue(remoteNodeArchitecture);
         this.remoteNodeArchitecture = remoteNodeArchitecture;
     }
 
@@ -212,6 +240,7 @@ public String getQueueName() {
     }
 
     public void setQueueName(String queueName) {
+        getParameter("queueName").setValue(queueName);
         this.queueName = queueName;
     }
 
@@ -220,6 +249,7 @@ public String getSubtasksPerCore() {
     }
 
     public void setSubtasksPerCore(String subtasksPerCore) {
+        getParameter("subtasksPerCore").setValue(subtasksPerCore);
         this.subtasksPerCore = subtasksPerCore;
     }
 
@@ -228,6 +258,7 @@ public String getMaxNodes() {
     }
 
     public void setMaxNodes(String maxNodes) {
+        getParameter("maxNodes").setValue(maxNodes);
         this.maxNodes = maxNodes;
     }
 
@@ -236,6 +267,7 @@ public String getMinCoresPerNode() {
     }
 
     public void setMinCoresPerNode(String minCoresPerNode) {
+        getParameter("minCoresPerNode").setValue(minCoresPerNode);
         this.minCoresPerNode = minCoresPerNode;
     }
 
@@ -244,6 +276,7 @@ public String getMinGigsPerNode() {
     }
 
     public void setMinGigsPerNode(String minGigsPerNode) {
+        getParameter("minGigsPerNode").setValue(minGigsPerNode);
         this.minGigsPerNode = minGigsPerNode;
     }
 
@@ -252,6 +285,7 @@ public String getOptimizer() {
     }
 
     public void setOptimizer(String optimizer) {
+        getParameter("optimizer").setValue(optimizer);
         this.optimizer = optimizer;
     }
 
@@ -260,6 +294,7 @@ public boolean isNodeSharing() {
     }
 
     public void setNodeSharing(boolean nodeSharing) {
+        getParameter("nodeSharing").setValue(nodeSharing);
         this.nodeSharing = nodeSharing;
     }
 
@@ -268,6 +303,7 @@ public boolean isWallTimeScaling() {
     }
 
     public void setWallTimeScaling(boolean wallTimeScaling) {
+        getParameter("wallTimeScaling").setValue(wallTimeScaling);
         this.wallTimeScaling = wallTimeScaling;
     }
 
@@ -276,7 +312,7 @@ public int getMinSubtasksForRemoteExecution() {
     }
 
     public void setMinSubtasksForRemoteExecution(int minSubtasksForRemoteExecution) {
+        getParameter("minSubtasksForRemoteExecution").setValue(minSubtasksForRemoteExecution);
         this.minSubtasksForRemoteExecution = minSubtasksForRemoteExecution;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/RemoteQueueDescriptor.java b/src/main/java/gov/nasa/ziggy/module/remote/RemoteQueueDescriptor.java
index 6205d3c..8f5da7f 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/RemoteQueueDescriptor.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/RemoteQueueDescriptor.java
@@ -1,6 +1,9 @@
 package gov.nasa.ziggy.module.remote;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -11,23 +14,32 @@
  *
  * @author PT
  */
-public enum RemoteQueueDescriptor {
+public enum RemoteQueueDescriptor implements Comparator<RemoteQueueDescriptor> {
 
-    LOW("low", 4.0, SupportedRemoteClusters.NAS),
-    NORMAL("normal", 12.0, SupportedRemoteClusters.NAS),
-    LONG("long", 120.0, SupportedRemoteClusters.NAS),
-    CLOUD("cloud", Double.MAX_VALUE, SupportedRemoteClusters.AWS),
-    UNKNOWN("", Double.MAX_VALUE, SupportedRemoteClusters.NAS);
+    ANY,
+    LOW("low", 4.0, SupportedRemoteClusters.NAS, true),
+    NORMAL("normal", 12.0, SupportedRemoteClusters.NAS, true),
+    LONG("long", 120.0, SupportedRemoteClusters.NAS, true),
+    DEVEL("devel", 2.0, SupportedRemoteClusters.NAS, false),
+    DEBUG("debug", 2.0, SupportedRemoteClusters.NAS, false),
+    RESERVED("reserved", Double.MAX_VALUE, SupportedRemoteClusters.NAS, false),
+    CLOUD("cloud", Double.MAX_VALUE, SupportedRemoteClusters.AWS, true),
+    UNKNOWN("", Double.MAX_VALUE, SupportedRemoteClusters.NAS, false);
 
     private String queueName;
     private double maxWallTimeHours;
     private SupportedRemoteClusters remoteCluster;
+    private boolean autoSelectable;
 
     RemoteQueueDescriptor(String queueName, double maxWallTimeHours,
-        SupportedRemoteClusters supportedCluster) {
+        SupportedRemoteClusters supportedCluster, boolean autoSelectable) {
         this.queueName = queueName;
         this.maxWallTimeHours = maxWallTimeHours;
         remoteCluster = supportedCluster;
+        this.autoSelectable = autoSelectable;
+    }
+
+    RemoteQueueDescriptor() {
     }
 
     public String getQueueName() {
@@ -42,13 +54,36 @@ public SupportedRemoteClusters getRemoteCluster() {
         return remoteCluster;
     }
 
-    public static RemoteQueueDescriptor fromName(String name) {
-        if (StringUtils.isEmpty(name)) {
-            throw new IllegalArgumentException("name argument cannot be null or empty");
+    public boolean isAutoSelectable() {
+        return autoSelectable;
+    }
+
+    @Override
+    public int compare(RemoteQueueDescriptor o1, RemoteQueueDescriptor o2) {
+        return (int) (o1.maxWallTimeHours - o2.maxWallTimeHours);
+    }
+
+    /**
+     * Uses the standard {@link #compare(RemoteQueueDescriptor, RemoteQueueDescriptor) method
+     * enforced by the {@link Comparator} interface to construct a knock-off of the
+     * {@link #compareTo(RemoteQueueDescriptor)} method. The reason for this is that enumerations
+     * have a final {@link #compareTo(RemoteQueueDescriptor)}, so it cannot be overridden, and the
+     * syntax of {@link #compare(RemoteQueueDescriptor, RemoteQueueDescriptor)} is stupid: it's an
+     * instance method that requires two arguments (i.e., you could say a = b.compare(c, d), which
+     * is stupid).
+     */
+    public int compare(RemoteQueueDescriptor other) {
+        return compare(this, other);
+    }
+
+    public static RemoteQueueDescriptor fromQueueName(String queueName) {
+        checkArgument(!StringUtils.isEmpty(queueName), "name argument cannot be null or empty");
+        if (queueName.startsWith("R")) {
+            return RESERVED;
         }
         RemoteQueueDescriptor descriptor = UNKNOWN;
         for (RemoteQueueDescriptor d : RemoteQueueDescriptor.values()) {
-            if (d.getQueueName().contentEquals(name)) {
+            if (d.getQueueName() != null && d.getQueueName().contentEquals(queueName)) {
                 descriptor = d;
             }
         }
@@ -57,34 +92,44 @@ public static RemoteQueueDescriptor fromName(String name) {
 
     /**
      * Returns the remote queue descriptors for a given cluster sorted by their maximum allowed wall
-     * time.
+     * time. Only the queues that are auto-selectable will be returned, thus the DEBUG, DEVEL,
+     * UNKNOWN, and RESERVED descriptors will never be included in the returned List.
      */
     public static List<RemoteQueueDescriptor> descriptorsSortedByMaxTime(
         SupportedRemoteClusters remoteCluster) {
         List<RemoteQueueDescriptor> unsortedDescriptors = new ArrayList<>();
         for (RemoteQueueDescriptor descriptor : RemoteQueueDescriptor.values()) {
-            if (descriptor.getRemoteCluster().equals(remoteCluster)
-                && !descriptor.equals(UNKNOWN)) {
+            if (descriptor.getRemoteCluster() != null
+                && descriptor.getRemoteCluster().equals(remoteCluster)
+                && descriptor.isAutoSelectable()) {
                 unsortedDescriptors.add(descriptor);
             }
         }
-        return unsortedDescriptors.stream()
-            .sorted(RemoteQueueDescriptor::compareByMaxTime)
-            .collect(Collectors.toList());
+        return unsortedDescriptors.stream().sorted().collect(Collectors.toList());
     }
 
-    private static int compareByMaxTime(RemoteQueueDescriptor d1, RemoteQueueDescriptor d2) {
-        return (int) Math.signum(d1.getMaxWallTimeHours() - d2.getMaxWallTimeHours());
+    public static RemoteQueueDescriptor max(RemoteQueueDescriptor r1, RemoteQueueDescriptor r2) {
+        return r1.compare(r2) > 0 ? r1 : r2;
     }
 
-    public static String[] allNames() {
+    public static RemoteQueueDescriptor[] allDescriptors() {
         List<RemoteQueueDescriptor> descriptors = descriptorsSortedByMaxTime(
             SupportedRemoteClusters.remoteCluster());
-        String[] allNames = new String[descriptors.size()];
-        for (int i = 0; i < allNames.length; i++) {
-            allNames[i] = descriptors.get(i).name();
+        if (SupportedRemoteClusters.remoteCluster().equals(SupportedRemoteClusters.NAS)) {
+            descriptors.add(DEBUG);
+            descriptors.add(DEVEL);
+            descriptors.add(RESERVED);
+        }
+        RemoteQueueDescriptor[] allDescriptors = new RemoteQueueDescriptor[descriptors.size() + 1];
+        allDescriptors[0] = ANY;
+        for (int i = 1; i < allDescriptors.length; i++) {
+            allDescriptors[i] = descriptors.get(i - 1);
         }
-        return allNames;
+        return allDescriptors;
     }
 
+    @Override
+    public String toString() {
+        return gov.nasa.ziggy.util.StringUtils.constantToSentenceWithSpaces(super.toString());
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/SupportedRemoteClusters.java b/src/main/java/gov/nasa/ziggy/module/remote/SupportedRemoteClusters.java
index d6ab64d..03ffafc 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/SupportedRemoteClusters.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/SupportedRemoteClusters.java
@@ -2,13 +2,12 @@
 
 import java.io.File;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.apache.commons.exec.CommandLine;
 
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.module.remote.aws.AwsExecutor;
 import gov.nasa.ziggy.module.remote.nas.NasExecutor;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.process.ExternalProcess;
 
@@ -50,8 +49,8 @@ private static void setRemoteCluster() {
         // (generally this means we are emulating a remote cluster for test purposes).
         File osReleaseFile = new File("/etc/os-release");
         if (!osReleaseFile.exists()) {
-            Configuration config = ZiggyConfiguration.getInstance();
-            String clusterName = config.getString(PropertyNames.CLUSTER_PROPERTY_NAME,
+            ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+            String clusterName = config.getString(PropertyName.REMOTE_CLUSTER.property(),
                 defaultCluster.name());
             remoteCluster = SupportedRemoteClusters.valueOf(clusterName.toUpperCase());
         } else {
@@ -59,18 +58,13 @@ private static void setRemoteCluster() {
             // See if the /etc/os-release file has the string "Amazon" in it
             ExternalProcess p = ExternalProcess
                 .simpleExternalProcess(CommandLine.parse("/usr/bin/grep Amazon /etc/os-release"));
-            try {
-                p.run(true, 0);
-                String grepResult = p.getStdoutString();
-                if (grepResult.isEmpty()) {
-                    remoteCluster = SupportedRemoteClusters.NAS;
-                } else {
-                    remoteCluster = SupportedRemoteClusters.AWS;
-                }
-            } catch (Exception e) {
-                throw new PipelineException("Unable to set remote cluster", e);
+            p.run(true, 0);
+            String grepResult = p.getStdoutString();
+            if (grepResult.isEmpty()) {
+                remoteCluster = SupportedRemoteClusters.NAS;
+            } else {
+                remoteCluster = SupportedRemoteClusters.AWS;
             }
-
         }
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/TimestampFile.java b/src/main/java/gov/nasa/ziggy/module/remote/TimestampFile.java
index ea7d38c..ebab2aa 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/TimestampFile.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/TimestampFile.java
@@ -8,6 +8,8 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * @author Todd Klaus
@@ -19,6 +21,7 @@ public enum Event {
         ARRIVE_PFE, QUEUED_PBS, PBS_JOB_START, PBS_JOB_FINISH, SUB_TASK_START, SUB_TASK_FINISH
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public static boolean create(File directory, Event name, long timestamp) {
         if (!delete(directory, name)) {
             return false;
@@ -61,6 +64,7 @@ public static boolean create(File directory, Event name) {
         return create(directory, name, System.currentTimeMillis());
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     public static long timestamp(File directory, final Event name) {
         File[] files = directory
             .listFiles((FileFilter) f -> f.getName().startsWith(name.toString()) && f.isFile());
@@ -86,8 +90,9 @@ public static long timestamp(File directory, final Event name) {
         try {
             timeMillis = Long.parseLong(timeString);
         } catch (NumberFormatException e) {
-            throw new PipelineException(
-                "Unable to parse timestamp file: " + filename + ", timeString = " + timeString);
+            // This can never occur. By construction, the timestamp files are written with
+            // valid long integer values.
+            throw new AssertionError(e);
         }
 
         return timeMillis;
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/aws/AwsExecutor.java b/src/main/java/gov/nasa/ziggy/module/remote/aws/AwsExecutor.java
index 3192337..e8fc5c8 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/aws/AwsExecutor.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/aws/AwsExecutor.java
@@ -1,9 +1,5 @@
 package gov.nasa.ziggy.module.remote.aws;
 
-import java.io.IOException;
-
-import org.apache.commons.configuration.ConfigurationException;
-
 import gov.nasa.ziggy.module.StateFile;
 import gov.nasa.ziggy.module.remote.PbsParameters;
 import gov.nasa.ziggy.module.remote.RemoteExecutor;
@@ -77,8 +73,7 @@ public PbsParameters generatePbsParameters(RemoteParameters remoteParameters,
     }
 
     @Override
-    protected void submitForExecution(StateFile stateFile)
-        throws IOException, ConfigurationException {
+    protected void submitForExecution(StateFile stateFile) {
         submitToPbsInternal(stateFile, pipelineTask, algorithmLogDir(), taskDataDir());
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/nas/NasExecutor.java b/src/main/java/gov/nasa/ziggy/module/remote/nas/NasExecutor.java
index 61a1a4e..85a8a81 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/nas/NasExecutor.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/nas/NasExecutor.java
@@ -42,7 +42,7 @@ public PbsParameters generatePbsParameters(RemoteParameters remoteParameters,
     }
 
     @Override
-    protected void submitForExecution(StateFile stateFile) throws Exception {
+    protected void submitForExecution(StateFile stateFile) {
         submitToPbsInternal(stateFile, pipelineTask, algorithmLogDir(), taskDataDir());
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/module/remote/nas/NasQueueTimeMetrics.java b/src/main/java/gov/nasa/ziggy/module/remote/nas/NasQueueTimeMetrics.java
index eaca741..2d96e4d 100644
--- a/src/main/java/gov/nasa/ziggy/module/remote/nas/NasQueueTimeMetrics.java
+++ b/src/main/java/gov/nasa/ziggy/module/remote/nas/NasQueueTimeMetrics.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -38,6 +38,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -53,12 +54,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.module.remote.RemoteNodeDescriptor;
 import gov.nasa.ziggy.module.remote.SupportedRemoteClusters;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
@@ -99,6 +101,7 @@ private String fullDestination(String qsResultsDestination) {
     }
 
     // This method has to stay public so that the unit tests will run correctly.
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public void populate(String qsResultsDestination) {
 
         if (remoteNodeNameMap.isEmpty()) {
@@ -110,7 +113,7 @@ public void populate(String qsResultsDestination) {
         }
         if (StringUtils.isEmpty(directorate)) {
             directorate = ZiggyConfiguration.getInstance()
-                .getString(PropertyNames.NASA_DIRECTORATE_PROP_NAME, DEFAULT_DIRECTORATE)
+                .getString(PropertyName.REMOTE_NASA_DIRECTORATE.property(), DEFAULT_DIRECTORATE)
                 .toUpperCase();
         }
         Long currentTime = System.currentTimeMillis();
@@ -125,6 +128,10 @@ public void populate(String qsResultsDestination) {
             try {
                 p.run(true, 0);
             } catch (Exception e) {
+                // The qs command is potentially unreliable and prone to
+                // intermittent failures that appear here as runtime exceptions.
+                // In this case, we don't want execution to stop because we can
+                // use the most recent prior run of qs to perform the calculations.
                 log.error("Error when attempting to run qs command", e);
             }
             Set<ArchitectureQueueTimeMetrics> allMetrics = parseQsCsv(qsResultsDestination,
@@ -151,6 +158,7 @@ static void setSingletonInstance(NasQueueTimeMetrics instance) {
         NasQueueTimeMetrics.instance = instance;
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     private Set<ArchitectureQueueTimeMetrics> parseQsCsv(String file, String nasaDivision) {
 
         Set<ArchitectureQueueTimeMetrics> metricsAllArchitectures = new HashSet<>();
@@ -181,7 +189,7 @@ private Set<ArchitectureQueueTimeMetrics> parseQsCsv(String file, String nasaDiv
                         archRecord.get(runoutIndex), archRecord.get(expansionIndex)));
             }
         } catch (IOException e) {
-            throw new PipelineException("Unable to parse file " + file, e);
+            throw new UncheckedIOException("Unable to parse file " + file.toString(), e);
         }
         return metricsAllArchitectures;
     }
@@ -268,7 +276,5 @@ public static void main(String[] args) {
             Double expansion = metrics.getQueueTime(descriptor);
             System.out.println(archName + "  " + runout + "  " + expansion);
         }
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/parameters/DefaultParameters.java b/src/main/java/gov/nasa/ziggy/parameters/DefaultParameters.java
deleted file mode 100644
index 32be54d..0000000
--- a/src/main/java/gov/nasa/ziggy/parameters/DefaultParameters.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package gov.nasa.ziggy.parameters;
-
-import java.util.Objects;
-
-import gov.nasa.ziggy.pipeline.definition.TypedParameterCollection;
-
-/**
- * Parameters implementation for use-cases in which no specific Java class is required.
- * <p>
- * The DefaultParameters class stores parameters using a Set of TypedProperty instances, each of
- * which contains a name, value, and data type. This is a different approach from the standard one
- * of supporting every parameter set with a unique Java class that implements Parameters and which
- * has parameter names represented as member names.
- * <p>
- * From the user's point of view, a DefaultParameters instance behaves much like any other
- * Parameters instance, specifically in that the parameters are serialized to HDF5 files in a manner
- * identical to parameter sets backed by a Java class.
- *
- * @author PT
- */
-public class DefaultParameters extends TypedParameterCollection implements Parameters {
-
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name);
-    }
-
-    // Note: hashCode() and equals() use only the name so that there cannot be any duplicate copies
-    // of the parameter set in a Set<DefaultParameters>.
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        DefaultParameters other = (DefaultParameters) obj;
-        if (!Objects.equals(name, other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/parameters/InternalParameters.java b/src/main/java/gov/nasa/ziggy/parameters/InternalParameters.java
index 5554328..42af5bd 100644
--- a/src/main/java/gov/nasa/ziggy/parameters/InternalParameters.java
+++ b/src/main/java/gov/nasa/ziggy/parameters/InternalParameters.java
@@ -1,12 +1,12 @@
 package gov.nasa.ziggy.parameters;
 
 /**
- * This interface indicates a parameter class that is intended for internal use only. Classes that
+ * This class indicates a parameter class that is intended for internal use only. Classes that
  * implement {@link InternalParameters} are not displayed on the GUI and hence cannot be edited via
  * the GUI.
  *
  * @author PT
  */
-public interface InternalParameters extends Parameters {
+public class InternalParameters extends Parameters {
 
 }
diff --git a/src/main/java/gov/nasa/ziggy/parameters/ModuleParameters.java b/src/main/java/gov/nasa/ziggy/parameters/ModuleParameters.java
index 5c3d1e5..20c57f7 100644
--- a/src/main/java/gov/nasa/ziggy/parameters/ModuleParameters.java
+++ b/src/main/java/gov/nasa/ziggy/parameters/ModuleParameters.java
@@ -14,14 +14,13 @@
  */
 public class ModuleParameters implements Persistable {
 
-    private List<Parameters> moduleParameters = new ArrayList<>();
+    private List<ParametersInterface> moduleParameters = new ArrayList<>();
 
-    public List<Parameters> getModuleParameters() {
+    public List<ParametersInterface> getModuleParameters() {
         return moduleParameters;
     }
 
-    public void setModuleParameters(List<Parameters> moduleParameters) {
+    public void setModuleParameters(List<ParametersInterface> moduleParameters) {
         this.moduleParameters = moduleParameters;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/parameters/ParameterLibrary.java b/src/main/java/gov/nasa/ziggy/parameters/ParameterLibrary.java
index ecb27ce..2c59ddf 100644
--- a/src/main/java/gov/nasa/ziggy/parameters/ParameterLibrary.java
+++ b/src/main/java/gov/nasa/ziggy/parameters/ParameterLibrary.java
@@ -1,23 +1,20 @@
 package gov.nasa.ziggy.parameters;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_URL_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_USERNAME_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_URL;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_USERNAME;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.GregorianCalendar;
 import java.util.List;
 
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
 import gov.nasa.ziggy.pipeline.xml.HasXmlSchemaFilename;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.util.ZiggyVersion;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -39,15 +36,9 @@ public class ParameterLibrary implements HasXmlSchemaFilename {
     @XmlAttribute(required = false)
     private String release = "";
 
-    @XmlAttribute(required = false, name = "repository-revision")
-    private String repositoryRevision = "";
-
     @XmlAttribute(required = false, name = "database-user")
     private String databaseUser = "";
 
-    @XmlAttribute(required = false, name = "build-date")
-    private XMLGregorianCalendar buildDate;
-
     @XmlAttribute(required = false, name = "override-only")
     private Boolean overrideOnly = false;
 
@@ -58,23 +49,15 @@ public class ParameterLibrary implements HasXmlSchemaFilename {
     @XmlAttribute(required = false, name = "database-url")
     private String databaseUrl = "";
 
-    @XmlAttribute(required = false, name = "repository-branch")
-    private String repositoryBranch = "";
-
     @XmlElement(name = "parameter-set")
     private List<ParameterSet> parameterSets = new ArrayList<>();
 
-    public ParameterLibrary() throws DatatypeConfigurationException {
-        Configuration config = ZiggyConfiguration.getInstance();
-        GregorianCalendar gc = new GregorianCalendar();
-        gc.setTime(ZiggyVersion.getBuildDate());
-        buildDate = DatatypeFactory.newInstance().newXMLGregorianCalendar(gc);
-        release = ZiggyVersion.getSoftwareVersion();
-        databaseUrl = config.getString(HIBERNATE_URL_PROP_NAME, "");
-        databaseUser = config.getString(HIBERNATE_USERNAME_PROP_NAME, "");
+    public ParameterLibrary() {
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+        release = config.getString(PropertyName.ZIGGY_VERSION.property());
+        databaseUrl = config.getString(HIBERNATE_URL.property(), "");
+        databaseUser = config.getString(HIBERNATE_USERNAME.property(), "");
         overrideOnly = false;
-        repositoryBranch = ZiggyVersion.getBranch();
-        repositoryRevision = ZiggyVersion.getRevision();
     }
 
     public String getRelease() {
@@ -85,14 +68,6 @@ public void setRelease(String release) {
         this.release = release;
     }
 
-    public String getRepositoryBranch() {
-        return repositoryBranch;
-    }
-
-    public void setRepositoryBranch(String repositoryBranch) {
-        this.repositoryBranch = repositoryBranch;
-    }
-
     public String getDatabaseUser() {
         return databaseUser;
     }
@@ -101,14 +76,6 @@ public void setDatabaseUser(String databaseUser) {
         this.databaseUser = databaseUser;
     }
 
-    public XMLGregorianCalendar getBuildDate() {
-        return buildDate;
-    }
-
-    public void setBuildDate(XMLGregorianCalendar buildDate) {
-        this.buildDate = buildDate;
-    }
-
     public Boolean getOverrideOnly() {
         return overrideOnly;
     }
@@ -140,37 +107,33 @@ public void setParameterSets(List<ParameterSet> parameterSets) {
     public void setDatabaseParameterSets(Collection<ParameterSetDescriptor> descriptors) {
         parameterSets.clear();
         for (ParameterSetDescriptor descriptor : descriptors) {
-            parameterSets.add(descriptor.getLibraryParamSet());
+            parameterSets.add(descriptor.getParameterSet());
         }
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public List<ParameterSetDescriptor> getParameterSetDescriptors() {
         List<ParameterSetDescriptor> descriptors = new ArrayList<>();
         for (ParameterSet parameterSet : parameterSets) {
-            ParameterSetDescriptor descriptor = new ParameterSetDescriptor(
-                parameterSet.getName().getName(), parameterSet.getClassname());
+            ParameterSetDescriptor descriptor = new ParameterSetDescriptor(parameterSet.getName(),
+                parameterSet.getClassname());
             try {
                 parameterSet.populateDatabaseFields();
-                descriptor.setImportedParamsBean(parameterSet.getParameters());
             } catch (ClassNotFoundException e) {
+                // This means that the class name entered in the parameter library
+                // XML file doesn't match any class known to the worker. In that
+                // case, we don't want to stop reading in parameter sets, we just
+                // want to mark that this parameter set requires a nonexistent class.
                 descriptor.setState(ParameterSetDescriptor.State.CLASS_MISSING);
             }
+            descriptor.setParameterSet(parameterSet);
             descriptors.add(descriptor);
         }
         return descriptors;
     }
 
-    public String getRepositoryRevision() {
-        return repositoryRevision;
-    }
-
-    public void setRepositoryRevision(String repositoryRevision) {
-        this.repositoryRevision = repositoryRevision;
-    }
-
     @Override
     public String getXmlSchemaFilename() {
         return XML_SCHEMA_FILE_NAME;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/parameters/ParameterLibraryImportExportCli.java b/src/main/java/gov/nasa/ziggy/parameters/ParameterLibraryImportExportCli.java
index b0ade60..cc4f1c6 100644
--- a/src/main/java/gov/nasa/ziggy/parameters/ParameterLibraryImportExportCli.java
+++ b/src/main/java/gov/nasa/ziggy/parameters/ParameterLibraryImportExportCli.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -48,6 +48,8 @@
 
 import gov.nasa.ziggy.services.database.DatabaseTransaction;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 public class ParameterLibraryImportExportCli {
     private static final Logger log = LoggerFactory.getLogger(ParametersOperations.class);
@@ -74,7 +76,7 @@ public ParameterLibraryImportExportCli(boolean importLib, String[] filenames,
         Arrays.sort(filenames);
     }
 
-    public void go() throws Exception {
+    public void go() {
         ParametersOperations paramOps = new ParametersOperations();
         List<ParameterSetDescriptor> results = null;
 
@@ -104,7 +106,8 @@ private static void usageAndExit(Options options) {
         System.exit(-1);
     }
 
-    public static void main(String[] args) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.USAGE)
+    public static void main(String[] args) {
         Options options = new Options();
         options.addOption(IMPORT_OPT, false, "import parameter library from xml file");
         options.addOption(EXPORT_OPT, false, "export parameter library to xml file");
diff --git a/src/main/java/gov/nasa/ziggy/parameters/ParameterSetDescriptor.java b/src/main/java/gov/nasa/ziggy/parameters/ParameterSetDescriptor.java
index 4363dc9..cb61416 100644
--- a/src/main/java/gov/nasa/ziggy/parameters/ParameterSetDescriptor.java
+++ b/src/main/java/gov/nasa/ziggy/parameters/ParameterSetDescriptor.java
@@ -1,17 +1,27 @@
 package gov.nasa.ziggy.parameters;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
+import gov.nasa.ziggy.collections.ZiggyDataType;
+import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.ReflectionUtils;
 
 /**
  * Descriptor for a {@link ParameterSet}, either in the parameter library or in an export directory
  *
  * @author Todd Klaus
  */
-public class ParameterSetDescriptor {
+public class ParameterSetDescriptor implements Comparable<ParameterSetDescriptor> {
     public enum State {
         /** initial state */
         NONE,
@@ -48,8 +58,7 @@ public enum State {
     /** textual representation of the props in the export file */
     private String fileProps = null;
 
-    private ParameterSet libraryParamSet = null;
-    private BeanWrapper<Parameters> importedParamsBean = null;
+    private ParameterSet parameterSet;
 
     public ParameterSetDescriptor() {
     }
@@ -66,11 +75,11 @@ public ParameterSetDescriptor(String name, String className, State state) {
     }
 
     public Parameters parametersInstance() {
-        return importedParamsBean.getInstance();
+        return parameterSet.parametersInstance();
     }
 
     public Set<TypedParameter> getImportedProperties() {
-        return importedParamsBean.getTypedProperties();
+        return parameterSet.getTypedParameters();
     }
 
     /**
@@ -82,15 +91,7 @@ public Set<TypedParameter> getImportedProperties() {
      * </ol>
      */
     public void validate() {
-
-        // Data types
-        if (!getImportedParamsBean().checkPrimitiveDataTypes()) {
-            throw new IllegalStateException("Parameter set descriptor " + getName()
-                + " typed property values do not match expected types");
-        }
-
-        // Parameter names
-        validateTypedProperties(getFullParametersBean().getTypedProperties());
+        validateTypedProperties(parameterSet.getTypedParameters());
     }
 
     /**
@@ -99,7 +100,7 @@ public void validate() {
      * {@link ParameterSet}.
      */
     public void validateAgainstParameterSet(ParameterSet parameterSet) {
-        validateTypedProperties(parameterSet.getParameters().getTypedProperties());
+        validateTypedProperties(parameterSet.getTypedParameters());
     }
 
     private void validateTypedProperties(Set<TypedParameter> expectedTypedProperties) {
@@ -112,9 +113,109 @@ private void validateTypedProperties(Set<TypedParameter> expectedTypedProperties
         }
     }
 
-    public BeanWrapper<Parameters> getFullParametersBean() {
-        Parameters p = parametersInstance();
-        return new BeanWrapper<>(p);
+    /**
+     * Sets the data type information of the {@link TypedParameter} instances based on any fields in
+     * the {@link Parameters} class.
+     * <p>
+     * Subclasses of {@link Parameters} have fields with data types and as a result, the data types
+     * are omitted from the XML files that define the corresponding parameter sets. As a result, the
+     * {@link TypedParameter} instances created at import all use type {@link String} rather than
+     * the type required for the field. This method replaces the imported {@link TypedParameter}
+     * instances with new versions that have the correct data type and the correct scalar vs array
+     * setting.
+     *
+     * @throws IllegalStateException if the parameter values are not convertible to the field type
+     * @return the original {@code parameterSet} with correctly-typed parameters
+     */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    private ParameterSet updateTypedParameterTypes(ParameterSet parameterSet) {
+
+        // Instances of Parameters don't need any modification.
+        try {
+            if (Class.forName(className).equals(Parameters.class)) {
+                return parameterSet;
+            }
+        } catch (ClassNotFoundException e) {
+            throw new PipelineException("Class " + className + " not found", e);
+        }
+
+        // Subclasses of Parameters potentially have fields that will need to be populated.
+        // We want the TypedParameter instances to have types that match the types of the
+        // fields.
+        Set<TypedParameter> originalTypedParameters = parameterSet.getTypedParameters();
+        Map<String, TypedParameter> originalParametersByName = new HashMap<>();
+        for (TypedParameter parameter : originalTypedParameters) {
+            originalParametersByName.put(parameter.getName(), parameter);
+        }
+        Set<TypedParameter> updatedTypedParameters = new HashSet<>();
+
+        List<String> conversionFailureFieldNames = new ArrayList<>();
+        ParametersInterface instance = parameterSet.parametersInstance(false);
+        for (Field field : ReflectionUtils.getAllFields(parameterSet.clazz(), true)) {
+            field.setAccessible(true);
+
+            // The Parameters field name is not to be turned into a TypedParameter.
+            if (field.getName().equals(Parameters.NAME_FIELD)) {
+                continue;
+            }
+            ZiggyDataType dataType = null;
+            try {
+                dataType = ZiggyDataType.getDataType(field);
+            } catch (PipelineException e) {
+
+                // Indicates something other than a primitive type or a String, which
+                // means that it must be some other field that was never meant to be
+                // supported.
+                continue;
+            }
+
+            // If we've pulled in a Persistable, that also indicates that there's something
+            // lurking in this parameters class that shouldn't be converted to a TypedParameter.
+            if (dataType.equals(ZiggyDataType.ZIGGY_PERSISTABLE)) {
+                continue;
+            }
+            boolean isScalar = !field.getType().isArray();
+            TypedParameter typedParameter = originalParametersByName.get(field.getName());
+            if (typedParameter == null) {
+
+                // Check to see if there is a default value in the ParametersInterface instance.
+                String defaultValueString = "";
+                try {
+                    Object defaultValue = field.get(instance);
+                    if (defaultValue != null) {
+                        defaultValueString = ZiggyDataType.objectToString(defaultValue);
+                    }
+                } catch (IllegalArgumentException | IllegalAccessException e) {
+
+                    // This can never occur. The ParameterSet API ensures that the class returned
+                    // by the clazz() method matches the class of the object returned by the
+                    // parametersInstance() method, hence
+                    throw new AssertionError(e);
+                }
+                updatedTypedParameters.add(
+                    new TypedParameter(field.getName(), defaultValueString, dataType, isScalar));
+                continue;
+            }
+
+            // As long as we're here, do a type check.
+            try {
+                ZiggyDataType.stringToObject(typedParameter.getString(), dataType, !isScalar);
+            } catch (Exception e) {
+                conversionFailureFieldNames.add(field.getName());
+                continue;
+            }
+            updatedTypedParameters.add(new TypedParameter(typedParameter.getName(),
+                typedParameter.getString(), dataType, isScalar));
+        }
+        if (!conversionFailureFieldNames.isEmpty()) {
+            throw new IllegalStateException(
+                "Unable to convert parameter string values to appropriate type, fields: "
+                    + conversionFailureFieldNames.toString());
+        }
+        parameterSet.setTypedParameters(updatedTypedParameters);
+        return parameterSet;
     }
 
     @Override
@@ -184,28 +285,20 @@ public void setFileProps(String fileProps) {
     /**
      * @return the libraryParamSet
      */
-    public ParameterSet getLibraryParamSet() {
-        return libraryParamSet;
+    public ParameterSet getParameterSet() {
+        return parameterSet;
     }
 
     /**
      * @param libraryParamSet the libraryParamSet to set
      */
-    public void setLibraryParamSet(ParameterSet libraryParamSet) {
-        this.libraryParamSet = libraryParamSet;
+    public void setParameterSet(ParameterSet parameterSet) {
+        parameterSet.setClassname(className);
+        this.parameterSet = updateTypedParameterTypes(parameterSet);
     }
 
-    /**
-     * @return the importedParamsBean
-     */
-    public BeanWrapper<Parameters> getImportedParamsBean() {
-        return importedParamsBean;
-    }
-
-    /**
-     * @param importedParamsBean the importedParamsBean to set
-     */
-    public void setImportedParamsBean(BeanWrapper<Parameters> importedParamsBean) {
-        this.importedParamsBean = importedParamsBean;
+    @Override
+    public int compareTo(ParameterSetDescriptor o) {
+        return name.compareTo(o.getName());
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/parameters/Parameters.java b/src/main/java/gov/nasa/ziggy/parameters/Parameters.java
index 9bc1516..68ce599 100644
--- a/src/main/java/gov/nasa/ziggy/parameters/Parameters.java
+++ b/src/main/java/gov/nasa/ziggy/parameters/Parameters.java
@@ -1,27 +1,76 @@
 package gov.nasa.ziggy.parameters;
 
-import gov.nasa.ziggy.module.io.Persistable;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
+import java.util.Objects;
+
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.TypedParameterCollection;
 
 /**
- * Interface for all parameter bean classes.
+ * Parameters implementation for use-cases in which no specific Java class is required. It is also
+ * used a simple marker used by the console to display all possible classes found on the classpath
+ * when configuring a new {@link PipelineDefinition}.
  * <p>
- * This interface is a simple marker used by the console to display all possible classes found on
- * the classpath when configuring a new {@link PipelineDefinition}.
+ * This class stores parameters using a Set of TypedParameter instances, each of which contains a
+ * name, value, and data type. This is a different approach from the old one of supporting every
+ * parameter set with a unique Java class that implemented the old Parameters interface and which
+ * has parameter names represented as member names.
  * <p>
- * Implementing classes should conform to the JavaBeans specification.
+ * From the user's point of view, a Parameters instance behaves much like the old classes
+ * implementing the old Parameters interface, specifically in that the parameters are serialized to
+ * HDF5 files in a manner identical to parameter sets backed by a Java class.
  * <p>
- * This class is used to parameterize {@link BeanWrapper} in {@link PipelineDefinition} and
- * {@link PipelineInstance}
+ * Subclasses should conform to the JavaBeans specification in order to extract TypedParameters from
+ * the class' properties.
  *
- * @author Todd Klaus
+ * @author PT
+ * @author Bill Wohler
  */
-public interface Parameters extends Persistable {
 
-    default void validate() {
+public class Parameters extends TypedParameterCollection implements ParametersInterface {
+
+    public static final String NAME_FIELD = "name";
+
+    // If you change the name of the following field, change the value in the static String, above.
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public void validate() {
         // Do nothing, by default.
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(name);
+    }
+
+    @Override
+    public void updateParameter(String name, String value) {
+        getParametersByName().get(name).setString(value);
+        populate(getParameters());
+    }
+
+    // Note: hashCode() and equals() use only the name so that there cannot be any duplicate copies
+    // of the parameter set in a Set<Parameters>.
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        Parameters other = (Parameters) obj;
+        if (!Objects.equals(name, other.name)) {
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/parameters/ParametersInterface.java b/src/main/java/gov/nasa/ziggy/parameters/ParametersInterface.java
new file mode 100644
index 0000000..df9b4da
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/parameters/ParametersInterface.java
@@ -0,0 +1,50 @@
+package gov.nasa.ziggy.parameters;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import gov.nasa.ziggy.collections.ZiggyDataType;
+import gov.nasa.ziggy.module.io.Persistable;
+import gov.nasa.ziggy.pipeline.definition.TypedParameter;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.ReflectionUtils;
+
+public interface ParametersInterface extends Persistable {
+
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    default void populate(Set<TypedParameter> typedParameters) {
+
+        setParameters(typedParameters);
+
+        // Now populate any fields in subclasses.
+        for (Field field : ReflectionUtils.getAllFields(this, true)) {
+            TypedParameter typedParameter = getParametersByName().get(field.getName());
+            if (typedParameter == null) {
+                // This happens if the field is something that is not supposed to be mapped
+                // between TypedParameter instances and instance fields. Examples include:
+                // static fields such as a logger, the Parameters name field, or the
+                // TypedParameterCollection Set and Map fields.
+                continue;
+            }
+            try {
+                ZiggyDataType.setField(this, field, typedParameter.getString());
+            } catch (IllegalArgumentException e) {
+                // Can never occur. By construction, the field exists and is writable.
+                throw new AssertionError(e);
+            }
+        }
+    }
+
+    void updateParameter(String name, String value);
+
+    void setParameters(Collection<TypedParameter> typedParameters);
+
+    Map<String, TypedParameter> getParametersByName();
+
+    Set<TypedParameter> getParameters();
+
+    void validate();
+}
diff --git a/src/main/java/gov/nasa/ziggy/parameters/ParametersOperations.java b/src/main/java/gov/nasa/ziggy/parameters/ParametersOperations.java
index 6ee3359..ec5bf54 100644
--- a/src/main/java/gov/nasa/ziggy/parameters/ParametersOperations.java
+++ b/src/main/java/gov/nasa/ziggy/parameters/ParametersOperations.java
@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -14,21 +13,18 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.datatype.DatatypeConfigurationException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
 
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli.ParamIoMode;
 import gov.nasa.ziggy.pipeline.PipelineOperations;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 import gov.nasa.ziggy.pipeline.definition.crud.ParameterSetCrud;
 import gov.nasa.ziggy.pipeline.xml.ValidatingXmlManager;
-import jakarta.xml.bind.JAXBException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Utility functions for managing the parameter library.
@@ -43,25 +39,17 @@ public class ParametersOperations {
     private ValidatingXmlManager<ParameterLibrary> xmlManager;
 
     public ParametersOperations() {
-        try {
-            xmlManager = new ValidatingXmlManager<>(ParameterLibrary.class);
-        } catch (InstantiationException | IllegalAccessException | SAXException | JAXBException
-            | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
-            | SecurityException e) {
-            throw new PipelineException(
-                "Unable to construct ValidatingXmlManager for class ParameterLibrary", e);
-        }
-
+        xmlManager = new ValidatingXmlManager<>(ParameterLibrary.class);
     }
 
     /**
      * Export the current parameter library to the specified file.
      *
      * @param destinationPath
-     * @throws IOException
      */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public List<ParameterSetDescriptor> exportParameterLibrary(String destinationPath,
-        List<String> excludeList, ParamIoMode ioMode) throws IOException {
+        List<String> excludeList, ParamIoMode ioMode) {
         if (ioMode == ParamIoMode.NODB) {
             throw new IllegalStateException("Cannot use NODB option with parameter exports");
         }
@@ -70,17 +58,17 @@ public List<ParameterSetDescriptor> exportParameterLibrary(String destinationPat
         List<ParameterSet> parameters = parameterCrud.retrieveLatestVersions();
 
         for (ParameterSet paramSet : parameters) {
-            String name = paramSet.getName().getName();
+            String name = paramSet.getName();
             if (excludeList != null && excludeList.contains(name)) {
                 // skip
                 log.debug("Skipping: " + name + " because it's on the exclude list");
                 continue;
             }
 
-            BeanWrapper<Parameters> bean = paramSet.getParameters();
+            Parameters parametersInstance = paramSet.parametersInstance();
             String className = "";
             try {
-                className = bean.getClazz().getName();
+                className = parametersInstance.getClass().getName();
             } catch (PipelineException e) {
                 // skip
                 log.info(
@@ -90,21 +78,16 @@ public List<ParameterSetDescriptor> exportParameterLibrary(String destinationPat
 
             ParameterSetDescriptor parameterSetDescriptor = new ParameterSetDescriptor(name,
                 className);
-            parameterSetDescriptor.setLibraryParamSet(paramSet);
+            parameterSetDescriptor.setParameterSet(paramSet);
             parameterSetDescriptor.setState(ParameterSetDescriptor.State.EXPORT);
             entries.add(parameterSetDescriptor);
         }
 
         if (ioMode == ParamIoMode.STANDARD) {
             log.debug("Writing parameter library export XML file");
-            try {
-                ParameterLibrary library = new ParameterLibrary();
-                library.setDatabaseParameterSets(entries);
-                xmlManager.marshal(library, new File(destinationPath));
-            } catch (DatatypeConfigurationException | JAXBException e) {
-                throw new PipelineException(
-                    "Unable to export parameter library to file " + destinationPath, e);
-            }
+            ParameterLibrary library = new ParameterLibrary();
+            library.setDatabaseParameterSets(entries);
+            xmlManager.marshal(library, new File(destinationPath));
         }
 
         return entries;
@@ -126,7 +109,7 @@ public List<ParameterSetDescriptor> exportParameterLibrary(String destinationPat
      * @throws IOException if there were problems reading the parameter files
      */
     public List<ParameterSetDescriptor> importParameterLibrary(File sourceFile,
-        List<String> excludeList, ParamIoMode ioMode) throws Exception {
+        List<String> excludeList, ParamIoMode ioMode) {
         List<ParameterSetDescriptor> results = null;
 
         if (sourceFile.isDirectory()) {
@@ -169,10 +152,9 @@ public List<ParameterSetDescriptor> importParameterLibrary(File sourceFile,
      * @param ioMode indicates whether execution is to be a full execution, a dry run (which
      * requires database access), or a database-free execution. changed.
      * @return
-     * @throws IOException
      */
     public List<ParameterSetDescriptor> importParameterLibrary(String sourcePath,
-        List<String> excludeList, ParamIoMode ioMode) throws Exception {
+        List<String> excludeList, ParamIoMode ioMode) {
         ParameterSetCrud paramCrud = new ParameterSetCrud();
         ParameterLibrary library = xmlManager.unmarshal(new File(sourcePath));
         List<ParameterSetDescriptor> entries = library.getParameterSetDescriptors();
@@ -196,8 +178,6 @@ public List<ParameterSetDescriptor> importParameterLibrary(String sourcePath,
                 continue;
             }
 
-            // Remove confusing whitespace around values in the imported parameters
-            desc.getImportedParamsBean().trimWhitespace();
             importCount += 1;
 
             ParameterSet currentParamSet = null;
@@ -225,7 +205,6 @@ public List<ParameterSetDescriptor> importParameterLibrary(String sourcePath,
                 // Otherwise, replace an existing parameter set
                 replaceExistingParameters(desc, currentParamSet, ioMode);
             }
-
         } // end of loop over entries from file
 
         log.info("Imported " + importCount + " parameter sets from: " + sourcePath);
@@ -252,8 +231,9 @@ private void createNewParameterSet(ParameterSetDescriptor desc, ParamIoMode ioMo
         if (ioMode == ParamIoMode.STANDARD) {
             ParameterSet newParamSet = new ParameterSet(name);
             newParamSet.setDescription("Created by importParameterLibrary @ " + new Date());
-            newParamSet.setParameters(desc.getFullParametersBean());
-            new ParameterSetCrud().create(newParamSet);
+            newParamSet.setTypedParameters(desc.getImportedProperties());
+            newParamSet.setClassname(desc.getClassName());
+            new ParameterSetCrud().merge(newParamSet);
         }
     }
 
@@ -271,14 +251,15 @@ private void overrideExistingParameters(ParameterSetDescriptor desc,
 
         // Next we need to create a new ParameterSet instance that's a copy of the
         // database instance and copy new values into it
-        ParameterSet mergedParameterSet = new ParameterSet(databaseParameterSet);
+        ParameterSet mergedParameterSet = databaseParameterSet.newInstance();
+        mergedParameterSet.setTypedParameters(databaseParameterSet.copyOfTypedParameters());
         Set<TypedParameter> libraryProperties = new HashSet<>();
 
         // Make maps from the property names to the two sets of properties (imported and merged)
         Map<String, TypedParameter> importedProperties = nameToTypedPropertyMap(
             desc.getImportedProperties());
         Map<String, TypedParameter> mergedProperties = nameToTypedPropertyMap(
-            mergedParameterSet.getParameters().getTypedProperties());
+            mergedParameterSet.getTypedParameters());
 
         // Find the merged properties that correspond to the imported ones and copy over the
         // imported value
@@ -295,15 +276,9 @@ private void overrideExistingParameters(ParameterSetDescriptor desc,
         }
         desc.setLibraryProps(formatProps(libraryProperties));
 
-        // Now we can validate the primitive types of the merged properties
-        if (!mergedParameterSet.getParameters().checkPrimitiveDataTypes()) {
-            throw new IllegalStateException("Parameter set descriptor " + desc.getName()
-                + " typed property values do not match expected types");
-        }
-
         // If the parameter values have changed, commit the new parameters to the database
-        desc.setState(
-            updateParameters(databaseParameterSet, mergedParameterSet.getParameters(), ioMode));
+        desc.setState(updateParameters(databaseParameterSet,
+            mergedParameterSet.parametersInstance(), ioMode));
     }
 
     Map<String, TypedParameter> nameToTypedPropertyMap(Set<TypedParameter> typedProperties) {
@@ -317,12 +292,12 @@ Map<String, TypedParameter> nameToTypedPropertyMap(Set<TypedParameter> typedProp
     /**
      * Performs complete replacement of an existing parameter set with a new one.
      * <p>
-     * For instances of {@link DefaultParameters}, the replacement allows not only the values but
-     * also the parameters themselves. The original parameters (names, types, and values) are
-     * replaced. For all other classes, the current parameters of the class are used (which may
-     * differ from the values in the library if the class has been modified). In either case, the
-     * current library parameters are not copied to the new parameter set. For partial parameter set
-     * replacement (i.e., keep some values and replace others), use parameter overrides.
+     * For instances of {@link Parameters}, the replacement allows not only the values but also the
+     * parameters themselves. The original parameters (names, types, and values) are replaced. For
+     * all other classes, the current parameters of the class are used (which may differ from the
+     * values in the library if the class has been modified). In either case, the current library
+     * parameters are not copied to the new parameter set. For partial parameter set replacement
+     * (i.e., keep some values and replace others), use parameter overrides.
      */
     private void replaceExistingParameters(ParameterSetDescriptor desc,
         ParameterSet databaseParameterSet, ParamIoMode ioMode) {
@@ -331,31 +306,31 @@ private void replaceExistingParameters(ParameterSetDescriptor desc,
         desc.validate();
 
         // perform updates as needed
-        desc.setState(updateParameters(databaseParameterSet, desc.getFullParametersBean(), ioMode));
+        desc.setState(updateParameters(databaseParameterSet, desc.parametersInstance(), ioMode));
     }
 
     /**
      * Updates database parameters if changes have been made.
      *
      * @param databaseParameterSet parameter set from the database
-     * @param newParameters BeanWrapper of new parameters
+     * @param newParameters new parameters
      * @param ioMode
      * @return state SAME if no update was performed, state UPDATE if updates were made.
      */
     private ParameterSetDescriptor.State updateParameters(ParameterSet databaseParameterSet,
-        BeanWrapper<Parameters> newParameters, ParamIoMode ioMode) {
+        Parameters newParameters, ParamIoMode ioMode) {
         // If the parameter values have changed, commit the new parameters to the database
         PipelineOperations pipelineOps = new PipelineOperations();
-        if (pipelineOps.compareParameters(databaseParameterSet.getParameters(), newParameters)) {
-            log.debug("name: " + databaseParameterSet.getName().getName()
+        if (pipelineOps.compareParameters(databaseParameterSet.parametersInstance(),
+            newParameters)) {
+            log.debug("name: " + databaseParameterSet.getName()
                 + " contents match parameter library, no update needed");
             return ParameterSetDescriptor.State.SAME;
         }
         log.debug("name: " + databaseParameterSet.getName()
             + " contents do not match parameter library, update needed");
         if (ioMode == ParamIoMode.STANDARD) {
-            pipelineOps.updateParameterSet(databaseParameterSet, newParameters.getInstance(),
-                false);
+            pipelineOps.updateParameterSet(databaseParameterSet, newParameters, false);
         }
         return ParameterSetDescriptor.State.UPDATE;
     }
@@ -379,6 +354,7 @@ private boolean skipParameterSetDescriptor(ParameterSetDescriptor desc,
         return false;
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     private void addLibraryOnlyParameterSets(List<ParameterSetDescriptor> entries,
         ParamIoMode ioMode) {
         List<String> importNames = new LinkedList<>();
@@ -389,19 +365,19 @@ private void addLibraryOnlyParameterSets(List<ParameterSetDescriptor> entries,
         if (ioMode != ParamIoMode.NODB) {
             List<ParameterSet> allLibraryEntries = new ParameterSetCrud().retrieveLatestVersions();
             for (ParameterSet libraryParamSet : allLibraryEntries) {
-                String name = libraryParamSet.getName().getName();
+                String name = libraryParamSet.getName();
 
                 if (!importNames.contains(name)) {
-                    BeanWrapper<Parameters> libraryParameters = libraryParamSet.getParameters();
+                    Parameters libraryParameters = libraryParamSet.parametersInstance();
                     String className = "";
                     try {
-                        className = libraryParameters.getClazz().getName();
+                        className = libraryParameters.getClass().getName();
                     } catch (PipelineException e) {
                         continue;
                     }
                     ParameterSetDescriptor newDesc = new ParameterSetDescriptor(name, className);
                     newDesc.setState(ParameterSetDescriptor.State.LIBRARY_ONLY);
-                    newDesc.setLibraryProps(formatProps(libraryParameters.getTypedProperties()));
+                    newDesc.setLibraryProps(formatProps(libraryParameters.getParameters()));
                     entries.add(newDesc);
                 }
             }
diff --git a/src/main/java/gov/nasa/ziggy/parameters/ParametersUtils.java b/src/main/java/gov/nasa/ziggy/parameters/ParametersUtils.java
index 8672481..ac3ac57 100644
--- a/src/main/java/gov/nasa/ziggy/parameters/ParametersUtils.java
+++ b/src/main/java/gov/nasa/ziggy/parameters/ParametersUtils.java
@@ -7,17 +7,20 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
+import java.io.UncheckedIOException;
 import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
+import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
@@ -38,53 +41,61 @@ private ParametersUtils() {
      *
      * @param file
      * @param parametersClass
-     * @throws IOException
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public static Parameters importParameters(File file,
-        Class<? extends Parameters> parametersClass) throws IOException {
+        Class<? extends Parameters> parametersClass) {
         log.info("Importing " + parametersClass.getSimpleName() + " from: " + file.getName());
 
         Properties propsFile = new Properties();
         try (Reader reader = new InputStreamReader(new FileInputStream(file),
             FileUtil.ZIGGY_CHARSET)) {
             propsFile.load(reader);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to read from file " + file.toString(), e);
         }
 
-        Map<String, String> propsMap = new HashMap<>();
         Set<Object> keys = propsFile.keySet();
+        Set<TypedParameter> typedParameters = new HashSet<>();
         for (Object key : keys) {
             Object value = propsFile.get(key);
-            propsMap.put((String) key, (String) value);
+            typedParameters.add(new TypedParameter((String) key, (String) value));
+        }
+        Parameters parametersInstance;
+        try {
+            parametersInstance = parametersClass.getDeclaredConstructor().newInstance();
+            parametersInstance.populate(typedParameters);
+            return parametersInstance;
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+            | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+            throw new PipelineException(e);
         }
-
-        BeanWrapper<Parameters> paramsBean = new BeanWrapper<>(parametersClass);
-        paramsBean.setProperties(propsMap);
-
-        return paramsBean.getInstance();
     }
 
-    public static void exportParameters(File file, Parameters parametersBean) throws IOException {
-        BeanWrapper<Parameters> paramsBean = new BeanWrapper<>(parametersBean);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static void exportParameters(File file, Parameters parameters) {
 
-        Set<TypedParameter> properties = paramsBean.getTypedProperties();
-        Properties propsFile = new Properties();
+        Set<TypedParameter> typedParameters = parameters.getParameters();
+        Properties properties = new Properties();
 
-        for (TypedParameter property : properties) {
-            String propName = property.getName();
-            String propValue = property.getString();
-            if (propValue == null) {
+        for (TypedParameter parameter : typedParameters) {
+            String name = parameter.getName();
+            String value = parameter.getString();
+            if (value == null) {
                 // Hashtable (used by Properties) doesn't allow null values
-                propValue = "";
+                value = "";
             }
-            propsFile.put(propName, propValue);
+            properties.put(name, value);
         }
 
-        log.info(
-            "Exporting " + parametersBean.getClass().getSimpleName() + " to: " + file.getName());
+        log.info("Exporting " + parameters.getClass().getSimpleName() + " to: " + file.getName());
 
         try (Writer propsFileWriter = new OutputStreamWriter(new FileOutputStream(file),
             FileUtil.ZIGGY_CHARSET)) {
-            propsFile.store(propsFileWriter, "exported by ParametersUtils");
+            properties.store(propsFileWriter, "exported by ParametersUtils");
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to write to file " + file.toString(), e);
         }
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/InstanceAndTasks.java b/src/main/java/gov/nasa/ziggy/pipeline/InstanceAndTasks.java
index b14086d..fabead2 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/InstanceAndTasks.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/InstanceAndTasks.java
@@ -39,12 +39,11 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         InstanceAndTasks other = (InstanceAndTasks) obj;
         return Objects.equals(pipelineInstance, other.pipelineInstance)
             && Objects.equals(pipelineTasks, other.pipelineTasks);
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/PipelineConfigurator.java b/src/main/java/gov/nasa/ziggy/pipeline/PipelineConfigurator.java
index ade89a7..31ab42f 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/PipelineConfigurator.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/PipelineConfigurator.java
@@ -10,10 +10,9 @@
 
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule;
@@ -40,10 +39,10 @@ public class PipelineConfigurator {
     PipelineDefinitionNode currentNode = null;
 
     // pipeline params
-    private Map<ClassWrapper<Parameters>, ParameterSetName> pipelineParameterSetNamesMap = new HashMap<>();
+    private Map<ClassWrapper<ParametersInterface>, String> pipelineParameterSetNamesMap = new HashMap<>();
 
     // module params
-    private Map<PipelineDefinitionNode, Map<ClassWrapper<Parameters>, ParameterSetName>> moduleParameterSetNamesMap = new HashMap<>();
+    private Map<PipelineDefinitionNode, Map<ClassWrapper<ParametersInterface>, String>> moduleParameterSetNamesMap = new HashMap<>();
 
     private int exeTimeout = 60 * 60 * 50; // 50 hours
 
@@ -114,9 +113,10 @@ public void addPipelineParameterSet(ParameterSet parameterSet) {
             throw new PipelineException("Pipeline not initialized, call createPipeline() first");
         }
 
-        Class<? extends Parameters> paramSetClass = parameterSet.parametersInstance().getClass();
+        Class<? extends ParametersInterface> paramSetClass = parameterSet.parametersInstance()
+            .getClass();
 
-        ClassWrapper<Parameters> classWrapper = new ClassWrapper<>(paramSetClass);
+        ClassWrapper<ParametersInterface> classWrapper = new ClassWrapper<>(paramSetClass);
         pipelineParameterSetNamesMap.put(classWrapper, parameterSet.getName());
     }
 
@@ -168,10 +168,10 @@ private PipelineDefinitionNode createNode(String name, Class<? extends PipelineM
 
         PipelineDefinitionNode node = addNode(moduleDef, taskGenerator);
 
-        Map<ClassWrapper<Parameters>, ParameterSetName> paramSetNamesMap = new HashMap<>();
+        Map<ClassWrapper<ParametersInterface>, String> paramSetNamesMap = new HashMap<>();
 
         for (ParameterSet set : paramSets) {
-            ClassWrapper<Parameters> classWrapper = new ClassWrapper<>(
+            ClassWrapper<ParametersInterface> classWrapper = new ClassWrapper<>(
                 set.parametersInstance().getClass());
             paramSetNamesMap.put(classWrapper, set.getName());
         }
@@ -256,12 +256,12 @@ public PipelineDefinitionNode addNode(PipelineModuleDefinition moduleDef,
         PipelineDefinitionNode node = new PipelineDefinitionNode();
         node.setPipelineModuleDefinition(moduleDef);
 
-        Map<ClassWrapper<Parameters>, ParameterSetName> paramSetNamesMap = new HashMap<>();
+        Map<ClassWrapper<ParametersInterface>, String> paramSetNamesMap = new HashMap<>();
 
         for (ParameterSet set : paramSets) {
-            Class<? extends Parameters> paramClass = set.parametersInstance().getClass();
+            Class<? extends ParametersInterface> paramClass = set.parametersInstance().getClass();
 
-            ClassWrapper<Parameters> classWrapper = new ClassWrapper<>(paramClass);
+            ClassWrapper<ParametersInterface> classWrapper = new ClassWrapper<>(paramClass);
             paramSetNamesMap.put(classWrapper, set.getName());
         }
 
@@ -318,16 +318,14 @@ public PipelineModuleDefinition createModule(String name, Class<? extends Pipeli
             .retrieveAllVersionsForName(name);
         for (PipelineModuleDefinition existingModule : existingModules) {
             log.info("deleting existing pipeline module def: " + existingModule);
-            pipelineModuleDefinitionCrud.delete(existingModule);
+            pipelineModuleDefinitionCrud.remove(existingModule);
         }
 
         PipelineModuleDefinition moduleDef = new PipelineModuleDefinition(name);
         moduleDef.setPipelineModuleClass(new ClassWrapper<>(clazz));
         moduleDef.setExeTimeoutSecs(exeTimeout);
 
-        pipelineModuleDefinitionCrud.create(moduleDef);
-
-        return moduleDef;
+        return pipelineModuleDefinitionCrud.merge(moduleDef);
     }
 
     /**
@@ -343,17 +341,15 @@ public ParameterSet createParamSet(String name, Parameters params) {
         List<ParameterSet> existingParamSets = parameterSetCrud.retrieveAllVersionsForName(name);
         for (ParameterSet set : existingParamSets) {
             log.info("deleting existing pipeline module param set: " + set);
-            parameterSetCrud.delete(set);
+            parameterSetCrud.remove(set);
         }
 
         ParameterSet paramSet = new ParameterSet(name);
         paramSet.setDescription("Created by PipelineConfigurator");
 
-        paramSet.setParameters(new BeanWrapper<>(params));
-
-        parameterSetCrud.create(paramSet);
+        paramSet.populateFromParametersInstance(params);
 
-        return paramSet;
+        return parameterSetCrud.merge(paramSet);
     }
 
     /**
@@ -362,19 +358,19 @@ public ParameterSet createParamSet(String name, Parameters params) {
      * @param pipelineParams
      */
     public void setPipelineParamNames(
-        Map<ClassWrapper<Parameters>, ParameterSetName> pipelineParams) {
+        Map<ClassWrapper<ParametersInterface>, String> pipelineParams) {
         pipelineParameterSetNamesMap = pipelineParams;
     }
 
     public void setModuleParamNames(PipelineDefinitionNode node,
-        Map<ClassWrapper<Parameters>, ParameterSetName> moduleParams) {
+        Map<ClassWrapper<ParametersInterface>, String> moduleParams) {
         moduleParameterSetNamesMap.put(node, moduleParams);
     }
 
     public void addModuleParamNames(PipelineDefinitionNode node, ParameterSet parameterSet) {
-        Map<ClassWrapper<Parameters>, ParameterSetName> moduleParamsForNode = moduleParameterSetNamesMap
+        Map<ClassWrapper<ParametersInterface>, String> moduleParamsForNode = moduleParameterSetNamesMap
             .get(node);
-        ClassWrapper<Parameters> classWrapper = new ClassWrapper<>(
+        ClassWrapper<ParametersInterface> classWrapper = new ClassWrapper<>(
             parameterSet.parametersInstance().getClass());
         moduleParamsForNode.put(classWrapper, parameterSet.getName());
     }
@@ -394,7 +390,7 @@ public void finalizePipeline() {
             throw new IllegalStateException("Pipeline has no nodes, call addNode() at least once");
         }
 
-        pipelineDefinitionCrud.create(pipeline);
+        pipelineDefinitionCrud.persist(pipeline);
 
         pipeline = null;
         currentNode = null;
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/PipelineExecutor.java b/src/main/java/gov/nasa/ziggy/pipeline/PipelineExecutor.java
index ea7d310..f71fb4b 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/PipelineExecutor.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/PipelineExecutor.java
@@ -1,26 +1,27 @@
 package gov.nasa.ziggy.pipeline;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.metrics.report.Memdrone;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.ModelRegistry;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstanceAggregateState;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.Priority;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
@@ -36,18 +37,26 @@
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.ProcessingSummaryOperations;
 import gov.nasa.ziggy.services.database.DatabaseService;
+import gov.nasa.ziggy.services.database.DatabaseTransaction;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 import gov.nasa.ziggy.services.events.ZiggyEventHandler;
 import gov.nasa.ziggy.services.events.ZiggyEventLabels;
-import gov.nasa.ziggy.services.messages.RunningPipelinesCheckRequest;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
+import gov.nasa.ziggy.services.messages.TaskRequest;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.supervisor.TaskRequestHandlerLifecycleManager;
 import gov.nasa.ziggy.uow.UnitOfWork;
 import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
-import gov.nasa.ziggy.worker.WorkerPipelineProcess;
 
 /***
- * Encapsulates the launch and transition logic for pipelines**
+ * Encapsulates the launch and transition logic for pipelines.
+ * <p>
+ * Note that the methods
+ * {@link #launch(PipelineDefinition, String, PipelineDefinitionNode, PipelineDefinitionNode, String)}
+ * and {@link #transitionToNextInstanceNode(PipelineInstance, PipelineTask, TaskCounts)} must not be
+ * run in the context of a transaction; these methods provide their own transactions in order to
+ * ensure that the transactions are completed before any task requests can be sent. Other methods,
+ * including {@link #restartFailedTasks(Collection, boolean, RunMode)}, can (or in some cases must)
+ * be run in a transaction context.
  *
  * @author Todd Klaus
  * @author PT
@@ -60,6 +69,7 @@ public class PipelineExecutor {
     private PipelineInstanceCrud pipelineInstanceCrud;
     private PipelineInstanceNodeCrud pipelineInstanceNodeCrud;
     private PipelineTaskCrud pipelineTaskCrud;
+    private PipelineOperations pipelineOperations;
 
     public PipelineExecutor() {
 
@@ -68,15 +78,7 @@ public PipelineExecutor() {
         pipelineInstanceCrud = new PipelineInstanceCrud();
         pipelineInstanceNodeCrud = new PipelineInstanceNodeCrud();
         pipelineTaskCrud = new PipelineTaskCrud();
-    }
-
-    /**
-     * Launch a new {@link PipelineInstance} for this {@link PipelineDefinition} with optional
-     * startNode and/or endNode.
-     */
-    public InstanceAndTasks launch(PipelineDefinition pipeline, String instanceName,
-        PipelineDefinitionNode startNode, PipelineDefinitionNode endNode) {
-        return launch(pipeline, instanceName, startNode, endNode, null);
+        pipelineOperations = new PipelineOperations();
     }
 
     /**
@@ -85,345 +87,344 @@ public InstanceAndTasks launch(PipelineDefinition pipeline, String instanceName,
      * {@link ParameterSet} created by a {@link ZiggyEventHandler}. This allows the event handler to
      * transfer information to the pipeline that it needs at runtime.
      */
-    public InstanceAndTasks launch(PipelineDefinition pipeline, String instanceName,
+    public PipelineInstance launch(PipelineDefinition pipeline, String instanceName,
         PipelineDefinitionNode startNode, PipelineDefinitionNode endNode,
         String eventHandlerParamSetName) {
-        pipeline.buildPaths();
-        List<PipelineTask> tasks = new LinkedList<>();
-
-        /*
-         * Lock the current version of the model registry and associate it with this pipeline
-         * instance.
-         */
-        ModelCrud modelCrud = new ModelCrud();
-        ModelRegistry modelRegistry = modelCrud.lockCurrentRegistry();
-
-        int priority = pipeline.getInstancePriority();
-
-        if (priority < PipelineInstance.HIGHEST_PRIORITY) {
-            priority = PipelineInstance.HIGHEST_PRIORITY;
-        }
-
-        if (priority > PipelineInstance.LOWEST_PRIORITY) {
-            priority = PipelineInstance.LOWEST_PRIORITY;
-        }
-
-        PipelineInstance instance = new PipelineInstance();
-        instance.setName(instanceName);
-        instance.setPipelineDefinition(pipeline);
-        instance.setState(PipelineInstance.State.PROCESSING);
-        instance.startExecutionClock();
-        instance.setPriority(priority);
-        instance.setModelRegistry(modelRegistry);
-
-        /*
-         * Set the pipeline instance params to the latest version of the name specified in the
-         * trigger and lock the param set. Also, if the pipeline instance needs a parameter set from
-         * a ZiggyEventHandler, add that to the parameters.
-         */
-        Map<ClassWrapper<Parameters>, ParameterSetName> triggerParamNames = pipeline
-            .getPipelineParameterSetNames();
-        if (eventHandlerParamSetName != null) {
-            triggerParamNames.put(new ClassWrapper<Parameters>(ZiggyEventLabels.class),
-                new ParameterSetName(eventHandlerParamSetName));
-        }
-        Map<ClassWrapper<Parameters>, ParameterSet> instanceParams = instance
-            .getPipelineParameterSets();
-
-        bindParameters(triggerParamNames, instanceParams);
-
-        instance.setPipelineParameterSets(instanceParams);
-
-        pipelineInstanceCrud.create(instance);
-
-        if (startNode == null) {
-            // start at the root
-            log.info("Creating instance nodes (starting at root because startNode not set)");
 
-            List<PipelineInstanceNode> rootInstanceNodes = new LinkedList<>();
-
-            for (PipelineDefinitionNode definitionRootNode : pipeline.getRootNodes()) {
-                PipelineInstanceNode rootInstanceNode = createInstanceNodes(instance, pipeline,
-                    definitionRootNode, endNode);
-                rootInstanceNodes.add(rootInstanceNode);
-            }
+        List<PipelineInstanceNode> nodesForLaunch = new ArrayList<>();
+
+        // Most of this method has to take place inside a database transaction.
+        PipelineInstance pipelineInstance = (PipelineInstance) DatabaseTransactionFactory
+            .performTransaction(() -> {
+                pipeline.buildPaths();
+
+                /*
+                 * Lock the current version of the model registry and associate it with this
+                 * pipeline instance.
+                 */
+                ModelCrud modelCrud = new ModelCrud();
+                ModelRegistry modelRegistry = modelCrud.lockCurrentRegistry();
+
+                Priority priority = pipeline.getInstancePriority();
+
+                PipelineInstance instance = new PipelineInstance();
+                instance.setName(instanceName);
+                instance.setPipelineDefinition(pipeline);
+                instance.setState(PipelineInstance.State.PROCESSING);
+
+                instance.startExecutionClock();
+                instance.setPriority(priority);
+                instance.setModelRegistry(modelRegistry);
+
+                /*
+                 * Set the pipeline instance params to the latest version of the name specified in
+                 * the trigger and lock the param set. Also, if the pipeline instance needs a
+                 * parameter set from a ZiggyEventHandler, add that to the parameters.
+                 */
+                Map<ClassWrapper<ParametersInterface>, String> triggerParamNames = pipeline
+                    .getPipelineParameterSetNames();
+                if (eventHandlerParamSetName != null) {
+                    triggerParamNames.put(new ClassWrapper<>(ZiggyEventLabels.class),
+                        eventHandlerParamSetName);
+                }
+                Map<ClassWrapper<ParametersInterface>, ParameterSet> instanceParams = instance
+                    .getPipelineParameterSets();
 
-            // make sure the new PipelineInstanceNodes are in the db for
-            // launchNode, below
-            DatabaseService.getInstance().flush();
+                bindParameters(triggerParamNames, instanceParams);
 
-            for (PipelineInstanceNode instanceNode : rootInstanceNodes) {
-                tasks.addAll(launchNode(instanceNode));
-            }
-        } else {
-            // start at the specified startNode
-            log.info("Creating instance nodes (startNode set, so starting there instead of root)");
+                instance.setPipelineParameterSets(instanceParams);
 
-            PipelineInstanceNode startInstanceNode = createInstanceNodes(instance, pipeline,
-                startNode, endNode);
-            instance.setStartNode(startInstanceNode);
+                pipelineInstanceCrud.persist(instance);
 
-            PipelineDefinitionNode taskGeneratorNode = startInstanceNode.getPipelineDefinitionNode()
-                .taskGeneratorNode();
+                if (startNode == null) {
+                    // start at the root
+                    log.info(
+                        "Creating instance nodes (starting at root because startNode not set)");
 
-            Map<ClassWrapper<Parameters>, ParameterSetName> uowModuleParamNames = taskGeneratorNode
-                .getModuleParameterSetNames();
-            Map<ClassWrapper<Parameters>, ParameterSet> uowModuleParams = new HashMap<>();
-            bindParameters(uowModuleParamNames, uowModuleParams);
+                    List<PipelineInstanceNode> rootInstanceNodes = new LinkedList<>();
 
-            // make sure the new PipelineInstanceNodes are in the db for
-            // launchNode, below
-            DatabaseService.getInstance().flush();
+                    for (PipelineDefinitionNode definitionRootNode : pipeline.getRootNodes()) {
+                        PipelineInstanceNode rootInstanceNode = createInstanceNodes(instance,
+                            pipeline, definitionRootNode, endNode);
+                        rootInstanceNodes.add(rootInstanceNode);
+                    }
 
-            tasks.addAll(launchNode(startInstanceNode, taskGeneratorNode, uowModuleParams));
+                    nodesForLaunch.addAll(rootInstanceNodes);
+                } else {
+                    // start at the specified startNode
+                    log.info(
+                        "Creating instance nodes (startNode set, so starting there instead of root)");
 
-        }
+                    PipelineInstanceNode startInstanceNode = createInstanceNodes(instance, pipeline,
+                        startNode, endNode);
+                    instance.setStartNode(startInstanceNode);
 
-        return new InstanceAndTasks(instance, tasks);
-    }
+                    nodesForLaunch.add(startInstanceNode);
+                }
 
-    public TaskCounts updateTaskCountsForCurrentNode(PipelineTask task,
-        boolean currentTaskSuccessful) {
-        log.info("currentTaskSuccessful: " + currentTaskSuccessful);
+                // make sure the new PipelineInstanceNodes are in the db for
+                // launchNode, below
+                DatabaseService.getInstance().flush();
 
-        long pipelineInstanceNodeId = task.getPipelineInstanceNode().getId();
-        TaskCounts newTaskCounts;
+                return instance;
+            });
 
-        // This code obtains the lock on PI_PIPELINE_INST_NODE with 'select for
-        // update'.
-        // The lock is held until the next commit
-        if (currentTaskSuccessful) {
-            newTaskCounts = pipelineInstanceNodeCrud
-                .incrementCompletedTaskCount(pipelineInstanceNodeId);
-        } else {
-            newTaskCounts = pipelineInstanceNodeCrud
-                .incrementFailedTaskCount(pipelineInstanceNodeId);
+        for (PipelineInstanceNode node : nodesForLaunch) {
+            launchNode(node);
         }
 
-        return newTaskCounts;
+        // Get the current state of the pipeline instance from the database and return same.
+        return (PipelineInstance) DatabaseTransactionFactory
+            .performTransaction(() -> pipelineInstanceCrud.retrieve(pipelineInstance.getId()));
     }
 
     /**
      * The transition logic generates the worker task request messages for the next module in this
-     * pipeline.
-     * <p>
-     * This method should only be called if the current task completed successfully.
-     *
-     * @param instance
-     * @param task
-     * @throws PipelineException
+     * pipeline. This method only executes if the task in question completed successfully.
      */
-    public LinkedList<PipelineTask> doTransition(PipelineInstance instance, PipelineTask task,
+    public void transitionToNextInstanceNode(PipelineInstance instance, PipelineTask task,
         TaskCounts currentNodeTaskCounts) {
 
-        LinkedList<PipelineTask> tasks = new LinkedList<>();
-
-        log.debug("doTransition(WorkerTaskRequest, PipelineInstanceNode) - start");
-        log.debug("doTransition: current task = " + task.getId());
+        List<PipelineInstanceNode> nodesForLaunch = new ArrayList<>();
+        List<PipelineDefinitionNode> nextPipelineDefinitionNodesSimpleTransition = new ArrayList<>();
+        List<PipelineDefinitionNode> nextPipelineDefinitionNodesNewUowTransition = new ArrayList<>();
+        log.debug("current task = " + task.getId());
         log.info("task.isRetried(): " + task.isRetry());
 
-        Memdrone memdrone = new Memdrone(task.getModuleName(), task.getPipelineInstance().getId());
-        try {
+        // Determine which pipeline definition nodes can perform a simple transition and which ones
+        // require a new-UOW transition.
+        DatabaseTransactionFactory.performTransaction(() -> {
+
+            Memdrone memdrone = new Memdrone(task.getModuleName(),
+                task.getPipelineInstance().getId());
             if (Memdrone.memdroneEnabled()) {
                 memdrone.createStatsCache();
                 memdrone.createPidMapCache();
             }
-        } catch (Exception e) {
-            throw new PipelineException("Memdrone processing failed with exception", e);
+
+            log.info("instanceNode " + currentNodeTaskCounts.log());
+            List<PipelineDefinitionNode> nextNodes = task.getPipelineDefinitionNode()
+                .getNextNodes();
+            nextPipelineDefinitionNodesSimpleTransition
+                .addAll(nodesWithSimpleTransition(nextNodes));
+            nextPipelineDefinitionNodesNewUowTransition.addAll(nextNodes);
+            nextPipelineDefinitionNodesNewUowTransition
+                .removeAll(nextPipelineDefinitionNodesSimpleTransition);
+            return null;
+        });
+
+        // If there are simple transitions to later nodes, execute them now.
+        if (!nextPipelineDefinitionNodesSimpleTransition.isEmpty()) {
+            simpleTransition(instance, task, nextPipelineDefinitionNodesSimpleTransition);
         }
 
-        PipelineInstanceNode instanceNode = pipelineInstanceNodeCrud.retrieve(instance,
-            task.getPipelineDefinitionNode());
-
-        log.info("doTransition: instanceNode " + currentNodeTaskCounts.log());
-
-        // @formatter:off
-        /**
-         * (using javadoc-style comments to keep eclipse from munging
-         * formatting)
-         *
-         * <pre>
-         *
-         * if there is another node in this pipeline,
-         *   for each nextNode
-         *     if nextNode.isStartNewUow() == true
-         *       if all tasks for this node are complete
-         *         use the task generator for nextNode to generate the next set of tasks
-         *       else
-         *         create a new task with the same uowTask as the last task
-         * else
-         *   pipeline complete for this UOW
-         *
-         * </pre>
-         */
-        //@ formatter:on
+        // The new-UOW transitions need to do some additional database work.
+        DatabaseTransactionFactory.performTransaction(() -> {
+
+            PipelineInstanceNode instanceNode = task.getPipelineInstanceNode();
+            TaskCounts instanceNodeCounts = pipelineOperations.taskCounts(instanceNode);
+
+            // If there are any tasks still running, then we can't perform any new-UOW transitions.
+            if (!instanceNodeCounts.isInstanceNodeExecutionComplete()) {
+                log.info("Tasks remaining for this node, doing nothing");
+                return null;
+            }
+
+            // If there aren't any pipeline definition nodes to transition to, return.
+            if (nextPipelineDefinitionNodesNewUowTransition.isEmpty()) {
+                return null;
+            }
 
-        // true if the user specified an optional end node (not null and equal
-        // to the current node)
-        PipelineInstanceNode endNode = instance.getEndNode();
-        boolean isEndNode = endNode != null && instanceNode.getId() == endNode.getId();
+            // If we got here, then the tasks for the current node are done and there are additional
+            // nodes that need to be run. However! We can't do that if the instance is stalled due
+            // to
+            // errored tasks.
+            if (!currentNodeTaskCounts.isInstanceNodeComplete()) {
+                log.error("Halting pipeline execution due to errors in node {}",
+                    instanceNode.getPipelineDefinitionNode().getModuleName());
+                return null;
+            }
 
-        if (!isEndNode && task.getPipelineDefinitionNode().getNextNodes().size() > 0) {
-            log.debug("more nodes remaining for this pipeline");
-            for (PipelineDefinitionNode nextDefinitionNode : task.getPipelineDefinitionNode()
-                .getNextNodes()) {
+            // Generate instance nodes for the remaining definition nodes.
+            for (PipelineDefinitionNode node : nextPipelineDefinitionNodesNewUowTransition) {
+                log.info("Launching node {} with a new UOW", node.getModuleName());
                 PipelineInstanceNode nextInstanceNode = pipelineInstanceNodeCrud.retrieve(instance,
-                    nextDefinitionNode);
+                    node);
+                nodesForLaunch.add(nextInstanceNode);
+            }
+            return null;
+        });
 
-                if (nextDefinitionNode.isStartNewUow()) { // synchronized
-                    // transition
-                    log.debug("isWaitForPreviousTasks == true, checking to see if all tasks for this node are complete");
+        // Finally, launch the nodes.
+        for (PipelineInstanceNode node : nodesForLaunch) {
+            launchNode(node);
+        }
+    }
+
+    /**
+     * Returns the {@link PipelineDefinitionNode}s that have a simple transition from the current
+     * node (here "simple transition" means that no new UOW is started).
+     */
+    private List<PipelineDefinitionNode> nodesWithSimpleTransition(
+        List<PipelineDefinitionNode> nodes) {
+        List<PipelineDefinitionNode> nodesWithSimpleTransition = new ArrayList<>();
+        if (CollectionUtils.isEmpty(nodes)) {
+            return nodesWithSimpleTransition;
+        }
+        for (PipelineDefinitionNode node : nodes) {
+            if (!node.isStartNewUow()) {
+                nodesWithSimpleTransition.add(node);
+            }
+        }
+        return nodesWithSimpleTransition;
+    }
 
-                    if (currentNodeTaskCounts.isInstanceNodeComplete()) {
-                        log.info("doTransition: all tasks for this node done");
+    /**
+     * Performs simple transitions. Simple transitions are transitions that reuse a unit of work,
+     * which means that they do not need to wait for all the tasks in the current instance node to
+     * complete before launching new tasks.
+     */
+    private void simpleTransition(PipelineInstance instance, PipelineTask task,
+        List<PipelineDefinitionNode> nextNodesSimpleTransition) {
+        for (PipelineDefinitionNode node : nextNodesSimpleTransition) {
 
+            log.info("Node {} uses the same UOW as {}, creating task with reused UOW",
+                node.getModuleName(), task.getPipelineDefinitionNode().getModuleName());
+            PipelineInstanceNode nextInstanceNode = (PipelineInstanceNode) DatabaseTransactionFactory
+                .performTransaction(() -> pipelineInstanceNodeCrud.retrieve(instance, node));
+            UnitOfWork nextUowTask = task.uowTaskInstance();
 
-                        log.info("doTransition: launching next node with a new UOW");
-                        tasks.addAll(launchNode(nextInstanceNode));
-                    } else {
-                        log.info("doTransition: there are uncompleted tasks remaining for this node, doing nothing");
-                    }
-                } else {
-                    /*
-                     * Simple transition: just propagate the last task to the
-                     * nextNode
-                     */
+            launchTasks(nextInstanceNode, instance, List.of(nextUowTask));
+        }
+    }
 
-                    log.info("doTransition: nextNode uses the same UOW, just creating a single task with the UOW from this task");
+    /**
+     * Logs the PipelineInstance state based on the aggregate PipelineInstanceNode task counts.
+     * Called after the transition logic runs.
+     */
+    public void logUpdatedInstanceState(PipelineInstance pipelineInstance) {
+        TaskCounts state = pipelineOperations.taskCounts(pipelineInstance);
 
-                    BeanWrapper<UnitOfWork> nextUowTask = null;
+        log.info("""
+            updateInstanceState: all nodes:\s\
+            numTasks/numSubmittedTasks/numCompletedTasks/numFailedTasks =\s\s\
+            {} / {} / {} / {}""", state.getTaskCount(), state.getSubmittedTaskCount(),
+            state.getCompletedTaskCount(), state.getFailedTaskCount());
 
-                    if (task.getUowTask() != null) {
-                        nextUowTask = new BeanWrapper<>(task.getUowTask().getInstance());
-                    }
+        log.info("updateInstanceState: updated PipelineInstance.state = {} for id: ",
+            pipelineInstance.getState(), pipelineInstance.getId());
+    }
 
-                    tasks.add(launchTask(nextInstanceNode, instance, nextUowTask));
-                    pipelineInstanceNodeCrud.incrementSubmittedTaskCount(nextInstanceNode.getId());
-                }
-            }
-        } else {
-            if (isEndNode) {
-                log.info("doTransition: end of pipeline reached for this UOW (reached specified endNode)");
-            }
+    /**
+     * Restart {@link PipelineTask}s in the ERROR state. This method performs the following steps:
+     * <ol>
+     * <li>Sets the {@link PipelineInstanceNode}s represented by the tasks into the not-yet-run
+     * state.
+     * <li>Checks each task to make sure it's in a condition that permits a resubmit.
+     * <li>Sets the state of each task to SUBMITTED.
+     * <li>Sends a task request for each task.
+     * <li>Sets the instance states back to already-started state.
+     * </ol>
+     */
+    public void restartFailedTasks(Collection<PipelineTask> tasks, boolean doTransitionOnly,
+        RunMode restartMode) {
+        log.debug("runTask(long) - start");
 
-            log.info("doTransition: end of pipeline reached for this UOW");
+        // Map between the instance nodes and the tasks.
+        Map<PipelineInstanceNode, List<PipelineTask>> nodesToTasks = new HashMap<>();
+        for (PipelineTask task : tasks) {
+            PipelineInstanceNode node = task.getPipelineInstanceNode();
+            if (!nodesToTasks.containsKey(node)) {
+                nodesToTasks.put(node, new ArrayList<>());
+            }
+            nodesToTasks.get(node).add(task);
         }
 
-        return tasks;
+        // Perform restarts by instance node.
+        for (Entry<PipelineInstanceNode, List<PipelineTask>> entry : nodesToTasks.entrySet()) {
+            restartFailedTasksForNode(entry, doTransitionOnly, restartMode);
+        }
     }
 
     /**
-     * Updates the PipelineInstance state based on the aggregate
-     * PipelineInstanceNode task counts. Called after the transition logic runs.
-     *
-     * @param instance
+     * Performs task restart for all tasks associated with a particular
+     * {@link PipelineInstanceNode}.
      */
-    public void updateInstanceState(PipelineInstance instance) {
-        PipelineInstanceAggregateState state = pipelineInstanceCrud.instanceState(instance);
-
-        if (state.getNumCompletedTasks().equals(state.getNumTasks())) {
-            // completed successfully
-            instance.setState(PipelineInstance.State.COMPLETED);
-            instance.stopExecutionClock();
-        } else if (state.getNumFailedTasks() > 0) {
-            if (state.getNumFailedTasks() + state.getNumCompletedTasks() == state
-                .getNumSubmittedTasks()) {
-                instance.setState(PipelineInstance.State.ERRORS_STALLED);
-                instance.stopExecutionClock();
-            } else {
-                instance.setState(PipelineInstance.State.ERRORS_RUNNING);
-            }
-        } else {
-            // situation normal
-            instance.setState(PipelineInstance.State.PROCESSING);
+    private void restartFailedTasksForNode(
+        Map.Entry<PipelineInstanceNode, List<PipelineTask>> entry, boolean doTransitionOnly,
+        RunMode restartMode) {
+        PipelineInstanceNode node = entry.getKey();
+        List<PipelineTask> tasks = entry.getValue();
+        log.info("Restarting {} tasks for instance node {} ({})", tasks.size(), node.getId(),
+            node.getPipelineDefinitionNode().getModuleName());
+
+        pipelineOperations.taskCounts(node);
+        logInstanceNodeCounts(node, "initial");
+
+        // Loop over tasks and prepare for restart, including sending the task request message.
+        for (PipelineTask task : tasks) {
+            restartFailedTask(task, doTransitionOnly, restartMode);
         }
 
-        log.info("updateInstanceState: all nodes: numTasks/numSubmittedTasks/numCompletedTasks/numFailedTasks =  "
-            + state.getNumTasks()
-            + "/"
-            + state.getNumSubmittedTasks()
-            + "/"
-            + state.getNumCompletedTasks() + "/" + state.getNumFailedTasks());
+        // Update and log the instance state.
+        PipelineInstance instance = node.getPipelineInstance();
+        logUpdatedInstanceState(instance);
+        pipelineInstanceCrud.merge(instance);
+
+        logInstanceNodeCounts(node, "final");
+    }
 
-        log.info("updateInstanceState: updated PipelineInstance.state = " + instance.getState()
-        + " for id: " + instance.getId());
+    private void logInstanceNodeCounts(PipelineInstanceNode node, String initialOrFinal) {
+        TaskCounts instanceNodeCounts = pipelineOperations.taskCounts(node);
+        log.info("""
+            node {} state:\s\
+            numTasks/numSubmittedTasks/numCompletedTasks/numFailedTasks =\s\s\
+            {} / {} {} / {}""", initialOrFinal, instanceNodeCounts.getTaskCount(),
+            instanceNodeCounts.getSubmittedTaskCount(), instanceNodeCounts.getCompletedTaskCount(),
+            instanceNodeCounts.getFailedTaskCount());
     }
 
     /**
-     * Restart a PipelineTask in the ERROR state. Usually called from the console.
-     *
-     * @param task
-     * @param doTransitionOnly
+     * Performs restart activities for a single {@link PipelineTask}.
      */
-    public void restartFailedTask(PipelineTask task, boolean doTransitionOnly) {
-        log.debug("runTask(long) - start");
-
+    private void restartFailedTask(PipelineTask task, boolean doTransitionOnly,
+        RunMode restartMode) {
         boolean okayToRestart = false;
         PipelineTask.State oldState = task.getState();
         if (oldState == PipelineTask.State.ERROR) {
-            okayToRestart = true ;
+            okayToRestart = true;
         } else {
             ProcessingSummary processingState = new ProcessingSummaryOperations()
                 .processingSummary(task.getId());
-            if (processingState.getProcessingState() == ProcessingState.COMPLETE &&
-                processingState.getFailedSubtaskCount() > 0) {
-                okayToRestart = true ;
+            if (processingState.getProcessingState() == ProcessingState.COMPLETE
+                && processingState.getFailedSubtaskCount() > 0) {
+                okayToRestart = true;
             }
         }
 
         log.info("Restarting failed task id=" + task.getId() + ", oldState : " + oldState);
 
         if (!okayToRestart) {
-            throw new PipelineException("Can only restart ERROR tasks or COMPLETE tasks with failed sub-tasks!  state = " + oldState);
+            log.warn("Task {} is in state {}, not restarting", task.getId(), oldState);
+            return;
         }
 
-        // Retrieve the task so that it can be modified in the database using the Hibernate infrastructure
+        // Retrieve the task so that it can be modified in the database using the Hibernate
+        // infrastructure
         PipelineTask databaseTask = pipelineTaskCrud.retrieve(task.getId());
-        databaseTask.setState(PipelineTask.State.SUBMITTED);
-        databaseTask.startExecutionClock();
-        databaseTask.setRetry(true);
-
-        PipelineInstance instance = databaseTask.getPipelineInstance();
-        PipelineInstanceNode instanceNode = pipelineInstanceNodeCrud.retrieve(instance,
-            task.getPipelineDefinitionNode());
-
-        log.info("restartFailedTask: currentNode: numTasks/numSubmittedTasks/numCompletedTasks/numFailedTasks =  "
-            + instanceNode.getNumTasks()
-            + "/"
-            + instanceNode.getNumSubmittedTasks()
-            + "/"
-            + instanceNode.getNumCompletedTasks() + "/" + instanceNode.getNumFailedTasks());
-
-        pipelineInstanceNodeCrud.decrementFailedTaskCount(instanceNode.getId());
-
-        updateInstanceState(instance);
-        pipelineInstanceCrud.update(instance);
-        pipelineTaskCrud.update(databaseTask);
+        log.info("Restarting task id={}, oldState : {}", databaseTask.getId(), oldState);
 
-        restartTask(task, doTransitionOnly);
-    }
-
-    /**
-     * Re-submit a task to the worker queue without making any changes to the {@link PipelineTask}
-     * object in the database.
-     *
-     * @param task
-     * @param doTransitionOnly
-     */
-    public void restartTask(PipelineTask task, boolean doTransitionOnly) {
-        PipelineTask.State oldState = task.getState();
+        databaseTask.setRetry(true);
+        pipelineOperations.setTaskState(databaseTask, PipelineTask.State.SUBMITTED);
+        removeTaskFromKilledTaskList(pipelineTaskCrud.merge(databaseTask).getId());
 
-        log.info("Restarting task id=" + task.getId() + ", oldState : " + oldState);
+        // Send the task message to the supervisor.
+        sendTaskRequestMessage(databaseTask, Priority.HIGHEST, doTransitionOnly, restartMode);
     }
 
-    /**
-     * Re-submit a task to the worker queue without making any changes to the {@link PipelineTask}
-     * object in the database.
-     *
-     * @param task
-     */
-    public void restartTask(PipelineTask task) {
-        restartTask(task, false);
+    /** Replace with dummy method in unit testing. */
+    public void removeTaskFromKilledTaskList(long taskId) {
+        TaskRequestHandlerLifecycleManager.removeTaskFromKilledTaskList(taskId);
     }
 
     /**
@@ -433,13 +434,14 @@ public void restartTask(PipelineTask task) {
      * @param queueName
      * @return
      */
-    private LinkedList<PipelineTask> launchNode(PipelineInstanceNode instanceNode) {
-        Map<ClassWrapper<Parameters>, ParameterSet> uowModuleParameterSets = instanceNode
+    private void launchNode(PipelineInstanceNode instanceNode) {
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> uowModuleParameterSets = instanceNode
             .getModuleParameterSets();
-        PipelineDefinitionNode taskGeneratorNode = instanceNode
-            .getPipelineDefinitionNode().taskGeneratorNode();
+        log.debug("launchNode 1: start");
+        PipelineDefinitionNode taskGeneratorNode = instanceNode.getPipelineDefinitionNode()
+            .taskGeneratorNode();
 
-        return launchNode(instanceNode, taskGeneratorNode, uowModuleParameterSets);
+        launchNode(instanceNode, taskGeneratorNode, uowModuleParameterSets);
     }
 
     /**
@@ -450,32 +452,34 @@ private LinkedList<PipelineTask> launchNode(PipelineInstanceNode instanceNode) {
      * @param uowModuleParameterSets
      * @return
      */
-    private LinkedList<PipelineTask> launchNode(PipelineInstanceNode instanceNode,
+    private void launchNode(PipelineInstanceNode instanceNode,
         PipelineDefinitionNode taskGeneratorNode,
-        Map<ClassWrapper<Parameters>, ParameterSet> uowModuleParameterSets) {
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> uowModuleParameterSets) {
         PipelineInstance instance = instanceNode.getPipelineInstance();
-        PipelineDefinitionNode definitionNode = instanceNode.getPipelineDefinitionNode();
-        ClassWrapper<UnitOfWorkGenerator> unitOfWorkGenerator = unitOfWorkGenerator(taskGeneratorNode);
+        instanceNode.getPipelineDefinitionNode();
+        ClassWrapper<UnitOfWorkGenerator> unitOfWorkGenerator = unitOfWorkGenerator(
+            taskGeneratorNode);
 
+        log.debug("launchNode 2: start");
 
         if (!unitOfWorkGenerator.isInitialized()) {
             throw new PipelineException(
                 "Configuration Error: Unable to launch node because no UnitOfWorkGenerator class is defined");
         }
 
-        Map<ClassWrapper<Parameters>, ParameterSet> pipelineParameterSets = instance
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> pipelineParameterSets = instance
             .getPipelineParameterSets();
 
         /*
-         * Create a Map containing all of the entries from the pipeline
-         * parameters plus the module parameters for this node for use by the
-         * UnitOfWorkTaskGenerator. This allows the UOW parameters to be
-         * specified at either the pipeline or module level.
+         * Create a Map containing all of the entries from the pipeline parameters plus the module
+         * parameters for this node for use by the UnitOfWorkTaskGenerator. This allows the UOW
+         * parameters to be specified at either the pipeline or module level.
          */
-        Map<ClassWrapper<Parameters>, ParameterSet> compositeParameterSets = new HashMap<>(
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> compositeParameterSets = new HashMap<>(
             pipelineParameterSets);
 
-        for (ClassWrapper<Parameters> moduleParameterClass : uowModuleParameterSets.keySet()) {
+        for (ClassWrapper<ParametersInterface> moduleParameterClass : uowModuleParameterSets
+            .keySet()) {
             if (compositeParameterSets.containsKey(moduleParameterClass)) {
                 throw new PipelineException(
                     "Configuration Error: Module parameter and pipeline parameter Maps both contain a value for parameter class: "
@@ -485,39 +489,25 @@ private LinkedList<PipelineTask> launchNode(PipelineInstanceNode instanceNode,
                 uowModuleParameterSets.get(moduleParameterClass));
         }
 
-        Map<Class<? extends Parameters>, Parameters> uowParams = new HashMap<>();
+        Map<Class<? extends ParametersInterface>, ParametersInterface> uowParams = new HashMap<>();
 
-        for (ClassWrapper<Parameters> parametersClass : compositeParameterSets.keySet()) {
+        for (ClassWrapper<ParametersInterface> parametersClass : compositeParameterSets.keySet()) {
             ParameterSet parameterSet = compositeParameterSets.get(parametersClass);
-            Class<? extends Parameters> clazz = parametersClass.getClazz();
+            Class<? extends ParametersInterface> clazz = parametersClass.getClazz();
             uowParams.put(clazz, parameterSet.parametersInstance());
         }
 
+        log.debug("Generating tasks");
         List<UnitOfWork> tasks = new ArrayList<>();
         tasks = unitOfWorkGenerator.newInstance().generateUnitsOfWork(uowParams);
+        log.info("Generated " + tasks.size() + " tasks for pipeline definition node "
+            + taskGeneratorNode.getModuleName());
 
         if (tasks.isEmpty()) {
-            throw new PipelineException(
-                "Task generation did not generate any tasks!  UOW class: "
-                    + unitOfWorkGenerator.getClassName());
-        }
-
-        LinkedList<PipelineTask> pipelineTasks = new LinkedList<>();
-
-        for (UnitOfWork task : tasks) {
-            pipelineTasks.add(launchTask(instanceNode, instance, new BeanWrapper<>(
-                task)));
-        }
-
-        instanceNode.setNumTasks(tasks.size());
-        instanceNode.setNumSubmittedTasks(tasks.size());
-
-        PipelineInstanceNode endNode = instance.getEndNode();
-        if (endNode == null || instanceNode.getId() != endNode.getId()) {
-            propagateTaskCount(instance, definitionNode.getNextNodes(), tasks.size());
+            throw new PipelineException("Task generation did not generate any tasks!  UOW class: "
+                + unitOfWorkGenerator.getClassName());
         }
-
-        return pipelineTasks;
+        launchTasks(instanceNode, instance, tasks);
     }
 
     public ClassWrapper<UnitOfWorkGenerator> unitOfWorkGenerator(PipelineDefinitionNode node) {
@@ -525,11 +515,9 @@ public ClassWrapper<UnitOfWorkGenerator> unitOfWorkGenerator(PipelineDefinitionN
     }
 
     /**
-     * Recursive method to create a {@link PipelineInstanceNode} for all
-     * subsequent {@link PipelineDefinitionNode}s
-     *
-     * This is later used by PipelineInstanceCrud.isNodeComplete() to determine
-     * if all tasks are complete for a given node.
+     * Recursive method to create a {@link PipelineInstanceNode} for all subsequent
+     * {@link PipelineDefinitionNode}s This is later used by PipelineInstanceCrud.isNodeComplete()
+     * to determine if all tasks are complete for a given node.
      *
      * @param instance
      * @param pipeline
@@ -545,16 +533,16 @@ private PipelineInstanceNode createInstanceNodes(PipelineInstance instance,
 
         PipelineInstanceNode instanceNode = new PipelineInstanceNode(instance, node,
             moduleDefinition);
-        pipelineInstanceNodeCrud.create(instanceNode);
+        pipelineInstanceNodeCrud.persist(instanceNode);
 
-        Map<ClassWrapper<Parameters>, ParameterSetName> pipelineNodeParameters =
-            node.getModuleParameterSetNames();
-        Map<ClassWrapper<Parameters>, ParameterSet> instanceNodeParams = instanceNode
+        Map<ClassWrapper<ParametersInterface>, String> pipelineNodeParameters = node
+            .getModuleParameterSetNames();
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> instanceNodeParams = instanceNode
             .getModuleParameterSets();
 
         bindParameters(pipelineNodeParameters, instanceNodeParams);
 
-        if (endNode != null && endNode.getId() == node.getId()) {
+        if (endNode != null && endNode.getId().equals(node.getId())) {
             log.info("Reached optional endNode, not creating any more PipelineInstanceNodes");
             instance.setEndNode(instanceNode);
         } else {
@@ -567,17 +555,16 @@ private PipelineInstanceNode createInstanceNodes(PipelineInstance instance,
     }
 
     /**
-     * For each {@link ParamSetName}, retrieve the latest version of the
-     * {@link ParamSet}, lock it, and put it into the params map. Used for both
-     * pipeline params and module params.
+     * For each {@link ParamSetName}, retrieve the latest version of the {@link ParamSet}, lock it,
+     * and put it into the params map. Used for both pipeline params and module params.
      *
      * @param paramNames
      * @param params
      */
-    private void bindParameters(Map<ClassWrapper<Parameters>, ParameterSetName> paramNames,
-        Map<ClassWrapper<Parameters>, ParameterSet> params) {
-        for (ClassWrapper<Parameters> paramClass : paramNames.keySet()) {
-            ParameterSetName pipelineParamName = paramNames.get(paramClass);
+    private void bindParameters(Map<ClassWrapper<ParametersInterface>, String> paramNames,
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> params) {
+        for (ClassWrapper<ParametersInterface> paramClass : paramNames.keySet()) {
+            String pipelineParamName = paramNames.get(paramClass);
             ParameterSet paramSet = parameterSetCrud
                 .retrieveLatestVersionForName(pipelineParamName);
             params.put(paramClass, paramSet);
@@ -586,96 +573,56 @@ private void bindParameters(Map<ClassWrapper<Parameters>, ParameterSetName> para
     }
 
     /**
-     * Create a new {@link PipelineTask} and the corresponding
-     * {@link WorkerTaskRequest} message.
-     *
-     * @param instanceNode
-     * @param queueName
-     * @param instance
-     * @param definitionNode
-     * @param task
-     * @return
+     * Create new {@link PipelineTask}s and the corresponding {@link TaskRequest} messages.
      */
-    private PipelineTask launchTask(PipelineInstanceNode instanceNode, PipelineInstance instance,
-        BeanWrapper<UnitOfWork> task) {
-        PipelineTask pipelineTask = new PipelineTask(instance, instanceNode);
-        pipelineTask.setState(PipelineTask.State.SUBMITTED);
-        pipelineTask.setUowTask(task);
-
-        pipelineTaskCrud.create(pipelineTask);
+    private void launchTasks(PipelineInstanceNode instanceNode, PipelineInstance instance,
+        List<UnitOfWork> tasks) {
+        List<PipelineTask> pipelineTasks = new ArrayList<>();
+        for (UnitOfWork task : tasks) {
+            PipelineTask pipelineTask = new PipelineTask(instance, instanceNode);
 
-        return pipelineTask;
-    }
+            pipelineTask.setState(PipelineTask.State.SUBMITTED);
+            pipelineTask.setUowTaskParameters(task.getParameters());
+            pipelineTasks.add(pipelineTask);
+        }
+        DatabaseTransactionFactory.performTransaction(new DatabaseTransaction<Void>() {
+            @Override
+            public Void transaction() {
+                pipelineTaskCrud.persist(pipelineTasks);
+                return null;
+            }
 
-    /**
-     * Propagate numTasks to later instance nodes that share the same UOW
-     *
-     * @param nextDefinitionNodes
-     * @param numTasks
-     */
-    private void propagateTaskCount(PipelineInstance instance,
-        List<PipelineDefinitionNode> nextDefinitionNodes, int numTasks) {
-        for (PipelineDefinitionNode nextDefinitionNode : nextDefinitionNodes) {
-            if (!nextDefinitionNode.isStartNewUow()) {
-                PipelineInstanceNode instanceNode = pipelineInstanceNodeCrud.retrieve(instance,
-                    nextDefinitionNode);
-                instanceNode.setNumTasks(numTasks);
-
-                PipelineInstanceNode endNode = instance.getEndNode();
-                if (endNode == null || instanceNode.getId() != endNode.getId()) {
-                    propagateTaskCount(instance, nextDefinitionNode.getNextNodes(), numTasks);
-                }
+            // Do not allow in the context of an existing transaction.
+            @Override
+            public boolean allowExistingTransaction() {
+                return false;
             }
+        });
+        for (PipelineTask pipelineTask : pipelineTasks) {
+            sendTaskRequestMessage(pipelineTask, pipelineTask.getPipelineInstance().getPriority(),
+                false, RunMode.STANDARD);
         }
     }
 
-    public void sendWorkerMessageForTask(PipelineTask task) {
-        sendWorkerMessageForTask(task, task.getPipelineInstance().getPriority(), false);
-    }
-
-    public void sendWorkerMessageForTask(PipelineTask task, int priority) {
-        sendWorkerMessageForTask(task, priority, false);
+    public void persistTaskResults(PipelineTask task) {
+        sendTaskRequestMessage(task, Priority.HIGH, false, RunMode.STANDARD);
     }
 
-    /**
-     * @param task
-     * @throws PipelineException
-     *
-     * Note: the doTransitionOnly arg is heritage from the Kepler and TESS source (PI and Spiffy,
-     * respectively). AFAICT, there is no use-case anywhere in our code for setting doTransitionOnly to
-     * true. I'm keeping the option here just in case.
-     */
-    public void sendWorkerMessageForTask(PipelineTask task, int priority, boolean doTransitionOnly) {
-    	sendWorkerMessageForTask(task, priority, doTransitionOnly, RunMode.STANDARD);
-    }
+    private void sendTaskRequestMessage(PipelineTask task, Priority priority,
+        boolean doTransitionOnly, RunMode runMode) {
 
-    public void sendWorkerMessageForTask(PipelineTask task, int priority, boolean doTransitionOnly,
-    		RunMode runMode) {
+        if (!taskRequestEnabled()) {
+            return;
+        }
 
         log.debug("Generating worker task message for task=" + task.getId() + ", module="
-                + task.getModuleName());
-
-            WorkerTaskRequest workerTaskRequest = new WorkerTaskRequest(task.pipelineInstanceId(),
-                task.pipelineInstanceNodeId(), task.getId(), priority, doTransitionOnly,
-                runMode);
-
-            WorkerPipelineProcess.workerTaskRequestQueue.put(workerTaskRequest);
-
-    }
+            + task.getModuleName());
 
-    /**
-     * Sends a fire-trigger request message to the worker.
-     */
-    public void sendTriggerMessage(WorkerFireTriggerRequest triggerRequest) {
-        UiCommunicator.send(triggerRequest);
-    }
+        TaskRequest taskRequest = new TaskRequest(task.pipelineInstanceId(),
+            task.pipelineInstanceNodeId(), task.getPipelineDefinitionNode().getId(), task.getId(),
+            priority, doTransitionOnly, runMode);
 
-    /**
-     * Sends a request for information on whether any pipelines are running or queued.
-     */
-    public void sendRunningPipelinesCheckRequestMessage() {
-        log.info("Sending message to request status of running instances");
-        UiCommunicator.send(new RunningPipelinesCheckRequest());
+        ZiggyMessenger.publish(taskRequest);
     }
 
     /**
@@ -700,7 +647,8 @@ public void setPipelineInstanceNodeCrud(PipelineInstanceNodeCrud pipelineInstanc
         this.pipelineInstanceNodeCrud = pipelineInstanceNodeCrud;
     }
 
-    void setPipelineModuleDefinitionCrud(PipelineModuleDefinitionCrud pipelineModuleDefinitionCrud) {
+    void setPipelineModuleDefinitionCrud(
+        PipelineModuleDefinitionCrud pipelineModuleDefinitionCrud) {
         this.pipelineModuleDefinitionCrud = pipelineModuleDefinitionCrud;
     }
 
@@ -708,4 +656,11 @@ void setPipelineModuleParameterSetCrud(ParameterSetCrud parameterSetCrud) {
         this.parameterSetCrud = parameterSetCrud;
     }
 
+    public void setPipelineOperations(PipelineOperations pipelineOperations) {
+        this.pipelineOperations = pipelineOperations;
+    }
+
+    public boolean taskRequestEnabled() {
+        return true;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/PipelineOperations.java b/src/main/java/gov/nasa/ziggy/pipeline/PipelineOperations.java
index 3bfaa79..ebed88a 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/PipelineOperations.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/PipelineOperations.java
@@ -2,10 +2,9 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
+import java.io.UncheckedIOException;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -18,27 +17,30 @@
 import gov.nasa.ziggy.models.ModelRegistryOperations;
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.parameters.ParametersUtils;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ModuleName;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.TaskCounts;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
+import gov.nasa.ziggy.pipeline.definition.TypedParameterCollection;
 import gov.nasa.ziggy.pipeline.definition.crud.ParameterSetCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceNodeCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineModuleDefinitionCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
 import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 public class PipelineOperations {
+    @SuppressWarnings("unused")
     private static final Logger log = LoggerFactory.getLogger(PipelineOperations.class);
 
     private static final String CSV_REPORT_DELIMITER = ":";
@@ -52,33 +54,19 @@ public PipelineOperations() {
      * @param moduleName
      * @return
      */
-    public PipelineModuleDefinition retrieveLatestModuleDefinition(ModuleName moduleName) {
+    public PipelineModuleDefinition retrieveLatestModuleDefinition(String moduleName) {
         PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
         return crud.retrieveLatestVersionForName(moduleName);
     }
 
     /**
-     * Get the latest version for the specified parameterSetName
-     *
-     * @param parameterSetName
-     * @return
+     * Get the latest version for the specified parameter set name.
      */
     public ParameterSet retrieveLatestParameterSet(String parameterSetName) {
         ParameterSetCrud crud = new ParameterSetCrud();
         return crud.retrieveLatestVersionForName(parameterSetName);
     }
 
-    /**
-     * Get the latest version for the specified {@link ParameterSetName}
-     *
-     * @param parameterSetName
-     * @return
-     */
-    public ParameterSet retrieveLatestParameterSet(ParameterSetName parameterSetName) {
-        ParameterSetCrud crud = new ParameterSetCrud();
-        return crud.retrieveLatestVersionForName(parameterSetName);
-    }
-
     /**
      * Returns a {@link Set} containing all {@link Parameters} classes required by the specified
      * {@link PipelineDefinitionNode}. This is a union of the Parameters classes required by the
@@ -88,20 +76,20 @@ public ParameterSet retrieveLatestParameterSet(ParameterSetName parameterSetName
      * @param pipelineNode
      * @return
      */
-    public Set<ClassWrapper<Parameters>> retrieveRequiredParameterClassesForNode(
+    public Set<ClassWrapper<ParametersInterface>> retrieveRequiredParameterClassesForNode(
         PipelineDefinitionNode pipelineNode) {
         PipelineModuleDefinitionCrud modDefCrud = new PipelineModuleDefinitionCrud();
         PipelineModuleDefinition modDef = modDefCrud
             .retrieveLatestVersionForName(pipelineNode.getModuleName());
 
-        Set<ClassWrapper<Parameters>> allRequiredParams = new HashSet<>();
+        Set<ClassWrapper<ParametersInterface>> allRequiredParams = new HashSet<>();
 
-        List<Class<? extends Parameters>> uowParams = UnitOfWorkGenerator
+        List<Class<? extends ParametersInterface>> uowParams = UnitOfWorkGenerator
             .unitOfWorkGenerator(pipelineNode)
             .newInstance()
             .requiredParameterClasses();
-        for (Class<? extends Parameters> uowParam : uowParams) {
-            allRequiredParams.add(new ClassWrapper<Parameters>(uowParam));
+        for (Class<? extends ParametersInterface> uowParam : uowParams) {
+            allRequiredParams.add(new ClassWrapper<>(uowParam));
         }
         allRequiredParams.addAll(modDef.getRequiredParameterClasses());
 
@@ -121,7 +109,7 @@ public Set<ClassWrapper<Parameters>> retrieveRequiredParameterClassesForNode(
      * @param forceSave If true, save the new ParameterSet even if nothing changed
      * @return
      */
-    public ParameterSet updateParameterSet(ParameterSetName parameterSetName, Parameters parameters,
+    public ParameterSet updateParameterSet(String parameterSetName, Parameters parameters,
         boolean forceSave) {
         ParameterSet parameterSet = retrieveLatestParameterSet(parameterSetName);
 
@@ -140,8 +128,8 @@ public ParameterSet updateParameterSet(ParameterSetName parameterSetName, Parame
      * @param parameterSet
      * @return
      */
-    public ParameterSet updateParameterSet(ParameterSet parameterSet, Parameters newParameters,
-        boolean forceSave) {
+    public ParameterSet updateParameterSet(ParameterSet parameterSet,
+        ParametersInterface newParameters, boolean forceSave) {
         return updateParameterSet(parameterSet, newParameters, parameterSet.getDescription(),
             forceSave);
     }
@@ -151,22 +139,15 @@ public ParameterSet updateParameterSet(ParameterSet parameterSet, Parameters new
      * <p>
      * If if the parameters instance is different than the parameter set, then apply the changes. If
      * locked, first create a new version.
-     * <p>
-     * The new ParameterSet version is returned if one was created, otherwise the old one is
-     * returned.
      *
-     * @param newParameters
-     * @return
+     * @return the new ParameterSet version if one was created; otherwise the old one is returned
      */
-    public ParameterSet updateParameterSet(ParameterSet parameterSet, Parameters newParameters,
-        String newDescription, boolean forceSave) {
-        BeanWrapper<Parameters> currentParamsBean = parameterSet.getParameters();
-        BeanWrapper<Parameters> newParamsBean = new BeanWrapper<>(newParameters);
+    public ParameterSet updateParameterSet(ParameterSet parameterSet,
+        ParametersInterface newParameters, String newDescription, boolean forceSave) {
+        ParametersInterface currentParameters = parameterSet.parametersInstance();
 
         String currentDescription = parameterSet.getDescription();
 
-        ParameterSet updatedParameterSet = parameterSet;
-
         boolean descriptionChanged = false;
         if (currentDescription == null) {
             if (newDescription != null) {
@@ -176,75 +157,32 @@ public ParameterSet updateParameterSet(ParameterSet parameterSet, Parameters new
             descriptionChanged = true;
         }
 
-        boolean propsChanged = !compareParameters(currentParamsBean, newParamsBean);
-
-        if (propsChanged || descriptionChanged || forceSave) {
-            ParameterSetCrud crud = new ParameterSetCrud();
-            if (parameterSet.isLocked()) {
-                updatedParameterSet = parameterSet.newVersion();
-                // Evict the exiting parameter set object so that we don't get
-                // a Hibernate error about a duplicate ParameterSetName.
-                crud.evict(parameterSet);
-            }
-
-            updatedParameterSet.setParameters(newParamsBean);
-            updatedParameterSet.setDescription(newDescription);
-            crud.create(updatedParameterSet);
+        if (!compareParameters(currentParameters, newParameters) || descriptionChanged
+            || forceSave) {
+            parameterSet.setTypedParameters(newParameters.getParameters());
+            parameterSet.setDescription(newDescription);
+            return new ParameterSetCrud().merge(parameterSet);
         }
-
-        return updatedParameterSet;
+        return parameterSet;
     }
 
     /**
-     * Indicates whether the specified beans contain the same parameters and values
+     * Indicates whether the specified parameters contain the same parameters and values.
      *
-     * @param currentParamsBean
-     * @param newParamsBean
-     * @return true if same
+     * @return true if same or both null
      */
-    public boolean compareParameters(BeanWrapper<Parameters> currentParamsBean,
-        BeanWrapper<Parameters> newParamsBean) {
-        Map<String, String> currentProps = BeanWrapper
-            .propertyValueByName(currentParamsBean.getTypedProperties());
-        Map<String, String> newProps = BeanWrapper
-            .propertyValueByName(newParamsBean.getTypedProperties());
-
-        boolean propsSame = true;
-        if (currentProps == null) {
-            if (newProps != null) {
-                propsSame = false;
-            }
-        } else {
-            propsSame = currentProps.equals(newProps);
-        }
-
-        log.debug("currentProps.size = " + currentProps.size());
-        log.debug("newProps.size = " + newProps.size());
-
-        return propsSame;
-    }
+    public boolean compareParameters(ParametersInterface currentParameters,
+        ParametersInterface newParameters) {
 
-    /**
-     * Sends a fire-trigger request message to the worker.
-     */
-    public void sendTriggerMessage(WorkerFireTriggerRequest triggerRequest) {
-        new PipelineExecutor().sendTriggerMessage(triggerRequest);
-    }
-
-    /**
-     * Sends a request for information on whether any pipelines are running or queued.
-     */
-    public void sendRunningPipelinesCheckRequestMessage() {
-        new PipelineExecutor().sendRunningPipelinesCheckRequestMessage();
-    }
+        if (currentParameters == null) {
+            return newParameters == null;
+        }
+        if (newParameters == null) {
+            return false;
+        }
 
-    /**
-     * Create the launcher and launch a new pipeline instance using the specified
-     * {@link PipelineDefinition} and startNode/endNode
-     */
-    public InstanceAndTasks fireTrigger(PipelineDefinition pipelineDefinition, String instanceName,
-        PipelineDefinitionNode startNode, PipelineDefinitionNode endNode) {
-        return fireTrigger(pipelineDefinition, instanceName, startNode, endNode, null);
+        return new TypedParameterCollection(currentParameters.getParameters())
+            .totalEquals(new TypedParameterCollection(newParameters.getParameters()));
     }
 
     /**
@@ -253,7 +191,7 @@ public InstanceAndTasks fireTrigger(PipelineDefinition pipelineDefinition, Strin
      * {@link ParameterSet} generated by an event handler, if the pipeline launch operation is
      * driven by an event handler.
      */
-    public InstanceAndTasks fireTrigger(PipelineDefinition pipelineDefinition, String instanceName,
+    public PipelineInstance fireTrigger(PipelineDefinition pipelineDefinition, String instanceName,
         PipelineDefinitionNode startNode, PipelineDefinitionNode endNode,
         String eventHandlerParamSetName) {
         TriggerValidationResults validationResults = validateTrigger(pipelineDefinition);
@@ -266,10 +204,6 @@ public InstanceAndTasks fireTrigger(PipelineDefinition pipelineDefinition, Strin
             eventHandlerParamSetName);
     }
 
-    public void sendWorkerMessageForTask(PipelineTask task) {
-        pipelineExecutor().sendWorkerMessageForTask(task);
-    }
-
     /**
      * Validates that this {@link PipelineDefinition} is valid for firing. Checks that the
      * associated pipeline definition objects have not changed in an incompatible way and that all
@@ -313,7 +247,7 @@ private void validateTriggerParametersForNode(PipelineDefinition pipelineDefinit
         PipelineDefinitionNode pipelineDefinitionNode, TriggerValidationResults validationResults) {
         String errorLabel = "module: " + pipelineDefinitionNode.getModuleName();
 
-        Set<ClassWrapper<Parameters>> requiredParameterClasses = retrieveRequiredParameterClassesForNode(
+        Set<ClassWrapper<ParametersInterface>> requiredParameterClasses = retrieveRequiredParameterClassesForNode(
             pipelineDefinitionNode);
 
         validateParameterClassExists(pipelineDefinitionNode.getModuleParameterSetNames(),
@@ -334,14 +268,15 @@ private void validateTriggerParametersForNode(PipelineDefinition pipelineDefinit
      *
      * @param validationResults
      */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     private void validateTriggerParameters(
-        Set<ClassWrapper<Parameters>> requiredModuleParameterClasses,
-        Map<ClassWrapper<Parameters>, ParameterSetName> pipelineParameterSetNames,
-        Map<ClassWrapper<Parameters>, ParameterSetName> moduleParameterSetNames, String errorLabel,
+        Set<ClassWrapper<ParametersInterface>> requiredModuleParameterClasses,
+        Map<ClassWrapper<ParametersInterface>, String> pipelineParameterSetNames,
+        Map<ClassWrapper<ParametersInterface>, String> moduleParameterSetNames, String errorLabel,
         TriggerValidationResults validationResults) {
-        ParameterSetName paramSetName = null;
+        String paramSetName = null;
 
-        for (ClassWrapper<Parameters> classWrapper : requiredModuleParameterClasses) {
+        for (ClassWrapper<ParametersInterface> classWrapper : requiredModuleParameterClasses) {
             boolean found = false;
 
             // check at the module level first
@@ -365,8 +300,7 @@ private void validateTriggerParameters(
                 } else {
                     // check for new fields
                     ParameterSet paramSet = retrieveLatestParameterSet(paramSetName);
-                    BeanWrapper<Parameters> bean = paramSet.getParameters();
-                    if (bean.hasNewUnsavedFields()) {
+                    if (paramSet.hasNewUnsavedFields()) {
                         validationResults.addError(errorLabel + ": parameter set: " + paramSetName
                             + " has new fields that have been added since the last time this parameter set was saved.  "
                             + "Please edit the parameter set in the parameter library, verify that it has the correct values, and save it.");
@@ -374,7 +308,7 @@ private void validateTriggerParameters(
 
                     // Validate the parameters.
                     try {
-                        bean.getInstance().validate();
+                        paramSet.parametersInstance().validate();
                     } catch (Exception ex) {
                         validationResults.addError(errorLabel + ": parameter set: " + paramSetName
                             + " has invalid values: " + ex.toString());
@@ -388,7 +322,8 @@ private void validateTriggerParameters(
          * because this makes the data accountability trace less clear (could possibly support this
          * in the future)
          */
-        for (ClassWrapper<Parameters> moduleParameterClass : moduleParameterSetNames.keySet()) {
+        for (ClassWrapper<ParametersInterface> moduleParameterClass : moduleParameterSetNames
+            .keySet()) {
             if (pipelineParameterSetNames.containsKey(moduleParameterClass)) {
                 validationResults.addError(
                     "Ambiguous configuration: Module parameter and pipeline parameter Maps both contain a value for parameter class: "
@@ -402,10 +337,11 @@ private void validateTriggerParameters(
      * @param errorLabel
      * @param validationResults
      */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     private void validateParameterClassExists(
-        Map<ClassWrapper<Parameters>, ParameterSetName> parameterSetNames, String errorLabel,
+        Map<ClassWrapper<ParametersInterface>, String> parameterSetNames, String errorLabel,
         TriggerValidationResults validationResults) {
-        for (ClassWrapper<Parameters> classWrapper : parameterSetNames.keySet()) {
+        for (ClassWrapper<ParametersInterface> classWrapper : parameterSetNames.keySet()) {
             try {
                 classWrapper.getClazz();
             } catch (RuntimeException e) {
@@ -416,6 +352,104 @@ private void validateParameterClassExists(
         }
     }
 
+    /**
+     * Updates the state of a {@link PipelineTask} and simultaneously updates the state of that
+     * task's {@link PipelineInstance} if need be. Returns a {@link TaskStateSummary} that has the
+     * {@link TaskCounts} for the instance and also the task's {@link PipelineInstanceNode}. This is
+     * a safer method to use than the "bare"
+     * {@link PipelineTask#setState(gov.nasa.ziggy.pipeline.definition.PipelineTask.State)} because
+     * it also automatically updates the pipeline instance, and starts or stops execution clocks as
+     * needed.
+     */
+    public TaskStateSummary setTaskState(PipelineTask task, PipelineTask.State state) {
+        task.setState(state);
+        if (state == PipelineTask.State.COMPLETED || state == PipelineTask.State.ERROR
+            || state == PipelineTask.State.PARTIAL) {
+            task.stopExecutionClock();
+        } else {
+            task.startExecutionClock();
+        }
+        PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
+        // First set the task state.
+        PipelineTask mergedTask = pipelineTaskCrud.merge(task);
+
+        // Obtain the task counts for the instance.
+        TaskCounts instanceCounts = taskCounts(mergedTask.getPipelineInstance());
+
+        // Obtain the task counts for the instance node.
+        TaskCounts instanceNodeCounts = taskCounts(mergedTask.getPipelineInstanceNode());
+
+        // Update the instance state
+        updateInstanceState(mergedTask, instanceNodeCounts);
+        PipelineInstance mergedInstance = new PipelineInstanceCrud()
+            .merge(mergedTask.getPipelineInstance());
+
+        return new TaskStateSummary(instanceCounts, instanceNodeCounts, mergedTask, mergedInstance);
+    }
+
+    /**
+     * Sets the state of a {@link PipelineInstance} based on the {@link TaskCounts} object that
+     * summarizes the task states for the instance. Also starts or stops the execution clock as
+     * needed. Returns the merged {@link PipelineInstance} object (which includes the updated
+     * state).
+     */
+    public void updateInstanceState(PipelineTask pipelineTask, TaskCounts instanceNodeCounts) {
+        PipelineInstance instance = pipelineTask.getPipelineInstance();
+
+        PipelineInstance.State state = PipelineInstance.State.INITIALIZED;
+
+        if (allInstanceNodesComplete(instance)) {
+
+            // If all the instance nodes are done, we can set the instance state to
+            // either completed or stalled.
+            state = instanceNodeCounts.isInstanceNodeComplete() ? PipelineInstance.State.COMPLETED
+                : PipelineInstance.State.ERRORS_STALLED;
+        } else if (instanceNodeCounts.isInstanceNodeExecutionComplete()) {
+
+            // If the current node is done, then the state is either stalled or processing.
+            state = instanceNodeCounts.isInstanceNodeComplete() ? PipelineInstance.State.PROCESSING
+                : PipelineInstance.State.ERRORS_STALLED;
+        } else {
+
+            // If the current instance node is still grinding away, then the state is either
+            // errors running or processing
+            state = instanceNodeCounts.getFailedTaskCount() == 0 ? PipelineInstance.State.PROCESSING
+                : PipelineInstance.State.ERRORS_RUNNING;
+        }
+
+        state.setExecutionClockState(instance);
+        instance.setState(state);
+    }
+
+    /**
+     * Returns a {@link TaskCounts} instance for a given {@link PipelineInstance}.
+     */
+    public TaskCounts taskCounts(PipelineInstance pipelineInstance) {
+        return TaskCounts.from(new PipelineTaskCrud().retrieveStates(pipelineInstance));
+    }
+
+    /**
+     * Returns a {@link TaskCounts} instance for a given {@link PipelineInstanceNode}.
+     */
+    public TaskCounts taskCounts(PipelineInstanceNode pipelineInstanceNode) {
+        return TaskCounts.from(new PipelineTaskCrud().retrieveStates(pipelineInstanceNode));
+    }
+
+    /**
+     * Determines whether all pipeline instances have completed execution. This means that all nodes
+     * have tasks that submitted and all tasks for all nodes are either complete or errored.
+     */
+    public boolean allInstanceNodesComplete(PipelineInstance pipelineInstance) {
+        List<PipelineInstanceNode> instanceNodes = new PipelineInstanceNodeCrud()
+            .retrieveAll(pipelineInstance);
+        for (PipelineInstanceNode node : instanceNodes) {
+            if (!taskCounts(node).isInstanceNodeExecutionComplete()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * Generate a text report containing pipeline instance metadata including all parameter sets and
      * their values.
@@ -440,13 +474,12 @@ public String generatePedigreeReport(PipelineInstance instance) {
         report.append(nl);
         report.append("Definition Name: " + instance.getPipelineDefinition().getName() + nl);
         report.append("Definition Version: " + instance.getPipelineDefinition().getVersion() + nl);
-        report.append("Definition ID: " + instance.getPipelineDefinition().getId() + nl);
 
         report.append(nl);
         report.append("Pipeline Parameter Sets" + nl);
-        Map<ClassWrapper<Parameters>, ParameterSet> pipelineParamSets = instance
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> pipelineParamSets = instance
             .getPipelineParameterSets();
-        for (ClassWrapper<Parameters> paramClassWrapper : pipelineParamSets.keySet()) {
+        for (ClassWrapper<ParametersInterface> paramClassWrapper : pipelineParamSets.keySet()) {
             ParameterSet paramSet = pipelineParamSets.get(paramClassWrapper);
 
             appendParameterSetToReport(report, paramSet, "  ", false);
@@ -460,17 +493,20 @@ public String generatePedigreeReport(PipelineInstance instance) {
 
         for (PipelineInstanceNode node : pipelineNodes) {
             PipelineModuleDefinition module = node.getPipelineModuleDefinition();
+            TaskCounts instanceNodeCounts = taskCounts(node);
 
             appendModule(nl, report, module);
 
-            report.append("    # Tasks (total/completed/failed): " + node.getNumTasks() + "/"
-                + node.getNumCompletedTasks() + "/" + node.getNumFailedTasks() + nl);
+            report
+                .append("    # Tasks (total/completed/failed): " + instanceNodeCounts.getTaskCount()
+                    + "/" + instanceNodeCounts.getCompletedTaskCount() + "/"
+                    + instanceNodeCounts.getFailedTaskCount() + nl);
             List<String> nodeSoftwareRevisions = pipelineTaskCrud.distinctSoftwareRevisions(node);
             report.append("    Software Revisions for node:" + nodeSoftwareRevisions + nl);
 
-            Map<ClassWrapper<Parameters>, ParameterSet> moduleParamSets = node
+            Map<ClassWrapper<ParametersInterface>, ParameterSet> moduleParamSets = node
                 .getModuleParameterSets();
-            for (ClassWrapper<Parameters> paramClassWrapper : moduleParamSets.keySet()) {
+            for (ClassWrapper<ParametersInterface> paramClassWrapper : moduleParamSets.keySet()) {
                 ParameterSet moduleParamSet = moduleParamSets.get(paramClassWrapper);
 
                 appendParameterSetToReport(report, moduleParamSet, "    ", false);
@@ -489,40 +525,35 @@ public String generatePedigreeReport(PipelineInstance instance) {
     /**
      * Generate a text report about the specified {@link PipelineDefinition} including all parameter
      * sets and their values.
-     *
-     * @param pipelineDefinition
-     * @return
      */
-    public String generateTriggerReport(PipelineDefinition pipelineDefinition) {
+    public String generatePipelineReport(PipelineDefinition pipelineDefinition) {
         String nl = System.lineSeparator();
         StringBuilder report = new StringBuilder();
         ParameterSetCrud paramSetCrud = new ParameterSetCrud();
         PipelineModuleDefinitionCrud pipelineModuleDefinitionCrud = new PipelineModuleDefinitionCrud();
 
-        report.append("Trigger ID: " + pipelineDefinition.getId() + nl);
-        report.append("Trigger Name: " + pipelineDefinition.getName() + nl);
-        report.append("Trigger Priority: " + pipelineDefinition.getInstancePriority() + nl);
+        report.append("Pipeline version: " + pipelineDefinition.getVersion() + nl);
+        report.append("Pipeline name: " + pipelineDefinition.getName() + nl);
+        report.append("Pipeline priority: " + pipelineDefinition.getInstancePriority() + nl);
         report.append(nl);
 
         TriggerValidationResults validationErrors = validateTrigger(pipelineDefinition);
         if (validationErrors.hasErrors()) {
-            report.append("*** Trigger Validation Errors ***" + nl);
+            report.append("*** Pipeline Validation Errors ***" + nl);
             report.append(nl);
             report.append(validationErrors.errorReport("  "));
             report.append(nl);
         }
 
-        report.append("Definition Name: " + pipelineDefinition.getName().getName() + nl);
-
         report.append("Pipeline Parameter Sets" + nl);
-        Map<ClassWrapper<Parameters>, ParameterSetName> pipelineParamSets = pipelineDefinition
+        Map<ClassWrapper<ParametersInterface>, String> pipelineParamSets = pipelineDefinition
             .getPipelineParameterSetNames();
-        for (ClassWrapper<Parameters> paramClassWrapper : pipelineParamSets.keySet()) {
-            ParameterSetName paramSetName = pipelineParamSets.get(paramClassWrapper);
+        for (ClassWrapper<ParametersInterface> paramClassWrapper : pipelineParamSets.keySet()) {
+            String paramSetName = pipelineParamSets.get(paramClassWrapper);
             ParameterSet paramSet = paramSetCrud.retrieveLatestVersionForName(paramSetName);
 
-            appendParameterSetToReport(report, paramSet, "  ", false);
             report.append(nl);
+            appendParameterSetToReport(report, paramSet, "  ", false);
         }
 
         report.append(nl);
@@ -530,22 +561,22 @@ public String generateTriggerReport(PipelineDefinition pipelineDefinition) {
 
         List<PipelineDefinitionNode> nodes = pipelineDefinition.getNodes();
         for (PipelineDefinitionNode node : nodes) {
-            ModuleName moduleName = node.getModuleName();
+            String moduleName = node.getModuleName();
 
             PipelineModuleDefinition modDef = pipelineModuleDefinitionCrud
                 .retrieveLatestVersionForName(moduleName);
 
             appendModule(nl, report, modDef);
 
-            Map<ClassWrapper<Parameters>, ParameterSetName> moduleParamSetNames = node
+            Map<ClassWrapper<ParametersInterface>, String> moduleParamSetNames = node
                 .getModuleParameterSetNames();
-            for (ClassWrapper<Parameters> paramClassWrapper : moduleParamSetNames.keySet()) {
-                ParameterSetName moduleParamSetName = moduleParamSetNames.get(paramClassWrapper);
+            for (ClassWrapper<ParametersInterface> paramClassWrapper : moduleParamSetNames
+                .keySet()) {
+                String moduleParamSetName = moduleParamSetNames.get(paramClassWrapper);
                 ParameterSet moduleParamSet = paramSetCrud
                     .retrieveLatestVersionForName(moduleParamSetName);
 
                 appendParameterSetToReport(report, moduleParamSet, "    ", false);
-                report.append(nl);
             }
         }
 
@@ -555,8 +586,8 @@ public String generateTriggerReport(PipelineDefinition pipelineDefinition) {
     private void appendModule(String nl, StringBuilder report, PipelineModuleDefinition module) {
         report.append(nl);
         report.append(
-            "  Module Definition: " + module.getName() + ", version=" + module.getVersion() + nl);
-        report.append("    Java Classname: "
+            "  Module definition: " + module.getName() + ", version=" + module.getVersion() + nl);
+        report.append("    Java classname: "
             + module.getPipelineModuleClass().getClazz().getSimpleName() + nl);
         report.append("    exe timeout seconds: " + module.getExeTimeoutSecs() + nl);
         report.append("    min memory MB: " + module.getMinMemoryMegaBytes() + nl);
@@ -565,40 +596,42 @@ private void appendModule(String nl, StringBuilder report, PipelineModuleDefinit
     /**
      * @param pipelineDefinition
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void exportPipelineParams(PipelineDefinition pipelineDefinition,
         File destinationDirectory) {
         if (!destinationDirectory.exists()) {
             try {
                 FileUtils.forceMkdir(destinationDirectory);
             } catch (IOException e) {
-                throw new PipelineException(
-                    "failed to create [" + destinationDirectory + "], caught e = " + e, e);
+                throw new UncheckedIOException(
+                    "Unable to create directory " + destinationDirectory.toString(), e);
             }
         }
 
         ParameterSetCrud paramSetCrud = new ParameterSetCrud();
         Map<String, Parameters> paramsToExport = new HashMap<>();
 
-        Map<ClassWrapper<Parameters>, ParameterSetName> pipelineParamSets = pipelineDefinition
+        Map<ClassWrapper<ParametersInterface>, String> pipelineParamSets = pipelineDefinition
             .getPipelineParameterSetNames();
-        for (ClassWrapper<Parameters> paramClassWrapper : pipelineParamSets.keySet()) {
-            ParameterSetName paramSetName = pipelineParamSets.get(paramClassWrapper);
+        for (ClassWrapper<ParametersInterface> paramClassWrapper : pipelineParamSets.keySet()) {
+            String paramSetName = pipelineParamSets.get(paramClassWrapper);
             ParameterSet paramSet = paramSetCrud.retrieveLatestVersionForName(paramSetName);
 
-            paramsToExport.put(paramSetName.getName(), paramSet.parametersInstance());
+            paramsToExport.put(paramSetName, paramSet.parametersInstance());
         }
 
         List<PipelineDefinitionNode> nodes = pipelineDefinition.getNodes();
         for (PipelineDefinitionNode node : nodes) {
-            Map<ClassWrapper<Parameters>, ParameterSetName> moduleParamSetNames = node
+            Map<ClassWrapper<ParametersInterface>, String> moduleParamSetNames = node
                 .getModuleParameterSetNames();
-            for (ClassWrapper<Parameters> paramClassWrapper : moduleParamSetNames.keySet()) {
-                ParameterSetName moduleParamSetName = moduleParamSetNames.get(paramClassWrapper);
+            for (ClassWrapper<ParametersInterface> paramClassWrapper : moduleParamSetNames
+                .keySet()) {
+                String moduleParamSetName = moduleParamSetNames.get(paramClassWrapper);
                 ParameterSet moduleParamSet = paramSetCrud
                     .retrieveLatestVersionForName(moduleParamSetName);
 
-                paramsToExport.put(moduleParamSetName.getName(),
-                    moduleParamSet.parametersInstance());
+                paramsToExport.put(moduleParamSetName, moduleParamSet.parametersInstance());
             }
         }
 
@@ -606,11 +639,7 @@ public void exportPipelineParams(PipelineDefinition pipelineDefinition,
             Parameters params = paramsToExport.get(paramSetName);
             File file = new File(destinationDirectory, paramSetName + ".properties");
 
-            try {
-                ParametersUtils.exportParameters(file, params);
-            } catch (IOException e) {
-                throw new PipelineException("failed to export [" + file + "], caught e = " + e, e);
-            }
+            ParametersUtils.exportParameters(file, params);
         }
     }
 
@@ -641,33 +670,31 @@ public String generateParameterLibraryReport(boolean csvMode) {
      * @param paramSet
      * @param indent
      */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public void appendParameterSetToReport(StringBuilder report, ParameterSet paramSet,
         String indent, boolean csvMode) {
         String nl = System.lineSeparator();
         String paramsIndent = indent + "  ";
-        BeanWrapper<Parameters> parameters = paramSet.getParameters();
         String parameterClassName = "";
 
         try {
-            parameterClassName = parameters.getClazz().getSimpleName();
-        } catch (RuntimeException e) {
-            parameterClassName = " <deleted>: " + parameters.getClassName();
+            parameterClassName = Class.forName(paramSet.getClassname()).getSimpleName();
+        } catch (RuntimeException | ClassNotFoundException e) {
+            parameterClassName = " <deleted>: " + paramSet.getClassname();
         }
 
         if (!csvMode) {
-            report.append(indent + "Parameter Set: " + paramSet.getName() + " (type="
+            report.append(indent + "Parameter set: " + paramSet.getName() + " (type="
                 + parameterClassName + ", version=" + paramSet.getVersion() + ")" + nl);
         }
 
-        Map<String, TypedParameter> params = BeanWrapper
-            .typedPropertyByName(parameters.getTypedProperties());
-        if (params.isEmpty() && !csvMode) {
+        Set<TypedParameter> parameters = paramSet.parametersInstance().getParameters();
+        if (parameters.isEmpty() && !csvMode) {
             report.append(paramsIndent + "(no parameters)" + nl);
         } else {
-            List<String> sortedKeys = new LinkedList<>(params.keySet());
-            Collections.sort(sortedKeys);
-            for (String key : sortedKeys) {
-                String value = params.get(key).getString();
+            for (TypedParameter parameter : parameters) {
+                String key = parameter.getName();
+                String value = parameter.getString();
 
                 if (csvMode) {
                     report.append(paramSet.getName() + CSV_REPORT_DELIMITER);
@@ -682,19 +709,19 @@ public void appendParameterSetToReport(StringBuilder report, ParameterSet paramS
         }
     }
 
-    public Map<ClassWrapper<Parameters>, ParameterSet> retrieveParameterSets(
+    public Map<ClassWrapper<ParametersInterface>, ParameterSet> retrieveParameterSets(
         PipelineDefinition pipelineDefinition, String moduleName) {
-        Map<ClassWrapper<Parameters>, ParameterSetName> parameterSetNameMap = new HashMap<>(
+        Map<ClassWrapper<ParametersInterface>, String> parameterSetNameMap = new HashMap<>(
             pipelineDefinition.getPipelineParameterSetNames());
         for (PipelineDefinitionNode pipelineDefinitionNode : pipelineDefinition.getNodes()) {
-            if (pipelineDefinitionNode.getModuleName().getName().equals(moduleName)) {
+            if (pipelineDefinitionNode.getModuleName().equals(moduleName)) {
                 parameterSetNameMap.putAll(pipelineDefinitionNode.getModuleParameterSetNames());
             }
         }
 
         ParameterSetCrud parameterSetCrud = new ParameterSetCrud();
-        Map<ClassWrapper<Parameters>, ParameterSet> parameterSetMap = new HashMap<>();
-        for (Entry<ClassWrapper<Parameters>, ParameterSetName> entry : parameterSetNameMap
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetMap = new HashMap<>();
+        for (Entry<ClassWrapper<ParametersInterface>, String> entry : parameterSetNameMap
             .entrySet()) {
             ParameterSet parameterSet = parameterSetCrud
                 .retrieveLatestVersionForName(entry.getValue());
@@ -707,4 +734,44 @@ public Map<ClassWrapper<Parameters>, ParameterSet> retrieveParameterSets(
     public PipelineExecutor pipelineExecutor() {
         return new PipelineExecutor();
     }
+
+    /**
+     * Container used to provide information to the caller after execution of the
+     * {@link PipelineOperations#setTaskState(PipelineTask, gov.nasa.ziggy.pipeline.definition.PipelineTask.State)}.
+     * The updated {@link PipelineTask} and {@link PipelineInstance} are returned, as are the
+     * {@link TaskCounts} instances for the pipeline instance and instance node for the task.
+     *
+     * @author PT
+     */
+    public static class TaskStateSummary {
+
+        private final TaskCounts instanceCounts;
+        private final TaskCounts instanceNodeCounts;
+        private final PipelineTask task;
+        private final PipelineInstance instance;
+
+        public TaskStateSummary(TaskCounts instanceCounts, TaskCounts instanceNodeCounts,
+            PipelineTask mergedTask, PipelineInstance mergedInstance) {
+            this.instanceCounts = instanceCounts;
+            this.instanceNodeCounts = instanceNodeCounts;
+            task = mergedTask;
+            instance = mergedInstance;
+        }
+
+        public TaskCounts getInstanceCounts() {
+            return instanceCounts;
+        }
+
+        public TaskCounts getInstanceNodeCounts() {
+            return instanceNodeCounts;
+        }
+
+        public PipelineTask getTask() {
+            return task;
+        }
+
+        public PipelineInstance getInstance() {
+            return instance;
+        }
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/PipelineTaskDebugger.java b/src/main/java/gov/nasa/ziggy/pipeline/PipelineTaskDebugger.java
index 06fe9b4..678418d 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/PipelineTaskDebugger.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/PipelineTaskDebugger.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -34,10 +34,9 @@
 
 package gov.nasa.ziggy.pipeline;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,6 +51,8 @@
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.DatabaseService;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 public class PipelineTaskDebugger {
 
@@ -84,7 +85,7 @@ public class PipelineTaskDebugger {
      * Either set properties, ptd.*, or provide explicit values as the defaults in the config calls
      * in this constructor.
      */
-    public PipelineTaskDebugger(Configuration config) {
+    public PipelineTaskDebugger(ImmutableConfiguration config) {
         // used by all
         pipelineTaskId = config.getInt(PIPELINE_TASK_ID_PROP, 35);
         debugAsyncEnabled = config.getBoolean(DEBUG_ASYNC_ENABLED_PROP, true);
@@ -101,37 +102,42 @@ public PipelineTaskDebugger(Configuration config) {
         }
     }
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         PipelineTaskDebugger pipelineTaskDebugger = new PipelineTaskDebugger(
             ZiggyConfiguration.getInstance());
-        DatabaseTransactionFactory.performTransaction(() -> {
-            startProcessingThread(pipelineTaskDebugger);
-            log.info("Completed.");
-            return null;
-        });
+//        DatabaseTransactionFactory.performTransaction(() -> {
+        startProcessingThread(pipelineTaskDebugger);
+        log.info("Completed.");
+//            return null;
+//        });
 
         System.exit(0);
     }
 
-    private static void startProcessingThread(final PipelineTaskDebugger pipelineTaskDebugger)
-        throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
+    private static void startProcessingThread(final PipelineTaskDebugger pipelineTaskDebugger) {
         Thread thread = new Thread() {
             @Override
+            @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
             public void run() {
                 try {
-                    PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-                    PipelineTask pipelineTask = pipelineTaskCrud
-                        .retrieve(pipelineTaskDebugger.getPipelineTaskId());
-
-                    dumpConfig(pipelineTaskDebugger, pipelineTask);
-                    if (pipelineTaskDebugger.isDebugAsyncEnabled()) {
-                        debugAsyncLocalFromProcessOutputs(pipelineTask);
-                    } else if (pipelineTaskDebugger.isDebugFromStartEnabled()) {
-                        debugFromStartOfTask(pipelineTask);
-                    } else if (pipelineTaskDebugger.isDebugLaunchTriggerEnabled()) {
+                    DatabaseTransactionFactory.performTransaction(() -> {
+                        PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
+                        PipelineTask task = pipelineTaskCrud
+                            .retrieve(pipelineTaskDebugger.getPipelineTaskId());
+
+                        dumpConfig(pipelineTaskDebugger, task);
+                        if (pipelineTaskDebugger.isDebugAsyncEnabled()) {
+                            debugAsyncLocalFromProcessOutputs(task);
+                        } else if (pipelineTaskDebugger.isDebugFromStartEnabled()) {
+                            debugFromStartOfTask(task);
+                        } else {
+                            debugDoTransition(task);
+                        }
+                        return null;
+                    });
+                    if (pipelineTaskDebugger.isDebugLaunchTriggerEnabled()) {
                         debugLaunchTrigger();
-                    } else {
-                        debugDoTransition(pipelineTask);
                     }
 
                     DatabaseService.getInstance().flush();
@@ -145,39 +151,28 @@ private void debugFromStartOfTask(PipelineTask pipelineTask) throws Exception {
                 pipelineModule.processTask();
             }
 
-            private void debugAsyncLocalFromProcessOutputs(PipelineTask pipelineTask)
-                throws Exception {
-
-                try {
-                    PipelineModule pipelineModule = pipelineTask.getModuleImplementation();
-                    Object moduleName = pipelineModule.getClass()
-                        .getDeclaredMethod("getModuleName")
-                        .invoke(pipelineModule);
-                    if (!(moduleName instanceof String)) {
-                        throw new IllegalStateException(String.format(
-                            "%s: invalid class, getModuleName method did not return String",
-                            pipelineTask.getPipelineInstanceNode()
-                                .getPipelineModuleDefinition()
-                                .getPipelineModuleClass()
-                                .getClassName()));
-                    }
-                    // pipelineModule.processTask(pipelineTask);
+            private void debugAsyncLocalFromProcessOutputs(PipelineTask pipelineTask) {
+                PipelineModule pipelineModule = pipelineTask.getModuleImplementation();
+                Object moduleName = pipelineModule.getModuleName();
+                if (!(moduleName instanceof String)) {
+                    throw new IllegalStateException(String.format(
+                        "%s: invalid class, getModuleName method did not return String",
+                        pipelineTask.getPipelineInstanceNode()
+                            .getPipelineModuleDefinition()
+                            .getPipelineModuleClass()
+                            .getClassName()));
+                }
 
-                    if (!(pipelineModule instanceof ExternalProcessPipelineModule)) {
-                        log.error(
-                            "Configured pipelineModule must implement ExternalProcessPipelineModule.");
-                    }
-                } catch (NoSuchMethodException | SecurityException | IllegalAccessException
-                    | IllegalArgumentException | InvocationTargetException e) {
-                    log.error(e.getMessage(), e);
-                    throw e;
+                if (!(pipelineModule instanceof ExternalProcessPipelineModule)) {
+                    log.error(
+                        "Configured pipelineModule must implement ExternalProcessPipelineModule.");
                 }
             }
 
             private void debugDoTransition(PipelineTask pipelineTask) {
                 PipelineExecutor pipelineExecutor = new PipelineExecutor();
-                pipelineExecutor.doTransition(pipelineTask.getPipelineInstance(), pipelineTask,
-                    new TaskCounts(0, 0, 0, 0));
+                pipelineExecutor.transitionToNextInstanceNode(pipelineTask.getPipelineInstance(),
+                    pipelineTask, new TaskCounts(0, 0, 0, 0));
             }
 
             private void debugLaunchTrigger() {
@@ -190,16 +185,14 @@ private void debugLaunchTrigger() {
 
                 PipelineOperations pipelineOps = new PipelineOperations();
                 pipelineOps.fireTrigger(pipelineDefinition, "instanceName", pipelineDefinitionNode,
-                    pipelineDefinitionNode);
+                    pipelineDefinitionNode, null);
             }
 
             private PipelineDefinitionNode getPipelineDefinitionNode(
                 List<PipelineDefinitionNode> nodes) {
                 PipelineDefinitionNode returnNode = null;
                 for (PipelineDefinitionNode node : nodes) {
-                    if (node.getModuleName()
-                        .getName()
-                        .equals(pipelineTaskDebugger.getModuleName())) {
+                    if (node.getModuleName().equals(pipelineTaskDebugger.getModuleName())) {
                         returnNode = node;
                     }
 
@@ -214,7 +207,11 @@ private PipelineDefinitionNode getPipelineDefinitionNode(
             }
         };
         thread.start();
-        thread.join();
+        try {
+            thread.join();
+        } catch (InterruptedException e) {
+            System.exit(2);
+        }
     }
 
     private static void processException(Throwable e) {
@@ -239,19 +236,11 @@ private static void dumpConfig(PipelineTaskDebugger taskDebugger, PipelineTask p
         log.info(String.format("%s=%s\n", MODULE_NAME_PROP, taskDebugger.getModuleName()));
         log.info(String.format("%s=%s\n", TRIGGER_NAME_PROP, taskDebugger.getTriggerName()));
 
-        log.info(String.format("%s=%s\n", ZiggyConfiguration.CONFIG_SERVICE_PROPERTIES_PATH_ENV,
-            System.getenv(ZiggyConfiguration.CONFIG_SERVICE_PROPERTIES_PATH_ENV)));
+        log.info(String.format("%s=%s\n", ZiggyConfiguration.PIPELINE_CONFIG_PATH_ENV,
+            System.getenv(ZiggyConfiguration.PIPELINE_CONFIG_PATH_ENV)));
 
         PipelineModule pipelineModule = pipelineTask.getModuleImplementation();
-        Object moduleName = null;
-        try {
-            moduleName = pipelineModule.getClass()
-                .getDeclaredMethod("getModuleName")
-                .invoke(pipelineModule);
-        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
-            | NoSuchMethodException | SecurityException e) {
-            e.printStackTrace();
-        }
+        Object moduleName = pipelineModule.getModuleName();
         if (moduleName instanceof String) {
             log.info(String.format("MODULE_NAME=%s\n", (String) moduleName));
         }
@@ -282,7 +271,7 @@ public String getPersistableOutputClassName() {
     }
 
     public String getPipelineProperties() {
-        return ZiggyConfiguration.CONFIG_SERVICE_PROPERTIES_PATH_ENV;
+        return ZiggyConfiguration.PIPELINE_CONFIG_PATH_ENV;
     }
 
     public String getModuleName() {
@@ -292,5 +281,4 @@ public String getModuleName() {
     public String getTriggerName() {
         return triggerName;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/PipelineTaskInformation.java b/src/main/java/gov/nasa/ziggy/pipeline/PipelineTaskInformation.java
index 7171bd6..001024c 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/PipelineTaskInformation.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/PipelineTaskInformation.java
@@ -12,11 +12,9 @@
 import gov.nasa.ziggy.module.PipelineInputs;
 import gov.nasa.ziggy.module.SubtaskInformation;
 import gov.nasa.ziggy.module.remote.RemoteParameters;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
@@ -106,7 +104,7 @@ static void setInstance(PipelineTaskInformation newInstance) {
      * Cache of {@link ParameterSetName}s for {@link RemoteParameters} instances, organized by
      * {@link PipelineDefinitionNode}.
      */
-    private static Map<PipelineDefinitionNode, ParameterSetName> remoteParametersMap = new HashMap<>();
+    private static Map<PipelineDefinitionNode, String> remoteParametersMap = new HashMap<>();
 
     /**
      * Cache that stores information on whether a given module has limits on the number of subtasks
@@ -154,7 +152,7 @@ public static synchronized List<SubtaskInformation> subtaskInformation(
      * Returns the {@link ParameterSetName} for a specified node's {@link RemoteParameters}
      * instance. If the module has no such parameter set, null is returned.
      */
-    public static synchronized ParameterSetName remoteParameters(PipelineDefinitionNode node) {
+    public static synchronized String remoteParameters(PipelineDefinitionNode node) {
         if (!hasPipelineDefinitionNode(node)) {
             generateSubtaskInformation(node);
         }
@@ -185,7 +183,7 @@ public static synchronized boolean parallelLimits(PipelineDefinitionNode node) {
 
     private static synchronized void generateSubtaskInformation(PipelineDefinitionNode node) {
 
-        log.debug("Generating subtask information for node " + node.getModuleName().getName());
+        log.debug("Generating subtask information for node " + node.getModuleName());
         PipelineDefinition pipelineDefinition = pipelineDefinitionCrud()
             .retrieveLatestVersionForName(node.getPipelineName());
 
@@ -194,9 +192,9 @@ private static synchronized void generateSubtaskInformation(PipelineDefinitionNo
         pipelineInstance.setPipelineDefinition(pipelineDefinition);
 
         // Populate the instance parameters
-        Map<ClassWrapper<Parameters>, ParameterSetName> triggerParamNames = pipelineDefinition
+        Map<ClassWrapper<ParametersInterface>, String> triggerParamNames = pipelineDefinition
             .getPipelineParameterSetNames();
-        Map<ClassWrapper<Parameters>, ParameterSet> instanceParams = pipelineInstance
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> instanceParams = pipelineInstance
             .getPipelineParameterSets();
         populateParameters(triggerParamNames, instanceParams);
         pipelineInstance.setPipelineParameterSets(instanceParams);
@@ -219,10 +217,11 @@ private static synchronized void generateSubtaskInformation(PipelineDefinitionNo
             .unitOfWorkGenerator(taskNode);
 
         // Produce a combined map from Parameter classes to Parameter instances
-        Map<ClassWrapper<Parameters>, ParameterSet> compositeParameterSets = new HashMap<>(
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> compositeParameterSets = new HashMap<>(
             pipelineInstance.getPipelineParameterSets());
 
-        for (ClassWrapper<Parameters> moduleParameterClass : instanceNode.getModuleParameterSets()
+        for (ClassWrapper<ParametersInterface> moduleParameterClass : instanceNode
+            .getModuleParameterSets()
             .keySet()) {
             if (compositeParameterSets.containsKey(moduleParameterClass)) {
                 throw new PipelineException(
@@ -237,11 +236,11 @@ private static synchronized void generateSubtaskInformation(PipelineDefinitionNo
         // can run in parallel
 
         modulesWithParallelLimitsMap.put(node, instance.parallelLimits(moduleDefinition));
-        Map<Class<? extends Parameters>, Parameters> uowParams = new HashMap<>();
+        Map<Class<? extends ParametersInterface>, ParametersInterface> uowParams = new HashMap<>();
 
-        for (ClassWrapper<Parameters> parametersClass : compositeParameterSets.keySet()) {
+        for (ClassWrapper<ParametersInterface> parametersClass : compositeParameterSets.keySet()) {
             ParameterSet parameterSet = compositeParameterSets.get(parametersClass);
-            Class<? extends Parameters> clazz = parametersClass.getClazz();
+            Class<? extends ParametersInterface> clazz = parametersClass.getClazz();
             if (clazz.equals(RemoteParameters.class)) {
                 remoteParametersMap.put(node, parameterSet.getName());
             }
@@ -258,7 +257,7 @@ private static synchronized void generateSubtaskInformation(PipelineDefinitionNo
         List<SubtaskInformation> subtaskInformationList = new LinkedList<>();
         for (UnitOfWork task : tasks) {
             PipelineTask pipelineTask = instance.pipelineTask(pipelineInstance, instanceNode, task);
-            pipelineTask.setUowTask(new BeanWrapper<>(task));
+            pipelineTask.setUowTaskParameters(task.getParameters());
             SubtaskInformation subtaskInformation = instance.subtaskInformation(moduleDefinition,
                 pipelineTask);
             subtaskInformationList.add(subtaskInformation);
@@ -271,7 +270,7 @@ private static synchronized void generateSubtaskInformation(PipelineDefinitionNo
      * unit tests.
      */
     List<UnitOfWork> unitsOfWork(ClassWrapper<UnitOfWorkGenerator> wrappedUowGenerator,
-        Map<Class<? extends Parameters>, Parameters> uowParams) {
+        Map<Class<? extends ParametersInterface>, ParametersInterface> uowParams) {
         UnitOfWorkGenerator taskGenerator = wrappedUowGenerator.newInstance();
         return taskGenerator.generateUnitsOfWork(uowParams);
     }
@@ -290,7 +289,7 @@ ClassWrapper<UnitOfWorkGenerator> unitOfWorkGenerator(PipelineDefinitionNode nod
     PipelineTask pipelineTask(PipelineInstance instance, PipelineInstanceNode instanceNode,
         UnitOfWork uow) {
         PipelineTask pipelineTask = new PipelineTask(instance, instanceNode);
-        pipelineTask.setUowTask(new BeanWrapper<>(uow));
+        pipelineTask.setUowTaskParameters(uow.getParameters());
         return pipelineTask;
     }
 
@@ -310,10 +309,10 @@ SubtaskInformation subtaskInformation(PipelineModuleDefinition moduleDefinition,
     }
 
     private static void populateParameters(
-        Map<ClassWrapper<Parameters>, ParameterSetName> parameterSetNames,
-        Map<ClassWrapper<Parameters>, ParameterSet> parameterSets) {
-        for (ClassWrapper<Parameters> paramClass : parameterSetNames.keySet()) {
-            ParameterSetName pipelineParamName = parameterSetNames.get(paramClass);
+        Map<ClassWrapper<ParametersInterface>, String> parameterSetNames,
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSets) {
+        for (ClassWrapper<ParametersInterface> paramClass : parameterSetNames.keySet()) {
+            String pipelineParamName = parameterSetNames.get(paramClass);
             ParameterSet paramSet = parameterSetCrud()
                 .retrieveLatestVersionForName(pipelineParamName);
             parameterSets.put(paramClass, paramSet);
@@ -332,5 +331,4 @@ private static synchronized PipelineDefinitionCrud pipelineDefinitionCrud() {
     private static synchronized PipelineModuleDefinitionCrud pipelineModuleDefinitionCrud() {
         return instance.getPipelineModuleDefinitionCrud();
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/AuditInfo.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/AuditInfo.java
index 3112d90..7dc4ea6 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/AuditInfo.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/AuditInfo.java
@@ -3,15 +3,14 @@
 import java.util.Date;
 import java.util.Objects;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
 import gov.nasa.ziggy.services.security.User;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 
 /**
  * This {@link Embeddable} class is used by {@link Entity} classes that can be modified through the
@@ -23,9 +22,9 @@
 @Embeddable
 public class AuditInfo {
     @ManyToOne
-    @JoinColumn(name = "LC_PI_USER_ID")
+    @JoinColumn(name = "lastChangedUser")
     private User lastChangedUser = null;
-    @Column(name = "LC_TIME")
+    @Column(name = "lastChangedTime")
     private Date lastChangedTime = null;
 
     public AuditInfo() {
@@ -75,14 +74,12 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final AuditInfo other = (AuditInfo) obj;
-        if (!Objects.equals(lastChangedTime, other.lastChangedTime)) {
-            return false;
-        }
-        if (!Objects.equals(lastChangedUser, other.lastChangedUser)) {
+        if (!Objects.equals(lastChangedTime, other.lastChangedTime)
+            || !Objects.equals(lastChangedUser, other.lastChangedUser)) {
             return false;
         }
         return true;
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/BeanWrapper.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/BeanWrapper.java
deleted file mode 100644
index d5dec52..0000000
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/BeanWrapper.java
+++ /dev/null
@@ -1,526 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.FetchType;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-import org.jfree.util.Log;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.l2fprod.common.beans.BeanUtils;
-
-import gov.nasa.ziggy.collections.ZiggyDataType;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.util.ReflectionUtils;
-import gov.nasa.ziggy.util.StringUtils;
-
-/**
- * This class provides database persistence for an arbitrary Java class using JavaBeans semantics.
- * Persistence is provided by representing the bean's contents as a {@link Set} of
- * {@link TypedParameter} instances. A {@link TypedParameter} contains a name-value pair and also a
- * data type, which can be "none."
- * <p>
- * The class operates on two types of Java class. The typical standard use case is a Java class that
- * conforms to the JavaBean specification. The fields of such a class get mapped into
- * {@link TypedParameter} instances. The alternate use case is subclasses of
- * {@link TypedParameterCollection}. These classes uses the TypedProperty internally for storage, in
- * order to be able to store typed name-value pairs without the need to define a specialized Java
- * class to contain a specific set of such parameters. Some class methods will offer two execution
- * branches: one for instances of {@link TypedParameterCollection}, one for everything else.
- * <p>
- * This class also contains the name of the class and uses that to manage instantiation and to
- * define the valid members of the Set. For type-safety, the class can be parameterized &lt;T&gt;.
- * The constructor then enforces that the class can only be instantiated with types that extend T. T
- * must either conform to the JavaBeans specification or else must extend
- * {@link TypedParameterCollection}.
- * <p>
- * This class also provides instance management (create, populate, describe). The instance created
- * is considered to be transient; changes to the instance, either directly or through the populate()
- * method, do not affect the values that gets persisted.
- *
- * @author Todd Klaus
- * @author PT
- */
-@Embeddable
-public class BeanWrapper<T> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(BeanWrapper.class);
-
-    @Column(nullable = true)
-    private String clazz = null;
-    @Column(nullable = true)
-    private Boolean initialized = false;
-
-    @ElementCollection(fetch = FetchType.EAGER)
-    @Fetch(value = FetchMode.SUBSELECT)
-    @Embedded
-    Set<TypedParameter> typedProperties = new HashSet<>();
-
-    /** For Hibernate use only */
-    BeanWrapper() {
-    }
-
-    /**
-     * Construct from a Class. A new instance of the class is created, and the props map is
-     * populated from the default values in the new instance.
-     *
-     * @param clazz
-     */
-    public BeanWrapper(Class<? extends T> clazz) {
-        setClazz(clazz);
-
-        // DefaultParameters don't require any additional initialization
-        if (!TypedParameterCollection.class.isAssignableFrom(clazz)) {
-            /* call createInstance with populate==false so that the class defaults will be used */
-            T instance = createInstance(false);
-            try {
-                typedProperties = describeBean(instance);
-            } catch (IllegalArgumentException | IllegalAccessException e) {
-                throw new PipelineException(
-                    "Unable to instantiate BeanWrapper of " + clazz.getName(), e);
-            }
-        }
-        initialized = true;
-
-    }
-
-    /**
-     * Construct from an existing instance
-     *
-     * @param <E>
-     * @param instance
-     * @throws PipelineException
-     */
-    @SuppressWarnings("unchecked")
-    public <E extends T> BeanWrapper(E instance) {
-        setClazz((Class<? extends T>) instance.getClass());
-        if (TypedParameterCollection.class.isAssignableFrom(instance.getClass())) {
-            TypedParameterCollection dInstance = (TypedParameterCollection) instance;
-            typedProperties = dInstance.getParameters();
-        } else
-
-        {
-            typedProperties = describe(instance);
-        }
-        initialized = true;
-    }
-
-    /**
-     * Copy constructor
-     *
-     * @param otherBeanWrapper
-     */
-    public BeanWrapper(BeanWrapper<T> otherBeanWrapper) {
-        setClazz(otherBeanWrapper.wrappedClass());
-
-        if (otherBeanWrapper.typedProperties != null) {
-            this.typedProperties = new HashSet<>();
-            for (TypedParameter property : otherBeanWrapper.typedProperties) {
-                this.typedProperties.add(new TypedParameter(property));
-            }
-        }
-        this.initialized = otherBeanWrapper.initialized;
-    }
-
-    /**
-     * Create a new instance of this bean. If the props Map is set, use it to populate() the
-     * instance.
-     *
-     * @param populate if true, populate the new instance with current contents of props
-     * @throws PipelineException
-     */
-    private T createInstance(boolean populate) throws PipelineException {
-        try {
-            @SuppressWarnings("unchecked")
-            T instance = (T) Class.forName(clazz).getDeclaredConstructor().newInstance();
-            if (populate) {
-                populate(instance);
-            }
-
-            return instance;
-        } catch (Exception e) {
-            throw new PipelineException(
-                "failed to instantiate instance with className=" + clazz + ", caught e = " + e, e);
-        }
-    }
-
-    /**
-     * Returns the instance of T, creating and initializing, if necessary.
-     * <p>
-     * Consider this object to be READ-ONLY. Changes are only persisted when calling populate() or
-     * setProperty()
-     *
-     * @throws PipelineException
-     */
-    public T getInstance() throws PipelineException {
-        return createInstance(true);
-    }
-
-    /**
-     * Populate the classname and map from the specified instance.
-     *
-     * @param instance
-     * @throws PipelineException
-     */
-    @SuppressWarnings("unchecked")
-    public void populateFromInstance(T instance) throws PipelineException {
-        setClazz((Class<? extends T>) instance.getClass());
-        typedProperties = describe(instance);
-    }
-
-    /**
-     * Returns true if new fields have been added to the class, but do not exist in the database.
-     *
-     * @return
-     */
-    public boolean hasNewUnsavedFields() {
-        T instance = getInstance();
-        Set<TypedParameter> newProperties = describe(instance);
-
-        boolean sameKeys = true;
-        for (TypedParameter newProperty : newProperties) {
-            if (!typedProperties.contains(newProperty)) {
-                sameKeys = false;
-            }
-        }
-
-        return !sameKeys;
-    }
-
-    /**
-     * Determines whether the values in all {@link TypedParameter} instances are compatible with the
-     * data types in their respective instances.
-     *
-     * @return true if all {@link TypedParameter} instances are internally consistent.
-     */
-    public boolean checkPrimitiveDataTypes() {
-        T instance = getInstance();
-        Set<TypedParameter> allProperties = getTypedProperties();
-        Class<?> type = null;
-        String value = null;
-        boolean primitiveDataTypesOkay = true;
-        for (TypedParameter property : allProperties) {
-            try {
-                Field field = instance.getClass().getDeclaredField(property.getName());
-                type = field.getType();
-                value = property.getString();
-                if (type.equals(byte.class)) {
-                    Byte.valueOf(value);
-                } else if (type.equals(short.class)) {
-                    Short.valueOf(value);
-                } else if (type.equals(int.class)) {
-                    Integer.valueOf(value);
-                } else if (type.equals(long.class)) {
-                    Long.valueOf(value);
-                } else if (type.equals(float.class)) {
-                    Float.valueOf(value);
-                } else if (type.equals(double.class)) {
-                    Double.valueOf(value);
-                }
-            } catch (NoSuchFieldException ignore) {
-                // ignore fields that no longer exist in the class
-            } catch (NumberFormatException e) {
-                Log.error("Typed property mismatch: value " + value
-                    + " cannot be converted to type " + type, e);
-                primitiveDataTypesOkay = false;
-            }
-        }
-        return primitiveDataTypesOkay;
-    }
-
-    /**
-     * Removes leading and trailing whitespace from all values, including whitespace around commas
-     * used as value separators (i.e., " v1, v2 " becomes "v1,v2").
-     *
-     * @throws Exception
-     */
-    public void trimWhitespace() throws Exception {
-
-        Set<TypedParameter> updatedTypedProperties = new HashSet<>();
-        for (TypedParameter typedProperty : getTypedProperties()) {
-            String name = typedProperty.getName();
-            String value = typedProperty.getString();
-            ZiggyDataType type = typedProperty.getDataType();
-            boolean scalar = typedProperty.isScalar();
-
-            value = StringUtils.trimListWhitespace(value);
-            updatedTypedProperties.add(new TypedParameter(name, value, type, scalar));
-        }
-        setTypedProperties(updatedTypedProperties);
-    }
-
-    /**
-     * Uses {@link BeanUtils} to populate the instance (the typedProperties Set is unaffected).
-     */
-    private void populate(T instance) throws PipelineException {
-
-        if (TypedParameterCollection.class.isAssignableFrom(instance.getClass())) {
-            TypedParameterCollection dInstance = (TypedParameterCollection) instance;
-            Set<TypedParameter> instanceProperties = new HashSet<>();
-            for (TypedParameter property : typedProperties) {
-                instanceProperties.add(new TypedParameter(property));
-            }
-            dInstance.setParameters(instanceProperties);
-            return;
-        }
-
-        if (typedProperties != null) {
-            try {
-                /*
-                 * Get the values out of the typedProperty Set, and put them into a new Set for the
-                 * instance.
-                 *
-                 * props does not contain nulls, so before we call populate, we need to create a new
-                 * Map (allProps) with all of the properties returned by BeanUtilsBean2.describe,
-                 * then override the values from props. This also initializes new (unsaved) fields
-                 * to the default value specified in the class
-                 */
-                Map<String, TypedParameter> typedPropertyMap = typedPropertyByName(typedProperties);
-                Set<TypedParameter> allProperties = describeBean(instance);
-                for (TypedParameter property : allProperties) {
-                    String value = null;
-                    if (typedProperties.contains(property)) {
-                        value = typedPropertyMap.get(property.getName()).getString().trim();
-                        if (value.isEmpty()) {
-                            value = null;
-                        }
-                        property.setValue(value);
-                    }
-                }
-                typedPropertyMap = typedPropertyByName(allProperties);
-
-                // Pour the values in the typed properties back into the instance, applying
-                // appropriate conversions from String.
-                for (Field field : ReflectionUtils.getAllFields(instance, true)) {
-                    ZiggyDataType.setField(instance, field,
-                        typedPropertyMap.get(field.getName()).getString());
-                }
-
-                fixNulls(instance, allProperties);
-            } catch (Exception e) {
-                throw new PipelineException("failed to populate bean, caught e = " + e, e);
-            }
-        }
-    }
-
-    /**
-     * Override the behavior of BeanUtilsBean2 w.r.t. String[] and String fields with a null or
-     * missing value in the Map.
-     * <p>
-     * For some reason, BeanUtilsBean2 sets array fields to an array with one null element instead
-     * of an empty array when the value in the Map is null. This method fixes that. Strings are
-     * initialized to the empty String ""
-     */
-    private void fixNulls(T instance, Set<TypedParameter> allProperties) throws Exception {
-        // Get property descriptors for the bean, in case we need to find
-        // writer methods for any properties that need to be fixed.
-        Map<String, PropertyDescriptor> beanProperties = new HashMap<>();
-        BeanInfo beanInfo = Introspector.getBeanInfo(instance.getClass());
-        for (PropertyDescriptor descriptor : beanInfo.getPropertyDescriptors()) {
-            beanProperties.put(descriptor.getName(), descriptor);
-        }
-
-        for (TypedParameter typedProperty : allProperties) {
-            String key = typedProperty.getName();
-            String value = typedProperty.getString();
-            if (value == null) {
-                Class<? extends Object> instanceClass = instance.getClass();
-                try {
-                    Field f = instanceClass.getDeclaredField(key);
-                    f.setAccessible(true);
-                    Class<?> fieldClass = f.getType();
-                    // Need to make the field accessible, since we may have
-                    // public bean access methods to a private member.
-                    f.setAccessible(true);
-                    if (!fieldClass.isArray()) {
-                        if (!fieldClass.isPrimitive()) {
-                            f.set(instance, fieldClass.getDeclaredConstructor().newInstance());
-                        }
-                    } else {
-                        Class<?> componentType = fieldClass.getComponentType();
-                        f.set(instance, Array.newInstance(componentType, 0));
-                    }
-                } catch (InstantiationException ignore) {
-                    // Could not instantiate a value, probably because the class
-                    // does not have an empty constructor. Leave that property
-                    // null.
-                } catch (NoSuchFieldException ignore) {
-                    // Try a bean writer method if one exists for the property.
-                    PropertyDescriptor descriptor = beanProperties.get(key);
-                    if (descriptor != null && descriptor.getWriteMethod() != null) {
-                        try {
-                            Class<?> clazz = descriptor.getPropertyType();
-                            if (!clazz.isArray()) {
-                                descriptor.getWriteMethod()
-                                    .invoke(instance, clazz.getDeclaredConstructor().newInstance());
-                            } else {
-                                Class<?> componentType = clazz.getComponentType();
-                                descriptor.getWriteMethod()
-                                    .invoke(instance, Array.newInstance(componentType, 0));
-                            }
-                        } catch (InstantiationException ignore2) {
-                            // Could not instantiate a value, probably because
-                            // the class does not have an empty constructor.
-                            // Leave that property null.
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Uses {@link BeanUtils} to construct a Map containing all of the properties for T.
-     * <p>
-     * Used by the console to populate a property editor so the user can configure the properties.
-     * <p>
-     * Also removes the super-class properties that should not be visible to the user (why doesn't
-     * BeanUtils offer this filtering capability?)
-     *
-     * @param instance
-     * @return
-     * @throws PipelineException
-     */
-    private Set<TypedParameter> describe(T instance) throws PipelineException {
-        if (TypedParameterCollection.class.isAssignableFrom(instance.getClass())) {
-            TypedParameterCollection dInstance = (TypedParameterCollection) instance;
-            Set<TypedParameter> instanceParameters = new HashSet<>();
-            for (TypedParameter property : dInstance.getParameters()) {
-                instanceParameters.add(new TypedParameter(property));
-            }
-            return instanceParameters;
-        }
-        try {
-            return describeBean(instance);
-        } catch (Exception e) {
-            throw new PipelineException("failed to describe bean, caught e = " + e, e);
-        }
-    }
-
-    private Set<TypedParameter> describeBean(T instance)
-        throws IllegalArgumentException, IllegalAccessException {
-        Set<TypedParameter> instanceParameters = new HashSet<>();
-        for (Field field : ReflectionUtils.getAllFields(instance, true)) {
-            instanceParameters.add(new TypedParameter(instance, field));
-        }
-        return instanceParameters;
-
-    }
-
-    public String getClassName() {
-        return clazz;
-    }
-
-    public Class<?> getClazz() {
-        try {
-            return Class.forName(clazz);
-        } catch (Exception e) {
-            throw new PipelineException(
-                "failed to instantiate instance with className=" + clazz + ", caught e = " + e, e);
-        }
-    }
-
-    /**
-     * Gets all possible properties of the bean, including those that have null values.
-     *
-     * @return a set of bean properties
-     */
-    public Set<String> getAllPropertyNames() {
-        Set<String> allProps = new HashSet<>();
-
-        if (TypedParameterCollection.class.isAssignableFrom(wrappedClass())) {
-            for (TypedParameter typedProperty : typedProperties) {
-                allProps.add(typedProperty.getName());
-            }
-        } else {
-            try {
-                BeanInfo beanInfo = Introspector.getBeanInfo(getClazz(), Object.class);
-                for (PropertyDescriptor descriptor : beanInfo.getPropertyDescriptors()) {
-                    allProps.add(descriptor.getName());
-                }
-            } catch (IntrospectionException e) {
-                LOG.warn("Error introspecting on bean class: " + clazz);
-            }
-        }
-        return allProps;
-    }
-
-    public void setClazz(Class<? extends T> clazz) {
-        this.clazz = clazz.getName();
-        initialized = true;
-    }
-
-    @SuppressWarnings("unchecked")
-    private Class<? extends T> wrappedClass() {
-        try {
-            return (Class<? extends T>) Class.forName(clazz);
-        } catch (ClassNotFoundException e) {
-
-            // This should never happen, as the clazz string is initially set from the name of
-            // an actual Class instance. Nonetheless, if it does happen we want processing to stop.
-            throw new PipelineException("Class " + clazz + " cannot be found", e);
-        }
-    }
-
-    public void setProperties(Map<String, String> newProps) {
-        Set<TypedParameter> newProperties = new HashSet<>();
-        for (String key : newProps.keySet()) {
-            newProperties.add(new TypedParameter(key, newProps.get(key)));
-        }
-        typedProperties = newProperties;
-        initialized = true;
-    }
-
-    public boolean isInitialized() {
-        if (initialized == null) {
-            return false;
-        }
-        return initialized;
-    }
-
-    public void setInitialized(boolean set) {
-        this.initialized = set;
-    }
-
-    public void setTypedProperties(Set<TypedParameter> typedProperties) {
-        this.typedProperties = typedProperties;
-    }
-
-    public Set<TypedParameter> getTypedProperties() {
-        return typedProperties;
-    }
-
-    public static Map<String, TypedParameter> typedPropertyByName(
-        Set<TypedParameter> typedProperties) {
-        Map<String, TypedParameter> props = new HashMap<>();
-        for (TypedParameter typedProperty : typedProperties) {
-            props.put(typedProperty.getName(), typedProperty);
-        }
-        return props;
-    }
-
-    public static Map<String, String> propertyValueByName(Set<TypedParameter> typedProperties) {
-        Map<String, String> props = new HashMap<>();
-        for (TypedParameter typedProperty : typedProperties) {
-            props.put(typedProperty.getName(), typedProperty.getString());
-        }
-        return props;
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/CanBeDeclaredObsolete.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/CanBeDeclaredObsolete.java
deleted file mode 100644
index 82f9313..0000000
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/CanBeDeclaredObsolete.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-/**
- * Interface that must be implemented for any pipeline infrastructure class that can be declared
- * obsolete (involves changing its group and its name).
- *
- * @author PT
- */
-public interface CanBeDeclaredObsolete {
-
-    Group getGroup();
-
-    void setGroup(Group group);
-
-    String getGroupName();
-
-    void rename(String name);
-
-    String getDatabaseName();
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ClassWrapper.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ClassWrapper.java
index 1e81fab..7165ccc 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ClassWrapper.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/ClassWrapper.java
@@ -1,17 +1,18 @@
 package gov.nasa.ziggy.pipeline.definition;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Transient;
-
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.DefaultParameters;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
@@ -25,7 +26,6 @@
 public class ClassWrapper<T> implements Comparable<ClassWrapper<T>> {
     private String clazz = null;
     @Column(nullable = true)
-    private Boolean initialized = false;
 
     @Transient
     private String unmangledClassName;
@@ -42,7 +42,6 @@ public class ClassWrapper<T> implements Comparable<ClassWrapper<T>> {
     public ClassWrapper(Class<? extends T> clazz) {
         this.clazz = clazz.getName();
         unmangledClassName = this.clazz;
-        this.initialized = true;
     }
 
     /**
@@ -53,33 +52,29 @@ public ClassWrapper(Class<? extends T> clazz) {
      * @throws PipelineException
      */
     public <E extends T> ClassWrapper(E instance) {
-        this.clazz = instance.getClass().getName();
+        clazz = instance.getClass().getName();
         unmangledClassName = clazz;
-        this.initialized = true;
     }
 
     /**
      * Special purpose constructor for the case of a {@link ParameterSet}. this allows the
-     * {@link ClassWrapper} to mangle the class name for instances of {@link DefaultParameters}, so
-     * that multiple instances of class-wrapped DefaultParameters can coexist in a {@link Set} or
-     * {@link Map}.
+     * {@link ClassWrapper} to mangle the class name for instances of {@link Parameters}, so that
+     * multiple instances of class-wrapped Parameters can coexist in a {@link Set} or {@link Map}.
      */
+    @SuppressWarnings("unchecked")
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public ClassWrapper(ParameterSet paramSet) {
-        @SuppressWarnings("unchecked")
-        Class<? extends Parameters> actualClass = (Class<? extends Parameters>) paramSet
-            .getParameters()
-            .getClazz();
+        Class<? extends Parameters> actualClass = (Class<? extends Parameters>) paramSet.clazz();
         unmangledClassName = actualClass.getName();
-        if (actualClass != DefaultParameters.class) {
-            this.clazz = unmangledClassName;
+        if (actualClass != Parameters.class) {
+            clazz = unmangledClassName;
         } else {
 
             // In this case we append to the class name the parameter set name. The two are
             // separated by whitespace so that there's no risk of confustion with an actual
             // class name.
-            this.clazz = unmangledClassName + " " + paramSet.getName().getName();
+            clazz = unmangledClassName + " " + paramSet.getName();
         }
-        initialized = true;
     }
 
     /**
@@ -88,47 +83,48 @@ public ClassWrapper(ParameterSet paramSet) {
      * @param otherClassWrapper
      */
     public ClassWrapper(ClassWrapper<T> otherClassWrapper) {
-        this.clazz = otherClassWrapper.clazz;
-        this.unmangledClassName = otherClassWrapper.unmangledClassName;
-        this.initialized = otherClassWrapper.initialized;
+        clazz = otherClassWrapper.clazz;
+        unmangledClassName = otherClassWrapper.unmangledClassName;
     }
 
     /**
      * Returns a new instance of T.
-     *
-     * @throws PipelineException
      */
     @SuppressWarnings("unchecked")
-    public T newInstance() throws PipelineException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public T newInstance() {
         try {
             return (T) Class.forName(unmangledClassName()).getDeclaredConstructor().newInstance();
-        } catch (Exception e) {
-            throw new PipelineException("failed to instantiate instance with className="
-                + unmangledClassName() + ", caught e = " + e, e);
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+            | InvocationTargetException | NoSuchMethodException | SecurityException
+            | ClassNotFoundException e) {
+            throw new PipelineException("Unable to instantiate " + unmangledClassName(), e);
         }
     }
 
     /**
      * Returns a constructor with a particular signature
-     *
-     * @throws ClassNotFoundException
-     * @throws SecurityException
-     * @throws NoSuchMethodException
      */
     @SuppressWarnings("unchecked")
-    public Constructor<T> constructor(Class<?>... classArguments)
-        throws NoSuchMethodException, SecurityException, ClassNotFoundException {
-        return (Constructor<T>) Class.forName(unmangledClassName())
-            .getDeclaredConstructor(classArguments);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public Constructor<T> constructor(Class<?>... classArguments) {
+        try {
+            return (Constructor<T>) Class.forName(unmangledClassName())
+                .getDeclaredConstructor(classArguments);
+        } catch (NoSuchMethodException | SecurityException | ClassNotFoundException e) {
+            throw new PipelineException("Cannot return constructor for " + unmangledClassName(), e);
+        }
     }
 
     @SuppressWarnings("unchecked")
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     public Class<T> getClazz() {
         try {
             return (Class<T>) Class.forName(unmangledClassName());
-        } catch (Exception e) {
-            throw new PipelineException("failed to instantiate instance with className="
-                + unmangledClassName() + ", caught e = " + e, e);
+        } catch (ClassNotFoundException e) {
+            // Can never occur. By construction, the class wrapped by an instance of ClassWrapper
+            // is available to the pipeline.
+            throw new AssertionError(e);
         }
     }
 
@@ -147,10 +143,7 @@ public String getClassName() {
     }
 
     public boolean isInitialized() {
-        if (initialized == null) {
-            return false;
-        }
-        return initialized;
+        return clazz != null;
     }
 
     @Override
@@ -193,21 +186,28 @@ public static class ClassWrapperAdapter<T> extends XmlAdapter<String, ClassWrapp
 
         @SuppressWarnings("unchecked")
         @Override
-        public ClassWrapper<T> unmarshal(String v) throws Exception {
+        @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+        public ClassWrapper<T> unmarshal(String v) {
             if (v == null) {
                 return null;
             }
-            Class<? extends T> clazz = (Class<? extends T>) Class.forName(v);
-            return new ClassWrapper<>(clazz);
+            Class<? extends T> clazz;
+            try {
+                clazz = (Class<? extends T>) Class.forName(v);
+                return new ClassWrapper<>(clazz);
+            } catch (ClassNotFoundException e) {
+                // This can never occur. The caller provides the string from the name
+                // of a known existing class.
+                throw new AssertionError(e);
+            }
         }
 
         @Override
-        public String marshal(ClassWrapper<T> v) throws Exception {
+        public String marshal(ClassWrapper<T> v) {
             if (v == null) {
                 return null;
             }
             return v.toString();
         }
-
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ExternalIdAssignable.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ExternalIdAssignable.java
deleted file mode 100644
index 1e849f0..0000000
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ExternalIdAssignable.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-/**
- * Defines an interface for classes where the pipeline needs to support both importation and
- * generation of the model/table in question. In the case of importation, the model/table will have
- * an external ID provided by whomever or whatever generated the model/table. In the case of
- * generation, the model/table requires a generated ID that takes into account both the existing IDs
- * in the table and the minimum ID permitted for generated tables.
- *
- * @author PT
- */
-public interface ExternalIdAssignable extends HasExternalId {
-
-    /**
-     * Method that returns the minimum allowed ID value in cases where an ID must be assigned (i.e.,
-     * models/tables that are generated and not imported). In these cases, values will start with
-     * the minAllowedAssignedIdNumber and increase monotonically for subsequent generated
-     * models/tables. Models and tables may override this to return their own minimum allowed
-     * assigned ID values
-     *
-     * @return the minimum ID number that the assignment process may use.
-     */
-    int minAllowedAssignedIdNumber();
-}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/Group.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/Group.java
index c39e71a..449911f 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/Group.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/Group.java
@@ -2,10 +2,10 @@
 
 import java.util.Objects;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 /**
  * Group identifier for {@link PipelineDefinition}s, {@link PipelineModuleDefinition}s,
@@ -17,9 +17,9 @@
  * @author Todd Klaus
  */
 @Entity
-@Table(name = "PI_GROUP")
+@Table(name = "ziggy_Group")
 public class Group {
-    public static final Group DEFAULT_GROUP = new Group();
+    public static final Group DEFAULT = new Group();
 
     @Id
     private String name;
@@ -36,6 +36,12 @@ public Group(String name) {
         this.name = name;
     }
 
+    public Group(Group group) {
+        name = group.name;
+        description = group.description;
+        parentGroup = group.parentGroup;
+    }
+
     public String getName() {
         if (name == null) {
             return "";
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/HasGroup.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/HasGroup.java
new file mode 100644
index 0000000..f5209a6
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/HasGroup.java
@@ -0,0 +1,17 @@
+package gov.nasa.ziggy.pipeline.definition;
+
+/**
+ * A database entity that has a {@link Group}.
+ *
+ * @author PT
+ */
+public interface HasGroup {
+
+    Group group();
+
+    default String groupName() {
+        return group() != null ? group().getName() : "default";
+    }
+
+    void setGroup(Group group);
+}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelMetadata.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelMetadata.java
index faab6d2..52b7100 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelMetadata.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelMetadata.java
@@ -4,19 +4,22 @@
 import java.util.GregorianCalendar;
 import java.util.regex.Matcher;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import gov.nasa.ziggy.models.SemanticVersionNumber;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.Iso8601Formatter;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -34,13 +37,13 @@
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_MODEL_METADATA")
+@Table(name = "ziggy_ModelMetadata")
 public class ModelMetadata implements Comparable<ModelMetadata> {
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_MODEL_METADATA_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ziggy_ModelMetadata_generator")
+    @SequenceGenerator(name = "ziggy_ModelMetadata_generator", initialValue = 1,
+        sequenceName = "ziggy_ModelMetadata_sequence", allocationSize = 1)
+    private Long id;
 
     /** A String identifying the model type (like 'GEOMETRY' or 'SPACECRAFT_EPHEMERIS') */
     @ManyToOne(fetch = FetchType.EAGER)
@@ -95,23 +98,14 @@ public class ModelMetadata implements Comparable<ModelMetadata> {
     public ModelMetadata() {
     }
 
-    /**
-     * Constructor. Will throw an IllegalArgumentException if the version of this instance is &lt;=
-     * the version in the current registry metadata.
-     *
-     * @param modelType
-     * @param modelName
-     * @param modelDescription
-     * @param currentRegistryMetadata
-     */
     public ModelMetadata(ModelType modelType, String modelName, String modelDescription,
-        ModelMetadata currentRegistryMetadata) {
+        String revision, ModelMetadata currentRegistryMetadata) {
 
         String version = getNewVersion(modelType, modelName, currentRegistryMetadata);
         String datastoreName = datastoreName(modelType, modelName, version);
         importTime = currentDate();
         locked = false;
-        modelRevision = version;
+        modelRevision = revision;
         datastoreFileName = datastoreName;
         originalFileName = modelName;
         this.modelDescription = modelDescription;
@@ -123,6 +117,12 @@ public ModelMetadata(ModelType modelType, String modelName, String modelDescript
         }
     }
 
+    public ModelMetadata(ModelType modelType, String modelName, String modelDescription,
+        ModelMetadata currentRegistryMetadata) {
+        this(modelType, modelName, modelDescription,
+            getNewVersion(modelType, modelName, currentRegistryMetadata), currentRegistryMetadata);
+    }
+
     /**
      * Copy constructor. Used for test purposes only, specifically to produce a
      * {@link ModelMetadata} instance from an instance of a subclass.
@@ -144,7 +144,7 @@ public ModelMetadata(ModelType modelType, String modelName, String modelDescript
      * then the new version will be 1 larger than the current one. If neither of the preceding is
      * true, the version will be "1".
      */
-    private String getNewVersion(ModelType modelType, String modelName,
+    private static String getNewVersion(ModelType modelType, String modelName,
         ModelMetadata currentRegistryMetadata) {
         String version;
         // Do different things depending on whether the model type includes a version
@@ -227,7 +227,7 @@ public void setLocked(boolean locked) {
         this.locked = locked;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
@@ -283,32 +283,39 @@ Date currentDate() {
     private static class DateAdapter extends XmlAdapter<XMLGregorianCalendar, Date> {
 
         @Override
-        public Date unmarshal(XMLGregorianCalendar v) throws Exception {
+        public Date unmarshal(XMLGregorianCalendar v) {
             return v.toGregorianCalendar().getTime();
         }
 
         @Override
-        public XMLGregorianCalendar marshal(Date v) throws Exception {
+        @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+        public XMLGregorianCalendar marshal(Date v) {
             GregorianCalendar gc = new GregorianCalendar();
             gc.setTime(v);
-            return DatatypeFactory.newInstance().newXMLGregorianCalendar(gc);
+            try {
+                return DatatypeFactory.newInstance().newXMLGregorianCalendar(gc);
+            } catch (DatatypeConfigurationException e) {
+                // This can never occur. To be precise, according to
+                // https://stackoverflow.com/a/6953002/12166780
+                // newInstance().newXMLGregorianCalendar is guaranteed to
+                // never throw DatatypeConfigurationException.
+                throw new AssertionError(e);
+            }
         }
-
     }
 
     private class ModelTypeAdapter extends XmlAdapter<String, ModelType> {
 
         @Override
-        public ModelType unmarshal(String v) throws Exception {
+        public ModelType unmarshal(String v) {
             ModelType modelType = new ModelType();
             modelType.setType(v);
             return modelType;
         }
 
         @Override
-        public String marshal(ModelType v) throws Exception {
+        public String marshal(ModelType v) {
             return modelType.getType();
         }
-
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelRegistry.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelRegistry.java
index 246ed4f..9cdc1cb 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelRegistry.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelRegistry.java
@@ -6,21 +6,20 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
 import gov.nasa.ziggy.pipeline.xml.HasXmlSchemaFilename;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlElement;
@@ -36,20 +35,20 @@
 @XmlRootElement(name = "modelRegistry")
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_MODEL_REGISTRY")
+@Table(name = "ziggy_ModelRegistry")
 public class ModelRegistry implements HasXmlSchemaFilename {
 
     private static final String XML_SCHEMA_FILE_NAME = "model-registry.xsd";
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_MODREG_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ziggy_ModelRegistry_generator")
+    @SequenceGenerator(name = "ziggy_ModelRegistry_generator", initialValue = 1,
+        sequenceName = "ziggy_ModelRegistry_sequence", allocationSize = 1)
+    private Long id;
 
     @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "PI_MODREG_MODEL")
-    @Cascade({ CascadeType.SAVE_UPDATE })
+    @JoinTable(name = "ziggy_ModelRegistry_models")
+    @Cascade({ CascadeType.PERSIST, CascadeType.MERGE })
     private Map<ModelType, ModelMetadata> models = new HashMap<>();
 
     @XmlElement(name = "modelMetadata")
@@ -111,7 +110,7 @@ public boolean isLocked() {
         return locked;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
@@ -142,6 +141,10 @@ public ModelMetadata getMetadataForType(ModelType modelType) {
         return models.get(modelType);
     }
 
+    public ModelType getModelType(String modelType) {
+        return modelTypesMap.get(modelType);
+    }
+
     public List<ModelMetadata> getModelMetadata() {
         return modelMetadata;
     }
@@ -154,5 +157,4 @@ public void setModelMetadata(List<ModelMetadata> modelMetadata) {
     public String getXmlSchemaFilename() {
         return XML_SCHEMA_FILE_NAME;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelType.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelType.java
index 75a9f38..3e71406 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelType.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/ModelType.java
@@ -4,14 +4,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
 import gov.nasa.ziggy.module.io.ProxyIgnore;
 import gov.nasa.ziggy.util.RegexBackslashManager;
 import gov.nasa.ziggy.util.RegexGroupCounter;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -36,7 +35,7 @@
 
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_MODEL_TYPE")
+@Table(name = "ziggy_ModelType")
 public class ModelType implements Comparable<ModelType> {
 
     @XmlAttribute(required = true)
@@ -76,10 +75,9 @@ public void validate() {
             throw new IllegalStateException(
                 "Version number group " + versionNumberGroup + " does not exist in model " + type);
         }
-        if ((timestampGroup > groupCount) || (versionNumberGroup <= 0 && semanticVersionNumber)) {
+        if (timestampGroup > groupCount || versionNumberGroup <= 0 && semanticVersionNumber) {
             throw new IllegalStateException(
                 "Timestamp group " + versionNumberGroup + " does not exist in model " + type);
-
         }
     }
 
@@ -153,7 +151,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         ModelType other = (ModelType) obj;
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ModuleName.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ModuleName.java
deleted file mode 100644
index 3bf9d5f..0000000
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ModuleName.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-import java.util.Objects;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * {@link PipelineDefinitionNode} uses a {@link ModuleName} to refer to the
- * {@link PipelineModuleDefinition} that corresponds to that node. This is a 'soft reference'
- * because there may be several instances of the {@link PipelineModuleDefinition} with the name in
- * the {@link ModuleName} (one for each version). An association to a specific version (usually
- * latest version) is only made when a pipeline instance is launched (the
- * {@link PipelineInstanceNode} contains a hard reference to the {@link PipelineModuleDefinition}).
- * <p>
- * This class is used instead of just using {@link String} in order to support referential integrity
- * in the database (both the {@link PipelineDefinitionNode} and the {@link PipelineModuleDefinition}
- * refer to the same {@link ModuleName} row)
- *
- * @author Todd Klaus
- */
-@Entity
-@Table(name = "PI_MOD_NAME")
-public class ModuleName {
-    @Id
-    private String name;
-
-    /**
-     * For Hibernate use only
-     */
-    ModuleName() {
-    }
-
-    /**
-     * Constructors are package-level access because they should only be created by
-     * {@link PipelineModuleDefinition}
-     *
-     * @param name
-     */
-    public ModuleName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if ((obj == null) || (getClass() != obj.getClass())) {
-            return false;
-        }
-        final ModuleName other = (ModuleName) obj;
-        if (!Objects.equals(name, other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * {@link XmlAdapter} implementation for {@link ModuleName} instances.
-     *
-     * @author PT
-     */
-    public static class ModuleNameAdapter extends XmlAdapter<String, ModuleName> {
-
-        @Override
-        public ModuleName unmarshal(String v) throws Exception {
-            return new ModuleName(v);
-        }
-
-        @Override
-        public String marshal(ModuleName v) throws Exception {
-            return v.toString();
-        }
-
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ParameterSet.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ParameterSet.java
index 9179286..db71416 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ParameterSet.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/ParameterSet.java
@@ -1,32 +1,34 @@
 package gov.nasa.ziggy.pipeline.definition;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
-
-import javax.persistence.AssociationOverride;
-import javax.persistence.CascadeType;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import java.util.TreeSet;
 
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.parameters.InternalParameters;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.UniqueConstraint;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * This class models a set of module parameters. A parameter set may be shared by multiple pipeline
@@ -36,55 +38,32 @@
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_PS")
-public class ParameterSet {
+@Table(name = "ziggy_ParameterSet",
+    uniqueConstraints = { @UniqueConstraint(columnNames = { "name", "version" }) })
+public class ParameterSet extends UniqueNameVersionPipelineComponent<ParameterSet>
+    implements HasGroup {
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_PS_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ziggy_ParameterSet_generator")
+    @SequenceGenerator(name = "ziggy_ParameterSet_generator", initialValue = 1,
+        sequenceName = "ziggy_ParameterSet_sequence", allocationSize = 1)
+    private Long id;
 
     @Embedded
     // init with empty placeholder, to be filled in by console
     private AuditInfo auditInfo = new AuditInfo();
 
-    // Combination of name+version must be unique (see shared-extra-ddl-create.sql)
-    @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(ParameterSetName.ParameterSetNameAdapter.class)
-    @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    private ParameterSetName name;
-
-    @XmlAttribute(required = false)
-    private Integer version = 0;
-
-    /**
-     * used by Hibernate to implement optimistic locking. Should prevent 2 different console users
-     * from clobbering each others changes
-     */
-    @Version
-    private int dirty = 0;
-
     @ManyToOne
     private Group group = null;
 
-    /**
-     * Set to true when the first pipeline instance is created using this definition in order to
-     * preserve the data accountability record. Editing a locked definition will result in a new,
-     * unlocked instance with the version incremented
-     */
-    @XmlAttribute(required = false)
-    private Boolean locked = false;
-
     private String description = null;
 
-    @Embedded
-    @AssociationOverride(name = "typedProperties", joinTable = @JoinTable(name = "PI_PS_PROPS"))
-    private BeanWrapper<Parameters> parameters = null;
+    @ElementCollection(fetch = FetchType.EAGER)
+    @JoinTable(name = "ziggy_ParameterSet_parameters")
+    private Set<TypedParameter> typedParameters;
 
     // Used to support the XML interface for parameter sets
     @XmlAttribute(required = false)
-    @Transient
-    private String classname = "gov.nasa.ziggy.parameters.DefaultParameters";
+    private String classname = Parameters.class.getName();
 
     // Used to support the XML interface for parameter sets
     @XmlElement(name = "parameter")
@@ -95,133 +74,92 @@ public ParameterSet() {
     }
 
     public ParameterSet(String name) {
-        this.name = new ParameterSetName(name);
+        setName(name);
     }
 
     public ParameterSet(AuditInfo auditInfo, String name) {
         this.auditInfo = auditInfo;
-        this.name = new ParameterSetName(name);
-    }
-
-    /**
-     * Copy constructor
-     */
-    public ParameterSet(ParameterSet other) {
-        this(other, false);
-    }
-
-    ParameterSet(ParameterSet other, boolean exact) {
-        auditInfo = other.auditInfo;
-        name = other.name;
-        group = other.group;
-        description = other.description;
-        parameters = new BeanWrapper<>(other.parameters);
-
-        if (exact) {
-            version = other.version;
-            locked = other.locked;
-        } else {
-            version = 0;
-            locked = false;
-        }
-    }
-
-    public void rename(String name) {
-        this.name = new ParameterSetName(name);
-    }
-
-    public ParameterSet newVersion() throws PipelineException {
-        if (!locked) {
-            throw new PipelineException("Can't version an unlocked instance");
-        }
-
-        ParameterSet copy = new ParameterSet(this);
-        copy.version = version + 1;
-
-        return copy;
+        setName(name);
     }
 
     // Populates the XML fields (classname and xmlParameters) from the database fields
     public void populateXmlFields() {
-        classname = parameters.getClassName();
-        for (TypedParameter typedProperty : parameters.typedProperties) {
+        for (TypedParameter typedProperty : typedParameters) {
             xmlParameters.add(new Parameter(typedProperty));
         }
     }
 
-    // populates the parameters field from the XML fields.
-    @SuppressWarnings("unchecked")
+    // Populates the parameters field from the XML fields.
     public void populateDatabaseFields() throws ClassNotFoundException {
-        Class<? extends Parameters> beanClass;
-        beanClass = (Class<? extends Parameters>) Class.forName(classname);
-        BeanWrapper<Parameters> paramsBean = new BeanWrapper<>(beanClass);
-        Set<TypedParameter> typedProperties = new HashSet<>();
+        Set<TypedParameter> typedParameters = new HashSet<>();
         for (Parameter parameter : xmlParameters) {
-            typedProperties.add(parameter.typedProperty());
+            typedParameters.add(parameter.typedProperty());
         }
-        paramsBean.setTypedProperties(typedProperties);
-        parameters = paramsBean;
-    }
-
-    /**
-     * just set locked = true
-     */
-    public void lock() {
-        locked = true;
+        this.typedParameters = typedParameters;
     }
 
     /**
-     * Determines whether the parameter set contains an instance of {@link Parameters}, or one of
-     * {@link InternalParameters}.
+     * Construct an instance of the desired {@link Parameters} subclass and populate with values
+     * from the typed parameters of the parameter set.
      */
-    public boolean visibleParameterSet() {
-        return !(parameters.getInstance() instanceof InternalParameters);
+    public <T extends ParametersInterface> T parametersInstance() {
+        return parametersInstance(true);
     }
 
     /**
-     * @return Returns the description.
+     * Construct an instance of the desired {@link Parameters} subclass and optionally populate with
+     * values from the typed parameters of the parameter set.
      */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * @param description The description to set.
-     */
-    public void setDescription(String description) {
-        this.description = description;
+    @SuppressWarnings("unchecked")
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public <T extends ParametersInterface> T parametersInstance(boolean populate) {
+        T parametersInstance;
+        try {
+            parametersInstance = (T) Class.forName(classname)
+                .getDeclaredConstructor()
+                .newInstance();
+            if (populate) {
+                parametersInstance.populate(typedParameters);
+            }
+            return parametersInstance;
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+            | InvocationTargetException | NoSuchMethodException | SecurityException
+            | ClassNotFoundException e) {
+            throw new PipelineException(e);
+        }
     }
 
     /**
-     * @return Returns the name.
+     * Populates the fields of the {@link ParameterSet} from an instance of
+     * {@link ParametersInterface}.
      */
-    public ParameterSetName getName() {
-        return name;
+    public <T extends ParametersInterface> void populateFromParametersInstance(
+        T parametersInstance) {
+        setTypedParameters(parametersInstance.getParameters());
+        setClassname(parametersInstance.getClass().getName());
     }
 
-    /**
-     * @return Returns the version.
-     */
-    public int getVersion() {
-        return version;
+    public Class<?> clazz() {
+        try {
+            return Class.forName(classname);
+        } catch (ClassNotFoundException e) {
+            throw new PipelineException(e);
+        }
     }
 
     /**
-     * @return the parameters
+     * Determines whether the parameter set contains an instance of {@link Parameters}, or one of
+     * {@link InternalParameters}.
      */
-    public BeanWrapper<Parameters> getParameters() {
-        return parameters;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T extends Parameters> T parametersInstance() {
-        return (T) getParameters().getInstance();
+    public boolean visibleParameterSet() {
+        return !(parametersInstance() instanceof InternalParameters);
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public boolean parametersClassDeleted() {
         boolean deleted = false;
         try {
-            parameters.getInstance();
+            parametersInstance();
         } catch (PipelineException e) {
             deleted = true;
         }
@@ -229,10 +167,43 @@ public boolean parametersClassDeleted() {
     }
 
     /**
-     * @param parameters the parameters to set
+     * Returns true if new fields have been added to the class, but do not exist in the database.
      */
-    public void setParameters(BeanWrapper<Parameters> parameters) {
-        this.parameters = parameters;
+    public <T extends ParametersInterface> boolean hasNewUnsavedFields() {
+        T instance = parametersInstance();
+
+        boolean sameKeys = true;
+        for (TypedParameter newProperty : instance.getParameters()) {
+            if (!typedParameters.contains(newProperty)) {
+                sameKeys = false;
+            }
+        }
+
+        return !sameKeys;
+    }
+
+    public Set<TypedParameter> copyOfTypedParameters() {
+        Set<TypedParameter> copiedParameters = new TreeSet<>();
+        for (TypedParameter typedParameter : typedParameters) {
+            copiedParameters.add(new TypedParameter(typedParameter));
+        }
+        return copiedParameters;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Set<TypedParameter> getTypedParameters() {
+        return typedParameters;
+    }
+
+    public void setTypedParameters(Set<TypedParameter> typedParameters) {
+        this.typedParameters = typedParameters;
         populateXmlFields();
     }
 
@@ -244,34 +215,20 @@ public void setAuditInfo(AuditInfo auditInfo) {
         this.auditInfo = auditInfo;
     }
 
-    public boolean isLocked() {
-        return locked;
-    }
-
     @Override
-    public String toString() {
-        return name != null ? name.getName() : "UNNAMED";
-    }
-
-    public Group getGroup() {
+    public Group group() {
         return group;
     }
 
+    @Override
     public void setGroup(Group group) {
         this.group = group;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    /**
-     * For TEST USE ONLY
-     */
-    public void setDirty(int dirty) {
-        this.dirty = dirty;
-    }
-
     public String getClassname() {
         return classname;
     }
@@ -288,6 +245,24 @@ public void setXmlParameters(Set<Parameter> xmlParameters) {
         this.xmlParameters = xmlParameters;
     }
 
+    // For a parameter set, total equals includes the names, types, and values of all TypedParameter
+    // instances.
+    @Override
+    public boolean totalEquals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        ParameterSet other = (ParameterSet) obj;
+        return Objects.equals(auditInfo, other.auditInfo)
+            && Objects.equals(classname, other.classname)
+            && Objects.equals(description, other.description) && Objects.equals(group, other.group)
+            && Objects.equals(id, other.id) && new TypedParameterCollection(typedParameters)
+                .totalEquals(new TypedParameterCollection(other.typedParameters));
+    }
+
     @XmlAccessorType(XmlAccessType.NONE)
     private static class Parameter {
 
@@ -324,13 +299,16 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if ((obj == null) || (getClass() != obj.getClass())) {
+            if (obj == null || getClass() != obj.getClass()) {
                 return false;
             }
             Parameter other = (Parameter) obj;
             return Objects.equals(name, other.name);
         }
-
     }
 
+    @Override
+    protected void clearDatabaseId() {
+        id = null;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ParameterSetName.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ParameterSetName.java
deleted file mode 100644
index f8bf3a6..0000000
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ParameterSetName.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-import java.util.Objects;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.xml.XmlReference;
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * {@link PipelineDefinition} and {@link PipelineDefinitionNode} use {@link ParameterSetName} to
- * refer to the {@link ParameterSet}s that are used by those definitions ({@link Parameters} or
- * {@link Parameters}).
- * <p>
- * This is a 'soft reference' because there may be several instances of the {@link ParameterSet}
- * with the name in the {@link ParameterSetName} (one for each version). An association to a
- * specific version (usually latest version) is only made when a pipeline instance is launched (the
- * {@link PipelineInstance} and {@link PipelineInstanceNode} contain hard references to the
- * {@link ParameterSet}s).
- * <p>
- * This class is used instead of just using {@link String} in order to support referential integrity
- * in the database (both the {@link PipelineDefinition} and the {@link ParameterSet} refer to the
- * same {@link ParameterSetName} row)
- * <p>
- * Note that in order to support rename capability, foreign key references to this entity need to be
- * updated in ParameterSetCrud.rename().
- *
- * @author Todd Klaus
- */
-@Entity
-@Table(name = "PI_PS_NAME")
-public class ParameterSetName extends XmlReference {
-    public static final String DELIMITER = ":";
-
-    /**
-     * For Hibernate use only
-     */
-    ParameterSetName() {
-    }
-
-    /**
-     * Constructors are package-level access because they should only be created by
-     * {@link ParameterSet}
-     *
-     * @param name
-     */
-    public ParameterSetName(String name) {
-        super(name);
-        if (name.contains(DELIMITER)) {
-            throw new IllegalArgumentException("name must not contain '" + DELIMITER + "'");
-        }
-
-    }
-
-    // Here we put the Hibernate annotation on the getter rather than on the field. This is
-    // necessary because the field is in the superclass, but the superclass is not used to construct
-    // a database table.
-    @Id
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String name) {
-        super.setName(name);
-        if (name.contains(DELIMITER)) {
-            throw new IllegalArgumentException("name must not contain '" + DELIMITER + "'");
-        }
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        ParameterSetName other = (ParameterSetName) obj;
-        return Objects.equals(name, other.name);
-    }
-
-    public static class ParameterSetNameAdapter extends XmlAdapter<String, ParameterSetName> {
-
-        @Override
-        public ParameterSetName unmarshal(String v) throws Exception {
-            return new ParameterSetName(v);
-        }
-
-        @Override
-        public String marshal(ParameterSetName v) throws Exception {
-            return v.getName();
-        }
-
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinition.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinition.java
index 73f5324..1837fa1 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinition.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinition.java
@@ -5,36 +5,38 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Stack;
 import java.util.stream.Collectors;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.Version;
-
 import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.PipelineExecutor;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.Priority;
+import gov.nasa.ziggy.pipeline.xml.XmlReference.ParameterSetReference;
 import gov.nasa.ziggy.util.CollectionFilters;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.UniqueConstraint;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -50,70 +52,47 @@
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_PIPELINE_DEF")
-public class PipelineDefinition implements CanBeDeclaredObsolete {
+@Table(name = "ziggy_PipelineDefinition",
+    uniqueConstraints = { @UniqueConstraint(columnNames = { "name", "version" }) })
+public class PipelineDefinition extends UniqueNameVersionPipelineComponent<PipelineDefinition>
+    implements HasGroup {
     @SuppressWarnings("unused")
     private static final Logger log = LoggerFactory.getLogger(PipelineDefinition.class);
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_PD_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,
+        generator = "ziggy_PipelineDefinition_generator")
+    @SequenceGenerator(name = "ziggy_PipelineDefinition_generator", initialValue = 1,
+        sequenceName = "ziggy_PipelineDefinition_sequence", allocationSize = 1)
+    private Long id;
 
     @Embedded
     // init with empty placeholder, to be filled in by console
     private AuditInfo auditInfo = new AuditInfo();
 
-    /**
-     * used by Hibernate to implement optimistic locking. Should prevent 2 different console users
-     * from clobbering each others changes
-     */
-    @Version
-    private int dirty = 0;
-
     @XmlAttribute(required = true)
-    private String description = null;
-
-    // Combination of name+version must be unique (see shared-extra-ddl-create.sql)
-    @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PipelineDefinitionName.PipelineNameAdapter.class)
-    @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    private PipelineDefinitionName name;
-
-    private int version = 0;
+    private String description;
 
     @ManyToOne
-    private Group group = null;
+    private Group group;
 
     // Using the Integer class rather than int here because XML won't allow optional
     // attributes that are primitive types
     @XmlAttribute(required = false)
-    private Integer instancePriority = PipelineInstance.LOWEST_PRIORITY;
-
-    /**
-     * {@link ParameterSetName}s that will be used as {@link Parameters} when an instance of this
-     * pipeline is launched. At launch-time, the {@Link PipelineInstance} will be given a
-     * hard-reference to a specific version (typically latest) of the {@link ParameterSet} for this
-     * {@link ParameterSetName}
-     */
-    @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "PI_TD_PSN")
-    private Map<ClassWrapper<Parameters>, ParameterSetName> pipelineParameterSetNames = new HashMap<>();
-
-    /**
-     * Set to true when the first pipeline instance is created using this definition in order to
-     * preserve the data accountability record. Editing a locked definition will result in a new,
-     * unlocked instance with the version incremented
-     */
-    private boolean locked = false;
-
-    @OneToMany
-    @Cascade({ org.hibernate.annotations.CascadeType.SAVE_UPDATE,
-        org.hibernate.annotations.CascadeType.DETACH })
-    @JoinTable(name = "PI_PDN_ROOT_NODES", joinColumns = @JoinColumn(name = "PARENT_PI_PD_ID"),
-        inverseJoinColumns = @JoinColumn(name = "CHILD_PI_PDN_ID"))
-    @OrderColumn(name = "IDX")
+    @Enumerated(EnumType.STRING)
+    @XmlJavaTypeAdapter(PipelineInstance.Priority.PriorityXmlAdapter.class)
+    private Priority instancePriority = Priority.NORMAL;
+
+    @ElementCollection
+    @JoinTable(name = "ziggy_PipelineDefinition_pipelineParameterSetNames")
+    private Map<ClassWrapper<ParametersInterface>, String> pipelineParameterSetNames = new HashMap<>();
+
+    @ManyToMany
+    @Cascade({ CascadeType.PERSIST, CascadeType.MERGE, CascadeType.DETACH })
+    @JoinTable(name = "ziggy_PipelineDefinition_rootNodes",
+        joinColumns = { @JoinColumn(name = "id") },
+        inverseJoinColumns = @JoinColumn(name = "childNode_id"))
+    @OrderColumn(name = "idx")
     private List<PipelineDefinitionNode> rootNodes = new ArrayList<>();
 
     // Root node names are stored until post-processing can connect them to
@@ -126,7 +105,7 @@ public class PipelineDefinition implements CanBeDeclaredObsolete {
     // pipeline in any order in the XML, but it also complicates the bookkeeping required for those
     // objects.
     @XmlElements({ @XmlElement(name = "node", type = PipelineDefinitionNode.class),
-        @XmlElement(name = "pipelineParameter", type = ParameterSetName.class) })
+        @XmlElement(name = "pipelineParameter", type = ParameterSetReference.class) })
     @Transient
     private Set<Object> nodesAndParamSets = new HashSet<>();
 
@@ -134,87 +113,44 @@ public PipelineDefinition() {
     }
 
     public PipelineDefinition(String name) {
-        this.name = new PipelineDefinitionName(name);
+        setName(name);
     }
 
     public PipelineDefinition(AuditInfo auditInfo, String name) {
-        this.name = new PipelineDefinitionName(name);
+        setName(name);
         this.auditInfo = auditInfo;
     }
 
     /**
-     * Copy constructor
+     * Constructs a renamed (deep) copy of this pipeline definition.
      *
-     * @param other
+     * @see UniqueNameVersionPipelineComponent#newInstance()
      */
-    public PipelineDefinition(PipelineDefinition other) {
-        name = other.name;
-        description = other.description;
-        auditInfo = other.auditInfo;
-        version = 0;
-        group = other.group;
-        locked = false;
-
-        for (PipelineDefinitionNode otherNode : other.rootNodes) {
-            rootNodes.add(new PipelineDefinitionNode(otherNode));
-        }
-    }
-
     @Override
-    public void rename(String name) {
-        this.name = new PipelineDefinitionName(name);
-    }
-
-    /**
-     * Creates a new, unlocked version of this {@link PipelineDefinition} Called by the console when
-     * the user edits a locked instance. If the instance is unlocked, the instance itself will be
-     * returned.
-     */
-    public PipelineDefinition newVersion() {
-        return newVersion(false);
-    }
+    public PipelineDefinition newInstance() {
+        PipelineDefinition pipelineDefinition = super.newInstance();
+        pipelineDefinition.id = null;
+        if (auditInfo != null) {
+            pipelineDefinition.auditInfo = new AuditInfo(auditInfo.getLastChangedUser(),
+                auditInfo.getLastChangedTime());
+        }
+        if (group != null) {
+            pipelineDefinition.group = new Group(group);
+        }
 
-    /**
-     * Creates a new, unlocked version of this {@link PipelineDefinition} that has had its content
-     * replaced by the content of another {@link PipelineDefinition} instance. If the instance is
-     * unlocked, the instance itself will be returned.
-     */
-    public PipelineDefinition newVersionWithUpdatedContent(PipelineDefinition contentSource) {
-        PipelineDefinition newVersion = newVersion(true);
-        newVersion.description = contentSource.description;
-        newVersion.instancePriority = contentSource.instancePriority;
-        newVersion.rootNodeNames = contentSource.rootNodeNames;
-        newVersion.nodesAndParamSets = contentSource.nodesAndParamSets;
-        return newVersion;
-    }
-
-    private PipelineDefinition newVersion(boolean clearNodesAndParams) throws PipelineException {
-        PipelineDefinition newVersion = this;
-        if (locked) {
-            newVersion = new PipelineDefinition(this);
-            newVersion.version = version + 1;
+        pipelineDefinition.pipelineParameterSetNames = new HashMap<>();
+        for (Entry<ClassWrapper<ParametersInterface>, String> pipelineParameterSetName : pipelineParameterSetNames
+            .entrySet()) {
+            pipelineDefinition.pipelineParameterSetNames.put(pipelineParameterSetName.getKey(),
+                pipelineParameterSetName.getValue());
         }
 
-        if (clearNodesAndParams) {
-            newVersion.pipelineParameterSetNames.clear();
-            newVersion.rootNodes.clear();
+        pipelineDefinition.rootNodes = new ArrayList<>();
+        for (PipelineDefinitionNode rootNode : rootNodes) {
+            pipelineDefinition.rootNodes.add(new PipelineDefinitionNode(rootNode));
         }
-        return newVersion;
-    }
 
-    /**
-     * Sets the state of this {@link PipelineDefinition}, and all associated
-     * {@link PipelineDefinitionNode}s, {@link PipelineModuleDefinition}s, and
-     * {@link ParameterSet}s.
-     * <p>
-     * Normally called by the {@link PipelineExecutor} when a pipeline instance is launched in order
-     * to preserve the data accountability record by preventing these definitions from being
-     * modified once they are used.
-     *
-     * @throws PipelineException
-     */
-    public void lock() throws PipelineException {
-        locked = true;
+        return pipelineDefinition;
     }
 
     /**
@@ -248,26 +184,6 @@ private void buildPaths(PipelineDefinitionNode parent, List<PipelineDefinitionNo
         }
     }
 
-    public long getId() {
-        return id;
-    }
-
-    public PipelineDefinitionName getName() {
-        return name;
-    }
-
-    /**
-     * @return Returns the locked.
-     */
-    public boolean isLocked() {
-        return locked;
-    }
-
-    @Override
-    public String toString() {
-        return name.toString();
-    }
-
     public List<PipelineDefinitionNode> getRootNodes() {
         return rootNodes;
     }
@@ -286,7 +202,7 @@ private void setRootNodeNames() {
         }
         StringBuilder sb = new StringBuilder();
         for (PipelineDefinitionNode node : rootNodes) {
-            sb.append(node.getModuleName().getName());
+            sb.append(node.getModuleName());
             sb.append(", ");
         }
         sb.setLength(sb.length() - 2);
@@ -326,7 +242,10 @@ public void populateXmlFields() {
         for (PipelineDefinitionNode node : allNodes) {
             node.populateXmlFields();
         }
-        nodesAndParamSets.addAll(pipelineParameterSetNames.values());
+        nodesAndParamSets.addAll(pipelineParameterSetNames.values()
+            .stream()
+            .map(ParameterSetReference::new)
+            .collect(Collectors.toSet()));
 
         // Don't touch the rootNodeNames String unless the rootNodes List is populated
         if (!rootNodes.isEmpty()) {
@@ -350,12 +269,8 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public int getVersion() {
-        return version;
-    }
-
     @Override
-    public Group getGroup() {
+    public Group group() {
         return group;
     }
 
@@ -364,55 +279,42 @@ public void setGroup(Group group) {
         this.group = group;
     }
 
-    public int getDirty() {
-        return dirty;
-    }
-
-    /**
-     * For TEST USE ONLY
-     */
-    public void setDirty(int dirty) {
-        this.dirty = dirty;
+    public Long getId() {
+        return id;
     }
 
-    @Override
     public String getGroupName() {
-        Group group = getGroup();
+        Group group = group();
         if (group == null) {
-            return Group.DEFAULT_GROUP.getName();
+            return Group.DEFAULT.getName();
         }
         return group.getName();
     }
 
-    @Override
-    public String getDatabaseName() {
-        return getName().getName();
-    }
-
-    public int getInstancePriority() {
+    public Priority getInstancePriority() {
         return instancePriority;
     }
 
-    public void setInstancePriority(int instancePriority) {
+    public void setInstancePriority(Priority instancePriority) {
         this.instancePriority = instancePriority;
     }
 
-    public Map<ClassWrapper<Parameters>, ParameterSetName> getPipelineParameterSetNames() {
+    public Map<ClassWrapper<ParametersInterface>, String> getPipelineParameterSetNames() {
         return pipelineParameterSetNames;
     }
 
     // Populates the Map from Parameter class to ParameterSetName.
     public void setPipelineParameterSetNames(
-        Map<ClassWrapper<Parameters>, ParameterSetName> pipelineParameterSetNames) {
+        Map<ClassWrapper<ParametersInterface>, String> pipelineParameterSetNames) {
         this.pipelineParameterSetNames = pipelineParameterSetNames;
-        CollectionFilters.removeTypeFromCollection(nodesAndParamSets, ParameterSetName.class);
+        CollectionFilters.removeTypeFromCollection(nodesAndParamSets, String.class);
         populateXmlFields();
     }
 
     // Adds an element to the Map from Parameter class to ParameterSetName.
-    public void addPipelineParameterSetName(Class<? extends Parameters> parameterClass,
+    public void addPipelineParameterSetName(Class<? extends ParametersInterface> parameterClass,
         ParameterSet parameterSet) {
-        ClassWrapper<Parameters> classWrapper = new ClassWrapper<>(parameterClass);
+        ClassWrapper<ParametersInterface> classWrapper = new ClassWrapper<>(parameterClass);
         if (pipelineParameterSetNames.containsKey(classWrapper)) {
             throw new PipelineException(
                 "This PipelineDefinition already contains a pipeline parameter set for class: "
@@ -448,7 +350,7 @@ public PipelineDefinitionNode getNodeByName(String name) {
         }
         List<PipelineDefinitionNode> nodes = getNodes();
         List<PipelineDefinitionNode> nodeNameMatches = nodes.stream()
-            .filter(s -> name.equals(s.getModuleName().getName()))
+            .filter(s -> name.equals(s.getModuleName()))
             .collect(Collectors.toList());
         PipelineDefinitionNode matchedNode = null;
         if (!nodeNameMatches.isEmpty()) {
@@ -461,8 +363,11 @@ public Set<PipelineDefinitionNode> getNodesFromXml() {
         return CollectionFilters.filterToSet(nodesAndParamSets, PipelineDefinitionNode.class);
     }
 
-    public Set<ParameterSetName> getParameterSetNames() {
-        return CollectionFilters.filterToSet(nodesAndParamSets, ParameterSetName.class);
+    public Set<String> getParameterSetNames() {
+        return CollectionFilters.filterToSet(nodesAndParamSets, ParameterSetReference.class)
+            .stream()
+            .map(ParameterSetReference::getName)
+            .collect(Collectors.toSet());
     }
 
     public String getRootNodeNames() {
@@ -474,4 +379,14 @@ public void setRootNodeNames(String rootNodeNames) {
         this.rootNodeNames = rootNodeNames;
     }
 
+    // TODO: Define what totalEquals() should do in the case of a pipeline definition.
+    @Override
+    public boolean totalEquals(Object other) {
+        return false;
+    }
+
+    @Override
+    protected void clearDatabaseId() {
+        id = null;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionCli.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionCli.java
index 1718204..2aa3b8e 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionCli.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionCli.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -49,6 +49,8 @@
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
 import gov.nasa.ziggy.services.database.DatabaseTransaction;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 public class PipelineDefinitionCli {
     public static final String IMPORT_OPT = "import";
@@ -65,7 +67,7 @@ public PipelineDefinitionCli(boolean importLib, String[] filenames) {
         Arrays.sort(filenames);
     }
 
-    public void go() throws Exception {
+    public void go() {
         PipelineDefinitionOperations pipelineConfigOps = new PipelineDefinitionOperations();
 
         if (importLib) {
@@ -89,7 +91,8 @@ private static void usageAndExit(Options options) {
         System.exit(-1);
     }
 
-    public static void main(String[] args) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.USAGE)
+    public static void main(String[] args) {
         Options options = new Options();
         options.addOption(IMPORT_OPT, false, "import pipeline config from xml file");
         options.addOption(EXPORT_OPT, false, "export pipeline config to xml file");
@@ -131,11 +134,10 @@ public void catchBlock(Throwable e) {
             }
 
             @Override
-            public Void transaction() throws Exception {
+            public Void transaction() {
                 cli.go();
                 return null;
             }
         });
-
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionFile.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionFile.java
index bb8b6a8..075cf89 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionFile.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionFile.java
@@ -72,5 +72,4 @@ public void setPipelines(Collection<PipelineDefinition> pipelines) {
     public String getXmlSchemaFilename() {
         return XML_SCHEMA_FILE_NAME;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionName.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionName.java
deleted file mode 100644
index e53c9fe..0000000
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionName.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-import java.util.Objects;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * {@link PipelineDefinition} uses a {@link PipelineDefinitionName} to refer to the
- * {@link PipelineDefinition} that is launched by that trigger. This is a 'soft reference' because
- * there may be several instances of the {@link PipelineDefinition} with the name in the
- * {@link PipelineDefinitionName} (one for each version). An association to a specific version
- * (usually latest version) is only made when a trigger is launched (the {@link PipelineInstance}
- * contains a hard reference to the {@link PipelineDefinition}).
- *
- * @author Todd Klaus
- */
-@Entity
-@Table(name = "PI_PD_NAME")
-public class PipelineDefinitionName {
-    @Id
-    private String name;
-
-    /**
-     * For Hibernate use only
-     */
-    PipelineDefinitionName() {
-    }
-
-    /**
-     * Constructors are package-level access because they should only be created by
-     * {@link PipelineDefinition}
-     *
-     * @param name
-     */
-    public PipelineDefinitionName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        PipelineDefinitionName other = (PipelineDefinitionName) obj;
-        return Objects.equals(name, other.name);
-    }
-
-    /**
-     * {@link XmlAdapter} implementation for {@link PipelineDefinitionName} instances.
-     *
-     * @author PT
-     */
-    public static class PipelineNameAdapter extends XmlAdapter<String, PipelineDefinitionName> {
-
-        @Override
-        public PipelineDefinitionName unmarshal(String v) throws Exception {
-            return new PipelineDefinitionName(v);
-        }
-
-        @Override
-        public String marshal(PipelineDefinitionName v) throws Exception {
-            return v.toString();
-        }
-
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNode.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNode.java
index 3b492e6..cc87856 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNode.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNode.java
@@ -6,39 +6,43 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderColumn;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
 import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
 
 import gov.nasa.ziggy.data.management.DataFileType;
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.xml.XmlReference;
 import gov.nasa.ziggy.pipeline.xml.XmlReference.InputTypeReference;
 import gov.nasa.ziggy.pipeline.xml.XmlReference.ModelTypeReference;
 import gov.nasa.ziggy.pipeline.xml.XmlReference.OutputTypeReference;
+import gov.nasa.ziggy.pipeline.xml.XmlReference.ParameterSetReference;
+import gov.nasa.ziggy.services.messages.WorkerResources;
 import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
 import gov.nasa.ziggy.util.CollectionFilters;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -57,13 +61,14 @@
 
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_PIPELINE_DEF_NODE")
+@Table(name = "ziggy_PipelineDefinitionNode")
 public class PipelineDefinitionNode {
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_PDN_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,
+        generator = "ziggy_PipelineDefinitionNode_generator")
+    @SequenceGenerator(name = "ziggy_PipelineDefinitionNode_generator", initialValue = 1,
+        sequenceName = "ziggy_PipelineDefinitionNode_sequence", allocationSize = 1)
+    private Long id;
 
     /**
      * Indicates whether the transition logic should simply propagate the
@@ -77,6 +82,28 @@ public class PipelineDefinitionNode {
     @XmlAttribute(required = false)
     private Boolean startNewUow = true;
 
+    /**
+     * Indicates the maximum number of worker processes that should be spun up for this node. If
+     * zero, the pipeline will default to the number of workers specified for the pipeline as a
+     * whole, either in the properties file or the command line arguments used when the cluster was
+     * started.
+     * <p>
+     * Optional XML attributes cannot be primitives.
+     */
+    @XmlAttribute(required = false, name = "maxWorkers")
+    private Integer maxWorkerCount = 0;
+
+    /**
+     * Indicates the maximum total Java heap size, in MB, for worker processes spun up for this
+     * node. If zero, the pipeline will default to the heap size specified for the pipeline as a
+     * whole, either in the properties file or the command line arguments used when the cluster was
+     * started.
+     * <p>
+     * Optional XML attributes cannot be primitives.
+     */
+    @XmlAttribute(required = false, name = "heapSizeMb")
+    private Integer heapSizeMb = 0;
+
     /**
      * If non-null, this UOW generator definition is used to generate the tasks for this node. May
      * only be null if startNewUow == false (in which case the task from the previous node is just
@@ -88,20 +115,18 @@ public class PipelineDefinitionNode {
     @XmlJavaTypeAdapter(ClassWrapper.ClassWrapperAdapter.class)
     @Embedded
     @AttributeOverrides({
-        @AttributeOverride(name = "clazz", column = @Column(name = "UOW_TG_CN")) })
+        @AttributeOverride(name = "clazz", column = @Column(name = "unitOfWorkGenerator")) })
     private ClassWrapper<UnitOfWorkGenerator> unitOfWorkGenerator;
 
     @XmlAttribute(required = true, name = "moduleName")
-    @XmlJavaTypeAdapter(ModuleName.ModuleNameAdapter.class)
-    @ManyToOne(fetch = FetchType.EAGER)
-    private ModuleName moduleName;
+    private String moduleName;
 
     @OneToMany(fetch = FetchType.EAGER)
-    @Cascade({ org.hibernate.annotations.CascadeType.SAVE_UPDATE,
-        org.hibernate.annotations.CascadeType.DETACH })
-    @JoinTable(name = "PI_PDN_PDN", joinColumns = @JoinColumn(name = "PARENT_PI_PDN_ID"),
-        inverseJoinColumns = @JoinColumn(name = "CHILD_PI_PDN_ID"))
-    @OrderColumn(name = "IDX")
+    @Cascade({ CascadeType.PERSIST, CascadeType.MERGE, CascadeType.DETACH })
+    @JoinTable(name = "ziggy_PipelineDefinitionNode_nextNodes",
+        joinColumns = @JoinColumn(name = "parentNodeId"),
+        inverseJoinColumns = @JoinColumn(name = "childNodeId"))
+    @OrderColumn(name = "idx")
     private List<PipelineDefinitionNode> nextNodes = new ArrayList<>();
 
     // Child node names are stored until post-processing can connect them to
@@ -110,30 +135,31 @@ public class PipelineDefinitionNode {
     @Transient
     private String childNodeNames;
 
-    @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "PI_TDN_MPS")
-    private Map<ClassWrapper<Parameters>, ParameterSetName> moduleParameterSetNames = new HashMap<>();
+    @ElementCollection
+    @JoinTable(name = "ziggy_PipelineDefinitionNode_moduleParameterSetNames")
+    private Map<ClassWrapper<ParametersInterface>, String> moduleParameterSetNames = new HashMap<>();
 
     @ManyToMany
-    @JoinTable(name = "PI_PDN_DFT_INPUTS")
+    @JoinTable(name = "ziggy_PipelineDefinitionNode_inputDataFileTypes")
     private Set<DataFileType> inputDataFileTypes = new HashSet<>();
 
     @ManyToMany
-    @JoinTable(name = "PI_PDN_DFT_OUTPUTS")
+    @JoinTable(name = "ziggy_PipelineDefinitionNode_outputDataFileTypes")
     private Set<DataFileType> outputDataFileTypes = new HashSet<>();
 
     @ManyToMany
-    @JoinTable(name = "PI_PDN_MODEL_TYPES")
+    @JoinTable(name = "ziggy_PipelineDefinitionNode_modelTypes")
     private Set<ModelType> modelTypes = new HashSet<>();
 
     // This construct allows a node's module parameters, input and output data file types, and
     // model types to be entered in the XML file in any order. The downside of this flexibility
     // is that all of the elements wind up in the xmlReferences collection jumbled up together,
     // which complicates the bookkeeping of the various references.
-    @XmlElements(value = { @XmlElement(name = "moduleParameter", type = ParameterSetName.class),
-        @XmlElement(name = "inputDataFileType", type = InputTypeReference.class),
-        @XmlElement(name = "outputDataFileType", type = OutputTypeReference.class),
-        @XmlElement(name = "modelType", type = ModelTypeReference.class) })
+    @XmlElements(
+        value = { @XmlElement(name = "moduleParameter", type = ParameterSetReference.class),
+            @XmlElement(name = "inputDataFileType", type = InputTypeReference.class),
+            @XmlElement(name = "outputDataFileType", type = OutputTypeReference.class),
+            @XmlElement(name = "modelType", type = ModelTypeReference.class) })
     @Transient
     private Set<XmlReference> xmlReferences = new HashSet<>();
 
@@ -150,29 +176,40 @@ public class PipelineDefinitionNode {
     public PipelineDefinitionNode() {
     }
 
-    public PipelineDefinitionNode(ModuleName pipelineModuleDefinitionName,
+    public PipelineDefinitionNode(String pipelineModuleDefinitionName,
         String pipelineDefinitionName) {
         moduleName = pipelineModuleDefinitionName;
         pipelineName = pipelineDefinitionName;
     }
 
     /**
-     * Copy constructor Duplicate this node and all of its child nodes.
-     *
-     * @param other
+     * Duplicates this node and all of its child nodes.
      */
     public PipelineDefinitionNode(PipelineDefinitionNode other) {
         startNewUow = other.startNewUow;
-        moduleName = other.moduleName;
-        pipelineName = other.pipelineName;
+        maxWorkerCount = other.maxWorkerCount;
+        heapSizeMb = other.heapSizeMb;
 
         if (other.unitOfWorkGenerator != null) {
             unitOfWorkGenerator = new ClassWrapper<>(other.unitOfWorkGenerator);
         }
 
+        moduleName = other.moduleName;
+
         for (PipelineDefinitionNode otherNode : other.nextNodes) {
             nextNodes.add(new PipelineDefinitionNode(otherNode));
         }
+
+        for (Entry<ClassWrapper<ParametersInterface>, String> moduleParameterSetName : other.moduleParameterSetNames
+            .entrySet()) {
+            moduleParameterSetNames.put(moduleParameterSetName.getKey(),
+                moduleParameterSetName.getValue());
+        }
+
+        inputDataFileTypes.addAll(other.inputDataFileTypes);
+        outputDataFileTypes.addAll(other.outputDataFileTypes);
+        modelTypes.addAll(other.modelTypes);
+        pipelineName = other.pipelineName;
     }
 
     /**
@@ -200,7 +237,10 @@ public void populateXmlFields() {
         xmlReferences.addAll(modelTypes.stream()
             .map(s -> new ModelTypeReference(s.getType()))
             .collect(Collectors.toSet()));
-        xmlReferences.addAll(moduleParameterSetNames.values());
+        xmlReferences.addAll(moduleParameterSetNames.values()
+            .stream()
+            .map(ParameterSetReference::new)
+            .collect(Collectors.toSet()));
 
         // We don't want to touch the childNodeNames String unless the nextNodes List is populated
         if (!nextNodes.isEmpty()) {
@@ -215,7 +255,7 @@ private void setChildNodeNames() {
         }
         StringBuilder sb = new StringBuilder();
         for (PipelineDefinitionNode node : nextNodes) {
-            sb.append(node.getModuleName().getName());
+            sb.append(node.getModuleName());
             sb.append(", ");
         }
         sb.setLength(sb.length() - 2);
@@ -242,10 +282,31 @@ public PipelineDefinitionNode taskGeneratorNode() {
         return currentNode;
     }
 
+    /**
+     * Returns the worker resources for the current node. If resources are not specified, the
+     * resources object will have nulls, in which case default values will be retrieved from the
+     * {@link WorkerResources} singleton when the object is queried.
+     */
+    public WorkerResources workerResources() {
+        Integer workerCount = maxWorkerCount == null || maxWorkerCount <= 0 ? null : maxWorkerCount;
+        Integer heapSize = heapSizeMb == null || heapSizeMb <= 0 ? null : heapSizeMb;
+        return new WorkerResources(workerCount, heapSize);
+    }
+
+    /**
+     * Applies the worker resources values to a pipeline instance node. If the values are the
+     * default ones, the node's values will be set to zero rather than the values returned by the
+     * resources object.
+     */
+    public void applyWorkerResources(WorkerResources resources) {
+        maxWorkerCount = resources.maxWorkerCountIsDefault() ? 0 : resources.getMaxWorkerCount();
+        heapSizeMb = resources.heapSizeIsDefault() ? 0 : resources.getHeapSizeMb();
+    }
+
     /**
      * @return the id
      */
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
@@ -282,6 +343,30 @@ public void setStartNewUow(boolean startNewUow) {
         this.startNewUow = startNewUow;
     }
 
+    public Integer getMaxWorkerCount() {
+        return maxWorkerCount;
+    }
+
+    public void setMaxWorkerCount(int workers) {
+        maxWorkerCount = workers;
+    }
+
+    public boolean useDefaultWorkerCount() {
+        return maxWorkerCount == null || maxWorkerCount.intValue() == 0;
+    }
+
+    public Integer getHeapSizeMb() {
+        return heapSizeMb;
+    }
+
+    public void setHeapSizeMb(int heapSizeMb) {
+        this.heapSizeMb = heapSizeMb;
+    }
+
+    public boolean useDefaultHeapSize() {
+        return heapSizeMb == null || heapSizeMb.intValue() == 0;
+    }
+
     public ClassWrapper<UnitOfWorkGenerator> getUnitOfWorkGenerator() {
         return unitOfWorkGenerator;
     }
@@ -290,11 +375,11 @@ public void setUnitOfWorkGenerator(ClassWrapper<UnitOfWorkGenerator> unitOfWorkG
         this.unitOfWorkGenerator = unitOfWorkGenerator;
     }
 
-    public ModuleName getModuleName() {
+    public String getModuleName() {
         return moduleName;
     }
 
-    public void setModuleName(ModuleName moduleName) {
+    public void setModuleName(String moduleName) {
         this.moduleName = moduleName;
     }
 
@@ -327,13 +412,13 @@ public void setPath(PipelineDefinitionNodePath path) {
         this.path = path;
     }
 
-    public Map<ClassWrapper<Parameters>, ParameterSetName> getModuleParameterSetNames() {
+    public Map<ClassWrapper<ParametersInterface>, String> getModuleParameterSetNames() {
         return moduleParameterSetNames;
     }
 
-    public ParameterSetName putModuleParameterSetName(Class<? extends Parameters> clazz,
-        ParameterSetName paramSetName) {
-        ClassWrapper<Parameters> classWrapper = new ClassWrapper<>(clazz);
+    public String putModuleParameterSetName(Class<? extends Parameters> clazz,
+        String paramSetName) {
+        ClassWrapper<ParametersInterface> classWrapper = new ClassWrapper<>(clazz);
 
         if (moduleParameterSetNames.containsKey(classWrapper)) {
             throw new PipelineException(
@@ -345,14 +430,17 @@ public ParameterSetName putModuleParameterSetName(Class<? extends Parameters> cl
     }
 
     public void setModuleParameterSetNames(
-        Map<ClassWrapper<Parameters>, ParameterSetName> moduleParameterSetNames) {
+        Map<ClassWrapper<ParametersInterface>, String> moduleParameterSetNames) {
         this.moduleParameterSetNames = moduleParameterSetNames;
-        CollectionFilters.removeTypeFromCollection(xmlReferences, ParameterSetName.class);
+        CollectionFilters.removeTypeFromCollection(xmlReferences, ParameterSetReference.class);
         populateXmlFields();
     }
 
-    public Set<ParameterSetName> getParameterSetNames() {
-        return CollectionFilters.filterToSet(xmlReferences, ParameterSetName.class);
+    public Set<String> getParameterSetNames() {
+        return CollectionFilters.filterToSet(xmlReferences, ParameterSetReference.class)
+            .stream()
+            .map(ParameterSetReference::getName)
+            .collect(Collectors.toSet());
     }
 
     public void addInputDataFileType(DataFileType dataFileType) {
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNodePath.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNodePath.java
index 5455f52..5d4fe10 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNodePath.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNodePath.java
@@ -4,9 +4,9 @@
 import java.util.List;
 import java.util.Objects;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Embeddable;
-import javax.persistence.JoinTable;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.JoinTable;
 
 /**
  * This class models a path to a {@link PipelineDefinitionNode} in a {@link PipelineDefinition}. The
@@ -24,7 +24,7 @@
 public class PipelineDefinitionNodePath {
 
     @ElementCollection
-    @JoinTable(name = "PI_PDN_PATH_ELEMS")
+    @JoinTable(name = "ziggy_PipelineDefinitionNode_path")
     List<Integer> path = new LinkedList<>();
 
     protected PipelineDefinitionNodePath() {
@@ -61,10 +61,9 @@ private PipelineDefinitionNode definitionNodeAt(List<PipelineDefinitionNode> nod
 
         if (pathIndex < path.size() - 1) {
             return definitionNodeAt(node.getNextNodes(), pathIndex + 1);
-        } else {
-            // last element of the path
-            return node;
         }
+        // last element of the path
+        return node;
     }
 
     @Override
@@ -99,7 +98,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final PipelineDefinitionNodePath other = (PipelineDefinitionNodePath) obj;
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionOperations.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionOperations.java
index f906e5f..862f3f0 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionOperations.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionOperations.java
@@ -1,8 +1,6 @@
 package gov.nasa.ziggy.pipeline.definition;
 
 import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -16,11 +14,10 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
 
 import gov.nasa.ziggy.data.management.DataFileType;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.parameters.ParametersOperations;
 import gov.nasa.ziggy.pipeline.PipelineOperations;
 import gov.nasa.ziggy.pipeline.definition.crud.DataFileTypeCrud;
@@ -30,7 +27,6 @@
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineModuleDefinitionCrud;
 import gov.nasa.ziggy.pipeline.xml.ValidatingXmlManager;
 import gov.nasa.ziggy.pipeline.xml.XmlReference;
-import jakarta.xml.bind.JAXBException;
 
 /**
  * Contains methods for importing and exporting pipeline configurations.
@@ -60,14 +56,7 @@ public class PipelineDefinitionOperations {
     private ValidatingXmlManager<PipelineDefinitionFile> xmlManager;
 
     public PipelineDefinitionOperations() {
-        try {
-            xmlManager = new ValidatingXmlManager<>(PipelineDefinitionFile.class);
-        } catch (InstantiationException | IllegalAccessException | SAXException | JAXBException
-            | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
-            | SecurityException e) {
-            throw new PipelineException(
-                "Unable to construct ValidatingXmlManager for class PipelineDefinitionFile", e);
-        }
+        xmlManager = new ValidatingXmlManager<>(PipelineDefinitionFile.class);
     }
 
     /**
@@ -76,11 +65,9 @@ public PipelineDefinitionOperations() {
      *
      * @param pipelines
      * @param destinationPath
-     * @throws IOException
-     * @throws JAXBException
      */
     public void exportPipelineConfiguration(List<PipelineDefinition> pipelines,
-        String destinationPath) throws IOException, JAXBException {
+        String destinationPath) {
         File destinationFile = new File(destinationPath);
         if (destinationFile.exists() && destinationFile.isDirectory()) {
             throw new IllegalArgumentException(
@@ -104,7 +91,7 @@ private void populatePiplineDefinitionFile(List<PipelineDefinition> pipelines,
         for (PipelineDefinition pipeline : pipelines) {
             pipelineDefinitionFile.getPipelines().add(pipeline);
             for (PipelineDefinitionNode node : pipeline.getNodes()) {
-                moduleNames.add(node.getModuleName().getName());
+                moduleNames.add(node.getModuleName());
             }
         }
         Collections.sort(moduleNames);
@@ -130,7 +117,7 @@ private void exportModules(List<String> moduleNames,
      * Imports the pipeline, module, and node definitions from a {@link Collection} of files in the
      * appropriate XML format.
      */
-    public void importPipelineConfiguration(Collection<File> files) throws Exception {
+    public void importPipelineConfiguration(Collection<File> files) {
         for (File sourceFile : files) {
             if (!sourceFile.exists() || sourceFile.isDirectory()) {
                 throw new IllegalArgumentException(
@@ -160,76 +147,20 @@ public void importPipelineConfiguration(Collection<File> files) throws Exception
 
     private void importModules(List<PipelineModuleDefinition> newModules) {
         PipelineModuleDefinitionCrud moduleCrud = pipelineModuleDefinitionCrud();
-        List<PipelineModuleDefinition> existingModules = moduleCrud.retrieveLatestVersions();
-        Map<String, PipelineModuleDefinition> existingModuleMap = new HashMap<>();
-
-        for (PipelineModuleDefinition existingModule : existingModules) {
-            existingModuleMap.put(existingModule.getName().getName(), existingModule);
-        }
-        Set<String> existingModuleNames = existingModuleMap.keySet();
         for (PipelineModuleDefinition newModule : newModules) {
-            String newModuleName = newModule.getName().getName();
-            if (existingModuleNames.contains(newModuleName)) {
-                PipelineModuleDefinition databaseModule = null;
-                PipelineModuleDefinition existingModule = existingModuleMap.get(newModuleName);
-                if (existingModule.isLocked()) {
-                    log.info("Adding new version of module: " + newModuleName);
-                    databaseModule = existingModule.newVersion();
-                } else {
-                    databaseModule = existingModule;
-                    log.info("Updating unlocked version of module: " + newModuleName);
-                }
-                databaseModule.setAuditInfo(new AuditInfo());
-                databaseModule.setDescription(newModule.getDescription());
-                databaseModule.setExeTimeoutSecs(newModule.getExeTimeoutSecs());
-                databaseModule.setMinMemoryMegaBytes(newModule.getMinMemoryMegaBytes());
-
-                databaseModule.setPipelineModuleClass(newModule.getPipelineModuleClass());
-                databaseModule.setInputsClass(newModule.getInputsClass());
-                databaseModule.setOutputsClass(newModule.getOutputsClass());
-                newModule = databaseModule;
-            } else {
-                log.info("Adding new module to module library: " + newModuleName);
-            }
-            moduleCrud.createOrUpdate(newModule);
+            moduleCrud.merge(newModule);
         }
     }
 
     private void importPipelines(List<PipelineDefinition> newPipelineDefinitions) {
 
         PipelineDefinitionCrud pipelineCrud = pipelineDefinitionCrud();
-        List<PipelineDefinition> existingPipelines = pipelineCrud.retrieveLatestVersions();
-        Map<String, PipelineDefinition> existingPipelineMap = new HashMap<>();
-
-        for (PipelineDefinition existingPipeline : existingPipelines) {
-            existingPipelineMap.put(existingPipeline.getName().getName(), existingPipeline);
-        }
-
         for (PipelineDefinition newPipelineDefinition : newPipelineDefinitions) {
 
-            String pipelineName = newPipelineDefinition.getName().getName();
-            PipelineDefinition databasePipeline = null;
-            if (existingPipelineMap.containsKey(pipelineName)) {
-                PipelineDefinition existingPipeline = existingPipelineMap.get(pipelineName);
-                if (existingPipeline.isLocked()) {
-                    log.info("Creating new version of pipeline: " + pipelineName);
-                } else {
-                    log.info("Updating unlocked pipeline: " + pipelineName);
-                }
-                databasePipeline = existingPipeline
-                    .newVersionWithUpdatedContent(newPipelineDefinition);
-            } else {
-                log.info("Adding new pipeline to pipeline library: " + pipelineName);
-
-                // Note: this is necessary so that we can either manipulate the updated
-                // pipeline (use-case above) or the one from XML without triggering a
-                // ConcurrentModificationException (which would occur if we set
-                // newPipelineDefinition equal to databasePipeline).
-                databasePipeline = newPipelineDefinition;
-            }
-            databasePipeline.setAuditInfo(new AuditInfo());
+            String pipelineName = newPipelineDefinition.getName();
+            newPipelineDefinition.setAuditInfo(new AuditInfo());
 
-            Set<PipelineDefinitionNode> nodes = databasePipeline.getNodesFromXml();
+            Set<PipelineDefinitionNode> nodes = newPipelineDefinition.getNodesFromXml();
             Map<String, PipelineDefinitionNode> nodesByName = new HashMap<>();
 
             if (nodes.isEmpty()) {
@@ -238,12 +169,12 @@ private void importPipelines(List<PipelineDefinition> newPipelineDefinitions) {
             for (PipelineDefinitionNode node : nodes) {
                 String childNodeIds = node.getChildNodeNames() != null ? node.getChildNodeNames()
                     : "";
-                log.info("Adding node " + node.getModuleName().getName() + " for pipeline "
-                    + pipelineName + " with child node(s) " + childNodeIds);
-                nodesByName.put(node.getModuleName().getName(), node);
+                log.info("Adding node " + node.getModuleName() + " for pipeline " + pipelineName
+                    + " with child node(s) " + childNodeIds);
+                nodesByName.put(node.getModuleName(), node);
             }
 
-            String rootNodeString = databasePipeline.getRootNodeNames();
+            String rootNodeString = newPipelineDefinition.getRootNodeNames();
             if (rootNodeString != null) {
                 log.info("Pipeline " + pipelineName + " root node names: " + rootNodeString);
             } else {
@@ -252,15 +183,16 @@ private void importPipelines(List<PipelineDefinition> newPipelineDefinitions) {
 
             // pipeline-level parameters
             log.info("Parameter sets for pipeline " + pipelineName + ": "
-                + databasePipeline.getParameterSetNames().toString());
-            databasePipeline.setPipelineParameterSetNames(
-                parseParameterSets(databasePipeline.getParameterSetNames()));
+                + newPipelineDefinition.getParameterSetNames().toString());
+            newPipelineDefinition.setPipelineParameterSetNames(
+                parseParameterSets(newPipelineDefinition.getParameterSetNames()));
 
-            List<String> rootNodeNames = splitAndListifyString(databasePipeline.getRootNodeNames());
-            addNodes(databasePipeline.getName().getName(), rootNodeNames,
-                databasePipeline.getRootNodes(), nodesByName);
+            List<String> rootNodeNames = splitAndListifyString(
+                newPipelineDefinition.getRootNodeNames());
+            addNodes(newPipelineDefinition.getName(), rootNodeNames,
+                newPipelineDefinition.getRootNodes(), nodesByName);
 
-            pipelineCrud.createOrUpdate(databasePipeline);
+            pipelineCrud.merge(newPipelineDefinition);
         }
     }
 
@@ -303,7 +235,7 @@ private void addNodes(String pipelineName, List<String> rootNodeNames,
                 }
             }
             if (!missingDataFileTypes.isEmpty()) {
-                throw new PipelineException(xmlNode.getModuleName().getName()
+                throw new PipelineException(xmlNode.getModuleName()
                     + " missing input data file type names: " + missingDataFileTypes.toString());
             }
             xmlNode.addAllInputDataFileTypes(dataFileTypes);
@@ -319,7 +251,7 @@ private void addNodes(String pipelineName, List<String> rootNodeNames,
                 }
             }
             if (!missingDataFileTypes.isEmpty()) {
-                throw new PipelineException(xmlNode.getModuleName().getName()
+                throw new PipelineException(xmlNode.getModuleName()
                     + " missing output data file type names: " + missingDataFileTypes.toString());
             }
             xmlNode.addAllOutputDataFileTypes(dataFileTypes);
@@ -336,8 +268,8 @@ private void addNodes(String pipelineName, List<String> rootNodeNames,
                 }
             }
             if (!missingModelTypes.isEmpty()) {
-                throw new PipelineException(xmlNode.getModuleName().getName()
-                    + " missing model type names: " + missingModelTypes.toString());
+                throw new PipelineException(xmlNode.getModuleName() + " missing model type names: "
+                    + missingModelTypes.toString());
             }
             xmlNode.addAllModelTypes(modelTypes);
             pipelineRootNodes.add(xmlNode);
@@ -356,12 +288,12 @@ private void addNodes(String pipelineName, List<String> rootNodeNames,
      * Converts a {@link Set} of {@link ParameterSetName} instances to a {@link Map} that provides
      * the parameter set class as a key and the {@link ParameterSetName} as a value.
      */
-    private Map<ClassWrapper<Parameters>, ParameterSetName> parseParameterSets(
-        Set<ParameterSetName> parameterSetNames) {
-        Map<ClassWrapper<Parameters>, ParameterSetName> parameterSets = new HashMap<>();
+    private Map<ClassWrapper<ParametersInterface>, String> parseParameterSets(
+        Set<String> parameterSetNames) {
+        Map<ClassWrapper<ParametersInterface>, String> parameterSets = new HashMap<>();
         ParameterSetCrud paramCrud = parameterSetCrud();
-        for (ParameterSetName pipelineParamSetName : parameterSetNames) {
-            String xmlParamName = pipelineParamSetName.getName();
+        for (String pipelineParamSetName : parameterSetNames) {
+            String xmlParamName = pipelineParamSetName;
             ParameterSet parameterSet = paramCrud.retrieveLatestVersionForName(xmlParamName);
 
             if (parameterSet == null) {
@@ -419,5 +351,4 @@ ModelCrud modelCrud() {
         }
         return modelCrud;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineExecutionTime.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineExecutionTime.java
index 5ec4c74..36dbb29 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineExecutionTime.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineExecutionTime.java
@@ -4,6 +4,8 @@
 
 import org.apache.commons.lang3.time.DurationFormatUtils;
 
+import gov.nasa.ziggy.pipeline.PipelineOperations;
+
 /**
  * Provides capabilities needed by classes that track pipeline execution times, such as
  * {@link PipelineTask} and {@link PipelineInstance}. Four pieces of information are managed:
@@ -42,6 +44,10 @@ public interface PipelineExecutionTime {
     /**
      * Starts execution timing for an instance. At start time, the processing-start time is set if
      * currently null, and the start time for the current execution time is also set.
+     * <p>
+     * Users are advised not to call this method directly. The {@link PipelineOperations} class will
+     * call this method when a change in state of a {@link PipelineExecutionTime} implementation
+     * requires it.
      */
     default void startExecutionClock() {
 
@@ -59,6 +65,10 @@ default void startExecutionClock() {
      * Stops execution timing for an instance. The current-execution start time is set to -1 and the
      * elapsed time from the current execution attempt is added to the total execution time. The end
      * processing time is also set.
+     * <p>
+     * Users are advised not to call this method directly. The {@link PipelineOperations} class will
+     * call this method when a change in state of a {@link PipelineExecutionTime} implementation
+     * requires it.
      */
     default void stopExecutionClock() {
 
@@ -100,6 +110,5 @@ default String elapsedTime() {
         }
         return DurationFormatUtils.formatDuration(totalExecutionTimeAllAttemptsMillis(),
             "HH:mm:ss");
-
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstance.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstance.java
index bd9f4a8..6002d3e 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstance.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstance.java
@@ -4,20 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import java.util.function.Consumer;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.slf4j.Logger;
@@ -25,7 +12,22 @@
 
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.crud.HasExternalIdCrud;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
  * Represents an instance of a {@link PipelineDefinition} that either is running or has completed.
@@ -41,38 +43,75 @@
  * @author Todd Klaus
  */
 @Entity
-@Table(name = "PI_PIPELINE_INSTANCE")
+@Table(name = "ziggy_PipelineInstance")
 public class PipelineInstance implements PipelineExecutionTime {
-    private static final Logger log = LoggerFactory.getLogger(PipelineInstance.class);
+    private static final long serialVersionUID = 20230712L;
 
-    public static final int HIGHEST_PRIORITY = 0;
-    public static final int LOWEST_PRIORITY = 4;
+    private static final Logger log = LoggerFactory.getLogger(PipelineInstance.class);
 
     public enum State {
         /** Not yet launched */
-        INITIALIZED,
+        INITIALIZED(PipelineInstance::startExecutionClock),
 
         /** pipeline running or ready to run, no failed tasks */
-        PROCESSING,
+        PROCESSING(PipelineInstance::startExecutionClock),
 
         /** at least one failed task, but others still running or ready to run */
-        ERRORS_RUNNING,
+        ERRORS_RUNNING(PipelineInstance::startExecutionClock),
 
         /** at least one failed task, no tasks can run (pipeline stalled) */
-        ERRORS_STALLED,
+        ERRORS_STALLED(PipelineInstance::stopExecutionClock),
 
         /** pipeline stopped/paused by operator */
-        STOPPED,
+        STOPPED(PipelineInstance::stopExecutionClock),
 
         /** all tasks completed successfully */
-        COMPLETED
+        COMPLETED(PipelineInstance::stopExecutionClock);
+
+        private final Consumer<PipelineInstance> setExecutionClockState;
+
+        State(Consumer<PipelineInstance> setExecutionClockState) {
+            this.setExecutionClockState = setExecutionClockState;
+        }
+
+        public void setExecutionClockState(PipelineInstance instance) {
+            setExecutionClockState.accept(instance);
+        }
+    }
+
+    /**
+     * Execution priority of a pipeline and its modules.
+     * <p>
+     * Note: Java enumerations have a natural ordering that matches the order in the definition. The
+     * {@link Priority} enum is used to determine the order with which tasks are moved from the
+     * submitted state to execution, hence do not change the ordering of the enums in this
+     * definition.
+     *
+     * @author PT
+     */
+    public enum Priority {
+        HIGHEST, HIGH, NORMAL, LOW, LOWEST;
+
+        public static class PriorityXmlAdapter extends XmlAdapter<String, Priority> {
+
+            @Override
+            public String marshal(Priority priority) throws Exception {
+                return priority.name();
+            }
+
+            @Override
+            public Priority unmarshal(String priority) throws Exception {
+                return Priority.valueOf(priority);
+            }
+        }
     }
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_PIPE_INST_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,
+        generator = "ziggy_PipelineInstance_generator")
+    @SequenceGenerator(name = "ziggy_PipelineInstance_generator", initialValue = 1,
+        sequenceName = "ziggy_PipelineInstance_sequence", allocationSize = 1)
+    private Long id;
 
     /**
      * Descriptive name specified by the user at launch-time. Used when displaying the instance in
@@ -98,7 +137,9 @@ public enum State {
 
     @Enumerated(EnumType.STRING)
     private State state = State.INITIALIZED;
-    private int priority = LOWEST_PRIORITY;
+
+    @Enumerated(EnumType.STRING)
+    private Priority priority = Priority.NORMAL;
 
     /**
      * {@link ParameterSet}s used as {@link Parameters} for this instance. This is a hard-reference
@@ -106,8 +147,8 @@ public enum State {
      * latest available version)
      */
     @ManyToMany
-    @JoinTable(name = "PI_INSTANCE_PS")
-    private Map<ClassWrapper<Parameters>, ParameterSet> pipelineParameterSets = new HashMap<>();
+    @JoinTable(name = "ziggy_PipelineInstance_pipelineParameterSets")
+    private Map<ClassWrapper<ParametersInterface>, ParameterSet> pipelineParameterSets = new HashMap<>();
 
     /**
      * {@link ModelRegistry} in force at the time this pipeline instance was launched. For data
@@ -116,14 +157,9 @@ public enum State {
     @ManyToOne
     private ModelRegistry modelRegistry = null;
 
-    /**
-     * Name of the Trigger that launched this pipeline
-     */
-    private String triggerName;
-
     /** If set, the pipeline instance will start at the specified node */
     @OneToOne
-    @JoinColumn(name = "START_NODE")
+    @JoinColumn(name = "startNode")
     private PipelineInstanceNode startNode;
 
     /**
@@ -132,7 +168,7 @@ public enum State {
      * this endNode, other branches will proceed to the end.
      */
     @OneToOne
-    @JoinColumn(name = "END_NODE")
+    @JoinColumn(name = "endNode")
     private PipelineInstanceNode endNode;
 
     /**
@@ -153,11 +189,11 @@ public void setState(State state) {
         this.state = state;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -169,11 +205,11 @@ public void setPipelineDefinition(PipelineDefinition pipeline) {
         pipelineDefinition = pipeline;
     }
 
-    public int getPriority() {
+    public Priority getPriority() {
         return priority;
     }
 
-    public void setPriority(int priority) {
+    public void setPriority(Priority priority) {
         this.priority = priority;
     }
 
@@ -202,20 +238,6 @@ public void setStartProcessingTime(Date startProcessingTime) {
         this.startProcessingTime = startProcessingTime;
     }
 
-    /**
-     * @return the triggerName
-     */
-    public String getTriggerName() {
-        return triggerName;
-    }
-
-    /**
-     * @param triggerName the triggerName to set
-     */
-    public void setTriggerName(String triggerName) {
-        this.triggerName = triggerName;
-    }
-
     @Override
     public int hashCode() {
         return Objects.hash(id);
@@ -226,22 +248,19 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
-            return false;
-        }
-        final PipelineInstance other = (PipelineInstance) obj;
-        if (id != other.id) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-        return true;
+        PipelineInstance other = (PipelineInstance) obj;
+        return Objects.equals(id, other.id);
     }
 
-    public Map<ClassWrapper<Parameters>, ParameterSet> getPipelineParameterSets() {
+    public Map<ClassWrapper<ParametersInterface>, ParameterSet> getPipelineParameterSets() {
         return pipelineParameterSets;
     }
 
     public void setPipelineParameterSets(
-        Map<ClassWrapper<Parameters>, ParameterSet> pipelineParameterSets) {
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> pipelineParameterSets) {
         this.pipelineParameterSets = pipelineParameterSets;
         populateXmlFields();
     }
@@ -294,7 +313,7 @@ public void clearParameterSets() {
         pipelineParameterSets.clear();
     }
 
-    public ParameterSet putParameterSet(ClassWrapper<Parameters> key, ParameterSet value) {
+    public ParameterSet putParameterSet(ClassWrapper<ParametersInterface> key, ParameterSet value) {
         value.populateXmlFields();
         return pipelineParameterSets.put(key, value);
     }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstanceAggregateState.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstanceAggregateState.java
deleted file mode 100644
index 332b154..0000000
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstanceAggregateState.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-import java.util.Objects;
-
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
-
-/**
- * Holds the results of an aggregate query from
- * {@link PipelineInstanceCrud#instanceState(PipelineInstance)}.
- *
- * @author Todd Klaus
- */
-public class PipelineInstanceAggregateState {
-    private Long numTasks;
-    private Long numSubmittedTasks;
-    private Long numCompletedTasks;
-    private Long numFailedTasks;
-
-    public PipelineInstanceAggregateState(Long numTasks, Long numSubmittedTasks,
-        Long numCompletedTasks, Long numFailedTasks) {
-        this.numTasks = numTasks;
-        this.numSubmittedTasks = numSubmittedTasks;
-        this.numCompletedTasks = numCompletedTasks;
-        this.numFailedTasks = numFailedTasks;
-    }
-
-    public Long getNumTasks() {
-        return numTasks;
-    }
-
-    public void setNumTasks(Long numTasks) {
-        this.numTasks = numTasks;
-    }
-
-    public Long getNumCompletedTasks() {
-        return numCompletedTasks;
-    }
-
-    public void setNumCompletedTasks(Long numCompletedTasks) {
-        this.numCompletedTasks = numCompletedTasks;
-    }
-
-    public Long getNumFailedTasks() {
-        return numFailedTasks;
-    }
-
-    public void setNumFailedTasks(Long numFailedTasks) {
-        this.numFailedTasks = numFailedTasks;
-    }
-
-    @Override
-    public String toString() {
-        return ReflectionToStringBuilder.toString(this);
-    }
-
-    public Long getNumSubmittedTasks() {
-        return numSubmittedTasks;
-    }
-
-    public void setNumSubmittedTasks(Long numSubmittedTasks) {
-        this.numSubmittedTasks = numSubmittedTasks;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(numCompletedTasks, numFailedTasks, numSubmittedTasks, numTasks);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final PipelineInstanceAggregateState other = (PipelineInstanceAggregateState) obj;
-        if (!Objects.equals(numCompletedTasks, other.numCompletedTasks)
-            || !Objects.equals(numFailedTasks, other.numFailedTasks)
-            || !Objects.equals(numSubmittedTasks, other.numSubmittedTasks)
-            || !Objects.equals(numTasks, other.numTasks)) {
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstanceNode.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstanceNode.java
index 4d2ef42..48b3221 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstanceNode.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineInstanceNode.java
@@ -3,22 +3,22 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import java.util.Objects;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.PipelineExecutor;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance.State;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 /**
  * Created by the {@link PipelineExecutor} when creating {@link PipelineTask} objects for a
@@ -31,50 +31,18 @@
  * @author Todd Klaus
  */
 @Entity
-@Table(name = "PI_PIPELINE_INST_NODE")
+@Table(name = "ziggy_PipelineInstanceNode")
 public class PipelineInstanceNode {
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_PIPE_IN_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,
+        generator = "ziggy_PipelineInstanceNode_generator")
+    @SequenceGenerator(name = "ziggy_PipelineInstanceNode_generator", initialValue = 1,
+        sequenceName = "ziggy_PipelineInstanceNode_sequence", allocationSize = 1)
+    private Long id;
 
     /** Timestamp this was created (either by launcher or transition logic) */
     private Date created = new Date(System.currentTimeMillis());
 
-    /**
-     * Total number of {@link PipelineTask}s needed for the associated
-     * {@link PipelineDefinitionNode}
-     */
-    private int numTasks = 0;
-
-    /**
-     * Number of {@link PipelineTask}s actually created for the associated
-     * {@link PipelineDefinitionNode}. For nodes where {@link PipelineDefinitionNode.startNewUow} ==
-     * true, this number will be equal to numTasks above since all of the tasks are created when the
-     * node is launched. For nodes where startNewUow == false, this field will start out at zero and
-     * will be incremented by 1 by the transition logic as each task for the previous node
-     * completes.
-     */
-    private int numSubmittedTasks = 0;
-
-    /**
-     * Number of {@link PipelineTask}s completed for the associated {@link PipelineDefinitionNode}.
-     * If numCompletedTasks == numTasks, then this node is complete and the transition logic will
-     * progress to the next node. The transition logic uses 'select for update' locking when
-     * accessing this object to ensure that this field is updated atomically
-     */
-    private int numCompletedTasks = 0;
-
-    /**
-     * Number of {@link PipelineTask}s that have failed for the associated
-     * {@link PipelineDefinitionNode}. If numFailedTasks > 0 and (numCompletedTasks +
-     * numFailedTasks) == numTasks, then all tasks have been attempted at least once and the
-     * {@link PipelineInstance} state will be set to failed. The transition logic uses 'select for
-     * update' locking when accessing this object to ensure that this field is updated atomically
-     */
-    private int numFailedTasks = 0;
-
     @ManyToOne
     private PipelineInstance pipelineInstance = null;
 
@@ -90,8 +58,8 @@ public class PipelineInstanceNode {
      * latest available version)
      */
     @ManyToMany
-    @JoinTable(name = "PI_PIN_PI_MPS")
-    private Map<ClassWrapper<Parameters>, ParameterSet> moduleParameterSets = new HashMap<>();
+    @JoinTable(name = "ziggy_PipelineInstanceNode_moduleParameterSets")
+    private Map<ClassWrapper<ParametersInterface>, ParameterSet> moduleParameterSets = new HashMap<>();
 
     /**
      * Required by Hibernate
@@ -107,77 +75,6 @@ public PipelineInstanceNode(PipelineInstance pipelineInstance,
         this.pipelineModuleDefinition = pipelineModuleDefinition;
     }
 
-    /**
-     * Specify the counts at creation-time. Only used by tests
-     *
-     * @param pipelineInstance
-     * @param pipelineDefinitionNode
-     * @param pipelineModuleDefinition
-     * @param numTasks
-     * @param numSubmittedTasks
-     * @param numCompletedTasks
-     * @param numFailedTasks
-     */
-    public PipelineInstanceNode(PipelineInstance pipelineInstance,
-        PipelineDefinitionNode pipelineDefinitionNode,
-        PipelineModuleDefinition pipelineModuleDefinition, int numTasks, int numSubmittedTasks,
-        int numCompletedTasks, int numFailedTasks) {
-        this.pipelineInstance = pipelineInstance;
-        this.pipelineDefinitionNode = pipelineDefinitionNode;
-        this.pipelineModuleDefinition = pipelineModuleDefinition;
-        this.numTasks = numTasks;
-        this.numSubmittedTasks = numSubmittedTasks;
-        this.numCompletedTasks = numCompletedTasks;
-        this.numFailedTasks = numFailedTasks;
-    }
-
-    /**
-     * Return the aggregate state for the node. Used for reporting.
-     *
-     * @return
-     */
-    public PipelineInstance.State state() {
-        PipelineInstance.State nodeState = State.INITIALIZED;
-
-        if (numTasks > 0) {
-            if (numCompletedTasks == numTasks) {
-                nodeState = PipelineInstance.State.COMPLETED;
-            } else if (numFailedTasks > 0) {
-                if (numFailedTasks + numCompletedTasks == numSubmittedTasks) {
-                    nodeState = PipelineInstance.State.ERRORS_STALLED;
-                } else {
-                    nodeState = PipelineInstance.State.ERRORS_RUNNING;
-                }
-            } else {
-                nodeState = PipelineInstance.State.PROCESSING;
-            }
-        }
-        return nodeState;
-    }
-
-    public void setNumTasks(int taskCount) {
-        numTasks = taskCount;
-    }
-
-    /**
-     * Should only be called for new (non-persisted) instances of PipelineInstanceNode. For
-     * persisted instances, use PipelineInstanceNodeCrud.incrementSubmittedTaskCount() to ensure
-     * that the instance is updated atomically (it does select for update)
-     *
-     * @param numSubmittedTasks
-     */
-    public void setNumSubmittedTasks(int numSubmittedTasks) {
-        this.numSubmittedTasks = numSubmittedTasks;
-    }
-
-    public int getNumTasks() {
-        return numTasks;
-    }
-
-    public int getNumCompletedTasks() {
-        return numCompletedTasks;
-    }
-
     public PipelineDefinitionNode getPipelineDefinitionNode() {
         return pipelineDefinitionNode;
     }
@@ -202,7 +99,7 @@ public void setPipelineInstance(PipelineInstance instance) {
         pipelineInstance = instance;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
@@ -219,10 +116,6 @@ public void setPipelineModuleDefinition(PipelineModuleDefinition pipelineModuleD
         this.pipelineModuleDefinition = pipelineModuleDefinition;
     }
 
-    public int getNumFailedTasks() {
-        return numFailedTasks;
-    }
-
     /**
      * Retrieve module {@link Parameters} for this {@link PipelineInstanceNode}. This method is not
      * intended to be called directly, use the convenience method
@@ -236,12 +129,12 @@ ParameterSet getModuleParameterSet(Class<? extends Parameters> parametersClass)
         return moduleParameterSets.get(classWrapper);
     }
 
-    public Map<ClassWrapper<Parameters>, ParameterSet> getModuleParameterSets() {
+    public Map<ClassWrapper<ParametersInterface>, ParameterSet> getModuleParameterSets() {
         return moduleParameterSets;
     }
 
     public void setModuleParameterSets(
-        Map<ClassWrapper<Parameters>, ParameterSet> moduleParameterSets) {
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> moduleParameterSets) {
         this.moduleParameterSets = moduleParameterSets;
         populateXmlFields();
     }
@@ -253,14 +146,27 @@ public void populateXmlFields() {
         pipelineInstance.populateXmlFields();
     }
 
-    public ParameterSet putModuleParameterSet(Class<? extends Parameters> clazz,
+    public ParameterSet putModuleParameterSet(Class<ParametersInterface> clazz,
         ParameterSet paramSet) {
         paramSet.populateXmlFields();
-        ClassWrapper<Parameters> classWrapper = new ClassWrapper<>(clazz);
+        ClassWrapper<ParametersInterface> classWrapper = new ClassWrapper<>(clazz);
         return moduleParameterSets.put(classWrapper, paramSet);
     }
 
-    public int getNumSubmittedTasks() {
-        return numSubmittedTasks;
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        PipelineInstanceNode other = (PipelineInstanceNode) obj;
+        return Objects.equals(id, other.id);
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineModule.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineModule.java
index e4c4635..f228c0b 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineModule.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineModule.java
@@ -5,7 +5,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -15,8 +14,6 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.metrics.Metric;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.pipeline.PipelineOperations;
 import gov.nasa.ziggy.pipeline.definition.PipelineTaskMetrics.Units;
 
 /**
@@ -58,12 +55,6 @@ public abstract class PipelineModule {
      */
     private boolean partialSuccess = false;
 
-    /**
-     * List of tasks to be sent as TMQ messages after the current database transaction is committed.
-     * This is here to support LauncherPipelineModule
-     */
-    private List<PipelineTask> pendingMessages = new LinkedList<>();
-
     /**
      * Standard constructor. Stores the {@link PipelineTask} and {@link RunMode} for the instance.
      *
@@ -92,32 +83,11 @@ public boolean processTaskRequiresDatabaseTransaction() {
      * how they perform the work for a pipeline task.
      *
      * @return true if task was completed.
-     * @throws PipelineException
-     */
-    public abstract boolean processTask() throws PipelineException;
-
-    /**
-     * Queue a new PipelineTask message for sending via TMQ. PipelineTask must already have been
-     * written to the database. The messages will be sent after the database transaction for this
-     * task has been committed.
-     *
-     * @param task
+     * @throws Exception if an exception occurs in a concrete implementation. Because the
+     * implementation can throw practically anything, we are forced to be prepared for practically
+     * anything. Hence, {@link Exception} rather than a subclass of {@link Exception}.
      */
-    public void queueWorkerMessageForTask(PipelineTask task) {
-        pendingMessages.add(task);
-    }
-
-    /**
-     * Send pending messages. Should only be called after the PipelineTask objects have been
-     * committed to the database.
-     */
-    public void flushWorkerMessages() {
-        PipelineOperations pipelineOperations = new PipelineOperations();
-        for (PipelineTask task : pendingMessages) {
-            pipelineOperations.sendWorkerMessageForTask(task);
-        }
-        pendingMessages.clear();
-    }
+    public abstract boolean processTask() throws Exception;
 
     /**
      * Update the PipelineTask.summaryMetrics.
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineModuleDefinition.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineModuleDefinition.java
index 4b7703c..f409d6f 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineModuleDefinition.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineModuleDefinition.java
@@ -5,28 +5,24 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Version;
-
 import gov.nasa.ziggy.module.DefaultPipelineInputs;
 import gov.nasa.ziggy.module.DefaultPipelineOutputs;
 import gov.nasa.ziggy.module.ExternalProcessPipelineModule;
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.module.PipelineInputs;
 import gov.nasa.ziggy.module.PipelineOutputs;
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -40,42 +36,25 @@
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_MOD_DEF")
-public class PipelineModuleDefinition {
+@Table(name = "ziggy_PipelineModuleDefinition",
+    uniqueConstraints = { @UniqueConstraint(columnNames = { "name", "version" }) })
+public class PipelineModuleDefinition
+    extends UniqueNameVersionPipelineComponent<PipelineModuleDefinition> {
+
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_MOD_DEF_SEQ",
-        allocationSize = 1)
-    private long id;
-
-    // Combination of name+version must be unique (see shared-extra-ddl-create.sql)
-    @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(ModuleName.ModuleNameAdapter.class)
-    private ModuleName name;
-    private int version = 0;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,
+        generator = "ziggy_PipelineModuleDefinition_generator")
+    @SequenceGenerator(name = "ziggy_PipelineModuleDefinition_generator", initialValue = 1,
+        sequenceName = "ziggy_PipelineModuleDefinition_sequence", allocationSize = 1)
+    private Long id;
 
     @ManyToOne
     private Group group = null;
 
-    /**
-     * Set to true when the first pipeline instance is created using this definition in order to
-     * preserve the data accountability record. Editing a locked definition will result in a new,
-     * unlocked instance with the version incremented
-     */
-    private boolean locked = false;
-
     @Embedded
     // init with empty placeholder, to be filled in by console
     private AuditInfo auditInfo = new AuditInfo();
 
-    /**
-     * used by Hibernate to implement optimistic locking. Should prevent 2 different console users
-     * from clobbering each others changes
-     */
-    @Version
-    private int dirty = 0;
-
     @XmlAttribute
     private String description = "description";
 
@@ -83,9 +62,7 @@ public class PipelineModuleDefinition {
     @XmlJavaTypeAdapter(ClassWrapper.ClassWrapperAdapter.class)
     @Embedded
     @AttributeOverrides({
-        @AttributeOverride(name = "clazz", column = @Column(name = "MODULE_CLASS")),
-        @AttributeOverride(name = "initialized",
-            column = @Column(name = "IMP_CLASS_INITIALIZED")) })
+        @AttributeOverride(name = "clazz", column = @Column(name = "moduleClass")) })
     private ClassWrapper<PipelineModule> pipelineModuleClass = new ClassWrapper<>(
         ExternalProcessPipelineModule.class);
 
@@ -93,9 +70,7 @@ public class PipelineModuleDefinition {
     @XmlAttribute(required = false)
     @XmlJavaTypeAdapter(ClassWrapper.ClassWrapperAdapter.class)
     @AttributeOverrides({
-        @AttributeOverride(name = "clazz", column = @Column(name = "INPUTS_CLASS")),
-        @AttributeOverride(name = "initialized",
-            column = @Column(name = "INPUTS_CLASS_INITIALIZED")) })
+        @AttributeOverride(name = "clazz", column = @Column(name = "inputsClass")) })
     private ClassWrapper<PipelineInputs> inputsClass = new ClassWrapper<>(
         DefaultPipelineInputs.class);
 
@@ -103,9 +78,7 @@ public class PipelineModuleDefinition {
     @XmlAttribute(required = false)
     @XmlJavaTypeAdapter(ClassWrapper.ClassWrapperAdapter.class)
     @AttributeOverrides({
-        @AttributeOverride(name = "clazz", column = @Column(name = "OUTPUTS_CLASS")),
-        @AttributeOverride(name = "initialized",
-            column = @Column(name = "OUTPUTS_CLASS_INITIALIZED")) })
+        @AttributeOverride(name = "clazz", column = @Column(name = "outputsClass")) })
     private ClassWrapper<PipelineOutputs> outputsClass = new ClassWrapper<>(
         DefaultPipelineOutputs.class);
 
@@ -124,102 +97,21 @@ public PipelineModuleDefinition() {
     }
 
     public PipelineModuleDefinition(String name) {
-        this.name = new ModuleName(name);
+        setName(name);
     }
 
     public PipelineModuleDefinition(AuditInfo auditInfo, String name) {
         this.auditInfo = auditInfo;
-        this.name = new ModuleName(name);
-    }
-
-    /**
-     * Copy constructor
-     *
-     * @param other
-     */
-    public PipelineModuleDefinition(PipelineModuleDefinition other) {
-        this(other, false);
-    }
-
-    PipelineModuleDefinition(PipelineModuleDefinition other, boolean exact) {
-        name = other.name;
-        group = other.group;
-        auditInfo = other.auditInfo;
-        description = other.description;
-        pipelineModuleClass = other.pipelineModuleClass;
-        exeTimeoutSecs = other.exeTimeoutSecs;
-        minMemoryMegaBytes = other.minMemoryMegaBytes;
-
-        if (exact) {
-            version = other.version;
-            locked = other.locked;
-        } else {
-            version = 0;
-            locked = false;
-        }
-    }
-
-    public void rename(String name) {
-        this.name = new ModuleName(name);
-    }
-
-    public PipelineModuleDefinition newVersion() {
-        if (!locked) {
-            throw new PipelineException("Can't version an unlocked instance");
-        }
-
-        PipelineModuleDefinition copy = new PipelineModuleDefinition(this);
-        copy.version = version + 1;
-
-        return copy;
-    }
-
-    /**
-     * Lock this and all associated parameter sets
-     * <p>
-     * Before locking, if currently NOT locked, replace all param sets with the latest version, then
-     * lock those, then this one. This guarantees that when a pipeline is launched, the latest
-     * available params are used.
-     *
-     * <pre>
-     * if !locked
-     *   lock data object
-     *   for each param set
-     *     update param set with latest version
-     *     lock latest version param set
-     *   locked = true
-     * </pre>
-     *
-     * @throws PipelineException
-     */
-    public void lock() {
-        locked = true;
-    }
-
-    public boolean isLocked() {
-        return locked;
-    }
-
-    public ModuleName getName() {
-        return name;
-    }
-
-    public int getVersion() {
-        return version;
+        setName(name);
     }
 
     /**
      * @return Returns the id.
      */
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    @Override
-    public String toString() {
-        return name.toString();
-    }
-
     public AuditInfo getAuditInfo() {
         return auditInfo;
     }
@@ -282,13 +174,14 @@ public void setMinMemoryMegaBytes(int minMemoryBytes) {
         minMemoryMegaBytes = minMemoryBytes;
     }
 
-    public Set<ClassWrapper<Parameters>> getRequiredParameterClasses() {
+    public Set<ClassWrapper<ParametersInterface>> getRequiredParameterClasses() {
         PipelineInputs pipelineInputs = inputsClass.newInstance();
 
-        Set<ClassWrapper<Parameters>> requiredParameters = new HashSet<>();
-        List<Class<? extends Parameters>> moduleParameters = pipelineInputs.requiredParameters();
+        Set<ClassWrapper<ParametersInterface>> requiredParameters = new HashSet<>();
+        List<Class<? extends ParametersInterface>> moduleParameters = pipelineInputs
+            .requiredParameters();
 
-        for (Class<? extends Parameters> clazz : moduleParameters) {
+        for (Class<? extends ParametersInterface> clazz : moduleParameters) {
             requiredParameters.add(new ClassWrapper<>(clazz));
         }
 
@@ -303,21 +196,11 @@ public void setGroup(Group group) {
         this.group = group;
     }
 
-    public int getDirty() {
-        return dirty;
-    }
-
-    /**
-     * For TEST USE ONLY
-     */
-    public void setDirty(int dirty) {
-        this.dirty = dirty;
-    }
-
     @Override
     public int hashCode() {
-        return Objects.hash(description, dirty, exeTimeoutSecs, group, id, inputsClass, locked,
-            minMemoryMegaBytes, name, outputsClass, pipelineModuleClass, version);
+        return Objects.hash(description, getOptimisticLockValue(), exeTimeoutSecs, group, id,
+            inputsClass, isLocked(), minMemoryMegaBytes, getName(), outputsClass,
+            pipelineModuleClass, getVersion());
     }
 
     @Override
@@ -325,23 +208,32 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         PipelineModuleDefinition other = (PipelineModuleDefinition) obj;
         boolean equalModule = Objects.equals(description, other.description);
-        equalModule = equalModule && dirty == other.dirty;
+        equalModule = equalModule && getOptimisticLockValue() == other.getOptimisticLockValue();
         equalModule = equalModule && exeTimeoutSecs.intValue() == other.exeTimeoutSecs.intValue();
         equalModule = equalModule && Objects.equals(group, other.group);
-        equalModule = equalModule && id == other.id;
+        equalModule = equalModule && Objects.equals(id, other.id);
         equalModule = equalModule && Objects.equals(inputsClass, other.inputsClass);
-        equalModule = equalModule && locked == other.locked;
+        equalModule = equalModule && isLocked() == other.isLocked();
         equalModule = equalModule
             && minMemoryMegaBytes.intValue() == other.minMemoryMegaBytes.intValue();
-        equalModule = equalModule && Objects.equals(name, other.name);
+        equalModule = equalModule && Objects.equals(getName(), other.getName());
         equalModule = equalModule && Objects.equals(outputsClass, other.outputsClass);
         equalModule = equalModule && Objects.equals(pipelineModuleClass, other.pipelineModuleClass);
-        return equalModule && version == other.version;
+        return equalModule && getVersion() == other.getVersion();
     }
 
+    @Override
+    protected void clearDatabaseId() {
+        id = null;
+    }
+
+    @Override
+    public boolean totalEquals(Object obj) {
+        return equals(obj);
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineTask.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineTask.java
index 4a88a67..2ea5a11 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineTask.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineTask.java
@@ -1,6 +1,7 @@
 package gov.nasa.ziggy.pipeline.definition;
 
 import static com.google.common.base.Preconditions.checkState;
+import static gov.nasa.ziggy.ui.util.HtmlBuilder.htmlBuilder;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -15,31 +16,34 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.persistence.AssociationOverride;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OrderColumn;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.module.AlgorithmExecutor.AlgorithmType;
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.PipelineOperations;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
 import gov.nasa.ziggy.uow.TaskConfigurationParameters;
 import gov.nasa.ziggy.uow.UnitOfWork;
 import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.HostNameUtils;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 /**
  * Represents a single pipeline unit of work Associated with a{@link PipelineInstance}, a
@@ -53,7 +57,7 @@
  * @author Todd Klaus
  */
 @Entity
-@Table(name = "PI_PIPELINE_TASK")
+@Table(name = "ziggy_PipelineTask")
 public class PipelineTask implements PipelineExecutionTime {
     @SuppressWarnings("unused")
     private static final Logger log = LoggerFactory.getLogger(PipelineTask.class);
@@ -85,7 +89,7 @@ public enum State {
          */
         PARTIAL;
 
-        public String htmlString() {
+        public String toHtmlString() {
             String color = "black";
 
             switch (this) {
@@ -110,15 +114,15 @@ public String htmlString() {
                 default:
             }
 
-            return "<html><b><font color=" + color + ">" + toString() + "</font></b></html>";
+            return htmlBuilder().appendBoldColor(toString(), color).toString();
         }
     }
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_PIPE_TASK_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ziggy_PipelineTask_generator")
+    @SequenceGenerator(name = "ziggy_PipelineTask_generator", initialValue = 1,
+        sequenceName = "ziggy_PipelineTask_sequence", allocationSize = 1)
+    private Long id;
 
     /** Current state of this task */
     @Enumerated(EnumType.STRING)
@@ -171,31 +175,35 @@ public String htmlString() {
     /** Count of the number of automatic resubmits performed for this task. */
     private int autoResubmitCount = 0;
 
+    /** Indicates whether the task has been submitted for remote execution. */
+    @Enumerated(EnumType.STRING)
+    private AlgorithmType processingMode;
+
     @ManyToOne
     private PipelineInstance pipelineInstance = null;
 
     @ManyToOne
     private PipelineInstanceNode pipelineInstanceNode = null;
 
-    @Embedded
-    @AssociationOverride(name = "typedProperties", joinTable = @JoinTable(name = "PI_PT_UOW_PROPS"))
-    private BeanWrapper<UnitOfWork> uowTask;
+    @ElementCollection(fetch = FetchType.EAGER)
+    @JoinTable(name = "ziggy_PipelineTask_uowTaskParameters")
+    private Set<TypedParameter> uowTaskParameters;
 
     @ElementCollection
-    @JoinTable(name = "PI_PIPELINE_TASK_METRICS")
+    @JoinTable(name = "ziggy_PipelineTask_summaryMetrics")
     private List<PipelineTaskMetrics> summaryMetrics = new ArrayList<>();
 
     @ElementCollection
     @OrderColumn(name = "idx")
-    @JoinTable(name = "PI_PIPELINE_TASK_EXEC_LOG")
+    @JoinTable(name = "ziggy_PipelineTask_execLog")
     private List<TaskExecutionLog> execLog = new ArrayList<>();
 
     @ElementCollection
-    @JoinTable(name = "PI_PIPELINE_TASK_PRODUCER_IDS")
+    @JoinTable(name = "ziggy_PipelineTask_producerTaskIds")
     private Set<Long> producerTaskIds = new TreeSet<>();
 
     @ElementCollection
-    @JoinTable(name = "PI_PIPELINE_TASK_REMOTE_JOBS")
+    @JoinTable(name = "ziggy_PipelineTask_remoteJobs")
     private Set<RemoteJob> remoteJobs = new HashSet<>();
 
     private int taskLogIndex = 0;
@@ -236,10 +244,8 @@ public <T extends Parameters> T getParameters(Class<T> parametersClass) {
     @SuppressWarnings("unchecked")
     public <T extends Parameters> T getParameters(Class<T> parametersClass,
         boolean throwIfMissing) {
-
         ParameterSet parameterSet = getParameterSet(parametersClass, throwIfMissing);
-
-        return parameterSet == null ? (T) parameterSet : (T) parameterSet.parametersInstance();
+        return parameterSet == null ? null : (T) parameterSet.parametersInstance();
     }
 
     /**
@@ -257,7 +263,7 @@ public <T extends Parameters> ParameterSet getParameterSet(Class<T> parametersCl
      * Returns the full {@link Map} of pipeline-level {@link ParameterSet} instances. This is mainly
      * used to force Hibernate to lazy-instantiate the parameters.
      */
-    public Map<ClassWrapper<Parameters>, ParameterSet> getPipelineParameterSets() {
+    public Map<ClassWrapper<ParametersInterface>, ParameterSet> getPipelineParameterSets() {
         return pipelineInstance.getPipelineParameterSets();
     }
 
@@ -265,7 +271,7 @@ public Map<ClassWrapper<Parameters>, ParameterSet> getPipelineParameterSets() {
      * Returns the full {@link Map} of module-level {@link ParameterSet} instances. This is mainly
      * used to force Hibernate to lazy-instantiate the parameters.
      */
-    public Map<ClassWrapper<Parameters>, ParameterSet> getModuleParameterSets() {
+    public Map<ClassWrapper<ParametersInterface>, ParameterSet> getModuleParameterSets() {
         return pipelineInstanceNode.getModuleParameterSets();
     }
 
@@ -289,9 +295,8 @@ public <T extends Parameters> ParameterSet getParameterSet(Class<T> parametersCl
 
             if (throwIfMissing) {
                 throw new PipelineException(errMsg);
-            } else {
-                return null;
             }
+            return null;
         }
         if (pipelineParamSet != null && moduleParamSet != null) {
             throw new PipelineException("Parameters for class: " + parametersClass
@@ -326,9 +331,7 @@ public int getModelExternalId(String modelType) {
         if (modelMetadata == null) {
             throw new PipelineException("No model metadata found for modelType=" + modelType);
         }
-        int externalId = Integer.parseInt(modelMetadata.getModelRevision());
-
-        return externalId;
+        return Integer.parseInt(modelMetadata.getModelRevision());
     }
 
     /**
@@ -359,7 +362,7 @@ public String prettyPrint() {
         for (ParameterSet pset : setOfParameterSets) {
             bldr.append('[').append(pset.getDescription()).append(" ");
             bldr.append(pset.getVersion()).append(" ");
-            Set<TypedParameter> properties = pset.getParameters().getTypedProperties();
+            Set<TypedParameter> properties = pset.getTypedParameters();
             for (TypedParameter property : properties) {
                 bldr.append(property.getName()).append("=").append(property.getValue()).append(" ");
             }
@@ -370,28 +373,27 @@ public String prettyPrint() {
     }
 
     public String getModuleName() {
-        return getPipelineInstanceNode().getPipelineModuleDefinition().getName().getName();
+        return getPipelineInstanceNode().getPipelineModuleDefinition().getName();
     }
 
     public PipelineModule getModuleImplementation() {
         return getModuleImplementation(RunMode.STANDARD);
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
     public PipelineModule getModuleImplementation(RunMode runMode) {
-        PipelineModule module = null;
         ClassWrapper<PipelineModule> moduleWrapper = pipelineInstanceNode
             .getPipelineModuleDefinition()
             .getPipelineModuleClass();
         try {
-            module = moduleWrapper.constructor(PipelineTask.class, RunMode.class)
+            return moduleWrapper.constructor(PipelineTask.class, RunMode.class)
                 .newInstance(this, runMode);
         } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
-            | InvocationTargetException | PipelineException | NoSuchMethodException
-            | SecurityException | ClassNotFoundException e) {
-            throw new PipelineException(
-                "Unable to instantiate module of class " + moduleWrapper.getClazz().toString(), e);
+            | InvocationTargetException e) {
+            // Can never occur. The PipelineModule has a constructor that takes PipelineTask
+            // and RunMode as arguments.
+            throw new AssertionError(e);
         }
-        return module;
     }
 
     public PipelineDefinitionNode getPipelineDefinitionNode() {
@@ -418,35 +420,45 @@ public long pipelineInstanceId() {
         return pipelineInstance.getId();
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public BeanWrapper<UnitOfWork> getUowTask() {
-        return uowTask;
+    public Set<TypedParameter> getUowTaskParameters() {
+        return uowTaskParameters;
     }
 
-    @Override
-    public String toString() {
-        return "PipelineTask [id=" + id + ", state=" + state + ", uowTask=" + uowTask + "]";
+    public void setUowTaskParameters(Set<TypedParameter> uowTaskParameters) {
+        this.uowTaskParameters = uowTaskParameters;
     }
 
-    public void setUowTask(BeanWrapper<UnitOfWork> uowTask) {
-        this.uowTask = uowTask;
+    @Override
+    public String toString() {
+        return "PipelineTask [id=" + id + ", state=" + state + ", uowTask="
+            + uowTaskInstance().briefState() + "]";
     }
 
     public UnitOfWork uowTaskInstance() {
-        return getUowTask().getInstance();
+        UnitOfWork uow = new UnitOfWork();
+        uow.setParameters(uowTaskParameters);
+        return uow;
     }
 
     public State getState() {
         return state;
     }
 
+    /**
+     * Use of this method is not recommended. Use
+     * {@link PipelineOperations#setTaskState(PipelineTask, gov.nasa.ziggy.pipeline.definition.PipelineTask.State)}
+     * instead.
+     *
+     * @param state
+     */
     public void setState(State state) {
         this.state = state;
     }
@@ -643,22 +655,21 @@ public static String baseNamePrefix(long instanceId, long taskId) {
      */
     public String taskLabelText() {
 
-        String module = getPipelineInstanceNode().getPipelineModuleDefinition().toString();
-        long instanceId = getPipelineInstance().getId();
-        String elapsedTime = elapsedTime();
-        String briefState = uowTaskInstance().briefState();
-
-        String stateString;
-
-        if (state == State.ERROR) {
-            stateString = "<b><font color=red>" + state + "</font></b>";
-        } else {
-            stateString = "<b><font color=green>" + state + "</font></b>";
-        }
-
-        return "<html>  " + "<b>ID:</b> " + instanceId + ":" + id + " <b>WORKER:</b> "
-            + getWorkerName() + " <b>TASK:</b> " + module + " ([" + briefState + "] " + stateString
-            + " <i>" + elapsedTime + "</i>)</html>";
+        return htmlBuilder().appendBold("ID: ")
+            .append(getPipelineInstance().getId())
+            .append(":")
+            .append(id)
+            .appendBold(" WORKER: ")
+            .append(getWorkerName())
+            .appendBold(" TASK: ")
+            .append(getModuleName())
+            .append(" [")
+            .append(uowTaskInstance().briefState())
+            .append("] ")
+            .appendBoldColor(state.toString(), state == State.ERROR ? "red" : "green")
+            .append(" ")
+            .appendItalic(elapsedTime())
+            .toString();
     }
 
     /**
@@ -694,11 +705,8 @@ public boolean equals(Object obj) {
         if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-        final PipelineTask other = (PipelineTask) obj;
-        if (id != other.id) {
-            return false;
-        }
-        return true;
+        PipelineTask other = (PipelineTask) obj;
+        return Objects.equals(id, other.id);
     }
 
     public static final class TaskBaseNameMatcher {
@@ -798,6 +806,22 @@ public void setRemoteJobs(Set<RemoteJob> remoteJobs) {
         this.remoteJobs = remoteJobs;
     }
 
+    public boolean isRemoteExecution() {
+        return processingMode.equals(AlgorithmType.REMOTE);
+    }
+
+    public void setRemoteExecution(boolean remoteExecution) {
+        processingMode = remoteExecution ? AlgorithmType.REMOTE : AlgorithmType.LOCAL;
+    }
+
+    public AlgorithmType getProcessingMode() {
+        return processingMode;
+    }
+
+    public void setProcessingMode(AlgorithmType mode) {
+        processingMode = mode;
+    }
+
     public int getAutoResubmitCount() {
         return autoResubmitCount;
     }
@@ -817,7 +841,9 @@ public void resetAutoResubmitCount() {
     /**
      * Starts execution clock for {@link PipelineTask} by first using the default method from
      * {@link PipelineExecutionTime}, then starting the clock for the {@link PipelineInstance} as
-     * well.
+     * well. Users are generally advised not to call this method directly, as the clock is started
+     * and stopped at appropriate times when a {@link PipelineOperations} instance is used to set a
+     * task's state.
      */
     @Override
     public void startExecutionClock() {
@@ -893,7 +919,5 @@ public String processingStateShortLabel() {
 
             return sb.toString();
         }
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineTaskMetrics.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineTaskMetrics.java
index aedb4db..05edf2c 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineTaskMetrics.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/PipelineTaskMetrics.java
@@ -1,8 +1,8 @@
 package gov.nasa.ziggy.pipeline.definition;
 
-import javax.persistence.Embeddable;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 
 /**
  * @author Todd Klaus
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ProcessingState.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ProcessingState.java
index a1a9a8e..5859090 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ProcessingState.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/ProcessingState.java
@@ -99,5 +99,4 @@ public void taskAction(ProcessingStatePipelineModule module) {
     public abstract String shortName();
 
     public abstract void taskAction(ProcessingStatePipelineModule module);
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/ProcessingStatePipelineModule.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/ProcessingStatePipelineModule.java
index 64f4e19..36f2109 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/ProcessingStatePipelineModule.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/ProcessingStatePipelineModule.java
@@ -120,5 +120,4 @@ default ProcessingState getProcessingState() {
      * Defines the task action to be taken when the task state is {@link ProcessingState#COMPLETE}.
      */
     void processingCompleteTaskAction();
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/RemoteJob.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/RemoteJob.java
index b8aa0bf..f80d1b6 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/RemoteJob.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/RemoteJob.java
@@ -2,11 +2,10 @@
 
 import java.util.Objects;
 
-import javax.persistence.Embeddable;
-
 import gov.nasa.ziggy.module.remote.RemoteNodeDescriptor;
 import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 import gov.nasa.ziggy.util.TimeFormatter;
+import jakarta.persistence.Embeddable;
 
 /**
  * Provides information on remote execution jobs associated with a {@link PipelineTask}.
@@ -22,7 +21,7 @@
  * <p>
  * Instances of {@link RemoteJob} are created when the jobs for a {@link PipelineTask} are submitted
  * to the batch system. They get updated when the task leaves algorithm monitoring, when stale task
- * states are cleared at worker start time, and when the user requests a display of task and
+ * states are cleared at supervisor start time, and when the user requests a display of task and
  * instance costs via the {@link ZiggyGuiConsole}.
  *
  * @author PT
@@ -36,7 +35,6 @@ public class RemoteJob {
     private boolean finished;
 
     public RemoteJob() {
-
     }
 
     public RemoteJob(long jobId) {
@@ -77,7 +75,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         RemoteJob other = (RemoteJob) obj;
@@ -129,7 +127,5 @@ public String getModel() {
         public void setModel(String model) {
             this.model = model;
         }
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/TaskCounts.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/TaskCounts.java
index 5471717..4d558cd 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/TaskCounts.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/TaskCounts.java
@@ -1,8 +1,14 @@
 package gov.nasa.ziggy.pipeline.definition;
 
+import java.util.Collection;
+import java.util.Objects;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.module.PipelineException;
+
 /**
  * Result class for a query against PipelineInstanceNode.
  *
@@ -11,23 +17,59 @@
 public class TaskCounts {
     private final Logger log = LoggerFactory.getLogger(TaskCounts.class);
 
-    private long total;
-    private long submitted;
-    private long completed;
-    private long failed;
+    private int taskCount;
+    private int submittedTaskCount;
+    private int completedTaskCount;
+    private int failedTaskCount;
 
-    public TaskCounts(long total, long submitted, long completed, long failed) {
-        this.total = total;
-        this.submitted = submitted;
-        this.completed = completed;
-        this.failed = failed;
+    public TaskCounts(int total, int submitted, int completed, int failed) {
+        taskCount = total;
+        submittedTaskCount = submitted;
+        completedTaskCount = completed;
+        failedTaskCount = failed;
     }
 
     public TaskCounts(TaskCounts other) {
-        total = other.total;
-        submitted = other.submitted;
-        completed = other.completed;
-        failed = other.failed;
+        taskCount = other.taskCount;
+        submittedTaskCount = other.submittedTaskCount;
+        completedTaskCount = other.completedTaskCount;
+        failedTaskCount = other.failedTaskCount;
+    }
+
+    /**
+     * Constructs an instance of {@link TaskCounts} from a collection of {@link PipelineTask}
+     * states.
+     */
+    public static TaskCounts from(Collection<PipelineTask.State> states) {
+        int taskCount = states.size();
+        int submittedTaskCount = 0;
+        int completedTaskCount = 0;
+        int failedTaskCount = 0;
+        for (PipelineTask.State state : states) {
+            switch (state) {
+                case INITIALIZED:
+                    break;
+                case SUBMITTED:
+                    submittedTaskCount++;
+                    break;
+                case PROCESSING:
+                    submittedTaskCount++;
+                    break;
+                case ERROR:
+                    submittedTaskCount++;
+                    failedTaskCount++;
+                    break;
+                case COMPLETED:
+                    submittedTaskCount++;
+                    completedTaskCount++;
+                    break;
+                case PARTIAL:
+                    submittedTaskCount++;
+                default:
+                    throw new PipelineException("Unsupported task state: " + state.toString());
+            }
+        }
+        return new TaskCounts(taskCount, submittedTaskCount, completedTaskCount, failedTaskCount);
     }
 
     /**
@@ -36,45 +78,84 @@ public TaskCounts(TaskCounts other) {
      * @return
      */
     public boolean isInstanceNodeComplete() {
-        log.info("numTasks/numCompletedTasks = " + total + "/" + completed);
+        log.info("numTasks/numCompletedTasks = " + taskCount + "/" + completedTaskCount);
+
+        return completedTaskCount == taskCount;
+    }
 
-        return completed == total;
+    /**
+     * True if the sum of completed tasks and failed tasks == total tasks. Indicates that the
+     * pipeline has at least attempted to process every task.
+     */
+    public boolean isInstanceNodeExecutionComplete() {
+        log.debug("numTasks/numCompletedTasks/numFailedTasks = {} / {} / {}", taskCount,
+            completedTaskCount, failedTaskCount);
+        return completedTaskCount + failedTaskCount == taskCount && submittedTaskCount > 0;
+    }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this);
     }
 
     public String log() {
-        return "taskCounts: numTasks/numSubmittedTasks/numCompletedTasks/numFailedTasks =  " + total
-            + "/" + submitted + "/" + completed + "/" + failed;
+        return "taskCounts: numTasks/numSubmittedTasks/numCompletedTasks/numFailedTasks =  "
+            + taskCount + "/" + submittedTaskCount + "/" + completedTaskCount + "/"
+            + failedTaskCount;
+    }
+
+    public int getTaskCount() {
+        return taskCount;
+    }
+
+    public int getSubmittedTaskCount() {
+        return submittedTaskCount;
     }
 
-    public long getTotal() {
-        return total;
+    public int getCompletedTaskCount() {
+        return completedTaskCount;
     }
 
-    public long getSubmitted() {
-        return submitted;
+    public int getFailedTaskCount() {
+        return failedTaskCount;
     }
 
-    public long getCompleted() {
-        return completed;
+    public void setTaskCount(int total) {
+        taskCount = total;
     }
 
-    public long getFailed() {
-        return failed;
+    public void setSubmittedTaskCount(int submitted) {
+        submittedTaskCount = submitted;
     }
 
-    public void setTotal(long total) {
-        this.total = total;
+    public void setCompletedTaskCount(int completed) {
+        completedTaskCount = completed;
     }
 
-    public void setSubmitted(long submitted) {
-        this.submitted = submitted;
+    public void setFailedTaskCount(int failed) {
+        failedTaskCount = failed;
     }
 
-    public void setCompleted(long completed) {
-        this.completed = completed;
+    @Override
+    public int hashCode() {
+        return Objects.hash(completedTaskCount, failedTaskCount, submittedTaskCount, taskCount);
     }
 
-    public void setFailed(long failed) {
-        this.failed = failed;
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        final TaskCounts other = (TaskCounts) obj;
+        if (!Objects.equals(completedTaskCount, other.completedTaskCount)
+            || !Objects.equals(failedTaskCount, other.failedTaskCount)
+            || !Objects.equals(submittedTaskCount, other.submittedTaskCount)
+            || !Objects.equals(taskCount, other.taskCount)) {
+            return false;
+        }
+        return true;
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/TaskExecutionLog.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/TaskExecutionLog.java
index 6d099eb..8b87fab 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/TaskExecutionLog.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/TaskExecutionLog.java
@@ -3,12 +3,11 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.persistence.Embeddable;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-
 import gov.nasa.ziggy.pipeline.definition.PipelineTask.State;
 import gov.nasa.ziggy.util.StringUtils;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 
 @Embeddable
 public class TaskExecutionLog {
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/TypedParameter.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/TypedParameter.java
index 39079c2..876010d 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/TypedParameter.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/TypedParameter.java
@@ -3,28 +3,28 @@
 import java.lang.reflect.Field;
 import java.util.Objects;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-
 import com.l2fprod.common.propertysheet.AbstractProperty;
 import com.l2fprod.common.propertysheet.PropertySheet;
 
 import gov.nasa.ziggy.collections.ZiggyArrayUtils;
 import gov.nasa.ziggy.collections.ZiggyDataType;
-import gov.nasa.ziggy.parameters.DefaultParameters;
+import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.util.StringUtils;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 
 /**
  * Represents a parameter with a name, a value, and a type. The name and value are Strings, the type
  * is an enum that represents all valid parameter types. This allows the correct data type to be
  * stored at serialization time even though the value is stored as a String.
  * <p>
- * The main use case for this class is to store the contents of a {@link DefaultParameters}
- * instance. It is also used in places where a name-value pair needs to be stored or managed (for
- * example in the way that the Parameters subclasses store their contents, or the way that unit of
- * work instances store their contents). In these cases, the property type is stored as
- * {@link String}, because the Java type of the class member already supplies this information.
+ * The main use case for this class is to store the contents of a {@link Parameters} instance. It is
+ * also used in places where a name-value pair needs to be stored or managed (for example in the way
+ * that the Parameters subclasses store their contents, or the way that unit of work instances store
+ * their contents). In these cases, the property type is stored as {@link String}, because the Java
+ * type of the class member already supplies this information.
  * <p>
  * The class extends {@link AbstractProperty} and implements {Property}, both from l2fprod, which
  * adds a bit of complexity to the class. The {@link AbstractProperty} has a private member, value,
@@ -41,9 +41,9 @@
  */
 
 @Embeddable
-public class TypedParameter extends AbstractProperty {
+public class TypedParameter extends AbstractProperty implements Comparable<TypedParameter> {
 
-    private static final long serialVersionUID = 20220316L;
+    private static final long serialVersionUID = 20230511L;
 
     private static final String ARRAY_TYPE_SUFFIX = "array";
 
@@ -64,7 +64,6 @@ public class TypedParameter extends AbstractProperty {
 
     // Needed by Hibernate.
     public TypedParameter() {
-
     }
 
     /**
@@ -80,7 +79,7 @@ public TypedParameter(String name, String value, ZiggyDataType type) {
      */
     public TypedParameter(String name, String value, ZiggyDataType type, boolean scalar) {
         this.name = name;
-        stringValue = value;
+        stringValue = trimWhitespace(value);
         dataType = type;
         this.scalar = scalar;
         validate();
@@ -89,7 +88,6 @@ public TypedParameter(String name, String value, ZiggyDataType type, boolean sca
         // AbstractProperty value; also ensure that the handling of the decimal point for
         // floating point values is deterministic.
         setValue(getValue());
-
     }
 
     /**
@@ -113,12 +111,8 @@ public TypedParameter(String name, String value) {
      * Constructs a {@link TypedParameter} instance from the value of a {@link Field} in an
      * {@link Object}. The resulting {@link TypedParameter} will have a type of
      * {@link ZiggyDataType#ZIGGY_STRING}.
-     *
-     * @throws IllegalAccessException
-     * @throws IllegalArgumentException
      */
-    public TypedParameter(Object obj, Field field)
-        throws IllegalArgumentException, IllegalAccessException {
+    public TypedParameter(Object obj, Field field) {
         this(field.getName(), ZiggyDataType.objectToString(obj, field), ZiggyDataType.ZIGGY_STRING);
     }
 
@@ -126,12 +120,21 @@ public TypedParameter(Object obj, Field field)
      * Copy constructor.
      */
     public TypedParameter(TypedParameter original) {
-        name = new String(original.getName());
-        stringValue = new String(original.getString());
+        name = original.getName();
+        stringValue = original.getString();
         dataType = original.dataType;
         scalar = original.scalar;
     }
 
+    /**
+     * Removes leading and trailing whitespace from the given parameter, including whitespace around
+     * commas used as value separators (i.e., " v1, v2 " becomes "v1,v2"). This should be applied to
+     * all values.
+     */
+    private String trimWhitespace(String value) {
+        return StringUtils.trimListWhitespace(value);
+    }
+
     /**
      * Returns the value contents of the TypedProperty instance, converted to the correct type. The
      * return is always an array; for scalar values, it is an array of unit size. Commas in the
@@ -151,19 +154,18 @@ public Object getValueAsArray() {
     }
 
     private void validate() {
-        try {
-            getValueAsArray();
-        } catch (Exception e) {
-            throw new IllegalStateException(
-                "Unable to validate TypedProperty " + name + " with value " + stringValue
-                    + " and data type " + dataType.toString() + " with scalar == " + scalar,
-                e);
-        }
+        getValueAsArray();
+    }
+
+    // Note that equals() and hashCode(), as well as compareTo(), all rely solely on the name. This
+    // allows a Set of TypedProperty instances to act like a Map of name-value pairs (i.e., ensures
+    // that each name is unique in the Set). Use totalEquals() to compare all fields.
+
+    @Override
+    public int compareTo(TypedParameter other) {
+        return name.compareTo(other.name);
     }
 
-    // Note that equals() and hashCode() both rely solely on the name. This allows a Set of
-    // TypedProperty instances to act like a Map of name-value pairs (i.e., ensures that each name
-    // is unique in the Set).
     @Override
     public int hashCode() {
         return Objects.hash(name);
@@ -184,6 +186,17 @@ public boolean equals(Object obj) {
         return true;
     }
 
+    public boolean totalEquals(TypedParameter parameter) {
+        if (this == parameter) {
+            return true;
+        }
+        if (parameter == null) {
+            return false;
+        }
+        return dataType == parameter.dataType && Objects.equals(name, parameter.name)
+            && scalar == parameter.scalar && Objects.equals(stringValue, parameter.stringValue);
+    }
+
     @Override
     public String getName() {
         return name;
@@ -203,27 +216,11 @@ public String getString() {
      * private value member of AbstractProperty.
      */
     public void setString(String value) {
-        stringValue = value;
+        stringValue = trimWhitespace(value);
         validate();
         super.setValue(stringValue);
     }
 
-    /**
-     * Sets the contents of the {@link AbstractProperty} private value member. At the same time,
-     * sets the string value of this object.
-     */
-    @Override
-    public void setValue(Object value) {
-        if (value == null) {
-            setString(null);
-        } else if (isScalar()) {
-            setString(value.toString());
-        } else {
-            setString(ZiggyArrayUtils.arrayToString(value));
-        }
-        super.setValue(stringValue);
-    }
-
     /**
      * Returns the contents of the object's string value, converted to an appropriate scalar or
      * array value of the correct type. Note that this overrides the
@@ -263,7 +260,22 @@ public Object getValue() {
             dataType.setArrayMember(dataType.typedValue(s), returnArray, i);
         }
         return returnArray;
+    }
 
+    /**
+     * Sets the contents of the {@link AbstractProperty} private value member. At the same time,
+     * sets the string value of this object.
+     */
+    @Override
+    public void setValue(Object value) {
+        if (value == null) {
+            setString(null);
+        } else if (isScalar()) {
+            setString(value.toString());
+        } else {
+            setString(ZiggyArrayUtils.arrayToString(value));
+        }
+        super.setValue(stringValue);
     }
 
     public ZiggyDataType getDataType() {
@@ -330,21 +342,22 @@ public boolean isEditable() {
 
     @Override
     public void readFromObject(Object parametersInstance) {
-        if (!(parametersInstance instanceof DefaultParameters)) {
-            throw new IllegalArgumentException("Argument must be DefaultParameters instance");
+        if (!(parametersInstance instanceof Parameters)) {
+            throw new IllegalArgumentException("Argument must be Parameters instance");
         }
-        DefaultParameters defaultParameters = (DefaultParameters) parametersInstance;
-        TypedParameter typedProperty = defaultParameters.getParameter(name);
+        Parameters parameters = (Parameters) parametersInstance;
+        TypedParameter typedProperty = parameters.getParameter(name);
         setValue(typedProperty.getValue());
     }
 
     @Override
     public void writeToObject(Object parametersInstance) {
-        if (!(parametersInstance instanceof DefaultParameters)) {
-            throw new IllegalArgumentException("Argument must be DefaultParameters instance");
+        if (!(parametersInstance instanceof Parameters)) {
+            throw new IllegalArgumentException("Argument must be Parameters instance, not "
+                + parametersInstance.getClass().getSimpleName());
         }
-        DefaultParameters defaultParameters = (DefaultParameters) parametersInstance;
-        TypedParameter typedProperty = defaultParameters.getParameter(name);
+        Parameters parameters = (Parameters) parametersInstance;
+        TypedParameter typedProperty = parameters.getParameter(name);
         typedProperty.setValue(getValue());
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/TypedParameterCollection.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/TypedParameterCollection.java
index 031a2ce..f0f5fab 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/TypedParameterCollection.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/TypedParameterCollection.java
@@ -1,55 +1,82 @@
 package gov.nasa.ziggy.pipeline.definition;
 
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
-import com.l2fprod.common.propertysheet.PropertySheetPanel;
-
-import gov.nasa.ziggy.parameters.DefaultParameters;
+import gov.nasa.ziggy.module.io.ProxyIgnore;
+import gov.nasa.ziggy.parameters.Parameters;
 import gov.nasa.ziggy.uow.UnitOfWork;
 
 /**
  * Generic container for a collection of {@link TypedParameter} instances. Intended for use as the
- * superclass for other classes, see for example {@link DefaultParameters} and {@link UnitOfWork}.
+ * superclass for other classes, see for example {@link Parameters} and {@link UnitOfWork}.
  *
  * @author PT
  */
 public class TypedParameterCollection {
 
-    private Map<String, TypedParameter> typedProperties = new HashMap<>();
+    @ProxyIgnore
+    private Map<String, TypedParameter> parametersByName = new HashMap<>();
+
+    public TypedParameterCollection() {
+    }
 
+    public TypedParameterCollection(Collection<TypedParameter> parameters) {
+        setParameters(parameters);
+    }
+
+    /** Returns the parameters in this collection as a sorted set. */
     public Set<TypedParameter> getParameters() {
-        return new HashSet<>(typedProperties.values());
+        return new TreeSet<>(parametersByName.values());
     }
 
-    public void setParameters(Set<TypedParameter> parameters) {
-        Map<String, TypedParameter> parmap = new HashMap<>();
+    /** Returns a copy of all of the parameters in this collection as a sorted set. */
+    public Set<TypedParameter> getParametersCopy() {
+        Set<TypedParameter> parameters = new TreeSet<>();
+        for (TypedParameter parameter : parametersByName.values()) {
+            parameters.add(new TypedParameter(parameter));
+        }
+        return parameters;
+    }
+
+    public void setParameters(Collection<TypedParameter> parameters) {
+        parametersByName = new HashMap<>();
         for (TypedParameter parameter : parameters) {
-            parmap.put(parameter.getName(), parameter);
+            parametersByName.put(parameter.getName(), parameter);
         }
-        typedProperties = parmap;
     }
 
     public void addParameter(TypedParameter parameter) {
-        typedProperties.put(parameter.getName(), parameter);
+        parametersByName.put(parameter.getName(), parameter);
+    }
+
+    /** Returns the given parameter. */
+    public TypedParameter getParameter(String name) {
+        return parametersByName.get(name);
     }
 
-    public TypedParameter getParameter(String parName) {
-        return typedProperties.get(parName);
+    /** Returns the original map. */
+    public Map<String, TypedParameter> getParametersByName() {
+        return parametersByName;
     }
 
     /**
-     * Generates an array that has copies of all {@link TypedParameter} instances in this object.
-     * This is needed in support of the {@link PropertySheetPanel}).
+     * Performs a deep comparison of two {@link TypedParameterCollection} instances.
      */
-    public TypedParameter[] typedProperties() {
-        Set<TypedParameter> propertySet = new HashSet<>();
-        for (TypedParameter property : typedProperties.values()) {
-            propertySet.add(new TypedParameter(property));
+    public boolean totalEquals(TypedParameterCollection other) {
+        if (other == null || parametersByName.size() != other.parametersByName.size()) {
+            return false;
         }
-        return propertySet.toArray(new TypedParameter[0]);
-    }
 
+        for (Map.Entry<String, TypedParameter> entry : parametersByName.entrySet()) {
+            TypedParameter otherValue = other.parametersByName.get(entry.getKey());
+            if (otherValue == null || !otherValue.totalEquals(entry.getValue())) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/UniqueNameVersionPipelineComponent.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/UniqueNameVersionPipelineComponent.java
new file mode 100644
index 0000000..cecfb28
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/UniqueNameVersionPipelineComponent.java
@@ -0,0 +1,182 @@
+package gov.nasa.ziggy.pipeline.definition;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.definition.crud.UniqueNameVersionPipelineComponentCrud;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Version;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlTransient;
+
+/**
+ * Superclass for pipeline components that have the following features in common:
+ * <ol>
+ * <li>Each instance has a name, which is a {@link String}.
+ * <li>Each instance has a version, which is an int.
+ * <li>The combination of the name and the version must be unique in the component's database table.
+ * <li>Each instance has a boolean that indicates whether the instance has been used in a pipeline
+ * run (in which case the instance is said to be "locked").
+ * <li>Each instance has an int that is used by Hibernate for optimistic locking.
+ * </ol>
+ * <p>
+ * The components that meet the above criteria are {@link PipelineDefinition},
+ * {@link PipelineModuleDefinition}, and {@link ParameterSet}. The capabilities of this class aren't
+ * particularly exciting, but they allow for a bunch of common functionality to be located in a CRUD
+ * superclass.
+ *
+ * @see UniqueNameVersionPipelineComponentCrud .
+ * @author PT
+ */
+@XmlAccessorType(XmlAccessType.NONE)
+@MappedSuperclass
+@XmlTransient
+public abstract class UniqueNameVersionPipelineComponent<T extends UniqueNameVersionPipelineComponent<T>> {
+
+    private int version;
+
+    @XmlAttribute(required = true)
+    private String name;
+    private boolean locked;
+
+    /**
+     * Used by Hibernate to implement optimistic locking. This ensures that if two users are
+     * simultaneously editing an instance, when the second user goes to save values it won't allow
+     * that user's stale values to overwrite the changes made by the first user.
+     */
+    @Version
+    private int optimisticLockValue = 0;
+
+    public int getVersion() {
+        return version;
+    }
+
+    public boolean isLocked() {
+        return locked;
+    }
+
+    /**
+     * Locks the present instance. A locked instance is one that has been used in a pipeline. In
+     * order to preserve data accountability, a locked instance may not be edited or modified by the
+     * pipeline infrastructure. This method is used to lock an instance when it is first provided to
+     * a pipeline instance.
+     */
+    public void lock() {
+        locked = true;
+    }
+
+    public int getOptimisticLockValue() {
+        return optimisticLockValue;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    void setVersion(int version) {
+        this.version = version;
+    }
+
+    void setLocked(boolean locked) {
+        this.locked = locked;
+    }
+
+    public T rename(String name) {
+        T renamedInstance = newInstance();
+        renamedInstance.setName(name);
+        return renamedInstance;
+    }
+
+    @SuppressWarnings("unchecked")
+    /**
+     * Returns an unlocked version of the object. If the object is already unlocked, the object is
+     * returned. If it is locked, a shallow copy is returned that has the following properties:
+     * <ol>
+     * <li>The value of locked is set to false.
+     * <li>The database ID is null.
+     * <li>The version number is 1 greater than the version number of the current object.
+     * </ol>
+     * This provides a new version of the object that can be persisted as such, which leaves the
+     * existing, locked database instance untouched.
+     *
+     * @return
+     */
+    public T unlockedVersion() {
+        if (!isLocked()) {
+            return (T) this;
+        }
+        T unlockedVersion = newInstance();
+        unlockedVersion.setName(name);
+        unlockedVersion.setVersion(version + 1);
+        return unlockedVersion;
+    }
+
+    protected abstract void clearDatabaseId();
+
+    /**
+     * Determines whether two objects are identical. This is used to determine whether it is
+     * necessary for the CRUD merge() method to do anything at all. This is in contrast to
+     * {@link #equals}, which might limit the fields considered to ensure that a component of a
+     * given name, for example, is present in a set but once.
+     */
+    public abstract boolean totalEquals(Object other);
+
+    /**
+     * Constructs a renamed copy of the original object. Because the object is renamed, its version
+     * number is set to 0, its optimistic lock value is set to 0, and its locked status is false.
+     * This combination of features ensures that the copy doesn't get accidentally saved to the
+     * database as a new version of the original instance.
+     * <p>
+     * The method requires that the subclass of {@link UniqueNameVersionPipelineComponent} have a
+     * no-arg constructor and that its fields can be copied by the {@link Field#set(Object, Object)}
+     * method.
+     * <p>
+     * Note that the resulting copy is "shallow" in that, for fields that are class instances,
+     * collections, Maps, etc., the field in the copy will be a reference to the field in the
+     * original. Therefore, it is the responsibility of the user to ensure that when changes made to
+     * the copy are persisted, they do not result in unwanted changes to the original getting
+     * persisted.
+     */
+    @SuppressWarnings("unchecked")
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public T newInstance() {
+
+        try {
+            T copy = (T) this.getClass()
+                .getDeclaredConstructor((Class<?>[]) null)
+                .newInstance((Object[]) null);
+            Field[] fields = this.getClass().getDeclaredFields();
+            for (Field field : fields) {
+                if (Modifier.isFinal(field.getModifiers())) {
+                    continue;
+                }
+                field.setAccessible(true);
+                field.set(copy, field.get(this));
+            }
+            copy.setName("Copy of " + this.getName());
+            copy.setVersion(0);
+            copy.clearDatabaseId();
+            copy.setLocked(false);
+            return copy;
+        } catch (IllegalAccessException | InstantiationException | IllegalArgumentException
+            | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+            throw new PipelineException("Unable to construct copy of " + getClass().getName()
+                + " instance with name '" + getName(), e);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/DataFileTypeCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/DataFileTypeCrud.java
index c7aac44..cfd5c7a 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/DataFileTypeCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/DataFileTypeCrud.java
@@ -7,13 +7,13 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Projections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.data.management.DataFileType;
+import gov.nasa.ziggy.data.management.DataFileType_;
 import gov.nasa.ziggy.module.PipelineException;
 
 /**
@@ -21,30 +21,19 @@
  *
  * @author PT
  */
-public class DataFileTypeCrud extends AbstractCrud {
+public class DataFileTypeCrud extends AbstractCrud<DataFileType> {
 
     private static final Logger log = LoggerFactory.getLogger(DataFileTypeCrud.class);
 
     /**
      * Because the DataFileType encodes information about how each data file is stored in the
      * datastore, it is unsafe to update it -- it may cause the updated version to be unable to
-     * locate the data that's already in the datastore. For this reason, we override the
-     * createOrUpdate() method in AbstractCrud with one that simply throws an exception.
-     */
-    @Override
-    public void createOrUpdate(Object o) {
-        throw new PipelineException("Use of createOrUpdate in DataFileTypeCrud is forbidden");
-    }
-
-    /**
-     * Because the DataFileType encodes information about how each data file is stored in the
-     * datastore, it is unsafe to update it -- it may cause the updated version to be unable to
-     * locate the data that's already in the datastore. For this reason, we override the update()
+     * locate the data that's already in the datastore. For this reason, we override the merge()
      * method in AbstractCrud with one that simply throws an exception.
      */
     @Override
-    public void update(Object o) {
-        throw new PipelineException("Use of update in DataFileTypeCrud is forbidden");
+    public <T> T merge(T o) {
+        throw new PipelineException("Use of merge in DataFileTypeCrud is forbidden");
     }
 
     /**
@@ -55,7 +44,7 @@ public void update(Object o) {
      */
     @SuppressWarnings("unchecked")
     @Override
-    public void create(Collection<?> collection) {
+    public void persist(Collection<?> collection) {
         List<DataFileType> createdInstances = new ArrayList<>();
         List<String> existingNames = retrieveAllNames();
         if (existingNames == null) {
@@ -63,7 +52,7 @@ public void create(Collection<?> collection) {
         }
         final List<String> finalExistingNames = existingNames;
         List<DataFileType> validInstances = (List<DataFileType>) collection.stream()
-            .filter(s -> s instanceof DataFileType)
+            .filter(DataFileType.class::isInstance)
             .filter(s -> !finalExistingNames.contains(((DataFileType) s).getName()))
             .collect(Collectors.toList());
         if (validInstances.size() < collection.size()) {
@@ -72,26 +61,24 @@ public void create(Collection<?> collection) {
         }
         createdInstances.addAll(validInstances);
         log.info("Creating " + createdInstances.size() + " instances of DataFileType in database");
-        super.create(createdInstances);
+        super.persist(createdInstances);
         log.info("Created " + createdInstances.size() + " instances of DataFileType in database");
-
     }
 
     /**
      * Retrieves the names of all existing DataFileType instances.
      */
     public List<String> retrieveAllNames() {
-        Criteria criteria = createCriteria(DataFileType.class);
-        criteria.setProjection(Projections.property("name"));
-        return list(criteria);
+        ZiggyQuery<DataFileType, String> query = createZiggyQuery(DataFileType.class, String.class);
+        query.column(DataFileType_.name).select();
+        return list(query);
     }
 
     /**
      * Retrieves all DataFileType instances in the database.
      */
     public List<DataFileType> retrieveAll() {
-        Criteria criteria = createCriteria(DataFileType.class);
-        return list(criteria);
+        return list(createZiggyQuery(DataFileType.class));
     }
 
     /**
@@ -106,4 +93,9 @@ public Map<String, DataFileType> retrieveMap() {
         }
         return dataFileTypeMap;
     }
+
+    @Override
+    public Class<DataFileType> componentClass() {
+        return DataFileType.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/GroupCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/GroupCrud.java
index daf0734..f14ccf8 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/GroupCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/GroupCrud.java
@@ -2,12 +2,12 @@
 
 import java.util.List;
 
-import org.hibernate.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.crud.AbstractCrud;
 import gov.nasa.ziggy.pipeline.definition.Group;
+import gov.nasa.ziggy.pipeline.definition.Group_;
 import gov.nasa.ziggy.services.database.DatabaseService;
 
 /**
@@ -15,7 +15,7 @@
  *
  * @author Todd Klaus
  */
-public class GroupCrud extends AbstractCrud {
+public class GroupCrud extends AbstractCrud<Group> {
     @SuppressWarnings("unused")
     private static final Logger log = LoggerFactory.getLogger(GroupCrud.class);
 
@@ -27,8 +27,11 @@ public GroupCrud(DatabaseService databaseService) {
     }
 
     public List<Group> retrieveAll() {
-        Query q = createQuery("from Group order by name asc");
-        return list(q);
+        return list(createZiggyQuery(Group.class).column(Group_.name).ascendingOrder());
     }
 
+    @Override
+    public Class<Group> componentClass() {
+        return Group.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/HasExternalIdCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/HasExternalIdCrud.java
index 769459b..23a546b 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/HasExternalIdCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/HasExternalIdCrud.java
@@ -2,12 +2,12 @@
 
 import java.util.List;
 
-import org.hibernate.Query;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.crud.AbstractCrudInterface;
-import gov.nasa.ziggy.crud.HibernateClassCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.pipeline.definition.HasExternalId;
 
 /**
@@ -15,8 +15,7 @@
  *
  * @author Miles Cote
  */
-public interface HasExternalIdCrud<T extends HasExternalId>
-    extends AbstractCrudInterface, HibernateClassCrud<T> {
+public interface HasExternalIdCrud<T extends HasExternalId> extends AbstractCrudInterface<T> {
     /**
      * All receivables are written by DR, and the origin for DR writes is 0.
      */
@@ -35,11 +34,10 @@ default T retrieveByExternalId(int externalId) {
         Logger log = LoggerFactory.getLogger(HasExternalIdCrud.class);
         log.info(getClass().getSimpleName() + " retrieving for externalId " + externalId);
 
-        Query q = createQuery("from " + getHibernateClassName() + " where "
-            + getExternalIdFieldName() + " = :externalIdParam ");
-        q.setParameter("externalIdParam", externalId);
+        ZiggyQuery<T, T> query = createZiggyQuery(componentClass());
+        query.column(getExternalIdFieldName()).in(externalId);
 
-        return uniqueResult(q);
+        return finalize(uniqueResult(query));
     }
 
     /**
@@ -48,12 +46,9 @@ default T retrieveByExternalId(int externalId) {
     default T retrieveByMaxExternalId() {
         Logger log = LoggerFactory.getLogger(HasExternalIdCrud.class);
         log.info(getClass().getSimpleName() + " retrieving for max externalId");
-
-        Query q = createQuery("from " + getHibernateClassName() + " where "
-            + getExternalIdFieldName() + " in (select max(" + getExternalIdFieldName() + ") from "
-            + getHibernateClassName() + ")");
-
-        return uniqueResult(q);
+        ZiggyQuery<T, T> query = createZiggyQuery(componentClass());
+        query.column(getExternalIdFieldName()).in(retrieveMaxExternalId());
+        return finalize(uniqueResult(query));
     }
 
     /**
@@ -62,12 +57,11 @@ default T retrieveByMaxExternalId() {
      * @return max ID of the object type, or -1 if no objects of the type are currently in the
      * database.
      */
-    default int retriveMaxExternalId() {
-        Query q = createQuery("select " + getExternalIdFieldName() + " from "
-            + getHibernateClassName() + " where " + getExternalIdFieldName() + " in (select max("
-            + getExternalIdFieldName() + ") from " + getHibernateClassName() + ")");
+    default int retrieveMaxExternalId() {
+        ZiggyQuery<T, Integer> maxIdQuery = createZiggyQuery(componentClass(), Integer.class);
+        maxIdQuery.column(getExternalIdFieldName()).max();
+        Integer maxId = uniqueResult(maxIdQuery);
 
-        Integer maxId = uniqueResult(q);
         if (maxId == null) {
             return -1;
         }
@@ -75,13 +69,12 @@ default int retriveMaxExternalId() {
     }
 
     default boolean idInDatabase(int idNumber) {
-        Query q = createQuery(
-            "select " + getExternalIdFieldName() + " from " + getHibernateClassName());
-        List<Integer> ids = list(q);
-        if (ids == null || ids.isEmpty()) {
+        ZiggyQuery<T, Integer> query = createZiggyQuery(componentClass(), Integer.class);
+        query.column(getExternalIdFieldName()).select();
+        List<Integer> ids = list(query);
+        if (CollectionUtils.isEmpty(ids)) {
             return false;
         }
         return ids.contains(Integer.valueOf(idNumber));
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ModelCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ModelCrud.java
index 9cfb8fe..d7ffe2f 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ModelCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ModelCrud.java
@@ -4,13 +4,13 @@
 import java.util.List;
 import java.util.Map;
 
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.pipeline.definition.ModelMetadata;
 import gov.nasa.ziggy.pipeline.definition.ModelRegistry;
+import gov.nasa.ziggy.pipeline.definition.ModelRegistry_;
 import gov.nasa.ziggy.pipeline.definition.ModelType;
+import gov.nasa.ziggy.pipeline.definition.ModelType_;
 
 /**
  * CRUD class for model registries and model metadata instances. Each model metadata instance
@@ -22,21 +22,29 @@
  *
  * @author PT
  */
-public class ModelCrud extends AbstractCrud {
+public class ModelCrud extends AbstractCrud<ModelRegistry> {
 
     /**
      * Retrieves the current registry (the registry with the highest ID number). If no registry
      * exists in the database, a new, empty registry is created and returned.
      */
     public ModelRegistry retrieveCurrentRegistry() {
-        Query query = createQuery(
-            "from ModelRegistry where id in (select max(id) from ModelRegistry)");
-        ModelRegistry modelRegistry = uniqueResult(query);
-        if (modelRegistry == null) {
-            modelRegistry = new ModelRegistry();
-            create(modelRegistry);
+
+        // I don't know how to do this in 1 query so I'll use 2.
+        // TODO: reformat as subquery.
+        ZiggyQuery<ModelRegistry, Long> idQuery = createZiggyQuery(ModelRegistry.class, Long.class);
+        idQuery.column(ModelRegistry_.id).max();
+        Long maxId = uniqueResult(idQuery);
+        if (maxId == null) {
+            ModelRegistry modelRegistry = new ModelRegistry();
+            persist(modelRegistry);
+            return modelRegistry;
         }
-        return modelRegistry;
+
+        ZiggyQuery<ModelRegistry, ModelRegistry> query = createZiggyQuery(ModelRegistry.class);
+        query.column(ModelRegistry_.id).in(maxId);
+
+        return uniqueResult(query);
     }
 
     /**
@@ -48,7 +56,7 @@ public ModelRegistry retrieveUnlockedRegistry() {
         ModelRegistry modelRegistry = retrieveCurrentRegistry();
         if (modelRegistry.isLocked()) {
             modelRegistry = new ModelRegistry(modelRegistry);
-            create(modelRegistry);
+            persist(modelRegistry);
         }
         return modelRegistry;
     }
@@ -63,10 +71,10 @@ public ModelRegistry lockCurrentRegistry() {
         Map<ModelType, ModelMetadata> models = modelRegistry.getModels();
         for (ModelMetadata metadata : models.values()) {
             metadata.lock();
-            update(metadata);
+            merge(metadata);
         }
         modelRegistry.lock();
-        update(modelRegistry);
+        merge(modelRegistry);
         flush();
         return modelRegistry;
     }
@@ -75,8 +83,7 @@ public ModelRegistry lockCurrentRegistry() {
      * Retrieves all model types in the database.
      */
     public List<ModelType> retrieveAllModelTypes() {
-        Criteria criteria = createCriteria(ModelType.class);
-        return list(criteria);
+        return list(createZiggyQuery(ModelType.class));
     }
 
     /**
@@ -92,10 +99,25 @@ public Map<String, ModelType> retrieveModelTypeMap() {
         return modelTypeMap;
     }
 
+    /**
+     * Retrieves a {@link ModelType} based on the type string of the instance.
+     *
+     * @param type
+     * @return
+     */
+    public ModelType retrieveModelType(String type) {
+        return uniqueResult(createZiggyQuery(ModelType.class).column(ModelType_.type).in(type));
+    }
+
     /**
      * Retrieves the ID of the current unlocked model registry.
      */
     public long retrieveUnlockedRegistryId() {
         return retrieveUnlockedRegistry().getId();
     }
+
+    @Override
+    public Class<ModelRegistry> componentClass() {
+        return ModelRegistry.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ParameterSetCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ParameterSetCrud.java
index 9198d40..ce9192f 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ParameterSetCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ParameterSetCrud.java
@@ -2,22 +2,16 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.hibernate.Query;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.module.remote.RemoteParameters;
 import gov.nasa.ziggy.parameters.InternalParameters;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet_;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.services.database.DatabaseService;
 
 /**
  * Provides CRUD methods for {@link ParameterSet}. Note: methods that return all parameter sets will
@@ -28,42 +22,14 @@
  * @author Todd Klaus
  * @author PT
  */
-public class ParameterSetCrud extends AbstractCrud {
-    private static final Logger log = LoggerFactory.getLogger(ParameterSetCrud.class);
+public class ParameterSetCrud extends UniqueNameVersionPipelineComponentCrud<ParameterSet> {
 
     public ParameterSetCrud() {
     }
 
-    public ParameterSetCrud(DatabaseService databaseService) {
-        super(databaseService);
-    }
-
-    public List<ParameterSet> retrieveAllVersionsForName(String name) {
-        Query q = createQuery("from ParameterSetName p where p.name = :name");
-        q.setString("name", name);
-        q.setMaxResults(1);
-
-        ParameterSetName parameterSetName = uniqueResult(q);
-
-        if (parameterSetName == null) {
-            return new ArrayList<>();
-        }
-
-        q = createQuery("from ParameterSet p where p.name = :name order by version asc");
-        q.setEntity("name", parameterSetName);
-
-        List<ParameterSet> result = list(q);
-        populateXmlFields(result);
-
-        return result;
-    }
-
     public List<ParameterSet> retrieveAll() {
-        Query q = createQuery("from ParameterSet p order by name asc");
-
-        List<ParameterSet> result = list(q);
+        List<ParameterSet> result = list(createZiggyQuery(ParameterSet.class));
         populateXmlFields(result);
-
         return visibleParameterSets(result);
     }
 
@@ -73,122 +39,14 @@ public List<ParameterSet> visibleParameterSets(List<ParameterSet> allParameterSe
             .collect(Collectors.toList());
     }
 
-    public ParameterSet retrieveLatestVersionForName(String name) {
-        Query q = createQuery("from ParameterSetName p where p.name = :name");
-        q.setString("name", name);
-        q.setMaxResults(1);
-        ParameterSetName parameterSetName = uniqueResult(q);
-
-        if (parameterSetName == null) {
-            log.debug("No ParameterSetName found for name = " + name);
-            return null;
-        }
-
-        ParameterSet result = retrieveLatestVersionForName(parameterSetName);
-        populateXmlFields(result);
-        return result;
-    }
-
     public ParameterSet retrieve(long id) {
-        Query q = createQuery("from ParameterSet p where p.id = :id");
-        q.setLong("id", id);
-        q.setMaxResults(1);
-
-        ParameterSet result = uniqueResult(q);
+        ZiggyQuery<ParameterSet, ParameterSet> query = createZiggyQuery(ParameterSet.class);
+        query.column(ParameterSet_.id).in(id);
+        ParameterSet result = uniqueResult(query);
         populateXmlFields(result);
         return result;
     }
 
-    public ParameterSet retrieveLatestVersionForName(ParameterSetName name) {
-        Query q = createQuery("from ParameterSet pmps where pmps.name = :name order by id desc");
-        q.setEntity("name", name);
-        q.setMaxResults(1);
-
-        ParameterSet result = uniqueResult(q);
-        populateXmlFields(result);
-        return result;
-    }
-
-    public List<ParameterSet> retrieveLatestVersions() {
-        Query q = createQuery("from ParameterSetName order by name");
-
-        List<ParameterSetName> names = list(q);
-
-        List<ParameterSet> results = new ArrayList<>();
-
-        for (ParameterSetName name : names) {
-            ParameterSet latestVersion = retrieveLatestVersionForName(name);
-
-            if (latestVersion != null) {
-                results.add(latestVersion);
-            } else {
-                log.debug("no versions found for name = " + name);
-            }
-        }
-        populateXmlFields(results);
-        return visibleParameterSets(results);
-    }
-
-    public void rename(ParameterSet parameterSet, String newName) {
-        String oldName = parameterSet.getName().getName();
-
-        // first, create the new name in PI_PS_NAME
-        ParameterSetName newNameEntity = new ParameterSetName(newName);
-        create(newNameEntity);
-
-        // flush these changes so the updates below will see them
-        flush();
-
-        /*
-         * @formatter:off
-         *
-         * second, update all references to the old name
-         * This includes:
-         *  TriggerDefinition (via PI_TD_PSN)
-         *  TriggerDefinitionNode (via PI_TDN_MPS)
-         *  PipelineInstance (via PI_INSTANCE_PS)
-         *  PipelineInstanceNode (via PI_PIN_PI_MPS)
-         *
-         * @formatter:on
-         */
-        Query updateQuery1 = createSQLQuery(
-            "update PI_PS set PI_PS_NAME_NAME = :newName where " + "PI_PS_NAME_NAME = :oldName");
-        updateQuery1.setParameter("newName", newName);
-        updateQuery1.setParameter("oldName", oldName);
-
-        int updatedRows = updateQuery1.executeUpdate();
-
-        log.debug("Updated " + updatedRows + " rows in PI_PS");
-
-        Query updateQuery2 = createSQLQuery("update PI_TD_PSN set PI_PS_NAME_NAME = :newName where "
-            + "PI_PS_NAME_NAME = :oldName");
-        updateQuery2.setParameter("newName", newName);
-        updateQuery2.setParameter("oldName", oldName);
-
-        updatedRows = updateQuery2.executeUpdate();
-
-        log.debug("Updated " + updatedRows + " rows in PI_TD_PSN");
-
-        Query updateQuery3 = createSQLQuery(
-            "update PI_TDN_MPS set PI_PS_NAME_NAME = :newName where "
-                + "PI_PS_NAME_NAME = :oldName");
-        updateQuery3.setParameter("newName", newName);
-        updateQuery3.setParameter("oldName", oldName);
-
-        updatedRows = updateQuery3.executeUpdate();
-
-        log.debug("Updated " + updatedRows + " rows in PI_TDN_MPS");
-
-        // flush these changes so the delete below will not fail due to a foreign key
-        // constraint violation
-        flush();
-
-        Query deleteQuery = createSQLQuery("delete from PI_PS_NAME where NAME = :oldName");
-        deleteQuery.setParameter("oldName", oldName);
-        int deletedRows = deleteQuery.executeUpdate();
-        log.debug("Deleted " + deletedRows + " rows in PI_PS_NAME");
-    }
-
     /**
      * Retrieves the latest {@link RemoteParameters} from the database. These may be later than
      * those associated with the task to allow restarting the task with modified parameters.
@@ -203,7 +61,7 @@ public RemoteParameters retrieveRemoteParameters(PipelineTask pipelineTask) {
         if (parameterSet == null) {
             return null;
         }
-        ParameterSetName name = parameterSet.getName();
+        String name = parameterSet.getName();
         ParameterSet latestParameterSet = retrieveLatestVersionForName(name);
 
         return latestParameterSet.parametersInstance();
@@ -225,7 +83,7 @@ public int retrieveRemoteParameterVersionNumber(PipelineTask pipelineTask) {
         if (parameterSet == null) {
             return -1;
         }
-        ParameterSetName name = parameterSet.getName();
+        String name = parameterSet.getName();
         ParameterSet latestParameterSet = retrieveLatestVersionForName(name);
 
         return latestParameterSet.getVersion();
@@ -246,9 +104,20 @@ private void populateXmlFields(ParameterSet result) {
      * ensures that the instances have their XML and database fields consistent with each other upon
      * retrieval from the database.
      */
-    private void populateXmlFields(Collection<ParameterSet> results) {
+    @Override
+    protected void populateXmlFields(Collection<ParameterSet> results) {
         for (ParameterSet result : results) {
             populateXmlFields(result);
         }
     }
+
+    @Override
+    public String componentNameForExceptionMessages() {
+        return "parameter set";
+    }
+
+    @Override
+    public Class<ParameterSet> componentClass() {
+        return ParameterSet.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionCrud.java
index a8cb241..e5617d4 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionCrud.java
@@ -1,118 +1,44 @@
 package gov.nasa.ziggy.pipeline.definition.crud;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import org.hibernate.HibernateException;
-import org.hibernate.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
+import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinition_;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.services.database.DatabaseService;
 
 /**
  * Provides CRUD methods for {@link PipelineDefinition}
  *
  * @author Todd Klaus
+ * @author PT
  */
-public class PipelineDefinitionCrud extends AbstractCrud {
+public class PipelineDefinitionCrud
+    extends UniqueNameVersionPipelineComponentCrud<PipelineDefinition> {
     private static final Logger log = LoggerFactory.getLogger(PipelineDefinitionCrud.class);
 
     public PipelineDefinitionCrud() {
     }
 
-    public PipelineDefinitionCrud(DatabaseService databaseService) {
-        super(databaseService);
-    }
-
     public List<PipelineDefinition> retrieveAll() {
-        Query query = createQuery("from PipelineDefinition");
-
-        return list(query);
+        return list(createZiggyQuery(PipelineDefinition.class));
     }
 
-    private static void populateXmlFields(Collection<PipelineDefinition> results) {
+    @Override
+    protected void populateXmlFields(Collection<PipelineDefinition> results) {
         for (PipelineDefinition result : results) {
             result.populateXmlFields();
         }
     }
 
-    public List<PipelineDefinition> retrieveAllVersionsForName(String name) {
-        Query q = createQuery("from PipelineDefinitionName m where m.name = :name");
-        q.setString("name", name);
-        q.setMaxResults(1);
-
-        PipelineDefinitionName pipelineDefName = uniqueResult(q);
-
-        if (pipelineDefName == null) {
-            return new ArrayList<>();
-        }
-
-        q = createQuery("from PipelineDefinition pd where pd.name = :name order by version asc");
-        q.setEntity("name", pipelineDefName);
-
-        List<PipelineDefinition> results = list(q);
-        populateXmlFields(results);
-        return results;
-    }
-
-    public PipelineDefinition retrieveLatestVersionForName(String name) {
-        Query q = createQuery("from PipelineDefinitionName where name = :name");
-        q.setString("name", name);
-        q.setMaxResults(1);
-        PipelineDefinitionName pipelineDefName = uniqueResult(q);
-
-        if (pipelineDefName == null) {
-            log.warn("No PipelineDefinitionName found for name = " + name);
-            return null;
-        }
-
-        return retrieveLatestVersionForName(pipelineDefName);
-    }
-
-    public PipelineDefinition retrieveLatestVersionForName(PipelineDefinitionName name) {
-        Query q = createQuery("from PipelineDefinition where name = :name order by version desc");
-        q.setEntity("name", name);
-        q.setMaxResults(1);
-
-        PipelineDefinition result = uniqueResult(q);
-        result.populateXmlFields();
-        return result;
-    }
-
-    public List<PipelineDefinition> retrieveLatestVersions() {
-        Query q = createQuery("from PipelineDefinitionName order by name");
-
-        List<PipelineDefinitionName> names = list(q);
-
-        List<PipelineDefinition> results = new ArrayList<>();
-
-        for (PipelineDefinitionName name : names) {
-            results.add(retrieveLatestVersionForName(name));
-        }
-
-        return results;
-    }
-
-    /**
-     * Retrieves the unique list of names of all {@link PipelineDefinition}s.
-     *
-     * @return a non-{@code null} list of {@link PipelineDefinition} names.
-     * @throws HibernateException if there were problems accessing the database.
-     */
-    public List<String> retrievePipelineDefinitionNames() {
-        Query query = createQuery("select name from PipelineDefinitionName " + "order by name asc");
-
-        return list(query);
-    }
-
     /**
      * Retrieves the names of all {@link PipelineDefinition}s that are associated with
      * {@link PipelineInstance}s.
@@ -121,10 +47,11 @@ public List<String> retrievePipelineDefinitionNames() {
      * @throws HibernateException if there were problems accessing the database.
      */
     public List<String> retrievePipelineDefinitionNamesInUse() {
-        Query query = createQuery(
-            "select distinct pdn.name from PipelineDefinitionName pdn, PipelineInstance pinst "
-                + "where pdn.name = pinst.pipelineDefinition.name order by pdn.name asc");
-
+        ZiggyQuery<PipelineDefinition, String> query = createZiggyQuery(PipelineDefinition.class,
+            String.class);
+        query.column(PipelineDefinition_.NAME).select();
+        query.column(PipelineDefinition_.LOCKED).in(true);
+        query.distinct(true);
         return list(query);
     }
 
@@ -137,26 +64,27 @@ public void deleteAllVersionsForName(String name) {
         }
     }
 
-    public void deletePipeline(PipelineDefinition pipeline) {
+    public void deletePipeline(PipelineDefinition pipelineDefinition) {
         /*
          * Must delete the nodes before deleting the pipeline because the cascade rules do not
          * include delete (having Cascade.ALL would cause errors in the console when manually
          * deleting individual nodes)
          */
-        deleteNodes(pipeline.getRootNodes());
-
-        delete(pipeline);
+        if (pipelineDefinition.isLocked()) {
+            throw new PipelineException("Cannot delete locked version "
+                + pipelineDefinition.getVersion() + " of pipeline " + pipelineDefinition.getName());
+        }
+        deleteNodes(pipelineDefinition.getRootNodes());
+        remove(pipelineDefinition);
     }
 
     /**
      * Delete all of the nodes in a pipeline and clear the rootNodes List.
-     *
-     * @param pipeline
      */
-    public void deleteAllPipelineNodes(PipelineDefinition pipeline) {
-        List<PipelineDefinitionNode> rootNodes = pipeline.getRootNodes();
+    public void deleteAllPipelineNodes(PipelineDefinition pipelineDefinition) {
+        List<PipelineDefinitionNode> rootNodes = pipelineDefinition.getRootNodes();
         deleteNodes(rootNodes);
-        pipeline.setRootNodes(Collections.emptyList());
+        pipelineDefinition.setRootNodes(Collections.emptyList());
     }
 
     /**
@@ -167,47 +95,17 @@ public void deleteAllPipelineNodes(PipelineDefinition pipeline) {
     private void deleteNodes(List<PipelineDefinitionNode> nodes) {
         for (PipelineDefinitionNode node : nodes) {
             deleteNodes(node.getNextNodes());
-            delete(node);
+            remove(node);
         }
     }
 
-    public void rename(PipelineDefinition pipelineDef, String newName) {
-        String oldName = pipelineDef.getName().getName();
-
-        // first, create the new name in PI_PD_NAME
-        PipelineDefinitionName newNameEntity = new PipelineDefinitionName(newName);
-        create(newNameEntity);
-
-        // flush these changes so the updates below will see them
-        flush();
-
-        /*
-         * @formatter:off
-         *
-         * second, update all references to the old name
-         * This includes:
-         *   PipelineDefinition
-         *
-         * @formatter:on
-         */
-        Query updateQuery1 = createSQLQuery(
-            "update PI_PIPELINE_DEF set PI_PD_NAME_NAME = :newName where "
-                + "PI_PD_NAME_NAME = :oldName");
-        updateQuery1.setParameter("newName", newName);
-        updateQuery1.setParameter("oldName", oldName);
-
-        int updatedRows = updateQuery1.executeUpdate();
-
-        log.debug("Updated " + updatedRows + " rows in PI_PIPELINE_DEF");
-
-        // flush these changes so the delete below will not fail due to a foreign key
-        // constraint violation
-        flush();
-
-        Query deleteQuery = createSQLQuery("delete from PI_PD_NAME where NAME = :oldName");
-        deleteQuery.setParameter("oldName", oldName);
-        int deletedRows = deleteQuery.executeUpdate();
-        log.debug("Deleted " + deletedRows + " rows in PI_PD_NAME");
+    @Override
+    public String componentNameForExceptionMessages() {
+        return "pipeline definition";
     }
 
+    @Override
+    public Class<PipelineDefinition> componentClass() {
+        return PipelineDefinition.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionNodeCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionNodeCrud.java
new file mode 100644
index 0000000..dfedd88
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionNodeCrud.java
@@ -0,0 +1,21 @@
+package gov.nasa.ziggy.pipeline.definition.crud;
+
+import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+
+/**
+ * CRUD class for {@link PipelineDefinitionNode}.
+ * <p>
+ * The PipelineDefinitionNode requires only the generic CRUD features like
+ * {@link AbstractCrud#persist(Object)} and {@link AbstractCrud#merge(Object)}. Thus no other
+ * class-specific methods are defined here.
+ *
+ * @author PT
+ */
+public class PipelineDefinitionNodeCrud extends AbstractCrud<PipelineDefinitionNode> {
+
+    @Override
+    public Class<PipelineDefinitionNode> componentClass() {
+        return PipelineDefinitionNode.class;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceCrud.java
index 11b9026..aec5838 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceCrud.java
@@ -4,31 +4,38 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
-import org.hibernate.Criteria;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.Query;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance.State;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstanceAggregateState;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode_;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance_;
+import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition_;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask_;
 import gov.nasa.ziggy.services.database.DatabaseService;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Root;
 
 /**
  * Provides CRUD methods for {@link PipelineInstance}.
  *
  * @author Todd Klaus
  */
-public class PipelineInstanceCrud extends AbstractCrud {
+public class PipelineInstanceCrud extends AbstractCrud<PipelineInstance> {
     private static final Logger log = LoggerFactory.getLogger(PipelineInstanceCrud.class);
 
+    private static final long MILLIS_PER_DAY = 24 * 60 * 60 * 1000;
+
     public PipelineInstanceCrud() {
     }
 
@@ -37,10 +44,11 @@ public PipelineInstanceCrud(DatabaseService databaseService) {
     }
 
     public PipelineInstance retrieve(long id) {
-        Query query = createQuery("from PipelineInstance where id = :id");
-        query.setLong("id", id);
-        PipelineInstance instance = uniqueResult(query);
-        populateXmlFields(instance);
+        PipelineInstance instance = uniqueResult(
+            createZiggyQuery(PipelineInstance.class).column(PipelineInstance_.id).in(id));
+        if (instance != null) {
+            populateXmlFields(instance);
+        }
         return instance;
     }
 
@@ -50,11 +58,7 @@ public PipelineInstance retrieve(long id) {
      * @return
      */
     public List<PipelineInstance> retrieve(PipelineInstanceFilter filter) {
-        Query q = filter.query(getSession());
-
-        q.setLockMode("pi", LockMode.READ);
-
-        List<PipelineInstance> result = list(q);
+        List<PipelineInstance> result = list(queryForFilter(filter));
         populateXmlFields(result);
         return result;
     }
@@ -64,12 +68,10 @@ public List<PipelineInstance> retrieve(PipelineInstanceFilter filter) {
      * (highest to lowest)
      */
     public List<PipelineInstance> retrieve(Date startDate, Date endDate) {
-        Query q = createQuery(
-            "from PipelineInstance pi " + "where pi.startProcessingTime >= :startDate "
-                + "and pi.startProcessingTime <= :endDate " + "order by priority desc");
-        q.setParameter("startDate", startDate);
-        q.setParameter("endDate", endDate);
-        List<PipelineInstance> result = list(q);
+        ZiggyQuery<PipelineInstance, PipelineInstance> query = createZiggyQuery(
+            PipelineInstance.class);
+        query.column(PipelineInstance_.startProcessingTime).between(startDate, endDate);
+        List<PipelineInstance> result = list(query);
         populateXmlFields(result);
         return result;
     }
@@ -87,17 +89,14 @@ public List<PipelineInstance> retrieve(Date startDate, Date endDate) {
      */
     public List<PipelineInstance> retrieve(Date startDate, Date endDate, State[] states,
         String[] types) {
-        // We found that a clean Criteria query would return a huge
+        // We found that a Hibernate Criteria query would return a huge
         // n-dimensional Cartesian product. The following code trades a huge
         // number of joins with an n+1 select (but n is usually pretty small).
+        // We're now using JPA Criteria instead of Hibernate, but for now
+        // we are sticking with the same 2 step process.
 
         // First, get all the instances within the date range.
-        Query query = createQuery(
-            "from PipelineInstance " + "where startProcessingTime >= :startDate "
-                + "and startProcessingTime <= :endDate " + "order by id asc");
-        query.setParameter("startDate", startDate);
-        query.setParameter("endDate", endDate);
-        List<PipelineInstance> result = list(query);
+        List<PipelineInstance> result = retrieve(startDate, endDate);
 
         // Now, choose those instances that match the additional criteria.
         List<PipelineInstance> filteredResult = new ArrayList<>();
@@ -130,10 +129,9 @@ public List<PipelineInstance> retrieve(Date startDate, Date endDate, State[] sta
     /**
      */
     public List<PipelineInstance> retrieveAll() {
-        Query q = createQuery("from PipelineInstance pi order by pi.id asc");
-        q.setLockMode("pi", LockMode.READ);
 
-        List<PipelineInstance> result = list(q);
+        List<PipelineInstance> result = list(
+            createZiggyQuery(PipelineInstance.class).column(PipelineInstance_.id).ascendingOrder());
         populateXmlFields(result);
         return result;
     }
@@ -142,12 +140,13 @@ public List<PipelineInstance> retrieveAll() {
      * Return all active pipeline instances, sorted by priority (highest to lowest)
      */
     public List<PipelineInstance> retrieveAllActive() {
-        Query q = createQuery("from PipelineInstance pi where pi.state = :processing "
-            + "or pi.state = :errorsrunning " + "order by priority desc");
-        q.setParameter("processing", PipelineInstance.State.PROCESSING);
-        q.setParameter("errorsrunning", PipelineInstance.State.ERRORS_RUNNING);
+        ZiggyQuery<PipelineInstance, PipelineInstance> query = createZiggyQuery(
+            PipelineInstance.class);
+        query.column(PipelineInstance_.state)
+            .in(Set.of(PipelineInstance.State.PROCESSING, PipelineInstance.State.ERRORS_RUNNING));
+        query.column(PipelineInstance_.priority).descendingOrder();
+        List<PipelineInstance> result = list(query);
 
-        List<PipelineInstance> result = list(q);
         populateXmlFields(result);
         return result;
     }
@@ -173,14 +172,14 @@ public void cancelAllActive() {
      * @return {@link List} of {@link PipelineInstance}s.
      */
     public List<PipelineInstance> retrieveAll(Collection<Long> pipelineInstanceIds) {
-        List<PipelineInstance> pipelineInstances = new ArrayList<>();
-        if (!pipelineInstanceIds.isEmpty()) {
-            Query query = createQuery(
-                "from PipelineInstance where id in (:pipelineInstanceIds) " + "order by id asc");
-            query.setParameterList("pipelineInstanceIds", pipelineInstanceIds);
-
-            pipelineInstances = list(query);
+        if (pipelineInstanceIds.isEmpty()) {
+            return new ArrayList<>();
         }
+        ZiggyQuery<PipelineInstance, PipelineInstance> query = createZiggyQuery(
+            PipelineInstance.class);
+        query.column(PipelineInstance_.id).in(pipelineInstanceIds).ascendingOrder();
+        List<PipelineInstance> pipelineInstances = list(query);
+
         populateXmlFields(pipelineInstances);
         return pipelineInstances;
     }
@@ -204,71 +203,59 @@ private void populateXmlFields(Collection<PipelineInstance> instances) {
      * @param newName
      */
     public void updateName(long id, String newName) {
-        Query updateQuery = createSQLQuery(
-            "update PI_PIPELINE_INSTANCE pi " + "set name = :newName where id = :id");
-
-        updateQuery.setString("newName", newName);
-        updateQuery.setLong("id", id);
-
-        int rowsUpdated = updateQuery.executeUpdate();
+        HibernateCriteriaBuilder builder = createCriteriaBuilder();
+        CriteriaUpdate<PipelineInstance> query = builder
+            .createCriteriaUpdate(PipelineInstance.class);
+        Root<PipelineInstance> root = query.from(PipelineInstance.class);
+        query.where(builder.in(root.get("id"), Set.of(id))).set(root.get("name"), newName);
+        int rowsUpdated = executeUpdate(query);
 
         log.info("Updated instance name, rowsUpdated=" + rowsUpdated);
     }
 
     /**
-     * Indicates whether all {@link PipelineTask}s for this {@link PipelineInstance} are in the
-     * PipelineTask.State.COMPLETED state
-     *
-     * @param instance
+     * Returns all pipeline instances in which a specified pipeline module was run.
      */
-    public PipelineInstanceAggregateState instanceState(PipelineInstance instance) {
-        // flush changes so that the updateInstanceState query will see them.
-        flush();
-
-        Query q = createQuery(
-            "select new gov.nasa.ziggy.pipeline.definition.PipelineInstanceAggregateState(sum(instanceNode.numTasks), sum(instanceNode.numSubmittedTasks), sum(instanceNode.numCompletedTasks), "
-                + "sum(instanceNode.numFailedTasks)) from PipelineInstanceNode instanceNode where pipelineInstance "
-                + "= :instance");
-        q.setEntity("instance", instance);
-
-        PipelineInstanceAggregateState state = uniqueResult(q);
+    public List<PipelineInstance> instanceIdsForModule(String moduleName) {
+        ZiggyQuery<PipelineTask, PipelineInstance> query = createZiggyQuery(PipelineTask.class,
+            PipelineInstance.class);
+        query.getCriteriaQuery()
+            .where(query.in(query.get(PipelineTask_.pipelineInstanceNode)
+                .get(PipelineInstanceNode_.pipelineModuleDefinition)
+                .get(PipelineModuleDefinition_.name), moduleName));
+        query.column(PipelineTask_.pipelineInstance).select().distinct(true);
+        return list(query);
+    }
 
-        log.debug(state.toString());
+    private ZiggyQuery<PipelineInstance, PipelineInstance> queryForFilter(
+        PipelineInstanceFilter filter) {
+        ZiggyQuery<PipelineInstance, PipelineInstance> query = createZiggyQuery(
+            PipelineInstance.class);
 
-        return state;
-    }
+        // If the user wants to filter by state, apply that now.
+        if (!CollectionUtils.isEmpty(filter.getStates())) {
+            query.column(PipelineInstance_.state).in(filter.getStates());
+        }
 
-    /**
-     * Indicates whether all {@link PipelineTask}s for this {@link PipelineInstance} are in the
-     * PipelineTask.State.COMPLETED state, without considering the specified ignoredTask. This is
-     * used by the transition logic to see if all tasks other than the one for which the transition
-     * logic is acting on (which is about to become completed) have completed.
-     *
-     * @param instance
-     */
-    public boolean isInstanceComplete(PipelineInstance instance, PipelineTask ignoredTask) {
-        Query q = createQuery("select count(*) from PipelineTask pt where pipelineInstance "
-            + "= :instance and state not in (:state1, :state2) and id <> :id");
-        q.setEntity("instance", instance);
-        q.setLong("id", ignoredTask.getId());
-        q.setParameter("state1", PipelineTask.State.COMPLETED);
-        q.setParameter("state2", PipelineTask.State.PARTIAL);
-        Number count = uniqueResult(q);
+        // If the user wants to filter by age, apply that now.
+        if (filter.getAgeDays() > 0) {
+            Date startTime = new Date(
+                System.currentTimeMillis() - filter.getAgeDays() * MILLIS_PER_DAY);
+            query.where(query.getBuilder()
+                .greaterThan(query.getRoot().get("startProcessingTime"), startTime));
+        }
 
-        return count.intValue() == 0;
+        // If the user wants to filter by pipeline instance name, apply that now.
+        if (!StringUtils.isEmpty(filter.getNameContains())) {
+            query.where(
+                query.getBuilder().like(query.getRoot().get("name"), filter.getNameContains()));
+        }
+        query.column(PipelineInstance_.id).ascendingOrder();
+        return query;
     }
 
-    /**
-     * Returns all pipeline instances in which a specified pipeline module was run.
-     */
-    public List<PipelineInstance> instanceIdsForModule(String moduleName) {
-        Criteria criteria = createCriteria(PipelineTask.class);
-        criteria.createAlias("pipelineInstance", "instance");
-        criteria.createAlias("pipelineInstanceNode", "node");
-        criteria.createAlias("node.pipelineModuleDefinition", "module");
-        criteria.add(Restrictions.eq("module.name.name", moduleName));
-        criteria.setProjection(Projections.distinct(Projections.property("pipelineInstance")));
-        return list(criteria);
+    @Override
+    public Class<PipelineInstance> componentClass() {
+        return PipelineInstance.class;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceFilter.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceFilter.java
index dbf4c2d..ae95eed 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceFilter.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceFilter.java
@@ -1,11 +1,8 @@
 package gov.nasa.ziggy.pipeline.definition.crud;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.Set;
 
-import org.hibernate.Query;
-import org.hibernate.Session;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance.State;
@@ -16,9 +13,8 @@
  * @author Todd Klaus
  */
 public class PipelineInstanceFilter {
-    private static final String FROM_CLAUSE = "from PipelineInstance pi";
-    private static final String ORDER_BY_CLAUSE = "order by pi.id asc";
-    private static final long MILLIS_PER_DAY = 24 * 60 * 60 * 1000;
+
+    public static final int DEFAULT_AGE = 10;
 
     /**
      * Pass if PipelineInstance.name contains the specified String. If empty or null, name is not
@@ -28,89 +24,25 @@ public class PipelineInstanceFilter {
 
     /**
      * Pass if PipelineInstance.state is contained in this Set. If null, state is not included in
-     * the where clause. Note that List is used rather than Set in order to make the order
-     * deterministic, which simplifies testing
+     * the where clause.
      */
-    private List<PipelineInstance.State> states = null;
+    private Set<PipelineInstance.State> states;
 
     /**
      * Pass if PipelineInstance.startProcessingTime is within ageDays days of the time the query is
      * ran. If 0, startProcessingTime is not included in the where clause.
      */
-    private int ageDays = 10;
+    private int ageDays = DEFAULT_AGE;
 
     public PipelineInstanceFilter() {
     }
 
-    public PipelineInstanceFilter(String nameContains, List<State> states, int ageDays) {
+    public PipelineInstanceFilter(String nameContains, Set<State> states, int ageDays) {
         this.nameContains = nameContains;
         this.states = states;
         this.ageDays = ageDays;
     }
 
-    /**
-     * Create the Hibernate Query object that implements this filter. Called only by
-     * PipelineInstanceCrud.
-     *
-     * @param session
-     * @return
-     */
-    Query query(Session session) {
-        StringBuilder result = new StringBuilder();
-        List<Date> startTimestamps = new ArrayList<>();
-
-        if (nameContains != null && nameContains.length() > 0) {
-            result.append("pi.name like '%" + nameContains + "%'");
-        }
-
-        if (states != null) {
-            if (result.length() > 0) {
-                result.append(" and ");
-            }
-
-            if (states.size() > 0) {
-                int statesAdded = 0;
-                result.append("pi.state in (");
-                for (PipelineInstance.State state : states) {
-                    if (statesAdded > 0) {
-                        result.append(",");
-                    }
-                    result.append(state.ordinal());
-                    statesAdded++;
-                }
-                result.append(")");
-            } else {
-                // empty, no matches
-                result.append("pi.state = -1");
-            }
-        }
-
-        if (ageDays > 0) {
-            if (result.length() > 0) {
-                result.append(" and ");
-            }
-            result.append("pi.startProcessingTime >= :startProcessingTime");
-            long t = System.currentTimeMillis() - ageDays * MILLIS_PER_DAY;
-            Date d = new Date(t);
-            startTimestamps.add(d);
-        }
-
-        Query q;
-
-        if (result.length() > 0) {
-            q = session
-                .createQuery(FROM_CLAUSE + " where " + result.toString() + " " + ORDER_BY_CLAUSE);
-            for (Date obj : startTimestamps) {
-                q.setParameter("startProcessingTime", obj);
-            }
-        } else {
-            // no filters
-            q = session.createQuery(FROM_CLAUSE + " " + ORDER_BY_CLAUSE);
-        }
-
-        return q;
-    }
-
     public String getNameContains() {
         return nameContains;
     }
@@ -119,11 +51,11 @@ public void setNameContains(String nameContains) {
         this.nameContains = nameContains;
     }
 
-    public List<PipelineInstance.State> getStates() {
+    public Set<PipelineInstance.State> getStates() {
         return states;
     }
 
-    public void setStates(List<PipelineInstance.State> states) {
+    public void setStates(Set<PipelineInstance.State> states) {
         this.states = states;
     }
 
@@ -134,4 +66,9 @@ public int getAgeDays() {
     public void setAgeDays(int ageDays) {
         this.ageDays = ageDays;
     }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this);
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceNodeCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceNodeCrud.java
index 746e3d8..4473796 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceNodeCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceNodeCrud.java
@@ -3,17 +3,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.hibernate.LockMode;
-import org.hibernate.Query;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.pipeline.definition.TaskCounts;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode_;
 import gov.nasa.ziggy.services.database.DatabaseService;
 
 /**
@@ -21,8 +16,7 @@
  *
  * @author Todd Klaus
  */
-public class PipelineInstanceNodeCrud extends AbstractCrud {
-    private static final Logger log = LoggerFactory.getLogger(PipelineInstanceNodeCrud.class);
+public class PipelineInstanceNodeCrud extends AbstractCrud<PipelineInstanceNode> {
 
     public PipelineInstanceNodeCrud() {
     }
@@ -32,25 +26,25 @@ public PipelineInstanceNodeCrud(DatabaseService databaseService) {
     }
 
     public List<PipelineInstanceNode> retrieveAll(PipelineInstance pipelineInstance) {
-        Query query = createQuery(
-            "from PipelineInstanceNode pin where pipelineInstance = :pipelineInstance order by pin.id");
-        query.setEntity("pipelineInstance", pipelineInstance);
-
+        ZiggyQuery<PipelineInstanceNode, PipelineInstanceNode> query = createZiggyQuery(
+            PipelineInstanceNode.class);
+        query.column(PipelineInstanceNode_.pipelineInstance).in(pipelineInstance);
+        query.column(PipelineInstanceNode_.id).ascendingOrder();
         List<PipelineInstanceNode> instanceNodes = list(query);
         populateXmlFields(instanceNodes);
         return instanceNodes;
     }
 
     /**
-     * Retrieve the PipelineInstanceNode for the specified id using LockMode.READ (bypass caches)
+     * Retrieve the PipelineInstanceNode for the specified id.
      *
      * @param id
      * @return
      */
     public PipelineInstanceNode retrieve(long id) {
-        Query query = createQuery("from PipelineInstanceNode where id = :id");
-        query.setLong("id", id);
-        query.setLockMode("pin", LockMode.READ);
+        ZiggyQuery<PipelineInstanceNode, PipelineInstanceNode> query = createZiggyQuery(
+            PipelineInstanceNode.class);
+        query.column(PipelineInstanceNode_.id).in(id);
 
         PipelineInstanceNode instanceNode = uniqueResult(query);
         populateXmlFields(instanceNode);
@@ -59,7 +53,7 @@ public PipelineInstanceNode retrieve(long id) {
 
     /**
      * Retrieve the PipelineInstanceNode for the specified PipelineInstance and
-     * PipelineDefinitionNode using LockMode.READ (bypass caches)
+     * PipelineDefinitionNode.
      *
      * @param pipelineInstance
      * @param pipelineDefinitionNode
@@ -67,13 +61,12 @@ public PipelineInstanceNode retrieve(long id) {
      */
     public PipelineInstanceNode retrieve(PipelineInstance pipelineInstance,
         PipelineDefinitionNode pipelineDefinitionNode) {
-        Query query = createQuery(
-            "from PipelineInstanceNode pin where pipelineInstance = :pipelineInstance"
-                + " and pipelineDefinitionNode = :pipelineDefinitionNode");
-
-        query.setEntity("pipelineInstance", pipelineInstance);
-        query.setEntity("pipelineDefinitionNode", pipelineDefinitionNode);
-        query.setLockMode("pin", LockMode.READ);
+        ZiggyQuery<PipelineInstanceNode, PipelineInstanceNode> query = createZiggyQuery(
+            PipelineInstanceNode.class);
+        query.column(PipelineInstanceNode_.pipelineInstance)
+            .in(pipelineInstance)
+            .column(PipelineInstanceNode_.pipelineDefinitionNode)
+            .in(pipelineDefinitionNode);
 
         PipelineInstanceNode instanceNode = uniqueResult(query);
         populateXmlFields(instanceNode);
@@ -90,292 +83,8 @@ private void populateXmlFields(Collection<PipelineInstanceNode> nodes) {
         }
     }
 
-    private enum CountType {
-        TOTAL("NUM_TASKS"),
-        SUBMITTED("NUM_SUBMITTED_TASKS"),
-        COMPLETED("NUM_COMPLETED_TASKS"),
-        FAILED("NUM_FAILED_TASKS");
-
-        private String columnName;
-
-        CountType(String columnName) {
-            this.columnName = columnName;
-        }
-
-        public String getColumnName() {
-            return columnName;
-        }
-
-        public String getColumnList() {
-            return TOTAL.columnName + "," + SUBMITTED.columnName + "," + COMPLETED.columnName + ","
-                + FAILED.columnName;
-        }
-    }
-
-    private TaskCounts updateTaskCount(long pipelineInstanceNodeId, CountType countType,
-        int taskCountDelta) {
-        return updateTaskCount(pipelineInstanceNodeId, countType, taskCountDelta, true);
-    }
-
-    /**
-     * Common code to update task count columns atomically. Uses 'select for update' semantics so
-     * that the count is read and updated atomically.
-     *
-     * @param pipelineInstanceNodeId
-     * @param countType.toString()
-     * @param taskCountDelta
-     * @param applyDeltas
-     */
-    private TaskCounts updateTaskCount(long pipelineInstanceNodeId, CountType countType,
-        int taskCountDelta, boolean applyDeltas) {
-        // make sure dirty objects are flushed to the database
-        flush();
-
-        Query selectForUpdateQuery = createSQLQuery("select " + countType.getColumnList()
-            + " from PI_PIPELINE_INST_NODE pin where id = :pipelineInstanceNodeId for update");
-
-        selectForUpdateQuery.setLong("pipelineInstanceNodeId", pipelineInstanceNodeId);
-
-        log.debug("query = " + selectForUpdateQuery);
-
-        Object[] results = uniqueResult(selectForUpdateQuery);
-        TaskCounts newTaskCounts;
-        if (applyDeltas) {
-
-            // 4 columns returned, as defined in the query above
-            Number numTasks = (Number) results[0];
-            Number numSubmittedTasks = (Number) results[1];
-            Number numCompletedTasks = (Number) results[2];
-            Number numFailedTasks = (Number) results[3];
-
-            newTaskCounts = new TaskCounts(numTasks.intValue(), numSubmittedTasks.intValue(),
-                numCompletedTasks.intValue(), numFailedTasks.intValue());
-        } else {
-            newTaskCounts = new TaskCounts(0, 0, 0, 0);
-        }
-
-        int previousTaskCount;
-        int newTaskCount;
-
-        switch (countType) {
-            case TOTAL:
-                previousTaskCount = (int) newTaskCounts.getTotal();
-                newTaskCount = Math.max(0, previousTaskCount + taskCountDelta);
-                newTaskCounts.setTotal(newTaskCount);
-                break;
-
-            case SUBMITTED:
-                previousTaskCount = (int) newTaskCounts.getSubmitted();
-                newTaskCount = Math.max(0, previousTaskCount + taskCountDelta);
-                newTaskCounts.setSubmitted(newTaskCount);
-                break;
-
-            case COMPLETED:
-                previousTaskCount = (int) newTaskCounts.getCompleted();
-                newTaskCount = Math.max(0, previousTaskCount + taskCountDelta);
-                newTaskCounts.setCompleted(newTaskCount);
-                break;
-
-            case FAILED:
-                previousTaskCount = (int) newTaskCounts.getFailed();
-                newTaskCount = Math.max(0, previousTaskCount + taskCountDelta);
-                newTaskCounts.setFailed(newTaskCount);
-                break;
-
-            default:
-                throw new IllegalStateException("unknown CountType: " + countType);
-        }
-
-        // this update releases the lock obtained above
-        Query updateQuery = createSQLQuery("update PI_PIPELINE_INST_NODE pin " + "set "
-            + countType.getColumnName() + " = :newTaskCount where id = :pipelineInstanceNodeId");
-
-        updateQuery.setLong("pipelineInstanceNodeId", pipelineInstanceNodeId);
-        updateQuery.setLong("newTaskCount", newTaskCount);
-
-        int rowsUpdated = updateQuery.executeUpdate();
-
-        log.info("Changed PI_PIPELINE_INST_NODE(" + pipelineInstanceNodeId + ")."
-            + countType.getColumnName() + " (" + previousTaskCount + "->" + newTaskCount
-            + "), rowsUpdated = " + rowsUpdated);
-
-        return newTaskCounts;
-    }
-
-    /**
-     * Update numTasks for the specified PipelineInstanceNode. Uses 'select for update' semantics so
-     * that the count is read and updated atomically.
-     * <p>
-     * NOTE: Atomicity is not guaranteed on HSQLDB since it does not support 'select for update'
-     *
-     * @param pipelineInstanceNodeId
-     * @param taskCountDelta
-     */
-    public TaskCounts updateTaskCount(long pipelineInstanceNodeId, int taskCountDelta) {
-        return updateTaskCount(pipelineInstanceNodeId, CountType.TOTAL, taskCountDelta);
-    }
-
-    /**
-     * Increment numSubmittedTasks for the specified PipelineInstanceNode. Uses 'select for update'
-     * semantics so that the count is read and updated atomically.
-     * <p>
-     * NOTE: Atomicity is not guaranteed on HSQLDB since it does not support 'select for update'
-     *
-     * @param pipelineInstanceNodeId
-     */
-    public TaskCounts incrementSubmittedTaskCount(long pipelineInstanceNodeId) {
-        return updateTaskCount(pipelineInstanceNodeId, CountType.SUBMITTED, 1);
-    }
-
-    /**
-     * Update numSubmittedTasks for the specified PipelineInstanceNode. Uses 'select for update'
-     * semantics so that the count is read and updated atomically.
-     * <p>
-     * NOTE: Atomicity is not guaranteed on HSQLDB since it does not support 'select for update'
-     *
-     * @param pipelineInstanceNodeId
-     * @param taskCountDelta
-     */
-    public TaskCounts updateSubmittedTaskCount(long pipelineInstanceNodeId, int taskCountDelta) {
-        return updateTaskCount(pipelineInstanceNodeId, CountType.SUBMITTED, taskCountDelta);
-    }
-
-    /**
-     * Increment numCompletedTasks for the specified PipelineInstanceNode. Uses 'select for update'
-     * semantics so that the count is read and updated atomically.
-     * <p>
-     * NOTE: Atomicity is not guaranteed on HSQLDB since it does not support 'select for update'
-     *
-     * @param pipelineInstanceNodeId
-     */
-    public TaskCounts incrementCompletedTaskCount(long pipelineInstanceNodeId) {
-        return updateTaskCount(pipelineInstanceNodeId, CountType.COMPLETED, 1);
+    @Override
+    public Class<PipelineInstanceNode> componentClass() {
+        return PipelineInstanceNode.class;
     }
-
-    /**
-     * Update numCompletedTasks for the specified PipelineInstanceNode. Uses 'select for update'
-     * semantics so that the count is read and updated atomically.
-     * <p>
-     * NOTE: Atomicity is not guaranteed on HSQLDB since it does not support 'select for update'
-     *
-     * @param pipelineInstanceNodeId
-     * @param taskCountDelta
-     */
-    public TaskCounts updateCompletedTaskCount(long pipelineInstanceNodeId, int taskCountDelta) {
-        return updateTaskCount(pipelineInstanceNodeId, CountType.COMPLETED, taskCountDelta);
-    }
-
-    /**
-     * Increment numFailedTasks for the specified PipelineInstanceNode. Uses 'select for update'
-     * semantics so that the count is read and updated atomically.
-     * <p>
-     * NOTE: Atomicity is not guaranteed on HSQLDB since it does not support 'select for update'
-     *
-     * @param pipelineInstanceNodeId
-     */
-    public TaskCounts incrementFailedTaskCount(long pipelineInstanceNodeId) {
-        return updateTaskCount(pipelineInstanceNodeId, CountType.FAILED, 1);
-    }
-
-    /**
-     * Deccrement numFailedTasks for the specified PipelineInstanceNode. Uses 'select for update'
-     * semantics so that the count is read and updated atomically.
-     * <p>
-     * NOTE: Atomicity is not guaranteed on HSQLDB since it does not support 'select for update'
-     *
-     * @param pipelineInstanceNodeId
-     */
-    public TaskCounts decrementFailedTaskCount(long pipelineInstanceNodeId) {
-        return updateTaskCount(pipelineInstanceNodeId, CountType.FAILED, -1);
-    }
-
-    /**
-     * Increment numFailedTasks for the specified PipelineInstanceNode. Uses 'select for update'
-     * semantics so that the count is read and updated atomically.
-     * <p>
-     * NOTE: Atomicity is not guaranteed on HSQLDB since it does not support 'select for update'
-     *
-     * @param pipelineInstanceNodeId
-     * @param taskCountDelta
-     */
-    public TaskCounts updateFailedTaskCount(long pipelineInstanceNodeId, int taskCountDelta) {
-        return updateTaskCount(pipelineInstanceNodeId, CountType.FAILED, taskCountDelta);
-    }
-
-    /**
-     * Use the pipeline task states to update the task counts in the instance nodes. This is used to
-     * avoid a situation in which the pipeline instance nodes in the database become inconsistent
-     * with the task states that those nodes are supposed to summarize
-     *
-     * @param pipelineInstanceId instance ID to be updated
-     */
-    public void updateTaskCountsFromTasks(long pipelineInstanceId) {
-
-        PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-
-        // get the node IDs
-
-        List<Long> nodeIds = pipelineTaskCrud.retrievePipelineInstanceNodeIds(pipelineInstanceId);
-
-        // loop over instance nodes
-
-        if (nodeIds != null && !nodeIds.isEmpty()) {
-            for (long nodeId : nodeIds) {
-
-                // get the state count for each node, bearing in mind that the
-                // submitted count is actually the sum of submitted, completed,
-                // processing, error, partial
-
-                int completedCount = pipelineTaskCrud.retrieveStateCount(nodeId,
-                    PipelineTask.State.COMPLETED);
-                int erroredCount = pipelineTaskCrud.retrieveStateCount(nodeId,
-                    PipelineTask.State.ERROR);
-                int submittedCount = pipelineTaskCrud.retrieveStateCount(nodeId,
-                    PipelineTask.State.SUBMITTED);
-                submittedCount += erroredCount;
-                submittedCount += completedCount;
-                submittedCount += pipelineTaskCrud.retrieveStateCount(nodeId,
-                    PipelineTask.State.PARTIAL);
-                submittedCount += pipelineTaskCrud.retrieveStateCount(nodeId,
-                    PipelineTask.State.PROCESSING);
-
-                // apply updates -- note that this is an absolute update rather
-                // than a delta, so use false as the 4th argument
-
-                updateTaskCount(nodeId, CountType.SUBMITTED, submittedCount, false);
-                updateTaskCount(nodeId, CountType.COMPLETED, completedCount, false);
-                updateTaskCount(nodeId, CountType.FAILED, erroredCount, false);
-            }
-        }
-
-    }
-
-    /**
-     * True if PipelineInstanceNode.numCompletedTasks == numTasks
-     *
-     * @param pipelineInstanceNodeId
-     * @return
-     */
-//    private boolean isInstanceNodeComplete(long pipelineInstanceNodeId) {
-//        // Make sure dirty objects are flushed to the database.
-//        // Then wash your hands.
-//        getSession().flush();
-//
-//        Query query = getSession().createQuery("select numTasks, numCompletedTasks "
-//            + "from PipelineInstanceNode pin where id = :pipelineInstanceNodeId");
-//
-//        query.setLong("pipelineInstanceNodeId", pipelineInstanceNodeId);
-//
-//        Object[] results = (Object[]) query.uniqueResult();
-//
-//        // 2 columns, as defined in the query above
-//        Number numTasks = (Number) results[0];
-//        Number numCompletedTasks = (Number) results[1];
-//
-//        log.info("PipelineInstanceNode(" + pipelineInstanceNodeId
-//            + ") numTasks/numCompletedTasks = " + numTasks + "/" + numCompletedTasks);
-//
-//        return (numCompletedTasks.equals(numTasks));
-//    }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineModuleDefinitionCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineModuleDefinitionCrud.java
index 0ac536a..f4e4def 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineModuleDefinitionCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineModuleDefinitionCrud.java
@@ -1,161 +1,39 @@
 package gov.nasa.ziggy.pipeline.definition.crud;
 
-import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
-import org.hibernate.Query;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.crud.AbstractCrud;
-import gov.nasa.ziggy.pipeline.definition.ModuleName;
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
-import gov.nasa.ziggy.services.database.DatabaseService;
+import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition_;
 
 /**
  * Provides CRUD methods for {@link PipelineModuleDefinition}
  *
  * @author Todd Klaus
  */
-public class PipelineModuleDefinitionCrud extends AbstractCrud {
-    private static final Logger log = LoggerFactory.getLogger(PipelineModuleDefinitionCrud.class);
+public class PipelineModuleDefinitionCrud
+    extends UniqueNameVersionPipelineComponentCrud<PipelineModuleDefinition> {
 
     public PipelineModuleDefinitionCrud() {
     }
 
-    public PipelineModuleDefinitionCrud(DatabaseService databaseService) {
-        super(databaseService);
-    }
-
     public List<PipelineModuleDefinition> retrieveAll() {
-        return list(createQuery("from PipelineModuleDefinition pmd order by pmd.name"));
+        return list(
+            createZiggyQuery(PipelineModuleDefinition.class).column(PipelineModuleDefinition_.NAME)
+                .ascendingOrder());
     }
 
-    public List<PipelineModuleDefinition> retrieveAllVersionsForName(String name) {
-        Query q = createQuery("from ModuleName m where m.name = :name");
-        q.setString("name", name);
-        q.setMaxResults(1);
-
-        ModuleName moduleName = uniqueResult(q);
-
-        if (moduleName == null) {
-            return new ArrayList<>();
-        }
-
-        q = createQuery(
-            "from PipelineModuleDefinition p where p.name = :name order by version asc");
-        q.setEntity("name", moduleName);
-
-        return list(q);
+    @Override
+    protected void populateXmlFields(Collection<PipelineModuleDefinition> objects) {
     }
 
-    public PipelineModuleDefinition retrieveLatestVersionForName(String name) {
-        Query q = createQuery("from ModuleName m where m.name = :name");
-        q.setString("name", name);
-        q.setMaxResults(1);
-        ModuleName moduleName = uniqueResult(q);
-
-        if (moduleName == null) {
-            log.info("No ModuleName found for name = " + name);
-            return null;
-        }
-
-        return retrieveLatestVersionForName(moduleName);
-    }
-
-    public PipelineModuleDefinition retrieveLatestVersionForName(ModuleName name) {
-        Query q = createQuery(
-            "from PipelineModuleDefinition pmd where pmd.name = :name order by version desc");
-        q.setEntity("name", name);
-        q.setMaxResults(1);
-
-        return uniqueResult(q);
-    }
-
-    public List<PipelineModuleDefinition> retrieveLatestVersions() {
-        Query q = createQuery("from ModuleName order by name");
-
-        List<ModuleName> names = list(q);
-
-        List<PipelineModuleDefinition> results = new ArrayList<>();
-
-        for (ModuleName name : names) {
-            results.add(retrieveLatestVersionForName(name));
-        }
-
-        return results;
+    @Override
+    public String componentNameForExceptionMessages() {
+        return "pipeline module definition";
     }
 
-    public void rename(PipelineModuleDefinition moduleDef, String newName) {
-        String oldName = moduleDef.getName().getName();
-
-        // first, create the new name in PI_MOD_NAME
-        ModuleName newNameEntity = new ModuleName(newName);
-        create(newNameEntity);
-
-        // flush these changes so the updates below will see them
-        flush();
-
-        /*
-         * @formatter:off
-         *
-         * second, update all references to the old name
-         * This includes:
-         *   PipelineModuleDefinition
-         *   PipelineDefinitionNode
-         *   PipelineInstanceNode
-         *   TriggerDefinitionNode
-         *   MrReport
-         *
-         * @formatter:on
-         */
-        Query updateQuery1 = createSQLQuery(
-            "update PI_MOD_DEF set PI_MOD_NAME_NAME = :newName where "
-                + "PI_MOD_NAME_NAME = :oldName");
-        updateQuery1.setParameter("newName", newName);
-        updateQuery1.setParameter("oldName", oldName);
-
-        int updatedRows = updateQuery1.executeUpdate();
-
-        log.debug("Updated " + updatedRows + " rows in PI_MOD_DEF");
-
-        Query updateQuery2 = createSQLQuery(
-            "update PI_PIPELINE_DEF_NODE set PI_MOD_NAME_NAME = :newName where "
-                + "PI_MOD_NAME_NAME = :oldName");
-        updateQuery2.setParameter("newName", newName);
-        updateQuery2.setParameter("oldName", oldName);
-
-        updatedRows = updateQuery2.executeUpdate();
-
-        log.debug("Updated " + updatedRows + " rows in PI_PIPELINE_DEF_NODE");
-
-        Query updateQuery3 = createSQLQuery(
-            "update PI_TRIGGER_DEF_NODE set PI_MOD_NAME_NAME = :newName where "
-                + "PI_MOD_NAME_NAME = :oldName");
-        updateQuery3.setParameter("newName", newName);
-        updateQuery3.setParameter("oldName", oldName);
-
-        updatedRows = updateQuery3.executeUpdate();
-
-        log.debug("Updated " + updatedRows + " rows in PI_TRIGGER_DEF_NODE");
-
-        Query updateQuery4 = createSQLQuery(
-            "update MR_REPORT set PI_MOD_NAME_NAME = :newName where "
-                + "PI_MOD_NAME_NAME = :oldName");
-        updateQuery4.setParameter("newName", newName);
-        updateQuery4.setParameter("oldName", oldName);
-
-        updatedRows = updateQuery4.executeUpdate();
-
-        log.debug("Updated " + updatedRows + " rows in MR_REPORT");
-
-        // flush these changes so the delete below will not fail due to a foreign key
-        // constraint violation
-        flush();
-
-        Query deleteQuery = createSQLQuery("delete from PI_MOD_NAME where NAME = :oldName");
-        deleteQuery.setParameter("oldName", oldName);
-        int deletedRows = deleteQuery.executeUpdate();
-        log.debug("Deleted " + deletedRows + " rows in PI_MOD_NAME");
+    @Override
+    public Class<PipelineModuleDefinition> componentClass() {
+        return PipelineModuleDefinition.class;
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskCrud.java
index 91fad78..afa7a2e 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskCrud.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskCrud.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.pipeline.definition.crud;
 
-import static java.lang.Math.toIntExact;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -10,37 +10,35 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.Criteria;
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.Query;
-import org.hibernate.criterion.CriteriaSpecification;
-import org.hibernate.criterion.DetachedCriteria;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.module.remote.RemoteParameters;
+import gov.nasa.ziggy.pipeline.PipelineOperations;
+import gov.nasa.ziggy.pipeline.PipelineOperations.TaskStateSummary;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.Priority;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode_;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance_;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule;
+import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition_;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask.State;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask_;
 import gov.nasa.ziggy.pipeline.definition.ProcessingState;
 import gov.nasa.ziggy.services.database.DatabaseService;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-import gov.nasa.ziggy.worker.WorkerPipelineProcess;
+import gov.nasa.ziggy.services.messages.TaskRequest;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
 
 /**
  * Provides CRUD methods for {@link PipelineTask}
  *
  * @author Todd Klaus
  */
-public class PipelineTaskCrud extends AbstractCrud {
+public class PipelineTaskCrud extends AbstractCrud<PipelineTask> {
     private static final Logger log = LoggerFactory.getLogger(PipelineTaskCrud.class);
 
     public PipelineTaskCrud() {
@@ -56,14 +54,11 @@ public PipelineTaskCrud(DatabaseService databaseService) {
      * @return a list of pipeline tasks
      */
     public List<PipelineTask> retrieveAll() {
-        Criteria query = createCriteria(PipelineTask.class);
-        return list(query);
+        return list(createZiggyQuery(PipelineTask.class));
     }
 
     public PipelineTask retrieve(long id) {
-        Query query = createQuery("from PipelineTask where id = :id");
-        query.setLong("id", id);
-        return uniqueResult(query);
+        return uniqueResult(createZiggyQuery(PipelineTask.class).column(PipelineTask_.id).in(id));
     }
 
     /**
@@ -73,12 +68,10 @@ public PipelineTask retrieve(long id) {
      * @return
      */
     public List<PipelineTask> retrieveTasksForInstance(PipelineInstance instance) {
-        Query q = createQuery("from PipelineTask pt"
-            + " where pt.pipelineInstance = :pipelineInstance order by id asc");
-        q.setEntity("pipelineInstance", instance);
-        q.setLockMode("pt", LockMode.READ); // bypass caches
-
-        return list(q);
+        return list(createZiggyQuery(PipelineTask.class).column(PipelineTask_.pipelineInstance)
+            .in(instance)
+            .column(PipelineTask_.id)
+            .ascendingOrder());
     }
 
     /**
@@ -93,16 +86,14 @@ public List<PipelineTask> retrieveTasksForInstance(long instanceId) {
      * Convenience method that generates a query for getting the tasks for a given named module
      *
      * @param moduleName name of the module
-     * @return Criteria query for retrieving all tasks for the requested module name.
+     * @return {@link ZiggyQuery} for retrieving all tasks for the requested module name.
      */
-    public Criteria createModuleNameCriteria(String moduleName) {
-        Criteria query = createCriteria(PipelineTask.class);
-        query.createCriteria("pipelineInstanceNode")
-            .createCriteria("pipelineModuleDefinition")
-            .createCriteria("name")
-            .add(Restrictions.eq("name", moduleName));
+    public ZiggyQuery<PipelineTask, PipelineTask> createModuleNameCriteria(String moduleName) {
+        ZiggyQuery<PipelineTask, PipelineTask> query = createZiggyQuery(PipelineTask.class);
+        query.where(query.in(query.get(PipelineTask_.pipelineInstanceNode)
+            .get(PipelineInstanceNode_.pipelineModuleDefinition)
+            .get(PipelineModuleDefinition_.name), moduleName));
         return query;
-
     }
 
     /**
@@ -112,9 +103,8 @@ public Criteria createModuleNameCriteria(String moduleName) {
      * @return a list of tasks for that module
      */
     public List<PipelineTask> retrieveAllForModule(String moduleName) {
-        Criteria query = createModuleNameCriteria(moduleName);
-        query.addOrder(Order.asc("created"));
-
+        ZiggyQuery<PipelineTask, PipelineTask> query = createModuleNameCriteria(moduleName);
+        query.column(PipelineTask_.created).ascendingOrder();
         return list(query);
     }
 
@@ -125,8 +115,8 @@ public List<PipelineTask> retrieveAllForModule(String moduleName) {
      * @return the latest task, or null if no tasks exist for the module name
      */
     public PipelineTask retrieveLatestForModule(String moduleName) {
-        Criteria query = createModuleNameCriteria(moduleName);
-        query.addOrder(Order.desc("id"));
+        ZiggyQuery<PipelineTask, PipelineTask> query = createModuleNameCriteria(moduleName);
+        query.column(PipelineTask_.id).descendingOrder();
 
         List<PipelineTask> tasks = list(query);
         return tasks.isEmpty() ? null : tasks.get(0);
@@ -141,8 +131,9 @@ public PipelineTask retrieveLatestForModule(String moduleName) {
      */
     public List<PipelineTask> retrieveTasksForModuleAndInstance(String moduleName,
         long instanceId) {
-        Criteria query = createModuleNameCriteria(moduleName);
-        query.createCriteria("pipelineInstance").add(Restrictions.eq("id", instanceId));
+        ZiggyQuery<PipelineTask, PipelineTask> query = createModuleNameCriteria(moduleName);
+        query.where(query.in(query.get(PipelineTask_.pipelineInstance).get(PipelineInstance_.id),
+            instanceId));
         return list(query);
     }
 
@@ -153,12 +144,10 @@ public List<PipelineTask> retrieveTasksForModuleAndInstance(String moduleName,
      * @return
      */
     public List<PipelineTask> retrieveAll(PipelineInstanceNode pipelineInstanceNode) {
-        Query q = createQuery("from PipelineTask pt"
-            + " where pt.pipelineInstanceNode = :pipelineInstanceNode order by id asc");
-        q.setEntity("pipelineInstanceNode", pipelineInstanceNode);
-        q.setLockMode("pt", LockMode.READ); // bypass caches
+        ZiggyQuery<PipelineTask, PipelineTask> query = createZiggyQuery(PipelineTask.class);
+        query.column(PipelineTask_.pipelineInstanceNode).in(pipelineInstanceNode);
 
-        return list(q);
+        return list(query);
     }
 
     /**
@@ -168,40 +157,35 @@ public List<PipelineTask> retrieveAll(PipelineInstanceNode pipelineInstanceNode)
     public List<Long> retrieveIdsForPipelineDefinitionNode(Collection<Long> taskIds,
         PipelineDefinitionNode pipelineDefinitionNode) {
 
-        Query q = createQuery("select id from PipelineTask pt where pt.id in :id "
-            + "and pt.pipelineInstanceNode.pipelineDefinitionNode = :pipelineDefinitionNode");
-        q.setEntity("pipelineDefinitionNode", pipelineDefinitionNode);
-        return aggregateResults(taskIds, chunk -> q.setParameterList("id", chunk));
-
+        ZiggyQuery<PipelineTask, Long> query = createZiggyQuery(PipelineTask.class, Long.class);
+        query.column(PipelineTask_.id).select();
+        query.where(query.in(query.get(PipelineTask_.pipelineInstanceNode)
+            .get(PipelineInstanceNode_.pipelineDefinitionNode), pipelineDefinitionNode));
+        query.column(PipelineTask_.id).chunkedIn(taskIds);
+        return list(query);
     }
 
     /**
      * Retrieve all {@link PipelineTask}s for the specified {@link PipelineInstance} and the
      * specified {@link PipelineTask.State}
-     *
-     * @param instance
-     * @return
      */
     public List<PipelineTask> retrieveAll(PipelineInstance instance, PipelineTask.State state) {
-        Query q = createQuery(
-            "from PipelineTask pt where " + "pt.pipelineInstance = :pipelineInstance "
-                + "and pt.state = :state " + "order by id asc");
-
-        q.setEntity("pipelineInstance", instance);
-        q.setParameter("state", state);
-        q.setLockMode("pt", LockMode.READ); // bypass caches
+        ZiggyQuery<PipelineTask, PipelineTask> query = createZiggyQuery(PipelineTask.class);
+        query.column(PipelineTask_.pipelineInstance).in(instance);
+        query.column(PipelineTask_.state).in(state);
+        query.column(PipelineTask_.id).ascendingOrder();
 
-        return list(q);
+        return list(query);
     }
 
     public List<Long> retrieveIdsForTasksInState(Collection<Long> taskIds,
         PipelineTask.State state) {
 
-        Criteria criteria = createCriteria(PipelineTask.class);
-        criteria.add(Restrictions.in("id", taskIds));
-        criteria.add(Restrictions.eq("state", state));
-        criteria.setProjection(Projections.distinct(Projections.property("id")));
-        return list(criteria);
+        ZiggyQuery<PipelineTask, Long> query = createZiggyQuery(PipelineTask.class, Long.class);
+        query.column(PipelineTask_.id).select();
+        query.column(PipelineTask_.id).chunkedIn(taskIds);
+        query.distinct(true);
+        return list(query);
     }
 
     /**
@@ -211,16 +195,13 @@ public List<Long> retrieveIdsForTasksInState(Collection<Long> taskIds,
      * @return {@link List} of {@link PipelineTask}s.
      */
     public List<PipelineTask> retrieveAll(Collection<Long> pipelineTaskIds) {
-        List<PipelineTask> pipelineTasks = new ArrayList<>();
-        if (!pipelineTaskIds.isEmpty()) {
-            Query query = createQuery(
-                "from PipelineTask where id in (:pipelineTaskIds) " + "order by id asc");
-            query.setParameterList("pipelineTaskIds", pipelineTaskIds);
-
-            pipelineTasks = list(query);
+        if (pipelineTaskIds.isEmpty()) {
+            return new ArrayList<>();
         }
-
-        return pipelineTasks;
+        ZiggyQuery<PipelineTask, PipelineTask> query = createZiggyQuery(PipelineTask.class);
+        query.column(PipelineTask_.id).chunkedIn(pipelineTaskIds);
+        query.column(PipelineTask_.id).ascendingOrder();
+        return list(query);
     }
 
     /**
@@ -230,13 +211,13 @@ public List<PipelineTask> retrieveAll(Collection<Long> pipelineTaskIds) {
      * @return
      */
     public List<String> distinctSoftwareRevisions(PipelineInstanceNode node) {
-        Query q = createQuery("select distinct softwareRevision"
-            + " from PipelineTask pt where pt.pipelineInstanceNode"
-            + " = :pipelineInstanceNode order by softwareRevision asc");
+        ZiggyQuery<PipelineTask, String> query = createZiggyQuery(PipelineTask.class, String.class);
+        query.column(PipelineTask_.pipelineInstanceNode).in(node);
+        query.column(PipelineTask_.softwareRevision).select();
+        query.column(PipelineTask_.softwareRevision).ascendingOrder();
+        query.distinct(true);
 
-        q.setEntity("pipelineInstanceNode", node);
-
-        return list(q);
+        return list(query);
     }
 
     /**
@@ -247,12 +228,13 @@ public List<String> distinctSoftwareRevisions(PipelineInstanceNode node) {
      * @return
      */
     public List<String> distinctSoftwareRevisions(PipelineInstance instance) {
-        Query q = createQuery("select distinct softwareRevision from PipelineTask pt "
-            + "where pt.pipelineInstance = :pipelineInstance order by softwareRevision asc");
+        ZiggyQuery<PipelineTask, String> query = createZiggyQuery(PipelineTask.class, String.class);
+        query.column(PipelineTask_.pipelineInstance).in(instance);
+        query.column(PipelineTask_.softwareRevision).select();
+        query.column(PipelineTask_.softwareRevision).ascendingOrder();
+        query.distinct(true);
 
-        q.setEntity("pipelineInstance", instance);
-
-        return list(q);
+        return list(query);
     }
 
     public class ClearStaleStateResults {
@@ -261,28 +243,26 @@ public class ClearStaleStateResults {
     }
 
     /**
-     * Change the state from PROCESSING or SUBMITTED to ERROR for any tasks with the specified
-     * workerHost.
+     * Change the state from PROCESSING or SUBMITTED to ERROR for tasks that have stale processing
+     * states.
      * <p>
-     * This is typically called by a worker during startup to clear the stale state of any tasks
-     * that were processing when the worker exited abnormally (without a chance to set the state to
-     * ERROR)
+     * This is typically called by the supervisor during startup to clear the stale state of any
+     * tasks that were processing when the supervisor exited abnormally (without a chance to set the
+     * state to ERROR)
      *
      * @param workerHost
      * @return
      */
-    public ClearStaleStateResults clearStaleState(String workerHost) {
+    public ClearStaleStateResults clearStaleState() {
         ClearStaleStateResults results = new ClearStaleStateResults();
 
-        PipelineInstanceNodeCrud pipelineInstanceNodeCrud = new PipelineInstanceNodeCrud();
+        PipelineOperations pipelineOperations = new PipelineOperations();
+        ZiggyQuery<PipelineTask, PipelineTask> query = createZiggyQuery(PipelineTask.class);
+        query.column(PipelineTask_.state)
+            .in(Set.of(PipelineTask.State.PROCESSING, PipelineTask.State.SUBMITTED));
+        query.distinct(true);
 
-        Criteria criteria = createCriteria(PipelineTask.class);
-        criteria.add(Restrictions.eq("workerHost", workerHost));
-        criteria.add(Restrictions.or(Restrictions.eq("state", PipelineTask.State.PROCESSING),
-            Restrictions.eq("state", PipelineTask.State.SUBMITTED)));
-        criteria.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
-
-        List<PipelineTask> staleTasks = list(criteria);
+        List<PipelineTask> staleTasks = list(query);
         log.info("Stale task count: " + staleTasks.size());
         log.info("Stale task IDs: " + staleTasks.toString());
 
@@ -296,7 +276,7 @@ public ClearStaleStateResults clearStaleState(String workerHost) {
 
             // If the task was executing remotely, and it was queued or executing, we can try
             // to resume monitoring on it -- the jobs may have continued to run while the
-            // worker was down.
+            // supervisor was down.
             RemoteParameters remoteParams = new ParameterSetCrud().retrieveRemoteParameters(task);
             if (remoteParams != null && remoteParams.isEnabled()) {
                 ProcessingState state = new ProcessingSummaryOperations()
@@ -305,23 +285,20 @@ public ClearStaleStateResults clearStaleState(String workerHost) {
                 if (state == ProcessingState.ALGORITHM_QUEUED
                     || state == ProcessingState.ALGORITHM_EXECUTING) {
                     log.info("Resuming monitoring for task " + task.getId());
-                    WorkerTaskRequest taskRequest = new WorkerTaskRequest(instanceId,
-                        instanceNodeId, task.getId(), 0, false,
-                        PipelineModule.RunMode.RESUME_MONITORING);
-                    WorkerPipelineProcess.workerTaskRequestQueue.add(taskRequest);
+                    TaskRequest taskRequest = new TaskRequest(instanceId, instanceNodeId,
+                        task.getPipelineDefinitionNode().getId(), task.getId(), Priority.HIGHEST,
+                        false, PipelineModule.RunMode.RESUME_MONITORING);
+                    ZiggyMessenger.publish(taskRequest);
                     continue;
                 }
             }
             results.uniqueInstanceIds.add(instanceId);
 
-            pipelineInstanceNodeCrud.updateFailedTaskCount(instanceNodeId, 1);
-            task.setState(PipelineTask.State.ERROR);
-            new PipelineTaskOperations().updateJobs(task);
-            task.stopExecutionClock();
+            TaskStateSummary updatedStates = pipelineOperations.setTaskState(task,
+                PipelineTask.State.ERROR);
             log.info("Setting task " + task.getId() + " to ERROR state");
-
+            new PipelineTaskOperations().updateJobs(updatedStates.getTask());
             flush(); // push out the update
-
         }
 
         log.info("totalUpdatedTaskCount = " + results.totalUpdatedTaskCount);
@@ -337,147 +314,83 @@ public ClearStaleStateResults clearStaleState(String workerHost) {
      * normally (left in the PROCESSING or SUBMITTED states). This allows the operator to restart
      * these tasks.
      */
-    public void resetTaskStates(long pipelineInstanceId, boolean allStalledTasks, String taskIds) {
-        Query select = null;
+    public void resetTaskStates(long pipelineInstanceId, boolean allStalledTasks) {
 
+        ZiggyQuery<PipelineTask, PipelineTask> query = createZiggyQuery(PipelineTask.class);
+        query.where(query.in(query.get(PipelineTask_.pipelineInstance).get(PipelineInstance_.id),
+            Set.of(pipelineInstanceId)));
         if (allStalledTasks) {
-            select = createSQLQuery(
-                "select PI_PIPELINE_INST_NODE_ID," + " count(*) from PI_PIPELINE_TASK"
-                    + " where STATE = :submittedState or STATE = :processingState"
-                    + " and PI_PIPELINE_INSTANCE_ID = :instanceId"
-                    + " group by PI_PIPELINE_INST_NODE_ID");
-            select.setParameter("submittedState", PipelineTask.State.SUBMITTED.toString());
-            select.setParameter("processingState", PipelineTask.State.PROCESSING.toString());
+            query.column(PipelineTask_.state)
+                .in(Set.of(PipelineTask.State.SUBMITTED, PipelineTask.State.PROCESSING));
         } else {
-            select = createSQLQuery("select PI_PIPELINE_INST_NODE_ID,"
-                + " count(*) from PI_PIPELINE_TASK" + " where STATE = :submittedState"
-                + " and PI_PIPELINE_INSTANCE_ID = :instanceId"
-                + " group by PI_PIPELINE_INST_NODE_ID");
-            select.setParameter("submittedState", PipelineTask.State.SUBMITTED.toString());
+            query.column(PipelineTask_.state).in(Set.of(PipelineTask.State.SUBMITTED));
         }
-        select.setParameter("instanceId", pipelineInstanceId);
-
-        PipelineInstanceNodeCrud pipelineInstanceNodeCrud = new PipelineInstanceNodeCrud();
+        List<PipelineTask> staleTasks = list(query);
 
-        log.info("Select query: " + select);
-
-        List<Object[]> staleTasks = list(select);
+        // Organize into a Map by pipeline instance node
+        Map<PipelineInstanceNode, Set<PipelineTask>> tasksByInstanceNode = new HashMap<>();
+        for (PipelineTask task : staleTasks) {
+            PipelineInstanceNode node = task.getPipelineInstanceNode();
+            Set<PipelineTask> tasks = tasksByInstanceNode.get(node);
+            if (tasks == null) {
+                tasks = new HashSet<>();
+                tasksByInstanceNode.put(node, tasks);
+            }
+            tasks.add(task);
+        }
 
-        for (Object[] row : staleTasks) {
-            Number instanceNodeId = (Number) row[0];
-            Number staleCount = (Number) row[1];
+        PipelineOperations pipelineOperations = new PipelineOperations();
+        for (Map.Entry<PipelineInstanceNode, Set<PipelineTask>> entry : tasksByInstanceNode
+            .entrySet()) {
+            long instanceNodeId = entry.getKey().getId();
+            int staleCount = entry.getValue().size();
 
             log.info("instanceNodeId = " + instanceNodeId);
             log.info("staleCount = " + staleCount);
 
-            pipelineInstanceNodeCrud.updateFailedTaskCount(instanceNodeId.longValue(),
-                staleCount.intValue());
-
-            int updatedTaskCount = performTaskReset(instanceNodeId.longValue(), allStalledTasks,
-                taskIds);
+            for (PipelineTask task : entry.getValue()) {
+                pipelineOperations.setTaskState(task, PipelineTask.State.ERROR);
+            }
 
             flush(); // push out the update
 
-            if (updatedTaskCount == 0) {
-                log.info("found NO rows for instanceNode = " + instanceNodeId
-                    + " for this worker with stale state");
-            } else {
-                log.info("found " + updatedTaskCount + " rows for instanceNode = " + instanceNodeId
-                    + " for this worker with stale state, these rows were reset to ERROR");
-            }
+            log.info("found " + staleCount + " rows for instanceNode = " + instanceNodeId
+                + " with stale state, these rows were reset to ERROR");
         }
         flush();
     }
 
-    private int performTaskReset(long instanceNodeId, boolean allStalledTasks, String taskIds) {
-        String stateConstraint = "";
-        String taskIdsConstraint = "";
-
-        State error = PipelineTask.State.ERROR;
-        State processing = PipelineTask.State.PROCESSING;
-        State submitted = PipelineTask.State.SUBMITTED;
-
-        if (allStalledTasks) {
-            stateConstraint = "and state = :submitted or state = :processing ";
-        } else {
-            stateConstraint = "and state = :submitted ";
-        }
-
-        if (taskIds != null) {
-            taskIdsConstraint = "and id in (" + taskIds + ") ";
-        }
-
-        Query q = createQuery("from PipelineTask where " + "pipelineInstanceNode = :instanceNode "
-            + stateConstraint + taskIdsConstraint);
-
-        q.setEntity("instanceNode", get(PipelineInstanceNode.class, instanceNodeId));
-        q.setParameter("submitted", submitted);
-        if (allStalledTasks) {
-            q.setParameter("processing", processing);
-        }
-        List<PipelineTask> tasks = list(q);
-        for (PipelineTask task : tasks) {
-            task.setState(error);
-            task.stopExecutionClock();
-        }
-
-        return tasks.size();
-    }
-
     /**
      * Gets the number of {@link PipelineTask}s associated with the given {@link PipelineInstance}.
-     *
-     * @param pipelineInstance the non-{@code null} {@link PipelineInstance}.
-     * @return the number of {@link PipelineTask}s.
-     * @throws HibernateException if there were problems retrieving the count of
-     * {@link PipelineTask} objects.
-     * @throws NullPointerException if {@code pipelineInstance} is {@code null}.
      */
-    public int taskCount(PipelineInstance pipelineInstance) {
-        if (pipelineInstance == null) {
-            throw new NullPointerException("pipelineInstance can't be null");
-        }
+    public long taskCount(PipelineInstance pipelineInstance) {
+        checkNotNull(pipelineInstance, "pipelineInstance");
 
-        Query query = createQuery("select count(id) from PipelineTask t "
-            + "where t.pipelineInstance = :pipelineInstance");
-        query.setParameter("pipelineInstance", pipelineInstance);
-        return ((Long) query.iterate().next()).intValue();
-    }
-
-    /**
-     * Gets a map containing the number of {@link PipelineTask}s associated with the given
-     * {@link PipelineInstance} for each state {@link State}. All known states are guaranteed to be
-     * found in the map, even if the count is 0.
-     *
-     * @param pipelineInstance the non-{@code null} {@link PipelineInstance}.
-     * @return the number of {@link PipelineTask}s.
-     * @throws HibernateException if there were problems retrieving the count of
-     * {@link PipelineTask} objects.
-     * @throws NullPointerException if {@code pipelineInstance} is {@code null}.
-     */
-    public Map<State, Integer> taskCountByState(PipelineInstance pipelineInstance) {
-        if (pipelineInstance == null) {
-            throw new NullPointerException("pipelineInstance can't be null");
-        }
+        ZiggyQuery<PipelineTask, Long> query = createZiggyQuery(PipelineTask.class, Long.class);
+        query.column(PipelineTask_.pipelineInstance).in(pipelineInstance);
+        query.count();
 
-        Query query = createQuery("select state, count(*) from PipelineTask t "
-            + "where t.pipelineInstance = :pipelineInstance " + "group by state");
-        query.setParameter("pipelineInstance", pipelineInstance);
+        return uniqueResult(query);
+    }
 
-        List<Object[]> list = list(query);
-        Map<State, Integer> taskCounts = new HashMap<>();
-        for (Object[] row : list) {
-            taskCounts.put((State) row[0], ((Long) row[1]).intValue());
-        }
+    public List<PipelineTask.State> retrieveStates(PipelineInstance pipelineInstance) {
+        ZiggyQuery<PipelineTask, PipelineTask.State> query = taskStateQuery();
+        query.column(PipelineTask_.pipelineInstance).in(pipelineInstance);
+        return list(query);
+    }
 
-        // Ensure that all states are covered.
-        for (State state : State.values()) {
-            if (taskCounts.get(state) == null) {
-                taskCounts.put(state, 0);
-            }
-        }
+    /** Helper function to generate a query that returns states for tasks. */
+    private ZiggyQuery<PipelineTask, PipelineTask.State> taskStateQuery() {
+        ZiggyQuery<PipelineTask, PipelineTask.State> query = createZiggyQuery(PipelineTask.class,
+            PipelineTask.State.class);
+        query.column(PipelineTask_.state).select();
+        return query;
+    }
 
-        return taskCounts;
+    public List<PipelineTask.State> retrieveStates(PipelineInstanceNode pipelineInstanceNode) {
+        ZiggyQuery<PipelineTask, PipelineTask.State> query = taskStateQuery();
+        query.column(PipelineTask_.pipelineInstanceNode).in(pipelineInstanceNode);
+        return list(query);
     }
 
     /**
@@ -487,12 +400,12 @@ public Map<State, Integer> taskCountByState(PipelineInstance pipelineInstance) {
      * @return List of pipeline node IDs, can be null.
      */
     public List<Long> retrievePipelineInstanceNodeIds(long pipelineInstanceId) {
-        Criteria criteria = createCriteria(PipelineTask.class);
-        criteria.createAlias("pipelineInstanceNode", "instanceNode");
-        criteria.createAlias("pipelineInstance", "instance");
-        criteria.add(Restrictions.eq("instance.id", pipelineInstanceId));
-        criteria.setProjection(Projections.distinct(Projections.property("instanceNode.id")));
-        return list(criteria);
+        ZiggyQuery<PipelineTask, Long> query = createZiggyQuery(PipelineTask.class, Long.class);
+        query.where(query.in(query.get(PipelineTask_.pipelineInstance).get(PipelineInstance_.id),
+            pipelineInstanceId));
+        query.select(query.get(PipelineTask_.pipelineInstanceNode).get(PipelineInstanceNode_.id));
+        query.distinct(true);
+        return list(query);
     }
 
     /**
@@ -503,31 +416,19 @@ public List<Long> retrievePipelineInstanceNodeIds(long pipelineInstanceId) {
      * @return count of the number of tasks in the given state for the given node ID.
      */
     public int retrieveStateCount(long nodeId, PipelineTask.State state) {
-        Criteria criteria = createCriteria(PipelineTask.class);
-        criteria.createAlias("pipelineInstanceNode", "instanceNode");
-        criteria.add(Restrictions.eq("instanceNode.id", nodeId));
-        criteria.add(Restrictions.eq("state", state));
-        criteria.setProjection(Projections.rowCount());
-        return toIntExact(uniqueResult(criteria));
-    }
-
-    /**
-     * Produces a {@link DetachedCriteria} that finds the IDs of {@link PipelineTask} instances with
-     * a given pipeline module name and pipeline instance ID. The detached criteria can be added as
-     * a subquery to other {@link Criteria} queries that need to select for task IDs based on
-     * instance ID and module name.
-     */
-    public static DetachedCriteria taskIdsForModuleAndInstance(String moduleName, long instanceId) {
-        DetachedCriteria criteria = DetachedCriteria.forClass(PipelineTask.class);
-        criteria.createAlias("pipelineInstance", "instance");
-        criteria.createAlias("pipelineInstanceNode", "node");
-        criteria.createAlias("node.pipelineModuleDefinition", "module");
-        criteria.add(Restrictions.eq("instance.id", instanceId));
-        criteria.add(Restrictions.eq("module.name.name", moduleName));
-        criteria.setProjection(Projections.distinct(Projections.property("id")));
-
-        return criteria;
 
+        // Note: the count() method causes the query to return a long, so it has to be cast to
+        // an int before returning.
+        ZiggyQuery<PipelineTask, Long> query = createZiggyQuery(PipelineTask.class, Long.class);
+        query.column(PipelineTask_.state).in(state);
+        query.where(query.in(
+            query.get(PipelineTask_.pipelineInstanceNode).get(PipelineInstanceNode_.id), nodeId));
+        query.count();
+        return uniqueResult(query).intValue();
     }
 
+    @Override
+    public Class<PipelineTask> componentClass() {
+        return PipelineTask.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskOperations.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskOperations.java
index cd2f491..a9e9ad1 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskOperations.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskOperations.java
@@ -34,7 +34,7 @@ public class PipelineTaskOperations {
      */
     public void createRemoteJobsFromQstat(long pipelineTaskId) {
 
-        DatabaseTransactionFactory.performTransactionInThread(() -> {
+        DatabaseTransactionFactory.performTransaction(() -> {
             PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
             PipelineTask databaseTask = pipelineTaskCrud.retrieve(pipelineTaskId);
             QueueCommandManager queueCommandManager = queueCommandManager();
@@ -126,5 +126,4 @@ public List<PipelineTask> updateJobs(PipelineInstance pipelineInstance) {
     QueueCommandManager queueCommandManager() {
         return QueueCommandManager.newInstance();
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ProcessingSummaryOperations.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ProcessingSummaryOperations.java
index 8b49f80..4087bb5 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ProcessingSummaryOperations.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/ProcessingSummaryOperations.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.pipeline.definition.crud;
 
-import static gov.nasa.ziggy.services.database.DatabaseTransactionFactory.performTransactionInThread;
+import static gov.nasa.ziggy.services.database.DatabaseTransactionFactory.performTransaction;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -9,7 +9,7 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
 import gov.nasa.ziggy.pipeline.definition.ProcessingState;
-import gov.nasa.ziggy.ui.proxy.ProcessingSummaryOpsProxy;
+import gov.nasa.ziggy.ui.util.proxy.ProcessingSummaryOpsProxy;
 
 /**
  * Supports updates to database values of {@link PipelineTask} fields that are associated with the
@@ -29,13 +29,13 @@ public ProcessingSummaryOperations() {
      */
     public void updateSubTaskCounts(final long taskId, final int numSubTasksTotal,
         final int numSubTasksComplete, final int numSubTasksFailed) {
-        performTransactionInThread(() -> {
+        performTransaction(() -> {
             PipelineTaskCrud crud = new PipelineTaskCrud();
             PipelineTask task = crud.retrieve(taskId);
             task.setCompletedSubtaskCount(numSubTasksComplete);
             task.setFailedSubtaskCount(numSubTasksFailed);
             task.setTotalSubtaskCount(numSubTasksTotal);
-            crud.update(task);
+            crud.merge(task);
             return null;
         });
     }
@@ -44,11 +44,11 @@ public void updateSubTaskCounts(final long taskId, final int numSubTasksTotal,
      * Update the processing state in the database.
      */
     public void updateProcessingState(final long taskId, final ProcessingState newState) {
-        performTransactionInThread(() -> {
+        performTransaction(() -> {
             PipelineTaskCrud crud = new PipelineTaskCrud();
             PipelineTask task = crud.retrieve(taskId);
             task.setProcessingState(newState);
-            crud.update(task);
+            crud.merge(task);
             return null;
         });
     }
@@ -57,8 +57,7 @@ public void updateProcessingState(final long taskId, final ProcessingState newSt
      * Retrieve the current processing state from the database.
      */
     public ProcessingSummary processingSummary(long taskId) {
-        return (ProcessingSummary) performTransactionInThread(
-            () -> processingSummaryInternal(taskId));
+        return (ProcessingSummary) performTransaction(() -> processingSummaryInternal(taskId));
     }
 
     /**
@@ -78,7 +77,7 @@ public ProcessingSummary processingSummaryInternal(long taskId) {
     @SuppressWarnings("unchecked")
     public Map<Long, ProcessingSummary> processingSummaries(
         Collection<PipelineTask> pipelineTasks) {
-        return (Map<Long, ProcessingSummary>) performTransactionInThread(
+        return (Map<Long, ProcessingSummary>) performTransaction(
             () -> processingSummariesInternal(pipelineTasks));
     }
 
@@ -106,5 +105,4 @@ public Map<Long, ProcessingSummary> processingSummariesForInstanceInternal(long
         return processingSummariesInternal(
             new PipelineTaskCrud().retrieveTasksForInstance(instanceId));
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/UniqueNameVersionPipelineComponentCrud.java b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/UniqueNameVersionPipelineComponentCrud.java
new file mode 100644
index 0000000..537a051
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/pipeline/definition/crud/UniqueNameVersionPipelineComponentCrud.java
@@ -0,0 +1,181 @@
+package gov.nasa.ziggy.pipeline.definition.crud;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.definition.UniqueNameVersionPipelineComponent;
+import gov.nasa.ziggy.pipeline.definition.UniqueNameVersionPipelineComponent_;
+
+/**
+ * Superclass for CRUD methods that support {@link UniqueNameVersionPipelineComponent} classes.
+ * <p>
+ * Subclasses of {@link UniqueNameVersionPipelineComponent} have some specialized rules for their
+ * database tables. Most relevant is that any changes made to an instance that is locked cannot be
+ * persisted to the locked instance in the database, but must be saved as an unlocked instance with
+ * a new version number. The methods of this class ensure that these requirements are met.
+ *
+ * @author PT
+ */
+public abstract class UniqueNameVersionPipelineComponentCrud<U extends UniqueNameVersionPipelineComponent<U>>
+    extends AbstractCrud<U> {
+
+    /**
+     * Populates XML fields for an instance.
+     * <p>
+     * The issue here is that the instance fields that are used by the database and the instance
+     * fields that are used when serializing to XML are not the same. Classes for which this is true
+     * require logic that populates the latter from the former, which in turn means that the CRUD
+     * class must also populate the latter from the former so that an instance that's returned from
+     * a CRUD class is ready to be serialized if so desired.
+     */
+    protected abstract void populateXmlFields(Collection<U> objects);
+
+    /**
+     * Retrieves the latest version for a given name.
+     */
+    public U retrieveLatestVersionForName(String name) {
+
+        // I can't figure out how to do this in 1 query, so I'm going to use 2.
+        // TODO: refactor to subquery.
+        ZiggyQuery<U, Integer> versionQuery = createZiggyQuery(componentClass(), Integer.class);
+        versionQuery.column(UniqueNameVersionPipelineComponent_.NAME).in(name);
+        versionQuery.column(UniqueNameVersionPipelineComponent_.VERSION).max();
+        Integer maxVersionForName = uniqueResult(versionQuery);
+
+        if (maxVersionForName == null) {
+            return null;
+        }
+
+        ZiggyQuery<U, U> query = createZiggyQuery(componentClass());
+        query.column(UniqueNameVersionPipelineComponent_.NAME).in(name);
+        query.column(UniqueNameVersionPipelineComponent_.VERSION).in(maxVersionForName);
+        U result = uniqueResult(query);
+        populateXmlFields(List.of(result));
+
+        return result;
+    }
+
+    /**
+     * Retrieve all database instances for the specified name.
+     */
+    public List<U> retrieveAllVersionsForName(String name) {
+        ZiggyQuery<U, U> query = createZiggyQuery(componentClass());
+        query.column(UniqueNameVersionPipelineComponent_.NAME).in(name);
+        List<U> results = list(query);
+        populateXmlFields(results);
+        return results;
+    }
+
+    /**
+     * Retrieves the unique list of names of all instances.
+     */
+    public List<String> retrieveNames() {
+        ZiggyQuery<U, String> query = createZiggyQuery(componentClass(), String.class);
+        query.column(UniqueNameVersionPipelineComponent_.NAME).select().distinct(true);
+        return list(query);
+    }
+
+    /**
+     * Retrieves the latest versions of the class across all names in use in the database.
+     */
+    public List<U> retrieveLatestVersions() {
+        List<String> names = retrieveNames();
+        List<U> results = new ArrayList<>();
+        for (String name : names) {
+            results.add(retrieveLatestVersionForName(name));
+        }
+        populateXmlFields(results);
+        return results;
+    }
+
+    /**
+     * Renames an instance. The new name must not be a name that is already in use in the database.
+     * Because the object is saved to a new name, its version is set to zero and its lock status is
+     * set to unlocked.
+     *
+     * @return the merged instance, which should be used in lieu of {@code pipelineComponent}
+     */
+    public U rename(U pipelineComponent, String newName) {
+        String oldName = pipelineComponent.getName();
+
+        // If the name is changed, the new name isn't allowed to conflict with
+        // any existing pipeline definition names.
+        if (!newName.equals(oldName) && retrieveLatestVersionForName(newName) != null) {
+            throw new PipelineException("Unable to change name of "
+                + componentNameForExceptionMessages() + " from " + oldName + " to " + newName
+                + " due to conflict with existing definition in database");
+        }
+
+        pipelineComponent = pipelineComponent.rename(newName);
+        return super.merge(pipelineComponent);
+    }
+
+    /**
+     * Persists or merges an object into the database, as appropriate, with persist semantics. That
+     * means that updates to the persisted object will be persisted as well.
+     *
+     * @see #merge(Object)
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void persist(Object o) {
+        persistOrMerge((U) o);
+    }
+
+    /**
+     * Persists or merges an object into the database, as appropriate, with merge semantics. That
+     * means that updates to the persisted object are not guaranteed to be persisted; update the
+     * returned object instead.
+     * <p>
+     * If the database currently contains no objects that share the name of the argument object, the
+     * argument object is created via {@link AbstractCrud#persist(Object)} and the original object
+     * is returned. If the database contains an object that shares the name, then one of two things
+     * happens:
+     * <ol>
+     * <li>If the instance in the database is unlocked, the argument object is merged into the
+     * database object via {@link AbstractCrud#merge(Object)}. The persistent instance is returned.
+     * <li>If the instance in the database is locked, the argument object's version number is set 1
+     * higher than that of the database object, and the new object is persisted via
+     * {@link AbstractCrud#merge(Object)}. The persistent instance is returned. Note that in this
+     * case, we're taking advantage of the fact that merge can also be used to persist an object in
+     * the database, with some caveats.
+     * <ol>
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T merge(T o) {
+        return (T) persistOrMerge((U) o);
+    }
+
+    private U persistOrMerge(U pipelineComponent) {
+
+        U latestVersion = retrieveLatestVersionForName(pipelineComponent.getName());
+
+        // If there's nothing at all in the database, we persist.
+        if (latestVersion == null) {
+            super.persist(pipelineComponent);
+            return pipelineComponent;
+        }
+
+        // If the latest version and the pipelineComponent are identical, there's
+        // no need to do anything.
+        if (pipelineComponent.totalEquals(latestVersion)) {
+            return pipelineComponent;
+        }
+
+        // If there's an instance in the database, we take the one that needs to go
+        // to the database and set its version as needed; then merge it.
+        U unlockedVersion = pipelineComponent.unlockedVersion();
+        return super.merge(unlockedVersion);
+    }
+
+    /**
+     * String that can be used in exception messages so that the messages are properly customized to
+     * the component class and CRUD class that are causing the exception.
+     */
+    public abstract String componentNameForExceptionMessages();
+}
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/xml/ValidatingXmlManager.java b/src/main/java/gov/nasa/ziggy/pipeline/xml/ValidatingXmlManager.java
index 04b2fb3..18bc4b4 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/xml/ValidatingXmlManager.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/xml/ValidatingXmlManager.java
@@ -11,7 +11,10 @@
 
 import org.xml.sax.SAXException;
 
+import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
@@ -30,34 +33,52 @@ public class ValidatingXmlManager<T extends HasXmlSchemaFilename> {
     private final Unmarshaller unmarshaller;
     private final Marshaller marshaller;
 
-    public ValidatingXmlManager(Class<T> clazz) throws InstantiationException,
-        IllegalAccessException, SAXException, JAXBException, IllegalArgumentException,
-        InvocationTargetException, NoSuchMethodException, SecurityException {
-
-        // Generate a schema for validation
-        SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        String ziggySchemaDir = DirectoryProperties.ziggySchemaDir().toString();
-        String schemaFilename = clazz.getDeclaredConstructor().newInstance().getXmlSchemaFilename();
-        Path schemaPath = Paths.get(ziggySchemaDir, "xml", schemaFilename);
-        Schema schema = schemaFactory.newSchema(schemaPath.toFile());
-
-        // Generate marshaller and unmarshaller
-        JAXBContext context = JAXBContext.newInstance(clazz);
-        unmarshaller = context.createUnmarshaller();
-        unmarshaller.setSchema(schema);
-
-        marshaller = context.createMarshaller();
-        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-        marshaller.setSchema(schema);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public ValidatingXmlManager(Class<T> clazz) {
+
+        try {
+            // Generate a schema for validation
+            SchemaFactory schemaFactory = SchemaFactory
+                .newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            String ziggySchemaDir = DirectoryProperties.ziggySchemaDir().toString();
+            String schemaFilename = clazz.getDeclaredConstructor()
+                .newInstance()
+                .getXmlSchemaFilename();
+            Path schemaPath = Paths.get(ziggySchemaDir, "xml", schemaFilename);
+            Schema schema = schemaFactory.newSchema(schemaPath.toFile());
+
+            // Generate marshaller and unmarshaller
+            JAXBContext context = JAXBContext.newInstance(clazz);
+            unmarshaller = context.createUnmarshaller();
+            unmarshaller.setSchema(schema);
+
+            marshaller = context.createMarshaller();
+            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+            marshaller.setSchema(schema);
+        } catch (JAXBException | SAXException | InstantiationException | IllegalAccessException
+            | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+            | SecurityException e) {
+            throw new PipelineException(
+                "Unable to instantiate ValidatingXmlManager for " + clazz.getName(), e);
+        }
     }
 
     @SuppressWarnings("unchecked")
-    public T unmarshal(File xmlFile) throws JAXBException {
-        return (T) unmarshaller.unmarshal(xmlFile);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public T unmarshal(File xmlFile) {
+        try {
+            return (T) unmarshaller.unmarshal(xmlFile);
+        } catch (JAXBException e) {
+            throw new PipelineException("Unable to unmarshal " + xmlFile.toString(), e);
+        }
     }
 
-    public void marshal(T object, File file) throws JAXBException {
-        marshaller.marshal(object, file);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void marshal(T object, File file) {
+        try {
+            marshaller.marshal(object, file);
+        } catch (JAXBException e) {
+            throw new PipelineException("Unable to marshal to " + file.toString(), e);
+        }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/xml/XmlReference.java b/src/main/java/gov/nasa/ziggy/pipeline/xml/XmlReference.java
index de0383c..687885c 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/xml/XmlReference.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/xml/XmlReference.java
@@ -50,7 +50,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         XmlReference other = (XmlReference) obj;
@@ -64,7 +64,6 @@ public InputTypeReference() {
         public InputTypeReference(String name) {
             super(name);
         }
-
     }
 
     public static class OutputTypeReference extends XmlReference {
@@ -74,7 +73,6 @@ public OutputTypeReference() {
         public OutputTypeReference(String name) {
             super(name);
         }
-
     }
 
     public static class ModelTypeReference extends XmlReference {
@@ -84,6 +82,14 @@ public ModelTypeReference() {
         public ModelTypeReference(String name) {
             super(name);
         }
+    }
 
+    public static class ParameterSetReference extends XmlReference {
+        public ParameterSetReference() {
+        }
+
+        public ParameterSetReference(String name) {
+            super(name);
+        }
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/pipeline/xml/XmlSchemaExporter.java b/src/main/java/gov/nasa/ziggy/pipeline/xml/XmlSchemaExporter.java
index 7c87562..7e85396 100644
--- a/src/main/java/gov/nasa/ziggy/pipeline/xml/XmlSchemaExporter.java
+++ b/src/main/java/gov/nasa/ziggy/pipeline/xml/XmlSchemaExporter.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -57,6 +57,8 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionFile;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 import gov.nasa.ziggy.services.events.ZiggyEventHandlerFile;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.SchemaOutputResolver;
@@ -79,16 +81,21 @@ public class XmlSchemaExporter {
     private static final String DEFAULT_XSD_FILE_NAME = "default.xsd";
     private static String destinationDirectory;
 
-    public static void main(String[] args) throws JAXBException, IOException {
-
-        String xmlDir = DirectoryProperties.ziggySchemaBuildDir().toString();
-        destinationDirectory = Paths.get(xmlDir, "xml").toString();
-        new File(destinationDirectory).mkdirs();
-        for (Class<? extends HasXmlSchemaFilename> clazz : XmlSchemaExporter.schemaClasses()) {
-            log.info("Generating XML schema for class " + clazz.getName() + "...");
-            JAXBContext context = JAXBContext.newInstance(clazz);
-            context.generateSchema(new PipelineDefinitionSchemaResolver(clazz));
-            log.info("Generating XML schema for class " + clazz.getName() + "...done");
+    @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
+    public static void main(String[] args) {
+        try {
+            String xmlDir = DirectoryProperties.ziggySchemaBuildDir().toString();
+            destinationDirectory = Paths.get(xmlDir, "xml").toString();
+            new File(destinationDirectory).mkdirs();
+            for (Class<? extends HasXmlSchemaFilename> clazz : XmlSchemaExporter.schemaClasses()) {
+                log.info("Generating XML schema for class " + clazz.getName() + "...");
+                JAXBContext context = JAXBContext.newInstance(clazz);
+                context.generateSchema(new PipelineDefinitionSchemaResolver(clazz));
+                log.info("Generating XML schema for class " + clazz.getName() + "...done");
+            }
+        } catch (IOException | JAXBException e) {
+            log.error("Unable to generate schema", e);
+            System.exit(1);
         }
     }
 
@@ -107,6 +114,7 @@ public PipelineDefinitionSchemaResolver() {
             schemaFilename = DEFAULT_XSD_FILE_NAME;
         }
 
+        @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
         public PipelineDefinitionSchemaResolver(Class<? extends HasXmlSchemaFilename> clazz) {
             try {
                 schemaFilename = clazz.getDeclaredConstructor()
@@ -120,6 +128,10 @@ public PipelineDefinitionSchemaResolver(Class<? extends HasXmlSchemaFilename> cl
         }
 
         @Override
+        /**
+         * @throws IOException for compatibility with the
+         * {@link SchemaOutputResolver#createOutput(String, String)} method in the superclass.
+         */
         public Result createOutput(String namespaceUri, String suggestedFileName)
             throws IOException {
             File schemaFile = new File(destinationDirectory, schemaFilename);
diff --git a/src/main/java/gov/nasa/ziggy/services/AbstractService.java b/src/main/java/gov/nasa/ziggy/services/AbstractService.java
deleted file mode 100644
index 09f94a0..0000000
--- a/src/main/java/gov/nasa/ziggy/services/AbstractService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package gov.nasa.ziggy.services;
-
-import gov.nasa.ziggy.module.PipelineException;
-
-/**
- * @author Todd Klaus
- */
-public interface AbstractService {
-    void initialize() throws PipelineException;
-
-    boolean isInitialized() throws PipelineException;
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/alert/Alert.java b/src/main/java/gov/nasa/ziggy/services/alert/Alert.java
index 97609cf..65b9406 100644
--- a/src/main/java/gov/nasa/ziggy/services/alert/Alert.java
+++ b/src/main/java/gov/nasa/ziggy/services/alert/Alert.java
@@ -3,13 +3,14 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 
+import gov.nasa.ziggy.services.messages.AlertMessage;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+
 /**
  * Contains alert data. Shared by {@link Alert} (used to store alert data in the database) and
  * {@link AlertMessage} (used to broadcast alert data).
@@ -20,7 +21,7 @@
 public class Alert implements Serializable {
     private static final Logger log = LoggerFactory.getLogger(Alert.class);
 
-    private static final long serialVersionUID = -6630368734502687993L;
+    private static final long serialVersionUID = 20230511L;
 
     private static final int MAX_MESSAGE_LENGTH = 4000;
 
@@ -29,7 +30,7 @@ public class Alert implements Serializable {
     private long sourceTaskId = -1;
     private String processName = null;
     private String processHost = null;
-    private int processId = -1;
+    private long processId = -1;
     private String severity = Level.ERROR.toString();
     @Column(nullable = true, length = MAX_MESSAGE_LENGTH)
     private String message = null;
@@ -38,7 +39,7 @@ public Alert() {
     }
 
     public Alert(Date timestamp, String sourceComponent, long sourceTaskId, String processName,
-        String processHost, int processId, String message) {
+        String processHost, long processId, String message) {
         this.timestamp = timestamp;
         this.sourceComponent = sourceComponent;
         this.sourceTaskId = sourceTaskId;
@@ -51,7 +52,7 @@ public Alert(Date timestamp, String sourceComponent, long sourceTaskId, String p
     }
 
     public Alert(Date timestamp, String sourceComponent, long sourceTaskId, String processName,
-        String processHost, int processId, String severity, String message) {
+        String processHost, long processId, String severity, String message) {
         this.timestamp = timestamp;
         this.sourceComponent = sourceComponent;
         this.sourceTaskId = sourceTaskId;
@@ -75,7 +76,7 @@ private void validateMessageLength() {
         }
     }
 
-    public int getProcessId() {
+    public long getProcessId() {
         return processId;
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/services/alert/AlertLog.java b/src/main/java/gov/nasa/ziggy/services/alert/AlertLog.java
index 30cd3d5..f5c44a9 100644
--- a/src/main/java/gov/nasa/ziggy/services/alert/AlertLog.java
+++ b/src/main/java/gov/nasa/ziggy/services/alert/AlertLog.java
@@ -1,24 +1,24 @@
 package gov.nasa.ziggy.services.alert;
 
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 /**
  * @author Todd Klaus
  */
 @Entity
-@Table(name = "PI_ALERT")
+@Table(name = "ziggy_AlertLog")
 public class AlertLog {
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_PD_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ziggy_AlertLog_generator")
+    @SequenceGenerator(name = "ziggy_AlertLog_generator", initialValue = 1,
+        sequenceName = "ziggy_AlertLog_sequence", allocationSize = 1)
+    private Long id;
 
     @Embedded
     private Alert alertData;
@@ -36,7 +36,7 @@ public AlertLog(Alert alertData) {
     /**
      * @return the id
      */
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/services/alert/AlertLogCrud.java b/src/main/java/gov/nasa/ziggy/services/alert/AlertLogCrud.java
index 227b81d..fb76dba 100644
--- a/src/main/java/gov/nasa/ziggy/services/alert/AlertLogCrud.java
+++ b/src/main/java/gov/nasa/ziggy/services/alert/AlertLogCrud.java
@@ -1,20 +1,21 @@
 package gov.nasa.ziggy.services.alert;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
-import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
-import org.hibernate.SQLQuery;
-import org.hibernate.criterion.Disjunction;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
 
 import gov.nasa.ziggy.collections.ListChunkIterator;
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.services.database.DatabaseService;
 
 /**
@@ -23,7 +24,7 @@
  * @author Bill Wohler
  * @author Todd Klaus
  */
-public class AlertLogCrud extends AbstractCrud {
+public class AlertLogCrud extends AbstractCrud<AlertLog> {
     /**
      * Creates an {@link AlertLogCrud} object.
      */
@@ -47,10 +48,12 @@ public AlertLogCrud(DatabaseService databaseService) {
      * @throws HibernateException if there were problems accessing the database
      */
     public List<String> retrieveComponents() {
-        Criteria query = createCriteria(AlertLog.class);
-        query.setProjection(Projections
-            .distinct(Projections.groupProperty("alertData.sourceComponent").as("component")));
-        query.addOrder(Order.asc("component"));
+        ZiggyQuery<AlertLog, String> query = createZiggyQuery(AlertLog.class, String.class);
+        query.select(query.get(AlertLog_.alertData).get(Alert_.sourceComponent));
+        query.getCriteriaQuery()
+            .orderBy(
+                query.getBuilder().asc(query.get(AlertLog_.alertData).get(Alert_.sourceComponent)));
+        query.distinct(true);
         return list(query);
     }
 
@@ -62,10 +65,12 @@ public List<String> retrieveComponents() {
      * @throws HibernateException if there were problems accessing the database
      */
     public List<String> retrieveSeverities() {
-        Criteria query = createCriteria(AlertLog.class);
-        query.setProjection(
-            Projections.distinct(Projections.groupProperty("alertData.severity").as("severity")));
-        query.addOrder(Order.asc("severity"));
+        ZiggyQuery<AlertLog, String> query = createZiggyQuery(AlertLog.class, String.class);
+        query.select(query.get(AlertLog_.alertData).get(Alert_.severity));
+        query.getCriteriaQuery()
+            .orderBy(
+                query.getBuilder().asc(query.getRoot().get("alertData").<String> get("severity")));
+        query.distinct(true);
         return list(query);
     }
 
@@ -96,42 +101,28 @@ public List<AlertLog> retrieve(Date startDate, Date endDate) {
      */
     public List<AlertLog> retrieve(Date startDate, Date endDate, String[] components,
         String[] severities) {
-        if (startDate == null) {
-            throw new NullPointerException("startDate can't be null");
-        }
-        if (endDate == null) {
-            throw new NullPointerException("endDate can't be null");
-        }
-        if (components == null) {
-            throw new NullPointerException("components can't be null");
-        }
-        if (severities == null) {
-            throw new NullPointerException("severities can't be null");
-        }
-
-        Criteria query = createCriteria(AlertLog.class);
-        query.add(Restrictions.ge("alertData.timestamp", startDate));
-        query.add(Restrictions.le("alertData.timestamp", endDate));
-
+        checkNotNull(components, "components");
+        checkNotNull(severities, "severities");
+        checkNotNull(startDate, "startDate");
+        checkNotNull(endDate, "endDate");
+
+        ZiggyQuery<AlertLog, AlertLog> query = createZiggyQuery(AlertLog.class);
+        query.where(query.getBuilder()
+            .between(query.get(AlertLog_.alertData).get(Alert_.timestamp), startDate, endDate));
         if (components.length > 0) {
-            Disjunction componentCriteria = Restrictions.disjunction();
-            for (String component : components) {
-                componentCriteria.add(Restrictions.eq("alertData.sourceComponent", component));
-            }
-            query.add(componentCriteria);
+            query.where(query.in(query.get(AlertLog_.alertData).get(Alert_.sourceComponent),
+                Arrays.asList(components)));
         }
-
         if (severities.length > 0) {
-            Disjunction severityCriteria = Restrictions.disjunction();
-            for (String severity : severities) {
-                severityCriteria.add(Restrictions.eq("alertData.severity", severity));
-            }
-            query.add(severityCriteria);
+            query.where(query.in(query.get(AlertLog_.alertData).get(Alert_.severity),
+                Arrays.asList(severities)));
         }
 
-        query.addOrder(Order.asc("alertData.sourceComponent"));
-        query.addOrder(Order.asc("alertData.severity"));
-        query.addOrder(Order.asc("alertData.timestamp"));
+        query.getCriteriaQuery()
+            .orderBy(
+                query.getBuilder().asc(query.get(AlertLog_.alertData).get(Alert_.sourceComponent)),
+                query.getBuilder().asc(query.get(AlertLog_.alertData).get(Alert_.severity)),
+                query.getBuilder().asc(query.get(AlertLog_.alertData).get(Alert_.timestamp)));
 
         return list(query);
     }
@@ -143,11 +134,15 @@ public List<AlertLog> retrieve(Date startDate, Date endDate, String[] components
      * @return
      */
     public List<AlertLog> retrieveForPipelineInstance(long pipelineInstanceId) {
-        SQLQuery query = createSQLQuery("select * from PI_ALERT a, PI_PIPELINE_TASK t "
-            + "where t.PI_PIPELINE_INSTANCE_ID = :pipelineInstanceId and t.ID = a.SOURCE_TASK_ID "
-            + "order by a.SOURCE_TASK_ID");
-        query.addEntity(AlertLog.class);
-        query.setLong("pipelineInstanceId", pipelineInstanceId);
+
+        // I don't know how to do this as one query, so I'm doing it as two.
+        List<PipelineTask> tasksInInstance = new PipelineTaskCrud()
+            .retrieveTasksForInstance(pipelineInstanceId);
+        List<Long> taskIds = tasksInInstance.stream()
+            .map(PipelineTask::getId)
+            .collect(Collectors.toList());
+        ZiggyQuery<AlertLog, AlertLog> query = createZiggyQuery(AlertLog.class);
+        query.where(query.in(query.get(AlertLog_.alertData).get(Alert_.sourceTaskId), taskIds));
 
         return list(query);
     }
@@ -165,9 +160,14 @@ public List<AlertLog> retrieveByPipelineTaskIds(Collection<Long> taskIds) {
     }
 
     private List<AlertLog> retrieveChunk(List<Long> taskIds) {
-        Criteria query = createCriteria(AlertLog.class);
-        query.add(Restrictions.in("alertData.sourceTaskId", taskIds));
+        ZiggyQuery<AlertLog, AlertLog> query = createZiggyQuery(AlertLog.class);
+        query.where(query.in(query.get(AlertLog_.alertData).get(Alert_.sourceTaskId), taskIds));
 
         return list(query);
     }
+
+    @Override
+    public Class<AlertLog> componentClass() {
+        return AlertLog.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/alert/AlertMessage.java b/src/main/java/gov/nasa/ziggy/services/alert/AlertMessage.java
deleted file mode 100644
index 2e16149..0000000
--- a/src/main/java/gov/nasa/ziggy/services/alert/AlertMessage.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package gov.nasa.ziggy.services.alert;
-
-import gov.nasa.ziggy.services.messages.PipelineMessage;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-
-public class AlertMessage extends PipelineMessage {
-    private static final long serialVersionUID = 20210318L;
-
-    private final Alert alertData;
-
-    public AlertMessage(Alert alertData) {
-        this.alertData = alertData;
-    }
-
-    public Alert getAlertData() {
-        return alertData;
-    }
-
-    @Override
-    public Object handleMessage(MessageHandler handler) {
-
-        handler.handleAlert(this);
-        return null;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/alert/AlertService.java b/src/main/java/gov/nasa/ziggy/services/alert/AlertService.java
index a237d4a..108e701 100644
--- a/src/main/java/gov/nasa/ziggy/services/alert/AlertService.java
+++ b/src/main/java/gov/nasa/ziggy/services/alert/AlertService.java
@@ -4,15 +4,19 @@
 import java.net.UnknownHostException;
 import java.util.Date;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.services.messaging.WorkerCommunicator;
+import gov.nasa.ziggy.services.messages.AlertMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
 import gov.nasa.ziggy.services.process.AbstractPipelineProcess;
 import gov.nasa.ziggy.services.process.ProcessInfo;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Alert service implementation.
@@ -31,8 +35,7 @@ public String toString() {
 
     private static final Logger log = LoggerFactory.getLogger(AlertService.class);
 
-    public static final String BROADCAST_ENABLED_PROP = "pi.alerts.jmsBroadcast.enabled";
-    public static final boolean BROADCAST_ENABLED_DEFAULT = false;
+    public static final boolean BROADCAST_ALERTS_ENABLED_DEFAULT = false;
 
     public boolean broadcastEnabled = false;
 
@@ -50,12 +53,9 @@ public static synchronized AlertService getInstance() {
     }
 
     public AlertService() {
-        Configuration configService = ZiggyConfiguration.getInstance();
-        try {
-            broadcastEnabled = configService.getBoolean(BROADCAST_ENABLED_PROP,
-                BROADCAST_ENABLED_DEFAULT);
-        } catch (Exception ignore) {
-        }
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+        broadcastEnabled = config.getBoolean(PropertyName.BROADCAST_ALERTS_ENABLED.property(),
+            BROADCAST_ALERTS_ENABLED_DEFAULT);
     }
 
     public void generateAlert(String sourceComponent, String message) {
@@ -83,6 +83,8 @@ public void generateAndBroadcastAlert(String sourceComponent, long sourceTaskId,
         broadcastEnabled = storedBroadcastFlag;
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public void generateAlert(String sourceComponent, long sourceTaskId,
         AlertService.Severity severity, String message) {
         log.debug("ALERT:[" + sourceComponent + "]: " + message);
@@ -90,7 +92,7 @@ public void generateAlert(String sourceComponent, long sourceTaskId,
         Date timestamp = new Date();
         String processName = null;
         String processHost = null;
-        int processId = -1;
+        long processId = -1;
 
         // get ProcessInfo, if available
         ProcessInfo processInfo = AbstractPipelineProcess.getProcessInfo();
@@ -103,7 +105,9 @@ public void generateAlert(String sourceComponent, long sourceTaskId,
             try {
                 processHost = InetAddress.getLocalHost().getHostName();
             } catch (UnknownHostException e) {
-                log.warn("failed to get hostname", e);
+                // This can never occur. The localhost will always have a correctly
+                // configured host name.
+                throw new AssertionError(e);
             }
         }
 
@@ -113,19 +117,13 @@ public void generateAlert(String sourceComponent, long sourceTaskId,
         // store alert in db
         try {
             AlertLogCrud alertCrud = new AlertLogCrud();
-            alertCrud.create(new AlertLog(alertData));
+            alertCrud.persist(new AlertLog(alertData));
         } catch (PipelineException e) {
             log.error("Failed to store Alert in database", e);
         }
 
         if (broadcastEnabled || severity == AlertService.Severity.INFRASTRUCTURE) {
-            // broadcast alert on MessagingService
-            try {
-                WorkerCommunicator.broadcast(new AlertMessage(alertData));
-            } catch (PipelineException e) {
-                log.error("Failed to broadcast Alert", e);
-            }
+            ZiggyMessenger.publish(new AlertMessage(alertData));
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/config/ConfigMerge.java b/src/main/java/gov/nasa/ziggy/services/config/ConfigMerge.java
index 4818ce4..1ed8b93 100644
--- a/src/main/java/gov/nasa/ziggy/services/config/ConfigMerge.java
+++ b/src/main/java/gov/nasa/ziggy/services/config/ConfigMerge.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -37,13 +37,20 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.UncheckedIOException;
 
-import org.apache.commons.configuration.ConfigurationUtils;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.fluent.Configurations;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
@@ -65,34 +72,42 @@ public ConfigMerge(String basePath, String overridePath, String mergedPath) {
         this.mergedPath = mergedPath;
     }
 
-    public void merge() throws Exception {
-        // Read base file
-        File baseFile = new File(basePath);
-        if (!baseFile.exists()) {
-            throw new Exception("baseFile: " + baseFile + " does not exist");
-        }
-
-        log.info("reading base file: " + baseFile);
-        PropertiesConfiguration baseConfig = new PropertiesConfiguration(baseFile);
-
-        // Read the override file
-        File overrideFile = new File(overridePath);
-        if (!overrideFile.exists()) {
-            throw new Exception("overrideFile: " + overrideFile + " does not exist");
-        }
-
-        log.info("reading override file: " + overrideFile);
-        PropertiesConfiguration overrideConfig = new PropertiesConfiguration(overrideFile);
-
-        // Copy the override properties to the base config
-        ConfigurationUtils.copy(overrideConfig, baseConfig);
-
-        // Write out the merged config .properties file
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void merge() {
         File mergedFile = new File(mergedPath);
-        log.info("writing merged file: " + mergedFile);
-        BufferedWriter outputWriter = new BufferedWriter(
-            new OutputStreamWriter(new FileOutputStream(mergedFile), FileUtil.ZIGGY_CHARSET));
-        baseConfig.save(outputWriter);
+        try {
+            // Read base file
+            File baseFile = new File(basePath);
+            if (!baseFile.exists()) {
+                throw new PipelineException("baseFile: " + baseFile + " does not exist");
+            }
+
+            log.info("reading base file: " + baseFile);
+            PropertiesConfiguration baseConfig = new Configurations().properties(baseFile);
+
+            // Read the override file
+            File overrideFile = new File(overridePath);
+            if (!overrideFile.exists()) {
+                throw new PipelineException("overrideFile: " + overrideFile + " does not exist");
+            }
+
+            log.info("reading override file: " + overrideFile);
+            PropertiesConfiguration overrideConfig = new Configurations().properties(overrideFile);
+
+            // Copy the override properties to the base config
+            ConfigurationUtils.copy(overrideConfig, baseConfig);
+
+            // Write out the merged config .properties file
+            log.info("writing merged file: " + mergedFile);
+            BufferedWriter outputWriter = new BufferedWriter(
+                new OutputStreamWriter(new FileOutputStream(mergedFile), FileUtil.ZIGGY_CHARSET));
+            baseConfig.write(outputWriter);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to write to file " + mergedFile.toString(), e);
+        } catch (ConfigurationException e) {
+            throw new PipelineException("Unable to construct PropertiesConfiguration instance", e);
+        }
     }
 
     /**
diff --git a/src/main/java/gov/nasa/ziggy/services/config/ConfigOps.java b/src/main/java/gov/nasa/ziggy/services/config/ConfigOps.java
index 9fa26d1..f685244 100644
--- a/src/main/java/gov/nasa/ziggy/services/config/ConfigOps.java
+++ b/src/main/java/gov/nasa/ziggy/services/config/ConfigOps.java
@@ -2,11 +2,14 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 
 import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Some additional operations over a Configuration object.
@@ -16,7 +19,7 @@
 public class ConfigOps {
 
     /**
-     * Gets a directory property from the ConfigurationService as a File without creating the
+     * Gets a directory property from the Ziggy configuration as a File without creating the
      * directory. This is equivelent to getDirectory(propName, false)
      *
      * @param propName a property name
@@ -27,16 +30,17 @@ public static File getDirectory(String propName) {
     }
 
     /**
-     * Gets a directory property from the ConfigurationService as a File optionally creating it.
+     * Gets a directory property from the Ziggy configuration as a File optionally creating it.
      *
      * @param propName a property name
      * @param makeDirIfNonexistent When true and the value of this property does not exist as a
      * directory then one is created with mkdirs().
      * @return non-null
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public static File getDirectory(String propName, boolean makeDirIfNonexistent) {
 
-        Configuration configuration = ZiggyConfiguration.getInstance();
+        ImmutableConfiguration configuration = ZiggyConfiguration.getInstance();
         if (!configuration.containsKey(propName)) {
             throw new PipelineException("Required config property not found: " + propName);
         }
@@ -51,8 +55,7 @@ public static File getDirectory(String propName, boolean makeDirIfNonexistent) {
             try {
                 Files.createDirectories(dir.toPath());
             } catch (IOException e) {
-                throw new PipelineException("Failed to create direcotry " + dirName
-                    + " specified in property " + propName + ".", e);
+                throw new UncheckedIOException("Unable to create directory " + dir.toString(), e);
             }
         }
         if (!dir.isDirectory()) {
diff --git a/src/main/java/gov/nasa/ziggy/services/config/ConfigurationValue.java b/src/main/java/gov/nasa/ziggy/services/config/ConfigurationValue.java
deleted file mode 100644
index 144f7cd..0000000
--- a/src/main/java/gov/nasa/ziggy/services/config/ConfigurationValue.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package gov.nasa.ziggy.services.config;
-
-/**
- * Implements a wrapper around a configuration value.
- */
-public class ConfigurationValue {
-
-    private String propertyName;
-    private String defaultValue;
-    private Class<?> type;
-
-    public ConfigurationValue(String propertyName, String defaultValue, Class<?> type) {
-        this.propertyName = propertyName;
-        this.defaultValue = defaultValue;
-        this.type = type;
-
-        checkDefaultValue(defaultValue, type);
-    }
-
-    private void checkDefaultValue(String defaultValue, Class<?> type) {
-        if (type == Integer.TYPE) {
-            Integer.parseInt(defaultValue);
-        } else if (type == Long.TYPE) {
-            Long.parseLong(defaultValue);
-        } else if (type == Boolean.TYPE) {
-            Boolean.parseBoolean(defaultValue);
-        } // Else no checking is performed.
-    }
-
-    private void checkAccessType(Class<?> attemptedType) {
-        if (attemptedType != type) {
-            throw new WrongParameterTypeException(propertyName, type);
-        }
-    }
-
-    /**
-     * Gets the configuration parameter value, as a string.
-     *
-     * @return the configuration parameter value
-     */
-    public String getString() {
-        checkAccessType(String.class);
-        return ZiggyConfiguration.getInstance().getString(propertyName, defaultValue);
-    }
-
-    /**
-     * Gets the configuration parameter value, as an int.
-     *
-     * @return the configuration parameter value
-     */
-    public int getInt() {
-        checkAccessType(Integer.TYPE);
-        return ZiggyConfiguration.getInstance()
-            .getInt(propertyName, Integer.parseInt(defaultValue));
-    }
-
-    /**
-     * Gets the configuration parameter value, as a long.
-     *
-     * @return the configuration parameter value
-     */
-    public long getLong() {
-        checkAccessType(Long.TYPE);
-        return ZiggyConfiguration.getInstance().getLong(propertyName, Long.parseLong(defaultValue));
-    }
-
-    /**
-     * Gets the configuration parameter value, as a float.
-     *
-     * @return the configuration parameter value
-     */
-    public float getFloat() {
-        checkAccessType(Float.TYPE);
-        return ZiggyConfiguration.getInstance()
-            .getFloat(propertyName, Float.parseFloat(defaultValue));
-    }
-
-    /**
-     * Gets the configuration parameter value, as a double.
-     *
-     * @return the configuration parameter value
-     */
-    public double getDouble() {
-        checkAccessType(Double.TYPE);
-        return ZiggyConfiguration.getInstance()
-            .getDouble(propertyName, Double.parseDouble(defaultValue));
-    }
-
-    /**
-     * Gets the configuration parameter value, as a boolean.
-     *
-     * @return the configuration parameter value
-     */
-    public boolean getBoolean() {
-        checkAccessType(Boolean.TYPE);
-        return ZiggyConfiguration.getInstance()
-            .getBoolean(propertyName, Boolean.parseBoolean(defaultValue));
-    }
-
-    /**
-     * Gets the class of the configuration value.
-     *
-     * @return the class of the value
-     */
-    public Class<?> getValueClass() {
-        return type;
-    }
-
-    /**
-     * Represents an exception thrown when a parameter is accessed using the wrong type accessor
-     * method.
-     */
-    @SuppressWarnings("serial")
-    public static class WrongParameterTypeException extends RuntimeException {
-
-        public WrongParameterTypeException(String parameterName, Class<?> type) {
-            super("Parameter '" + parameterName + "' must be accessed as " + type.getSimpleName());
-        }
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/config/DirectoryProperties.java b/src/main/java/gov/nasa/ziggy/services/config/DirectoryProperties.java
index 6ff5e2a..ff80eda 100644
--- a/src/main/java/gov/nasa/ziggy/services/config/DirectoryProperties.java
+++ b/src/main/java/gov/nasa/ziggy/services/config/DirectoryProperties.java
@@ -3,7 +3,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 
 /**
  * Provides one-stop shopping for various directory locations based on properties.
@@ -21,7 +21,7 @@ public class DirectoryProperties {
     private static final String STATE_FILES_RELATIVE_PATH = "state";
     private static final String ALGORITHM_LOG_FILES_RELATIVE_PATH = "algorithms";
     private static final String DATABASE_LOG_FILES_RELATIVE_PATH = "db";
-    private static final String WORKER_LOG_FILES_RELATIVE_PATH = "worker";
+    private static final String SUPERVISOR_LOG_FILES_RELATIVE_PATH = "supervisor";
     private static final String PI_LOG_FILES_RELATIVE_PATH = "pi";
     private static final String SCHEMA_DIR_RELATIVE_PATH = "schema";
     private static final String CONFIG_DIR_RELATIVE_PATH = "config";
@@ -30,16 +30,14 @@ public class DirectoryProperties {
     private static final String REPORTS_DIR_RELATIVE_PATH = "reports";
 
     /**
-     * Location of the bin directory relative to either
-     * {@link PropertyNames#PIPELINE_HOME_DIR_PROP_NAME} or
-     * {@link PropertyNames#ZIGGY_HOME_DIR_PROP_NAME}.
+     * Location of the bin directory relative to either {@link PropertyName#PIPELINE_HOME_DIR} or
+     * {@link PropertyName#ZIGGY_HOME_DIR}.
      */
     private static final String BIN_DIR_RELATIVE_PATH = "bin";
 
     /**
-     * Location of the lib directory relative to either
-     * {@link PropertyNames#PIPELINE_HOME_DIR_PROP_NAME} or
-     * {@link PropertyNames#ZIGGY_HOME_DIR_PROP_NAME}.
+     * Location of the lib directory relative to either {@link PropertyName#PIPELINE_HOME_DIR} or
+     * {@link PropertyName#ZIGGY_HOME_DIR}.
      */
     private static final String LIB_DIR_RELATIVE_PATH = "lib";
 
@@ -49,7 +47,7 @@ public class DirectoryProperties {
 
     public static Path pipelineResultsDir() {
         return Paths
-            .get(ZiggyConfiguration.getInstance().getString(PropertyNames.RESULTS_DIR_PROP_NAME));
+            .get(ZiggyConfiguration.getInstance().getString(PropertyName.RESULTS_DIR.property()));
     }
 
     public static Path taskDataDir() {
@@ -92,7 +90,7 @@ public static Path piLogsDir() {
 
     public static Path pipelineHomeDir() {
         return Paths.get(
-            ZiggyConfiguration.getInstance().getString(PropertyNames.PIPELINE_HOME_DIR_PROP_NAME));
+            ZiggyConfiguration.getInstance().getString(PropertyName.PIPELINE_HOME_DIR.property()));
     }
 
     public static Path pipelineBinDir() {
@@ -104,8 +102,9 @@ public static Path pipelineConfigDir() {
     }
 
     public static Path ziggyHomeDir() {
-        return Paths.get(
-            ZiggyConfiguration.getInstance().getString(PropertyNames.ZIGGY_HOME_DIR_PROP_NAME));
+        return Paths.get(ZiggyConfiguration.getInstance()
+            .getString(PropertyName.ZIGGY_HOME_DIR.property(),
+                System.getenv(ZiggyConfiguration.ZIGGY_HOME_ENV)));
     }
 
     public static Path ziggyBinDir() {
@@ -120,6 +119,11 @@ public static Path ziggySchemaDir() {
         return ziggyHomeDir().resolve(SCHEMA_DIR_RELATIVE_PATH);
     }
 
+    public static Path databaseSchemaDir() {
+        return Paths.get(ZiggyConfiguration.getInstance()
+            .getString(PropertyName.DATABASE_SCHEMA_DIR.property()));
+    }
+
     public static Path ziggyCodeBuildDir() {
         return Paths.get(BUILD);
     }
@@ -137,9 +141,9 @@ public static Path databaseLogDir() {
             .resolve(Paths.get(LOG_FILES_RELATIVE_PATH, DATABASE_LOG_FILES_RELATIVE_PATH));
     }
 
-    public static Path workerLogDir() {
+    public static Path supervisorLogDir() {
         return pipelineResultsDir()
-            .resolve(Paths.get(LOG_FILES_RELATIVE_PATH, WORKER_LOG_FILES_RELATIVE_PATH));
+            .resolve(Paths.get(LOG_FILES_RELATIVE_PATH, SUPERVISOR_LOG_FILES_RELATIVE_PATH));
     }
 
     public static Path reportsDir() {
@@ -149,7 +153,7 @@ public static Path reportsDir() {
 
     public static Path pipelineDefinitionDir() {
         return Paths.get(
-            ZiggyConfiguration.getInstance().getString(PropertyNames.PIPELINE_DEFS_DIR_PROP_NAME));
+            ZiggyConfiguration.getInstance().getString(PropertyName.PIPELINE_DEFS_DIR.property()));
     }
 
     public static Path ziggyLogoDir() {
@@ -166,52 +170,55 @@ public static Path memdroneDir() {
     }
 
     /**
-     * Returns the root of the database directory ({@value PropertyNames#DATABASE_DIR_PROP_NAME}).
+     * Returns the root of the database directory ({@link PropertyName#DATABASE_DIR}).
      *
      * @return the database root directory, or null if this property is empty, which can be the case
      * if a system database is in use
      */
     public static Path databaseDir() {
         String pathString = ZiggyConfiguration.getInstance()
-            .getString(PropertyNames.DATABASE_DIR_PROP_NAME, null);
+            .getString(PropertyName.DATABASE_DIR.property(), null);
         return pathString != null ? Paths.get(pathString) : null;
     }
 
     /**
      * Returns the absolute path to the database executables, which is in the properties file as the
-     * value of the database.bin.dir property. If no such property is set, null is returned. This
-     * last is necessary because the user may decide to put the database executables on their search
-     * path rather than specifying the path in the properties file.
+     * value of the {@link PropertyName#DATABASE_BIN_DIR} property. If no such property is set, null
+     * is returned. This last is necessary because the user may decide to put the database
+     * executables on their search path rather than specifying the path in the properties file.
      */
     public static Path databaseBinDir() {
         String pathString = ZiggyConfiguration.getInstance()
-            .getString(PropertyNames.DATABASE_BIN_DIR_PROP_NAME, null);
+            .getString(PropertyName.DATABASE_BIN_DIR.property(), null);
         return pathString != null ? Paths.get(pathString) : null;
     }
 
     /**
      * Returns the absolute path to the database executables, which is in the properties file as the
-     * value of the database.conf.file property. If no such property is set, null is returned. This
-     * last is necessary because the specifying such a file is optional.
+     * value of the {@link PropertyName#DATABASE_CONF_FILE} property. If no such property is set,
+     * null is returned. This last is necessary because the specifying such a file is optional.
      */
     public static Path databaseConfFile() {
         String pathString = ZiggyConfiguration.getInstance()
-            .getString(PropertyNames.DATABASE_CONF_FILE_PROP_NAME, null);
+            .getString(PropertyName.DATABASE_CONF_FILE.property(), null);
         return pathString != null ? Paths.get(pathString) : null;
     }
 
     /**
-     * During normal activities, returns the working directory specified by the user.dir system
-     * property. During testing, setting the ziggy.test.working.dir property allows this to return a
-     * different path to be used as the working directory for test purposes.
+     * During normal activities, returns the working directory specified by the
+     * {@link PropertyName#WORKING_DIR} system property. During testing, setting the
+     * {@link PropertyName#ZIGGY_TEST_WORKING_DIR} property allows this to return a different path
+     * to be used as the working directory for test purposes.
      */
     public static Path workingDir() {
-        return Paths.get(ZiggyConfiguration.getInstance()
-            .getString(PropertyNames.ZIGGY_TEST_WORKING_DIR_PROP_NAME, SystemUtils.USER_DIR));
+        ImmutableConfiguration configuration = ZiggyConfiguration.getInstance();
+
+        return Paths.get(configuration.getString(PropertyName.ZIGGY_TEST_WORKING_DIR.property(),
+            configuration.getString(PropertyName.WORKING_DIR.property())));
     }
 
     public static Path datastoreRootDir() {
         return Paths.get(
-            ZiggyConfiguration.getInstance().getString(PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME));
+            ZiggyConfiguration.getInstance().getString(PropertyName.DATASTORE_ROOT_DIR.property()));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/config/DumpSystemProperties.java b/src/main/java/gov/nasa/ziggy/services/config/DumpSystemProperties.java
index 3fe12cb..66b9226 100644
--- a/src/main/java/gov/nasa/ziggy/services/config/DumpSystemProperties.java
+++ b/src/main/java/gov/nasa/ziggy/services/config/DumpSystemProperties.java
@@ -1,18 +1,40 @@
 package gov.nasa.ziggy.services.config;
 
 import java.util.Properties;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import org.apache.commons.configuration2.ImmutableConfiguration;
 
 /**
+ * Display all system properties, and then display all ZiggyConfiguration properties.
+ *
  * @author Todd Klaus
+ * @author Bill Wohler
  */
 public class DumpSystemProperties {
     /**
      * @param args
      */
     public static void main(String[] args) {
+        System.out.println("System Properties:");
         Properties props = System.getProperties();
-        for (Object key : props.keySet()) {
-            System.out.println(key + "=" + props.getProperty((String) key));
-        }
+        System.out.println(props.entrySet()
+            .stream()
+            .map(e -> e.getKey() + "=" + e.getValue())
+            .sorted()
+            .collect(Collectors.joining("\n")));
+
+        System.out.println("\nZiggy Configuration:");
+        ImmutableConfiguration configuration = ZiggyConfiguration.getInstance();
+        System.out
+            .println(StreamSupport
+                .stream(Spliterators.spliteratorUnknownSize(configuration.getKeys(),
+                    Spliterator.ORDERED), false)
+                .map(k -> k + "=" + configuration.getString(k))
+                .sorted()
+                .collect(Collectors.joining("\n")));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/config/KeyValuePair.java b/src/main/java/gov/nasa/ziggy/services/config/KeyValuePair.java
index 69181dd..ae17cdf 100644
--- a/src/main/java/gov/nasa/ziggy/services/config/KeyValuePair.java
+++ b/src/main/java/gov/nasa/ziggy/services/config/KeyValuePair.java
@@ -1,13 +1,13 @@
 package gov.nasa.ziggy.services.config;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
 
 @Entity
-@Table(name = "PI_KV_PAIR")
+@Table(name = "ziggy_KeyValuePair")
 public class KeyValuePair {
     @Id
     @Column(name = "keyName", length = 100)
diff --git a/src/main/java/gov/nasa/ziggy/services/config/KeyValuePairCrud.java b/src/main/java/gov/nasa/ziggy/services/config/KeyValuePairCrud.java
index f9019e5..ae7b637 100644
--- a/src/main/java/gov/nasa/ziggy/services/config/KeyValuePairCrud.java
+++ b/src/main/java/gov/nasa/ziggy/services/config/KeyValuePairCrud.java
@@ -2,9 +2,8 @@
 
 import java.util.List;
 
-import org.hibernate.Query;
-
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.services.database.DatabaseService;
 
 /**
@@ -16,7 +15,7 @@
  *
  * @author Todd Klaus
  */
-public class KeyValuePairCrud extends AbstractCrud {
+public class KeyValuePairCrud extends AbstractCrud<KeyValuePair> {
     protected DatabaseService databaseService = null;
 
     /**
@@ -31,29 +30,32 @@ public KeyValuePairCrud(DatabaseService databaseService) {
     }
 
     public List<KeyValuePair> retrieveAll() {
-        return list(databaseService.getSession().createQuery("from KeyValuePair"));
+        return list(createZiggyQuery(KeyValuePair.class));
     }
 
     public String retrieveValue(String key) {
-        Query query = databaseService.getSession()
-            .createQuery("from KeyValuePair where key = :key");
-        query.setString("key", key);
-        KeyValuePair keyValuePair = uniqueResult(query);
-        return keyValuePair.getValue();
+        ZiggyQuery<KeyValuePair, String> query = createZiggyQuery(KeyValuePair.class, String.class);
+        query.column(KeyValuePair_.key).in(key);
+        query.column(KeyValuePair_.value).select();
+        return uniqueResult(query);
     }
 
     public KeyValuePair retrieve(String key) {
-        Query query = databaseService.getSession()
-            .createQuery("from KeyValuePair where key = :key");
-        query.setString("key", key);
+        ZiggyQuery<KeyValuePair, KeyValuePair> query = createZiggyQuery(KeyValuePair.class);
+        query.column(KeyValuePair_.key).in(key);
         return uniqueResult(query);
     }
 
     public void create(KeyValuePair keyValuePair) {
-        super.create(keyValuePair);
+        super.persist(keyValuePair);
     }
 
     public void delete(KeyValuePair keyValuePair) {
-        super.delete(keyValuePair);
+        super.remove(keyValuePair);
+    }
+
+    @Override
+    public Class<KeyValuePair> componentClass() {
+        return KeyValuePair.class;
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/config/PropertyName.java b/src/main/java/gov/nasa/ziggy/services/config/PropertyName.java
new file mode 100644
index 0000000..8962274
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/config/PropertyName.java
@@ -0,0 +1,303 @@
+package gov.nasa.ziggy.services.config;
+
+/**
+ * Container for definitions of all property names.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public enum PropertyName {
+
+    // This file is sorted by property name (not constant) to help organize properties.
+
+    /**
+     * If this property is true, require login even when running on trunk code. On non-trunk code,
+     * login is always required. TODO Review in future and document if preserved
+     */
+    REQUIRE_LOGIN_OVERRIDE("console.dev.require.login"),
+
+    /** Class used by Hibernate to manage the database connection. */
+    HIBERNATE_DRIVER("hibernate.connection.driver_class"),
+
+    /** Password used by Hibernate for database connection. */
+    HIBERNATE_PASSWORD("hibernate.connection.password"),
+
+    /** URL used by Hibernate for database connection. */
+    HIBERNATE_URL("hibernate.connection.url"),
+
+    /** Username used by Hibernate for database connection. */
+    HIBERNATE_USERNAME("hibernate.connection.username"),
+
+    /** Database dialect used by Hibernate. */
+    HIBERNATE_DIALECT("hibernate.dialect"),
+
+    /** "Pretty-print" generated queries written to log file. */
+    HIBERNATE_FORMAT_SQL("hibernate.format_sql"),
+
+    /** JDBC batch sized used by Hibernate. Can be tuned to improve performance. */
+    HIBERNATE_JDBC_BATCH_SIZE("hibernate.jdbc.batch_size"),
+
+    /** Write generated queries to log file. */
+    HIBERNATE_SHOW_SQL("hibernate.show_sql"),
+
+    /** Generate comments in generated queries in log. */
+    HIBERNATE_USE_SQL_COMMENTS("hibernate.use_sql_comments"),
+
+    /**
+     * The {@code java.class.path} system property. As it is not user-modifiable, this property
+     * should not be documented in the manual.
+     */
+    JAVA_CLASS_PATH("java.class.path"),
+
+    /**
+     * Location of the Java package to be used by the ziggy program when executing programs.
+     */
+    JAVA_HOME("java.home"),
+
+    /**
+     * The {@code java.runtime.name} system property. As it is not user-modifiable, this property
+     * should not be documented in the manual.
+     */
+    JAVA_RUNTIME_NAME("java.runtime.name"),
+
+    /**
+     * The {@code java.vm.version} system property. As it is not user-modifiable, this property
+     * should not be documented in the manual.
+     */
+    JAVA_VM_VERSION("java.vm.version"),
+
+    /**
+     * The log4j2 configuration property. As it is not user-modifiable, this property should not be
+     * documented in the manual.
+     */
+
+    LOG4J2_CONFIGURATION_FILE("log4j2.configurationFile"),
+
+    /**
+     * Property in the config service that points to the log4j.xml file used by Java code called
+     * from MATLAB
+     */
+    MATLAB_LOG4J_CONFIG_FILE("matlab.log4j.config"),
+
+    /** Set to true to initialize log4j when starting MATLAB. */
+    MATLAB_LOG4J_CONFIG_INITIALIZE("matlab.log4j.initialize"),
+
+    /**
+     * Property that is true if {@code gradle test} is running. As it is not user-modifiable, this
+     * property should not be documented in the manual.
+     */
+    GRADLE_TEST_WORKER("org.gradle.test.worker"),
+
+    /**
+     * Name for the operating system. As it is not user-modifiable, this property should not be
+     * documented in the manual.
+     */
+    OPERATING_SYSTEM("os.name"),
+
+    /**
+     * System property name for architecture data model. As it is not user-modifiable, this property
+     * should not be documented in the manual.
+     */
+    SUN_ARCH_DATA_MODEL("sun.arch.data.model"),
+
+    /**
+     * The {@code sun.boot.library.path} system property. As it is not user-modifiable, this
+     * property should not be documented in the manual.
+     */
+    SUN_BOOT_LIBRARY_PATH("sun.boot.library.path"),
+
+    /**
+     * Working directory. As it is not user-modifiable, this property should not be documented in
+     * the manual.
+     */
+    WORKING_DIR("user.dir"),
+
+    /**
+     * Current user. As it is not user-modifiable, this property should not be documented in the
+     * manual.
+     */
+    USER_NAME("user.name"),
+
+    /** Location of the configuration properties for Ziggy. */
+    ZIGGY_CONFIG_PATH("ziggy.config.path"),
+
+    /** Location of the database executables. */
+    DATABASE_BIN_DIR("ziggy.database.bin.dir"),
+
+    /** Location of the database configuration file. */
+    DATABASE_CONF_FILE("ziggy.database.conf.file"),
+
+    /** Maximum connections supported by database connection pooler. */
+    DATABASE_CONNECTIONS("ziggy.database.connections"),
+
+    /** Directory used by the relational database. */
+    DATABASE_DIR("ziggy.database.dir"),
+
+    /** Host used by the relational database. */
+    DATABASE_HOST("ziggy.database.host"),
+
+    /** Name of the database. */
+    DATABASE_NAME("ziggy.database.name"),
+
+    /** Port used by the relational database. */
+    DATABASE_PORT("ziggy.database.port"),
+
+    /** Protocol used by the relational database. */
+    DATABASE_PROTOCOL("ziggy.database.protocol"),
+
+    /** Location of the database schema for the pipeline + Ziggy */
+    DATABASE_SCHEMA_DIR("ziggy.database.schema.dir"),
+
+    /** Name of relational database software package. */
+    DATABASE_SOFTWARE("ziggy.database.software.name"),
+
+    /** Ziggy home directory (the build directory in the top-level Ziggy directory). */
+    ZIGGY_HOME_DIR("ziggy.home.dir"),
+
+    /** Location and name of the logo file for the pipeline (not the Ziggy logo). */
+    PIPELINE_LOGO_FILE("ziggy.logoFile"),
+
+    /** Search path for executables used by pipeline modules. */
+    BINPATH("ziggy.pipeline.binPath"),
+
+    /**
+     * Whether alerts should always be broadcast. This property does not need to be documented in
+     * the manual.
+     */
+    BROADCAST_ALERTS_ENABLED("ziggy.pipeline.broadcast.alerts.enabled"),
+
+    /** Classpath for Java classes that are part of the pipeline (not part of Ziggy). */
+    PIPELINE_CLASSPATH("ziggy.pipeline.classpath"),
+
+    /** Implementation class of DataImporter used by data receipt. */
+    DATA_IMPORTER_CLASS("ziggy.pipeline.data.importer.classname"),
+
+    /** Directory from which data receipt imports files. */
+    DATA_RECEIPT_DIR("ziggy.pipeline.data.receipt.dir"),
+
+    /** Maximum percentage of files that can fail validation before DR throws an exception. */
+    MAX_FAILURE_PERCENTAGE("ziggy.pipeline.data.receipt.validation.maxFailurePercentage"),
+
+    /** Top-level dictionary of the datastore. */
+    DATASTORE_ROOT_DIR("ziggy.pipeline.datastore.dir"),
+
+    /** Location of XML files that define the pipeline. */
+    PIPELINE_DEFS_DIR("ziggy.pipeline.definition.dir"),
+
+    /** Environment definition used by pipeline modules. */
+    RUNTIME_ENVIRONMENT("ziggy.pipeline.environment"),
+
+    /** Pipeline home directory. */
+    PIPELINE_HOME_DIR("ziggy.pipeline.home.dir"),
+
+    /** Shared object library path for pipeline modules. */
+    LIBPATH("ziggy.pipeline.libPath"),
+
+    /** Location of the MATLAB Compiler Runtime (MCR). */
+    MCRROOT("ziggy.pipeline.mcrRoot"),
+
+    /** Determines whether memdrone is enabled. */
+    MEMDRONE_ENABLED("ziggy.pipeline.memdrone.enabled"),
+
+    /** Determines the interval between memdrone samples. */
+    MEMDRONE_SLEEP("ziggy.pipeline.memdrone.sleepSeconds"),
+
+    /**
+     * Allows execution to stop after completion of a specified step (marshaling, executing, etc.).
+     */
+    PIPELINE_HALT("ziggy.pipeline.processing.halt.step"),
+
+    /** Location of pipeline results. */
+    RESULTS_DIR("ziggy.pipeline.results.dir"),
+
+    /**
+     * Whether pipeline status should be broadcast. This property does not need to be documented in
+     * the manual.
+     */
+    STATUS_BROADCAST_ENABLED("ziggy.pipeline.status.broadcast.enabled"),
+
+    /**
+     * Interval for posting worker status (milliseconds) This property does not need to be
+     * documented in the manual.
+     */
+    WORKER_STATUS_REPORT_INTERVAL_MILLIS("ziggy.pipeline.status.worker.reportIntervalMillis"),
+
+    /** Class used to identify default UOWs that are defined in the pipeline (not Ziggy). */
+    PIPELINE_DEFAULT_UOW_IDENTIFIER_CLASS("ziggy.pipeline.uow.defaultIdentifier.classname"),
+
+    /** Indicates whether to copy files to/from the working directory, or use symlinks. */
+    USE_SYMLINKS("ziggy.pipeline.useSymlinks"),
+
+    /** Remote cluster to use when submitting batch jobs. */
+    REMOTE_CLUSTER("ziggy.remote.cluster.name"),
+
+    /** The user group to use on Pleiades. */
+    REMOTE_GROUP("ziggy.remote.group"),
+
+    /**
+     * Names of Pleiades hosts, in order from most- to least-desired to use separated by
+     * semi-colons.
+     */
+    REMOTE_HOST("ziggy.remote.host"),
+
+    /** NASA directorate to be used for calculating likely NAS queue wait times. */
+    REMOTE_NASA_DIRECTORATE("ziggy.remote.nasa.directorate"),
+
+    /** Implementation class of QueueCommandManager for use by Ziggy. */
+    REMOTE_QUEUE_COMMAND_CLASS("ziggy.remote.queuecommand.classname"),
+
+    /** The username to use on Pleiades. */
+    REMOTE_USER("ziggy.remote.user"),
+
+    /**
+     * Interval between messages from the supervisor to RMI clients to ensure that connections
+     * remain intact.
+     */
+    HEARTBEAT_INTERVAL("ziggy.supervisor.heartbeat.interval.millis"),
+
+    /**
+     * Port used for communications between supervisor and console. Each cluster must have a port
+     * that is not already in use on the system.
+     */
+    SUPERVISOR_PORT("ziggy.supervisor.port"),
+
+    /**
+     * Property used by tests to ensure that ziggy.properties can be read. Its value is expected to
+     * be {@code from.default.location}. This property should not be documented in the manual.
+     */
+    TEST_FILE("ziggy.test.file.property"),
+
+    /** Allows the user to specify a working directory other than user.dir. For testing only. */
+    ZIGGY_TEST_WORKING_DIR("ziggy.test.working.dir"),
+
+    /** The current Ziggy version as determined by {@code git describe}. */
+    ZIGGY_VERSION("ziggy.version"),
+
+    /** Allow persisting to continue although one or more subtasks failed. */
+    ALLOW_PARTIAL_TASKS("ziggy.worker.allowPartialTasks"),
+
+    /** Number of workers. */
+    WORKER_COUNT("ziggy.worker.count"),
+
+    /**
+     * Heap size for the worker process. This is converted to the wrapper heap size by
+     * ClusterController.
+     */
+    WORKER_HEAP_SIZE("ziggy.worker.heapSize");
+
+    private String property;
+
+    PropertyName(String property) {
+        this.property = property;
+    }
+
+    public String property() {
+        return property;
+    }
+
+    @Override
+    /** The {@link #property} method is favored. */
+    public String toString() {
+        return property();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/config/PropertyNames.java b/src/main/java/gov/nasa/ziggy/services/config/PropertyNames.java
deleted file mode 100644
index 983c188..0000000
--- a/src/main/java/gov/nasa/ziggy/services/config/PropertyNames.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package gov.nasa.ziggy.services.config;
-
-/**
- * Container for definitions of all property names.
- *
- * @author PT
- * @author Bill Wohler
- */
-public class PropertyNames {
-
-    // This file is sorted by property name (not constant) to help organize properties.
-
-    /** Implementation class of DataImporter used by data receipt. */
-    public static final String DATA_RECEIPT_CLASS_PROP_NAME = "data.importer.classname";
-
-    /** Directory from which data receipt imports files. */
-    public static final String DATA_RECEIPT_DIR_PROP_NAME = "data.receipt.dir";
-
-    /** Maximum percentage of files that can fail validation before DR throws an exception. */
-    public static final String MAX_FAILURE_PERCENTAGE_PROP_NAME = "dataReceipt.validation.maxFailurePercentage";
-
-    /** Maximum connections supported by database connection pooler. */
-    public static final String DATABASE_CONNECTIONS_PROP_NAME = "database.connections";
-
-    /** Location of the database executables. */
-    public static final String DATABASE_BIN_DIR_PROP_NAME = "database.bin.dir";
-
-    /** Location of the database configuration file. */
-    public static final String DATABASE_CONF_FILE_PROP_NAME = "database.conf.file";
-
-    /** Directory used by the relational database. */
-    public static final String DATABASE_DIR_PROP_NAME = "database.dir";
-
-    /** Host used by the relational database. */
-    public static final String DATABASE_HOST_PROP_NAME = "database.host";
-
-    /** Name of the database. */
-    public static final String DATABASE_NAME_PROP_NAME = "database.name";
-
-    /** Port used by the relational database. */
-    public static final String DATABASE_PORT_PROP_NAME = "database.port";
-
-    /** Name of relational database software package. */
-    public static final String DATABASE_SOFTWARE_PROP_NAME = "database.software.name";
-
-    /** Top-level dictionary of the datastore. */
-    public static final String DATASTORE_ROOT_DIR_PROP_NAME = "datastore.root.dir";
-
-    /** Class used by Hibernate to manage the database connection. */
-    public static final String HIBERNATE_DRIVER_PROP_NAME = "hibernate.connection.driver_class";
-
-    /** Password used by Hibernate for database connection. */
-    public static final String HIBERNATE_PASSWD_PROP_NAME = "hibernate.connection.password";
-
-    /** URL used by Hibernate for database connection. */
-    public static final String HIBERNATE_URL_PROP_NAME = "hibernate.connection.url";
-
-    /** Username used by Hibernate for database connection. */
-    public static final String HIBERNATE_USERNAME_PROP_NAME = "hibernate.connection.username";
-
-    /** Database dialect used by Hibernate. */
-    public static final String HIBERNATE_DIALECT_PROP_NAME = "hibernate.dialect";
-
-    /**
-     * Directs how how identity or sequence columns are generated when using @GeneratedValue. The
-     * {@code SequenceHiLoGenerator} is used when false, which will have that multiply behavior. The
-     * The {@code SequenceStyleGenerator} is used when false that is more JPA and Oracle friendly
-     * and generates identifier values based on an sequence-style database structure. Variations
-     * range from actually using a sequence to using a table to mimic a sequence. The default value
-     * switches from false to true in Hibernate 5. The Ziggy default is true.
-     */
-    public static final String HIBERNATE_ID_NEW_GENERATOR_MAPPINGS_PROP_NAME = "hibernate.id.new_generator_mappings";
-
-    /**
-     * Location of the Java package to be used by runjava when executing programs.
-     */
-    public static final String JAVA_HOME_PROP_NAME = "java.home";
-
-    /** Determines whether memdrone is enabled. */
-    public static final String MEMDRONE_ENABLED_PROP_NAME = "moduleExe.memdrone.enabled";
-
-    /** Determines the interval between memdrone samples. */
-    public static final String MEMDRONE_SLEEP_PROP_NAME = "moduleExe.memdrone.sleepSeconds";
-
-    /** Indicates whether to copy files to/from the working directory, or use symlinks. */
-    public static final String USE_SYMLINKS_PROP_NAME = "moduleExe.useSymlinks";
-
-    // NASA directorate to be used for calculating likely NAS queue wait times.
-    public final static String NASA_DIRECTORATE_PROP_NAME = "nasa.directorate";
-
-    /** Name for the operating system. */
-    public static final String OPERATING_SYSTEM_PROPERTY_NAME = "os.name";
-
-    /** Environment definition used by pipeline modules. */
-    public static final String RUNTIME_ENVIRONMENT_PROPERTY_NAME = "pi.moduleExe.environment";
-
-    // Allows execution to stop after completion of a specified step (marshaling,
-    // executing, etc.).
-    public static final String PIPELINE_HALT_PROP_NAME = "pi.processing.halt.step";
-
-    // Heap size for the worker process. This is converted to the wrapper heap size by
-    // ClusterController.
-    public static final String WORKER_HEAP_SIZE_PROP_NAME = "pi.worker.heapSize";
-
-    /** Search path for executables used by pipeline modules. */
-    public static final String MODULE_EXE_BINPATH_PROPERTY_NAME = "pi.worker.moduleExe.binPath";
-
-    /** Shared object library path for pipeline modules. */
-    public static final String MODULE_EXE_LIBPATH_PROPERTY_NAME = "pi.worker.moduleExe.libPath";
-
-    /** Location of the MATLAB Compiler Runtime (MCR). */
-    public static final String MODULE_EXE_MCRROOT_PROPERTY_NAME = "pi.worker.moduleExe.mcrRoot";
-
-    /** Number of worker threads. */
-    public static final String WORKER_THREAD_COUNT_PROP_NAME = "pi.worker.threadCount";
-
-    /** Classpath for Java classes that are part of the pipeline (not part of Ziggy). */
-    public static final String PIPELINE_CLASSPATH_PROP_NAME = "pipeline.classpath";
-
-    /** Location of XML files that define the pipeline. */
-    public static final String PIPELINE_DEFS_DIR_PROP_NAME = "pipeline.definition.dir";
-
-    /** Pipeline home directory. */
-    public static final String PIPELINE_HOME_DIR_PROP_NAME = "pipeline.home.dir";
-
-    /** Location and name of the logo file for the pipeline (not the Ziggy logo). */
-    public static final String PIPELINE_LOGO_FILE_PROP_NAME = "pipeline.logoFile";
-
-    /** Location of pipeline results. */
-    public static final String RESULTS_DIR_PROP_NAME = "pipeline.results.dir";
-
-    /** Class used to identify default UOWs that are defined in the pipeline (not Ziggy). */
-    public static final String PIPELINE_DEFAULT_UOW_IDENTIFIER_CLASS_PROP_NAME = "pipeline.uow.defaultIdentifier";
-
-    /** Implementation class of QueueCommandManager for use by Ziggy. */
-    public static final String QUEUE_COMMAND_CLASS_PROP_NAME = "pleiades.queuecommand.classname";
-
-    /** Remote cluster to use when submitting batch jobs. */
-    public static final String CLUSTER_PROPERTY_NAME = "remote.cluster.name";
-
-    /** System property name for architecture data model. */
-    public static final String ARCH_DATA_MODEL_PROPERTY_NAME = "sun.arch.data.model";
-
-    /** Working directory. */
-    public static final String CURRENT_DIR_PROP_NAME = "user.dir";
-
-    /**
-     * Interval between messages from the worker to RMI clients to ensure that connections remain
-     * intact.
-     */
-    public static final String HEARTBEAT_INTERVAL_PROP_NAME = "worker.heartbeat.interval.millis";
-
-    /** Classpath elements for the wrapper executable. */
-    public static final String WRAPPER_CLASSPATH_PROP_NAME = "wrapper.java.classpath.";
-
-    /** Heap size for the wrapper executable. */
-    public static final String WRAPPER_HEAP_SIZE_PROP_NAME = "wrapper.java.maxmemory";
-
-    /** Log file for the wrapper executable. */
-    public static final String WRAPPER_LOG_FILE_PROP_NAME = "wrapper.logfile";
-
-    /** Location of the configuration properties for Ziggy. */
-    public static final String ZIGGY_CONFIG_PROP_NAME = "ziggy.config.path";
-
-    /** Ziggy home directory (the build directory in the top-level Ziggy directory). */
-    public static final String ZIGGY_HOME_DIR_PROP_NAME = "ziggy.home.dir";
-
-    // Allows the user to specify a working directory other than user.dir. For testing only.
-    public static final String ZIGGY_TEST_WORKING_DIR_PROP_NAME = "ziggy.test.working.dir";
-
-    /**
-     * If this property is true, require login even when running on trunk code. On non-trunk code,
-     * login is always required
-     */
-    public static final String REQUIRE_LOGIN_OVERRIDE = "console.dev.require.login";
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/config/ZiggyConfiguration.java b/src/main/java/gov/nasa/ziggy/services/config/ZiggyConfiguration.java
index c5bd6c7..6b8a804 100644
--- a/src/main/java/gov/nasa/ziggy/services/config/ZiggyConfiguration.java
+++ b/src/main/java/gov/nasa/ziggy/services/config/ZiggyConfiguration.java
@@ -1,286 +1,264 @@
 package gov.nasa.ziggy.services.config;
 
+import static gov.nasa.ziggy.services.config.PropertyName.GRADLE_TEST_WORKER;
+import static gov.nasa.ziggy.services.config.PropertyName.JAVA_RUNTIME_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.JAVA_VM_VERSION;
+import static gov.nasa.ziggy.services.config.PropertyName.SUN_BOOT_LIBRARY_PATH;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_CONFIG_PATH;
+
 import java.io.File;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.NoSuchElementException;
-
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.SystemConfiguration;
+import java.util.Enumeration;
+
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.ImmutableConfiguration;
+import org.apache.commons.configuration2.SystemConfiguration;
+import org.apache.commons.configuration2.builder.fluent.Configurations;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.sync.ReadWriteSynchronizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
+ * The Ziggy configuration. Most code will just use {@link #getInstance()}. This class is
+ * thread-safe.
+ *
  * @author Todd Klaus
+ * @author PT
+ * @author Bill Wohler
  */
 public class ZiggyConfiguration {
+    private static final String BUILD_CONFIGURATION = "ziggy-build.properties";
+
     private static final Logger log = LoggerFactory.getLogger(ZiggyConfiguration.class);
 
+    public static final String ZIGGY_HOME_ENV = "ZIGGY_HOME";
+    public static final String PIPELINE_CONFIG_PATH_ENV = "PIPELINE_CONFIG_PATH";
+
     /**
      * Default directory used to locate property file if the PIPELINE_CONFIG_PATH environment
      * variable is not defined.
      */
-    public static final String CONFIG_SERVICE_PROPERTIES_DEFAULT_DIR = "etc";
+    public static final String PIPELINE_CONFIG_DEFAULT_DIR = "etc";
 
     /**
      * Default property file used if the PIPELINE_CONFIG_PATH environment variable is not defined.
      */
-    public static final String CONFIG_SERVICE_PROPERTIES_DEFAULT_FILE = "ziggy.properties";
-
-    private static final String ZIGGY_RELATIVE_PATH = "ziggy";
-
-    private static Configuration instance = null;
-    private static AbstractConfiguration unsynchronizedInstance = null;
+    public static final String PIPELINE_CONFIG_DEFAULT_FILE = "ziggy.properties";
 
-    public static final String CONFIG_SERVICE_PROPERTIES_PATH_ENV = "PIPELINE_CONFIG_PATH";
-
-    public ZiggyConfiguration() {
-    }
+    private static ImmutableConfiguration instance;
+    private static Configuration mutableInstance;
+    private static ConfigurationInterpolator interpolator;
 
     /**
-     * Construct a composite configuration. The properties are stored in the following hierarchy:
+     * Returns an immutable configuration object with the content of the following in order of
+     * priority:
      * <ol>
-     * <li>System properties have the highest priority.
-     * <li>After system properties, properties in the pipeline config file, defined by the
-     * environment variable PIPELINE_CONFIG_PATH, are used.
-     * <li>After system properties and pipeline properties, properties in the Ziggy config file are
-     * used. This file is specified by the pipeline config file using the ziggy.config.path
-     * property. If no property is specified in the config file, Ziggy will default to the
-     * ziggy.properties file in the config directory.
+     * <li>System properties
+     * <li>Properties in the pipeline configuration file, defined by the environment variable
+     * {@value #PIPELINE_CONFIG_PATH_ENV}, except when run in a test.
+     * <li>Properties in the Ziggy configuration file. This file is specified by the pipeline
+     * configuration file using the {@link PropertyName#ZIGGY_CONFIG_PATH} property. If that
+     * property is missing, then Ziggy will use the {@value #PIPELINE_CONFIG_DEFAULT_FILE} file in
+     * the {@value #PIPELINE_CONFIG_DEFAULT_DIR} directory.
      * </ol>
-     *
-     * @return A composite configuration with priority of values as described above.
+     * This object's throwExceptionOnMissing property is set to {@code true}. In the rare case that
+     * a {@code NoSuchElementException} is not desired if the property is missing, provide a default
+     * when obtaining a property.
+     * <p>
+     * Classes under test will instead use an immutable version of the configuration obtained with
+     * {@link #getMutableInstance()} by the test.
      */
-    private static AbstractConfiguration getConfiguration() {
-        log.debug("initialize() - start");
-        CompositeConfiguration config = new ConfigurationDelegate();
-
-        // copy the system properties into the composite configuration
-        config.addConfiguration(new SystemConfiguration());
-
-        // Load the pipeline configurations from the file pointed at by PIPELINE_CONFIG_PATH;
-        // if that cannot be found, attempt to load a default config file
-        File configPropertiesFile = getConfigServicesFile();
-
-        if (!configPropertiesFile.exists()) {
-            throw new PipelineException("Config file pointed to by the "
-                + CONFIG_SERVICE_PROPERTIES_PATH_ENV + " environment variable does not exist: "
-                + configPropertiesFile.getAbsolutePath());
-        }
-        log.info("Loading configuration from: " + configPropertiesFile.getAbsolutePath());
-        try {
-            config.addConfiguration(new PropertiesConfiguration(configPropertiesFile));
-            String ziggyConfigFilename = config.getString(PropertyNames.ZIGGY_CONFIG_PROP_NAME,
-                null);
-            if (ziggyConfigFilename != null && !ziggyConfigFilename.isEmpty()) {
-                File ziggyConfigFile = new File(ziggyConfigFilename);
-                if (ziggyConfigFile.exists()) {
-                    log.info("Loading configuration from: " + ziggyConfigFile.getAbsolutePath());
-                    config.addConfiguration(new PropertiesConfiguration(ziggyConfigFile));
-                }
-            }
-        } catch (Exception e) {
-            log.error("ConfigurationService failed to initialize", e);
-            throw new PipelineException("ConfigurationService failed to initialize", e);
-        }
-
-        log.debug("initialize() - end");
-        return config;
-
-    }
-
-    public static synchronized AbstractConfiguration unsynchronizedInstance() {
-        getInstance();
-        return unsynchronizedInstance;
-    }
-
-    public static synchronized Configuration getInstance() {
+    public static synchronized ImmutableConfiguration getInstance() {
         if (instance == null) {
-            Configuration config = getConfiguration();
-            unsynchronizedInstance = (AbstractConfiguration) config;
-            // TODO Update to configuration2
-            // Then, call config.setSynchronizer(ZiggyConfiguration.class) in getConfiguration() and
-            // delete the following.
-            InvocationHandler handler = new SynchronizedInvocationHandler(config);
-            instance = (Configuration) Proxy.newProxyInstance(Configuration.class.getClassLoader(),
-                new Class<?>[] { Configuration.class }, handler);
+            String testRun = System.getProperty(GRADLE_TEST_WORKER.property());
+            Configuration configuration = mutableInstance != null ? mutableInstance
+                : getConfiguration(testRun == null);
+            instance = ConfigurationUtils.unmodifiableConfiguration(configuration);
+            interpolator = configuration.getInterpolator();
         }
         return instance;
     }
 
-    public static synchronized void reset() {
-        instance = null;
-        unsynchronizedInstance = null;
-    }
-
     /**
-     * Gets the value of an environment variable, unless we are running in a unit test. When run
-     * inside a unit test, always return null for environment variables. To determine whether a unit
-     * test is running, we use a system property that is set by the Gradle <code>test</code> task.
-     *
-     * @param envVarName the environment variable name
-     * @return the environment variable value, or null if the environment variable is not defined or
-     * if we are running inside a unit test
+     * Returns a configuration as described in {@link #getInstance()}.
      */
-    private static String getEnvVar(String envVarName) {
-        if (System.getProperty("org.gradle.test.worker") != null) {
-            return null;
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private static Configuration getConfiguration(boolean loadPipelineProperties) {
+        CompositeConfiguration config = new CompositeConfiguration();
+        config.setThrowExceptionOnMissing(true);
+
+        loadSystemConfiguration(config);
+        if (loadPipelineProperties) {
+            loadPipelineConfiguration(config);
         }
-        return System.getenv(envVarName);
+        loadZiggyConfiguration(config);
+        loadBuildConfiguration(config);
+
+        return config;
     }
 
     /**
-     * Locates the pipeline config file via the PIPELINE_CONFIG_PATH environment variable. If no
-     * environment variable is defined, or the file it points to does not exist, the default
-     * properties file (ziggy/etc/ziggy.properties) will be used if it can be found.
+     * Copies the system properties into the composite configuration.
+     *
+     * @param config the non-{@code null} target composite configuration
      */
-    public static File getConfigServicesFile() {
-        File configServicesFile = null;
-        String configFileEnvValue = getEnvVar(CONFIG_SERVICE_PROPERTIES_PATH_ENV);
-        log.debug("found environment variable: " + CONFIG_SERVICE_PROPERTIES_PATH_ENV + " = "
-            + configFileEnvValue);
-        if (configFileEnvValue != null) {
-            configServicesFile = new File(configFileEnvValue);
-        }
-        if (configServicesFile == null || !configServicesFile.exists()) {
-            Path ziggyDefaultConfig = Paths.get(
-                ziggyRoot(System.getProperty(PropertyNames.CURRENT_DIR_PROP_NAME)),
-                CONFIG_SERVICE_PROPERTIES_DEFAULT_DIR, CONFIG_SERVICE_PROPERTIES_DEFAULT_FILE);
-            configServicesFile = ziggyDefaultConfig.toFile();
-        }
-        if (!configServicesFile.exists()) {
-            throw new PipelineException("Unable to locate config file");
-        }
-
-        return configServicesFile;
+    private static void loadSystemConfiguration(CompositeConfiguration config) {
+        config.addConfiguration(new SystemConfiguration());
     }
 
-    public static String ziggyRoot(String directory) {
-        if (directory == null || directory.isEmpty()) {
-            return null;
-        }
+    /**
+     * Loads the pipeline configuration from the file pointed at by PIPELINE_CONFIG_PATH.
+     *
+     * @param config the non-{@code null} target composite configuration
+     */
+    private static void loadPipelineConfiguration(CompositeConfiguration config) {
 
-        // Does this path appear to contain "ziggy"?
-        int ziggyLocation = directory.lastIndexOf(ZIGGY_RELATIVE_PATH);
-        if (ziggyLocation < 0) {
-            return null;
+        File configPropertiesFile = getPipelineConfigFile();
+        if (configPropertiesFile != null) {
+            loadConfiguration(config, configPropertiesFile);
         }
-
-        // Does the path have directories after "ziggy"?
-        int separatorLocation = directory.indexOf(File.separator, ziggyLocation);
-
-        // If so, remove them.
-        return separatorLocation > 0 ? directory.substring(0, separatorLocation) : directory;
     }
 
     /**
-     * Wraps Configuration in order to throw {@code NoSuchElementException} if a property is missing
-     * for calls that don't supply a default.
-     * <p>
-     * This is necessary because the setThrowExceptionOnMissing() method doesn't work on primitives.
+     * Loads the Ziggy configuration in {@link PropertyName#ZIGGY_CONFIG_PATH},
+     * {@link PropertyName#ZIGGY_HOME_DIR}{@code /etc/ziggy.properties}, or
+     * {@link ZIGGY_HOME}{@code /etc/ziggy.properties} in that order.
+     *
+     * @param config the non-{@code null} target composite configuration
      */
-    private static class ConfigurationDelegate extends CompositeConfiguration {
+    private static void loadZiggyConfiguration(CompositeConfiguration config) {
+        String ziggyConfigFilename = config.getString(ZIGGY_CONFIG_PATH.property(), null);
 
-        /** Throws {@code NoSuchElementException} if {@code key} is missing. */
-        private void checkProperty(String key) {
-            if (!containsKey(key)) {
-                throw new NoSuchElementException(key + ": No such property");
-            }
+        Path ziggyConfigPath = null;
+        if (ziggyConfigFilename != null && !ziggyConfigFilename.isEmpty()) {
+            ziggyConfigPath = Paths.get(ziggyConfigFilename);
         }
-
-        @Override
-        public BigDecimal getBigDecimal(String key) {
-            checkProperty(key);
-            return super.getBigDecimal(key);
-        }
-
-        @Override
-        public BigInteger getBigInteger(String key) {
-            checkProperty(key);
-            return super.getBigInteger(key);
+        if (ziggyConfigPath == null) {
+            // Alas, the code for DirectoryProperties.ziggyHomeDir() is duplicated here to avoid an
+            // infinite loop.
+            String ziggyHomePath = config.getString(PropertyName.ZIGGY_HOME_DIR.property(),
+                System.getenv(ZIGGY_HOME_ENV));
+            Path ziggyHomeDir = ziggyHomePath != null ? Paths.get(ziggyHomePath) : null;
+            if (ziggyHomeDir != null && !ziggyHomeDir.toString().isEmpty()) {
+                ziggyConfigPath = ziggyHomeDir.resolve(PIPELINE_CONFIG_DEFAULT_DIR)
+                    .resolve(PIPELINE_CONFIG_DEFAULT_FILE);
+                log.warn("{} not defined in {}, trying {}", ZIGGY_CONFIG_PATH,
+                    PIPELINE_CONFIG_PATH_ENV, ziggyConfigPath);
+            }
         }
 
-        @Override
-        public boolean getBoolean(String key) {
-            checkProperty(key);
-            return super.getBoolean(key);
+        if (ziggyConfigPath == null) {
+            log.warn("Could not locate Ziggy configuration");
+        } else if (!Files.exists(ziggyConfigPath)) {
+            log.warn("Ziggy configuration in {} not found", ziggyConfigPath);
+        } else {
+            loadConfiguration(config, ziggyConfigPath.toFile());
         }
+    }
 
-        @Override
-        public byte getByte(String key) {
-            checkProperty(key);
-            return super.getByte(key);
+    /**
+     * Loads the build configuration from the {@value #BUILD_CONFIGURATION} file(s).
+     *
+     * @param config the non-{@code null} target composite configuration
+     */
+    private static void loadBuildConfiguration(CompositeConfiguration config) {
+        try {
+            Enumeration<URL> buildUrl = ZiggyConfiguration.class.getClassLoader()
+                .getResources(BUILD_CONFIGURATION);
+            if (buildUrl.hasMoreElements()) {
+                while (buildUrl.hasMoreElements()) {
+                    loadConfiguration(config, new File(buildUrl.nextElement().getPath()));
+                }
+            } else {
+                log.warn("Could not locate build information in {}", BUILD_CONFIGURATION);
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to load configuration from " + BUILD_CONFIGURATION, e);
         }
+    }
 
-        @Override
-        public double getDouble(String key) {
-            checkProperty(key);
-            return super.getDouble(key);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private static void loadConfiguration(CompositeConfiguration config, File propertiesFile) {
+        try {
+            log.info("Loading configuration from: {}", propertiesFile.getAbsolutePath());
+            config.addConfiguration(new Configurations().properties(propertiesFile));
+        } catch (ConfigurationException e) {
+            throw new PipelineException("Ziggy configuration failed to initialize", e);
         }
+    }
 
-        @Override
-        public float getFloat(String key) {
-            checkProperty(key);
-            return super.getFloat(key);
+    /**
+     * Locates the pipeline configuration file. This file is defined by the environment variable
+     * {@value #PIPELINE_CONFIG_PATH_ENV}.
+     *
+     * @return null if the environment variable isn't present; otherwise, a file object for the file
+     * represented by the variable
+     * @throws PipelineException if the file referenced by the variable doesn't exist
+     */
+    private static File getPipelineConfigFile() {
+        String configFileEnvValue = System.getenv(PIPELINE_CONFIG_PATH_ENV);
+        log.debug("{}={}", PIPELINE_CONFIG_PATH_ENV, configFileEnvValue);
+
+        File configFile = configFileEnvValue != null ? configFile = new File(configFileEnvValue)
+            : null;
+        if (configFile != null && !configFile.exists()) {
+            throw new PipelineException("Config file pointed to by the " + PIPELINE_CONFIG_PATH_ENV
+                + " environment variable does not exist: " + configFile.getAbsolutePath());
         }
 
-        @Override
-        public int getInt(String key) {
-            checkProperty(key);
-            return super.getInt(key);
-        }
+        return configFile;
+    }
 
-        @Override
-        public long getLong(String key) {
-            checkProperty(key);
-            return super.getLong(key);
-        }
+    /** Interpolates the given object with this configuration. */
+    public static Object interpolate(Object o) {
+        // Ensure there is a populated interpolator.
+        getInstance();
 
-        @Override
-        public short getShort(String key) {
-            checkProperty(key);
-            return super.getShort(key);
-        }
+        return interpolator.interpolate(o);
+    }
 
-        @Override
-        public String getString(String key) {
-            checkProperty(key);
-            return super.getString(key);
-        }
+    /** Logs the JVM properties. */
+    public static void logJvmProperties() {
+        getInstance();
+        log.info("jvm version:");
+        log.info("  {}={}", JAVA_RUNTIME_NAME, instance.getString(JAVA_RUNTIME_NAME.property()));
+        log.info("  {}={}", SUN_BOOT_LIBRARY_PATH,
+            instance.getString(SUN_BOOT_LIBRARY_PATH.property()));
+        log.info("  {}={}", JAVA_VM_VERSION, instance.getString(JAVA_VM_VERSION.property()));
     }
 
     /**
-     * Implements a proxy invocation handler that synchronizes all calls on the base object.
+     * Returns a mutable configuration object as described in {@link #getInstance()}. This method
+     * resets the immutable configuration in case a prior test forgot to call reset, so that
+     * subsequent calls to {@link #getInstance()} will use this immutable instance rather than the
+     * prior instance. For testing only. Production code should call {@link #getInstance()}.
      */
-    private static class SynchronizedInvocationHandler implements InvocationHandler {
-
-        private Object baseObject;
-
-        /**
-         * Creates a new instance that will route all invocations to the given object.
-         *
-         * @param baseObject the object that will get all invocations
-         */
-        public SynchronizedInvocationHandler(Object baseObject) {
-            this.baseObject = baseObject;
-        }
-
-        @Override
-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-            synchronized (baseObject) {
-                return method.invoke(baseObject, args);
-            }
+    public static synchronized Configuration getMutableInstance() {
+        if (mutableInstance == null) {
+            mutableInstance = getConfiguration(false);
+            mutableInstance.setSynchronizer(new ReadWriteSynchronizer());
+            instance = null;
         }
+        return mutableInstance;
     }
 
+    /** Clear the immutable and mutable configuration instances. */
+    public static synchronized void reset() {
+        instance = null;
+        mutableInstance = null;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/AnnotatedPojoList.java b/src/main/java/gov/nasa/ziggy/services/database/AnnotatedPojoList.java
index 56ea5ee..3fdb650 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/AnnotatedPojoList.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/AnnotatedPojoList.java
@@ -4,15 +4,16 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.ClasspathScanner;
 import gov.nasa.ziggy.util.ClasspathScannerListener;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.MappedSuperclass;
 import javassist.bytecode.AnnotationsAttribute;
 import javassist.bytecode.ClassFile;
 
@@ -47,13 +48,13 @@ public AnnotatedPojoList() {
      * @throws IOException
      * @throws ClassNotFoundException
      */
-    public Set<Class<?>> scanForClasses() throws Exception {
-        log.debug("AnnotatedPojoList: Scanning class path for annotated classes");
+    public Set<Class<?>> scanForClasses() {
+        log.debug("Scanning class path for annotated classes");
 
         ClasspathScanner classpathScanner = new ClasspathScanner();
         classpathScanner.addListener(this);
-        classpathScanner.setJarFilters(jarFilters);
-        classpathScanner.setPackageFilters(packageFilters);
+        classpathScanner.setIncludeJarFilters(jarFilters);
+        classpathScanner.setIncludePackageFilters(packageFilters);
         classpathScanner.setClassPathToScan(classPathToScan);
 
         classpathScanner.scanForClasses();
@@ -62,14 +63,18 @@ public Set<Class<?>> scanForClasses() throws Exception {
     }
 
     /**
-     * @throws Exception
      */
     @Override
-    public void processClass(ClassFile classFile) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public void processClass(ClassFile classFile) {
         if (isClassAnnotated(classFile)) {
             // log.debug("Found annotated class: " + className);
-            Class<?> clazz = Class.forName(classFile.getName());
-            detectedClasses.add(clazz);
+            try {
+                detectedClasses.add(Class.forName(classFile.getName()));
+            } catch (ClassNotFoundException e) {
+                // Can never occur. The class name comes from a class on the classpath.
+                throw new AssertionError(e);
+            }
         }
     }
 
@@ -112,29 +117,25 @@ private boolean isClassAnnotated(ClassFile classFile) {
         return false;
     }
 
-    /**
-     * @return the jarFilters
-     */
     public Set<String> getJarFilters() {
         return jarFilters;
     }
 
     /**
-     * @param jarFilters the jarFilters to set
+     * Only jars that match the given set of regular expressions will be processed. If this is not
+     * set, all jar files will be processed.
      */
     public void setJarFilters(Set<String> jarFilters) {
         this.jarFilters = jarFilters;
     }
 
-    /**
-     * @return the packageFilters
-     */
     public Set<String> getPackageFilters() {
         return packageFilters;
     }
 
     /**
-     * @param packageFilters the packageFilters to set
+     * Only packages that match the given set of regular expressions will be processed. If this is
+     * not set, all packages will be processed.
      */
     public void setPackageFilters(Set<String> packageFilters) {
         this.packageFilters = packageFilters;
diff --git a/src/main/java/gov/nasa/ziggy/services/database/ConnectInfo.java b/src/main/java/gov/nasa/ziggy/services/database/ConnectInfo.java
index b8fee43..73404e2 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/ConnectInfo.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/ConnectInfo.java
@@ -2,9 +2,9 @@
 
 import java.util.Properties;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 
 /**
@@ -21,19 +21,19 @@ public class ConnectInfo {
     private String password;
 
     public ConnectInfo() {
-        Configuration config = ZiggyConfiguration.getInstance();
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
 
         driverName = ZiggyHibernateConfiguration.driverClassName();
-        url = config.getString(PropertyNames.HIBERNATE_URL_PROP_NAME);
-        username = config.getString(PropertyNames.HIBERNATE_USERNAME_PROP_NAME);
-        password = config.getString(PropertyNames.HIBERNATE_PASSWD_PROP_NAME);
+        url = config.getString(PropertyName.HIBERNATE_URL.property());
+        username = config.getString(PropertyName.HIBERNATE_USERNAME.property());
+        password = config.getString(PropertyName.HIBERNATE_PASSWORD.property());
     }
 
     public ConnectInfo(Properties databaseProperties) {
         driverName = ZiggyHibernateConfiguration.driverClassName();
-        url = databaseProperties.getProperty(PropertyNames.HIBERNATE_URL_PROP_NAME);
-        username = databaseProperties.getProperty(PropertyNames.HIBERNATE_USERNAME_PROP_NAME);
-        password = databaseProperties.getProperty(PropertyNames.HIBERNATE_PASSWD_PROP_NAME);
+        url = databaseProperties.getProperty(PropertyName.HIBERNATE_URL.property());
+        username = databaseProperties.getProperty(PropertyName.HIBERNATE_USERNAME.property());
+        password = databaseProperties.getProperty(PropertyName.HIBERNATE_PASSWORD.property());
     }
 
     public ConnectInfo(String driverName, String url, String username, String password) {
@@ -89,5 +89,4 @@ public String toString() {
             .append("]");
         return builder.toString();
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/DatabaseController.java b/src/main/java/gov/nasa/ziggy/services/database/DatabaseController.java
index 0751b8f..e6001f6 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/DatabaseController.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/DatabaseController.java
@@ -2,7 +2,7 @@
 
 import java.nio.file.Path;
 
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 
 /**
@@ -22,20 +22,20 @@ public abstract class DatabaseController {
      * Obtains an instance of the correct subclass of {@link DatabaseController}.
      *
      * @return a new instance of the appropriate database controller, or {@code null} if the user
-     * has not specified a value for property database.software.name or the database associated with
-     * the given value is unsupported
+     * has not specified a value for property {@link PropertyName#DATABASE_SOFTWARE} or the database
+     * associated with the given value is unsupported
      */
     public static DatabaseController newInstance() {
 
         String databaseName = ZiggyConfiguration.getInstance()
-            .getString(PropertyNames.DATABASE_SOFTWARE_PROP_NAME, null);
-
+            .getString(PropertyName.DATABASE_SOFTWARE.property(), null);
         if (databaseName == null || databaseName.trim().isEmpty()) {
             return null;
         }
 
         SqlDialect dialect = SqlDialect.valueOf(databaseName.toUpperCase());
         return switch (dialect) {
+            case HSQLDB -> new HsqldbController();
             case POSTGRESQL -> new PostgresqlController();
             default -> null;
         };
@@ -85,11 +85,11 @@ public boolean isSystemDatabase() {
 
     /**
      * Returns the maximum number of connections to the database. See
-     * {@link PropertyNames#DATABASE_CONNECTIONS_PROP_NAME}.
+     * {@link PropertyName#DATABASE_CONNECTIONS}.
      */
     public String maxConnections() {
         return ZiggyConfiguration.getInstance()
-            .getString(PropertyNames.DATABASE_CONNECTIONS_PROP_NAME);
+            .getString(PropertyName.DATABASE_CONNECTIONS.property());
     }
 
     /**
@@ -125,32 +125,28 @@ public String maxConnections() {
     public abstract int status();
 
     /**
-     * Returns the host name of the database. See {@link PropertyNames#DATABASE_HOST_PROP_NAME}.
+     * Returns the host name of the database. See {@link PropertyName#DATABASE_HOST}.
      */
     public String host() {
-        return ZiggyConfiguration.getInstance().getString(PropertyNames.DATABASE_HOST_PROP_NAME);
+        return ZiggyConfiguration.getInstance().getString(PropertyName.DATABASE_HOST.property());
     }
 
     /**
-     * Returns the port number for the database. See {@link PropertyNames#DATABASE_PORT_PROP_NAME}.
+     * Returns the port number for the database. See {@link PropertyName#DATABASE_PORT}.
      */
     public int port() {
-        return Integer.parseInt(
-            ZiggyConfiguration.getInstance().getString(PropertyNames.DATABASE_PORT_PROP_NAME));
+        return ZiggyConfiguration.getInstance().getInt(PropertyName.DATABASE_PORT.property());
     }
 
     /**
-     * Returns the database name. See {@link PropertyNames#DATABASE_NAME_PROP_NAME}.
+     * Returns the database name. See {@link PropertyName#DATABASE_NAME}.
      */
     public String dbName() {
-        return ZiggyConfiguration.getInstance().getString(PropertyNames.DATABASE_NAME_PROP_NAME);
+        return ZiggyConfiguration.getInstance().getString(PropertyName.DATABASE_NAME.property());
     }
 
     /**
      * Checks whether the database specified by {@link #dbName()} exists.
-     *
-     * @return 0 for database running, &gt; 0 for any "not running" outcome, or
-     * {@link #NOT_SUPPORTED} if not supported
      */
     public abstract boolean dbExists();
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/DatabaseService.java b/src/main/java/gov/nasa/ziggy/services/database/DatabaseService.java
index b756de9..a9e529b 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/DatabaseService.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/DatabaseService.java
@@ -2,7 +2,6 @@
 
 import java.sql.Connection;
 import java.util.Collection;
-import java.util.Properties;
 
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
@@ -56,20 +55,8 @@ public static synchronized DatabaseService getInstance() {
     /**
      * Initialize the {@link DatabaseService} implementation. This method should only be called by
      * the {@link DatabaseService#getInstance()} methods.
-     *
-     * @throws PipelineException
-     */
-    public abstract void initialize() throws PipelineException;
-
-    /**
-     * Set an alternate source for the Hibernate properties. The default is to use the configuration
-     * service.
-     * <p>
-     * Used only for testing
-     *
-     * @param properties
      */
-    public abstract void setPropertiesSource(Properties properties);
+    public abstract void initialize();
 
     /**
      * Start a new {@link Session}/local transaction for the current thread
@@ -203,35 +190,6 @@ public static synchronized void markNotUsingService(boolean xa) {
         usingLocalService.set(Boolean.FALSE);
     }
 
-    /**
-     * Create an instance using the specified Hibernate properties. This instance is not cached, so
-     * a new instance will be returned each time.
-     * <p>
-     * This is only intended to be used by test code that keeps a reference to the returned
-     * instance. The use case is to allow tools that read from one database and write to another. If
-     * the destination is hsqldb, this provides a small-scale export capability since hsqldb can be
-     * configured to persist its state as txt files containing sql insert statements (very useful
-     * for seeding test databases used for automated tests).
-     * <p>
-     * Another use case is to verify user-entered credentials.
-     * <p>
-     * XA is not supported for these instances
-     *
-     * @param alternatePropertiesSource
-     * @return
-     * @throws PipelineException
-     */
-    public static synchronized DatabaseService getInstance(Properties alternatePropertiesSource) {
-        if (alternatePropertiesSource == null) {
-            throw new PipelineException("alternatePropertiesSource must not be null!");
-        }
-
-        HibernateDatabaseService instance = new HibernateDatabaseService();
-        instance.setPropertiesSource(alternatePropertiesSource);
-        instance.initialize();
-        return instance;
-    }
-
     /**
      * A thread local that stores a boolean and has an initial value.
      */
@@ -247,5 +205,4 @@ protected Boolean initialValue() {
             return initValue;
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/DatabaseTransaction.java b/src/main/java/gov/nasa/ziggy/services/database/DatabaseTransaction.java
index f01100f..8abc3d2 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/DatabaseTransaction.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/DatabaseTransaction.java
@@ -31,6 +31,8 @@ public interface DatabaseTransaction<T> {
 
     /**
      * Contains the contents of the transaction. Override in concrete class or lambda.
+     *
+     * @throws Exception, given that the transaction could throw just about anything.
      */
     T transaction() throws Exception;
 
@@ -59,13 +61,13 @@ default boolean swallowException() {
     }
 
     /**
-     * Determines whether the database transaction is performed without logging messages. The
-     * default behavior is to generate logging messages, but in some contexts these are overly
-     * distracting or not very useful and so should be suppressed. In those contexts, override this
-     * method to return true.
+     * Determines whether a transaction may be performed in the context of an existing transaction.
+     * In some cases this is not desirable, as transactions performed in that context will not
+     * commit when the transaction completes (they won't commit until the outer transaction
+     * completes). If {@link #allowExistingTransaction()} returns false, a {@link PipelineException}
+     * will be thrown if a transaction occurs in the context of an existing transaction.
      */
-    default boolean silent() {
-        return false;
+    default boolean allowExistingTransaction() {
+        return true;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/DatabaseTransactionFactory.java b/src/main/java/gov/nasa/ziggy/services/database/DatabaseTransactionFactory.java
index eb91e4c..4849680 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/DatabaseTransactionFactory.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/DatabaseTransactionFactory.java
@@ -1,9 +1,5 @@
 package gov.nasa.ziggy.services.database;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -11,13 +7,10 @@
 
 /**
  * Runs the {@link DatabaseTransaction#transaction()} method of a {@link DatabaseTransaction} within
- * a new transaction context. Use static method {@link #performTransaction(DatabaseTransaction)} to
- * run {@link DatabaseTransaction#transaction()} in the current thread or
- * {@link #performTransactionInThread(DatabaseTransaction)} to run
- * {@link DatabaseTransaction#transaction()} in a new thread.
+ * a new transaction context. Use the static method
+ * {@link #performTransaction(DatabaseTransaction)}.
  * <p>
- * The following example runs code in a transaction context within the current thread and doesn't
- * return a value.
+ * The following example runs code in a transaction context and doesn't return a value.
  *
  * <pre>
  * DatabaseTransactionFactory.performTransaction(() -&#62; {
@@ -26,10 +19,10 @@
  * });
  * </pre>
  *
- * The following example returns a value from a separate thread.
+ * The following example returns a value.
  *
  * <pre>
- * Integer result = (Integer) DatabaseTransactionFactory.performTransactionInThread(() -&#62; {
+ * Integer result = (Integer) DatabaseTransactionFactory.performTransaction(() -&#62; {
  *     // Content of transaction
  *     return queryResult;
  * });
@@ -39,7 +32,7 @@
  * <ol>
  * <li>An instance of {@link DatabaseService} is obtained and the transaction is started.
  * <li>The contents of the {@link DatabaseTransaction#transaction()} are executed.
- * <li>The transaction is committed.
+ * <li>The transaction is committed and the session is closed.
  * <li>If an exception occurred during the transaction, a catch block is executed. This includes any
  * optional content provided as part of {@link DatabaseTransaction#catchBlock(Throwable)}. The
  * transaction is rolled back. The catch block ends by throwing a {@link PipelineException} unless
@@ -53,11 +46,81 @@
  * @author PT
  * @author Bill Wohler
  */
-public class DatabaseTransactionFactory<T> implements Callable<T> {
+public class DatabaseTransactionFactory<T> {
+
+    /**
+     * Specifies the transaction context. Specifically, specifies whether the call to
+     * {@link DatabaseTransactionFactory#performTransaction(DatabaseTransaction) occurs in the
+     * context of an existing transaction. If the context is an existing transaction, then
+     * performTransaction should not begin, commit, or roll back the transaction, or close the
+     * session at the end of the operation; if the context is outside of an existing transaction,
+     * then the {@link TransactionContext} must provide all of the aforementioned functions.
+     *
+     * @author PT
+     */
+    private enum TransactionContext {
+
+        /**
+         * Existing transaction, so don't do anything to break the transaction that is outside of
+         * the control of the current activities.
+         */
+        IN_EXISTING_TRANSACTION {
+            @Override
+            public void beginTransaction() {
+            }
+
+            @Override
+            public void commitTransaction() {
+            }
+
+            @Override
+            public void rollBackTransactionIfActive() {
+            }
+
+            @Override
+            public void closeCurrentSession() {
+            }
+        },
+
+        /**
+         * No pre-existing transaction, so one must be created and managed.
+         */
+        IN_NEW_TRANSACTION {
+            @Override
+            public void beginTransaction() {
+                DatabaseService.getInstance().beginTransaction();
+            }
+
+            @Override
+            public void commitTransaction() {
+                DatabaseService.getInstance().commitTransaction();
+            }
+
+            @Override
+            public void rollBackTransactionIfActive() {
+                DatabaseService.getInstance().rollbackTransactionIfActive();
+            }
+
+            @Override
+            public void closeCurrentSession() {
+                DatabaseService.getInstance().closeCurrentSession();
+            }
+        };
+
+        public abstract void beginTransaction();
+
+        public abstract void commitTransaction();
+
+        public abstract void rollBackTransactionIfActive();
+
+        public abstract void closeCurrentSession();
+    }
 
     private static final Logger log = LoggerFactory.getLogger(DatabaseTransactionFactory.class);
 
     private DatabaseTransaction<T> transactionInstance;
+    private TransactionContext transactionContext;
+    private DatabaseService databaseService;
 
     private DatabaseTransactionFactory(DatabaseTransaction<T> transactionInstance) {
         this.transactionInstance = transactionInstance;
@@ -69,25 +132,47 @@ private DatabaseTransactionFactory(DatabaseTransaction<T> transactionInstance) {
      * returns from {@link DatabaseTransaction#transaction()} are returned by this method.
      */
     public static Object performTransaction(DatabaseTransaction<?> transactionInstance) {
+        if (log.isDebugEnabled()) {
+            log.debug("Called by {}", caller());
+        }
         return new DatabaseTransactionFactory<>(transactionInstance).performTransactionInternal();
     }
 
     /**
-     * Executes a transaction in a new thread. The user must supply an instance of
-     * {@link DatabaseTransaction} with a concrete {@link DatabaseTransaction#transaction()}. Any
-     * returns from {@link DatabaseTransaction#transaction()} are returned by this method.
+     * Returns the class, method, and line number of the stack element (or elements if a nested
+     * transaction occurs) just above this class in the call stack as a non-null string suitable for
+     * inclusion in a log message. Enable the trace logging level to get a stack backtrace as well.
      */
-    public static Object performTransactionInThread(DatabaseTransaction<?> transactionInstance) {
-        return new DatabaseTransactionFactory<>(transactionInstance)
-            .performTransactionInThreadInternal();
+    private static String caller() {
+        StackTraceElement[] stackTrace = new Exception().getStackTrace();
+
+        // Display the full stack if the trace log level is enabled.
+        if (log.isTraceEnabled()) {
+            for (int i = 0; i < stackTrace.length; i++) {
+                log.info("{}: {}.{}: {}", i, shortClassName(stackTrace[i].getClassName()),
+                    stackTrace[i].getMethodName(), Integer.toString(stackTrace[i].getLineNumber()));
+            }
+        }
+
+        boolean appendNextElement = false;
+        String caller = "";
+        for (StackTraceElement stackTraceElement : stackTrace) {
+            if (DatabaseTransactionFactory.class.getCanonicalName()
+                .equals(stackTraceElement.getClassName())) {
+                appendNextElement = true;
+            } else if (appendNextElement) {
+                appendNextElement = false;
+                String location = shortClassName(stackTraceElement.getClassName()) + "."
+                    + stackTraceElement.getMethodName() + ": "
+                    + Integer.toString(stackTraceElement.getLineNumber());
+                caller = caller.isEmpty() ? location : caller + ", " + location;
+            }
+        }
+        return caller.isEmpty() ? "unknown" : caller;
     }
 
-    /**
-     * Allows the transaction to be called within a thread.
-     */
-    @Override
-    public T call() {
-        return performTransactionInternal();
+    private static String shortClassName(String canonicalName) {
+        return canonicalName.substring(canonicalName.lastIndexOf(".") + 1);
     }
 
     /**
@@ -101,48 +186,38 @@ public T call() {
      * @see #swallowException()
      */
     private T performTransactionInternal() {
+        databaseService = DatabaseService.getInstance();
+        transactionContext = databaseService.transactionIsActive()
+            ? TransactionContext.IN_EXISTING_TRANSACTION
+            : TransactionContext.IN_NEW_TRANSACTION;
+        log.debug("session={}, transactionIsActive={}, thread={}", databaseService.getSession(),
+            databaseService.transactionIsActive(), Thread.currentThread().getName());
+        if (transactionContext == TransactionContext.IN_EXISTING_TRANSACTION
+            && !transactionInstance.allowExistingTransaction()) {
+            throw new PipelineException(
+                "Attempted to perform database access in existing transaction");
+        }
         T result = null;
-        DatabaseService databaseService = DatabaseService.getInstance();
         try {
-            if (!transactionInstance.silent()) {
-                log.info("Beginning transaction");
-            }
-            databaseService.beginTransaction();
+            transactionContext.beginTransaction();
             result = transactionInstance.transaction();
-            databaseService.commitTransaction();
-            if (!transactionInstance.silent()) {
-                log.info("Transaction completed");
-            }
+            transactionContext.commitTransaction();
         } catch (Throwable e) {
-            log.error("Exception during transaction", e);
-            databaseService.rollbackTransactionIfActive();
+            transactionContext.rollBackTransactionIfActive();
             transactionInstance.catchBlock(e);
             if (!transactionInstance.swallowException()) {
-                throw new PipelineException("Transaction failed with error.", e);
+                throw new PipelineException("Transaction failed with error", e);
             }
+            log.error("Exception during transaction", e);
         } finally {
-            databaseService.closeCurrentSession();
+            transactionContext.closeCurrentSession();
             transactionInstance.finallyBlock();
         }
-
         return result;
     }
 
-    /**
-     * Performs the transaction in a separate thread. See the class documentation for examples.
-     *
-     * @see #performTransactionInternal()
-     */
-    private T performTransactionInThreadInternal() {
-        ExecutorService executorService = SingleThreadExecutor.newInstance();
-        Future<T> future = executorService.submit(this);
-        executorService.shutdown();
-
-        try {
-            return future.get();
-        } catch (Exception e) {
-            throw new PipelineException("Unable to retrieve value from future", e);
-        }
+    /** For testing only. */
+    static String callerTest() {
+        return caller();
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/DbDumper.java b/src/main/java/gov/nasa/ziggy/services/database/DbDumper.java
deleted file mode 100644
index c9fa752..0000000
--- a/src/main/java/gov/nasa/ziggy/services/database/DbDumper.java
+++ /dev/null
@@ -1,589 +0,0 @@
-package gov.nasa.ziggy.services.database;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.regex.Pattern;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.util.RegexEditor;
-import gov.nasa.ziggy.util.io.FileUtil;
-
-/**
- * DbDumper - writes the contents of selected tables to a file
- *
- * @author Jay Gunter
- */
-public class DbDumper {
-    private static final Logger log = LoggerFactory.getLogger(DbDumper.class);
-
-    private static final String FIELD_SEPARATOR = ",";
-    private static final String COLUMN_EXPRESSION_SEPARATOR = "?";
-    private static final String[] ALL_TABLES = { "%" };
-    private static final String[] NO_COLUMNS = {};
-
-    private final ConnectInfo connectInfo;
-    private Connection connection;
-    private DatabaseMetaData dmd;
-    private String[] tablePrefixes = ALL_TABLES;
-    private String[] undesiredColumns = NO_COLUMNS;
-
-    private final Map<String, Pattern[]> patternsByColumn = new HashMap<>();
-
-    private String exFilename;
-
-    private String acFilename;
-
-    @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = """
-        User must be able to specify location of files for use in writing
-        out database tables. The db dump files that are read in are then
-        compared to one another and never used for any purpose that exposes
-        execution to malicious contents of the files.
-        """)
-    public static void main(String[] args) throws Exception {
-
-        File expectedFile = null;
-        File actualFile = null;
-
-        int i;
-        for (i = 0; i < args.length; i++) {
-            if (args[i].equals("x")) {
-                args[i] = "";
-            }
-            log.info(String.format("args[%s]= " + args[i]));
-        }
-        i = 0;
-
-        ConnectInfo connectInfo = new ConnectInfo("org.hsqldb.jdbcDriver", args[i++], "sa", "");
-
-        if (args[i].equals("v")) {
-            expectedFile = new File(args[++i]);
-            actualFile = new File(args[++i]);
-            DbDumper dbDumper = new DbDumper();
-            dbDumper.validateDatabase(expectedFile, actualFile);
-        } else {
-            DbDumper dbDumper = new DbDumper(connectInfo);
-            dbDumper.setTablePrefixes(nullIfNull(args[i++]));
-            dbDumper.setUndesiredColumnNames(nullIfNull(args[i++]));
-            dbDumper.writeDesiredTableData(new File(args[i++]));
-        }
-    }
-
-    /**
-     * If passed "null" returns null, otherwise returns String passed. This allows null to be
-     * expressed when running DbDumper from command line.
-     *
-     * @param s
-     * @return
-     */
-    private static String nullIfNull(String s) {
-        return s.equals("null") ? null : s;
-    }
-
-    /**
-     * Constructor used when dumping all tables and columns, or when separate calls to
-     * setTablePrefixes and setExcludeColumns makes sense.
-     *
-     * @param connectInfo
-     * @throws Exception
-     */
-    public DbDumper(ConnectInfo connectInfo) throws Exception {
-        this.connectInfo = connectInfo;
-        init();
-    }
-
-    /**
-     * Constructor used when table prefixes and excluded columns are known up front.
-     *
-     * @param connectInfo
-     * @param prefixes
-     * @param excludeColumns
-     * @throws Exception
-     */
-    public DbDumper(ConnectInfo connectInfo, String[] prefixes, String[] excludeColumns)
-        throws Exception {
-        this.connectInfo = connectInfo;
-        setTablePrefixes(prefixes);
-        setUndesiredColumnNames(excludeColumns);
-        init();
-    }
-
-    public DbDumper() throws Exception {
-        this(new ConnectInfo());
-    }
-
-    /**
-     * Get database connection and get database metadata.
-     *
-     * @throws Exception
-     */
-    private void init() throws Exception {
-        connect();
-        dmd = connection.getMetaData();
-    }
-
-    public void setTablePrefixes(String csv) {
-        setTablePrefixes(csv.split(","));
-    }
-
-    public void setTablePrefixes(String[] prefixes) {
-        tablePrefixes = prefixes;
-    }
-
-    public void setUndesiredColumnNames(String csv) {
-        setUndesiredColumnNames(csv.split(","));
-    }
-
-    public void setUndesiredColumnNames(String[] names) {
-        undesiredColumns = names;
-    }
-
-    /**
-     * Reads database metadata to find tables whose names match table prefixes, then determines
-     * which columns should be selected from the database, and performs those queries to generate
-     * the output file.
-     *
-     * @param outFile
-     * @throws Exception
-     */
-    public void writeDesiredTableData(File outFile) throws Exception {
-        log.info("Writing " + outFile.getAbsolutePath());
-        if (tablePrefixes.equals(ALL_TABLES)) {
-            log.info("all tables will be written");
-        }
-        if (undesiredColumns.equals(NO_COLUMNS)) {
-            log.info("all columns will be written");
-        }
-
-        try (BufferedWriter output = new BufferedWriter(
-            new OutputStreamWriter(new FileOutputStream(outFile), FileUtil.ZIGGY_CHARSET))) {
-            updatePatternsByTable();
-
-            // use database metadata to find tables with names matching prefixes
-            List<String> tableNames = new ArrayList<>();
-            Map<String, List<String>> selects = new HashMap<>();
-            for (String element : tablePrefixes) {
-                log.debug("table prefix #1 = " + element);
-                try (ResultSet tablesRS = dmd.getTables(null, null, element.toUpperCase() + "%",
-                    new String[] { "TABLE" })) {
-                    log.debug("tablesRS.getRow()=" + tablesRS.getRow());
-                    while (tablesRS.next()) {
-                        String tableName = tablesRS.getString("TABLE_NAME");
-                        log.info("table name: " + tableName);
-                        tableNames.add(tableName);
-
-                        // build list of desired (non-excluded) column names
-                        try (ResultSet columnsRS = dmd.getColumns(null, null,
-                            tableName.toUpperCase(), null)) {
-                            log.debug("columnsRS.getRow()=" + columnsRS.getRow());
-                            String tableColumns = "";
-                            String comma = "";
-                            List<String> columnNames = new ArrayList<>();
-                            while (columnsRS.next()) {
-                                String colName = columnsRS.getString("COLUMN_NAME");
-                                log.debug("colName = " + colName);
-                                String colSize = columnsRS.getString("COLUMN_SIZE");
-                                log.debug("colSize = " + colSize);
-
-                                String fullColName = tableName + "." + colName;
-                                int j = 0;
-                                log.debug("undesiredColumns.length=" + undesiredColumns.length);
-                                for (; j < undesiredColumns.length; j++) {
-                                    String column = undesiredColumns[j];
-                                    log.debug(String.format("undesiredColumns[%s]=", column));
-                                    if (column.indexOf(COLUMN_EXPRESSION_SEPARATOR) == -1
-                                        && fullColName.equalsIgnoreCase(column)) {
-                                        break;
-                                    }
-                                }
-                                if (j == undesiredColumns.length) {
-                                    tableColumns += comma + colName;
-                                    comma = ", ";
-                                    columnNames.add(colName);
-                                }
-                            }
-
-                            if (0 == tableColumns.length()) {
-                                tableColumns = "*";
-                            }
-                            if (0 == columnNames.size()) {
-                                log.error("all columns filtered away for table " + tableName);
-                            } else {
-                                // sort the column names to ensure output
-                                // comparability
-                                Collections.sort(columnNames);
-                                selects.put(tableName, columnNames);
-                            }
-                        }
-                    }
-                }
-            }
-
-            // sort table names to ensure output comparability
-            Collections.sort(tableNames);
-
-            // build and run a SELECT statement for each table
-            for (String tableName : tableNames) {
-                log.debug("table name: " + tableName);
-                List<String> columnNames = selects.get(tableName);
-                if (null == columnNames || 0 == columnNames.size()) {
-                    log.warn("no columns selected from table " + tableName);
-                    continue;
-                }
-                String comma = "";
-                String select = "SELECT ";
-                for (String columnName : columnNames) {
-                    select += comma + columnName;
-                    comma = FIELD_SEPARATOR;
-                }
-                select += " FROM " + tableName;
-                try (Statement stmt = connection.createStatement()) {
-                    log.info("select statement: " + select);
-                    output.write(select + "\n");
-                    try (ResultSet rs = stmt.executeQuery(select)) {
-                        log.debug("rs.getRow() = " + rs.getRow());
-                        List<String> tableLines = new ArrayList<>(rs.getFetchSize());
-                        while (rs.next()) {
-                            String outLine = "";
-                            comma = "";
-                            ResultSetMetaData rsmd = rs.getMetaData();
-                            int ncols = rsmd.getColumnCount();
-                            for (int c = 1; c <= ncols; c++) {
-                                outLine += comma + rs.getString(c);
-                                comma = FIELD_SEPARATOR;
-                            }
-                            log.debug("row data = " + outLine);
-                            tableLines.add(outLine);
-                        }
-                        Collections.sort(tableLines);
-                        for (String line : tableLines) {
-                            output.write(line + "\n");
-                        }
-                    }
-                }
-            }
-        }
-    } // writeDesiredTableData
-
-    /**
-     * Compares two files written by writeDesiredTableData.
-     */
-    public void validateDatabase(File expectedData, File actualData) throws Exception {
-        exFilename = expectedData.getAbsolutePath();
-        acFilename = actualData.getAbsolutePath();
-        log.info("actual=" + acFilename + ", expected=" + exFilename);
-
-        DumpFile ac;
-        try {
-            ac = new DumpFile(actualData);
-        } catch (Exception e) {
-            throw exception("Actual data file missing.");
-        }
-        DumpFile ex;
-        try {
-            ex = new DumpFile(expectedData);
-        } catch (Exception e) {
-            throw exception("Expected data file was missing; " + "consider copying "
-                + actualData.getAbsolutePath() + " to " + expectedData.getAbsolutePath()
-                + " and rerunning this test to validate against the new expected data file.");
-        }
-
-        updatePatternsByTable();
-
-        String[] exColumnValues = null;
-        String[] acColumnValues = null;
-        List<String> diffSelects = new ArrayList<>();
-        Set<String> tableNames = new TreeSet<>();
-        Set<String> diffColumns = new HashSet<>();
-        Map<String, Integer> diffCount = new HashMap<>();
-        int diffRows = 0;
-        int totalDiffRows = 0;
-        int totalDiffValues = 0;
-        String allDiffs = "";
-        boolean skipToNextSelect = false;
-
-        while (true) {
-            ex.read();
-            ac.read();
-            if (ex.eof && ac.eof) {
-                break;
-            }
-
-            tableNames.add(ex.tableName);
-            tableNames.add(ac.tableName);
-            if (ex.select && ac.select) {
-                diffRows = 0;
-                int tableNameComparison = ex.tableName.compareTo(ac.tableName);
-                skipToNextSelect = ex.waiting = ac.waiting = false;
-                if (tableNameComparison == 0) {
-                    // compare columns in SELECT statements
-                    if (!ex.line.equals(ac.line)) {
-                        diffSelects.add("Columns differ for table " + ex.tableName
-                            + ":\nexpected columns:\n" + ex.line + " (line #)" + ex.lines
-                            + ":\nactual columns:\n" + ac.line + " (line #)" + ac.lines);
-                        skipToNextSelect = true;
-                    }
-                } else if (tableNameComparison < 0) {
-                    // ex.tableName is alphabetically before current
-                    // ac.tableName,
-                    // so ex has a table that ac does not.
-                    // Loop through the data rows of the current ex table
-                    // and wait to see if ac has the next ex table.
-                    ac.waiting = true;
-                } else { // tableNameComparison > 0
-                    ex.waiting = true;
-                }
-                continue;
-            }
-
-            if (ex.select && !ac.select) {
-                // ac has more rows in current table than ex.
-                // Just wait for next table (select statement).
-                // Differing row counts appears in the report summation.
-                if (!ac.eof) {
-                    ex.waiting = true;
-                }
-                continue;
-            }
-            if (!ex.select && ac.select) {
-                if (!ex.eof) {
-                    ac.waiting = true;
-                }
-                continue;
-            }
-
-            if (!ex.waiting && !ex.eof && !ac.waiting && !ac.eof && !skipToNextSelect) {
-                // compare data rows
-                exColumnValues = ex.line.split(FIELD_SEPARATOR);
-                acColumnValues = ac.line.split(FIELD_SEPARATOR);
-                // need columns
-                if (exColumnValues.length != acColumnValues.length) {
-                    // If the expected vs actual selects matched
-                    // but we get a different # of columns in the data
-                    // we bail out. This should never happen.
-                    throw exception("INTERNAL ERROR IN DBDUMPER, UNEQUAL NUMBER OF COLUMN VALUES:\n"
-                        + "expected: table=" + ex.tableName + ", #rows=" + ex.rowsInTable + " line="
-                        + ex.line + "\nactual: table=" + ac.tableName + ", #rows=" + ac.rowsInTable
-                        + " line=" + ac.line);
-                }
-                String diffs = ""; // diffs for this row
-                boolean diffsInRow = false;
-                for (int i = 0; i < ex.columnNames.length; i++) {
-                    String tabCol = ex.tableName + "." + ex.columnNames[i];
-                    Pattern[] patterns = patternsByColumn.get(tabCol);
-                    if ((patterns == null || patterns.length == 0)
-                        && !exColumnValues[i].equals(acColumnValues[i])
-                        || patterns != null && patterns.length > 0 && !RegexEditor
-                            .stringEquals(exColumnValues[i], acColumnValues[i], patterns)) {
-                        diffsInRow = true;
-                        totalDiffValues++;
-                        // To make error reporting concise,
-                        // we only report the first difference for a particular
-                        // column.
-                        if (!diffColumns.contains(tabCol)) {
-                            diffColumns.add(tabCol);
-                            diffs += "\n   column #" + i + " (column name=" + ex.columnNames[i]
-                                + "): \n      expected value = '" + exColumnValues[i] + "'"
-                                + "\n      actual   value = '" + acColumnValues[i] + "'";
-                        }
-                    }
-                }
-                if (diffsInRow) {
-                    diffRows++;
-                    totalDiffRows++;
-                }
-                diffCount.put(ex.tableName, diffRows);
-                if (0 != diffs.length()) {
-                    allDiffs += "\nTable " + ex.tableName
-                        + ", first conflicting row: expected row #" + ex.rowsInTable + " (line #"
-                        + ex.lines + ") " + ", actual row #" + ac.rowsInTable + " (line #"
-                        + ac.lines + ") " + ": differences:" + diffs;
-                }
-            }
-        }
-
-        // gather differences into a single message to throw in an exception
-        String msg = "";
-        for (String s : diffSelects) {
-            msg += "\n" + s;
-        }
-        for (String table : tableNames) {
-            StringBuilder s = new StringBuilder();
-            int exRows = -1;
-            int acRows = -1;
-            s.append("\nTable ").append(table);
-            if (ex.tableNames.contains(table)) {
-                exRows = ex.rowCount.get(table);
-                s.append(": expected has ").append(exRows).append(" rows");
-            } else {
-                s.append(" (table missing in expected)");
-            }
-            if (ac.tableNames.contains(table)) {
-                acRows = ac.rowCount.get(table);
-                s.append(": actual has ").append(acRows).append(" rows");
-            } else {
-                s.append(" (table missing in actual)");
-            }
-            Integer n = diffCount.get(table);
-            int diffs = 0;
-            if (null != n) {
-                diffs = diffCount.get(table);
-            }
-            if (diffs > 0) {
-                s.append(": differences found in ").append(diffs).append(" rows.");
-            }
-            if (exRows != acRows || diffs > 0) {
-                msg += s.toString();
-            }
-        }
-        if (0 != allDiffs.length()) {
-            msg += "\n" + allDiffs;
-            if (totalDiffRows > 0) {
-                msg += "\n\nTotal number of differing rows for all tables = "
-                    + String.format("%,d", totalDiffRows);
-                msg += "\nTotal number of differing values for all tables = "
-                    + String.format("%,d", totalDiffValues);
-            }
-            String comma = "";
-            StringBuilder potentialExcludeColumns = new StringBuilder();
-            List<String> tabCols = new ArrayList<>(diffColumns);
-            Collections.sort(tabCols);
-            for (String tabCol : tabCols) {
-                potentialExcludeColumns.append(comma).append("\"").append(tabCol).append("\"");
-                comma = ",\n";
-            }
-            msg += "\n\nColumns to consider for exclusion:\n" + potentialExcludeColumns.toString();
-        }
-        if (0 != msg.length()) {
-            throw exception(msg);
-        }
-    }
-
-    private Exception exception(String msg) throws Exception {
-        String fullMsg = "Validation failed:  data files not identical:" + "\nExpected data file = "
-            + exFilename + "\nActual   data file = " + acFilename + "\nDifferences:" + msg;
-        log.error(fullMsg);
-        return new Exception(fullMsg);
-    }
-
-    /**
-     * (Re)connect to the database.
-     *
-     * @throws PipelineException
-     */
-    public void connect() throws PipelineException {
-        try {
-            Class.forName(connectInfo.getDriverName());
-            connection = DriverManager.getConnection(connectInfo.getUrl(),
-                connectInfo.getUsername(), connectInfo.getPassword());
-        } catch (Exception e) {
-            throw new PipelineException("failed to connect to: " + connectInfo.getUrl(), e);
-        }
-    }
-
-    public Connection getConnection() {
-        return connection;
-    }
-
-    private void updatePatternsByTable() {
-        patternsByColumn.clear();
-        if (undesiredColumns != null) {
-            for (String column : undesiredColumns) {
-                int index = column.indexOf(COLUMN_EXPRESSION_SEPARATOR);
-                if (index != -1) {
-                    String columnName = column.substring(0, index++);
-                    String excludeRegex = column.substring(index);
-                    String regexWithNonCaptureGroup = "(.*)(?:" + excludeRegex + ")(.*)";
-                    Pattern pattern = Pattern.compile(regexWithNonCaptureGroup);
-                    patternsByColumn.put(columnName, new Pattern[] { pattern });
-                }
-            }
-        }
-    }
-
-    private static final class DumpFile {
-        private BufferedReader in = null;
-        private boolean eof = false;
-        private boolean select = false;
-        private boolean waiting = false;
-        private String line = "";
-        private final Set<String> tableNames = new TreeSet<>();
-        private String tableName = "";
-        private String[] columnNames = {};
-        private int lines = 0;
-        private int rowsInTable = 0;
-        private final Map<String, Integer> rowCount = new HashMap<>();
-
-        private DumpFile(File file) throws FileNotFoundException {
-            in = new BufferedReader(
-                new InputStreamReader(new FileInputStream(file), FileUtil.ZIGGY_CHARSET));
-        }
-
-        public String read() {
-            if (waiting) {
-                return "";
-            }
-            try {
-                line = in.readLine();
-                if (null == line) {
-                    eof = true;
-                    line = "";
-                }
-            } catch (Exception e) {
-                eof = true;
-                line = "";
-            }
-            if (eof) {
-                return line;
-            }
-            lines++;
-            // if (tableName.length() > 0) {
-            // rowCount.put(tableName, rowsInTable);
-            // }
-            select = false;
-            if (line.startsWith("SELECT ")) {
-                select = true;
-                int i = line.lastIndexOf(" FROM ");
-                // skip the 6 characters of " FROM "
-                tableName = line.substring(i + 6);
-                tableNames.add(tableName);
-                columnNames = line.substring(7, i).split(FIELD_SEPARATOR);
-                rowsInTable = 0;
-                // rowCount.put(tableName, rowsInTable);
-            } else {
-                // log.info("line=" + line);
-                if (tableName.length() <= 0) {
-                    log.error("INTERNAL ERROR: EMPTY TABLE NAME");
-                }
-                rowsInTable++;
-            }
-            rowCount.put(tableName, rowsInTable);
-            // log.info(inFile.getName() + ": tableName="+tableName+",
-            // rowsInTable="+rowsInTable+": line="+line);
-            return line;
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/database/DerbyUrl.java b/src/main/java/gov/nasa/ziggy/services/database/DerbyUrl.java
deleted file mode 100644
index 14d4f69..0000000
--- a/src/main/java/gov/nasa/ziggy/services/database/DerbyUrl.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package gov.nasa.ziggy.services.database;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * The result of parsing the Derby URL. This is needed because the Derby DataSource objects will not
- * parse their own URLs.
- *
- * @author Sean McCauliff
- */
-public class DerbyUrl {
-    public final static int DERBY_DEFAULT_PORT = 1523;
-
-    final String databaseName;
-    /** e.g. ";create=true" */
-    final String attributes;
-    final String hostName;
-    final int portNumber;
-
-    public DerbyUrl(String databaseName, String attributes, String hostName, int portNumber) {
-        this.databaseName = databaseName;
-        this.attributes = attributes;
-        this.hostName = hostName;
-        this.portNumber = portNumber;
-    }
-
-    public static DerbyUrl parseDerbyUrl(String url) {
-        Pattern p = Pattern.compile("jdbc:derby:([^;]+)(;.+)?");
-        Matcher m = p.matcher(url);
-        if (!m.matches()) {
-            throw new IllegalArgumentException("Invalid derby url \" " + url + "\".");
-        }
-
-        String databaseName = null;
-        String hostName = null;
-        String attributes = "";
-        int portNumber = DERBY_DEFAULT_PORT;
-
-        if (m.group(1).startsWith("//")) {
-            // parse network url
-            Pattern netPattern = Pattern.compile("//([^:/]+)(:\\d+)?/(.+)");
-            Matcher netMatcher = netPattern.matcher(m.group(1));
-            if (!netMatcher.matches()) {
-                throw new IllegalArgumentException(
-                    "Bad network specification " + "for derby url \"" + m.group(1) + "\".");
-            }
-
-            hostName = netMatcher.group(1);
-            if (netMatcher.group(2) != null) {
-                portNumber = Integer.parseInt(netMatcher.group(2).substring(1));
-            }
-            databaseName = netMatcher.group(3);
-        } else {
-            databaseName = m.group(1);
-        }
-
-        if (m.groupCount() > 1) {
-            attributes = m.group(2) == null ? "" : m.group(2).substring(1);
-        }
-
-        return new DerbyUrl(databaseName, attributes, hostName, portNumber);
-    }
-
-    /**
-     * @return the attributes
-     */
-    public String getAttributes() {
-        return attributes;
-    }
-
-    /**
-     * @return the databaseName
-     */
-    public String getDatabaseName() {
-        return databaseName;
-    }
-
-    /**
-     * @return the hostName
-     */
-    public String getHostName() {
-        return hostName;
-    }
-
-    /**
-     * @return the portNumber
-     */
-    public int getPortNumber() {
-        return portNumber;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/database/HibernateDatabaseService.java b/src/main/java/gov/nasa/ziggy/services/database/HibernateDatabaseService.java
index 1ef3001..8f35f94 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/HibernateDatabaseService.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/HibernateDatabaseService.java
@@ -5,13 +5,12 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.crud.ProtectedEntityInterceptor;
-import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Implementation of the {@link DatabaseService} for Hibernate.
@@ -25,7 +24,6 @@ public final class HibernateDatabaseService extends HibernateDatabaseServiceBase
     public static final Logger log = LoggerFactory.getLogger(HibernateDatabaseService.class);
 
     private SessionFactory sessionFactory;
-    private ServiceRegistry serviceRegistery;
 
     protected final ThreadLocal<Session> threadSession = new ThreadLocal<>();
 
@@ -40,50 +38,42 @@ public final class HibernateDatabaseService extends HibernateDatabaseServiceBase
      */
     @Override
     public void initialize() {
-        log.debug("Hibernate Init: Building configuration");
-        hibernateConfig = ZiggyHibernateConfiguration
-            .buildHibernateConfiguration(alternatePropertiesSource);
+        log.debug("Building configuration");
+        hibernateConfig = ZiggyHibernateConfiguration.buildHibernateConfiguration();
 
-        try {
-            log.debug("Hibernate Init: Initializing SessionFactory");
-            serviceRegistery = new ServiceRegistryBuilder()
-                .applySettings(hibernateConfig.getProperties())
-                .buildServiceRegistry();
-            sessionFactory = hibernateConfig.buildSessionFactory(serviceRegistery);
-
-            log.debug("Hibernate Init: initialization complete - " + sessionFactory);
-        } catch (Exception e) {
-            log.error("Hibernate Init: " + serviceRegistery + ": failed to create sessionFactory.",
-                e);
-            throw new IllegalStateException(e);
-        }
+        log.debug("Initializing SessionFactory");
+        sessionFactory = hibernateConfig.buildSessionFactory();
+
+        log.debug("Initialization complete - {}", sessionFactory);
     }
 
     /**
      * Start a new transaction for the current Session
      */
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
     public void beginTransaction() {
         Session session = null;
 
         try {
+            log.debug("Starting Hibernate transaction");
             session = getSession();
             session.beginTransaction();
         } catch (HibernateException e) {
             handleException(e, session);
         }
-
-        log.debug("Hibernate transaction started.");
     }
 
     /**
      * Commit the current transaction and close the Session
      */
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
     public void commitTransaction() {
         Session session = null;
 
         try {
+            log.debug("Committing Hibernate transaction");
             session = getSession();
             session.getTransaction().commit();
         } catch (HibernateException e) {
@@ -95,6 +85,7 @@ public void commitTransaction() {
      * Roll back the existing transaction, if any, and close the Session
      */
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
     public void rollbackTransactionIfActive() {
         Session session = null;
 
@@ -103,6 +94,7 @@ public void rollbackTransactionIfActive() {
 
             Transaction transaction = getSession().getTransaction();
             if (transaction != null && transaction.isActive()) {
+                log.debug("Rolling back active Hibernate transaction");
                 transaction.rollback();
                 threadSession.remove();
                 session.close();
@@ -124,22 +116,27 @@ public void doSchemaExport() {
     }
 
     /**
-     * Try to close the current {@link Session} and remove it from the ThreadLocal
-     *
-     * @param e
-     * @param session
-     * @throws PipelineException
+     * Try to close the current {@link Session} and remove it from the ThreadLocal.
+     * {@link #handleException(HibernateException, Session) is called by all methods that have to
+     * handle {@link HibernateException}. The idea here is to ensure that the session gets closed
+     * before the {@link HibernateException} passes execution control back to the caller. Think of
+     * this as being like a finally block, but implemented as a method so we don't have to duplicate
+     * the same finally block in multiple places.
      */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     protected void handleException(HibernateException e, Session session) {
         threadSession.remove();
 
         if (session != null) {
             try {
                 session.close();
-            } catch (Exception e2) {
-                log.warn("Failed to close Session after previousfailure", e2);
+            } catch (HibernateException ignored) {
+                log.warn("Failed to close Session after previousfailure", ignored);
+                // A failure to close the session must not bring down the pipeline.
             }
         }
+        // Now that the session is closed, we can throw the exception and pass
+        // execution back to the caller.
         throw e;
     }
 
@@ -153,11 +150,10 @@ public Session getSession() {
         Session session = threadSession.get();
 
         if (session == null) {
-            log.debug("Creating new Session for Thread: " + Thread.currentThread().getName());
             session = sessionFactory().withOptions()
                 .interceptor(new ProtectedEntityInterceptor())
                 .openSession();
-            log.debug("Created new Session: " + session);
+            log.debug("Created Session {} in Thread {}", session, Thread.currentThread().getName());
             threadSession.set(session);
         }
 
@@ -176,6 +172,7 @@ public void closeCurrentSession() {
         if (session != null) {
             threadSession.remove();
             session.close();
+            log.debug("Closed Session {} in Thread {}", session, Thread.currentThread().getName());
         }
     }
 
@@ -183,5 +180,4 @@ public void closeCurrentSession() {
     protected SessionFactory sessionFactory() {
         return sessionFactory;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/HibernateDatabaseServiceBase.java b/src/main/java/gov/nasa/ziggy/services/database/HibernateDatabaseServiceBase.java
index fb534d9..214ccca 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/HibernateDatabaseServiceBase.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/HibernateDatabaseServiceBase.java
@@ -3,46 +3,35 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Collection;
-import java.util.Properties;
 
-import org.hibernate.FlushMode;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.spi.SessionImplementor;
 
 import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import jakarta.persistence.FlushModeType;
 
 public abstract class HibernateDatabaseServiceBase extends DatabaseService {
 
-    /**
-     * If set, these properties are used to initialize Hibernate. If null, the properties are
-     * fetched from the config service
-     */
-    protected Properties alternatePropertiesSource = null;
-
     protected Configuration hibernateConfig = null;
 
     public HibernateDatabaseServiceBase() {
     }
 
-    /**
-     * @see gov.nasa.ziggy.services.database.DatabaseService#flush()
-     */
     @Override
     public void flush() {
         getSession().flush();
     }
 
-    /**
-     * @see gov.nasa.ziggy.services.database.DatabaseService#setAutoFlush(boolean)
-     */
     @Override
     public void setAutoFlush(boolean active) {
         if (active) {
-            getSession().setFlushMode(FlushMode.AUTO);
+            getSession().setFlushMode(FlushModeType.AUTO);
         } else {
-            getSession().setFlushMode(FlushMode.MANUAL);
+            getSession().setFlushMode(FlushModeType.COMMIT);
         }
     }
 
@@ -57,7 +46,7 @@ protected String getPropertyChecked(String name) {
 
     @Override
     public void evictAll(Class<?> clazz) {
-        sessionFactory().getCache().evictEntityRegion(clazz);
+        sessionFactory().getCache().evictEntityData(clazz);
     }
 
     @Override
@@ -70,20 +59,16 @@ public void evictAll(Collection<?> collection) {
 
     @Override
     public void evict(Object object) {
-        Session session = getSession();
-        session.evict(object);
+        getSession().evict(object);
     }
 
     @Override
     public void clear() {
-        Session session = getSession();
-        session.clear();
+        getSession().clear();
     }
 
-    /**
-     * @see gov.nasa.ziggy.services.database.DatabaseService#getConnection()
-     */
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public Connection getConnection() {
         Session session = getSession();
         try {
@@ -98,14 +83,9 @@ public Connection getConnection() {
     }
 
     /**
-     * The underlying Hibernate implementation of javax.persistence.EntityManagerFactory. We use
+     * The underlying Hibernate implementation of jakarta.persistence.EntityManagerFactory. We use
      * this to get direct access to the Hibernate APIs rather than using the JPA (which is a subset
      * of the Hibernate functionality)
      */
     protected abstract SessionFactory sessionFactory();
-
-    @Override
-    public void setPropertiesSource(Properties properties) {
-        alternatePropertiesSource = properties;
-    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/HsqldbController.java b/src/main/java/gov/nasa/ziggy/services/database/HsqldbController.java
new file mode 100644
index 0000000..5aa87b3
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/database/HsqldbController.java
@@ -0,0 +1,394 @@
+package gov.nasa.ziggy.services.database;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_URL;
+import static gov.nasa.ziggy.util.WrapperUtils.WRAPPER_CLASSPATH_PROP_NAME_PREFIX;
+import static gov.nasa.ziggy.util.WrapperUtils.WRAPPER_LIBRARY_PATH_PROP_NAME_PREFIX;
+import static gov.nasa.ziggy.util.WrapperUtils.wrapperParameter;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.exec.CommandLine;
+import org.hsqldb.Server;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.WrapperUtils.WrapperCommand;
+
+/**
+ * Implementation of {@link DatabaseController} for HSQLDB databases.
+ * <p>
+ * Since we don't want to use the same RDBMS for unit tests as what's used in production, as that
+ * could potentially lead to damage to a production database when unit tests are run, we use HSQLDB
+ * for the tests.
+ * <p>
+ * Important: This class makes use of code that might be vulnerable to SQL injection. If it's used
+ * for anything more than unit tests and the sample pipeline, evaluate all code marked with
+ * SQL_INJECTION_JDBC. Also, the password should be set to something other than an empty string.
+ * <p>
+ * TODO Now that the manual touts HSQLDB as a viable database, consider the issues posed here
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class HsqldbController extends DatabaseController {
+
+    private static final Logger log = LoggerFactory.getLogger(HsqldbController.class);
+
+    private static final String SCHEMA_CREATE_FILE = "ddl.hsqldb-create.sql";
+    private static final String SCHEMA_DROP_FILE = "ddl.hsqldb-drop.sql";
+    private static final String DRIVER_CLASS_NAME = "org.hsqldb.jdbc.JDBCDriver";
+    private static final String LOG_SUFFIX = ".log";
+
+    private static final String INIT_TABLE_NAME = "HSQLDB_CONTROLLER_CREATED";
+    private static final String TABLE_COUNT = "select count(*) from INFORMATION_SCHEMA.tables where TABLE_SCHEMA = 'PUBLIC' and table_name != '%s'";
+    private static final String TABLE_EXISTS = "select count(*) from INFORMATION_SCHEMA.tables where TABLE_SCHEMA = 'PUBLIC' and table_name = '%s'";
+    private static final String SELECT_COUNT_SQL = "select count(*) from %s";
+    private static final String CREATE_INIT_TABLE_SQL = "create memory table PUBLIC.%s ( message varchar(256) )";
+    private static final String TABLE_NAMES = "select table_name from INFORMATION_SCHEMA.tables where TABLE_SCHEMA = 'PUBLIC' and table_name != '%s'";
+    private static final String INSERT_INIT_TABLE_SQL = "insert into %s values('This database schema was automatically created on %s.')";
+
+    private static final String HSQLDB_BIN_NAME = "hsqldb";
+    private static final int DATABASE_SETTLE_MILLIS = 1000;
+
+    /**
+     * Unit tests specify the {@code mem} protocol in {@link PropertyName#HIBERNATE_URL} and do not
+     * use the server; the runtime server uses {@code hsql}.
+     */
+    private static final String MEMORY_PROTOCOL = ":mem:";
+
+    private SqlRunner sqlRunner;
+    private Path databaseDir = DirectoryProperties.databaseDir();
+
+    /** Used by isSystemDatabase(). */
+    @Override
+    public Path dataDir() {
+        return databaseDir;
+    }
+
+    /** Not used by Ziggy. */
+    @Override
+    public Path logDir() {
+        return dataDir();
+    }
+
+    /** Not used by Ziggy. */
+    @Override
+    public Path logFile() {
+        return logDir().resolve(
+            ZiggyConfiguration.getInstance().getString(PropertyName.DATABASE_NAME.property())
+                + LOG_SUFFIX);
+    }
+
+    @Override
+    public SqlDialect sqlDialect() {
+        return SqlDialect.HSQLDB;
+    }
+
+    @Override
+    public String driver() {
+        return DRIVER_CLASS_NAME;
+    }
+
+    @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void createDatabase() {
+        try {
+            if (start() != 0) {
+                throw new PipelineException("Unable to start database");
+            }
+
+            log.info("Creating database");
+            executeScript(SCHEMA_CREATE_FILE, false);
+
+            if (!tableExists(INIT_TABLE_NAME)) {
+                createInitTable();
+            }
+
+            if (tableExists(INIT_TABLE_NAME)) {
+                updateInitTable();
+            }
+            log.info("Creating database...done");
+        } catch (SQLException e) {
+            throw new PipelineException("Unable to create database: " + e.getMessage(), e);
+        } finally {
+            sqlRunner().close();
+            stop();
+        }
+    }
+
+    private boolean unitTest() {
+        return ZiggyConfiguration.getInstance()
+            .getString(HIBERNATE_URL.property(), "")
+            .contains(MEMORY_PROTOCOL);
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void executeScript(String scriptName, boolean continueOnError) {
+        checkNotNull(scriptName, "scriptName");
+
+        String path = null;
+        try {
+            path = DirectoryProperties.databaseSchemaDir().toString();
+
+            File scriptFile = new File(path, scriptName);
+            log.debug("scriptFile={}, exists={}", scriptFile.getAbsolutePath(),
+                scriptFile.exists());
+            sqlRunner().executeSql(scriptFile, continueOnError);
+            sqlRunner().connection().commit();
+        } catch (SQLException e) {
+            throw new PipelineException("Failed to execute SQL script " + path, e);
+        }
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private SqlRunner sqlRunner() {
+        if (sqlRunner == null) {
+            try {
+                sqlRunner = SqlRunner.newInstance(driver());
+            } catch (Exception e) {
+                throw new PipelineException("Unable to initialize SqlRunner", e);
+            }
+        }
+        return sqlRunner;
+    }
+
+    private void createInitTable() throws SQLException {
+        try (Statement stmt = sqlRunner().connection().createStatement()) {
+            String sqlString = String.format(CREATE_INIT_TABLE_SQL, INIT_TABLE_NAME);
+            log.debug("Executing SQL: {}", sqlString);
+            stmt.executeUpdate(sqlString);
+            stmt.getConnection().commit();
+        }
+    }
+
+    private void updateInitTable() throws SQLException {
+        try (Statement stmt = sqlRunner().connection().createStatement()) {
+            String sqlString = String.format(INSERT_INIT_TABLE_SQL, INIT_TABLE_NAME, new Date());
+            log.debug("Executing SQL: {}", sqlString);
+            stmt.executeUpdate(sqlString);
+            stmt.getConnection().commit();
+        }
+    }
+
+    @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void dropDatabase() {
+        try {
+            dropDatabaseInternal();
+        } catch (SQLException e) {
+            throw new PipelineException("Could not drop database: " + e.getMessage(), e);
+        }
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void dropDatabaseInternal() throws SQLException {
+        if (sqlRunner().connection() == null) {
+            return;
+        }
+
+        long tableCount = -1;
+        try {
+            long rowCount = rowCount();
+            if (rowCount == 0) {
+                log.info("Database is empty");
+            } else {
+                log.warn("Database contains data");
+            }
+
+            tableCount = tableCount();
+            if (tableCount > 0) {
+                if (!tableExists(INIT_TABLE_NAME)) {
+                    throw new PipelineException(
+                        "Not dropping a potential live database that was not created by us");
+                }
+            } else {
+                log.info("Database does not have any tables");
+            }
+        } catch (SQLException e) {
+            throw new PipelineException(
+                "Could not determine if database was created by us: " + e.getMessage(), e);
+        }
+
+        if (tableCount > 0) {
+            try {
+                log.debug("Executing script: {}", SCHEMA_DROP_FILE);
+                executeScript(SCHEMA_DROP_FILE, true);
+            } catch (Exception e) {
+                throw new PipelineException("Drop script failed: " + e.getMessage(), e);
+            }
+
+            tableCount = tableCount();
+            if (tableCount > 0) {
+                throw new PipelineException(
+                    "Drop script left " + tableCount + " tables in database");
+            }
+        }
+    }
+
+    private long tableCount() throws SQLException {
+        String sqlString = String.format(TABLE_COUNT, INIT_TABLE_NAME);
+        try (Statement stmt = sqlRunner().connection().createStatement();
+            ResultSet rs = stmt.executeQuery(sqlString)) {
+            log.debug("Executing SQL: {}", sqlString);
+
+            if (rs.next()) {
+                log.debug("{} -> {}", rs.getStatement().toString(), rs.getLong(1));
+                return rs.getInt(1);
+            }
+            throw new PipelineException("Cannot determine the number of tables in the database");
+        }
+    }
+
+    @SuppressFBWarnings(value = "SQL_INJECTION_JDBC", justification = """
+        This class is used only by unit tests and the sample pipeline.
+        As long as it is not used by production databases, this class
+        cannot result in damage from SQL injection.
+        """)
+    private List<String> tableNames() throws SQLException {
+        String sqlString = String.format(TABLE_NAMES, INIT_TABLE_NAME);
+        List<String> tableNames = new ArrayList<>();
+
+        try (Statement stmt = sqlRunner().connection().createStatement();
+            ResultSet rs = stmt.executeQuery(sqlString)) {
+            log.debug("Executing SQL: {}", sqlString);
+            while (rs.next()) {
+                String tableName = rs.getString(1);
+                tableNames.add(tableName);
+            }
+
+            return tableNames;
+        }
+    }
+
+    private boolean tableExists(String tableNameMixedCase) throws SQLException {
+        checkNotNull(tableNameMixedCase, "tableNameMixedCase");
+
+        String tableName = tableNameMixedCase.trim().toUpperCase();
+        String sqlString = String.format(TABLE_EXISTS, tableName);
+
+        log.debug("Executing SQL: {}", sqlString);
+        try (Statement stmt = sqlRunner().connection().createStatement();
+            ResultSet rs = stmt.executeQuery(sqlString)) {
+            if (rs.next()) {
+                log.debug("{} -> {}", rs.getStatement().toString(), rs.getLong(1));
+                return rs.getInt(1) == 1;
+            }
+            throw new PipelineException(
+                "Cannot determine if the table " + tableName + " exists in the database");
+        }
+    }
+
+    @SuppressFBWarnings(value = "SQL_INJECTION_JDBC", justification = """
+        This class is used only by unit tests and the sample pipeline.
+        As long as it is not used by production databases, this class
+        cannot result in damage from SQL injection.
+        """)
+    private long rowCount() throws SQLException {
+        long rowCount = 0;
+        for (String tableName : tableNames()) {
+            String sqlString = String.format(SELECT_COUNT_SQL, tableName);
+            try (Statement stmt = sqlRunner().connection().createStatement();
+                ResultSet rs = stmt.executeQuery(sqlString)) {
+                if (rs.next()) {
+                    rowCount += rs.getLong(1);
+                }
+            }
+        }
+
+        return rowCount;
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    @Override
+    public int start() {
+        if (unitTest()) {
+            return 0;
+        }
+
+        CommandLine supervisorStatusCommand = hsqldbCommand(WrapperCommand.START);
+        log.debug("Command line: " + supervisorStatusCommand.toString());
+        int exitStatus = ExternalProcess.simpleExternalProcess(supervisorStatusCommand)
+            .exceptionOnFailure()
+            .execute();
+        try {
+            Thread.sleep(DATABASE_SETTLE_MILLIS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        return exitStatus;
+    }
+
+    @Override
+    public int stop() {
+        if (unitTest()) {
+            return 0;
+        }
+
+        CommandLine supervisorStopCommand = hsqldbCommand(WrapperCommand.STOP);
+        log.debug("Command line: " + supervisorStopCommand.toString());
+        return ExternalProcess.simpleExternalProcess(supervisorStopCommand).execute(true);
+    }
+
+    @Override
+    public int status() {
+        if (unitTest()) {
+            return 0;
+        }
+
+        CommandLine supervisorStatusCommand = hsqldbCommand(WrapperCommand.STATUS);
+        log.debug("Command line: " + supervisorStatusCommand);
+        return ExternalProcess.simpleExternalProcess(supervisorStatusCommand).execute();
+    }
+
+    @Override
+    public boolean dbExists() {
+        return Files.exists(databaseDir);
+    }
+
+    private CommandLine hsqldbCommand(WrapperCommand cmd) {
+        Path hsqldbPath = DirectoryProperties.ziggyBinDir().resolve(HSQLDB_BIN_NAME);
+        CommandLine commandLine = new CommandLine(hsqldbPath.toString());
+        if (cmd == WrapperCommand.START) {
+            // Refer to hsqldb.wrapper.conf for appropriate indices for the parameters specified
+            // here.
+            String ziggyLibDir = DirectoryProperties.ziggyLibDir().toString();
+
+            commandLine
+                .addArgument(wrapperParameter(WRAPPER_CLASSPATH_PROP_NAME_PREFIX, 1,
+                    DirectoryProperties.ziggyHomeDir().resolve("libs").resolve("*.jar").toString()))
+                .addArgument(
+                    wrapperParameter(WRAPPER_LIBRARY_PATH_PROP_NAME_PREFIX, 1, ziggyLibDir));
+        }
+
+        return commandLine.addArgument(cmd.toString());
+    }
+
+    public static void main(String[] args) {
+        new HsqldbController().startServer();
+    }
+
+    private void startServer() {
+        Server server = new Server();
+        server.setDatabaseName(0, dbName());
+        server.setDatabasePath(0, dataDir().resolve(dbName()).toString());
+        server.start();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/database/MatlabJavaInitialization.java b/src/main/java/gov/nasa/ziggy/services/database/MatlabJavaInitialization.java
index 08c8f21..b26c128 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/MatlabJavaInitialization.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/MatlabJavaInitialization.java
@@ -1,13 +1,15 @@
 package gov.nasa.ziggy.services.database;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.net.InetAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.UnknownHostException;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.SystemUtils;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.apache.logging.log4j.core.config.DefaultConfiguration;
@@ -16,8 +18,10 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.util.ZiggyBuild;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.os.OperatingSystemType;
 
 /**
@@ -28,13 +32,6 @@
 public class MatlabJavaInitialization {
     private static final Logger log = LoggerFactory.getLogger(MatlabJavaInitialization.class);
 
-    /**
-     * Property in the config service that points to the log4j.xml file used by Java code called
-     * from MATLAB
-     */
-
-    public static final String LOG4J_MATLAB_CONFIG_FILE_PROP = "matlab.log4j.config";
-    public static final String LOG4J_MATLAB_CONFIG_INITIALIZE_PROP = "matlab.log4j.initialize";
     public static final String LOG4J_LOGFILE_PREFIX = "log4j.logfile.prefix";
     public static final String MATLAB_PIDS_FILENAME = ".matlab.pids";
 
@@ -56,57 +53,57 @@ public class MatlabJavaInitialization {
      * <li>Initialize the config service
      * <li>Re-initialize log4j with the config service property
      * </ol>
-     *
-     * @throws PipelineException
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public static synchronized void initialize() {
-        if (!initialized) {
-            System.out
-                .println("MatlabJavaInitialization: Initializing log4j with BasicConfigurator");
+        if (initialized) {
+            return;
+        }
+
+        System.out.println("MatlabJavaInitialization: Initializing log4j with BasicConfigurator");
 
-            Configurator.initialize(new DefaultConfiguration());
+        Configurator.initialize(new DefaultConfiguration());
 
-            log.info("Log4j initialized with BasicConfigurator, initializing Config service");
+        log.info("Log4j initialized with BasicConfigurator, initializing Config service");
 
-            Configuration config = ZiggyConfiguration.getInstance();
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
 
-            if (config.getBoolean(LOG4J_MATLAB_CONFIG_INITIALIZE_PROP, false)) {
-                String log4jConfigFile = config.getString(LOG4J_MATLAB_CONFIG_FILE_PROP);
+        if (config.getBoolean(PropertyName.MATLAB_LOG4J_CONFIG_INITIALIZE.property(), false)) {
+            String log4jConfigFile = config
+                .getString(PropertyName.MATLAB_LOG4J_CONFIG_FILE.property());
 
-                log.info(LOG4J_MATLAB_CONFIG_FILE_PROP + " = " + log4jConfigFile);
+            log.info(PropertyName.MATLAB_LOG4J_CONFIG_FILE + " = " + log4jConfigFile);
 
-                if (log4jConfigFile != null) {
-                    log.info("Log4j initialized with DOMConfigurator from: " + log4jConfigFile);
-                    System.setProperty(LOG4J_LOGFILE_PREFIX, DEFAULT_LOG4J_LOGFILE_PREFIX);
-                    ConfigurationFactory.setConfigurationFactory(new XmlConfigurationFactory());
-                    try {
-                        Configurator.reconfigure(new URI(log4jConfigFile));
-                    } catch (URISyntaxException e) {
-                        throw new PipelineException("Unable to configure Log4j", e);
-                    }
+            if (log4jConfigFile != null) {
+                log.info("Log4j initialized with DOMConfigurator from: " + log4jConfigFile);
+                // TODO Evaluate setting of log4j property
+                // If ZiggyConfiguration.getInstance() is called before we get there, this
+                // statement will have no effect. Consider rearchitecting so that this property
+                // is already set before the MATLAB binary is started, presuming this property
+                // is even used.
+                System.setProperty(LOG4J_LOGFILE_PREFIX, DEFAULT_LOG4J_LOGFILE_PREFIX);
+                ConfigurationFactory.setConfigurationFactory(new XmlConfigurationFactory());
+                try {
+                    Configurator.reconfigure(new URI(log4jConfigFile));
+                } catch (URISyntaxException e) {
+                    throw new PipelineException("Unable to configure Log4j", e);
                 }
             }
+        }
 
-            log.info("jvm version:");
-            log.info("  java.runtime.name=" + SystemUtils.JAVA_RUNTIME_NAME);
-            log.info("  sun.boot.library.path=" + System.getProperty("sun.boot.library.path"));
-            log.info("  java.vm.version=" + SystemUtils.JAVA_VM_VERSION);
-
-            ZiggyBuild.logVersionInfo(log);
+        log.info("Software Version: {}", config.getString(PropertyName.ZIGGY_VERSION.property()));
+        ZiggyConfiguration.logJvmProperties();
 
-            try {
-                long pid = OperatingSystemType.getInstance().getProcInfo().getPid();
-                log.info("process ID: " + pid);
-                recordPid(pid);
-            } catch (Throwable t) {
-                log.warn("Unable to get process ID: " + t);
-            }
+        long pid = OperatingSystemType.getInstance().getProcInfo().getPid();
+        log.info("process ID: " + pid);
+        recordPid(pid);
 
-            initialized = true;
-        }
+        initialized = true;
     }
 
-    private static void recordPid(long pid) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private static void recordPid(long pid) {
         String hostname = "<unknown>";
         try {
             hostname = InetAddress.getLocalHost().getHostName();
@@ -114,13 +111,19 @@ private static void recordPid(long pid) throws Exception {
             if (dot != -1) {
                 hostname = hostname.substring(0, dot);
             }
-        } catch (Exception e) {
-            log.warn("failed to get hostname", e);
+        } catch (UnknownHostException e) {
+            // This can never happen. The localhost will be configured with
+            // a name and address that can be retrieved.
+            throw new AssertionError(e);
         }
 
         String PID_FILE = MATLAB_PIDS_FILENAME;
 
         File pidFile = new File(PID_FILE);
-        FileUtils.writeStringToFile(pidFile, hostname + ":" + pid + "\n", PID_FILE_CHARSET);
+        try {
+            FileUtils.writeStringToFile(pidFile, hostname + ":" + pid + "\n", PID_FILE_CHARSET);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to write to file " + PID_FILE, e);
+        }
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/PostgresqlController.java b/src/main/java/gov/nasa/ziggy/services/database/PostgresqlController.java
index 6b69ce9..bf6a334 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/PostgresqlController.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/PostgresqlController.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
@@ -13,15 +14,17 @@
 
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
  * Implementation of {@link DatabaseController} for PostgreSQL use. If the
- * {@value PropertyNames#DATABASE_DIR_PROP_NAME} property is empty, then the system database is
- * assumed. A system database cannot be started or stopped, nor can a database be initialized or
- * created. However, the Ziggy schema and tables can be created.
+ * {@link PropertyName#DATABASE_DIR} property is empty, then the system database is assumed. A
+ * system database cannot be started or stopped, nor can a database be initialized or created.
+ * However, the Ziggy schema and tables can be created.
  *
  * @author PT
  * @author Bill Wohler
@@ -49,6 +52,7 @@ public class PostgresqlController extends DatabaseController {
 
     @Override
     public Path dataDir() {
+        // Can't use isSystemDatabase() as that method uses dataDir().
         return databaseDir != null ? databaseDir.resolve(PGDATA_DIR) : null;
     }
 
@@ -75,13 +79,9 @@ public String driver() {
     @Override
     public void createDatabase() {
 
-        if (databaseDir != null) {
+        if (!isSystemDatabase()) {
             initializeDatabase();
-            try {
-                updateConfigFile();
-            } catch (IOException e) {
-                throw new PipelineException("Unable to update configuration file", e);
-            }
+            updateConfigFile();
 
             int dbStartRetCode = start();
             if (dbStartRetCode != 0) {
@@ -89,20 +89,16 @@ public void createDatabase() {
             }
         }
 
-        if (databaseDir != null) {
+        if (!isSystemDatabase()) {
             log.info("Creating database");
-            try {
-                CommandLine createCommand = new CommandLine(commandStringWithPath(CREATEDB));
-                createCommand.addArgument("-h").addArgument(host());
-                createCommand.addArgument("-p");
-                createCommand.addArgument(Integer.toString(port()));
-                createCommand.addArgument(dbName());
-                log.debug("Command line: " + createCommand.toString());
-                if (ExternalProcess.simpleExternalProcess(createCommand).execute(true) != 0) {
-                    throw new PipelineException("Unable to create database " + dbName());
-                }
-            } catch (Exception e) {
-                throw new PipelineException("Unable to create database", e);
+            CommandLine createCommand = new CommandLine(commandStringWithPath(CREATEDB));
+            createCommand.addArgument("-h").addArgument(host());
+            createCommand.addArgument("-p");
+            createCommand.addArgument(Integer.toString(port()));
+            createCommand.addArgument(dbName());
+            log.debug("Command line: " + createCommand.toString());
+            if (ExternalProcess.simpleExternalProcess(createCommand).execute(true) != 0) {
+                throw new PipelineException("Unable to create database " + dbName());
             }
             log.info("Creating database...done");
         }
@@ -112,11 +108,11 @@ public void createDatabase() {
             CommandLine schemaCommand = psqlCommand();
             schemaCommand.addArgument("-f");
             schemaCommand.addArgument(
-                DirectoryProperties.ziggySchemaDir().resolve(SCHEMA_CREATE_FILE).toString());
+                DirectoryProperties.databaseSchemaDir().resolve(SCHEMA_CREATE_FILE).toString());
             log.debug("Command line: " + schemaCommand.toString());
             ExternalProcess.simpleExternalProcess(schemaCommand).exceptionOnFailure().execute(true);
 
-            File[] extraFiles = DirectoryProperties.ziggySchemaDir()
+            File[] extraFiles = DirectoryProperties.databaseSchemaDir()
                 .toFile()
                 .listFiles((FilenameFilter) (dir, name) -> name.startsWith(SCHEMA_EXTRA_PREFIX)
                     && name.endsWith(SCHEMA_EXTRA_SUFFIX));
@@ -129,8 +125,6 @@ public void createDatabase() {
                     .exceptionOnFailure()
                     .execute(true);
             }
-        } catch (Exception e) {
-            throw new PipelineException("Unable to set up database", e);
         } finally {
             stop();
         }
@@ -140,6 +134,7 @@ public void createDatabase() {
     /**
      * Calls initdb and creates the log directory.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     private void initializeDatabase() {
 
         log.info("Initializing database");
@@ -156,49 +151,54 @@ private void initializeDatabase() {
         try {
             Files.createDirectories(logDir());
         } catch (IOException e) {
-            throw new PipelineException("Unable to create log directory", e);
+            throw new UncheckedIOException("Unable to create directory " + logDir(), e);
         }
         log.info("Initializing database...done");
     }
 
-    private void updateConfigFile() throws IOException {
-
-        // Create a directory for lock files. Postgres has a limit of 107 characters for
-        // unix_socket_directories, so remove any redundancies from the path.
-        Path lockFileDir = DirectoryProperties.databaseDir()
-            .resolve(LOCK_FILE_DIR_NAME)
-            .normalize();
-        Files.createDirectory(lockFileDir);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void updateConfigFile() {
 
         // Append to the postgresql.conf file an optional inclusion of the user's
         // config file and a setting of the lock file directory.
         log.info("Creating configuration file in " + dataDir().toString());
         Path configPath = dataDir().resolve(CONFIG_FILE_NAME);
-        String newline = System.lineSeparator();
-        StringBuilder confFileContents = new StringBuilder();
-        confFileContents.append("unix_socket_directories = '" + lockFileDir + "'" + newline);
-        if (DirectoryProperties.databaseConfFile() != null) {
-            confFileContents
-                .append("include '" + DirectoryProperties.databaseConfFile() + "'" + newline);
+
+        try {
+            // Create a directory for lock files. Postgres has a limit of 107 characters for
+            // unix_socket_directories, so remove any redundancies from the path.
+            Path lockFileDir = DirectoryProperties.databaseDir()
+                .resolve(LOCK_FILE_DIR_NAME)
+                .normalize();
+            Files.createDirectory(lockFileDir);
+            String newline = System.lineSeparator();
+            StringBuilder confFileContents = new StringBuilder();
+            confFileContents.append("unix_socket_directories = '" + lockFileDir + "'" + newline);
+            if (DirectoryProperties.databaseConfFile() != null) {
+                confFileContents
+                    .append("include '" + DirectoryProperties.databaseConfFile() + "'" + newline);
+            }
+            Files.write(configPath, confFileContents.toString().getBytes(FileUtil.ZIGGY_CHARSET),
+                StandardOpenOption.APPEND);
+            log.info("Creating configuration file in " + dataDir().toString() + "...done");
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to write to file " + configPath.toString(), e);
         }
-        Files.write(configPath, confFileContents.toString().getBytes(FileUtil.ZIGGY_CHARSET),
-            StandardOpenOption.APPEND);
-        log.info("Creating configuration file in " + dataDir().toString() + "...done");
     }
 
     @Override
     public void dropDatabase() {
         CommandLine schemaCommand = psqlCommand();
         schemaCommand.addArgument("-f");
-        schemaCommand
-            .addArgument(DirectoryProperties.ziggySchemaDir().resolve(SCHEMA_DROP_FILE).toString());
+        schemaCommand.addArgument(
+            DirectoryProperties.databaseSchemaDir().resolve(SCHEMA_DROP_FILE).toString());
         log.debug("Command line: " + schemaCommand.toString());
         ExternalProcess.simpleExternalProcess(schemaCommand).exceptionOnFailure().execute(true);
     }
 
     @Override
     public int start() {
-        if (databaseDir == null) {
+        if (isSystemDatabase()) {
             return NOT_SUPPORTED;
         }
 
@@ -215,14 +215,12 @@ public int start() {
         startCommand.addArgument("-l");
         startCommand.addArgument(logFile().toString());
         log.debug("Command line: " + startCommand.toString());
-        return ExternalProcess.simpleExternalProcess(startCommand)
-            .exceptionOnFailure(true)
-            .execute(true);
+        return ExternalProcess.simpleExternalProcess(startCommand).exceptionOnFailure().execute();
     }
 
     @Override
     public int stop() {
-        if (databaseDir == null) {
+        if (isSystemDatabase()) {
             return NOT_SUPPORTED;
         }
 
@@ -239,7 +237,7 @@ public int stop() {
 
     @Override
     public int status() {
-        if (databaseDir == null) {
+        if (isSystemDatabase()) {
             return NOT_SUPPORTED;
         }
 
@@ -251,7 +249,7 @@ public int status() {
 
     @Override
     public boolean dbExists() {
-        if (databaseDir != null) {
+        if (!isSystemDatabase()) {
             return true;
         }
 
@@ -286,8 +284,9 @@ private CommandLine psqlCommand() {
 
     /**
      * Generates an appropriate command string for database commands. If the user specified a
-     * database.bin.dir property, that is used as the path to the executable; otherwise, the
-     * executable name alone is returned and the executable is assumed to be on the search path.
+     * {@link PropertyName#DATABASE_BIN_DIR} property, that is used as the path to the executable;
+     * otherwise, the executable name alone is returned and the executable is assumed to be on the
+     * search path.
      */
     private String commandStringWithPath(String command) {
         Path databaseBinDir = DirectoryProperties.databaseBinDir();
diff --git a/src/test/java/gov/nasa/ziggy/services/database/SqlRunner.java b/src/main/java/gov/nasa/ziggy/services/database/SqlRunner.java
similarity index 52%
rename from src/test/java/gov/nasa/ziggy/services/database/SqlRunner.java
rename to src/main/java/gov/nasa/ziggy/services/database/SqlRunner.java
index 066323e..a4d8614 100644
--- a/src/test/java/gov/nasa/ziggy/services/database/SqlRunner.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/SqlRunner.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
- *
- * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
- * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
- * 80NSSC18M0068 & 80NSSC21M0079.
- *
- * This file is available under the terms of the NASA Open Source Agreement (NOSA). You should have
- * received a copy of this agreement with the Ziggy source code; see the file LICENSE.pdf.
- *
- * Disclaimers
- *
- * No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SUBJECT
- * SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL BE
- * ERROR FREE, OR ANY WARRANTY THAT DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT
- * SOFTWARE. THIS AGREEMENT DOES NOT, IN ANY MANNER, CONSTITUTE AN ENDORSEMENT BY GOVERNMENT AGENCY
- * OR ANY PRIOR RECIPIENT OF ANY RESULTS, RESULTING DESIGNS, HARDWARE, SOFTWARE PRODUCTS OR ANY
- * OTHER APPLICATIONS RESULTING FROM USE OF THE SUBJECT SOFTWARE. FURTHER, GOVERNMENT AGENCY
- * DISCLAIMS ALL WARRANTIES AND LIABILITIES REGARDING THIRD-PARTY SOFTWARE, IF PRESENT IN THE
- * ORIGINAL SOFTWARE, AND DISTRIBUTES IT "AS IS."
- *
- * Waiver and Indemnity: RECIPIENT AGREES TO WAIVE ANY AND ALL CLAIMS AGAINST THE UNITED STATES
- * GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT. IF RECIPIENT'S
- * USE OF THE SUBJECT SOFTWARE RESULTS IN ANY LIABILITIES, DEMANDS, DAMAGES, EXPENSES OR LOSSES
- * ARISING FROM SUCH USE, INCLUDING ANY DAMAGES FROM PRODUCTS BASED ON, OR RESULTING FROM,
- * RECIPIENT'S USE OF THE SUBJECT SOFTWARE, RECIPIENT SHALL INDEMNIFY AND HOLD HARMLESS THE UNITED
- * STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT, TO THE
- * EXTENT PERMITTED BY LAW. RECIPIENT'S SOLE REMEDY FOR ANY SUCH MATTER SHALL BE THE IMMEDIATE,
- * UNILATERAL TERMINATION OF THIS AGREEMENT.
- */
-
 package gov.nasa.ziggy.services.database;
 
 import java.io.BufferedReader;
@@ -48,20 +14,23 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
  * Simple class that loads SQL from a file and executes it using JDBC
  *
  * @author Todd Klaus
+ * @author Bill Wohler
  */
 public class SqlRunner implements Closeable {
     private static final Logger log = LoggerFactory.getLogger(SqlRunner.class);
@@ -69,11 +38,15 @@ public class SqlRunner implements Closeable {
     private final ConnectInfo connectInfo;
     private Connection cachedConnection;
 
+    private SqlRunner(ConnectInfo connectInfo) {
+        this.connectInfo = connectInfo;
+    }
+
     public static SqlRunner newInstance(String driver) throws Exception {
-        Configuration config = ZiggyConfiguration.getInstance();
-        String url = getPropertyChecked(config, PropertyNames.HIBERNATE_URL_PROP_NAME);
-        String username = getPropertyChecked(config, PropertyNames.HIBERNATE_USERNAME_PROP_NAME);
-        String password = getPropertyChecked(config, PropertyNames.HIBERNATE_PASSWD_PROP_NAME);
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+        String url = config.getString(PropertyName.HIBERNATE_URL.property());
+        String username = config.getString(PropertyName.HIBERNATE_USERNAME.property());
+        String password = config.getString(PropertyName.HIBERNATE_PASSWORD.property());
 
         return new SqlRunner(new ConnectInfo(driver, url, username, password));
     }
@@ -84,58 +57,82 @@ public static SqlRunner newInstance() throws Exception {
         return newInstance(driver);
     }
 
-    public SqlRunner(ConnectInfo connectInfo) {
-        this.connectInfo = connectInfo;
+    public Connection connection() {
+        if (cachedConnection == null) {
+            cachedConnection = connect();
+        }
+        return cachedConnection;
     }
 
     /**
      * (Re)connect to the database. Sets autocommit to false.
-     *
-     * @throws PipelineException
      */
-    public void connect() {
-        log.info("Connecting to: " + connectInfo);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private Connection connect() {
+        log.info("Connecting to: {}", connectInfo);
         try {
             Class.forName(connectInfo.getDriverName());
             cachedConnection = DriverManager.getConnection(connectInfo.getUrl(),
                 connectInfo.getUsername(), connectInfo.getPassword());
             cachedConnection.setAutoCommit(false);
         } catch (Exception e) {
-            throw new PipelineException("failed to connect to: " + connectInfo.getUrl(), e);
+            throw new PipelineException("Failed to connect to: " + connectInfo.getUrl(), e);
         }
+
+        return cachedConnection;
     }
 
     public void commit() throws SQLException {
-        getCachedConnection().commit();
+        connection().commit();
     }
 
-    public Connection getCachedConnection() {
-        return cachedConnection;
+    @SuppressFBWarnings(value = "SQL_INJECTION_JDBC", justification = """
+        This class is used only by unit tests and the sample pipeline.
+        As long as it is not used by production databases, this class
+        cannot result in damage from SQL injection.
+        """)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void executeSql(File path, boolean continueOnError) throws SQLException {
+        try {
+            executeSqlStatements(loadSql(path), continueOnError);
+        } catch (IOException e) {
+            throw new PipelineException("Failed to load: " + path, e);
+        }
     }
 
     @SuppressFBWarnings(value = "SQL_INJECTION_JDBC", justification = """
-        This class is used only by unit tests, thus the production database
-        cannot be compromised by SQL injection.
+        This class is used only by unit tests and the sample pipeline.
+        As long as it is not used by production databases, this class
+        cannot result in damage from SQL injection.
         """)
-    public void executeSql(File path, boolean continueOnError) throws SQLException {
-        String[] commands;
+    private String[] loadSql(File path) throws FileNotFoundException, IOException {
+        BufferedReader fileReader = new BufferedReader(
+            new InputStreamReader(new FileInputStream(path), FileUtil.ZIGGY_CHARSET));
+        StringBuilder bld = new StringBuilder((int) path.length());
         try {
-            commands = loadSql(path);
-        } catch (IOException e1) {
-            throw new PipelineException("failed to load: " + path, e1);
+            for (String line = fileReader.readLine(); line != null; line = fileReader.readLine()) {
+                bld.append(line);
+                bld.append(" ");
+            }
+
+            // Delete the last space so it won't be interpreted as a command.
+            bld.deleteCharAt(bld.length() - 1);
+        } finally {
+            FileUtil.close(fileReader);
         }
-        executeSqlStatements(commands, continueOnError);
+
+        return bld.toString().split(";");
     }
 
     @SuppressFBWarnings(value = "SQL_INJECTION_JDBC", justification = """
-        This class is used only by unit tests, thus the production database
-        cannot be compromised by SQL injection.
+        This class is used only by unit tests and the sample pipeline.
+        As long as it is not used by production databases, this class
+        cannot result in damage from SQL injection.
         """)
-    private void executeSqlStatements(String[] commands, boolean continueOnError)
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void executeSqlStatements(String[] commands, boolean continueOnError)
         throws SQLException {
-        if (cachedConnection == null) {
-            connect();
-        }
         PreparedStatement stmt = null;
         for (int line = 0; line < commands.length; line++) {
             String command = commands[line];
@@ -144,7 +141,7 @@ private void executeSqlStatements(String[] commands, boolean continueOnError)
             }
             try {
                 try {
-                    stmt = getCachedConnection().prepareStatement(command);
+                    stmt = connection().prepareStatement(command);
                     stmt.execute();
                 } catch (SQLException e) {
                     if (!continueOnError) {
@@ -173,48 +170,16 @@ private void executeSqlStatements(String[] commands, boolean continueOnError)
                     e);
             }
         }
-
-    }
-
-    @SuppressFBWarnings(value = "SQL_INJECTION_JDBC", justification = """
-        This class is used only by unit tests, thus the production database
-        cannot be compromised by SQL injection.
-        """)
-    private String[] loadSql(File path) throws FileNotFoundException, IOException {
-        BufferedReader fileReader = new BufferedReader(
-            new InputStreamReader(new FileInputStream(path), FileUtil.ZIGGY_CHARSET));
-        StringBuilder bld = new StringBuilder((int) path.length());
-        try {
-            for (String line = fileReader.readLine(); line != null; line = fileReader.readLine()) {
-                bld.append(line);
-                bld.append(" ");
-            }
-
-            // Delete the last space so it won't be interpreted as a command.
-            bld.deleteCharAt(bld.length() - 1);
-        } finally {
-            FileUtil.close(fileReader);
-        }
-
-        return bld.toString().split(";");
-    }
-
-    public static String getPropertyChecked(Configuration config, String name) throws Exception {
-        String value = config.getString(name);
-
-        if (value == null) {
-            throw new Exception("Required property " + name + " not set!");
-        }
-        return value;
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
         if (cachedConnection != null) {
             try {
                 cachedConnection.close();
+                cachedConnection = null;
             } catch (SQLException e) {
-                log.warn("Exception while trying to close database connection.", e);
+                log.warn("Could not close database connection: " + e.getMessage(), e);
             }
         }
     }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/ZiggyHibernateConfiguration.java b/src/main/java/gov/nasa/ziggy/services/database/ZiggyHibernateConfiguration.java
index cfffdc0..75ee0e0 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/ZiggyHibernateConfiguration.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/ZiggyHibernateConfiguration.java
@@ -1,20 +1,20 @@
 package gov.nasa.ziggy.services.database;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_DIALECT_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_DRIVER_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_ID_NEW_GENERATOR_MAPPINGS_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_URL_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_USERNAME_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_DIALECT;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_DRIVER;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_URL;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_USERNAME;
 
 import java.util.Iterator;
-import java.util.Properties;
 import java.util.Set;
 
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.hibernate.cfg.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 
 /**
@@ -23,8 +23,8 @@
  * It uses {@link AnnotatedPojoList} to scan the class path for annotated classes and adds them to
  * the configuration.
  * <p>
- * It also copies all properties that are prefixed with "hibernate." from the configuration service
- * to the Hibernate @{link AnnotatedConfiguration} object.
+ * It also copies all properties that are prefixed with "hibernate." from the Ziggy configuration to
+ * the Hibernate @{link AnnotatedConfiguration} object.
  * <p>
  * This class is used by the {@link HibernateDatabaseService} to initialize the
  * {@link DatabaseService}. It is also used by the various ant tasks that create the schema
@@ -35,13 +35,7 @@
 public class ZiggyHibernateConfiguration {
     private static final Logger log = LoggerFactory.getLogger(ZiggyHibernateConfiguration.class);
 
-    /**
-     * Recommended setting for applications that use the @GeneratedValue annotation. The default
-     * setting in Hibernate 5 is true, so we can consider deleting this setting when we upgrade.
-     */
-    public static final boolean HIBERNATE_ID_NEW_GENERATOR_MAPPINGS_DEFAULT = true;
-
-    private static final String ANNOTATED_POJO_PACKAGE_FILTER = "gov.nasa";
+    private static final String ANNOTATED_POJO_PACKAGE_FILTER = "^gov\\.nasa\\..*";
 
     /**
      * Private to prevent instantiation. Static method only
@@ -56,72 +50,29 @@ private ZiggyHibernateConfiguration() {
      * @throws PipelineException
      */
     public static Configuration buildHibernateConfiguration() {
-        return buildHibernateConfiguration(null);
-    }
-
-    /**
-     * Build a {@link Configuration} instance using Ziggy-specific resources.
-     *
-     * @return
-     * @throws PipelineException
-     */
-    public static Configuration buildHibernateConfiguration(Properties hibernateProperties) {
-        org.apache.commons.configuration.Configuration ziggyConfig = ZiggyConfiguration
-            .getInstance();
+        ImmutableConfiguration ziggyConfig = ZiggyConfiguration.getInstance();
 
         log.debug("Initializing Hibernate");
 
         Configuration hibernateConfig = new Configuration();
 
-        hibernateConfig.setNamingStrategy(ZiggyNamingStrategy.INSTANCE);
+        // Get the props from the from the Ziggy configuration.
+        for (Iterator<?> iter = ziggyConfig.getKeys("hibernate"); iter.hasNext();) {
+            String key = (String) iter.next();
+            String value = ziggyConfig.getString(key);
 
-        // Copy hibernate-related properties from the props source to the Hibernate configuration.
-        if (hibernateProperties != null) {
-            // Use the Properties passed in.
-            for (Object okey : hibernateProperties.keySet()) {
-                String key = (String) okey;
-                String value = hibernateProperties.getProperty(key);
-
-                if (value == null) {
-                    throw new PipelineException("Property values must not be null, key=" + key);
-                }
-                log.debug("copying property, key=" + key + ", value=" + value);
-                hibernateConfig.setProperty(key, value);
-            }
-        } else {
-            // Get the props from the from the ConfigurationService.
-            for (Iterator<?> iter = ziggyConfig.getKeys("hibernate"); iter.hasNext();) {
-                String key = (String) iter.next();
-                String value = ziggyConfig.getString(key);
-
-                log.debug("copying property, key=" + key + ", value=" + value);
-                hibernateConfig.setProperty(key, value);
-            }
+            log.debug("copying property, key=" + key + ", value=" + value);
+            hibernateConfig.setProperty(key, value);
         }
 
         // Inject properties defined by our code.
-        hibernateConfig.setProperty(HIBERNATE_DIALECT_PROP_NAME, hibernateDialect());
-        hibernateConfig.setProperty(HIBERNATE_DRIVER_PROP_NAME, driverClassName());
-        if (hibernateConfig.getProperty(HIBERNATE_ID_NEW_GENERATOR_MAPPINGS_PROP_NAME) == null) {
-            hibernateConfig.setProperty(HIBERNATE_ID_NEW_GENERATOR_MAPPINGS_PROP_NAME,
-                Boolean.toString(HIBERNATE_ID_NEW_GENERATOR_MAPPINGS_DEFAULT));
-        }
-
-        log.info("Database URL: " + hibernateConfig.getProperty(HIBERNATE_URL_PROP_NAME));
-        log.debug("Database User: " + hibernateConfig.getProperty(HIBERNATE_USERNAME_PROP_NAME));
+        hibernateConfig.setProperty(HIBERNATE_DIALECT.property(), hibernateDialect());
+        hibernateConfig.setProperty(HIBERNATE_DRIVER.property(), driverClassName());
 
-        AnnotatedPojoList annotatedPojoList = new AnnotatedPojoList();
-        annotatedPojoList.getPackageFilters().add(ANNOTATED_POJO_PACKAGE_FILTER);
+        log.info("Database URL: " + hibernateConfig.getProperty(HIBERNATE_URL.property()));
+        log.debug("Database User: " + hibernateConfig.getProperty(HIBERNATE_USERNAME.property()));
 
-        Set<Class<?>> detectedClasses;
-
-        try {
-            log.debug("Scanning for annotated POJOs");
-            detectedClasses = annotatedPojoList.scanForClasses();
-        } catch (Exception e) {
-            throw new PipelineException(
-                "failed to auto-scan for annotated classes, caught e = " + e, e);
-        }
+        Set<Class<?>> detectedClasses = annotatedClasses();
 
         log.debug("Adding " + detectedClasses.size() + " annotated POJOs to Hibernate");
 
@@ -137,22 +88,33 @@ public static Configuration buildHibernateConfiguration(Properties hibernateProp
         return hibernateConfig;
     }
 
+    /**
+     * Returns a non-null set of classes in the classpath with Hibernate annotations. The classes
+     * are limited to packages starting with {@value #ANNOTATED_POJO_PACKAGE_FILTER}.
+     */
+    public static Set<Class<?>> annotatedClasses() {
+        AnnotatedPojoList annotatedPojoList = new AnnotatedPojoList();
+        annotatedPojoList.getPackageFilters().add(ANNOTATED_POJO_PACKAGE_FILTER);
+
+        return annotatedPojoList.scanForClasses();
+    }
+
     /**
      * Returns the name of the Java class to be used as the database driver. If the property
-     * hibernate.connection.driver_class is specified in the properties file, its value is used. If
-     * not, the database controller's value for the driver class is used.
+     * {@link PropertyName#HIBERNATE_DRIVER} is specified in the properties file, its value is used.
+     * If not, the database controller's value for the driver class is used.
      *
      * @throws PipelineException if the class can not be found in either the property or database
      * controller
      */
     public static String driverClassName() {
         String driverClassName = ZiggyConfiguration.getInstance()
-            .getString(HIBERNATE_DRIVER_PROP_NAME, null);
+            .getString(HIBERNATE_DRIVER.property(), null);
         if (driverClassName == null) {
             DatabaseController controller = DatabaseController.newInstance();
             if (controller == null) {
-                throw new PipelineException(
-                    "Cannot determine database driver class from hibernate.connection.driver_class property or DatabaseController");
+                throw new PipelineException("Cannot determine database driver class from "
+                    + HIBERNATE_DRIVER + " property or DatabaseController");
             }
             driverClassName = controller.driver();
         }
@@ -161,20 +123,20 @@ public static String driverClassName() {
 
     /**
      * Returns the name of the SQL dialect to be used for database activities. If the property
-     * hibernate.dialect is specified in the properties file, its value is used. If not, the
-     * database controller's value for the dialect is used.
+     * {@link PropertyName#HIBERNATE_DIALECT} is specified in the properties file, its value is
+     * used. If not, the database controller's value for the dialect is used.
      *
      * @throws PipelineException if the dialect can not be found in either the property or database
      * controller
      */
     public static String hibernateDialect() {
         String hibernateDialect = ZiggyConfiguration.getInstance()
-            .getString(HIBERNATE_DIALECT_PROP_NAME, null);
+            .getString(HIBERNATE_DIALECT.property(), null);
         if (hibernateDialect == null) {
             DatabaseController controller = DatabaseController.newInstance();
             if (controller == null) {
-                throw new PipelineException(
-                    "Cannot determine database dialect from hibernate.dialect property or DatabaseController");
+                throw new PipelineException("Cannot determine database dialect from "
+                    + HIBERNATE_DIALECT + " property or DatabaseController");
             }
             hibernateDialect = controller.sqlDialect().dialect();
         }
diff --git a/src/main/java/gov/nasa/ziggy/services/database/ZiggyNamingStrategy.java b/src/main/java/gov/nasa/ziggy/services/database/ZiggyNamingStrategy.java
deleted file mode 100644
index 9fa1f0f..0000000
--- a/src/main/java/gov/nasa/ziggy/services/database/ZiggyNamingStrategy.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package gov.nasa.ziggy.services.database;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
-
-import org.hibernate.AssertionFailure;
-import org.hibernate.cfg.NamingStrategy;
-import org.hibernate.internal.util.StringHelper;
-
-/**
- * This class implements {@link org.hibernate.cfg.NamingStrategy} for the database naming
- * conventions defined for the Ziggy project. Essentially, this consists of converting the Java
- * camel-case names to an all-caps with underscores format.
- * <p>
- * This code is based on {@link org.hibernate.cfg.ImprovedNamingStrategy}, the main difference being
- * that names that are explicitly defined in the code annotations (like {@link Table},
- * {@link Column}, etc.) are not modified.
- *
- * @author Todd Klaus
- */
-
-// Note: the NamingStrategy is deprecated and requires replacement with some
-// combination of ImplicitNamingStrategy and PhysicalNamingStrategy classes
-// (both of which are specified in properties), and NamingStrategyDelegator /
-// NamingStrategyDelegate (which is specified in ZiggyHibernateConfiguration).
-// Alternately, the NamingStrategy can simply be eliminated.
-// This is going to be a significant effort in its own right, thus will not be
-// tackled with ZIGGY-142 (clean up build warnings), but will be addressed in
-// ZIGGY-5 (migrate to Hibernate 6).
-@SuppressWarnings("deprecation")
-public class ZiggyNamingStrategy implements NamingStrategy {
-    /**
-     * A convenient singleton instance
-     */
-    public static final NamingStrategy INSTANCE = new ZiggyNamingStrategy();
-
-    /**
-     * Return the unqualified class name, mixed case converted to underscores
-     */
-    @Override
-    public String classToTableName(String className) {
-        return addUnderscores(StringHelper.unqualify(className));
-    }
-
-    /**
-     * Return the full property path with underscore seperators, mixed case converted to underscores
-     */
-    @Override
-    public String propertyToColumnName(String propertyName) {
-        return addUnderscores(StringHelper.unqualify(propertyName));
-    }
-
-    /**
-     * This method is called for names explicitly defined in the annotations. Leave the name alone!
-     */
-    @Override
-    public String tableName(String tableName) {
-        return tableName;
-    }
-
-    /**
-     * This method is called for names explicitly defined in the annotations. Leave the name alone!
-     */
-    @Override
-    public String columnName(String columnName) {
-        return columnName;
-    }
-
-    @Override
-    public String collectionTableName(String ownerEntity, String ownerEntityTable,
-        String associatedEntity, String associatedEntityTable, String propertyName) {
-        return tableName(ownerEntityTable + '_' + propertyToColumnName(propertyName));
-    }
-
-    /**
-     * Return the argument
-     */
-    @Override
-    public String joinKeyColumnName(String joinedColumn, String joinedTable) {
-        return addUnderscores(joinedTable) + "_" + addUnderscores(joinedColumn);
-    }
-
-    /**
-     * Return the property name or propertyTableName
-     */
-    @Override
-    public String foreignKeyColumnName(String propertyName, String propertyEntityName,
-        String propertyTableName, String referencedColumnName) {
-        String header = propertyName != null ? StringHelper.unqualify(propertyName)
-            : propertyTableName;
-        if (header == null) {
-            throw new AssertionFailure("NamingStrategy not properly filled");
-        }
-        return addUnderscores(propertyTableName) + "_" + addUnderscores(referencedColumnName);
-    }
-
-    /**
-     * Return the column name or the unqualified property name
-     */
-    @Override
-    public String logicalColumnName(String columnName, String propertyName) {
-        return StringHelper.isNotEmpty(columnName) ? columnName
-            : StringHelper.unqualify(propertyName);
-    }
-
-    /**
-     * Returns either the table name if explicit or if there is an associated table, the
-     * concatenation of owner entity table and associated table otherwise the concatenation of owner
-     * entity table and the unqualified property name
-     */
-    @Override
-    public String logicalCollectionTableName(String tableName, String ownerEntityTable,
-        String associatedEntityTable, String propertyName) {
-        if (tableName != null) {
-            return tableName;
-        }
-        // use of a stringbuffer to workaround a JDK bug
-        return new StringBuffer(ownerEntityTable).append("_")
-            .append(associatedEntityTable != null ? associatedEntityTable
-                : StringHelper.unqualify(propertyName))
-            .toString();
-    }
-
-    /**
-     * Return the column name if explicit or the concatenation of the property name and the
-     * referenced column
-     */
-    @Override
-    public String logicalCollectionColumnName(String columnName, String propertyName,
-        String referencedColumn) {
-        return StringHelper.isNotEmpty(columnName) ? columnName
-            : StringHelper.unqualify(propertyName) + "_" + referencedColumn;
-    }
-
-    /**
-     * Convert camel-case to caps and underscores
-     *
-     * @param name
-     * @return
-     */
-    protected static String addUnderscores(String name) {
-        StringBuilder buf = new StringBuilder(name.replace('.', '_'));
-        for (int i = 1; i < buf.length() - 1; i++) {
-            if (Character.isLowerCase(buf.charAt(i - 1)) && Character.isUpperCase(buf.charAt(i))
-                && Character.isLowerCase(buf.charAt(i + 1))) {
-                buf.insert(i++, '_');
-            }
-        }
-        return buf.toString().toUpperCase();
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/database/ZiggySchemaExport.java b/src/main/java/gov/nasa/ziggy/services/database/ZiggySchemaExport.java
index 8760b90..7da0c77 100644
--- a/src/main/java/gov/nasa/ziggy/services/database/ZiggySchemaExport.java
+++ b/src/main/java/gov/nasa/ziggy/services/database/ZiggySchemaExport.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -34,25 +34,34 @@
 
 package gov.nasa.ziggy.services.database;
 
-import org.hibernate.cfg.Configuration;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.EnumSet;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.hbm2ddl.SchemaExport.Action;
+import org.hibernate.tool.schema.TargetType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+
 /**
- * This class provides a command-line interface to the Hibernate {@link SchemaExport} class which
- * uses {@link ZiggyHibernateConfiguration} as the configuration source.
- * <p>
- * Why didn't I just use the standard hbm2ddl ant task (which calls SchemaExport directly) to do
- * this instead of writing custom code to do it? Because the standard tools assume you have a
- * hibernate.cfg.xml file that explicitly lists all of your entity class. Rather than deal with that
- * maintenence headache, I wrote my own configurator {@link ZiggyHibernateConfiguration} which scans
- * the classpath for classes with Hibernate annotations and adds them to the configuration
- * dynamically. Hibernate does provide some similar code that scans the classpath, but it is
- * designed to work with JPA-style configuration files (persistence.xml) which has to be bundled in
- * a jar file, so it's difficult to support multiple database configurations.
+ * This class provides a command-line interface to the Hibernate {@link SchemaExport} class. Specify
+ * either the {@code --create} or {@code --drop} option, a {@code --output=<filename>} option, and
+ * define the Java property {@code hibernate.dialect}. For example:
+ *
+ * <pre>
+ * java -Dhibernate.dialect=org.hibernate.dialect.HSQLDialect gov.nasa.ziggy.services.database.ZiggySchemaExport --create --output=build/schema/ddl.hsqldb-create.sql
+ * java -Dhibernate.dialect=org.hibernate.dialect.PostgreSQLDialect gov.nasa.ziggy.services.database.ZiggySchemaExport --create --output=build/schema/ddl.postgresql-create.sql
+ * </pre>
  *
  * @author Todd Klaus
+ * @author PT
+ * @author Bill Wohler
  */
 public class ZiggySchemaExport {
     private static final Logger log = LoggerFactory.getLogger(ZiggySchemaExport.class);
@@ -60,20 +69,17 @@ public class ZiggySchemaExport {
     public ZiggySchemaExport() {
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
     public static void main(String[] args) {
         try {
-            boolean echoToStdOut = false;
             boolean drop = false;
             boolean create = false;
             boolean halt = true;
-            boolean export = false;
             String outFile = null;
             boolean format = true;
 
             for (String arg : args) {
-                if (arg.equals("--verbose")) {
-                    echoToStdOut = true;
-                } else if (arg.equals("--drop")) {
+                if (arg.equals("--drop")) {
                     drop = true;
                 } else if (arg.equals("--create")) {
                     create = true;
@@ -89,18 +95,30 @@ public static void main(String[] args) {
                 }
             }
 
-            Configuration hibernateConfig = ZiggyHibernateConfiguration
-                .buildHibernateConfiguration();
-
-            SchemaExport se = new SchemaExport(hibernateConfig).setHaltOnError(halt)
+            SchemaExport schemaExport = new SchemaExport().setHaltOnError(halt)
                 .setOutputFile(outFile)
                 .setDelimiter(";");
 
             if (format) {
-                se.setFormat(true);
+                schemaExport.setFormat(true);
             }
 
-            se.execute(echoToStdOut, export, drop, create);
+            Action action = Action.NONE;
+            if (create) {
+                action = drop ? Action.BOTH : Action.CREATE;
+            } else if (drop) {
+                action = Action.DROP;
+            }
+
+            MetadataSources metadata = new MetadataSources(
+                new StandardServiceRegistryBuilder().build());
+            for (Class<?> clazz : ZiggyHibernateConfiguration.annotatedClasses()) {
+                metadata.addAnnotatedClass(clazz);
+            }
+
+            Files.deleteIfExists(Paths.get(outFile));
+
+            schemaExport.execute(EnumSet.of(TargetType.SCRIPT), action, metadata.buildMetadata());
         } catch (Exception e) {
             log.error("Error creating schema ", e);
             e.printStackTrace();
diff --git a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEvent.java b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEvent.java
index 28e5cbc..deef7c3 100644
--- a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEvent.java
+++ b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEvent.java
@@ -3,16 +3,12 @@
 import java.util.Date;
 import java.util.Objects;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionName;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 /**
  * Permanent record of a Ziggy event for storage in the database.
@@ -20,36 +16,18 @@
  * @author PT
  */
 @Entity
-@Table(name = "PI_ZIGGY_EVENT")
+@Table(name = "ziggy_Event")
 public class ZiggyEvent {
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        ZiggyEvent other = (ZiggyEvent) obj;
-        return id == other.id;
-    }
-
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sg")
-    @SequenceGenerator(name = "sg", initialValue = 1, sequenceName = "PI_EVENT_SEQ",
-        allocationSize = 1)
-    private long id;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ziggy_Event_generator")
+    @SequenceGenerator(name = "ziggy_Event_generator", initialValue = 1,
+        sequenceName = "ziggy_Event_sequence", allocationSize = 1)
+    private Long id;
 
     private String eventHandlerName;
 
-    @ManyToOne(targetEntity = PipelineDefinitionName.class, fetch = FetchType.EAGER)
-    private PipelineDefinitionName pipelineName;
+    private String pipelineName;
     private Date eventTime;
     private long pipelineInstanceId;
 
@@ -57,19 +35,18 @@ public boolean equals(Object obj) {
     private ZiggyEvent() {
     }
 
-    public ZiggyEvent(String eventHandlerName, PipelineDefinitionName pipelineName,
-        long pipelineInstance) {
+    public ZiggyEvent(String eventHandlerName, String pipelineName, long pipelineInstance) {
         this.eventHandlerName = eventHandlerName;
         this.pipelineName = pipelineName;
         eventTime = new Date();
         pipelineInstanceId = pipelineInstance;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -81,11 +58,11 @@ public void setEventHandlerName(String eventHandlerName) {
         this.eventHandlerName = eventHandlerName;
     }
 
-    public PipelineDefinitionName getPipelineName() {
+    public String getPipelineName() {
         return pipelineName;
     }
 
-    public void setPipelineName(PipelineDefinitionName pipelineName) {
+    public void setPipelineName(String pipelineName) {
         this.pipelineName = pipelineName;
     }
 
@@ -105,4 +82,20 @@ public void setPipelineInstanceId(long pipelineInstance) {
         pipelineInstanceId = pipelineInstance;
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        ZiggyEvent other = (ZiggyEvent) obj;
+        return Objects.equals(id, other.id);
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventCrud.java b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventCrud.java
index 67980f4..6a7c09e 100644
--- a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventCrud.java
+++ b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventCrud.java
@@ -1,10 +1,13 @@
 package gov.nasa.ziggy.services.events;
 
+import java.util.Collection;
 import java.util.List;
-
-import org.hibernate.Criteria;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 
 /**
  * CRUD (Create, Retrieve, Update, Delete) class for {@link ZiggyEventHandler} and
@@ -12,21 +15,39 @@
  *
  * @author PT
  */
-public class ZiggyEventCrud extends AbstractCrud {
+public class ZiggyEventCrud extends AbstractCrud<ZiggyEvent> {
 
     /**
      * Returns all events. Used by the GUI event display.
      */
     public List<ZiggyEvent> retrieveAllEvents() {
-        Criteria criteria = createCriteria(ZiggyEvent.class);
-        return list(criteria);
+        return list(createZiggyQuery(ZiggyEvent.class));
+    }
+
+    /** Returns events associated with the given instances. */
+    public List<ZiggyEvent> retrieve(Collection<PipelineInstance> instances) {
+        Set<Long> instanceIds = instances.stream()
+            .map(PipelineInstance::getId)
+            .collect(Collectors.toSet());
+
+        ZiggyQuery<ZiggyEvent, ZiggyEvent> query = createZiggyQuery(ZiggyEvent.class)
+            .column(ZiggyEvent_.pipelineInstanceId)
+            .in(instanceIds)
+            .distinct(true)
+            .ascendingOrder();
+
+        return list(query);
     }
 
     /**
-     * Returns all event handlers. Used by the worker during initialization.
+     * Returns all event handlers. Used by the supervisor during initialization.
      */
     public List<ZiggyEventHandler> retrieveAllEventHandlers() {
-        Criteria criteria = createCriteria(ZiggyEventHandler.class);
-        return list(criteria);
+        return list(createZiggyQuery(ZiggyEventHandler.class));
+    }
+
+    @Override
+    public Class<ZiggyEvent> componentClass() {
+        return ZiggyEvent.class;
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandler.java b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandler.java
index 1d0130a..97839d7 100644
--- a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandler.java
+++ b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandler.java
@@ -4,13 +4,13 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -20,39 +20,34 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.PropertyConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.InstanceAndTasks;
 import gov.nasa.ziggy.pipeline.PipelineOperations;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionName;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.crud.ParameterSetCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
 import gov.nasa.ziggy.services.alert.AlertService;
 import gov.nasa.ziggy.services.alert.AlertService.Severity;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.services.messages.EventHandlerToggleStateRequest;
+import gov.nasa.ziggy.services.messages.InvalidateConsoleModelsMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.Iso8601Formatter;
 import gov.nasa.ziggy.util.ZiggyShutdownHook;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  * Handles a single type of Ziggy event. Ziggy events are a system that automatically starts
@@ -66,7 +61,7 @@
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @Entity
-@Table(name = "PI_ZIGGY_EVENT_HANDLER")
+@Table(name = "ziggy_EventHandler")
 public class ZiggyEventHandler implements Runnable {
 
     private static final Logger log = LoggerFactory.getLogger(ZiggyEventHandler.class);
@@ -101,7 +96,7 @@ public class ZiggyEventHandler implements Runnable {
     /**
      * Determines whether the {@link ZiggyEventHandler} should be enabled when the cluster is
      * started. By default, event handlers must be manually enabled; this field signals to the
-     * worker process that, upon startup, this event handler should start.
+     * supervisor process that, upon startup, this event handler should start.
      */
     @XmlAttribute
     private boolean enableOnClusterStart;
@@ -119,9 +114,7 @@ public class ZiggyEventHandler implements Runnable {
      * Pipeline to start when an event is detected.
      */
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PipelineDefinitionName.PipelineNameAdapter.class)
-    @ManyToOne(targetEntity = PipelineDefinitionName.class, fetch = FetchType.EAGER)
-    private PipelineDefinitionName pipelineName;
+    private String pipelineName;
 
     @Transient
     private PipelineOperations pipelineOperations;
@@ -134,6 +127,12 @@ public class ZiggyEventHandler implements Runnable {
 
     public ZiggyEventHandler() {
         ZiggyShutdownHook.addShutdownHook(this::stop);
+        ZiggyMessenger.subscribe(EventHandlerToggleStateRequest.class, message -> {
+            EventHandlerToggleStateRequest request = message;
+            if (request.getHandlerName().equals(name)) {
+                toggleStatus();
+            }
+        });
     }
 
     /**
@@ -164,6 +163,7 @@ public boolean isRunning() {
      * Checks for the ready-indicator file and starts the pipeline if it is present.
      */
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_IN_RUNNABLE)
     public void run() {
 
         try {
@@ -172,6 +172,12 @@ public void run() {
                 readyFile.delete(interpolatedDirectory());
             }
         } catch (Exception e) {
+            // If we got here, something bad happened either when looking for ready files
+            // or when starting the pipeline that responds to the ready file. In either case,
+            // we don't want the event handler to try again in a few seconds, but we also
+            // don't want the event handler infrastructure itself to fail as a result. For
+            // this reason, we catch Exception here (to include both runtime exceptions and
+            // unexpected checked exceptions), and then stop this particular event handler.
             log.error("ZiggyEventHandler " + name + " disabled due to exception", e);
             alertService().generateAndBroadcastAlert("Event handler " + name, 0, Severity.WARNING,
                 "Event handler shut down due to exception");
@@ -224,7 +230,7 @@ private void startPipeline(ReadyFile readyFile) {
         log.info(
             "Event name \"" + readyFile.getName() + "\" has " + readyFile.labelCount() + " labels");
         log.debug("Event handler labels: " + readyFile.labels());
-        log.info("Event handler " + name + " starting pipeline " + pipelineName.getName() + "...");
+        log.info("Event handler " + name + " starting pipeline " + pipelineName + "...");
 
         // Start by saving the event labels as a parameter set.
         String paramSetName = (String) DatabaseTransactionFactory.performTransaction(() -> {
@@ -236,7 +242,7 @@ private void startPipeline(ReadyFile readyFile) {
             ParameterSet paramSet = new ParameterSetCrud()
                 .retrieveLatestVersionForName(parameterSetName);
             if (paramSet != null) {
-                eventLabels = (ZiggyEventLabels) paramSet.getParameters().getInstance();
+                eventLabels = (ZiggyEventLabels) paramSet.parametersInstance();
                 eventLabels.setEventName(readyFile.getName());
                 eventLabels.setEventLabels(readyFile.labelsArray());
                 pipelineOperations().updateParameterSet(paramSet, eventLabels,
@@ -248,35 +254,25 @@ private void startPipeline(ReadyFile readyFile) {
                 eventLabels.setEventHandlerName(name);
                 eventLabels.setEventName(readyFile.getName());
                 eventLabels.setEventLabels(readyFile.labelsArray());
-                paramSet.setParameters(new BeanWrapper<Parameters>(eventLabels));
-                new ParameterSetCrud().create(paramSet);
+                paramSet.populateFromParametersInstance(eventLabels);
+                new ParameterSetCrud().persist(paramSet);
             }
             return parameterSetName;
         });
 
         // Create a new pipeline instance that includes the event handler labels parameter set.
+        PipelineDefinition pipelineDefinition = (PipelineDefinition) DatabaseTransactionFactory
+            .performTransaction(
+                () -> new PipelineDefinitionCrud().retrieveLatestVersionForName(pipelineName));
+        PipelineInstance pipelineInstance = pipelineOperations().fireTrigger(pipelineDefinition,
+            instanceName(), null, null, paramSetName);
+        ZiggyMessenger.publish(new InvalidateConsoleModelsMessage());
         DatabaseTransactionFactory.performTransaction(() -> {
-            PipelineDefinition pipelineDefinition = new PipelineDefinitionCrud()
-                .retrieveLatestVersionForName(pipelineName);
-            InstanceAndTasks instanceInfo = pipelineOperations().fireTrigger(pipelineDefinition,
-                instanceName(), null, null, paramSetName);
-            sendWorkerMessageForTasks(instanceInfo.getPipelineTasks());
-            final ZiggyEvent event = new ZiggyEvent(name, pipelineName,
-                instanceInfo.getPipelineInstance().getId());
-            new ZiggyEventCrud().create(event);
+            final ZiggyEvent event = new ZiggyEvent(name, pipelineName, pipelineInstance.getId());
+            new ZiggyEventCrud().persist(event);
             return null;
         });
-        log.info(
-            "Event handler " + name + " starting pipeline " + pipelineName.getName() + "...done");
-    }
-
-    /**
-     * Sends task messages to the worker. Package scoped so it can be mocked out.
-     */
-    void sendWorkerMessageForTasks(List<PipelineTask> pipelineTasks) {
-        for (PipelineTask pipelineTask : pipelineTasks) {
-            pipelineOperations().sendWorkerMessageForTask(pipelineTask);
-        }
+        log.info("Event handler " + name + " starting pipeline " + pipelineName + "...done");
     }
 
     /**
@@ -315,11 +311,11 @@ public void setDirectory(String directory) {
         this.directory = directory;
     }
 
-    public PipelineDefinitionName getPipelineName() {
+    public String getPipelineName() {
         return pipelineName;
     }
 
-    public void setPipelineName(PipelineDefinitionName pipelineName) {
+    public void setPipelineName(String pipelineName) {
         this.pipelineName = pipelineName;
     }
 
@@ -359,17 +355,8 @@ String instanceName() {
         return name + "-" + Iso8601Formatter.dateTimeLocalFormatter().format(new Date());
     }
 
-    Path interpolatedDirectory() {
-        return Paths.get((String) PropertyConverter.interpolate(directory, configuration()));
-    }
-
-    /**
-     * Returns the Ziggy configuration, cast back to its actual class
-     * ({@link CompositeConfiguration}). Because this does not work correctly in test, the method is
-     * broken out so that it can be mocked in test cases.
-     */
-    CompositeConfiguration configuration() {
-        return (CompositeConfiguration) ZiggyConfiguration.unsynchronizedInstance();
+    private Path interpolatedDirectory() {
+        return Paths.get((String) ZiggyConfiguration.interpolate(directory));
     }
 
     @Override
@@ -399,7 +386,7 @@ public boolean equals(Object obj) {
      */
     public static class ZiggyEventHandlerInfoForDisplay implements Serializable {
 
-        private static final long serialVersionUID = 20220707L;
+        private static final long serialVersionUID = 20230511L;
 
         private String name;
         private boolean enabled;
@@ -410,7 +397,7 @@ public ZiggyEventHandlerInfoForDisplay(ZiggyEventHandler eventHandler) {
             name = eventHandler.getName();
             enabled = eventHandler.isRunning();
             directory = eventHandler.interpolatedDirectory().toString();
-            pipelineName = eventHandler.getPipelineName().getName();
+            pipelineName = eventHandler.getPipelineName();
         }
 
         public String getName() {
@@ -444,7 +431,6 @@ public String getPipelineName() {
         public void setPipelineName(String pipelineName) {
             this.pipelineName = pipelineName;
         }
-
     }
 
     /**
@@ -482,9 +468,15 @@ public boolean isReady() {
             return count == filenames.size();
         }
 
-        public void delete(Path directory) throws IOException {
+        @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+        public void delete(Path directory) {
+
             for (String filename : filenames) {
-                Files.delete(directory.resolve(filename));
+                try {
+                    Files.delete(directory.resolve(filename));
+                } catch (IOException e) {
+                    throw new UncheckedIOException("Unable to delete file " + filename, e);
+                }
             }
         }
 
@@ -520,7 +512,5 @@ public boolean equals(Object obj) {
             ReadyFile other = (ReadyFile) obj;
             return Objects.equals(name, other.name);
         }
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerDefinitionImporter.java b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerDefinitionImporter.java
index 2582e5c..170befb 100644
--- a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerDefinitionImporter.java
+++ b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerDefinitionImporter.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -35,18 +35,16 @@
 package gov.nasa.ziggy.services.events;
 
 import java.io.File;
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
 
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
 import gov.nasa.ziggy.pipeline.xml.ValidatingXmlManager;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
-import jakarta.xml.bind.JAXBException;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Extremely simple class that imports {@link ZiggyEventHandler} definitions into the database. The
@@ -63,9 +61,7 @@ public class ZiggyEventHandlerDefinitionImporter {
     private ValidatingXmlManager<ZiggyEventHandlerFile> xmlManager;
     private File[] files;
 
-    public ZiggyEventHandlerDefinitionImporter(String[] filenames) throws InstantiationException,
-        IllegalAccessException, SAXException, JAXBException, IllegalArgumentException,
-        InvocationTargetException, NoSuchMethodException, SecurityException {
+    public ZiggyEventHandlerDefinitionImporter(String[] filenames) {
         files = new File[filenames.length];
         for (int i = 0; i < filenames.length; i++) {
             files[i] = new File(filenames[i]);
@@ -73,17 +69,16 @@ public ZiggyEventHandlerDefinitionImporter(String[] filenames) throws Instantiat
         xmlManager = new ValidatingXmlManager<>(ZiggyEventHandlerFile.class);
     }
 
-    public ZiggyEventHandlerDefinitionImporter(File[] files) throws InstantiationException,
-        IllegalAccessException, SAXException, JAXBException, IllegalArgumentException,
-        InvocationTargetException, NoSuchMethodException, SecurityException {
+    public ZiggyEventHandlerDefinitionImporter(File[] files) {
         this.files = files;
         xmlManager = new ValidatingXmlManager<>(ZiggyEventHandlerFile.class);
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     public void importFromFiles() {
 
-        List<String> pipelineDefinitionNames = new PipelineDefinitionCrud()
-            .retrievePipelineDefinitionNames();
+        List<String> pipelineDefinitionNames = new PipelineDefinitionCrud().retrieveNames();
 
         ZiggyEventCrud eventCrud = new ZiggyEventCrud();
         for (File file : files) {
@@ -97,15 +92,15 @@ public void importFromFiles() {
             }
             log.info("Unmarshaling file " + file.getName() + "...done");
             for (ZiggyEventHandler handler : handlerFile.getZiggyEventHandlers()) {
-                if (!pipelineDefinitionNames.contains(handler.getPipelineName().getName())) {
+                if (!pipelineDefinitionNames.contains(handler.getPipelineName())) {
                     log.error("Handler " + handler.getName() + " fires pipeline "
-                        + handler.getPipelineName().getName() + ", which is not defined");
+                        + handler.getPipelineName() + ", which is not defined");
                     log.error("Not persisting handler " + handler.getName());
                     continue;
                 }
                 try {
                     log.info("Persisting handler " + handler.getName() + "...");
-                    eventCrud.createOrUpdate(handler);
+                    eventCrud.merge(handler);
                 } catch (Exception e) {
                     log.error("Unable to persist handler " + handler.getName(), e);
                     continue;
@@ -122,14 +117,8 @@ public static void main(String[] args) {
             throw new IllegalArgumentException(
                 "No files listed for import as Ziggy event handlers");
         }
-        ZiggyEventHandlerDefinitionImporter importer = null;
-        try {
-            importer = new ZiggyEventHandlerDefinitionImporter(args);
-        } catch (InstantiationException | IllegalAccessException | SAXException | JAXBException
-            | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
-            | SecurityException e) {
-            throw new PipelineException("Unable to construct event handler importer ", e);
-        }
+        ZiggyEventHandlerDefinitionImporter importer = new ZiggyEventHandlerDefinitionImporter(
+            args);
         final ZiggyEventHandlerDefinitionImporter finalImporter = importer;
         DatabaseTransactionFactory.performTransaction(() -> {
             finalImporter.importFromFiles();
diff --git a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerFile.java b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerFile.java
index e50e900..9d36c58 100644
--- a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerFile.java
+++ b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerFile.java
@@ -33,5 +33,4 @@ public List<ZiggyEventHandler> getZiggyEventHandlers() {
     public void setZiggyEventHandlers(List<ZiggyEventHandler> ziggyEventHandlers) {
         this.ziggyEventHandlers = ziggyEventHandlers;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventLabels.java b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventLabels.java
index 25e71ed..a3faca0 100644
--- a/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventLabels.java
+++ b/src/main/java/gov/nasa/ziggy/services/events/ZiggyEventLabels.java
@@ -1,6 +1,9 @@
 package gov.nasa.ziggy.services.events;
 
+import gov.nasa.ziggy.collections.ZiggyArrayUtils;
+import gov.nasa.ziggy.collections.ZiggyDataType;
 import gov.nasa.ziggy.parameters.InternalParameters;
+import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 
 /**
  * Contains the event labels associated with a particular event that has been managed by the
@@ -8,7 +11,9 @@
  *
  * @author PT
  */
-public class ZiggyEventLabels implements InternalParameters {
+public class ZiggyEventLabels extends InternalParameters {
+
+    // If a field is renamed, update the parameter string in its setter.
 
     private String eventHandlerName;
     private String eventName;
@@ -20,6 +25,7 @@ public String getEventHandlerName() {
 
     public void setEventHandlerName(String eventHandlerName) {
         this.eventHandlerName = eventHandlerName;
+        addParameter(new TypedParameter("eventHandlerName", this.eventHandlerName));
     }
 
     public String getEventName() {
@@ -28,6 +34,7 @@ public String getEventName() {
 
     public void setEventName(String eventName) {
         this.eventName = eventName;
+        addParameter(new TypedParameter("eventName", this.eventName));
     }
 
     public String[] getEventLabels() {
@@ -36,6 +43,7 @@ public String[] getEventLabels() {
 
     public void setEventLabels(String[] eventLabels) {
         this.eventLabels = eventLabels;
+        addParameter(new TypedParameter("eventLabels",
+            ZiggyArrayUtils.arrayToString(this.eventLabels), ZiggyDataType.ZIGGY_STRING, false));
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/logging/TaskLog.java b/src/main/java/gov/nasa/ziggy/services/logging/TaskLog.java
index 2f9e796..6a85bd1 100644
--- a/src/main/java/gov/nasa/ziggy/services/logging/TaskLog.java
+++ b/src/main/java/gov/nasa/ziggy/services/logging/TaskLog.java
@@ -4,6 +4,7 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -32,6 +33,8 @@
 import gov.nasa.ziggy.module.remote.Qsub;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * This class manages the creation and use of log files for pipeline infrastructure purposes.
@@ -71,7 +74,6 @@ public Path logDir() {
             public FileAppender taskLogFileAppender(Path taskLog) {
                 return ((FileAppender.Builder) fileAppenderBuilder(taskLog.toFile())
                     .setFilter(threadContextMapFilter())).build();
-
             }
         },
         ALGORITHM {
@@ -89,19 +91,15 @@ public FileAppender taskLogFileAppender(Path taskLog) {
         public abstract Path logDir();
 
         public abstract FileAppender taskLogFileAppender(Path taskLog);
-
     }
 
     private static final Logger log = LoggerFactory.getLogger(TaskLog.class);
 
+    private static final String CONSOLE_APPENDER_NAME = "console";
+
     public static final String THREAD_NAME_KEY = "threadName";
     public static final int LOCAL_LOG_FILE_JOB_INDEX = 0;
 
-    /**
-     * NB the value of CONSOLE_APPENDER_NAME must match the name of the console appender defined in
-     * log4j2.xml.
-     */
-    public static final String CONSOLE_APPENDER_NAME = "console";
     public static final String CLI_APPENDER_NAME = "cli";
 
     private FileAppender taskLogFileAppender = null;
@@ -179,15 +177,16 @@ private static File[] searchForLogFilesOfType(LogType logType, long instanceId,
         return logType.logDir().toFile().listFiles((FilenameFilter) (dir, name) -> {
             Matcher matcher = TaskLogInformation.LOG_FILE_NAME_PATTERN.matcher(name);
             if (matcher.matches()) {
-                return Integer.parseInt(
+                return Long.parseLong(
                     matcher.group(TaskLogInformation.INSTANCE_ID_GROUP_NUMBER)) == instanceId
-                    && Integer
-                        .parseInt(matcher.group(TaskLogInformation.TASK_ID_GROUP_NUMBER)) == taskId;
+                    && Long.parseLong(
+                        matcher.group(TaskLogInformation.TASK_ID_GROUP_NUMBER)) == taskId;
             }
             return false;
         });
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void startLogging() {
         Path taskLogDir = taskLogFile.getParent();
         try {
@@ -199,16 +198,25 @@ public void startLogging() {
             taskLogFileAppender = logType.taskLogFileAppender(taskLogFile);
             taskLogFileAppender.start();
         } catch (IOException e) {
-            log.warn("failed to create taskLog FileAppender at: " + taskLogFile);
+            throw new UncheckedIOException("Unable to create dir " + taskLogDir.toString(), e);
         }
         rootConfig().addAppender(taskLogFileAppender, Level.ALL, null);
 
-        // If this is an algorithm log, then we don't need to run the console appender
-        // any longer.
-        if (logType == LogType.ALGORITHM) {
-            endLogging(CONSOLE_APPENDER_NAME);
-        }
+        // The WorkerProcess uses TaskLog instances exclusively, and doesn't use the
+        // console logger at all; the SupervisorPipelineProcess uses the console logger
+        // and never uses TaskLog instances. By virtue of the fact that the caller is
+        // logging to a TaskLog, we know that we aren't in the supervisor context, hence
+        // we can stop console logging.
+        endLogging(CONSOLE_APPENDER_NAME);
+    }
+
+    public void endLogging() {
+        endLogging(taskLogFile.getFileName().toString());
+    }
 
+    private static LoggerConfig rootConfig() {
+        return ((LoggerContext) LogManager.getContext(false)).getConfiguration()
+            .getLoggerConfig("");
     }
 
     private static ThreadContextMapFilter threadContextMapFilter() {
@@ -218,22 +226,12 @@ private static ThreadContextMapFilter threadContextMapFilter() {
             "and", Filter.Result.ACCEPT, Filter.Result.DENY);
     }
 
-    public void endLogging() {
-        endLogging(taskLogFile.getFileName().toString());
-    }
-
-    private static void endLogging(String appenderName) {
+    public static void endLogging(String appenderName) {
         Appender appender = rootConfig().getAppenders().get(appenderName);
         if (appender != null) {
             rootConfig().getAppenders().get(appenderName).stop();
             rootConfig().removeAppender(appenderName);
         }
-
-    }
-
-    private static LoggerConfig rootConfig() {
-        return ((LoggerContext) LogManager.getContext(false)).getConfiguration()
-            .getLoggerConfig("");
     }
 
     private static Layout<? extends Serializable> cliLayout() {
diff --git a/src/main/java/gov/nasa/ziggy/services/logging/TaskLogInformation.java b/src/main/java/gov/nasa/ziggy/services/logging/TaskLogInformation.java
index 424e4bd..7f6d403 100644
--- a/src/main/java/gov/nasa/ziggy/services/logging/TaskLogInformation.java
+++ b/src/main/java/gov/nasa/ziggy/services/logging/TaskLogInformation.java
@@ -22,7 +22,7 @@
  */
 public class TaskLogInformation implements Comparable<TaskLogInformation>, Serializable {
 
-    private static final long serialVersionUID = 20220325L;
+    private static final long serialVersionUID = 20230511L;
 
     /**
      * Pattern for logs file names: 10-100-algname.10-0.log, where the numbers are instance, task,
@@ -36,8 +36,8 @@ public class TaskLogInformation implements Comparable<TaskLogInformation>, Seria
     public static final int JOB_INDEX_GROUP_NUMBER = 3;
     public static final int TASK_LOG_INDEX_NUMBER = 4;
 
-    private final int instanceId;
-    private final int taskId;
+    private final long instanceId;
+    private final long taskId;
     private final int jobIndex;
     private final int taskLogIndex;
     private final long logSizeBytes;
@@ -55,14 +55,13 @@ public TaskLogInformation(File taskFile) {
         }
         Matcher matcher = LOG_FILE_NAME_PATTERN.matcher(filename);
         matcher.matches();
-        instanceId = Integer.parseInt(matcher.group(INSTANCE_ID_GROUP_NUMBER));
-        taskId = Integer.parseInt(matcher.group(TASK_ID_GROUP_NUMBER));
+        instanceId = Long.parseLong(matcher.group(INSTANCE_ID_GROUP_NUMBER));
+        taskId = Long.parseLong(matcher.group(TASK_ID_GROUP_NUMBER));
         taskLogIndex = Integer.parseInt(matcher.group(TASK_LOG_INDEX_NUMBER));
         jobIndex = Integer.parseInt(matcher.group(JOB_INDEX_GROUP_NUMBER));
         fullPath = taskFile.getAbsolutePath();
         logSizeBytes = taskFile.length();
         lastModified = taskFile.lastModified();
-
     }
 
     public static LogType logType(File taskFile) {
@@ -93,11 +92,11 @@ public String lastModifiedDateTime() {
         return DateFormat.getDateTimeInstance().format(date);
     }
 
-    public int getInstanceId() {
+    public long getInstanceId() {
         return instanceId;
     }
 
-    public int getTaskId() {
+    public long getTaskId() {
         return taskId;
     }
 
@@ -163,11 +162,11 @@ public boolean equals(Object obj) {
      */
     @Override
     public int compareTo(TaskLogInformation o) {
-        if (Integer.compare(instanceId, o.instanceId) != 0) {
-            return Integer.compare(instanceId, o.instanceId);
+        if (Long.compare(instanceId, o.instanceId) != 0) {
+            return Long.compare(instanceId, o.instanceId);
         }
-        if (Integer.compare(taskId, o.taskId) != 0) {
-            return Integer.compare(taskId, o.taskId);
+        if (Long.compare(taskId, o.taskId) != 0) {
+            return Long.compare(taskId, o.taskId);
         }
         if (Integer.compare(taskLogIndex, o.taskLogIndex) != 0) {
             return Integer.compare(taskLogIndex, o.taskLogIndex);
@@ -177,5 +176,4 @@ public int compareTo(TaskLogInformation o) {
         }
         return 0;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/logging/WriterLogOutputStream.java b/src/main/java/gov/nasa/ziggy/services/logging/WriterLogOutputStream.java
index 9ba7b11..b9b04ba 100644
--- a/src/main/java/gov/nasa/ziggy/services/logging/WriterLogOutputStream.java
+++ b/src/main/java/gov/nasa/ziggy/services/logging/WriterLogOutputStream.java
@@ -1,6 +1,7 @@
 package gov.nasa.ziggy.services.logging;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 
 import org.apache.commons.exec.LogOutputStream;
@@ -10,6 +11,8 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.SubtaskUtils;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Subclass of {@link LogOutputStream} that is used when messages need to be sent to both the
@@ -46,6 +49,7 @@ public WriterLogOutputStream(Writer writer, boolean logOutput, String logStreamI
     }
 
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     protected void processLine(String line, int level) {
         try {
             writer.write(line);
@@ -53,7 +57,7 @@ protected void processLine(String line, int level) {
             stringBuilder.append(line);
             stringBuilder.append("\n");
         } catch (IOException e) {
-            log.info("Unable to write log output, caught e = " + e, e);
+            throw new UncheckedIOException("Unable to write to log file ", e);
         }
 
         if (logOutput) {
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/AlertMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/AlertMessage.java
new file mode 100644
index 0000000..e447a24
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/AlertMessage.java
@@ -0,0 +1,22 @@
+package gov.nasa.ziggy.services.messages;
+
+import gov.nasa.ziggy.services.alert.Alert;
+
+/**
+ * Notifies message clients of a new {@link Alert}.
+ *
+ * @author PT
+ */
+public class AlertMessage extends PipelineMessage {
+    private static final long serialVersionUID = 20230511L;
+
+    private final Alert alertData;
+
+    public AlertMessage(Alert alertData) {
+        this.alertData = alertData;
+    }
+
+    public Alert getAlertData() {
+        return alertData;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/DefaultWorkerResourcesRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/DefaultWorkerResourcesRequest.java
new file mode 100644
index 0000000..c865a76
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/DefaultWorkerResourcesRequest.java
@@ -0,0 +1,11 @@
+package gov.nasa.ziggy.services.messages;
+
+/**
+ * Request that the recipient return the default {@link WorkerResources} instance.
+ *
+ * @author PT
+ */
+public class DefaultWorkerResourcesRequest extends PipelineMessage {
+
+    private static final long serialVersionUID = 20230714L;
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/DeleteTasksRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/DeleteTasksRequest.java
deleted file mode 100644
index 2c886a4..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messages/DeleteTasksRequest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package gov.nasa.ziggy.services.messages;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.AlgorithmMonitor;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.pipeline.PipelineExecutor;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask.State;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
-import gov.nasa.ziggy.services.alert.AlertService;
-import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.worker.WorkerPipelineProcess;
-import gov.nasa.ziggy.worker.WorkerTaskRequestDispatcher;
-
-/**
- * Requests that the worker delete tasks from both the submitted task queue and from the worker
- * threads. The tasks are specified by task ID.
- *
- * @author PT
- */
-public class DeleteTasksRequest extends PipelineMessage {
-
-    private static final long serialVersionUID = 20221004L;
-
-    private static final Logger log = LoggerFactory.getLogger(DeleteTasksRequest.class);
-    private final List<Long> taskIds = new ArrayList<>();
-
-    public DeleteTasksRequest(List<PipelineTask> pipelineTasks) {
-        taskIds
-            .addAll(pipelineTasks.stream().map(PipelineTask::getId).collect(Collectors.toList()));
-    }
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        try {
-            return Boolean.valueOf(messageHandler.deleteTasks(this));
-        } catch (IOException e) {
-            throw new PipelineException("Unable to delete tasks", e);
-        }
-
-    }
-
-    /**
-     * Performs the deletion of tasks based on ID numbers in the {@link DeleteTasksRequest}
-     * instance. Returns true if all the tasks for deletion were found locally (implying that none
-     * will be found running remotely), false otherwise.
-     *
-     * @throws IOException
-     */
-    @SuppressWarnings("unchecked")
-    public boolean deleteTasks() throws IOException {
-
-        log.info("Starting DeleteTasksRequest.deleteTasks()");
-        List<WorkerTaskRequest> tasksForDeletion = new ArrayList<>();
-        Set<Long> taskIdsForDeletion = new HashSet<>();
-        for (WorkerTaskRequest request : WorkerPipelineProcess.workerTaskRequestQueue) {
-            if (taskIds.contains(request.getTaskId())) {
-                tasksForDeletion.add(request);
-                taskIdsForDeletion.add(request.getTaskId());
-            }
-        }
-        WorkerPipelineProcess.workerTaskRequestQueue.removeAll(tasksForDeletion);
-
-        // For tasks that were waiting to run, i.e. in the submitted state, we need to manually
-        // set them to ERRORed in the database and update all counts and instance states.
-        if (!taskIdsForDeletion.isEmpty()) {
-            DatabaseTransactionFactory.performTransactionInThread(() -> {
-                PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-                PipelineExecutor pipelineExecutor = new PipelineExecutor();
-                List<PipelineTask> tasks = pipelineTaskCrud.retrieveAll(taskIdsForDeletion);
-                for (PipelineTask task : tasks) {
-                    task.setState(State.ERROR);
-                    task.stopExecutionClock();
-                    pipelineTaskCrud.update(task);
-                    pipelineExecutor.updateTaskCountsForCurrentNode(task, false);
-                    pipelineExecutor.updateInstanceState(task.getPipelineInstance());
-                }
-                return null;
-            });
-
-            // Issue alerts, too!
-            AlertService alertService = AlertService.getInstance();
-            for (long taskId : taskIdsForDeletion) {
-                alertService.generateAndBroadcastAlert("PI (Remote)", taskId,
-                    AlertService.Severity.ERROR,
-                    "Task " + taskId + " deleted from processing queue.");
-            }
-        }
-
-        // Signal to the WorkerTaskRequestDispatcher that any tasks that are currently being
-        // processed that they should be deleted.
-        for (long taskId : taskIds) {
-            if (WorkerTaskRequestDispatcher.deleteTask(taskId)) {
-                taskIdsForDeletion.add(taskId);
-            }
-        }
-
-        // Finally, for tasks that are running an external algorithm, use AlgorithmMonitor to
-        // tell the ComputeNodeMaster that the task in question has been deleted. This will cause
-        // algorithm processing to exit and the status of the task and instance to be updated
-        // properly.
-        taskIdsForDeletion.addAll(AlgorithmMonitor.deleteLocalTasks(taskIds));
-
-        // Locate any tasks that have completed while the delete request was working its way
-        // through the system.
-        taskIdsForDeletion.addAll((List<Long>) DatabaseTransactionFactory
-            .performTransactionInThread(() -> new PipelineTaskCrud()
-                .retrieveIdsForTasksInState(taskIds, PipelineTask.State.COMPLETED)));
-
-        // Notify the caller as to whether all the tasks were located in local execution.
-        return taskIdsForDeletion.containsAll(taskIds);
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/DisplayTasksForInstanceMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/DisplayTasksForInstanceMessage.java
new file mode 100644
index 0000000..9b67991
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/DisplayTasksForInstanceMessage.java
@@ -0,0 +1,31 @@
+package gov.nasa.ziggy.services.messages;
+
+import gov.nasa.ziggy.ui.instances.InstancesPanel;
+import gov.nasa.ziggy.ui.instances.TasksPanel;
+
+/**
+ * Message sent from the {@link InstancesPanel} to the {@link TasksPanel} notifying the latter that
+ * it may need to update its displays because of a change of the selected instance.
+ *
+ * @author PT
+ */
+public class DisplayTasksForInstanceMessage extends PipelineMessage {
+
+    private static final long serialVersionUID = 20230712L;
+
+    private final boolean reselect;
+    private final Long pipelineInstanceId;
+
+    public DisplayTasksForInstanceMessage(boolean reselect, Long pipelineInstanceId) {
+        this.reselect = reselect;
+        this.pipelineInstanceId = pipelineInstanceId;
+    }
+
+    public boolean isReselect() {
+        return reselect;
+    }
+
+    public long getPipelineInstanceId() {
+        return pipelineInstanceId;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/EventHandlerRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/EventHandlerRequest.java
index c859a3f..22f0ffb 100644
--- a/src/main/java/gov/nasa/ziggy/services/messages/EventHandlerRequest.java
+++ b/src/main/java/gov/nasa/ziggy/services/messages/EventHandlerRequest.java
@@ -1,20 +1,18 @@
 package gov.nasa.ziggy.services.messages;
 
 import gov.nasa.ziggy.services.events.ZiggyEventHandler;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
+import gov.nasa.ziggy.util.Requestor;
 
 /**
- * Requests that the worker send the UI the full list of {@link ZiggyEventHandler} instances.
+ * Requests that the supervisor send the UI the full list of {@link ZiggyEventHandler} instances.
  *
  * @author PT
  */
-public class EventHandlerRequest extends PipelineMessage {
+public class EventHandlerRequest extends SpecifiedRequestorMessage {
 
-    private static final long serialVersionUID = 20220707L;
+    private static final long serialVersionUID = 20230614L;
 
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        return messageHandler.handleEventHandlerRequest();
+    public EventHandlerRequest(Requestor sender) {
+        super(sender);
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/EventHandlerToggleStateRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/EventHandlerToggleStateRequest.java
index 5d32a8d..a64cdd9 100644
--- a/src/main/java/gov/nasa/ziggy/services/messages/EventHandlerToggleStateRequest.java
+++ b/src/main/java/gov/nasa/ziggy/services/messages/EventHandlerToggleStateRequest.java
@@ -4,20 +4,19 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.services.events.ZiggyEventHandler;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
 
 /**
- * Sends a request to the worker process to toggle the state of a single {@link ZiggyEventHandler}
- * instance.
+ * Sends a request to the supervisor process to toggle the state of a single
+ * {@link ZiggyEventHandler} instance.
  *
  * @author PT
  */
 public class EventHandlerToggleStateRequest extends PipelineMessage {
 
-    private static final long serialVersionUID = 20220707L;
+    private static final long serialVersionUID = 20230511L;
 
     private static final Logger log = LoggerFactory.getLogger(EventHandlerToggleStateRequest.class);
 
@@ -30,17 +29,14 @@ public class EventHandlerToggleStateRequest extends PipelineMessage {
     public static void requestEventHandlerToggle(String handlerName) {
         CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
         log.debug("Sending toggle request for event handler \"" + handlerName + "\"");
-        UiCommunicator.send(new EventHandlerToggleStateRequest(handlerName));
+        ZiggyMessenger.publish(new EventHandlerToggleStateRequest(handlerName));
     }
 
     private EventHandlerToggleStateRequest(String handlerName) {
         this.handlerName = handlerName;
     }
 
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        messageHandler.handleEventHandlerToggleRequest(handlerName);
-        return null;
+    public String getHandlerName() {
+        return handlerName;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/WorkerFireTriggerRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/FireTriggerRequest.java
similarity index 65%
rename from src/main/java/gov/nasa/ziggy/services/messages/WorkerFireTriggerRequest.java
rename to src/main/java/gov/nasa/ziggy/services/messages/FireTriggerRequest.java
index edc89c6..f044733 100644
--- a/src/main/java/gov/nasa/ziggy/services/messages/WorkerFireTriggerRequest.java
+++ b/src/main/java/gov/nasa/ziggy/services/messages/FireTriggerRequest.java
@@ -1,18 +1,17 @@
 package gov.nasa.ziggy.services.messages;
 
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
 
 /**
- * Sends to the worker a request to fire a trigger for a given pipeline. The request can include a
- * start and end node, and can include repetition parameters (i.e., the trigger can automatically
- * re-fire after some period of time).
+ * A request to fire a trigger for a given pipeline. The request can include a start and end node,
+ * and can include repetition parameters (i.e., the trigger can automatically re-fire after some
+ * period of time).
  *
  * @author PT
  */
-public class WorkerFireTriggerRequest extends PipelineMessage {
+public class FireTriggerRequest extends PipelineMessage {
 
-    private static final long serialVersionUID = 20210318L;
+    private static final long serialVersionUID = 20230511L;
 
     private final String pipelineName;
     private final String instanceName;
@@ -21,7 +20,7 @@ public class WorkerFireTriggerRequest extends PipelineMessage {
     private final int maxRepeats;
     private final int repeatIntervalSeconds;
 
-    public WorkerFireTriggerRequest(String pipelineName, String instanceName, String startNodeName,
+    public FireTriggerRequest(String pipelineName, String instanceName, String startNodeName,
         String endNodeName, int maxRepeats, int repeatIntervalSeconds) {
         this.pipelineName = pipelineName;
         this.instanceName = instanceName;
@@ -31,13 +30,13 @@ public WorkerFireTriggerRequest(String pipelineName, String instanceName, String
         this.repeatIntervalSeconds = repeatIntervalSeconds;
     }
 
-    public WorkerFireTriggerRequest(String pipelineName, String instanceName,
+    public FireTriggerRequest(String pipelineName, String instanceName,
         PipelineDefinitionNode startNode, PipelineDefinitionNode endNode, int maxRepeats,
         int repeatIntervalSeconds) {
         this.pipelineName = pipelineName;
         this.instanceName = instanceName;
-        startNodeName = startNode != null ? startNode.getModuleName().getName() : null;
-        endNodeName = endNode != null ? endNode.getModuleName().getName() : null;
+        startNodeName = startNode != null ? startNode.getModuleName() : null;
+        endNodeName = endNode != null ? endNode.getModuleName() : null;
         this.maxRepeats = maxRepeats;
         this.repeatIntervalSeconds = repeatIntervalSeconds;
     }
@@ -69,10 +68,4 @@ public int getMaxRepeats() {
     public int getRepeatIntervalSeconds() {
         return repeatIntervalSeconds;
     }
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        messageHandler.handleTriggerRequest(this);
-        return null;
-    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/HeartbeatMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/HeartbeatMessage.java
new file mode 100644
index 0000000..e7a698d
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/HeartbeatMessage.java
@@ -0,0 +1,55 @@
+package gov.nasa.ziggy.services.messages;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.services.process.StatusMessage;
+import gov.nasa.ziggy.util.SystemTime;
+
+/**
+ * Provides a signal, with timestamp, from the supervisor to all clients currently in contact with
+ * the message server. This signal is repeated at intervals. If the signals stop, the clients can
+ * respond by attempting to re-establish contact with the server.
+ *
+ * @author PT
+ */
+public class HeartbeatMessage extends StatusMessage {
+
+    private static final long serialVersionUID = 20230513L;
+
+    private static Logger log = LoggerFactory.getLogger(HeartbeatMessage.class);
+
+    /**
+     * Nominal interval between heartbeat messages in seconds.
+     */
+    private final static long DEFAULT_HEARTBEAT_INTERVAL_MILLIS = 1000 * 15L;
+    private static long heartbeatIntervalMillis;
+
+    // This is protected so that a subclass of this method used for test purposes can
+    // set its value.
+    protected long heartbeatTimeMillis;
+
+    /**
+     * Returns the heartbeat interval in milliseconds. This is nominally the default value but can
+     * be overridden to a shorter interval for testing purposes.
+     */
+    public static synchronized final long heartbeatIntervalMillis() {
+        if (heartbeatIntervalMillis <= 0L) {
+            heartbeatIntervalMillis = ZiggyConfiguration.getInstance()
+                .getLong(PropertyName.HEARTBEAT_INTERVAL.property(),
+                    DEFAULT_HEARTBEAT_INTERVAL_MILLIS);
+        }
+        return heartbeatIntervalMillis;
+    }
+
+    public HeartbeatMessage() {
+        log.debug("Supervisor heartbeat message generated");
+        heartbeatTimeMillis = SystemTime.currentTimeMillis();
+    }
+
+    public long getHeartbeatTimeMillis() {
+        return heartbeatTimeMillis;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/InvalidateConsoleModelsMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/InvalidateConsoleModelsMessage.java
new file mode 100644
index 0000000..26d47bd
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/InvalidateConsoleModelsMessage.java
@@ -0,0 +1,11 @@
+package gov.nasa.ziggy.services.messages;
+
+/**
+ * Notifies the console that its models need to be invalidated.
+ *
+ * @author PT
+ */
+public class InvalidateConsoleModelsMessage extends PipelineMessage {
+
+    private static final long serialVersionUID = 20231016L;
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/KillTasksRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/KillTasksRequest.java
new file mode 100644
index 0000000..fcc8a71
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/KillTasksRequest.java
@@ -0,0 +1,30 @@
+package gov.nasa.ziggy.services.messages;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+
+/**
+ * Requests that the supervisor kill the selected tasks if they are waiting in the worker queue to
+ * be processed, and then makes the same request of worker processes that are processing any of
+ * these tasks. processes. The tasks are specified by task ID.
+ *
+ * @author PT
+ */
+public class KillTasksRequest extends PipelineMessage {
+
+    private static final long serialVersionUID = 20230511L;
+
+    private final List<Long> taskIds = new ArrayList<>();
+
+    public KillTasksRequest(List<PipelineTask> pipelineTasks) {
+        taskIds
+            .addAll(pipelineTasks.stream().map(PipelineTask::getId).collect(Collectors.toList()));
+    }
+
+    public List<Long> getTaskIds() {
+        return taskIds;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/MonitorAlgorithmRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/MonitorAlgorithmRequest.java
new file mode 100644
index 0000000..3b10ff0
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/MonitorAlgorithmRequest.java
@@ -0,0 +1,33 @@
+package gov.nasa.ziggy.services.messages;
+
+import gov.nasa.ziggy.module.AlgorithmExecutor.AlgorithmType;
+import gov.nasa.ziggy.module.StateFile;
+import gov.nasa.ziggy.supervisor.PipelineSupervisor;
+import gov.nasa.ziggy.worker.PipelineWorker;
+
+/**
+ * Message sent from the {@link PipelineWorker} to the {@link PipelineSupervisor} to request that a
+ * given {@link StateFile} be added to either the local or remote {@link AlgorithmMonitor).
+ *
+ * @author PT
+ */
+public class MonitorAlgorithmRequest extends PipelineMessage {
+
+    private static final long serialVersionUID = 20230511L;
+
+    private final AlgorithmType algorithmType;
+    private final StateFile stateFile;
+
+    public MonitorAlgorithmRequest(StateFile stateFile, AlgorithmType algorithmType) {
+        this.algorithmType = algorithmType;
+        this.stateFile = stateFile;
+    }
+
+    public AlgorithmType getAlgorithmType() {
+        return algorithmType;
+    }
+
+    public StateFile getStateFile() {
+        return stateFile;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/NoRunningOrQueuedPipelinesMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/NoRunningOrQueuedPipelinesMessage.java
index 9811332..8b0e9d8 100644
--- a/src/main/java/gov/nasa/ziggy/services/messages/NoRunningOrQueuedPipelinesMessage.java
+++ b/src/main/java/gov/nasa/ziggy/services/messages/NoRunningOrQueuedPipelinesMessage.java
@@ -1,30 +1,13 @@
 package gov.nasa.ziggy.services.messages;
 
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.ui.ops.instances.OpsInstancesPanel;
-
 /**
- * Message sent from the WorkerFireTriggerRequestListener to the console to indicate that all
- * pipeline running is done until such time as a fresh trigger is fired. The message has no content,
- * its arrival is all the information the receiver needs.
+ * Message sent from the {@link WorkerFireTriggerRequestListener} to the console to indicate that
+ * all pipeline running is done until such time as a fresh trigger is fired. The message has no
+ * content, its arrival is all the information the receiver needs.
  *
  * @author PT
  */
 public class NoRunningOrQueuedPipelinesMessage extends PipelineMessage {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 20210318L;
-
-    /**
-     * Handles the receipt of this message by updating the {@link OpsInstancesPanel} to reflect that
-     * execution of all pipelines has completed.
-     */
-    @Override
-    public Object handleMessage(MessageHandler handler) {
-        handler.handleNoRunningOrQueuedPipelinesMessage();
-        return null;
-    }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/PipelineMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/PipelineMessage.java
index c9a3a5c..9259d0c 100644
--- a/src/main/java/gov/nasa/ziggy/services/messages/PipelineMessage.java
+++ b/src/main/java/gov/nasa/ziggy/services/messages/PipelineMessage.java
@@ -2,18 +2,22 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 
-import gov.nasa.ziggy.services.messaging.MessageHandler;
+import gov.nasa.ziggy.util.os.ProcessUtils;
 
 /**
  * Superclass for all classes that are sent over RMI.
  *
  * @author Todd Klaus
+ * @author PT
  */
 public abstract class PipelineMessage implements Serializable {
-    private static final long serialVersionUID = 20210318L;
 
-    private Date timeSent = new Date();
+    private static final long serialVersionUID = 20230513L;
+
+    private final Date timeSent = new Date();
+    private final long senderProcessId = ProcessUtils.getPid();
 
     public PipelineMessage() {
     }
@@ -25,33 +29,30 @@ public Date getTimeSent() {
         return timeSent;
     }
 
-    /**
-     * @param timeSent the timeSent to set
-     */
-    public void setTimeSent(Date timeSent) {
-        this.timeSent = timeSent;
+    public long getSenderProcessId() {
+        return senderProcessId;
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof PipelineMessage)) {
-            return false;
-        }
-
-        PipelineMessage other = (PipelineMessage) o;
-        return timeSent.equals(other.timeSent);
+    public int hashCode() {
+        return Objects.hash(senderProcessId, timeSent, getClass());
     }
 
     @Override
-    public int hashCode() {
-        return timeSent.hashCode();
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        PipelineMessage other = (PipelineMessage) obj;
+        return senderProcessId == other.senderProcessId && Objects.equals(timeSent, other.timeSent);
     }
 
     @Override
     public String toString() {
-        return "PipelineMessage, timeSent :" + timeSent.toString();
+        return getClass().getSimpleName() + ": timeSent=" + timeSent.toString()
+            + ", senderProcessId=" + senderProcessId;
     }
-
-    public abstract Object handleMessage(MessageHandler messageHandler);
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/RunningPipelinesCheckRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/RunningPipelinesCheckRequest.java
index fbec288..77d3762 100644
--- a/src/main/java/gov/nasa/ziggy/services/messages/RunningPipelinesCheckRequest.java
+++ b/src/main/java/gov/nasa/ziggy/services/messages/RunningPipelinesCheckRequest.java
@@ -1,9 +1,7 @@
 package gov.nasa.ziggy.services.messages;
 
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-
 /**
- * Message sent from the client to the worker requesting information on whether there are any
+ * Message sent from the client to the supervisor requesting information on whether there are any
  * running pipeline instances or any instances that are waiting to run. There's no message content
  * other than the request itself.
  *
@@ -11,11 +9,5 @@
  */
 public class RunningPipelinesCheckRequest extends PipelineMessage {
 
-    private static final long serialVersionUID = 20210318L;
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        messageHandler.handleRunningPipelinesCheckRequest(this);
-        return null;
-    }
+    private static final long serialVersionUID = 20230511L;
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/ShutdownMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/ShutdownMessage.java
new file mode 100644
index 0000000..2852e48
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/ShutdownMessage.java
@@ -0,0 +1,11 @@
+package gov.nasa.ziggy.services.messages;
+
+/**
+ * A message that notifies clients that the cluster is shutting down.
+ *
+ * @author PT
+ */
+public class ShutdownMessage extends PipelineMessage {
+
+    private static final long serialVersionUID = 20230511L;
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/SingleTaskLogMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/SingleTaskLogMessage.java
new file mode 100644
index 0000000..cb260f4
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/SingleTaskLogMessage.java
@@ -0,0 +1,21 @@
+package gov.nasa.ziggy.services.messages;
+
+/**
+ * Carries the contents of a single task log file to a requestor.
+ *
+ * @author PT
+ */
+public class SingleTaskLogMessage extends SpecifiedRequestorMessage {
+
+    private static final long serialVersionUID = 20230614L;
+    private final String taskLogContents;
+
+    public SingleTaskLogMessage(SingleTaskLogRequest originalMessage, String taskLogContents) {
+        super(originalMessage);
+        this.taskLogContents = taskLogContents;
+    }
+
+    public String taskLogContents() {
+        return taskLogContents;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/SingleTaskLogRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/SingleTaskLogRequest.java
new file mode 100644
index 0000000..78f16a5
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/SingleTaskLogRequest.java
@@ -0,0 +1,34 @@
+package gov.nasa.ziggy.services.messages;
+
+import gov.nasa.ziggy.services.logging.TaskLogInformation;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.security.Privilege;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
+import gov.nasa.ziggy.util.Requestor;
+
+/**
+ * Requests a single task log for display.
+ *
+ * @author PT
+ */
+public class SingleTaskLogRequest extends SpecifiedRequestorMessage {
+
+    private static final long serialVersionUID = 20230614L;
+
+    private final TaskLogInformation taskLogInformation;
+
+    private SingleTaskLogRequest(Requestor sender, TaskLogInformation taskLogInformation) {
+        super(sender);
+        this.taskLogInformation = taskLogInformation;
+    }
+
+    public static void requestSingleTaskLog(Requestor sender,
+        TaskLogInformation taskLogInformation) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
+        ZiggyMessenger.publish(new SingleTaskLogRequest(sender, taskLogInformation));
+    }
+
+    public TaskLogInformation getTaskLogInformation() {
+        return taskLogInformation;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/SpecifiedRequestorMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/SpecifiedRequestorMessage.java
new file mode 100644
index 0000000..6200dd6
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/SpecifiedRequestorMessage.java
@@ -0,0 +1,54 @@
+package gov.nasa.ziggy.services.messages;
+
+import gov.nasa.ziggy.util.Requestor;
+
+/**
+ * A {@link PipelineMessage} with a uniquely specified requestor.
+ * <p>
+ * Instances of {@link SpecifiedRequestorMessage} are messages that can determine whether a given
+ * subscriber is the requestor / intended recipient of the message. In general, the life cycle of
+ * {@link SpecifiedRequestorMessage}s are as follows:
+ * <ol>
+ * <li>An instance of {@link Requestor} publishes an instance of {@link SpecifiedRequestorMessage}.
+ * The publisher's {@link Requestor#requestorIdentifier()} method is used by the message to capture
+ * the publisher's unique identification.
+ * <li>The subscriber that receives the original message constructs a reply for the requestor. This
+ * message is also an instance of {@link SpecifiedRequestorMessage}, and it captures the identifier
+ * from the original message to use as its own requestor identifier.
+ * <li>When the reply message reaches a subscriber, that subscriber can use
+ * {@link Requestor#isDestination(Requestor)} to determine whether the subscriber in question is the
+ * intended recipient.
+ * </ol>
+ * <p>
+ * Note that, while a {@link SpecifiedRequestorMessage} has an intended recipient, there is no
+ * engineering control that prevents other subscribers from subscribing to the message and making
+ * use of its content. The intent of the {@link SpecifiedRequestorMessage} is to allow subscribers
+ * to protect themselves: specifically, to allow them to avoid taking action in response to a
+ * message not intended for them, in the event that taking such an action in that case would cause
+ * an error.
+ *
+ * @author PT
+ */
+public class SpecifiedRequestorMessage extends PipelineMessage implements Requestor {
+
+    private static final long serialVersionUID = 20230622L;
+    private final Object requestorIdentifier;
+
+    public SpecifiedRequestorMessage(Requestor requestor) {
+        requestorIdentifier = requestor.requestorIdentifier();
+    }
+
+    public SpecifiedRequestorMessage(SpecifiedRequestorMessage message) {
+        requestorIdentifier = message.requestorIdentifier;
+    }
+
+    @Override
+    public Object requestorIdentifier() {
+        return requestorIdentifier;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + ", requestorIdentifier=" + requestorIdentifier;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/StartMemdroneRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/StartMemdroneRequest.java
index 2af7ec5..7f9a493 100644
--- a/src/main/java/gov/nasa/ziggy/services/messages/StartMemdroneRequest.java
+++ b/src/main/java/gov/nasa/ziggy/services/messages/StartMemdroneRequest.java
@@ -1,18 +1,15 @@
 package gov.nasa.ziggy.services.messages;
 
-import gov.nasa.ziggy.metrics.report.Memdrone;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-
 /**
- * Requests that the memdrone shell script be started by the worker. This request is needed in one
- * use-case only: the case in which the console also requests that the worker restart failed tasks.
- * In all other cases, the worker or the remote nodes do not need this message to tell them to start
- * the shell script.
+ * Requests that the memdrone shell script be started by the supervisor. This request is needed in
+ * one use-case only: the case in which the console also requests that the supervisor restart failed
+ * tasks. In all other cases, the supervisor or the remote nodes do not need this message to tell
+ * them to start the shell script.
  *
  * @author PT
  */
 public class StartMemdroneRequest extends PipelineMessage {
-    private static final long serialVersionUID = 20211003L;
+    private static final long serialVersionUID = 20230511L;
 
     private long instanceId;
     private String moduleName;
@@ -37,15 +34,4 @@ public String getModuleName() {
     public void setModuleName(String moduleName) {
         this.moduleName = moduleName;
     }
-
-    public Memdrone memdrone() {
-        return new Memdrone(moduleName, instanceId);
-    }
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        messageHandler.handleStartMemdroneRequest(this);
-        return null;
-    }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/TaskCompletionNotification.java b/src/main/java/gov/nasa/ziggy/services/messages/TaskCompletionNotification.java
new file mode 100644
index 0000000..c6454ed
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/TaskCompletionNotification.java
@@ -0,0 +1,21 @@
+package gov.nasa.ziggy.services.messages;
+
+/**
+ * Notifies recipients that a task has completed.
+ *
+ * @author PT
+ */
+public class TaskCompletionNotification extends PipelineMessage {
+
+    private static final long serialVersionUID = 20230613L;
+
+    private final long taskId;
+
+    public TaskCompletionNotification(long taskId) {
+        this.taskId = taskId;
+    }
+
+    public long getTaskId() {
+        return taskId;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/TaskLogInformationMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/TaskLogInformationMessage.java
new file mode 100644
index 0000000..30251bf
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/TaskLogInformationMessage.java
@@ -0,0 +1,27 @@
+package gov.nasa.ziggy.services.messages;
+
+import java.util.Set;
+
+import gov.nasa.ziggy.services.logging.TaskLogInformation;
+
+/**
+ * Carries information about the available task logs for a specific task.
+ *
+ * @author PT
+ */
+public class TaskLogInformationMessage extends SpecifiedRequestorMessage {
+
+    private static final long serialVersionUID = 20230614L;
+
+    private final Set<TaskLogInformation> taskLogInformation;
+
+    public TaskLogInformationMessage(TaskLogInformationRequest originalMessage,
+        Set<TaskLogInformation> taskLogInformation) {
+        super(originalMessage);
+        this.taskLogInformation = taskLogInformation;
+    }
+
+    public Set<TaskLogInformation> taskLogInformation() {
+        return taskLogInformation;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/TaskLogInformationRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/TaskLogInformationRequest.java
new file mode 100644
index 0000000..fd4329c
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/TaskLogInformationRequest.java
@@ -0,0 +1,51 @@
+package gov.nasa.ziggy.services.messages;
+
+import java.util.Set;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.services.logging.TaskLogInformation;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.security.Privilege;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
+import gov.nasa.ziggy.util.Requestor;
+
+/**
+ * Ask for metadata on all the log files associated with a given pipeline task.
+ *
+ * @see gov.nasa.ziggy.services.logging.TaskLogInformation
+ * @author PT
+ */
+public final class TaskLogInformationRequest extends SpecifiedRequestorMessage {
+
+    private static final long serialVersionUID = 20230614L;
+
+    private final long instanceId;
+    private final long taskId;
+
+    private TaskLogInformationRequest(Requestor sender, long instanceId, long taskId) {
+        super(sender);
+        this.instanceId = instanceId;
+        this.taskId = taskId;
+    }
+
+    /**
+     * Performs the request for task log information and returns the information for all logs as a
+     * {@link Set} of {@link TaskLogInformation} instances. This method is the only public method to
+     * retrieve a task log, as the {@link TaskLogInformationRequest} constructor is private. This
+     * prevents callers from attempting to bypass the privilege verification performed in this
+     * method.
+     */
+    public static void requestTaskLogInformation(Requestor sender, PipelineTask task) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
+        ZiggyMessenger.publish(new TaskLogInformationRequest(sender,
+            task.getPipelineInstance().getId(), task.getId()));
+    }
+
+    public long getInstanceId() {
+        return instanceId;
+    }
+
+    public long getTaskId() {
+        return taskId;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/TaskRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/TaskRequest.java
new file mode 100644
index 0000000..7830254
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/TaskRequest.java
@@ -0,0 +1,115 @@
+package gov.nasa.ziggy.services.messages;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Objects;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.Priority;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
+
+/**
+ * Requests that the supervisor add a new task to its task queue.
+ *
+ * @author Todd Klaus
+ * @author PT
+ */
+public class TaskRequest extends PipelineMessage implements Comparable<TaskRequest> {
+    private static final long serialVersionUID = 20230511L;
+
+    private final long instanceId;
+    private final long instanceNodeId;
+    private final long pipelineDefinitionNodeId;
+    private final long taskId;
+    private final Priority priority;
+    private final RunMode runMode;
+
+    /**
+     * If true, only re-run the transition logic. Usually only true if the user specifically
+     * requested it via the console.
+     */
+    private final boolean doTransitionOnly;
+
+    public TaskRequest(long instanceId, long instanceNodeId, long pipelineDefinitionNodeId,
+        long taskId, Priority priority, boolean doTransitionOnly, RunMode runMode) {
+        this.instanceId = instanceId;
+        this.instanceNodeId = instanceNodeId;
+        this.pipelineDefinitionNodeId = pipelineDefinitionNodeId;
+        this.taskId = taskId;
+        this.doTransitionOnly = doTransitionOnly;
+        this.priority = priority;
+        this.runMode = checkNotNull(runMode, "runMode");
+    }
+
+    public long getInstanceId() {
+        return instanceId;
+    }
+
+    public long getPipelineDefinitionNodeId() {
+        return pipelineDefinitionNodeId;
+    }
+
+    public long getTaskId() {
+        return taskId;
+    }
+
+    public boolean isDoTransitionOnly() {
+        return doTransitionOnly;
+    }
+
+    public long getInstanceNodeId() {
+        return instanceNodeId;
+    }
+
+    public Priority getPriority() {
+        return priority;
+    }
+
+    public RunMode getRunMode() {
+        return runMode;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        return prime * result + Objects.hash(pipelineDefinitionNodeId, priority, taskId);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj) || getClass() != obj.getClass()) {
+            return false;
+        }
+        TaskRequest other = (TaskRequest) obj;
+        return pipelineDefinitionNodeId == other.pipelineDefinitionNodeId
+            && priority == other.priority && taskId == other.taskId;
+    }
+
+    /**
+     * Implements prioritization for {@link TaskRequest} instances. The prioritization scheme is as
+     * follows:
+     * <ol>
+     * <li>Tasks are first ordered by pipeline definition node ID. This is done because the worker
+     * count and worker heap size are set on a per-pipeline-definition-node basis. By forcing the
+     * tasks to sort first by pipeline definition node, we avoid a lot of thrashing between
+     * different worker configurations as tasks for assorted pipeline definition nodes execute.
+     * <li>For tasks with a common pipeline definition node ID, the tasks are sorted so that higher
+     * priority tasks execute earlier.
+     * <li>For tasks with a common pipeline definition node ID and priority, the tasks are sorted in
+     * order of task ID.
+     * </ol>
+     */
+    @Override
+    public int compareTo(TaskRequest o) {
+        if (pipelineDefinitionNodeId != o.getPipelineDefinitionNodeId()) {
+            return (int) (pipelineDefinitionNodeId - o.getPipelineDefinitionNodeId());
+        }
+        if (priority != o.getPriority()) {
+            return priority.compareTo(o.getPriority());
+        }
+        return (int) (taskId - o.getTaskId());
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/WorkerHeartbeatMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/WorkerHeartbeatMessage.java
deleted file mode 100644
index dfacd93..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messages/WorkerHeartbeatMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package gov.nasa.ziggy.services.messages;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.config.PropertyNames;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.services.process.StatusMessage;
-import gov.nasa.ziggy.util.SystemTime;
-
-/**
- * Provides a signal, with timestamp, from the worker to all clients currently in contact with the
- * worker. This signal is repeated at intervals. If the signals stop, the clients can respond by
- * attempting to re-establish contact with the worker.
- *
- * @author PT
- */
-public class WorkerHeartbeatMessage extends StatusMessage {
-
-    private static final long serialVersionUID = 20210218L;
-
-    private static Logger log = LoggerFactory.getLogger(WorkerHeartbeatMessage.class);
-
-    /**
-     * Nominal interval between heartbeat messages in seconds.
-     */
-    private final static long DEFAULT_HEARTBEAT_INTERVAL_MILLIS = 1000 * 15L;
-    private static long heartbeatIntervalMillis;
-
-    /**
-     * Returns the heartbeat interval in milliseconds. This is nominally the default value but can
-     * be overridden to a shorter interval for testing purposes.
-     */
-    public static final long heartbeatIntervalMillis() {
-        if (heartbeatIntervalMillis <= 0L) {
-            String heartbeatIntervalString = System.getProperty(
-                PropertyNames.HEARTBEAT_INTERVAL_PROP_NAME,
-                Long.toString(DEFAULT_HEARTBEAT_INTERVAL_MILLIS));
-            heartbeatIntervalMillis = Long.parseLong(heartbeatIntervalString);
-        }
-        return heartbeatIntervalMillis;
-    }
-
-    private long heartbeatTimeMillis;
-
-    public WorkerHeartbeatMessage() {
-        log.debug("Worker heartbeat message generated");
-        heartbeatTimeMillis = SystemTime.currentTimeMillis();
-    }
-
-    /**
-     * Message handler for {@link WorkerHeartbeatMessage}. This sets the timestamp of the current
-     * object into the {@link MessageHandler} instance.
-     */
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        messageHandler.setLastHeartbeatTimeMillis(heartbeatTimeMillis);
-        return null;
-    }
-
-    public long getHeartbeatTimeMillis() {
-        return heartbeatTimeMillis;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/WorkerResourceRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/WorkerResourceRequest.java
deleted file mode 100644
index fc354e8..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messages/WorkerResourceRequest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package gov.nasa.ziggy.services.messages;
-
-import java.io.Serializable;
-
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-
-/**
- * Message sent from the client to the worker requesting the number of worker threads and the Java
- * heap size. There's no message content other than the message itself.
- *
- * @author PT
- */
-public class WorkerResourceRequest extends PipelineMessage {
-
-    private static final long serialVersionUID = 20220614L;
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        return messageHandler.handleResourceRequest();
-    }
-
-    public static class WorkerResources implements Serializable {
-
-        private static final long serialVersionUID = 20220614L;
-
-        private final int workerThreads;
-        private final long heapSize;
-
-        public WorkerResources(int workerThreads, long heapSize) {
-            this.workerThreads = workerThreads;
-            this.heapSize = heapSize;
-        }
-
-        public int getWorkerThreads() {
-            return workerThreads;
-        }
-
-        public long getHeapSize() {
-            return heapSize;
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/WorkerResources.java b/src/main/java/gov/nasa/ziggy/services/messages/WorkerResources.java
new file mode 100644
index 0000000..fc0b6ef
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/WorkerResources.java
@@ -0,0 +1,66 @@
+package gov.nasa.ziggy.services.messages;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.supervisor.PipelineSupervisor;
+import gov.nasa.ziggy.ui.ZiggyGuiConsole;
+import gov.nasa.ziggy.ui.util.HumanReadableHeapSize;
+
+/**
+ * Notifies the {@link ZiggyGuiConsole} of the default settings for worker count and Java heap size
+ * that are stored in the {@link PipelineSupervisor}. This information is also used internally to
+ * determine the correct worker count and heap size for a given {@link PipelineDefinitionNode},
+ * based on whether the node has any non-default values set.
+ * <p>
+ * The class contains a singleton instance of {@link WorkerResources} that holds the default values
+ * for the pipeline. If a given pipeline definition node has no values set for one or both
+ * parameters, the default values will be returned by the class getter methods. There are also
+ * boolean methods that indicate whether the default or per-node values are being returned.
+ *
+ * @author PT
+ */
+public class WorkerResources extends PipelineMessage {
+
+    private static final long serialVersionUID = 20230714L;
+
+    /**
+     * Singleton instance that specifies the default values for the resources.
+     */
+    private static WorkerResources defaultResources;
+
+    // Values are boxed so they can be null.
+    private Integer maxWorkerCount;
+    private Integer heapSizeMb;
+
+    public WorkerResources(Integer maxWorkerCount, Integer heapSizeMb) {
+        this.maxWorkerCount = maxWorkerCount;
+        this.heapSizeMb = heapSizeMb;
+    }
+
+    public int getMaxWorkerCount() {
+        return !maxWorkerCountIsDefault() ? maxWorkerCount : defaultResources.getMaxWorkerCount();
+    }
+
+    public int getHeapSizeMb() {
+        return !heapSizeIsDefault() ? heapSizeMb : defaultResources.getHeapSizeMb();
+    }
+
+    public HumanReadableHeapSize humanReadableHeapSize() {
+        return new HumanReadableHeapSize(heapSizeMb);
+    }
+
+    public boolean heapSizeIsDefault() {
+        return heapSizeMb == null;
+    }
+
+    public boolean maxWorkerCountIsDefault() {
+        return maxWorkerCount == null;
+    }
+
+    public static void setDefaultResources(WorkerResources resources) {
+        defaultResources = resources;
+    }
+
+    public static WorkerResources getDefaultResources() {
+        return defaultResources;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/WorkerShutdownMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/WorkerShutdownMessage.java
deleted file mode 100644
index 7c2745a..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messages/WorkerShutdownMessage.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package gov.nasa.ziggy.services.messages;
-
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-
-/**
- * Tells clients that the worker is shutting down, and therefore they should do so as well. The
- * shutdown is executed by invoking the client's shutdown method.
- *
- * @author PT
- */
-public class WorkerShutdownMessage extends PipelineMessage {
-
-    private static final long serialVersionUID = 20210318L;
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        messageHandler.handleShutdownMessage(this);
-        return null;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/WorkerSingleTaskLogRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/WorkerSingleTaskLogRequest.java
deleted file mode 100644
index 6ea171b..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messages/WorkerSingleTaskLogRequest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package gov.nasa.ziggy.services.messages;
-
-import gov.nasa.ziggy.services.logging.TaskLogInformation;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-
-public class WorkerSingleTaskLogRequest extends PipelineMessage {
-
-    private static final long serialVersionUID = 20220325L;
-
-    private final TaskLogInformation taskLogInformation;
-
-    public static String requestSingleTaskLog(TaskLogInformation taskLogInformation) {
-        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
-        return (String) UiCommunicator.send(new WorkerSingleTaskLogRequest(taskLogInformation));
-    }
-
-    private WorkerSingleTaskLogRequest(TaskLogInformation taskLogInformation) {
-        this.taskLogInformation = taskLogInformation;
-    }
-
-    public TaskLogInformation getTaskLogInformation() {
-        return taskLogInformation;
-    }
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        return messageHandler.handleSingleTaskLogRequest(this);
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/WorkerStatusMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/WorkerStatusMessage.java
index cc9265a..56ba850 100644
--- a/src/main/java/gov/nasa/ziggy/services/messages/WorkerStatusMessage.java
+++ b/src/main/java/gov/nasa/ziggy/services/messages/WorkerStatusMessage.java
@@ -1,118 +1,72 @@
 package gov.nasa.ziggy.services.messages;
 
 import java.util.Date;
+import java.util.Objects;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import gov.nasa.ziggy.services.messaging.MessageHandler;
 import gov.nasa.ziggy.services.process.StatusMessage;
 
-public class WorkerStatusMessage extends StatusMessage {
-    private static final long serialVersionUID = 20210310L;
+/**
+ * Informs recipients of the status of a worker process.
+ *
+ * @author PT
+ */
+public class WorkerStatusMessage extends StatusMessage implements Comparable<WorkerStatusMessage> {
+    private static final long serialVersionUID = 20230522L;
 
     public static Logger log = LoggerFactory.getLogger(WorkerStatusMessage.class);
 
-    private int threadNumber;
-    private String state;
-    private String instanceId;
-    private String taskId;
-    private String module;
-    private String moduleUow;
-    private long processingStartTime;
-
-    /**
-     * @param state
-     * @param module
-     * @param moduleUow
-     * @param processingStartTime
-     */
-    public WorkerStatusMessage(int threadNumber, String state, String instanceId, String taskId,
-        String module, String moduleUow, long processingStartTime) {
-        this.threadNumber = threadNumber;
+    private final int workerNumber;
+    private final String state;
+    private final String instanceId;
+    private final String taskId;
+    private final String module;
+    private final String moduleUow;
+    private final long processingStartTime;
+    private final boolean lastMessageFromWorker;
+
+    public WorkerStatusMessage(int workerNumber, String state, String instanceId, String taskId,
+        String module, String moduleUow, long processingStartTime, boolean lastMessageFromWorker) {
+        this.workerNumber = workerNumber;
         this.state = state;
         this.instanceId = instanceId;
         this.taskId = taskId;
         this.module = module;
         this.moduleUow = moduleUow;
         this.processingStartTime = processingStartTime;
-    }
-
-    public WorkerStatusMessage() {
+        this.lastMessageFromWorker = lastMessageFromWorker;
     }
 
     @Override
     public String uniqueKey() {
-        return super.uniqueKey() + ":" + threadNumber;
+        return super.uniqueKey() + ":" + workerNumber;
     }
 
-    /**
-     * @return Returns the module.
-     */
     public String getModule() {
         return module;
     }
 
-    /**
-     * @param module The module to set.
-     */
-    public void setModule(String module) {
-        this.module = module;
-    }
-
-    /**
-     * @return Returns the processingStartTime.
-     */
     public long getProcessingStartTime() {
         return processingStartTime;
     }
 
-    /**
-     * @param processingStartTime The processingStartTime to set.
-     */
-    public void setProcessingStartTime(long processingStartTime) {
-        this.processingStartTime = processingStartTime;
-    }
-
-    /**
-     * @return Returns the state.
-     */
     public String getState() {
         return state;
     }
 
-    /**
-     * @param state The state to set.
-     */
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    /**
-     * @return the moduleUow
-     */
     public String getModuleUow() {
         return moduleUow;
     }
 
-    /**
-     * @param moduleUow the moduleUow to set
-     */
-    public void setModuleUow(String moduleUow) {
-        this.moduleUow = moduleUow;
-    }
-
-    public int getThreadNumber() {
-        return threadNumber;
-    }
-
-    public void setThreadNumber(int threadNumber) {
-        this.threadNumber = threadNumber;
+    public int getWorkerNumber() {
+        return workerNumber;
     }
 
     @Override
     public String briefStatus() {
-        return "WS:" + super.briefStatus() + "(" + threadNumber + "):" + "[" + state + ":"
+        return "WS:" + super.briefStatus() + "(" + workerNumber + "):" + "[" + state + ":"
             + instanceId + "-" + taskId + ":" + module + "{" + moduleUow + "}:since "
             + new Date(processingStartTime) + "]";
     }
@@ -121,21 +75,35 @@ public String getTaskId() {
         return taskId;
     }
 
-    public void setTaskId(String taskId) {
-        this.taskId = taskId;
-    }
-
     public String getInstanceId() {
         return instanceId;
     }
 
-    public void setInstanceId(String instanceId) {
-        this.instanceId = instanceId;
+    public boolean isLastMessageFromWorker() {
+        return lastMessageFromWorker;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        return prime * result + Objects.hash(taskId);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj) || getClass() != obj.getClass()) {
+            return false;
+        }
+        WorkerStatusMessage other = (WorkerStatusMessage) obj;
+        return Objects.equals(taskId, other.taskId);
     }
 
     @Override
-    public Object handleMessage(MessageHandler handler) {
-        handler.handleWorkerStatusMessage(this);
-        return null;
+    public int compareTo(WorkerStatusMessage o) {
+        return (int) (Long.parseLong(taskId) - Long.parseLong(o.taskId));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/WorkerTaskLogInformationRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/WorkerTaskLogInformationRequest.java
deleted file mode 100644
index 43f4688..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messages/WorkerTaskLogInformationRequest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package gov.nasa.ziggy.services.messages;
-
-import java.util.Set;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.services.logging.TaskLogInformation;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-
-/**
- * Ask for metadata on all the log files associated with a given pipeline task.
- *
- * @see gov.nasa.ziggy.services.logging.TaskLogInformation
- * @author PT
- */
-public final class WorkerTaskLogInformationRequest extends PipelineMessage {
-
-    private static final long serialVersionUID = 20220325L;
-
-    private final long instanceId;
-    private final long taskId;
-
-    /**
-     * Performs the request for task log information and returns the information for all logs as a
-     * {@link Set} of {@link TaskLogInformation} instances. This method is the only public method to
-     * retrieve a task log, as the {@link WorkerTaskLogInformationRequest} constructor is private.
-     * This prevents callers from attempting to bypass the privilege verification performed in this
-     * method.
-     */
-    @SuppressWarnings("unchecked")
-    public static Set<TaskLogInformation> requestTaskLogInformation(PipelineTask task) {
-        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
-        return (Set<TaskLogInformation>) UiCommunicator.send(
-            new WorkerTaskLogInformationRequest(task.getPipelineInstance().getId(), task.getId()));
-    }
-
-    private WorkerTaskLogInformationRequest(long instanceId, long taskId) {
-        this.instanceId = instanceId;
-        this.taskId = taskId;
-    }
-
-    public long getInstanceId() {
-        return instanceId;
-    }
-
-    public long getTaskId() {
-        return taskId;
-    }
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        return messageHandler.handleTaskLogInformationRequest(this);
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/WorkerTaskRequest.java b/src/main/java/gov/nasa/ziggy/services/messages/WorkerTaskRequest.java
deleted file mode 100644
index c8ea2ec..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messages/WorkerTaskRequest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package gov.nasa.ziggy.services.messages;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-
-/**
- * @author Todd Klaus
- */
-public class WorkerTaskRequest extends PipelineMessage implements Comparable<WorkerTaskRequest> {
-    private static final long serialVersionUID = 20210702L;
-
-    private long instanceId;
-    private long instanceNodeId;
-    private long taskId;
-    private int priority;
-    private RunMode runMode;
-
-    /**
-     * If true, only re-run the transition logic. Usually only true if the user specifically
-     * requested it via the console.
-     */
-    private boolean doTransitionOnly = false;
-
-    public WorkerTaskRequest(long instanceId, long instanceNodeId, long taskId, int priority,
-        boolean doTransitionOnly, RunMode runMode) {
-        this.instanceId = instanceId;
-        this.instanceNodeId = instanceNodeId;
-        this.taskId = taskId;
-        this.doTransitionOnly = doTransitionOnly;
-        this.priority = priority;
-        this.runMode = checkNotNull(runMode, "runMode");
-    }
-
-    /**
-     * @return Returns the instanceId.
-     */
-    public long getInstanceId() {
-        return instanceId;
-    }
-
-    /**
-     * @param instanceId The instanceId to set.
-     */
-    public void setInstanceId(long instanceId) {
-        this.instanceId = instanceId;
-    }
-
-    /**
-     * @return Returns the taskId.
-     */
-    public long getTaskId() {
-        return taskId;
-    }
-
-    /**
-     * @param taskId The taskId to set.
-     */
-    public void setTaskId(long taskId) {
-        this.taskId = taskId;
-    }
-
-    /**
-     * @return the doTransitionOnly
-     */
-    public boolean isDoTransitionOnly() {
-        return doTransitionOnly;
-    }
-
-    /**
-     * @param doTransitionOnly the doTransitionOnly to set
-     */
-    public void setDoTransitionOnly(boolean doTransitionOnly) {
-        this.doTransitionOnly = doTransitionOnly;
-    }
-
-    public long getInstanceNodeId() {
-        return instanceNodeId;
-    }
-
-    public void setInstanceNodeId(long instanceNodeId) {
-        this.instanceNodeId = instanceNodeId;
-    }
-
-    public void setPriority(int priority) {
-        this.priority = priority;
-    }
-
-    public int getPriority() {
-        return priority;
-    }
-
-    public RunMode getRunMode() {
-        return runMode;
-    }
-
-    public void setRunMode(RunMode runMode) {
-        this.runMode = runMode;
-    }
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        messageHandler.handleWorkerTaskRequest(this);
-        return null;
-    }
-
-    /**
-     * Implements prioritization for {@link WorkerTaskRequest} instances. Instances with a lower
-     * {@link priority} value come first; for instances with the same {@link priority}, the instance
-     * with the lower {@link taskId} comes first.
-     */
-    @Override
-    public int compareTo(WorkerTaskRequest o) {
-        if (priority != o.getPriority()) {
-            return priority - o.getPriority();
-        }
-        return (int) (taskId - o.getTaskId());
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messages/ZiggyEventHandlerInfoMessage.java b/src/main/java/gov/nasa/ziggy/services/messages/ZiggyEventHandlerInfoMessage.java
new file mode 100644
index 0000000..325c38e
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messages/ZiggyEventHandlerInfoMessage.java
@@ -0,0 +1,33 @@
+package gov.nasa.ziggy.services.messages;
+
+import java.util.Set;
+
+import gov.nasa.ziggy.services.events.ZiggyEventHandler.ZiggyEventHandlerInfoForDisplay;
+
+/**
+ * Transmits a {@link Set} of {@link ZiggyEventHandlerInfoForDisplay} instances. This message is
+ * sent in response to the {@link EventHandlerRequest} message.
+ *
+ * @author PT
+ */
+public class ZiggyEventHandlerInfoMessage extends SpecifiedRequestorMessage {
+
+    private static final long serialVersionUID = 20230614L;
+
+    private final Set<ZiggyEventHandlerInfoForDisplay> eventHandlerInfo;
+
+    public ZiggyEventHandlerInfoMessage(EventHandlerRequest originalMessage,
+        Set<ZiggyEventHandlerInfoForDisplay> eventHandlerInfo) {
+        super(originalMessage);
+        this.eventHandlerInfo = eventHandlerInfo;
+    }
+
+    public Set<ZiggyEventHandlerInfoForDisplay> getEventHandlerInfo() {
+        return eventHandlerInfo;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + ", " + eventHandlerInfo.size() + " event handlers";
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/ClientMessageHandler.java b/src/main/java/gov/nasa/ziggy/services/messaging/ClientMessageHandler.java
deleted file mode 100644
index c5d9d1a..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messaging/ClientMessageHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import gov.nasa.ziggy.services.alert.AlertMessage;
-import gov.nasa.ziggy.services.messages.WorkerShutdownMessage;
-import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
-
-/**
- * Performs processing of messages received by the client. This allows a separation between the
- * messages and their handleMessage methods and the client.
- *
- * @author PT
- * @author Bill Wohler
- */
-public interface ClientMessageHandler {
-
-    void handleAlert(AlertMessage message);
-
-    void handleWorkerStatusMessage(WorkerStatusMessage message);
-
-    void handleShutdownMessage(WorkerShutdownMessage message);
-
-    void handleNoRunningOrQueuedPipelinesMessage();
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/MessageAction.java b/src/main/java/gov/nasa/ziggy/services/messaging/MessageAction.java
new file mode 100644
index 0000000..899e41a
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messaging/MessageAction.java
@@ -0,0 +1,19 @@
+package gov.nasa.ziggy.services.messaging;
+
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+
+/**
+ * Defines an action that is to be taken when a message is delivered to a subscriber.
+ * <p>
+ *
+ * @author PT
+ * @param <T>
+ */
+@FunctionalInterface
+public interface MessageAction<T extends PipelineMessage> {
+
+    /**
+     * Performs the action that is to be taken in response to a message.
+     */
+    void action(T message);
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/MessageHandler.java b/src/main/java/gov/nasa/ziggy/services/messaging/MessageHandler.java
deleted file mode 100644
index 5051cf7..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messaging/MessageHandler.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import java.io.IOException;
-import java.util.Set;
-
-import gov.nasa.ziggy.services.alert.AlertMessage;
-import gov.nasa.ziggy.services.events.ZiggyEventHandler.ZiggyEventHandlerInfoForDisplay;
-import gov.nasa.ziggy.services.logging.TaskLogInformation;
-import gov.nasa.ziggy.services.messages.DeleteTasksRequest;
-import gov.nasa.ziggy.services.messages.PipelineMessage;
-import gov.nasa.ziggy.services.messages.RunningPipelinesCheckRequest;
-import gov.nasa.ziggy.services.messages.StartMemdroneRequest;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
-import gov.nasa.ziggy.services.messages.WorkerHeartbeatMessage;
-import gov.nasa.ziggy.services.messages.WorkerResourceRequest;
-import gov.nasa.ziggy.services.messages.WorkerShutdownMessage;
-import gov.nasa.ziggy.services.messages.WorkerSingleTaskLogRequest;
-import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
-import gov.nasa.ziggy.services.messages.WorkerTaskLogInformationRequest;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-
-/**
- * Provides support for handling messages. Specifically, the {@link MessageHandler} instance
- * provides class instances or other information / objects that are needed for the handleMessage()
- * method that each {@link PipelineMessage} provides. The {@link PipelineMessage} method does the
- * actual work of handling the message. This saves a lot of tedious if-then blocks by forcing each
- * subclass of {@link PipelineMessage} to provide all the class-specific handling code it requires.
- * <p>
- * The {@link MessageHandler} class is part of the Remote Method Invocation (RMI) communication
- * between the client and the worker. For this reason it must implement the
- * {@link MessageHandlerService} interface.
- * <p>
- * Consider extending UnicastRemoteObject if we ever have to implement equals() and hashCode().
- * According to Bill Grosso's Java RMI book, implementing these methods in stubs is "tricky."
- *
- * @author PT
- * @author Bill Wohler
- */
-public class MessageHandler implements MessageHandlerService {
-
-    public static final String RMI_REGISTRY_PORT_PROP = "rmi.registry.port";
-    public static final int RMI_REGISTRY_PORT_PROP_DEFAULT = 1099;
-
-    protected ClientMessageHandler clientMessageHandler;
-    protected WorkerMessageHandler workerMessageHandler;
-
-    /**
-     * Time at which the last heartbeat from the worker was detected by the UI. This is used to
-     * determine whether the worker has failed and a new connection must be established.
-     */
-    private volatile long lastHeartbeatTimeMillis;
-
-    /**
-     * Constructor used by clients. This requires a valid {@link ClientMessageHandler} instance
-     * which can do the work of handling messages received by the clients.
-     */
-    public MessageHandler(ClientMessageHandler clientMessageHandler) {
-        this.clientMessageHandler = clientMessageHandler;
-    }
-
-    /**
-     * Constructor used by the worker. This requires a valid {@link WorkerMessageHandler} instance
-     * which can do the work of handling messages received by the worker.
-     */
-    public MessageHandler(WorkerMessageHandler workerMessageHandler) {
-        this.workerMessageHandler = workerMessageHandler;
-    }
-
-    @Override
-    public Object handleMessage(PipelineMessage message) {
-        return message.handleMessage(this);
-    }
-
-    public void setLastHeartbeatTimeMillis(long lastHeartbeatTime) {
-        lastHeartbeatTimeMillis = lastHeartbeatTime;
-    }
-
-    public long getLastHeartbeatTimeMillis() {
-        return lastHeartbeatTimeMillis;
-    }
-
-    public void resetLastHeartbeatTime() {
-        lastHeartbeatTimeMillis = 0L;
-    }
-
-    public long heartbeatIntervalMillis() {
-        return WorkerHeartbeatMessage.heartbeatIntervalMillis();
-    }
-
-    public void handleAlert(AlertMessage message) {
-        clientMessageHandler.handleAlert(message);
-    }
-
-    public void handleWorkerStatusMessage(WorkerStatusMessage message) {
-        clientMessageHandler.handleWorkerStatusMessage(message);
-    }
-
-    public void handleShutdownMessage(WorkerShutdownMessage message) {
-        clientMessageHandler.handleShutdownMessage(message);
-    }
-
-    public void handleNoRunningOrQueuedPipelinesMessage() {
-        clientMessageHandler.handleNoRunningOrQueuedPipelinesMessage();
-    }
-
-    public void handleTriggerRequest(WorkerFireTriggerRequest fireTriggerRequest) {
-        workerMessageHandler.handleTriggerRequest(fireTriggerRequest);
-    }
-
-    public void handleRunningPipelinesCheckRequest(RunningPipelinesCheckRequest checkRequest) {
-        workerMessageHandler.handleRunningPipelinesCheckRequest(checkRequest);
-    }
-
-    public void handleWorkerTaskRequest(WorkerTaskRequest request) {
-        workerMessageHandler.handleWorkerTaskRequest(request);
-    }
-
-    public void handleStartMemdroneRequest(StartMemdroneRequest request) {
-        workerMessageHandler.handleStartMemdroneRequest(request);
-    }
-
-    public Set<TaskLogInformation> handleTaskLogInformationRequest(
-        WorkerTaskLogInformationRequest request) {
-        return workerMessageHandler.handleTaskLogInformationRequest(request);
-    }
-
-    public String handleSingleTaskLogRequest(WorkerSingleTaskLogRequest request) {
-        return workerMessageHandler.handleSingleTaskLogRequest(request);
-    }
-
-    public WorkerResourceRequest.WorkerResources handleResourceRequest() {
-        return workerMessageHandler.handleResourceRequest();
-    }
-
-    public Set<ZiggyEventHandlerInfoForDisplay> handleEventHandlerRequest() {
-        return workerMessageHandler.handleEventHandlerRequest();
-    }
-
-    public void handleEventHandlerToggleRequest(String handlerName) {
-        workerMessageHandler.handleEventHandlerToggleRequest(handlerName);
-    }
-
-    public boolean deleteTasks(DeleteTasksRequest request) throws IOException {
-        return workerMessageHandler.deleteTasks(request);
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/MessageHandlerService.java b/src/main/java/gov/nasa/ziggy/services/messaging/MessageHandlerService.java
deleted file mode 100644
index 54bb470..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messaging/MessageHandlerService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import gov.nasa.ziggy.services.messages.PipelineMessage;
-
-/**
- * Service that must be implemented by the {@link MessageHandler} class. The use of an interface is
- * necessary for the Remote Method Invocation (RMI) API, which is used for communication between
- * Ziggy components.
- *
- * @author PT
- */
-public interface MessageHandlerService extends Remote {
-
-    String SERVICE_NAME = "messageHandlerService";
-
-    Object handleMessage(PipelineMessage message) throws RemoteException;
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/ProcessHeartbeatManager.java b/src/main/java/gov/nasa/ziggy/services/messaging/ProcessHeartbeatManager.java
new file mode 100644
index 0000000..61ef5f1
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messaging/ProcessHeartbeatManager.java
@@ -0,0 +1,381 @@
+package gov.nasa.ziggy.services.messaging;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.services.messages.HeartbeatMessage;
+import gov.nasa.ziggy.ui.ClusterController;
+import gov.nasa.ziggy.ui.status.Indicator;
+import gov.nasa.ziggy.ui.status.ProcessesStatusPanel;
+import gov.nasa.ziggy.ui.status.StatusPanel;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.SystemTime;
+import gov.nasa.ziggy.util.ZiggyShutdownHook;
+
+/**
+ * Manages the process of responding to the presence or absence of heartbeat messages from the
+ * supervisor. The worker heartbeat messages are sent out at regular intervals from the supervisor
+ * to indicate that it has not crashed.
+ * <p>
+ * At startup, a console puts the Processes summary into the "Gray" (undefined) state. When the
+ * {@link ZiggyRmiClient} is created, an instance of {@link ProcessHeartbeatManager} is also
+ * created; it waits for 1 heartbeat interval to hear from the supervisor. If the supervisor is
+ * heard from in that interval, the state of the Processes summary goes to "Green;" if not heard
+ * from, "Red."
+ * <p>
+ * Once the Processes summary is "Green," a {@link ScheduledThreadPoolExecutor} is started that
+ * checks the timestamp of the latest heartbeat at an interval that is 2 * the heartbeat interval.
+ * If there have been no new heartbeats since the last one recorded by the
+ * {@link ProcessHeartbeatManager}, the Processes summary goes "Yellow," the {@link ZiggyRmiClient}
+ * instance is deleted, and a new instance is created; this is necessary because, if the supervisor
+ * has restarted, it needs new copies of the {@link MessageHandler} from each UI, which are provided
+ * during construction of the {@link ZiggyRmiClient}.
+ * <p>
+ * If, after deleting and reconstructing the {@link ZiggyRmiClient}, the supervisor is still not
+ * heard from, the Processes summary goes to "Red," and the heartbeat monitoring is terminated. At
+ * this point, it is assumed that whatever has happened to the supervisor is serious enough that it
+ * requires human intervention.
+ *
+ * @author PT
+ */
+public class ProcessHeartbeatManager {
+
+    private static final Logger log = LoggerFactory.getLogger(ProcessHeartbeatManager.class);
+
+    private static ProcessHeartbeatManager instance;
+    private static boolean initializeInThread = true;
+
+    private long heartbeatIntervalMillis;
+    private ScheduledThreadPoolExecutor heartbeatListener;
+    private long priorHeartbeatTime;
+    private long heartbeatTime;
+    protected HeartbeatManagerAssistant heartbeatManagerAssistant;
+    private boolean isInitialized = false;
+    private ClusterController clusterController;
+    private boolean reinitializeOnMissedHeartbeat = true;
+    private CountDownLatch heartbeatCountdownLatch;
+
+    public ProcessHeartbeatManager(HeartbeatManagerAssistant heartbeatManagerAssistant) {
+        this(heartbeatManagerAssistant, new ClusterController(100, 1));
+    }
+
+    /**
+     * Constructor for test purposes. This allows the caller to supply a mocked instance of the
+     * class that performs all "external" methods (where in this case an external method is one we
+     * want to mock and/or detect the use of).
+     *
+     * @param messageHandler
+     * @param externalMethodsManager
+     */
+    protected ProcessHeartbeatManager(HeartbeatManagerAssistant heartbeatManagerAssistant,
+        ClusterController clusterController) {
+        this.heartbeatManagerAssistant = heartbeatManagerAssistant;
+        heartbeatIntervalMillis = HeartbeatMessage.heartbeatIntervalMillis();
+        this.clusterController = clusterController;
+        ZiggyMessenger.subscribe(HeartbeatMessage.class, message -> {
+            heartbeatTime = message.getHeartbeatTimeMillis();
+            if (heartbeatCountdownLatch != null) {
+                heartbeatCountdownLatch.countDown();
+            }
+        });
+    }
+
+    public static void initializeInstance(HeartbeatManagerAssistant heartbeatManagerAssistant) {
+        if (isInitialized()) {
+            log.info("ProcessHeartbeatManager instance already available, skipping instantiation");
+        }
+        instance = new ProcessHeartbeatManager(heartbeatManagerAssistant);
+        instance.initializeHeartbeatManager();
+    }
+
+    public static boolean isInitialized() {
+        return instance != null;
+    }
+
+    /**
+     * Start checking for heartbeats. If they are detected, start the automated at-intervals
+     * checking.
+     */
+    public void initializeHeartbeatManager() {
+
+        if (isInitialized) {
+            return;
+        }
+        // wait for one heartbeat interval to see if we get a heartbeat message. We
+        // have to do this in a thread because this activity has to take place in
+        // parallel with starting the RMI client.
+        if (initializeInThread) {
+            new Thread(() -> {
+                initializeHeartbeatManagerInternal();
+            }).start();
+        } else {
+
+            // For testing use, it's more efficient to perform the initialization
+            // in the main execution thread.
+            initializeHeartbeatManagerInternal();
+        }
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
+    private void initializeHeartbeatManagerInternal() {
+        heartbeatCountdownLatch = new CountDownLatch(1);
+        SystemTime.currentTimeMillis();
+        log.debug("Heartbeat time: " + heartbeatTime);
+        try {
+            // If the console, for example, is stopped for a few hours and then resumed,
+            // checkForHeartbeat() will call initializeHeartbeatManager() a lot, which can result in
+            // this code being executed simultaneously in several threads. That's how the latch can
+            // be null shortly after it is created.
+            // If future threading issues arise, remove this condition and synchronize this method.
+            if (heartbeatCountdownLatch != null) {
+                heartbeatCountdownLatch.await(heartbeatIntervalMillis, TimeUnit.MILLISECONDS);
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return;
+        } finally {
+            heartbeatCountdownLatch = null;
+        }
+        if (heartbeatTime <= 0) {
+            log.debug("Setting RMI state to error");
+            setRmiIndicator(Indicator.State.ERROR);
+            if (heartbeatListener != null) {
+                heartbeatListener.shutdownNow();
+            }
+            log.error("Unable to detect supervisor heartbeat messages");
+            return;
+        }
+        log.debug("Setting RMI state to normal");
+        setRmiIndicator(Indicator.State.NORMAL);
+        priorHeartbeatTime = heartbeatTime;
+        if (heartbeatListener == null) {
+            startHeartbeatListener();
+        }
+        isInitialized = true;
+        log.debug("initializeHeartbeatManagerInternal: done");
+    }
+
+    /**
+     * Updates the state of the Processes idiot light.
+     */
+    protected void setRmiIndicator(Indicator.State state) {
+        heartbeatManagerAssistant.setRmiIndicator(state);
+    }
+
+    protected void setSupervisorIndicator(Indicator.State state) {
+        heartbeatManagerAssistant.setSupervisorIndicator(state);
+    }
+
+    protected void setDatabaseIndicator(Indicator.State state) {
+        heartbeatManagerAssistant.setDatabaseIndicator(state);
+    }
+
+    /**
+     * Start at-intervals checking for heartbeats, with a check interval that is 2 * the interval at
+     * which the supervisor emits heartbeats.
+     */
+    protected void startHeartbeatListener() {
+        log.info("Starting heartbeat listener thread");
+        heartbeatListener = new ScheduledThreadPoolExecutor(1);
+        if (heartbeatIntervalMillis == 0) {
+            log.info("Heartbeat listener thread not started");
+            return;
+        }
+        heartbeatListener.scheduleAtFixedRate(() -> {
+            try {
+                checkForHeartbeat();
+            } catch (Exception e) {
+                log.error("Exception occurred attempting to start heartbeat listener", e);
+                // NB: I'm pretty certain this block could never be executed because if there's
+                // a NoHeartbeatException thrown in checkForHeartbeat(), this thread will
+                // immediately be shut down.
+            }
+        }, 2 * heartbeatIntervalMillis, 2 * heartbeatIntervalMillis, TimeUnit.MILLISECONDS);
+        ZiggyShutdownHook.addShutdownHook(() -> {
+            heartbeatListener.shutdownNow();
+        });
+        log.info("Heartbeat listener thread started");
+    }
+
+    /**
+     * Check for a heartbeat more recent than the last one recorded. If none has happened, attempt
+     * to delete and recreate the {@link ZiggyRmiClient} and restart checking for heartbeats. If
+     * those attempts fail, stop all automated checking and set the Processes summary to "Red."
+     *
+     * @throws NoHeartbeatException
+     */
+    protected void checkForHeartbeat() throws NoHeartbeatException {
+        if (heartbeatTime > priorHeartbeatTime) {
+            priorHeartbeatTime = heartbeatTime;
+        } else {
+            setRmiIndicator(Indicator.State.WARNING);
+            priorHeartbeatTime = 0L;
+            heartbeatTime = 0L;
+            restartClientCommunicator();
+            isInitialized = false;
+            if (reinitializeOnMissedHeartbeat) {
+                initializeHeartbeatManager();
+            }
+        }
+        if (clusterController.isDatabaseAvailable()) {
+            setDatabaseIndicator(Indicator.State.NORMAL);
+        } else {
+            setDatabaseIndicator(Indicator.State.ERROR);
+        }
+        if (clusterController.isSupervisorRunning()) {
+            setSupervisorIndicator(Indicator.State.NORMAL);
+        } else {
+            setSupervisorIndicator(Indicator.State.ERROR);
+        }
+    }
+
+    public static synchronized void stopHeartbeatListener() {
+        if (isInitialized() && instance.getHeartbeatListener() != null) {
+            instance.getHeartbeatListener().shutdownNow();
+        }
+        instance = null;
+    }
+
+    public static synchronized void resetHeartbeatTime() {
+        if (isInitialized()) {
+            instance.heartbeatTime = 0L;
+        }
+    }
+
+    protected void restartClientCommunicator() {
+        heartbeatManagerAssistant.restartClientCommunicator();
+    }
+
+    public ScheduledThreadPoolExecutor getHeartbeatListener() {
+        return heartbeatListener;
+    }
+
+    protected long getPriorHeartbeatTime() {
+        return priorHeartbeatTime;
+    }
+
+    public long getHeartbeatTime() {
+        return heartbeatTime;
+    }
+
+    // For testing use only.
+    protected void setClusterController(ClusterController clusterController) {
+        this.clusterController = clusterController;
+    }
+
+    // For testing use only.
+    void setReinitializeOnMissedHeartbeat(boolean reinitialize) {
+        reinitializeOnMissedHeartbeat = reinitialize;
+    }
+
+    // For testing use only.
+    void setHeartbeatTime(long heartbeatTime) {
+        this.heartbeatTime = heartbeatTime;
+    }
+
+    // For testing use only.
+    static void setInitializeInThread(boolean initInThread) {
+        initializeInThread = initInThread;
+    }
+
+    /**
+     * Defines methods that are used by the {@link ProcessHeartbeatManager} to control the console
+     * stoplights based on the state of heartbeat detection. These are only used by the console; for
+     * the worker, the implementation of this interface is all no-op methods.
+     *
+     * @author PT
+     */
+    public interface HeartbeatManagerAssistant {
+
+        void setRmiIndicator(Indicator.State state);
+
+        void setSupervisorIndicator(Indicator.State state);
+
+        void setDatabaseIndicator(Indicator.State state);
+
+        default void restartClientCommunicator() {
+            ZiggyRmiClient.restart();
+        }
+    }
+
+    public static class NoHeartbeatException extends RuntimeException {
+
+        private static final long serialVersionUID = 20210310L;
+
+        public NoHeartbeatException(String string) {
+            super(string);
+        }
+    }
+
+    public static class WorkerHeartbeatManagerAssistant implements HeartbeatManagerAssistant {
+        @Override
+        public void setRmiIndicator(Indicator.State state) {
+        }
+
+        @Override
+        public void setSupervisorIndicator(Indicator.State state) {
+        }
+
+        @Override
+        public void setDatabaseIndicator(Indicator.State state) {
+        }
+    }
+
+    public static class ConsoleHeartbeatManagerAssistant implements HeartbeatManagerAssistant {
+
+        static final String RMI_ERROR_MESSAGE = "Unable to establish communication with supervisor";
+        static final String RMI_WARNING_MESSAGE = "Attempting to establish communication with supervisor";
+        static final String SUPERVISOR_ERROR_MESSAGE = "Supervisor process has failed";
+        static final String DATABASE_ERROR_MESSAGE = "Database process has failed";
+
+        @Override
+        public void setRmiIndicator(Indicator.State state) {
+            setIndicator(ProcessesStatusPanel.messagingIndicator(), state, RMI_WARNING_MESSAGE,
+                RMI_ERROR_MESSAGE);
+        }
+
+        @Override
+        public void setSupervisorIndicator(Indicator.State state) {
+            setIndicator(ProcessesStatusPanel.supervisorIndicator(), state, null,
+                SUPERVISOR_ERROR_MESSAGE);
+        }
+
+        @Override
+        public void setDatabaseIndicator(Indicator.State state) {
+            setIndicator(ProcessesStatusPanel.databaseIndicator(), state, null,
+                DATABASE_ERROR_MESSAGE);
+        }
+
+        public void updateProcessesIndicator() {
+            StatusPanel.ContentItem.PROCESSES.menuItem()
+                .setState(
+                    Indicator.summaryState(ProcessesStatusPanel.messagingIndicator(),
+                        ProcessesStatusPanel.supervisorIndicator(),
+                        ProcessesStatusPanel.databaseIndicator()),
+                    Indicator.summaryToolTipText(ProcessesStatusPanel.messagingIndicator(),
+                        ProcessesStatusPanel.supervisorIndicator(),
+                        ProcessesStatusPanel.databaseIndicator()));
+        }
+
+        private void setIndicator(Indicator indicator, Indicator.State state, String warningTooltip,
+            String errorTooltip) {
+            if (indicator == null) {
+                return;
+            }
+            String tooltip = null;
+            if (state == Indicator.State.WARNING) {
+                tooltip = warningTooltip;
+            }
+            if (state == Indicator.State.ERROR) {
+                tooltip = errorTooltip;
+            }
+            indicator.setState(state, tooltip);
+            updateProcessesIndicator();
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/UiCommunicator.java b/src/main/java/gov/nasa/ziggy/services/messaging/UiCommunicator.java
deleted file mode 100644
index 8242eb5..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messaging/UiCommunicator.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import java.rmi.NoSuchObjectException;
-import java.rmi.NotBoundException;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.rmi.server.UnicastRemoteObject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.services.messages.PipelineMessage;
-import gov.nasa.ziggy.ui.ZiggyConsole;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.ProcessHeartbeatManager;
-import gov.nasa.ziggy.ui.common.ProcessHeartbeatManager.NoHeartbeatException;
-
-/**
- * UI end of two-way communication between the worker and all clients. The clients make use of the
- * existing registry created by the worker. The registry in turn provides a method that allows
- * messages to be sent to the worker and arranges for the worker to have broadcast access to the
- * clients.
- * <p>
- * A {@link UiCommunicator} singleton is created when an instance of {@link ZiggyGuiConsole} or
- * {@link ZiggyConsole} is created via the {@link initializeInstance} method. The singleton will be
- * destroyed and re-created via {@link restart} if contact is lost with the worker. When the
- * creating instance exits, the {@link UiCommunicator} singleton will be destroyed via the
- * {@link reset} method.
- *
- * @author PT
- */
-public class UiCommunicator {
-
-    private static final String RMI_REGISTRY_HOST = "localhost";
-
-    /**
-     * Singleton instance of {@link UiCommunicator} class. All threads in the UI process can access
-     * this instance via the static methods.
-     */
-    private static UiCommunicator instance;
-
-    private static Logger log = LoggerFactory.getLogger(UiCommunicator.class);
-    private static ProcessHeartbeatManager heartbeatManager;
-
-    /**
-     * Allows messages to get sent to the server. Technically, this actually allows the
-     * UiCommunicator instance to request that the WorkerCommunicator's {@link MessageHandler}
-     * instance act on a {@link PipelineMessage} instance constructed by the client, but you get the
-     * idea.
-     */
-    private MessageHandlerService messageHandlerService;
-
-    /**
-     * Allows the UiCommunicator instance to add a stub of its {@link MessageHandler} instance to
-     * the collection of same in the {@link WorkerCommunicator} instance.
-     */
-    private WorkerCommunicatorService workerService;
-
-    /**
-     * When stubbed and sent to the {@link WorkerCommunicator} instance, this will allow that
-     * instance to request the UiCommunicator instance handle a message constructed by server (or if
-     * you prefer, allows the server to send a message to this client).
-     */
-    private MessageHandler messageHandler;
-
-    private Registry registry;
-    private int rmiPort;
-
-    private UiCommunicator(MessageHandler messageHandler, int rmiPort)
-        throws RemoteException, NotBoundException {
-        this.rmiPort = rmiPort;
-        this.messageHandler = messageHandler;
-    }
-
-    /**
-     * Constructs and installs the singleton instance of the class. The worker's message handler is
-     * obtained and stored for use in sending messages. The worker's communicator itself is obtained
-     * as a stub to allow the client's message handler stub to be added to the worker's collection
-     * of same.
-     * <p>
-     * If the singleton instance already exists, it will be kept and no new instance will be
-     * constructed.
-     */
-    public static synchronized void initializeInstance(MessageHandler messageHandler, int rmiPort) {
-
-        if (instance != null) {
-            log.info("UI communicator instance already available, skipping instantiation");
-            return;
-        }
-
-        try {
-            log.info("Starting new UiCommunicator instance");
-            instance = new UiCommunicator(messageHandler, rmiPort);
-            log.info("Retrieving registry on " + RMI_REGISTRY_HOST);
-            instance.registry = LocateRegistry.getRegistry(RMI_REGISTRY_HOST, rmiPort);
-
-            // get the stubs that the server provided for the message handler and the
-            // worker communicator
-            log.info("Looking up services in registry");
-            instance.messageHandlerService = (MessageHandlerService) instance.registry
-                .lookup(MessageHandlerService.SERVICE_NAME);
-            instance.workerService = (WorkerCommunicatorService) instance.registry
-                .lookup(WorkerCommunicatorService.SERVICE_NAME);
-
-            // Construct a stub of this instance's message handler and add that to the server's
-            // list of same. Note that we first need to unexport it if it was previously
-            // exported.
-            try {
-                UnicastRemoteObject.unexportObject(messageHandler, true);
-            } catch (NoSuchObjectException e) {
-            }
-            MessageHandlerService exportedMessageHandler = (MessageHandlerService) UnicastRemoteObject
-                .exportObject(messageHandler, 0);
-            log.info("Adding UI message handler service to worker communicator instance");
-            instance.workerService.addClientMessageHandlerStub(exportedMessageHandler);
-
-            // Start the heartbeat manager.
-            if (heartbeatManager == null) {
-                heartbeatManager = new ProcessHeartbeatManager(messageHandler);
-            }
-            heartbeatManager.initialize();
-            log.info("UiCommunicator construction complete");
-        } catch (RemoteException | NotBoundException | NoHeartbeatException e) {
-            throw new PipelineException(
-                "Exception occurred when attempting to initialize UiCommunicator", e);
-        }
-    }
-
-    /**
-     * Sends a message to the worker. To be pedantic about it, the message isn't "sent," exactly,
-     * but instead what happens is that the worker's {@link MessageHandler} instance is made to run
-     * its handleMessage method in the worker's process space, and its exact actions are based on
-     * the content of the {@link PipelineMessage} provided by this method to the handleMessage
-     * method in the worker.
-     */
-    public static synchronized Object send(PipelineMessage message) {
-        try {
-            log.debug("Sending " + message.getClass().getName() + " message to worker");
-            return instance.messageHandlerService.handleMessage(message);
-        } catch (RemoteException e) {
-            throw new PipelineException(
-                "RemoteException occurred attempting to send " + message.getClass().getName(), e);
-        }
-    }
-
-    public static synchronized MessageHandlerService getServerMessageHandlerStub() {
-        return instance.messageHandlerService;
-    }
-
-    public static synchronized WorkerCommunicatorService getWorkerService() {
-        return instance.workerService;
-    }
-
-    public static synchronized MessageHandler getMessageHandler() {
-        return instance.messageHandler;
-    }
-
-    public static synchronized Registry getRegistry() {
-        return instance.registry;
-    }
-
-    public static synchronized int getRmiPort() {
-        return instance.rmiPort;
-    }
-
-    static synchronized void stopHeartbeatListener() {
-        if (heartbeatManager != null && heartbeatManager.getHeartbeatListener() != null) {
-            heartbeatManager.getHeartbeatListener().shutdownNow();
-        }
-        heartbeatManager = null;
-    }
-
-    /**
-     * Destroys the existing instance and creates a new one. This has to be performed when the UI
-     * loses contact with the worker, as it indicates that the worker may have crashed and
-     * restarted, in which case it needs to be repopulated with {@link MessageHandlerService} stubs
-     * from all UIs.
-     */
-    public static synchronized void restart() {
-        log.info("Attempting restart of UiCommunicator instance");
-        MessageHandler messageHandler = UiCommunicator.getMessageHandler();
-        messageHandler.resetLastHeartbeatTime();
-        int rmiPort = UiCommunicator.getRmiPort();
-        instance = null;
-        initializeInstance(messageHandler, rmiPort);
-
-    }
-
-    public static synchronized void reset() {
-        stopHeartbeatListener();
-        instance = null;
-    }
-
-    static synchronized void setHeartbeatManager(ProcessHeartbeatManager heartbeatManager) {
-        UiCommunicator.heartbeatManager = heartbeatManager;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/WorkerCommunicator.java b/src/main/java/gov/nasa/ziggy/services/messaging/WorkerCommunicator.java
deleted file mode 100644
index 85ee030..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messaging/WorkerCommunicator.java
+++ /dev/null
@@ -1,280 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import java.rmi.NotBoundException;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.rmi.server.ExportException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.services.messages.PipelineMessage;
-import gov.nasa.ziggy.services.messages.WorkerHeartbeatMessage;
-import gov.nasa.ziggy.services.messages.WorkerShutdownMessage;
-import gov.nasa.ziggy.util.ZiggyShutdownHook;
-import gov.nasa.ziggy.worker.WorkerPipelineProcess;
-
-/**
- * Worker end of two-way communication between the worker process and clients. The worker end plays
- * the role of the server in that it establishes the RMI registry used for the communication. It
- * also provides a method that broadcasts messages to all clients, each of which supplies a
- * {@link MessageHandlerService} stub when it initializes its own {@link UiCommunicator} instance.
- * <p>
- * The singleton {@link WorkerCommunicator} is created when the {@link WorkerPipelineProcess} is
- * created. At the same time a new {@link Thread} is created that periodically broadcasts instances
- * of the {@link WorkerHeartbeatMessage} to all clients. Both that thread and the
- * {@link WorkerCommunicator} instance are destroyed when the {@link WorkerPipelineProcess} exits.
- * The shutdown will also attempt to shut down the RMI registry (see below).
- * <p>
- * In the event that the {@link WorkerPipelineProcess} crashes, a new instance of the latter will be
- * created, along with new instances of the {@link WorkerCommunicator} and the heartbeat thread. In
- * this case, since the RMI registry is (probably) still running, the new instance of
- * {@link WorkerCommunicator} will attempt to connect to the registry and update the contents of
- * same. In this event, shutting down the {@link WorkerCommunicator} will not shut down the RMI
- * registry; it is impossible to shut down a registry if the process that created it has been lost.
- * Fortunately, shutting down the worker will eventually cause the registry to shut down as well.
- *
- * @author PT
- */
-public class WorkerCommunicator implements WorkerCommunicatorService {
-
-    private static Logger log = LoggerFactory.getLogger(WorkerCommunicator.class);
-
-    /**
-     * Singleton instance of {@link WorkerCommunicator} so all threads in the worker process can
-     * make use of the initialized communicator.
-     */
-    private static WorkerCommunicator instance;
-
-    private static ScheduledThreadPoolExecutor heartbeatExecutor;
-
-    private Set<MessageHandlerService> clientMessageServiceStubs = new HashSet<>();
-    private MessageHandlerService messageHandler;
-    private Registry registry;
-    private boolean registryCreated = false;
-
-    private WorkerCommunicator(MessageHandlerService messageHandler) throws RemoteException {
-        this.messageHandler = messageHandler;
-    }
-
-    /**
-     * Constructs an instance of the class and assigns it as the singleton instance. This includes
-     * construction of the RMI registry.
-     * <P>
-     * The {@link WorkerCommunicator} needs to provide two stubs in the registry, corresponding to
-     * the two kinds of actions that clients need to be able to invoke:
-     * <ol>
-     * <li>Worker handling of client messages, which requires an instance of {@link MessageHandler}
-     * with appropriate members for server-side execution.
-     * <li>Addition of client-side {@link MessageHandler} stubs so that the worker can invoke
-     * actions in all clients simultaneously; this requires that the singleton instance of
-     * {@link WorkerCommunicator} be available to the clients as a stub.
-     * </ol>
-     */
-    public static synchronized void initializeInstance(MessageHandlerService messageHandler,
-        int rmiPort) {
-
-        if (instance != null) {
-            log.info("Worker communicator instance already available, skipping instantiation");
-            return;
-        }
-
-        try {
-            log.info("Starting new WorkerCommunicator instance");
-            instance = new WorkerCommunicator(messageHandler);
-
-            // Try to create the registry. If that fails due to ExportException, then this
-            // is a new WorkerCommunicator started on a system where the worker crashed and
-            // left the registry running; in that case, we need the registry so that we can
-            // clean up services installed by the prior instance and then rebind new ones
-            // to the registry.
-            try {
-                log.info("Creating RMI registry");
-                instance.registry = LocateRegistry.createRegistry(rmiPort);
-                instance.registryCreated = true;
-            } catch (ExportException e) {
-                log.info("Retrieving registry on localhost");
-                instance.registry = LocateRegistry.getRegistry("localhost", rmiPort);
-                instance.cleanUpRegistry();
-            }
-            log.info("Exporting and binding objects into registry");
-            MessageHandlerService msgStub = (MessageHandlerService) UnicastRemoteObject
-                .exportObject(messageHandler, 0);
-            instance.registry.rebind(MessageHandlerService.SERVICE_NAME, msgStub);
-            WorkerCommunicatorService commStub = (WorkerCommunicatorService) UnicastRemoteObject
-                .exportObject(instance, 0);
-            instance.registry.rebind(WorkerCommunicatorService.SERVICE_NAME, commStub);
-
-            // Start the heartbeat messages
-            log.info("Starting worker-UI heartbeat generator");
-            heartbeatExecutor = new ScheduledThreadPoolExecutor(1);
-            long heartbeatIntervalMillis = WorkerHeartbeatMessage.heartbeatIntervalMillis();
-            if (heartbeatIntervalMillis > 0) {
-                heartbeatExecutor.scheduleAtFixedRate(
-                    () -> WorkerCommunicator.broadcast(new WorkerHeartbeatMessage()), 0,
-                    WorkerHeartbeatMessage.heartbeatIntervalMillis(), TimeUnit.MILLISECONDS);
-            }
-            ZiggyShutdownHook.addShutdownHook(() -> {
-                if (heartbeatExecutor != null) {
-                    log.info("SHUTDOWN: Stopping worker communicator");
-                    WorkerCommunicator.shutdown(true);
-                    log.info("SHUTDOWN: worker communicator shutdown complete");
-                }
-            });
-            log.info("WorkerCommunicator construction complete");
-        } catch (
-
-        RemoteException e) {
-            throw new PipelineException(
-                "Exception occurred when attempting to initialize WorkerCommunicator", e);
-        }
-    }
-
-    private synchronized void cleanUpRegistry() {
-        cleanUpRegistry(true);
-    }
-
-    /**
-     * Remove obsolete bound and/or exported instances of the worker communicator and message
-     * handler services. This is only necessary when a new WorkerCommunicator is being constructed
-     * to replace one that crashed, or during shutdown.
-     */
-    private synchronized void cleanUpRegistry(boolean force) {
-        try {
-            log.info("Cleaning up bound / exported registry instances");
-            registry.unbind(MessageHandlerService.SERVICE_NAME);
-            registry.unbind(WorkerCommunicatorService.SERVICE_NAME);
-            UnicastRemoteObject.unexportObject(messageHandler, force);
-        } catch (RemoteException | NotBoundException e) {
-            throw new PipelineException("Unable to unbind services from RMI registry", e);
-        }
-    }
-
-    /**
-     * Adds a new {@link MessageHandlerService} stub from a client to the set of same. When a client
-     * initializes its {@link UiCommunicator} instance, that instance uses an RMI call that causes
-     * the {@link WorkerCommunicator} to add its stub to the set. It also sends an immediate
-     * heartbeat message to the UI so that the UI can confirm that communication has been started
-     * correctly.
-     */
-    @Override
-    public synchronized void addClientMessageHandlerStub(MessageHandlerService clientMessageStub) {
-        log.info("Adding client message handler");
-        clientMessageServiceStubs.add(clientMessageStub);
-        try {
-            clientMessageStub.handleMessage(new WorkerHeartbeatMessage());
-        } catch (RemoteException e) {
-            throw new PipelineException("Unable to send heartbeat message to new UI", e);
-        }
-    }
-
-    static synchronized void stopHeartbeatExecutor() {
-        if (heartbeatExecutor != null) {
-            heartbeatExecutor.shutdownNow();
-            heartbeatExecutor = null;
-        }
-    }
-
-    /**
-     * Triggers the handleMessage method of all client message handler stubs with a given message.
-     * This causes all client instances to execute the appropriate handler action for that message.
-     * <p>
-     * In the event that there are {@link MessageHandlerService} stubs that belong to defunct UI
-     * instances, the attempt to cause remote execution of their handleMessage() methods will
-     * trigger a {@link RemoteException}. This will cause the offending stub to be removed from the
-     * set of all client UI stubs.
-     */
-    public static synchronized void broadcast(PipelineMessage message) {
-
-        log.debug("Broadcasting " + message.getClass().getName() + " message to "
-            + getClientMessageServiceStubs().size() + "UI clients");
-        Set<MessageHandlerService> obsoleteStubs = new HashSet<>();
-        for (MessageHandlerService msgService : instance.clientMessageServiceStubs) {
-            try {
-                msgService.handleMessage(message);
-            } catch (RemoteException e) {
-                obsoleteStubs.add(msgService);
-            }
-        }
-        if (!obsoleteStubs.isEmpty()) {
-            log.info(
-                "Removing " + obsoleteStubs.size() + " client message handlers from cache, keeping "
-                    + (instance.clientMessageServiceStubs.size() - obsoleteStubs.size()));
-        }
-        instance.clientMessageServiceStubs.removeAll(obsoleteStubs);
-    }
-
-    public static synchronized Set<MessageHandlerService> getClientMessageServiceStubs() {
-        return instance.clientMessageServiceStubs;
-    }
-
-    public static synchronized MessageHandlerService getMessageHandler() {
-        return instance.messageHandler;
-    }
-
-    public static synchronized Registry getRegistry() {
-        return instance.registry;
-    }
-
-    /**
-     * Nullifies the singleton instance of the communicator.
-     */
-    public static synchronized void reset() {
-        instance = null;
-        heartbeatExecutor = null;
-    }
-
-    public static synchronized boolean isInitialized() {
-        return instance != null;
-    }
-
-    public static synchronized void shutdown() {
-        shutdown(true);
-    }
-
-    /**
-     * Performs the most orderly shutdown possible of the worker communicator and the registry.
-     * <p>
-     * In all circumstances, the singleton instance of the communicator will be nullified, the
-     * services will be unbound from the registry, the heartbeat executor will stop, and exported
-     * objects will be unexported. In addition, if this is the instance of WorkerCommunicator that
-     * created the registry, the registry will be unexported. Unfortunately, if the registry was
-     * created by a now-crashed instance of the communicator, it will be necessary for the JVM to
-     * shut it down when it destroys all daemon threads.
-     */
-    public static synchronized void shutdown(boolean force) {
-        log.info("SHUTDOWN: Sending shutdown notification to clients");
-        WorkerCommunicator.broadcast(new WorkerShutdownMessage());
-        log.info("SHUTDOWN: Shutting down heartbeat thread");
-        stopHeartbeatExecutor();
-        try {
-            if (instance != null) {
-                log.info("SHUTDOWN: Unbinding / unexporting services");
-                instance.cleanUpRegistry(force);
-
-                // Unexport the WorkerCommunicator so that the registry will be empty
-                UnicastRemoteObject.unexportObject(instance, force);
-
-                // Attempt to unexport the registry if and only if this is the instance of
-                // WorkerCommunicator that created it
-                if (instance.registryCreated) {
-                    log.info("SHUTDOWN: Unexporting registry");
-                    UnicastRemoteObject.unexportObject(instance.registry, force);
-                }
-            }
-        } catch (RemoteException e) {
-            // Since this method is called in the process of an orderly shutdown, there's not
-            // actually anything we can do if exceptions are thrown.
-        }
-        reset();
-        log.info("SHUTDOWN: WorkerCommunicator shutdown complete");
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/WorkerCommunicatorService.java b/src/main/java/gov/nasa/ziggy/services/messaging/WorkerCommunicatorService.java
deleted file mode 100644
index f120264..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messaging/WorkerCommunicatorService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * Service formulation of the WorkerCommunicator class. This is necessary because the clients need
- * to be able to add a stub MessageHandlerService to the server, such that the server can use RMI to
- * invoke actions at the client side.
- *
- * @author PT
- */
-public interface WorkerCommunicatorService extends Remote {
-
-    String SERVICE_NAME = "workerCommunicatorService";
-
-    void addClientMessageHandlerStub(MessageHandlerService clientMessageStub)
-        throws RemoteException;
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/WorkerMessageHandler.java b/src/main/java/gov/nasa/ziggy/services/messaging/WorkerMessageHandler.java
deleted file mode 100644
index 7b03368..0000000
--- a/src/main/java/gov/nasa/ziggy/services/messaging/WorkerMessageHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import java.io.IOException;
-import java.util.Set;
-
-import gov.nasa.ziggy.services.events.ZiggyEventHandler.ZiggyEventHandlerInfoForDisplay;
-import gov.nasa.ziggy.services.logging.TaskLogInformation;
-import gov.nasa.ziggy.services.messages.DeleteTasksRequest;
-import gov.nasa.ziggy.services.messages.RunningPipelinesCheckRequest;
-import gov.nasa.ziggy.services.messages.StartMemdroneRequest;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
-import gov.nasa.ziggy.services.messages.WorkerResourceRequest;
-import gov.nasa.ziggy.services.messages.WorkerSingleTaskLogRequest;
-import gov.nasa.ziggy.services.messages.WorkerTaskLogInformationRequest;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-
-/**
- * Provides worker-side abstraction for processing message requests from a client.
- *
- * @author PT
- * @author Bill Wohler
- */
-public interface WorkerMessageHandler {
-
-    void handleTriggerRequest(WorkerFireTriggerRequest fireTriggerRequest);
-
-    void handleRunningPipelinesCheckRequest(RunningPipelinesCheckRequest checkRequest);
-
-    void handleWorkerTaskRequest(WorkerTaskRequest request);
-
-    void handleStartMemdroneRequest(StartMemdroneRequest request);
-
-    Set<TaskLogInformation> handleTaskLogInformationRequest(
-        WorkerTaskLogInformationRequest request);
-
-    String handleSingleTaskLogRequest(WorkerSingleTaskLogRequest request);
-
-    WorkerResourceRequest.WorkerResources handleResourceRequest();
-
-    Set<ZiggyEventHandlerInfoForDisplay> handleEventHandlerRequest();
-
-    void handleEventHandlerToggleRequest(String eventHandlerName);
-
-    boolean deleteTasks(DeleteTasksRequest request) throws IOException;
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyMessenger.java b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyMessenger.java
new file mode 100644
index 0000000..8b6b1ff
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyMessenger.java
@@ -0,0 +1,257 @@
+package gov.nasa.ziggy.services.messaging;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+
+/**
+ * Performs the actions needed within a process that relate to messages and messaging.
+ * <p>
+ * The {@link ZiggyMessenger} holds the main responsibility for all messages that are sent or
+ * received by a process. This is accomplished through two primary methods:
+ * <ol>
+ * <li>The {@link ZiggyMessenger#subscribe(Class, MessageAction)} allows a user to specify an action
+ * that must be taken when a message of a specified class is received.
+ * <li>The {@link ZiggyMessenger#publish(PipelineMessage) causes a {@link PipelineMessage} to be
+ * dispatched. If the process hosting the {@link ZiggyMessenger} has an initialized instance of
+ * {@link ZiggyRmiClient}, the message is sent to all Ziggy RMI clients via the
+ * {@link ZiggyRmiClient#send(PipelineMessage)} method; otherwise, the subscriptions in the current
+ * process are used to determine if any action needs to be taken locally. Note that messages that
+ * are sent via RMI are then received by all clients, so
+ * {@link ZiggyMessenger#publish(PipelineMessage)} always works for messages from one activity in a
+ * process to another activity in the same process.
+ * </ol>
+ * <p>
+ * The {@link ZiggyMessenger} is created as a singleton instance in each process. Static methods are
+ * provided to allow users to send publish or subscribe requests to the singleton.
+ *
+ * @author PT
+ */
+public class ZiggyMessenger {
+
+    private static final Logger log = LoggerFactory.getLogger(ZiggyMessenger.class);
+
+    /**
+     * The singleton instance for a process.
+     */
+    private static ZiggyMessenger instance;
+
+    /**
+     * Blocking queue for outgoing messages. Messages wait here until the singleton instance is free
+     * to deal with them, at which time they get sent from the RMI client to the RMI server.
+     */
+    private static LinkedBlockingQueue<PipelineMessage> outgoingMessageQueue = new LinkedBlockingQueue<>();
+
+    /**
+     * For testing only.
+     */
+    static List<PipelineMessage> messagesFromOutgoingQueue = new ArrayList<>();
+
+    /**
+     * Dedicated thread for pulling messages off the blocking queue and giving them to the
+     * {@link ZiggyMessenger#publishMessage(PipelineMessage)} instance method.
+     * <p>
+     * The issue is that if a message requires an action that dispatches another message, there's
+     * potential for a deadlock of the {@link ZiggyMessenger} singleton instance: the
+     * {@link #takeAction(PipelineMessage) can't return until after the
+     * {@link #publishMessage(PipelineMessage)} call returns, but that call may be blocked from
+     * executing because the instance is waiting for the {@link #takeAction(PipelineMessage)} to
+     * return before it can do anything else. By making the static {@link #publish(PipelineMessage)}
+     * message put the message onto the blocking queue, that call returns immediately, which means
+     * that the instance call to {@link #takeAction(PipelineMessage)} can also return.
+     */
+    private Thread outgoingMessageThread;
+
+    /**
+     * Stores the mapping between a message class and the actions that must be taken when such a
+     * message arrives.
+     */
+    private Map<Class<? extends PipelineMessage>, List<MessageAction<?>>> subscriptions = new ConcurrentHashMap<>();
+
+    /**
+     * In some cases it may be necessary to get confirmation that a message has actually gone out
+     * before some other action is taken. For that reason we have a {@link Map} between messages and
+     * instances of {@link CountDownLatch}.
+     */
+    private Map<PipelineMessage, CountDownLatch> messageCountdownLatches = new HashMap<>();
+
+    /**
+     * Determines whether messages are stored when they are sent out from the message queue. For
+     * testing only.
+     */
+    private boolean storeMessages;
+
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
+    private ZiggyMessenger() {
+        outgoingMessageThread = new Thread(() -> {
+            while (!Thread.currentThread().isInterrupted()) {
+                try {
+                    PipelineMessage message = outgoingMessageQueue.take();
+                    if (storeMessages) {
+                        messagesFromOutgoingQueue.add(message);
+                    }
+                    publishMessage(message);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+        });
+        outgoingMessageThread.setDaemon(true);
+        outgoingMessageThread.start();
+    }
+
+    private void publishMessage(PipelineMessage message) {
+        CountDownLatch latch = messageCountdownLatches.get(message);
+        messageCountdownLatches.remove(message);
+        if (ZiggyRmiClient.isInitialized()) {
+            log.debug("Sending message of " + message.getClass().toString());
+            ZiggyRmiClient.send(message, latch);
+        } else {
+            takeAction(message);
+            if (latch != null) {
+                latch.countDown();
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T extends PipelineMessage> void takeAction(T message) {
+        List<MessageAction<?>> actions = subscriptions.get(message.getClass());
+        if (CollectionUtils.isEmpty(actions)) {
+            return;
+        }
+        for (MessageAction<?> action : actions) {
+            log.debug("Applying action for message " + message.getClass().toString());
+            ((MessageAction<T>) action).action(message);
+        }
+    }
+
+    // Package scope for testing.
+    static void initializeInstance() {
+        if (!isInitialized()) {
+            log.info("Initializing ZiggyMessenger singleton");
+            instance = new ZiggyMessenger();
+        }
+    }
+
+    private static boolean isInitialized() {
+        return instance != null;
+    }
+
+    /**
+     * Subscribes to a subclass of {@link PipelineMessage}.
+     */
+    public static <T extends PipelineMessage> void subscribe(Class<T> messageClass,
+        MessageAction<T> action) {
+        if (!isInitialized()) {
+            initializeInstance();
+        }
+        instance.addSubscription(messageClass, action);
+    }
+
+    private <T extends PipelineMessage> void addSubscription(Class<T> messageClass,
+        MessageAction<T> action) {
+        if (subscriptions.get(messageClass) == null) {
+            subscriptions.put(messageClass, new ArrayList<>());
+        }
+        subscriptions.get(messageClass).add(action);
+    }
+
+    /**
+     * Unsubscribes to a subclass of {@link PipelineMessage}.
+     */
+    public static <T extends PipelineMessage> void unsubscribe(Class<T> messageClass,
+        MessageAction<T> action) {
+        if (!isInitialized()) {
+            return;
+        }
+        instance.removeSubscription(messageClass, action);
+    }
+
+    private <T extends PipelineMessage> void removeSubscription(Class<T> messageClass,
+        MessageAction<T> action) {
+        if (subscriptions.get(messageClass) == null) {
+            return;
+        }
+        subscriptions.get(messageClass).remove(action);
+    }
+
+    /**
+     * Publishes a message via the {@link ZiggyMessenger} singleton.
+     *
+     * @throws InterruptedException
+     */
+    public static void publish(PipelineMessage message) {
+        publish(message, null);
+    }
+
+    /**
+     * Publishes a message via the {@link ZiggyMessenger} singleton, and holds onto a
+     * {@link CountDownLatch} for the message.
+     */
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
+    public static void publish(PipelineMessage message, CountDownLatch latch) {
+        if (!isInitialized()) {
+            initializeInstance();
+        }
+        try {
+            if (latch != null) {
+                instance.messageCountdownLatches.put(message, latch);
+            }
+            outgoingMessageQueue.put(message);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    /**
+     * Acts on a message via the {@link ZiggyMessenger} singleton. If the singleton has not been
+     * initialized, a {@link PipelineException} will be thrown. Package scoped because only
+     * {@link ZiggyRmiClient} should use this method.
+     *
+     * @param message
+     */
+    static void actOnMessage(PipelineMessage message) {
+        if (!isInitialized()) {
+            throw new PipelineException("Unable to act on message of "
+                + message.getClass().toString() + " due to absence of ZiggyMessenger instance");
+        }
+        log.debug("Taking action on message of " + message.getClass().toString());
+        instance.takeAction(message);
+    }
+
+    /** For testing only. */
+    static void reset() {
+        instance.outgoingMessageThread.interrupt();
+        instance = null;
+        messagesFromOutgoingQueue.clear();
+    }
+
+    /** For testing only. */
+    static Map<Class<? extends PipelineMessage>, List<MessageAction<?>>> getSubscriptions() {
+        return instance.subscriptions;
+    }
+
+    /** For testing only. */
+    static LinkedBlockingQueue<PipelineMessage> getOutgoingMessageQueue() {
+        return ZiggyMessenger.outgoingMessageQueue;
+    }
+
+    /** For testing only. */
+    static void setStoreMessages(boolean storeMessages) {
+        instance.storeMessages = storeMessages;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiClient.java b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiClient.java
new file mode 100644
index 0000000..446fb3e
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiClient.java
@@ -0,0 +1,234 @@
+package gov.nasa.ziggy.services.messaging;
+
+import java.rmi.NoSuchObjectException;
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import java.rmi.server.UnicastRemoteObject;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+import gov.nasa.ziggy.services.messaging.ProcessHeartbeatManager.NoHeartbeatException;
+import gov.nasa.ziggy.supervisor.PipelineSupervisor;
+import gov.nasa.ziggy.ui.ZiggyConsole;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.os.ProcessUtils;
+import gov.nasa.ziggy.worker.PipelineWorker;
+
+/**
+ * Client end of two-way communication between the server and all clients. The clients make use of
+ * the existing registry created by the server. The registry in turn provides a method that allows
+ * messages to be sent to the server and arranges for the server to have broadcast access to the
+ * clients.
+ * <p>
+ * A {@link ZiggyRmiClient} singleton is created is created via the {@link initializeInstance}
+ * method. The {@link PipelineSupervisor} has a client, as does every {@link PipelineWorker} and
+ * {@link ZiggyConsole}. The singleton will be destroyed and re-created via {@link restart} if
+ * contact is lost with the server. When the creating instance exits, the {@link ZiggyRmiClient}
+ * singleton will be destroyed via the {@link reset} method.
+ * <p>
+ * The {@link ZiggyRmiClient} is used by Ziggy console, supervisor, and worker processes. Each
+ * instance is created with an appropriate collection of {@link MessageAction} instances that can
+ * process all messages the client must process.
+ * <p>
+ * The {@link ZiggyRmiClient} instance is immutable, hence thread-safe.
+ *
+ * @author PT
+ */
+public class ZiggyRmiClient implements ZiggyRmiClientService {
+
+    private static final String RMI_REGISTRY_HOST = "localhost";
+
+    /**
+     * Singleton instance of {@link ZiggyRmiClient} class. All threads in the UI process can access
+     * this instance via the static methods.
+     */
+    private static ZiggyRmiClient instance;
+
+    private static Logger log = LoggerFactory.getLogger(ZiggyRmiClient.class);
+
+    // This Map is used for test purposes. It allows the unit tests to examine the messages
+    // detected by the singleton instance.
+    private static Map<Class<? extends PipelineMessage>, List<PipelineMessage>> messagesDetected = new HashMap<>();
+
+    // This is used in test to disable forwarding of received messages to the ZiggyMessenger.
+    private boolean useMessenger = true;
+
+    private final ZiggyRmiServerService ziggyRmiServerService;
+    private final Registry registry;
+    private final int rmiPort;
+
+    // Stores the type of client (worker, supervisor, console).
+    private final String clientType;
+
+    private ZiggyRmiClient(int rmiPort, String clientType)
+        throws RemoteException, NotBoundException {
+        this.clientType = clientType;
+        this.rmiPort = rmiPort;
+        log.info("Retrieving registry on {}", RMI_REGISTRY_HOST);
+        registry = LocateRegistry.getRegistry(RMI_REGISTRY_HOST, rmiPort);
+
+        // get the stub that the server provided.
+        log.info("Looking up services in registry");
+        ziggyRmiServerService = (ZiggyRmiServerService) registry
+            .lookup(ZiggyRmiServerService.SERVICE_NAME);
+    }
+
+    /**
+     * Constructs and installs the singleton instance of the class. The server's stub is obtained
+     * and stored for use in sending messages. The same stub is used to add the stub from the client
+     * singleton instance to the server.
+     * <p>
+     * If the singleton instance already exists, it will be kept and no new instance will be
+     * constructed.
+     */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static synchronized void initializeInstance(int rmiPort, String clientType) {
+
+        if (isInitialized()) {
+            log.info("ZiggyRmiClient instance already available, skipping instantiation");
+            return;
+        }
+
+        try {
+            log.info("Starting new ZiggyRmiClient instance");
+            instance = new ZiggyRmiClient(rmiPort, clientType);
+
+            // Construct a stub of this instance and add that to the server's
+            // list of same. Note that we first need to unexport it if it was previously
+            // exported.
+            try {
+                UnicastRemoteObject.unexportObject(instance, true);
+            } catch (NoSuchObjectException ignored) {
+                // In this case, we don't want execution to halt, because nothing bad will
+                // happen if the object we want to "unexport" is already gone. Swallow this
+                // exception.
+            }
+            ZiggyRmiClientService exportedClient = (ZiggyRmiClientService) UnicastRemoteObject
+                .exportObject(instance, 0);
+            log.info("Adding client service stub to server instance");
+            instance.ziggyRmiServerService.addClientStub(exportedClient);
+            log.info("ZiggyRmiClient construction complete");
+        } catch (RemoteException | NotBoundException | NoHeartbeatException e) {
+            throw new PipelineException(
+                "Exception occurred when attempting to initialize UiCommunicator", e);
+        }
+    }
+
+    public static boolean isInitialized() {
+        return instance != null;
+    }
+
+    /**
+     * Sends a message to the server. To be pedantic about it, the message isn't "sent," exactly,
+     * but instead what happens is that the server is made to run its
+     * {@link ZiggyRmiServerService#transmitToServer(PipelineMessage)} method in the server's
+     * process space. Package private because only the {@link ZiggyMessenger} should call it, other
+     * users should go by way of {@link ZiggyMessenger}.
+     */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    static synchronized void send(PipelineMessage message, CountDownLatch latch) {
+        log.debug("Sending {}", message.getClass().getName());
+        try {
+            instance.ziggyRmiServerService.transmitToServer(message);
+        } catch (RemoteException e) {
+            throw new PipelineException(e);
+        } finally {
+            if (latch != null) {
+                latch.countDown();
+            }
+        }
+    }
+
+    /**
+     * Handles messages sent from the server to the client. This is one of the methods exported to
+     * RMI via the service interface.
+     */
+    @Override
+    public void takeMessageActionInClient(PipelineMessage message) throws RemoteException {
+        if (useMessenger) {
+            ZiggyMessenger.actOnMessage(message);
+        } else {
+            recordMessage(message);
+        }
+    }
+
+    /**
+     * Updates the count of the number of detected or acted-upon messages of a given class.
+     */
+    private void recordMessage(PipelineMessage message) {
+
+        Class<? extends PipelineMessage> messageClass = message.getClass();
+        if (!messagesDetected.containsKey(messageClass)) {
+            messagesDetected.put(messageClass, new ArrayList<>());
+        }
+        messagesDetected.get(messageClass).add(message);
+    }
+
+    @Override
+    public String clientName() throws RemoteException {
+        return ProcessUtils.getPid() + ":" + clientType;
+    }
+
+    public static Registry getRegistry() {
+        return instance.registry;
+    }
+
+    public static int getRmiPort() {
+        return instance.rmiPort;
+    }
+
+    public static String getClientType() {
+        return instance.clientType;
+    }
+
+    /**
+     * Destroys the existing instance and creates a new one. This has to be performed when the
+     * client loses contact with the server, as it indicates that the server may have crashed and
+     * restarted, in which case it needs to be repopulated with {@link ZiggyRmiClientService} stubs
+     * from all clients.
+     */
+    public static synchronized void restart() {
+        log.info("Attempting restart of ZiggyRmiClient instance");
+        ProcessHeartbeatManager.resetHeartbeatTime();
+        int rmiPort = ZiggyRmiClient.getRmiPort();
+        String clientType = ZiggyRmiClient.getClientType();
+        instance = null;
+        initializeInstance(rmiPort, clientType);
+    }
+
+    public static synchronized void reset() {
+        instance = null;
+    }
+
+    /** For testing only. */
+    static ZiggyRmiServerService ziggyRmiServerService() {
+        return instance.ziggyRmiServerService;
+    }
+
+    /** For testing only. */
+    static Map<Class<? extends PipelineMessage>, List<PipelineMessage>> messagesDetected() {
+        return messagesDetected;
+    }
+
+    /** For testing only. */
+    static void clearDetectedMessages() {
+        messagesDetected.clear();
+    }
+
+    /** For testing only. */
+    static void setUseMessenger(boolean useMessenger) {
+        instance.useMessenger = useMessenger;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiClientService.java b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiClientService.java
new file mode 100644
index 0000000..aade02b
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiClientService.java
@@ -0,0 +1,32 @@
+package gov.nasa.ziggy.services.messaging;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+
+/**
+ * Defines the RMI service provided by an instance of {@link ZiggyRmiClient}. The provided service
+ * is a stub from the client that is exported, via RMI, to the {@link ZiggyRmiServerService}. This
+ * stub allows the server to send a message to the client. All messages received by the server are
+ * then re-sent to all clients.
+ * <p>
+ * Note that RMI requires all exported capabilities to be represented by an interface that extends
+ * {@link Remote}, which is why we have this interface class at all.
+ *
+ * @author PT
+ */
+public interface ZiggyRmiClientService extends Remote {
+
+    String SERVICE_NAME = "ZiggyRmiClientService";
+
+    // Note: it may seem that the implementations of these methods
+    // don't have anything in them that throws RemoteException, hence
+    // that these throws declarations can be removed. THEY CANNOT! RMI requires
+    // that all exported methods throw RemoteException, no matter what
+    // the underlying code does. If these throws declarations are removed,
+    // Ziggy's RMI system will fail at runtime.
+    void takeMessageActionInClient(PipelineMessage message) throws RemoteException;
+
+    String clientName() throws RemoteException;
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiServer.java b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiServer.java
new file mode 100644
index 0000000..d566b8e
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiServer.java
@@ -0,0 +1,484 @@
+package gov.nasa.ziggy.services.messaging;
+
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import java.rmi.server.ExportException;
+import java.rmi.server.UnicastRemoteObject;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.services.messages.HeartbeatMessage;
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+import gov.nasa.ziggy.supervisor.PipelineSupervisor;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.SystemTime;
+import gov.nasa.ziggy.util.ZiggyShutdownHook;
+
+/**
+ * Server component of the hub-and-spoke communication between Ziggy processes. The server
+ * establishes the RMI registry used for the communication, if it does not yet exist. It also
+ * provides a method that broadcasts messages to all clients, each of which supplies a
+ * {@link ZiggyRmiClientService} stub when it initializes its own {@link ZiggyRmiClient} instance.
+ * <p>
+ * The singleton {@link ZiggyRmiServer} is created when the {@link PipelineSupervisor} is created.
+ * At the same time a new {@link Thread} is created that periodically broadcasts instances of the
+ * {@link HeartbeatMessage} to all clients. Both that thread and the {@link ZiggyRmiServer} instance
+ * are destroyed when the {@link PipelineSupervisor} exits. The shutdown will also attempt to shut
+ * down the RMI registry (see below).
+ * <p>
+ * In the event that the {@link PipelineSupervisor} crashes, a new instance of the latter will be
+ * created, along with new instances of the {@link ZiggyRmiServer} and the heartbeat thread. In this
+ * case, since the RMI registry is (probably) still running, the new instance of
+ * {@link ZiggyRmiServer} will attempt to connect to the registry and update the contents of same.
+ * In this event, shutting down the {@link ZiggyRmiServer} will not shut down the RMI registry; it
+ * is impossible to shut down a registry if the process that created it has been lost. Fortunately,
+ * shutting down the supervisor will eventually cause the registry to shut down as well.
+ * <p>
+ * All of the fields in {@link ZiggyRmiServer} are either final or collections that support
+ * concurrency, hence the {@link ZiggyRmiServer} instance is thread-safe.
+ *
+ * @author PT
+ */
+public class ZiggyRmiServer implements ZiggyRmiServerService {
+
+    private static Logger log = LoggerFactory.getLogger(ZiggyRmiServer.class);
+    public static final int RMI_PORT_DEFAULT = 1099;
+    public static final long MAX_WAIT_FOR_QUEUE_CLEARANCE_DURING_SHUTDOWN_MILLIS = 1000L;
+
+    /**
+     * Singleton instance of {@link ZiggyRmiServer} so all threads in the supervisor process can
+     * make use of the initialized communicator.
+     */
+    private static ZiggyRmiServer instance;
+
+    // This Map is used for test purposes. It allows the unit tests to determine how many
+    // messages showed up, and of which classes.
+    private static Map<Class<? extends PipelineMessage>, Integer> messagesReceived = new ConcurrentHashMap<>();
+
+    /**
+     * Collection of client stubs. Each stub is provided with a {@link Thread} that is used for
+     * outgoing messages.
+     */
+    private Set<RmiClientThread> clientThreads = Collections
+        .newSetFromMap(new ConcurrentHashMap<>());
+
+    private final Registry registry;
+    private final boolean registryCreated;
+    private final Thread broadcastThread;
+
+    /** Queue for messages that are received from clients and awaiting broadcast to all clients. */
+    private LinkedBlockingQueue<PipelineMessage> messageQueue = new LinkedBlockingQueue<>();
+
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    private ZiggyRmiServer(int rmiPort) throws RemoteException {
+
+        // Try to create the registry. If that fails due to ExportException, then this
+        // is a new SupervisorCommunicator started on a system where the supervisor crashed and
+        // left the registry running; in that case, we need the registry so that we can
+        // clean up services installed by the prior instance and then rebind new ones
+        // to the registry.
+        boolean constructorCreatedRegistry = false;
+        Registry createdOrRetrievedRegistry = null;
+        try {
+            log.info("Creating RMI registry");
+            createdOrRetrievedRegistry = LocateRegistry.createRegistry(rmiPort);
+            constructorCreatedRegistry = true;
+        } catch (ExportException ignored) {
+            // This just means that the registry already exists, but there's no
+            // way to know that other than trying to create it and failing.
+            log.info("Retrieving registry on localhost");
+            createdOrRetrievedRegistry = LocateRegistry.getRegistry("localhost", rmiPort);
+        }
+        registry = createdOrRetrievedRegistry;
+        registryCreated = constructorCreatedRegistry;
+        if (!registryCreated) {
+            cleanUpRegistry();
+        }
+
+        // Start the background thread that pulls messages off the queue and broadcasts them.
+        broadcastThread = new Thread(() -> {
+            broadcastNextMessage();
+        });
+        broadcastThread.setDaemon(true);
+        broadcastThread.start();
+    }
+
+    /**
+     * Constructs an instance of the class and assigns it as the singleton instance. This includes
+     * construction of the RMI registry.
+     * <P>
+     * The {@link ZiggyRmiServer} needs to provide two capabilities to client instances:
+     * <ol>
+     * <li>The clients must be able to submit themselves, as stubs, to the server, such that the
+     * server can send messages to the clients via the
+     * {@link ZiggyRmiClientService#takeMessageActionInClient(PipelineMessage)} method. This is
+     * accomplished by the {@link #addClientStub(ZiggyRmiClientService)} method.
+     * <li>The clients must be able to send messages to the server, which the server then transmits
+     * back to all clients. This is accomplished by the {@link #transmitToServer(PipelineMessage)}
+     * method.
+     * </ol>
+     * Both of the capabilities described above are achieved by exporting the server, as an instance
+     * of {@link ZiggyRmiServerService}, to the RMI registry.
+     */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static void initializeInstance(int rmiPort) {
+
+        if (instance != null) {
+            log.info("ZiggyRmiServer instance already available, skipping instantiation");
+            return;
+        }
+        try {
+            log.info("Starting new ZiggyRmiServer instance");
+            ZiggyRmiServer serverInstance = new ZiggyRmiServer(rmiPort);
+
+            log.info("Exporting and binding objects into registry");
+            ZiggyRmiServerService commStub = (ZiggyRmiServerService) UnicastRemoteObject
+                .exportObject(serverInstance, 0);
+            serverInstance.registry.rebind(ZiggyRmiServerService.SERVICE_NAME, commStub);
+
+            ZiggyShutdownHook.addShutdownHook(() -> {
+                log.info("SHUTDOWN: ZiggyRmiServer...");
+                ZiggyRmiServer.shutdown(true);
+                log.info("SHUTDOWN: ZiggyRmiServer...done");
+            });
+            instance = serverInstance;
+            log.info("ZiggyRmiServer construction complete");
+        } catch (RemoteException e) {
+            throw new PipelineException(
+                "Exception occurred when attempting to initialize ZiggyRmiServer", e);
+        }
+    }
+
+    /**
+     * Remove obsolete bound and/or exported instances of the supervisor communicator and message
+     * handler services. This is only necessary when a new SupervisorCommunicator is being
+     * constructed to replace one that crashed, or during shutdown.
+     */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void cleanUpRegistry() {
+        try {
+            log.info("Cleaning up bound / exported registry instances");
+            List<String> registryServiceNames = Arrays.asList(registry.list());
+            if (registryServiceNames.contains(ZiggyRmiServerService.SERVICE_NAME)) {
+                registry.unbind(ZiggyRmiServerService.SERVICE_NAME);
+            }
+        } catch (RemoteException | NotBoundException e) {
+            throw new PipelineException("Unable to unbind services from RMI registry", e);
+        }
+    }
+
+    /**
+     * Adds a new {@link ZiggyRmiClientService} stub from a client to the set of same. When a client
+     * initializes its {@link ZiggyRmiClient} instance, that instance uses an RMI call that causes
+     * the {@link ZiggyRmiServer} to add its stub to the set. It also sends an immediate heartbeat
+     * message to the client so that the client can confirm that communication has been started
+     * correctly.
+     */
+    @Override
+    public void addClientStub(ZiggyRmiClientService clientStub) throws RemoteException {
+        log.info("Adding RMI client with name: " + clientStub.clientName());
+//        clientServiceStubs.put(clientStub, clientStub.clientName());
+        RmiClientThread clientInformation = new RmiClientThread(clientStub,
+            clientStub.clientName());
+        clientInformation.start();
+        clientInformation.addMessage(new HeartbeatMessage());
+        clientThreads.add(clientInformation);
+    }
+
+    /**
+     * Accepts a message from one of the {@link ZiggyRmiClient} instances and adds it to the queue
+     * of messages for broadcast.
+     */
+    @Override
+    public void transmitToServer(PipelineMessage message) throws RemoteException {
+        if (!messagesReceived.containsKey(message.getClass())) {
+            messagesReceived.put(message.getClass(), 0);
+        }
+        int messageCount = messagesReceived.get(message.getClass());
+        messagesReceived.put(message.getClass(), ++messageCount);
+        addToBroadcastQueue(message);
+    }
+
+    /**
+     * Adds a single message to the broadcast queue.
+     */
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
+    public synchronized static void addToBroadcastQueue(PipelineMessage message) {
+        try {
+            instance.messageQueue.put(message);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    /**
+     * Takes the next message off the message queue and broadcasts it to all clients.
+     * <p>
+     * The message queue is a {@link LinkedBlockingQueue}, such that the act of taking the next
+     * message off the queue blocks if the queue is empty. In consequence, the
+     * {@link ZiggyRmiServer} requires a dedicated {@link Thread} to take the messages off the queue
+     * and broadcast them.
+     * <p>
+     * The broadcast element of the method is accomplished by looping over the stubs from the
+     * {@link ZiggyRmiClient} instances and attempting to use the {@link MessageAction} instances in
+     * each client to perform any action required by the message. If a client lacks an appropriate
+     * {@link MessageAction} for a given message class, the message is ignored.
+     * <p>
+     * The {@link #broadcastNextMessage()} method also prunes any obsolete message stubs from its
+     * collection of same. This is made possible by the fact that any client stub that connects to a
+     * client that has shut down results in a {@link RemoteException}. Any stub that causes a
+     * {@link RemoteException} is recorded; at the end of the loop over stubs, any such stub is
+     * removed from the collection.
+     */
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    private void broadcastNextMessage() {
+        while (true) {
+            PipelineMessage message;
+            try {
+                message = messageQueue.take();
+            } catch (InterruptedException e1) {
+                Thread.currentThread().interrupt();
+                return;
+            }
+            log.debug("Broadcasting " + message.getClass().getName() + " message to "
+                + clientThreads.size() + " clients");
+            Set<RmiClientThread> obsoleteStubs = new HashSet<>();
+            Set<String> obsoleteStubNames = new HashSet<>();
+            for (RmiClientThread clientService : clientThreads) {
+                if (clientService.isClientDisconnected()) {
+                    obsoleteStubs.add(clientService);
+                    obsoleteStubNames.add(clientService.getClientName());
+                    continue;
+                }
+                clientService.addMessage(message);
+            }
+
+            if (!obsoleteStubs.isEmpty()) {
+                log.info("Removing " + obsoleteStubs.size() + " clients from cache, keeping "
+                    + (clientThreads.size() - obsoleteStubs.size()));
+                if (!obsoleteStubNames.isEmpty()) {
+                    log.debug("Obsolete stub names: " + obsoleteStubNames.toString());
+                } else {
+                    log.debug("Unable to capture names of obsolete stubs");
+                }
+            }
+            for (RmiClientThread stub : obsoleteStubs) {
+                clientThreads.remove(stub);
+            }
+        }
+    }
+
+    /**
+     * Nullifies the singleton instance of the communicator.
+     */
+    public static void reset() {
+        instance = null;
+        messagesReceived.clear();
+    }
+
+    public static boolean isInitialized() {
+        return instance != null;
+    }
+
+    public static void shutdown() {
+        shutdown(true);
+    }
+
+    /**
+     * Performs the most orderly shutdown possible of the server and the registry.
+     * <p>
+     * In all circumstances, the singleton instance of the server will be nullified, the services
+     * will be unbound from the registry, and exported objects will be unexported. In addition, if
+     * this is the instance of {@link ZiggyRmiServerService} that created the registry, the registry
+     * will be unexported. Unfortunately, if the registry was created by a now-crashed instance of
+     * the server, it will be necessary for the JVM to shut it down when it destroys all daemon
+     * threads.
+     */
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
+    public static synchronized void shutdown(boolean force) {
+        try {
+            if (instance != null) {
+                // Wait for up to 1 second for the message queues to empty and the
+                // broadcast threads to block while waiting for a new message.
+                // This ensures that the clients can receive the shutdown message.
+                long startWaitTime = SystemTime.currentTimeMillis();
+                while (SystemTime.currentTimeMillis()
+                    - startWaitTime < MAX_WAIT_FOR_QUEUE_CLEARANCE_DURING_SHUTDOWN_MILLIS) {
+                    if (isAllMessagingComplete()) {
+                        break;
+                    }
+                }
+                log.info("SHUTDOWN: Unbinding / unexporting services");
+                instance.cleanUpRegistry();
+
+                // Unexport the ZiggyRmiServer singleton so that the registry will be empty
+                UnicastRemoteObject.unexportObject(instance, force);
+
+                // Attempt to unexport the registry if and only if this is the instance of
+                // ZiggyRmiServer that created it
+                if (instance.registryCreated) {
+                    log.info("SHUTDOWN: Unexporting registry");
+                    UnicastRemoteObject.unexportObject(instance.registry, force);
+                }
+            }
+        } catch (RemoteException e) {
+            // Since this method is called in the process of an orderly shutdown, there's not
+            // actually anything we can do if exceptions are thrown.
+        }
+        reset();
+        log.info("SHUTDOWN: ZiggyRmiServer shutdown complete");
+    }
+
+    /**
+     * Returns the RMI registry. For testing only.
+     *
+     * @return
+     */
+    static Registry getRegistry() {
+        return instance.registry;
+    }
+
+    /**
+     * Returns the client service stubs. For testing only.
+     */
+    static Set<RmiClientThread> getClientServiceStubs() {
+        return instance.clientThreads;
+    }
+
+    /**
+     * Returns the singleton instance. For testing only.
+     */
+    static ZiggyRmiServer serverInstance() {
+        return instance;
+    }
+
+    /**
+     * Returns statistics on the messages received and rebroadcast. For testing only.
+     */
+    static Map<Class<? extends PipelineMessage>, Integer> messagesReceived() {
+        return messagesReceived;
+    }
+
+    /**
+     * Checks the state of the broadcast queues and messaging threads.
+     */
+    static boolean isAllMessagingComplete() {
+        boolean messagingComplete = instance.messageQueue.isEmpty()
+            && instance.broadcastThread.getState().equals(Thread.State.WAITING);
+        if (!messagingComplete) {
+            return false;
+        }
+        for (RmiClientThread client : instance.clientThreads) {
+            messagingComplete = messagingComplete && client.getOutgoingMessageQueue().isEmpty()
+                && client.outgoingMessageThreadState().equals(Thread.State.WAITING);
+            if (!messagingComplete) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Provides a separate {@link Thread} for each client to use for outgoing messages. This ensures
+     * that if one client freezes or is waiting to time out, it will not block messages that go out
+     * to other clients.
+     * <p>
+     * The class provides a {@link LinkedBlockingQueue} for messages, which the broadcast system
+     * populates with new messages that must go to the client. The thread that executes the
+     * message's action in the client blocks until a message arrives in the queue, at which time it
+     * attempts to execute that message's action.
+     * <p>
+     * The class provides methods that allow users to determine the state of the queue and of the
+     * thread, which can be used to determine whether the client is actively sending or responding
+     * to a message. It also provides a method that indicates whether a prior attempt at sending a
+     * message resulted in a {@link RemoteException}, which indicates that the client's process has
+     * terminated.
+     *
+     * @author PT
+     */
+    public static class RmiClientThread extends Thread {
+
+        private final ZiggyRmiClientService serviceStub;
+        private final String clientName;
+        private final LinkedBlockingQueue<PipelineMessage> outgoingMessageQueue = new LinkedBlockingQueue<>();
+        boolean clientDisconnected;
+
+        public RmiClientThread(ZiggyRmiClientService serviceStub, String clientName) {
+            this.serviceStub = serviceStub;
+            this.clientName = clientName;
+            setDaemon(true);
+        }
+
+        @Override
+        public void run() {
+            try {
+                while (true) {
+                    serviceStub.takeMessageActionInClient(outgoingMessageQueue.take());
+                }
+            } catch (RemoteException e) {
+                clientDisconnected = true;
+                Thread.currentThread().interrupt();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                return;
+            }
+        }
+
+        public void addMessage(PipelineMessage message) {
+            try {
+                outgoingMessageQueue.put(message);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                return;
+            }
+        }
+
+        public String getClientName() {
+            return clientName;
+        }
+
+        public boolean isClientDisconnected() {
+            return clientDisconnected;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(clientName);
+        }
+
+        private LinkedBlockingQueue<PipelineMessage> getOutgoingMessageQueue() {
+            return outgoingMessageQueue;
+        }
+
+        private Thread.State outgoingMessageThreadState() {
+            return getState();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+            RmiClientThread other = (RmiClientThread) obj;
+            return Objects.equals(clientName, other.clientName);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiServerService.java b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiServerService.java
new file mode 100644
index 0000000..8aa4c77
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/messaging/ZiggyRmiServerService.java
@@ -0,0 +1,38 @@
+package gov.nasa.ziggy.services.messaging;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+
+/**
+ * Defines the RMI service provided by an instance of {@link ZiggyRmiServer}.
+ * <p>
+ * The {@link ZiggyRmiServer} provides two capabilities that get exported to the RMI registry:
+ * <ol>
+ * <li>Instances of {@link ZiggyRmiClientService} can submit a stub that allows the server to send
+ * messages to that client. The stubs are stored in the server and removed when the corresponding
+ * client ceases to function.
+ * <li>Instances of {@link ZiggyRmiClientService} can submit a {@link PipelineMessage} to the
+ * {@link ZiggyRmiServerService}, which will then re-transmit that message to all clients.
+ * </ol>
+ * <p>
+ * Note that RMI requires all exported capabilities to be represented by an interface that extends
+ * {@link Remote}, which is why we have this interface class at all.
+ *
+ * @author PT
+ */
+public interface ZiggyRmiServerService extends Remote {
+
+    String SERVICE_NAME = "ZiggyRmiServerService";
+
+    // Note: it may seem that the implementations of these methods
+    // don't have anything in them that throws RemoteException, hence
+    // that these throws declarations can be removed. THEY CANNOT! RMI requires
+    // that all exported methods throw RemoteException, no matter what
+    // the underlying code does. If these throws declarations are removed,
+    // Ziggy's RMI system will fail at runtime.
+    void transmitToServer(PipelineMessage message) throws RemoteException;
+
+    void addClientStub(ZiggyRmiClientService client) throws RemoteException;
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/metrics/DeltaMetricValueGenerator.java b/src/main/java/gov/nasa/ziggy/services/metrics/DeltaMetricValueGenerator.java
index a72a894..e2bebda 100644
--- a/src/main/java/gov/nasa/ziggy/services/metrics/DeltaMetricValueGenerator.java
+++ b/src/main/java/gov/nasa/ziggy/services/metrics/DeltaMetricValueGenerator.java
@@ -78,13 +78,12 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if ((obj == null) || (getClass() != obj.getClass())) {
+            if (obj == null || getClass() != obj.getClass()) {
                 return false;
             }
             SourceAndMetricType other = (SourceAndMetricType) obj;
             return Objects.equals(metricType, other.metricType)
                 && Objects.equals(source, other.source);
         }
-
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/metrics/MetricsFileParser.java b/src/main/java/gov/nasa/ziggy/services/metrics/MetricsFileParser.java
index 6b83ada..c70688a 100644
--- a/src/main/java/gov/nasa/ziggy/services/metrics/MetricsFileParser.java
+++ b/src/main/java/gov/nasa/ziggy/services/metrics/MetricsFileParser.java
@@ -5,6 +5,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
+import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -19,6 +20,8 @@
 import gov.nasa.ziggy.metrics.MetricType;
 import gov.nasa.ziggy.metrics.MetricValue;
 import gov.nasa.ziggy.metrics.ValueMetric;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.TimeRange;
 import gov.nasa.ziggy.util.io.FileUtil;
 
@@ -49,11 +52,10 @@ public MetricsFileParser(File metricsFile, String metricSource) {
         this.metricSource = metricSource;
     }
 
-    public Iterator<MetricValue> parseFile() throws IOException {
+    public Iterator<MetricValue> parseFile() {
         if (metricNameToMetricType.isEmpty()) {
             types();
         }
-
         return new LineIterator<>() {
             @Override
             protected MetricValue parseLine(String line) {
@@ -73,9 +75,8 @@ protected MetricValue parseLine(String line) {
      * Call this after calling parse to get the parsed metrics.
      *
      * @return
-     * @throws IOException
      */
-    public Set<MetricType> types() throws IOException {
+    public Set<MetricType> types() {
         metricNameToMetricType = new HashMap<>();
         LineIterator<MetricMetadata> typeIt = metricMetadataIterator();
         for (MetricMetadata metadata : typeIt) {
@@ -109,7 +110,7 @@ public Map<MetricType, TimeRange> getTimestampRange() {
         return rv;
     }
 
-    private LineIterator<MetricMetadata> metricMetadataIterator() throws IOException {
+    private LineIterator<MetricMetadata> metricMetadataIterator() {
         return new LineIterator<>() {
             @Override
             protected MetricMetadata parseLine(String line) {
@@ -136,17 +137,27 @@ private <T> T metricTypeSwitch(String metricTypeStr, T valueCase, T counterCase)
             "Parse error.  Unknown metric type \"" + metricTypeStr + "\".");
     }
 
-    protected Reader openReader() throws IOException {
-        return new FileReader(metricsFile, FileUtil.ZIGGY_CHARSET);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    protected Reader openReader() {
+        try {
+            return new FileReader(metricsFile, FileUtil.ZIGGY_CHARSET);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to read from " + metricsFile.toString(), e);
+        }
     }
 
     private abstract class LineIterator<T> implements Iterator<T>, Iterable<T> {
         private String nextLine;
         private final BufferedReader breader;
 
-        LineIterator() throws IOException {
-            breader = new BufferedReader(openReader(), BUFFER_SIZE_BYTES);
-            nextLine = breader.readLine();
+        @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+        LineIterator() {
+            try {
+                breader = new BufferedReader(openReader(), BUFFER_SIZE_BYTES);
+                nextLine = breader.readLine();
+            } catch (IOException e) {
+                throw new UncheckedIOException("Unable to read from file", e);
+            }
         }
 
         @Override
@@ -155,6 +166,7 @@ public boolean hasNext() {
         }
 
         @Override
+        @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
         public T next() {
             if (nextLine == null) {
                 throw new IllegalStateException();
@@ -163,7 +175,7 @@ public T next() {
             try {
                 nextLine = breader.readLine();
             } catch (IOException e) {
-                throw new IllegalStateException(e);
+                throw new UncheckedIOException("Unable to read from file ", e);
             }
             if (nextLine == null) {
                 FileUtil.close(breader);
diff --git a/src/main/java/gov/nasa/ziggy/services/metrics/logger/MetricSample.java b/src/main/java/gov/nasa/ziggy/services/metrics/logger/MetricSample.java
deleted file mode 100644
index 9482c81..0000000
--- a/src/main/java/gov/nasa/ziggy/services/metrics/logger/MetricSample.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gov.nasa.ziggy.services.metrics.logger;
-
-import java.util.Date;
-
-import gov.nasa.ziggy.metrics.Metric;
-
-public class MetricSample {
-    private final String metricName;
-    private final Class<? extends Metric> metricClass;
-    private final String source;
-    private final Date timestamp;
-    private final float value;
-
-    public MetricSample(String metricName, Class<? extends Metric> metricClass, String source,
-        Date timestamp, float value) {
-        this.metricName = metricName;
-        this.metricClass = metricClass;
-        this.source = source;
-        this.timestamp = timestamp;
-        this.value = value;
-    }
-
-    public String getMetricName() {
-        return metricName;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public Date getTimestamp() {
-        return timestamp;
-    }
-
-    public float getValue() {
-        return value;
-    }
-
-    public Class<? extends Metric> getMetricClass() {
-        return metricClass;
-    }
-
-    @Override
-    public String toString() {
-        return "metricName=[" + metricName + "], source=[" + source + "], timestamp=[" + timestamp
-            + "], value=[" + value + "]";
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/services/metrics/logger/MetricsReaperThread.java b/src/main/java/gov/nasa/ziggy/services/metrics/logger/MetricsReaperThread.java
index 490560d..be4b676 100644
--- a/src/main/java/gov/nasa/ziggy/services/metrics/logger/MetricsReaperThread.java
+++ b/src/main/java/gov/nasa/ziggy/services/metrics/logger/MetricsReaperThread.java
@@ -1,12 +1,14 @@
 package gov.nasa.ziggy.services.metrics.logger;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.metrics.MetricsCrud;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 public class MetricsReaperThread extends Thread {
     private static final Logger log = LoggerFactory.getLogger(MetricsReaperThread.class);
@@ -28,11 +30,12 @@ public MetricsReaperThread() {
     }
 
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
     public void run() {
         try {
             log.info("MetricsReaperThread: STARTED");
 
-            Configuration config = ZiggyConfiguration.getInstance();
+            ImmutableConfiguration config = ZiggyConfiguration.getInstance();
             checkIntervalMillis = config.getInt(CHECK_INTERVAL_MINS_PROP,
                 DEFAULT_CHECK_INTERVAL_MINS) * 60 * 1000;
             maxRows = config.getInt(MAX_ROWS_PROP, DEFAULT_MAX_ROWS);
diff --git a/src/main/java/gov/nasa/ziggy/services/process/AbstractPipelineProcess.java b/src/main/java/gov/nasa/ziggy/services/process/AbstractPipelineProcess.java
index e569e8d..29786e3 100644
--- a/src/main/java/gov/nasa/ziggy/services/process/AbstractPipelineProcess.java
+++ b/src/main/java/gov/nasa/ziggy/services/process/AbstractPipelineProcess.java
@@ -1,18 +1,15 @@
 package gov.nasa.ziggy.services.process;
 
-import java.net.UnknownHostException;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tanukisoftware.wrapper.WrapperManager;
 
 import gov.nasa.ziggy.metrics.Metric;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.DatabaseService;
-import gov.nasa.ziggy.util.HostNameUtils;
-import gov.nasa.ziggy.util.ZiggyBuild;
+import gov.nasa.ziggy.util.os.ProcessUtils;
 
 /**
  * Superclass for all pipeline process bootstrap classes. Provides common functionality, including
@@ -27,13 +24,7 @@
 public abstract class AbstractPipelineProcess {
     private static final Logger log = LoggerFactory.getLogger(AbstractPipelineProcess.class);
 
-    private static final String STATUS_BROADCASTER_ENABLED_PROP = "services.process.statusBroadcaster.enabled";
-    private static final boolean STATUS_BROADCASTER_ENABLED_DEFAULT = true;
-
-    public static final String PROCESS_STATUS_REPORT_INTERVAL_MILLIS_PROP = "services.statusReport.process.reportIntervalMillis";
-    public static final String METRICS_STATUS_REPORT_INTERVAL_MILLIS_PROP = "services.statusReport.metrics.reportIntervalMillis";
-
-    public static final int REPORT_INTERVAL_MILLIS_DEFAULT = 60000;
+    private static final boolean STATUS_BROADCAST_ENABLED_DEFAULT = true;
 
     private boolean initDatabaseService = true;
 
@@ -41,7 +32,7 @@ public abstract class AbstractPipelineProcess {
 
     private static ProcessInfo processInfo = null;
 
-    private StatusMessageBroadcaster processStatusBroadcaster;
+    public static StatusMessageBroadcaster processStatusBroadcaster;
 
     public AbstractPipelineProcess(String name) {
         this(name, true, true);
@@ -51,16 +42,7 @@ public AbstractPipelineProcess(String name, boolean initMessagingService,
         boolean initDatabaseService) {
         this.initDatabaseService = initDatabaseService;
 
-        String host = "?";
-        try {
-            host = HostNameUtils.truncatedHostName();
-        } catch (UnknownHostException e) {
-            // This is a fatal error because we sometimes use this as a database key
-            log.error("Failed to get hostname.", e);
-            throw new IllegalStateException(e);
-        }
-
-        int pid = 0;
+        long pid = ProcessUtils.getPid();
         int jvmid = 0;
         if (WrapperManager.isControlledByNativeWrapper()) {
             pid = WrapperManager.getJavaPID();
@@ -69,44 +51,38 @@ public AbstractPipelineProcess(String name, boolean initMessagingService,
             log.info("JVM is NOT controlled by Native Wrapper");
         }
 
-        processInfo = new ProcessInfo(name, host, pid, jvmid);
+        processInfo = new ProcessInfo(name, pid, jvmid);
     }
 
     protected void initialize() {
-        log.debug("initialize(String[]) - start");
-
-        log.info("Starting initialization for Process: " + processInfo);
-        ZiggyBuild.logVersionInfo(log);
+        log.debug("initialize() - start");
 
-        log.info("jvm version:");
-        log.info("  java.runtime.name=" + SystemUtils.JAVA_RUNTIME_NAME);
-        log.info("  sun.boot.library.path=" + System.getProperty("sun.boot.library.path"));
-        log.info("  java.vm.version=" + SystemUtils.JAVA_VM_VERSION);
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
 
-        log.info("Initializing ConfigurationService...");
-        Configuration configService = ZiggyConfiguration.getInstance();
+        log.info("Starting process {} ({})", processInfo,
+            config.getString(PropertyName.ZIGGY_VERSION.property()));
+        ZiggyConfiguration.logJvmProperties();
 
         if (initDatabaseService) {
             log.info("Initializing DatabaseService...");
             DatabaseService.getInstance();
         }
 
-        boolean statusBroadcasterEnabled = configService.getBoolean(STATUS_BROADCASTER_ENABLED_PROP,
-            STATUS_BROADCASTER_ENABLED_DEFAULT);
+        boolean statusBroadcasterEnabled = config.getBoolean(
+            PropertyName.STATUS_BROADCAST_ENABLED.property(), STATUS_BROADCAST_ENABLED_DEFAULT);
 
-        if (statusBroadcasterEnabled) {
+        if (statusBroadcasterEnabled && processStatusBroadcaster == null) {
             log.info("Initializing StatusMessageBroadcaster...");
             processStatusBroadcaster = new StatusMessageBroadcaster(processInfo);
-
         }
 
-        log.debug("initialize(String[]) - end");
+        log.debug("initialize() - end");
     }
 
-    protected void addProcessStatusReporter(StatusReporter reporter, int reportIntervalMillis) {
+    protected void addProcessStatusReporter(StatusReporter reporter) {
         if (processStatusBroadcaster != null) {
             log.info("Adding a process status broadcast to the system");
-            processStatusBroadcaster.addStatusReporter(reporter, reportIntervalMillis);
+            processStatusBroadcaster.addStatusReporter(reporter);
         }
     }
 
@@ -132,4 +108,13 @@ public void setInitDatabaseService(boolean initDatabaseService) {
         this.initDatabaseService = initDatabaseService;
     }
 
+    /**
+     * Send updates to the supervisor, or (if this is the supervisor), broadcast them to all
+     * clients.
+     */
+    public static void sendUpdates() {
+        if (processStatusBroadcaster != null) {
+            processStatusBroadcaster.sendUpdates();
+        }
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/process/ExternalProcess.java b/src/main/java/gov/nasa/ziggy/services/process/ExternalProcess.java
index 740d4bd..fa251fe 100644
--- a/src/main/java/gov/nasa/ziggy/services/process/ExternalProcess.java
+++ b/src/main/java/gov/nasa/ziggy/services/process/ExternalProcess.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +26,8 @@
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.services.logging.PlainTextLogOutputStream;
 import gov.nasa.ziggy.services.logging.WriterLogOutputStream;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.StringUtils;
 import gov.nasa.ziggy.util.ZiggyShutdownHook;
 import gov.nasa.ziggy.util.os.ProcessUtils;
@@ -273,6 +276,8 @@ public int execute(boolean wait) {
         return retCode;
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     private int executeAndReturnStatus() {
         int retCode = 0;
         try {
@@ -284,11 +289,13 @@ private int executeAndReturnStatus() {
         } catch (ExecuteException e) {
             retCode = e.getExitValue();
         } catch (IOException e) {
-            throw new PipelineException("Exception occurred during command line execute", e);
+            throw new UncheckedIOException("Unable to execute command: " + commandLine.toString(),
+                e);
         }
         return retCode;
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
     private void executeAsynchronously() {
         DefaultExecuteResultHandler resultHandler = new DefaultExecuteResultHandler();
         try {
@@ -300,7 +307,6 @@ private void executeAsynchronously() {
         } catch (Exception e) {
             throw new PipelineException("Exception occurred during command line execute", e);
         }
-
     }
 
     private void initializeWriters() {
@@ -480,6 +486,19 @@ public ExecuteWatchdog getWatchdog() {
         return executor.getWatchdog();
     }
 
+    /**
+     * Executes a command as an external process and returns the result as a {@link List} of
+     * {@link String}s. The results are filtered to only include strings that themselves contain one
+     * or more target strings.
+     */
+    public static final List<String> commandOutput(String command, String... targets) {
+        ExternalProcess commandProcess = simpleExternalProcess(command);
+        commandProcess.writeStdErr(true);
+        commandProcess.writeStdOut(true);
+        commandProcess.run(true, 0);
+        return commandProcess.stdout(targets);
+    }
+
     /**
      * Sets a shutdown hook that finds process IDs for all descendants of the current process and
      * sends SIGTERM to them. Also starts a periodic thread that captures all of the child processes
@@ -512,5 +531,4 @@ private static void setExternalProcessesShutdownHook() {
             externalProcessesShutdownHookSet = true;
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/process/ExternalProcessUtils.java b/src/main/java/gov/nasa/ziggy/services/process/ExternalProcessUtils.java
new file mode 100644
index 0000000..10e28b7
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/services/process/ExternalProcessUtils.java
@@ -0,0 +1,64 @@
+package gov.nasa.ziggy.services.process;
+
+import org.apache.commons.lang3.StringUtils;
+
+import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+
+/**
+ * Provides common utilities needed by multiple different external process subsystems.
+ *
+ * @author PT
+ */
+public class ExternalProcessUtils {
+
+    private static final String SUPERVISOR_LOG_FILE_NAME = "supervisor.log";
+
+    /**
+     * The Log4j configuration file as a JVM argument.
+     */
+    public static String log4jConfigString() {
+        return "-D" + PropertyName.LOG4J2_CONFIGURATION_FILE + "="
+            + DirectoryProperties.ziggyHomeDir() + "/etc/log4j2.xml";
+    }
+
+    /**
+     * The Java library path as a JVM argument.
+     */
+    public static String javaLibraryPath() {
+        return "-Djava.library.path=" + bareJavaLibraryPath();
+    }
+
+    public static String jnaLibraryPath() {
+        return "-Djna.library.path=" + bareJavaLibraryPath();
+    }
+
+    /**
+     * The Java library path without its JVM argument decorations. If the pipeline has defined a
+     * library path, that path will be first, followed by the Ziggy library path; if no pipeline
+     * library path is present, the Ziggy library path will be returned.
+     */
+    private static String bareJavaLibraryPath() {
+        String pipelineLibPath = ZiggyConfiguration.getInstance()
+            .getString(PropertyName.LIBPATH.property(), null);
+        return StringUtils.isEmpty(pipelineLibPath) ? DirectoryProperties.ziggyLibDir().toString()
+            : pipelineLibPath + ":" + DirectoryProperties.ziggyLibDir().toString();
+    }
+
+    /**
+     * The prefix to be used for the supervisor log file (i.e., it goes into logs/supervisor).
+     */
+    public static String supervisorLogPrefix() {
+        return "-Dlog4j.logfile.prefix=" + DirectoryProperties.supervisorLogDir().toString();
+    }
+
+    /**
+     * The log file name used by the supervisor (hence also by the workers).
+     *
+     * @return
+     */
+    public static String supervisorLogFilename() {
+        return DirectoryProperties.supervisorLogDir().resolve(SUPERVISOR_LOG_FILE_NAME).toString();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/services/process/ProcessInfo.java b/src/main/java/gov/nasa/ziggy/services/process/ProcessInfo.java
index 8f2e0ab..c4ec5a8 100644
--- a/src/main/java/gov/nasa/ziggy/services/process/ProcessInfo.java
+++ b/src/main/java/gov/nasa/ziggy/services/process/ProcessInfo.java
@@ -10,31 +10,32 @@
  * @author Todd Klaus
  */
 public class ProcessInfo implements Serializable {
-    private static final long serialVersionUID = -2089578114844840384L;
+    private static final long serialVersionUID = 20230511L;
 
     private String name;
     private String host;
-    private int pid;
+    private long pid;
     private int jvmid;
 
     private final String key;
 
-    public ProcessInfo(String name, String host, int pid, int jvmid) {
+    public ProcessInfo(String name, long pid, int jvmid) {
         this.name = name;
-        this.host = HostNameUtils.callerHostNameOrLocalhost(host);
+        host = HostNameUtils.hostName();
         this.pid = pid;
         this.jvmid = jvmid;
-
-        key = name + ":" + host + ":" + pid + "(" + jvmid + ")";
+        String shortKey = this.name + ": " + HostNameUtils.callerHostNameOrLocalhost(host) + ": "
+            + this.pid;
+        key = this.jvmid == 0 ? shortKey : shortKey + "(" + this.jvmid + ")";
     }
 
     public ProcessInfo(ProcessInfo other) {
         name = other.name;
-        host = HostNameUtils.callerHostNameOrLocalhost(other.host);
+        host = other.host;
         pid = other.pid;
         jvmid = other.jvmid;
 
-        key = name + ":" + host + ":" + pid + "(" + jvmid + ")";
+        key = other.key;
     }
 
     public String getKey() {
@@ -91,7 +92,7 @@ public void setName(String name) {
     /**
      * @return the pid
      */
-    public int getPid() {
+    public long getPid() {
         return pid;
     }
 
@@ -101,5 +102,4 @@ public int getPid() {
     public void setPid(int pid) {
         this.pid = pid;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/process/StatusMessage.java b/src/main/java/gov/nasa/ziggy/services/process/StatusMessage.java
index a8aa640..3f685df 100644
--- a/src/main/java/gov/nasa/ziggy/services/process/StatusMessage.java
+++ b/src/main/java/gov/nasa/ziggy/services/process/StatusMessage.java
@@ -8,10 +8,9 @@
  * @author Todd Klaus
  */
 public abstract class StatusMessage extends PipelineMessage {
-    private static final long serialVersionUID = 20210318L;
+    private static final long serialVersionUID = 20230511L;
 
     private ProcessInfo sourceProcess;
-    private int reportIntervalMillis = 0;
 
     public StatusMessage() {
     }
@@ -41,12 +40,4 @@ public ProcessInfo getSourceProcess() {
     public void setSourceProcess(ProcessInfo sourceProcess) {
         this.sourceProcess = sourceProcess;
     }
-
-    public int getReportIntervalMillis() {
-        return reportIntervalMillis;
-    }
-
-    public void setReportIntervalMillis(int reportIntervalMillis) {
-        this.reportIntervalMillis = reportIntervalMillis;
-    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/process/StatusMessageBroadcaster.java b/src/main/java/gov/nasa/ziggy/services/process/StatusMessageBroadcaster.java
index f328d12..9d100fe 100644
--- a/src/main/java/gov/nasa/ziggy/services/process/StatusMessageBroadcaster.java
+++ b/src/main/java/gov/nasa/ziggy/services/process/StatusMessageBroadcaster.java
@@ -1,69 +1,57 @@
 package gov.nasa.ziggy.services.process;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import gov.nasa.ziggy.services.messaging.WorkerCommunicator;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * This class periodically broadcasts status messages to the "pipeline-status" JMS topic. Status
  * providers register with this class and provide their status messages (extend
  * {@link StatusMessage} via the {@link StatusReporter} interface.
+ * <p>
+ * Status updates are sent whenever the process receives a heartbeat message from the supervisor, or
+ * (for updates from the supervisor) at whatever interval the supervisor decides is appropriate.
  *
  * @author Todd Klaus
+ * @author PT
  */
 public class StatusMessageBroadcaster {
     private static final Logger log = LoggerFactory.getLogger(StatusMessageBroadcaster.class);
 
-    private static final String TIMER_THREAD_NAME = "StatusMessageBroadcaster.timerThread";
-
     private final ProcessInfo processInfo;
-    private Timer broadcastScheduler = new Timer(TIMER_THREAD_NAME);
 
     // Map[reporter, reportIntervalMillis]
-    private final Map<StatusReporter, Integer> reporters = new HashMap<>();
+    private final Set<StatusReporter> reporters = new HashSet<>();
 
     public StatusMessageBroadcaster(ProcessInfo processInfo) {
         this.processInfo = processInfo;
     }
 
-    public synchronized void addStatusReporter(final StatusReporter reporter,
-        final int reportIntervalMillis) {
+    public synchronized void addStatusReporter(final StatusReporter reporter) {
         log.info("Adding a status reporter of class " + reporter.getClass().getName());
-        reporters.put(reporter, reportIntervalMillis);
-
-        broadcastScheduler.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                sendUpdate(reporter, reportIntervalMillis);
-            }
-        }, reportIntervalMillis, reportIntervalMillis);
+        reporters.add(reporter);
     }
 
-    public synchronized void clearStatusReporters() {
-        broadcastScheduler.cancel();
-        broadcastScheduler = new Timer(TIMER_THREAD_NAME);
-        reporters.clear();
-    }
-
-    private void sendUpdate(StatusReporter reporter, int reportInterval) {
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    public void sendUpdates() {
+        log.debug("Sending status messages");
         try {
-            StatusMessage statusMessage = reporter.reportCurrentStatus();
-            if (statusMessage != null) {
-
-                statusMessage.setSourceProcess(processInfo);
-                statusMessage.setReportIntervalMillis(reportInterval);
+            for (StatusReporter reporter : reporters) {
+                StatusMessage statusMessage = reporter.reportCurrentStatus();
+                if (statusMessage != null) {
 
-                WorkerCommunicator.broadcast(statusMessage);
+                    statusMessage.setSourceProcess(processInfo);
+                    ZiggyMessenger.publish(statusMessage);
+                }
             }
         } catch (Exception e) {
             log.error("failed to send status messages", e);
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/process/StatusReporter.java b/src/main/java/gov/nasa/ziggy/services/process/StatusReporter.java
index a9aa934..5981303 100644
--- a/src/main/java/gov/nasa/ziggy/services/process/StatusReporter.java
+++ b/src/main/java/gov/nasa/ziggy/services/process/StatusReporter.java
@@ -8,5 +8,4 @@
  */
 public interface StatusReporter {
     StatusMessage reportCurrentStatus();
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/security/Role.java b/src/main/java/gov/nasa/ziggy/services/security/Role.java
index 3227776..a9d6b5f 100644
--- a/src/main/java/gov/nasa/ziggy/services/security/Role.java
+++ b/src/main/java/gov/nasa/ziggy/services/security/Role.java
@@ -5,19 +5,19 @@
 import java.util.List;
 import java.util.Objects;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Version;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
 
 /**
  * @author Todd Klaus
  */
 @Entity
-@Table(name = "PI_ROLE")
+@Table(name = "ziggy_Role")
 public class Role {
     @Id
     private String name;
@@ -27,8 +27,8 @@ public class Role {
     private User createdBy = null;
 
     @ElementCollection
-    @JoinTable(name = "PI_ROLE_PRIVS")
-    private List<String> privs = new LinkedList<>();
+    @JoinTable(name = "ziggy_Role_privileges")
+    private List<String> privileges = new LinkedList<>();
 
     /**
      * used by Hibernate to implement optimistic locking. Should prevent 2 different console users
@@ -54,16 +54,16 @@ public Role(String name, User createdBy) {
     }
 
     public List<String> getPrivileges() {
-        return privs;
+        return privileges;
     }
 
     public void setPrivileges(List<String> privileges) {
-        privs = privileges;
+        this.privileges = privileges;
     }
 
     public void addPrivilege(String privilege) {
         if (!hasPrivilege(privilege)) {
-            privs.add(privilege);
+            privileges.add(privilege);
         }
     }
 
@@ -77,7 +77,7 @@ public void addPrivileges(Role role) {
     }
 
     public boolean hasPrivilege(String privilege) {
-        return privs.contains(privilege);
+        return privileges.contains(privilege);
     }
 
     public String getName() {
@@ -118,7 +118,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final Role other = (Role) obj;
diff --git a/src/main/java/gov/nasa/ziggy/services/security/SecurityOperations.java b/src/main/java/gov/nasa/ziggy/services/security/SecurityOperations.java
index e5fcb6e..68236c7 100644
--- a/src/main/java/gov/nasa/ziggy/services/security/SecurityOperations.java
+++ b/src/main/java/gov/nasa/ziggy/services/security/SecurityOperations.java
@@ -18,12 +18,14 @@ public SecurityOperations(DatabaseService databaseService) {
     }
 
     public boolean validateLogin(String loginName) {
-        user = userCrud.retrieveUser(loginName);
+        String name = loginName != null ? loginName : "";
+        user = userCrud.retrieveUser(name);
         return user != null;
     }
 
     public boolean hasPrivilege(User user, String privilege) {
-        return user.hasPrivilege(privilege);
+        String privilegeName = privilege != null ? privilege : "";
+        return user.hasPrivilege(privilegeName);
     }
 
     /**
diff --git a/src/main/java/gov/nasa/ziggy/services/security/User.java b/src/main/java/gov/nasa/ziggy/services/security/User.java
index d0b3480..804bd1d 100644
--- a/src/main/java/gov/nasa/ziggy/services/security/User.java
+++ b/src/main/java/gov/nasa/ziggy/services/security/User.java
@@ -5,13 +5,13 @@
 import java.util.List;
 import java.util.Objects;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import javax.persistence.Version;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
 
 /**
  * A user object.
@@ -20,7 +20,7 @@
  * @author Todd Klaus
  */
 @Entity
-@Table(name = "PI_USER")
+@Table(name = "ziggy_User")
 public class User {
 
     @Id
@@ -31,11 +31,11 @@ public class User {
     private Date created;
 
     @ManyToMany
-    @JoinTable(name = "PI_USER_ROLE")
+    @JoinTable(name = "ziggy_User_roles")
     private List<Role> roles = new ArrayList<>();
 
     @ElementCollection
-    @JoinTable(name = "PI_USER_PRIVS")
+    @JoinTable(name = "ziggy_User_privileges")
     private List<String> privileges = new ArrayList<>();
 
     /**
@@ -152,7 +152,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final User other = (User) obj;
diff --git a/src/main/java/gov/nasa/ziggy/services/security/UserCrud.java b/src/main/java/gov/nasa/ziggy/services/security/UserCrud.java
index de00c10..a64e39a 100644
--- a/src/main/java/gov/nasa/ziggy/services/security/UserCrud.java
+++ b/src/main/java/gov/nasa/ziggy/services/security/UserCrud.java
@@ -3,9 +3,9 @@
 import java.util.List;
 
 import org.hibernate.Hibernate;
-import org.hibernate.Query;
 
 import gov.nasa.ziggy.crud.AbstractCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.services.database.DatabaseService;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @author Todd Klaus
  */
-public class UserCrud extends AbstractCrud {
+public class UserCrud extends AbstractCrud<User> {
     public UserCrud() {
     }
 
@@ -22,11 +22,12 @@ public UserCrud(DatabaseService databaseService) {
     }
 
     public void createUser(User user) {
-        create(user);
+        persist(user);
     }
 
     public List<User> retrieveAllUsers() {
-        List<User> results = list(createQuery("from User"));
+
+        List<User> results = list(createZiggyQuery(User.class));
         for (User user : results) {
             Hibernate.initialize(user.getPrivileges());
             Hibernate.initialize(user.getRoles());
@@ -35,8 +36,8 @@ public List<User> retrieveAllUsers() {
     }
 
     public User retrieveUser(String loginName) {
-        Query query = createQuery("from User where loginName = :loginName");
-        query.setString("loginName", loginName);
+        ZiggyQuery<User, User> query = createZiggyQuery(User.class);
+        query.column(User_.loginName).in(loginName);
         User user = uniqueResult(query);
         if (user != null) {
             Hibernate.initialize(user.getPrivileges());
@@ -46,25 +47,29 @@ public User retrieveUser(String loginName) {
     }
 
     public void deleteUser(User user) {
-        delete(user);
+        remove(user);
     }
 
     public void createRole(Role role) {
-        create(role);
+        persist(role);
     }
 
     public List<Role> retrieveAllRoles() {
-        return list(createQuery("from Role"));
+        return list(createZiggyQuery(Role.class));
     }
 
     public Role retrieveRole(String roleName) {
-        Query query = createQuery("from Role where name = :roleName");
-        query.setString("roleName", roleName);
+        ZiggyQuery<Role, Role> query = createZiggyQuery(Role.class);
+        query.column(Role_.name).in(roleName);
         return uniqueResult(query);
     }
 
     public void deleteRole(Role role) {
-        delete(role);
+        remove(role);
     }
 
+    @Override
+    public Class<User> componentClass() {
+        return User.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/worker/FileTransfer.java b/src/main/java/gov/nasa/ziggy/supervisor/FileTransfer.java
similarity index 97%
rename from src/main/java/gov/nasa/ziggy/worker/FileTransfer.java
rename to src/main/java/gov/nasa/ziggy/supervisor/FileTransfer.java
index d441951..ca08421 100644
--- a/src/main/java/gov/nasa/ziggy/worker/FileTransfer.java
+++ b/src/main/java/gov/nasa/ziggy/supervisor/FileTransfer.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.worker;
+package gov.nasa.ziggy.supervisor;
 
 /**
  * Models a file to be transfered to a worker process using the Messaging Service. Typical use case
diff --git a/src/main/java/gov/nasa/ziggy/worker/InstanceReporter.java b/src/main/java/gov/nasa/ziggy/supervisor/InstanceReporter.java
similarity index 86%
rename from src/main/java/gov/nasa/ziggy/worker/InstanceReporter.java
rename to src/main/java/gov/nasa/ziggy/supervisor/InstanceReporter.java
index d088d96..37abd7a 100644
--- a/src/main/java/gov/nasa/ziggy/worker/InstanceReporter.java
+++ b/src/main/java/gov/nasa/ziggy/supervisor/InstanceReporter.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.worker;
+package gov.nasa.ziggy.supervisor;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -14,6 +14,8 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.ProcessingSummaryOperations;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.TasksStates;
 import gov.nasa.ziggy.util.dispmod.InstancesDisplayModel;
 import gov.nasa.ziggy.util.dispmod.PipelineStatsDisplayModel;
@@ -27,8 +29,9 @@
  * @author Miles Cote
  */
 public class InstanceReporter {
-    public File report(PipelineInstance instance, File outputDir)
-        throws FileNotFoundException, UnsupportedEncodingException {
+
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public File report(PipelineInstance instance, File outputDir) {
         checkNotNull(instance, "instance cannot be null.");
         checkNotNull(outputDir, "outputDir cannot be null.");
 
@@ -65,6 +68,10 @@ public File report(PipelineInstance instance, File outputDir)
                 orderedModuleNames);
             taskMetricsDisplayModel.print(printStream,
                 "Processing Time Breakdown (completed tasks only)");
+        } catch (FileNotFoundException | UnsupportedEncodingException e) {
+            // This can never occur. A supported character set is used, and the file is guaranteed
+            // to be legitimate.
+            throw new AssertionError(e);
         }
 
         return reportFile;
diff --git a/src/main/java/gov/nasa/ziggy/worker/PipelineInstanceManager.java b/src/main/java/gov/nasa/ziggy/supervisor/PipelineInstanceManager.java
similarity index 89%
rename from src/main/java/gov/nasa/ziggy/worker/PipelineInstanceManager.java
rename to src/main/java/gov/nasa/ziggy/supervisor/PipelineInstanceManager.java
index 4849819..662c23b 100644
--- a/src/main/java/gov/nasa/ziggy/worker/PipelineInstanceManager.java
+++ b/src/main/java/gov/nasa/ziggy/supervisor/PipelineInstanceManager.java
@@ -1,29 +1,29 @@
-package gov.nasa.ziggy.worker;
+package gov.nasa.ziggy.supervisor;
 
 import static gov.nasa.ziggy.services.database.DatabaseTransactionFactory.performTransaction;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import org.hibernate.Hibernate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.module.ModuleFatalProcessingException;
-import gov.nasa.ziggy.pipeline.InstanceAndTasks;
 import gov.nasa.ziggy.pipeline.PipelineOperations;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
+import gov.nasa.ziggy.services.messages.FireTriggerRequest;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
- * Initiates processing of a pipeline instance in the worker, and if so requested initiates
+ * Initiates processing of a pipeline instance in the supervisor, and if so requested initiates
  * additional instances once the current one has run to completion. This class is intended to be
- * constructed and run in its own thread so as not to waste the time and attention of the worker.
+ * constructed and run in its own thread so as not to waste the time and attention of the
+ * supervisor.
  *
  * @author PT
  */
@@ -68,7 +68,7 @@ public class PipelineInstanceManager {
     /**
      * Provided with package scope to facilitate testing.
      */
-    void initialize(WorkerFireTriggerRequest triggerRequest) {
+    void initialize(FireTriggerRequest triggerRequest) {
         instanceName = triggerRequest.getInstanceName();
         maxRepeats = triggerRequest.getMaxRepeats();
         if (maxRepeats < 0) {
@@ -106,7 +106,7 @@ void initialize(WorkerFireTriggerRequest triggerRequest) {
         });
     }
 
-    public PipelineInstanceManager(WorkerFireTriggerRequest triggerRequest) {
+    public PipelineInstanceManager(FireTriggerRequest triggerRequest) {
         initialize(triggerRequest);
     }
 
@@ -114,6 +114,7 @@ public PipelineInstanceManager(WorkerFireTriggerRequest triggerRequest) {
      * Fires the trigger for the given pipeline. If repetitions are requested, they are also managed
      * by this method.
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public void fireTrigger() {
         // loop over repeats
         while (repeats < maxRepeats) {
@@ -122,22 +123,10 @@ public void fireTrigger() {
                 currentInstanceName.append(":-").append(Integer.toString(repeats));
             }
             final String finalCurrentInstanceName = currentInstanceName.toString();
-            final List<PipelineTask> pipelineTasks = new ArrayList<>();
-            // Create a database transaction and within it fire the trigger
-            performTransaction(() -> {
-
-                InstanceAndTasks triggerResults = pipelineOperations().fireTrigger(pipeline,
-                    finalCurrentInstanceName, startNode, endNode);
-                currentInstanceId = triggerResults.getPipelineInstance().getId();
-                pipelineTasks.addAll(triggerResults.getPipelineTasks());
-                pipelineInstanceCrud().evict(triggerResults.getPipelineInstance());
-                return null;
-            });
-
-            // Send pipeline task messages to the worker
-            for (PipelineTask task : pipelineTasks) {
-                pipelineOperations().sendWorkerMessageForTask(task);
-            }
+            new ArrayList<>();
+            PipelineInstance pipelineInstance = pipelineOperations().fireTrigger(pipeline,
+                finalCurrentInstanceName, startNode, endNode, null);
+            currentInstanceId = pipelineInstance.getId();
 
             // if we're not on the last repeat, we need to start the waiting
             if (repeats < maxRepeats - 1) {
@@ -169,7 +158,6 @@ public void fireTrigger() {
      * worker log.
      *
      * @return successful completion status of the instance.
-     * @throws InterruptedException if the worker is shut down while waiting
      */
     private boolean waitAndCheckStatus() throws InterruptedException {
 
diff --git a/src/main/java/gov/nasa/ziggy/supervisor/PipelineSupervisor.java b/src/main/java/gov/nasa/ziggy/supervisor/PipelineSupervisor.java
new file mode 100644
index 0000000..cb0bab8
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/supervisor/PipelineSupervisor.java
@@ -0,0 +1,317 @@
+package gov.nasa.ziggy.supervisor;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static gov.nasa.ziggy.util.WrapperUtils.WRAPPER_APP_PARAMETER_PROP_NAME_PREFIX;
+import static gov.nasa.ziggy.util.WrapperUtils.WRAPPER_CLASSPATH_PROP_NAME_PREFIX;
+import static gov.nasa.ziggy.util.WrapperUtils.WRAPPER_JAVA_ADDITIONAL_PROP_NAME_PREFIX;
+import static gov.nasa.ziggy.util.WrapperUtils.WRAPPER_LIBRARY_PATH_PROP_NAME_PREFIX;
+import static gov.nasa.ziggy.util.WrapperUtils.WRAPPER_LOG_FILE_PROP_NAME;
+import static gov.nasa.ziggy.util.WrapperUtils.wrapperParameter;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.apache.commons.configuration2.ImmutableConfiguration;
+import org.apache.commons.exec.CommandLine;
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.metrics.MetricsDumper;
+import gov.nasa.ziggy.metrics.report.Memdrone;
+import gov.nasa.ziggy.module.AlgorithmMonitor;
+import gov.nasa.ziggy.pipeline.PipelineExecutor;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud.ClearStaleStateResults;
+import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.services.events.ZiggyEventCrud;
+import gov.nasa.ziggy.services.events.ZiggyEventHandler;
+import gov.nasa.ziggy.services.events.ZiggyEventHandler.ZiggyEventHandlerInfoForDisplay;
+import gov.nasa.ziggy.services.logging.TaskLog;
+import gov.nasa.ziggy.services.messages.DefaultWorkerResourcesRequest;
+import gov.nasa.ziggy.services.messages.EventHandlerRequest;
+import gov.nasa.ziggy.services.messages.HeartbeatMessage;
+import gov.nasa.ziggy.services.messages.SingleTaskLogMessage;
+import gov.nasa.ziggy.services.messages.SingleTaskLogRequest;
+import gov.nasa.ziggy.services.messages.StartMemdroneRequest;
+import gov.nasa.ziggy.services.messages.TaskLogInformationMessage;
+import gov.nasa.ziggy.services.messages.TaskLogInformationRequest;
+import gov.nasa.ziggy.services.messages.WorkerResources;
+import gov.nasa.ziggy.services.messages.ZiggyEventHandlerInfoMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiClient;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiServer;
+import gov.nasa.ziggy.services.process.AbstractPipelineProcess;
+import gov.nasa.ziggy.services.process.ExternalProcessUtils;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.WrapperUtils.WrapperCommand;
+import gov.nasa.ziggy.util.ZiggyShutdownHook;
+import hdf.hdf5lib.H5;
+
+/**
+ * Establishes the pipeline supervisor instance. The supervisor instance is a process that runs as a
+ * daemon and provides central services for a data analysis pipeline (queueing and dispatch of task
+ * requests, monitoring of algorithm execution, response to requests from console instances, etc.).
+ *
+ * @author Todd Klaus
+ * @author PT
+ */
+public class PipelineSupervisor extends AbstractPipelineProcess {
+
+    private static final Logger log = LoggerFactory.getLogger(PipelineSupervisor.class);
+
+    public static final String NAME = "Supervisor";
+    private static final String SUPERVISOR_BIN_NAME = "supervisor";
+    public static final int WORKER_STATUS_REPORT_INTERVAL_MILLIS_DEFAULT = 15000;
+
+    private static final Set<ZiggyEventHandler> ziggyEventHandlers = new HashSet<>();
+
+    private ScheduledExecutorService heartbeatExecutor;
+
+    public PipelineSupervisor(int workerCount, int workerHeapSize) {
+        super(NAME);
+        checkArgument(workerCount > 0, "Worker count must be positive");
+        checkArgument(workerHeapSize > 0, "Worker heap size must be positive");
+        WorkerResources.setDefaultResources(new WorkerResources(workerCount, workerHeapSize));
+        log.debug("Starting pipeline supervisor with " + workerCount + " workers and "
+            + workerHeapSize + " MB max heap");
+    }
+
+    public PipelineSupervisor(boolean messaging, boolean database) {
+        super(NAME, messaging, database);
+    }
+
+    @Override
+    @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
+    public void initialize() {
+        try {
+            super.initialize();
+
+            ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+
+            clearStaleTaskStates();
+
+            // if HDF5 is to be used as the default binfile format (or indeed at all),
+            // load the library now -- note that (a) this is necessary because in linux
+            // some kind of conflict occurs when libhdf5 is loaded before libjhdf5, but not
+            // vice versa; (b) use of the System.loadLibrary doesn't work because at the first
+            // call to an HDF5 method, the code looks at a private static var that tells it
+            // whether the library is loaded, and that var is false (because H5 didn't load it).
+            // It doesn't look to see whether the library was loaded by somebody other than H5.
+            // It thus attempts to load again and we get the conflict.
+
+            H5.loadH5Lib();
+
+            log.info("Subscribing to messages...");
+            subscribe();
+            TriggerRequestManager.start();
+            log.info("Subscribing to messages...done");
+
+            int rmiPort = config.getInt(PropertyName.SUPERVISOR_PORT.property(),
+                ZiggyRmiServer.RMI_PORT_DEFAULT);
+            log.info("Starting RMI communications server with registry on port " + rmiPort);
+            ZiggyRmiServer.initializeInstance(rmiPort);
+
+            log.info("Starting ZiggyRmiClient instance with registry on port " + rmiPort + "...");
+            ZiggyRmiClient.initializeInstance(rmiPort, NAME);
+            ZiggyShutdownHook.addShutdownHook(() -> {
+                log.info("Sending shutdown notification");
+                ZiggyRmiServer.shutdown();
+                ZiggyRmiClient.reset();
+            });
+            log.info("Starting ZiggyRmiClient instance ... done");
+
+            // Start the heartbeat messages
+            log.info("Starting supervisor-client heartbeat generator");
+            heartbeatExecutor = new ScheduledThreadPoolExecutor(1);
+            long heartbeatIntervalMillis = HeartbeatMessage.heartbeatIntervalMillis();
+            if (heartbeatIntervalMillis > 0) {
+                heartbeatExecutor.scheduleAtFixedRate(
+                    () -> ZiggyRmiServer.addToBroadcastQueue(new HeartbeatMessage()), 0,
+                    HeartbeatMessage.heartbeatIntervalMillis(), TimeUnit.MILLISECONDS);
+            }
+            ZiggyShutdownHook.addShutdownHook(() -> {
+                log.info("Shutting down heartbeat executor...");
+                heartbeatExecutor.shutdownNow();
+                log.info("Shutting down heartbeat executor...done");
+            });
+
+            // Start the task request handler lifecycle manager.
+            log.info("Starting task request handler lifecycle manager...");
+            TaskRequestHandlerLifecycleManager.initializeInstance();
+            log.info("Starting task request handler lifecycle manager...done");
+
+            log.info("Starting metrics dumper thread...");
+            MetricsDumper metricsDumper = new MetricsDumper(
+                AbstractPipelineProcess.getProcessInfo().getPid());
+            Thread metricsDumperThread = new Thread(metricsDumper, "MetricsDumper");
+            metricsDumperThread.setDaemon(true);
+            metricsDumperThread.start();
+
+            log.info("Starting algorithm monitor threads...");
+            AlgorithmMonitor.initialize();
+
+            log.info("Loading event handlers...");
+            ziggyEventHandlers.addAll(new ZiggyEventCrud().retrieveAllEventHandlers());
+            for (ZiggyEventHandler handler : ziggyEventHandlers) {
+                if (handler.isEnableOnClusterStart()) {
+                    handler.start();
+                }
+            }
+            log.info("Loading event handlers...done");
+        } catch (Exception e) {
+            log.error("Initialization failed!", e);
+            System.exit(-1);
+        }
+    }
+
+    /**
+     * Set the state to ERROR for all tasks where the state is currently PROCESSING or SUBMITTED.
+     * Used at worker startup to reset the state after an abnormal supervisor exit while processing.
+     */
+    public void clearStaleTaskStates() {
+
+        /*
+         * Set the pipeline task state to ERROR for any tasks assigned to this worker that are in
+         * the PROCESSING state or the SUBMITTED state. These conditions indicate that the previous
+         * instance of the worker process on this host died abnormally
+         */
+        ClearStaleStateResults clearStateResults = (ClearStaleStateResults) DatabaseTransactionFactory
+            .performTransaction(() -> {
+                PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
+                return pipelineTaskCrud.clearStaleState();
+            });
+
+        /*
+         * Update the pipeline instance state for the instances associated with the stale tasks from
+         * above since that change may result in a change to the instances
+         */
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineExecutor pe = new PipelineExecutor();
+            PipelineInstanceCrud instanceCrud = new PipelineInstanceCrud();
+
+            for (Long instanceId : clearStateResults.uniqueInstanceIds) {
+                log.info("Updating instance state for instanceId = " + instanceId);
+                PipelineInstance instance = instanceCrud.retrieve(instanceId);
+                pe.logUpdatedInstanceState(instance);
+            }
+            return null;
+        });
+    }
+
+    /**
+     * Implements subscriptions that are relevant to the supervisor as a whole rather than any
+     * particular class within the supervisor.
+     */
+    private void subscribe() {
+        ZiggyMessenger.subscribe(EventHandlerRequest.class, message -> {
+            ZiggyMessenger.publish(new ZiggyEventHandlerInfoMessage(message,
+                PipelineSupervisor.serializableZiggyEventHandlers()));
+        });
+        ZiggyMessenger.subscribe(StartMemdroneRequest.class, message -> {
+            new Memdrone(message.getModuleName(), message.getInstanceId()).startMemdrone();
+        });
+        ZiggyMessenger.subscribe(TaskLogInformationRequest.class, message -> {
+            ZiggyMessenger.publish(new TaskLogInformationMessage(message,
+                TaskLog.searchForLogFiles(message.getInstanceId(), message.getTaskId())));
+        });
+        ZiggyMessenger.subscribe(SingleTaskLogRequest.class, message -> {
+            ZiggyMessenger.publish(new SingleTaskLogMessage(message, taskLogContents(message)));
+        });
+        ZiggyMessenger.subscribe(DefaultWorkerResourcesRequest.class, message -> {
+            ZiggyMessenger.publish(WorkerResources.getDefaultResources());
+        });
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private String taskLogContents(SingleTaskLogRequest request) {
+        File taskLogFile = new File(request.getTaskLogInformation().getFullPath());
+        String stepLogContents = "<Request timed-out!>";
+        log.info("Reading task log: " + taskLogFile);
+
+        Charset defaultCharset = null;
+        StringBuilder fileContents = new StringBuilder(1024 * 4);
+        try {
+            fileContents.append(FileUtils.readFileToString(taskLogFile, defaultCharset));
+            log.info("Returning task log (" + fileContents.length() + " chars): " + taskLogFile);
+            stepLogContents = fileContents.toString();
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to read file " + taskLogFile.toString(), e);
+        }
+        return stepLogContents;
+    }
+
+    public static Set<ZiggyEventHandler> ziggyEventHandlers() {
+        return ziggyEventHandlers;
+    }
+
+    public static Set<ZiggyEventHandlerInfoForDisplay> serializableZiggyEventHandlers() {
+        return ziggyEventHandlers.stream()
+            .map(ZiggyEventHandlerInfoForDisplay::new)
+            .collect(Collectors.toSet());
+    }
+
+    public static CommandLine supervisorCommand(WrapperCommand cmd, int workerCount,
+        int workerHeapSize) {
+        Path supervisorPath = DirectoryProperties.ziggyBinDir().resolve(SUPERVISOR_BIN_NAME);
+        CommandLine commandLine = new CommandLine(supervisorPath.toString());
+        if (cmd == WrapperCommand.START) {
+            // Refer to supervisor.wrapper.conf for appropriate indices for the parameters specified
+            // here.
+            String ziggyLibDir = DirectoryProperties.ziggyLibDir().toString();
+            commandLine
+                .addArgument(wrapperParameter(WRAPPER_LOG_FILE_PROP_NAME,
+                    ExternalProcessUtils.supervisorLogFilename()))
+                .addArgument(wrapperParameter(WRAPPER_CLASSPATH_PROP_NAME_PREFIX, 1,
+                    DirectoryProperties.ziggyHomeDir().resolve("libs").resolve("*.jar").toString()))
+                .addArgument(
+                    wrapperParameter(WRAPPER_LIBRARY_PATH_PROP_NAME_PREFIX, 1, ziggyLibDir))
+                .addArgument(wrapperParameter(WRAPPER_JAVA_ADDITIONAL_PROP_NAME_PREFIX, 5,
+                    "-Djna.library.path=" + ziggyLibDir))
+                .addArgument(wrapperParameter(WRAPPER_APP_PARAMETER_PROP_NAME_PREFIX, 2,
+                    Integer.toString(workerCount)))
+                .addArgument(wrapperParameter(WRAPPER_APP_PARAMETER_PROP_NAME_PREFIX, 3,
+                    Integer.toString(workerHeapSize)));
+
+            // Add classpaths for pipeline side, if any are needed.
+            String pipelineClasspath = ZiggyConfiguration.getInstance()
+                .getString(PropertyName.PIPELINE_CLASSPATH.property(), null);
+            if (pipelineClasspath != null) {
+                String[] pipelineClasspaths = pipelineClasspath.split(":");
+                for (int i = 0; i < pipelineClasspaths.length; i++) {
+                    int classpathIndex = i + 2;
+                    commandLine.addArgument(wrapperParameter(WRAPPER_CLASSPATH_PROP_NAME_PREFIX,
+                        classpathIndex, pipelineClasspaths[i]));
+                }
+            }
+        }
+        commandLine.addArgument(cmd.toString());
+
+        return commandLine;
+    }
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        int workerThreads = Integer.parseInt(args[0]);
+        int workerHeapSize = Integer.parseInt(args[1]);
+        new PipelineSupervisor(workerThreads, workerHeapSize).initialize();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/supervisor/TaskContext.java b/src/main/java/gov/nasa/ziggy/supervisor/TaskContext.java
new file mode 100644
index 0000000..f72b2df
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/supervisor/TaskContext.java
@@ -0,0 +1,120 @@
+package gov.nasa.ziggy.supervisor;
+
+import java.util.Map;
+
+import gov.nasa.ziggy.metrics.Metric;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.services.logging.TaskLog;
+import gov.nasa.ziggy.uow.UnitOfWork;
+
+/**
+ * @author Todd Klaus
+ */
+public class TaskContext {
+    public enum TaskState {
+        IDLE, PROCESSING
+    }
+
+    private Long pipelineInstanceId;
+    private Long pipelineTaskId;
+    private PipelineModule pipelineModule = null;
+    private TaskState state = TaskState.IDLE;
+    private String module = "-";
+    private String moduleUow = "-";
+    private long processingStartTimeMillis = 0;
+    private TaskLog taskLog = null;
+    private long moduleExecTime = 0L;
+    private Map<String, Metric> taskMetrics = null;
+
+    public TaskContext() {
+    }
+
+    public void setTask(PipelineTask pipelineTask) {
+        pipelineTaskId = pipelineTask.getId();
+        pipelineInstanceId = pipelineTask.getPipelineInstance().getId();
+        module = pipelineTask.getModuleName();
+        UnitOfWork uow = pipelineTask.uowTaskInstance();
+        moduleUow = uow.briefState();
+    }
+
+    public Long getPipelineInstanceId() {
+        return pipelineInstanceId;
+    }
+
+    public void setPipelineInstanceId(Long pipelineInstanceId) {
+        this.pipelineInstanceId = pipelineInstanceId;
+    }
+
+    public Long getPipelineTaskId() {
+        return pipelineTaskId;
+    }
+
+    public void setPipelineTaskId(Long pipelineTaskId) {
+        this.pipelineTaskId = pipelineTaskId;
+    }
+
+    public PipelineModule getPipelineModule() {
+        return pipelineModule;
+    }
+
+    public void setPipelineModule(PipelineModule currentPipelineModule) {
+        pipelineModule = currentPipelineModule;
+    }
+
+    public TaskState getState() {
+        return state;
+    }
+
+    public void setState(TaskState currentState) {
+        state = currentState;
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String currentModule) {
+        module = currentModule;
+    }
+
+    public String getModuleUow() {
+        return moduleUow;
+    }
+
+    public void setModuleUow(String currentModuleUow) {
+        moduleUow = currentModuleUow;
+    }
+
+    public long getProcessingStartTimeMillis() {
+        return processingStartTimeMillis;
+    }
+
+    public void setProcessingStartTimeMillis(long currentProcessingStartTimeMillis) {
+        processingStartTimeMillis = currentProcessingStartTimeMillis;
+    }
+
+    public TaskLog getTaskLog() {
+        return taskLog;
+    }
+
+    public void setTaskLog(TaskLog taskLog) {
+        this.taskLog = taskLog;
+    }
+
+    public long getModuleExecTime() {
+        return moduleExecTime;
+    }
+
+    public void setModuleExecTime(long moduleExecTime) {
+        this.moduleExecTime = moduleExecTime;
+    }
+
+    public Map<String, Metric> getTaskMetrics() {
+        return taskMetrics;
+    }
+
+    public void setTaskMetrics(Map<String, Metric> taskMetrics) {
+        this.taskMetrics = taskMetrics;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/supervisor/TaskFileCopy.java b/src/main/java/gov/nasa/ziggy/supervisor/TaskFileCopy.java
new file mode 100644
index 0000000..4200742
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/supervisor/TaskFileCopy.java
@@ -0,0 +1,121 @@
+package gov.nasa.ziggy.supervisor;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.AndFileFilter;
+import org.apache.commons.io.filefilter.IOFileFilter;
+import org.apache.commons.io.filefilter.NameFileFilter;
+import org.apache.commons.io.filefilter.NotFileFilter;
+import org.apache.commons.io.filefilter.WildcardFileFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.metrics.ValueMetric;
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.module.PipelineMetrics;
+import gov.nasa.ziggy.module.WorkingDirManager;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+
+/**
+ * Copy task files from the task data directory to another directory, typically a shared volume.
+ * <p>
+ * This class uses {@link TaskFileCopyParameters} to control behavior.
+ *
+ * @author Todd Klaus
+ */
+public class TaskFileCopy {
+    private static final Logger log = LoggerFactory.getLogger(TaskFileCopy.class);
+
+    private final PipelineTask pipelineTask;
+    private final TaskFileCopyParameters copyParams;
+
+    public TaskFileCopy(PipelineTask pipelineTask, TaskFileCopyParameters copyParams) {
+        this.pipelineTask = pipelineTask;
+        this.copyParams = copyParams;
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public void copyTaskFiles() {
+        File srcTaskDir = WorkingDirManager.workingDir(pipelineTask);
+        try {
+            if (copyParams.isDeleteWithoutCopy()) {
+                log.warn("*** TEST USE ONLY ***: deleting source directory without copying");
+                FileUtils.forceDelete(srcTaskDir);
+                log.info("Done deleting source directory");
+                return;
+            }
+            String destPath = copyParams.getDestinationPath();
+            File destDir = new File(destPath);
+
+            if (!destDir.exists()) {
+                FileUtils.forceMkdir(destDir);
+            }
+
+            log.info("srcTaskDir = " + srcTaskDir);
+            log.info("destPath = " + destPath);
+
+            if (!destDir.exists() || !destDir.isDirectory()) {
+                throw new PipelineException(
+                    "destDir does not exist or is not a directory: " + destPath);
+            }
+
+            if (srcTaskDir == null) {
+                throw new PipelineException(
+                    "sourceTaskDir not found for pipelineTask: " + pipelineTask);
+            }
+
+            File destTaskDir = new File(destDir, srcTaskDir.getName());
+            File destTaskTmpDir = new File(destDir, srcTaskDir.getName() + ".in_progress");
+
+            log.info("destTaskDir = " + destTaskDir);
+
+            if (destTaskTmpDir.exists()) {
+                log.info("destTaskTmpDir already exists, deleting: " + destTaskTmpDir);
+                FileUtils.forceDelete(destTaskTmpDir);
+            }
+
+            // setup exclude filter
+            FileFilter excludeFilter = null;
+            String[] wildcards = copyParams.getExcludeWildcards();
+            if (wildcards != null && wildcards.length > 0) {
+                excludeFilter = new NotFileFilter(new WildcardFileFilter(wildcards));
+                NotFileFilter svnFilter = new NotFileFilter(new NameFileFilter(".svn"));
+                excludeFilter = new AndFileFilter(svnFilter, (IOFileFilter) excludeFilter);
+                log.info("Using filter: " + excludeFilter);
+            }
+
+            // do copy
+            if (excludeFilter != null) {
+                FileUtils.copyDirectory(srcTaskDir, destTaskTmpDir, excludeFilter);
+            } else {
+                FileUtils.copyDirectory(srcTaskDir, destTaskTmpDir);
+            }
+
+            // rename dest now that copy is complete
+            boolean renamed = destTaskTmpDir.renameTo(destTaskDir);
+            if (!renamed) {
+                throw new PipelineException(
+                    "Failed to rename: " + destTaskTmpDir + " -> " + destTaskDir);
+            }
+
+            // delete source
+            if (copyParams.isDeleteAfterCopy()) {
+                log.info("Copy complete, deleting source directory");
+                FileUtils.forceDelete(srcTaskDir);
+                log.info("Done deleting source directory");
+            }
+
+            // attempt to measure dest file sizes
+            long archiveSize = FileUtils.sizeOfDirectory(destTaskDir);
+            ValueMetric.addValue(PipelineMetrics.TF_ARCHIVE_SIZE_METRIC, archiveSize);
+        } catch (IOException e) {
+            throw new UncheckedIOException("IOException occurred when copying task files ", e);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/worker/TaskFileCopyParameters.java b/src/main/java/gov/nasa/ziggy/supervisor/TaskFileCopyParameters.java
similarity index 92%
rename from src/main/java/gov/nasa/ziggy/worker/TaskFileCopyParameters.java
rename to src/main/java/gov/nasa/ziggy/supervisor/TaskFileCopyParameters.java
index 99f5993..7044741 100644
--- a/src/main/java/gov/nasa/ziggy/worker/TaskFileCopyParameters.java
+++ b/src/main/java/gov/nasa/ziggy/supervisor/TaskFileCopyParameters.java
@@ -1,14 +1,14 @@
-package gov.nasa.ziggy.worker;
+package gov.nasa.ziggy.supervisor;
 
 import gov.nasa.ziggy.parameters.Parameters;
 
 /**
- * Parameters for copying task files from the worker to another directory, typically a shared
- * volume. These parameters are used by {@link TaskFileCopy}
+ * Parameters for copying task files from the task data directory to another directory, typically a
+ * shared volume. These parameters are used by {@link TaskFileCopy}
  *
  * @author Todd Klaus
  */
-public class TaskFileCopyParameters implements Parameters {
+public class TaskFileCopyParameters extends Parameters {
     private boolean enabled = false;
 
     /**
@@ -127,5 +127,4 @@ public boolean isUowSymlinksIncludeCadenceRange() {
     public void setUowSymlinksIncludeCadenceRange(boolean isUowSymlinksIncludeCadenceRange) {
         this.isUowSymlinksIncludeCadenceRange = isUowSymlinksIncludeCadenceRange;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/supervisor/TaskRequestHandler.java b/src/main/java/gov/nasa/ziggy/supervisor/TaskRequestHandler.java
new file mode 100644
index 0000000..b0e3bd5
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/supervisor/TaskRequestHandler.java
@@ -0,0 +1,280 @@
+package gov.nasa.ziggy.supervisor;
+
+import static gov.nasa.ziggy.module.AlgorithmExecutor.ZIGGY_PROGRAM;
+
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.PriorityBlockingQueue;
+
+import org.apache.commons.exec.CommandLine;
+import org.hibernate.Hibernate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.pipeline.PipelineExecutor;
+import gov.nasa.ziggy.pipeline.PipelineOperations;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask.State;
+import gov.nasa.ziggy.pipeline.definition.TaskCounts;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.services.alert.AlertService;
+import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.services.messages.TaskRequest;
+import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.services.process.ExternalProcessUtils;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.Requestor;
+import gov.nasa.ziggy.worker.PipelineWorker;
+
+/**
+ * Interacts with the worker task queue to handle task requests. Hands off incoming messages to a
+ * {@link PipelineWorker} to execute.
+ *
+ * @author Todd Klaus
+ * @author Sean McCauliff
+ * @author PT
+ */
+public class TaskRequestHandler implements Runnable, Requestor {
+    private static final Logger log = LoggerFactory.getLogger(TaskRequestHandler.class);
+
+    private final int workerId;
+    private final int workerCount;
+    private final int heapSizeMb;
+    private final PriorityBlockingQueue<TaskRequest> taskRequestQueue;
+    private final UUID uuid = UUID.randomUUID();
+    private final long pipelineDefinitionNodeId;
+    private final CountDownLatch handlerShutdownCountdownLatch;
+
+    /** For testing only. */
+    private final Set<TaskRequest> taskRequests = new TreeSet<>();
+
+    public TaskRequestHandler(int workerId, int workerCount, int heapSizeMb,
+        PriorityBlockingQueue<TaskRequest> taskRequestQueue, long pipelineDefinitionNodeId,
+        CountDownLatch handlerShutdownCountdownLatch) {
+        this.workerId = workerId;
+        this.workerCount = workerCount;
+        this.heapSizeMb = heapSizeMb;
+        this.taskRequestQueue = taskRequestQueue;
+        this.pipelineDefinitionNodeId = pipelineDefinitionNodeId;
+        this.handlerShutdownCountdownLatch = handlerShutdownCountdownLatch;
+    }
+
+    /**
+     * Waits for a new task to become available on the supervisor's task queue. When the task
+     * becomes available, creates a {@link PipelineWorker} in an {@link ExternalProcess} to process
+     * the task.
+     * <p>
+     * The {@link TaskRequestHandler} instance lasts for as long as a given pipeline module is
+     * processing. At the end of processing a module, all the worker threads are destroyed. New
+     * threads with new instances of {@link TaskRequestHandler} are constructed when the next
+     * pipeline module begins processing.
+     */
+    @Override
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
+    public void run() {
+        log.debug("run() - start");
+        try {
+            while (!Thread.currentThread().isInterrupted()) {
+
+                // If execution blocks here, it will eventually unblock when either a task request
+                // becomes available, or the thread gets interrupted resulting in an
+                // InterruptedException.
+                TaskRequest taskRequest = taskRequestQueue.take();
+
+                // If the pipeline definition node ID has changed, it means that the pipeline
+                // is ready to transition from one definition node to the next. Given that the
+                // next node may need a different number of workers, all the TaskRequestHandlers
+                // should shut down when they see that this has happened.
+                if (taskRequest.getPipelineDefinitionNodeId() != pipelineDefinitionNodeId) {
+                    log.info("Transitioning to pipeline definition node "
+                        + taskRequest.getPipelineDefinitionNodeId()
+                        + " so shutting down task request handler");
+
+                    // Also, in this case, the task has to be put back onto the queue.
+                    taskRequestQueue.put(taskRequest);
+                    Thread.currentThread().interrupt();
+                    continue;
+                }
+                taskRequests.add(taskRequest);
+
+                // For testing purposes, we can allow negative values for the pipeline definition
+                // node id.
+                if (taskRequest.getPipelineDefinitionNodeId() < 0) {
+                    continue;
+                }
+                ExternalProcess externalProcess = ExternalProcess
+                    .simpleExternalProcess(commandLine(taskRequest));
+
+                // If execution blocks here, it will stay blocked until the worker process exits
+                // (successfully or otherwise). However, if the supervisor shuts down, it will send
+                // shutdown messages to all the workers, which will cause all the worker external
+                // processes to exit. That will bring us back here, where we will find that the
+                // thread has been interrupted and we exit the while loop.
+                int status = externalProcess.execute();
+
+                // If the external process returned a nonzero status, we need to ensure that
+                // the task is correctly marked as errored and that the instance is properly
+                // updated.
+                boolean readyForTransition = (boolean) DatabaseTransactionFactory
+                    .performTransaction(() -> {
+                        PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
+                        PipelineOperations pipelineOperations = new PipelineOperations();
+                        PipelineTask task = pipelineTaskCrud.retrieve(taskRequest.getTaskId());
+
+                        // If the external process returned a nonzero status, we need to ensure that
+                        // the task is correctly marked as errored and that the instance is properly
+                        // updated.
+                        if (status != 0) {
+
+                            // If the external process exited with bad status because its task was
+                            // deliberately killed, we want to present this information as an alert
+                            // and in the log.
+                            if (TaskRequestHandlerLifecycleManager
+                                .taskOnKilledTaskList(taskRequest.getTaskId())) {
+                                log.info("Task " + taskRequest.getTaskId() + " killed by user");
+                                AlertService alertService = AlertService.getInstance();
+                                alertService.generateAndBroadcastAlert("PI",
+                                    taskRequest.getTaskId(), AlertService.Severity.ERROR,
+                                    "Task " + taskRequest.getTaskId()
+                                        + " killed during local execution.");
+                            } else {
+                                log.error("Marking task " + taskRequest.getTaskId()
+                                    + " failed because PipelineWorker return value == " + status);
+
+                                AlertService alertService = AlertService.getInstance();
+                                alertService.generateAndBroadcastAlert("PI",
+                                    taskRequest.getTaskId(), AlertService.Severity.ERROR,
+                                    "Task marked as errored due to WorkerProcess return value "
+                                        + status);
+                            }
+                            if (task.getState() != PipelineTask.State.ERROR) {
+                                pipelineOperations.setTaskState(task, State.ERROR);
+                                pipelineTaskCrud.merge(task);
+                            }
+                        }
+                        return task.getState().equals(PipelineTask.State.COMPLETED);
+                    });
+
+                // Note that the worker will return when the task reaches p-state Ac, at which point
+                // it's still processing; the AlgorithmMonitor then submits it back into the task
+                // queue, at which point another worker will get the task to state COMPLETE. If this
+                // is the end of the first task (i.e., the one that stopped at Ac), we don't want to
+                // try to transition!
+                if (readyForTransition) {
+                    transitionToNextInstanceNode(taskRequest.getTaskId());
+                }
+            }
+        } catch (InterruptedException e) {
+
+            // If we got here, then the worker threads have been instructed to shut down.
+            // Set the interrupt flag so we can exit the while loop.
+            Thread.currentThread().interrupt();
+        } finally {
+            handlerShutdownCountdownLatch.countDown();
+        }
+    }
+
+    /**
+     * Performs the transition from one pipeline module to the next. The process includes the
+     * following steps:
+     * <ol>
+     * <li>Determine whether the user wants execution to halt with the current module, if so go no
+     * further.
+     * <li>Update task counts for the current module.
+     * <li>Update the state of the current pipeline instance.
+     * <li>If the
+     * {@link PipelineExecutor#transitionToNextInstanceNode(PipelineInstance, PipelineTask, TaskCounts)}
+     * method returns tasks, use {@link PipelineExecutor} to submit them to the task queue. These
+     * tasks are the tasks for the next pipeline module, if transition to that module is
+     * appropriate.
+     * </ol>
+     */
+    private void transitionToNextInstanceNode(long taskId) {
+        PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
+        PipelineTask task = (PipelineTask) DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineTask pipelineTask = pipelineTaskCrud.retrieve(taskId);
+
+            // These lines are here to ensure that lazy initialization runs.
+            Hibernate.initialize(pipelineTask.getPipelineInstance());
+            Hibernate.initialize(pipelineTask.getModuleImplementation());
+            return pipelineTask;
+        });
+        boolean success = task.getState().equals(PipelineTask.State.COMPLETED);
+        PipelineModule currentModule = task.getModuleImplementation();
+        if (currentModule != null && currentModule.isHaltPipelineOnTaskCompletion()) {
+            log.info("currentPipelineModule.isHaltPipelineOnTaskCompletion == true, "
+                + "so NOT executing transition logic for task " + taskId);
+            return;
+        }
+        log.info("executing transition logic for task " + taskId);
+
+        TaskCounts taskCountsForCurrentNode = (TaskCounts) DatabaseTransactionFactory
+            .performTransaction(
+                () -> new PipelineOperations().taskCounts(task.getPipelineInstanceNode()));
+        PipelineExecutor pipelineExecutor = new PipelineExecutor();
+        PipelineTask mergedTask = task;
+        if (success) {
+            log.info("Executing transition logic");
+
+            pipelineExecutor.transitionToNextInstanceNode(task.getPipelineInstance(), task,
+                taskCountsForCurrentNode);
+
+            mergedTask = (PipelineTask) DatabaseTransactionFactory.performTransaction(() -> {
+                task.setTransitionComplete(true);
+                return pipelineTaskCrud.merge(task);
+            });
+        } else {
+            log.info(
+                "postProcessing: not executing transition logic because of current task failure");
+        }
+        pipelineExecutor.logUpdatedInstanceState(mergedTask.getPipelineInstance());
+    }
+
+    /** For testing only. */
+    Set<TaskRequest> getTaskRequests() {
+        return taskRequests;
+    }
+
+    /**
+     * Generates the command line to start an instance of {@link PipelineWorker} to run the given
+     * task. The command line includes the pipeline-side library paths, the maximum permitted Java
+     * heap size, and information about the task to process.
+     */
+    private CommandLine commandLine(TaskRequest taskRequest) {
+
+        // The command line starts with the ziggy command.
+        CommandLine commandLine = new CommandLine(
+            DirectoryProperties.ziggyBinDir().resolve(ZIGGY_PROGRAM).toString());
+
+        // Next come the JVM arguments -- note that we don't need to set the
+        // classpath to include both Ziggy and pipelines because the ziggy program
+        // handles that automatically.
+        commandLine.addArgument(ExternalProcessUtils.log4jConfigString());
+        commandLine.addArgument(ExternalProcessUtils.javaLibraryPath());
+
+        int processHeapSizeMb = Math.round((float) heapSizeMb / workerCount);
+        commandLine.addArgument("-Xmx" + Integer.toString(processHeapSizeMb) + "M");
+
+        // Now for the worker process fully qualified class name
+        commandLine.addArgument("--class=" + PipelineWorker.class.getName());
+
+        // Now for the worker arguments
+        commandLine.addArgument(Integer.toString(workerId));
+        commandLine.addArgument(Long.toString(taskRequest.getTaskId()));
+        commandLine.addArgument(taskRequest.getRunMode().name());
+        log.debug("Worker command line: " + commandLine.toString());
+
+        return commandLine;
+    }
+
+    @Override
+    public Object requestorIdentifier() {
+        return uuid;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/supervisor/TaskRequestHandlerLifecycleManager.java b/src/main/java/gov/nasa/ziggy/supervisor/TaskRequestHandlerLifecycleManager.java
new file mode 100644
index 0000000..6a56071
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/supervisor/TaskRequestHandlerLifecycleManager.java
@@ -0,0 +1,300 @@
+package gov.nasa.ziggy.supervisor;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.PriorityBlockingQueue;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.PipelineExecutor;
+import gov.nasa.ziggy.pipeline.PipelineOperations;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.services.alert.AlertService;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.services.messages.KillTasksRequest;
+import gov.nasa.ziggy.services.messages.TaskRequest;
+import gov.nasa.ziggy.services.messages.WorkerResources;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.util.ZiggyShutdownHook;
+
+/**
+ * Manages instances of {@link TaskRequestHandler} throughout their lifecycle.
+ * <p>
+ * The initial state of the pipeline is one in which there are no {@link TaskRequestHandler}s, but
+ * there is a method that blocks until a {@link TaskRequest} arrives. At that time the class
+ * instantiates a number of {@link TaskRequestHandler}s based on the worker count specified for the
+ * pipeline definition node of the task. Those {@link TaskRequestHandler}s continue to run until the
+ * tasks for that pipeline definition node have all completed execution. At that time, the
+ * {@link TaskRequestHandler}s are shut down and the class resumes waiting for new task request.
+ * <p>
+ * The {@link TaskRequestHandlerLifecycleManager} is meant to be a singleton instance. One and only
+ * one instance should be constructed and stored in {@link PipelineSupervisor}.
+ *
+ * @author PT
+ */
+public class TaskRequestHandlerLifecycleManager extends Thread {
+
+    private static final Logger log = LoggerFactory
+        .getLogger(TaskRequestHandlerLifecycleManager.class);
+
+    /** Singleton instance */
+    private static TaskRequestHandlerLifecycleManager instance;
+
+    private CountDownLatch taskRequestThreadCountdownLatch;
+    private final PriorityBlockingQueue<TaskRequest> taskRequestQueue = new PriorityBlockingQueue<>();
+    private final Set<Long> killedTaskIds = ConcurrentHashMap.newKeySet();
+
+    // Use a boxed instance so it can be null.
+    private Long pipelineDefinitionNodeId;
+
+    private ExecutorService taskRequestThreadPool;
+
+    // For testing purposes, the TaskRequestDispatcher can optionally store all of the
+    // task request handlers it creates, organized by thread pool instance.
+    private List<List<TaskRequestHandler>> taskRequestHandlers = new ArrayList<>();
+    private final boolean storeTaskRequestHandlers;
+
+    private TaskRequestHandlerLifecycleManager() {
+        this(false);
+    }
+
+    protected TaskRequestHandlerLifecycleManager(boolean storeTaskRequestHandlers) {
+        this.storeTaskRequestHandlers = storeTaskRequestHandlers;
+
+        // Subscribe to task request messages.
+        ZiggyMessenger.subscribe(TaskRequest.class, message -> {
+            taskRequestQueue.put(message);
+        });
+
+        // Subscribe to kill tasks messages.
+        ZiggyMessenger.subscribe(KillTasksRequest.class, message -> {
+            killQueuedTasksAction(message.getTaskIds());
+        });
+    }
+
+    /**
+     * Constructs, initializes, and starts the singleton instance of
+     * {@link TaskRequestHandlerLifecycleManager}.
+     */
+    public static synchronized void initializeInstance() {
+        if (instance != null) {
+            return;
+        }
+        instance = new TaskRequestHandlerLifecycleManager();
+        instance.setDaemon(true);
+        instance.start();
+    }
+
+    /**
+     * Performs the deletion of queued tasks. This consists of removing the task requests from the
+     * task request queue and setting the state of all tasks thus removed to ERROR. The IDs of all
+     * tasks listed in the {@link KillTasksRequest} are added to the supervisor's list of killed
+     * task IDs. This avoids the need to capture the IDs from the worker, the supervisor, and the
+     * batch queues.
+     * <p>
+     * This method is package scoped to facilitate testing.
+     */
+    void killQueuedTasksAction(List<Long> taskIds) {
+        // Add the IDs to the supervisor's list of task IDs for use later when the tasks already
+        // in workers are killed
+        killedTaskIds.addAll(taskIds);
+        log.info("Deleting tasks: {}", taskIds);
+        List<TaskRequest> tasksForDeletion = new ArrayList<>();
+        Set<Long> taskIdsForDeletion = new HashSet<>();
+        for (TaskRequest request : taskRequestQueue) {
+            if (taskIds.contains(request.getTaskId())) {
+                tasksForDeletion.add(request);
+                taskIdsForDeletion.add(request.getTaskId());
+            }
+        }
+        taskRequestQueue.removeAll(tasksForDeletion);
+
+        // For tasks that were waiting to run, i.e. in the submitted state, we need to manually
+        // set them to ERRORed in the database and update all counts and instance states.
+        if (!taskIdsForDeletion.isEmpty()) {
+            DatabaseTransactionFactory.performTransaction(() -> {
+                PipelineTaskCrud pipelineTaskCrud = pipelineTaskCrud();
+                PipelineOperations pipelineOperations = pipelineOperations();
+                List<PipelineTask> tasks = pipelineTaskCrud.retrieveAll(taskIdsForDeletion);
+                for (PipelineTask task : tasks) {
+                    pipelineOperations.setTaskState(task, PipelineTask.State.ERROR);
+                }
+                return null;
+            });
+
+            // Issue alerts, too!
+            for (long taskId : taskIdsForDeletion) {
+                alertService().generateAndBroadcastAlert("PI", taskId, AlertService.Severity.ERROR,
+                    "Task " + taskId + " deleted from processing queue.");
+            }
+        }
+    }
+
+    /** CRUD class constructor. Broken out to facilitate testing. */
+    protected PipelineTaskCrud pipelineTaskCrud() {
+        return new PipelineTaskCrud();
+    }
+
+    /** Executor class constructor. Broken out to facilitate testing. */
+    protected PipelineExecutor pipelineExecutor() {
+        return new PipelineExecutor();
+    }
+
+    /** PipelineOperations class constructor. Broken out to facilitate testing. */
+    protected PipelineOperations pipelineOperations() {
+        return new PipelineOperations();
+    }
+
+    /** Alert service class accessor. Broken out to facilitate testing. */
+    protected AlertService alertService() {
+        return AlertService.getInstance();
+    }
+
+    /**
+     * Starts the {@link TaskRequestHandlerLifecycleManager}. Specifically, adds a shutdown hook so
+     * that when the supervisor is shut down the task request handler threads can be shut down as
+     * well, then kicks off the loop that watches for task requests and creates task request handler
+     * instances.
+     */
+    @Override
+    public void run() {
+        ZiggyShutdownHook.addShutdownHook(() -> {
+            shutdown();
+        });
+
+        startLifecycle();
+    }
+
+    /**
+     * Performs the main loop of the class that waits for the {@link TaskRequestWatchdog} to detect
+     * a task request, starts the {@link TaskRequestHandler}s, and waits for the
+     * {@link TaskRequestHandler}s to exit.
+     */
+    private void startLifecycle() {
+
+        try {
+            while (!Thread.currentThread().isInterrupted()) {
+
+                // Wait for a task request to arrive.
+                TaskRequest initialRequest = taskRequestQueue.take();
+
+                // Set the pipeline definition node that all the workers are supposed
+                // to be handling.
+                log.info("Setting supported pipeline definition node ID to {}",
+                    initialRequest.getPipelineDefinitionNodeId());
+                pipelineDefinitionNodeId = initialRequest.getPipelineDefinitionNodeId();
+
+                WorkerResources workerResources = workerResources(initialRequest);
+                int workerCount = workerResources.getMaxWorkerCount();
+                int heapSizeMb = workerResources.getHeapSizeMb();
+
+                // Put the task back onto the queue.
+                taskRequestQueue.put(initialRequest);
+
+                // Construct the TaskRequestHandler threads and the countdown latch.
+                taskRequestThreadCountdownLatch = new CountDownLatch(workerCount);
+                if (workerCount < 1) {
+                    throw new PipelineException("worker count < 1");
+                }
+                log.info("Starting {} workers", workerCount);
+                taskRequestThreadPool = Executors.newFixedThreadPool(workerCount);
+                List<TaskRequestHandler> handlers = new ArrayList<>();
+                for (int i = 0; i < workerCount; i++) {
+                    log.info("Starting worker # {} of {}", i + 1, workerCount);
+                    TaskRequestHandler handler = new TaskRequestHandler(i + 1, workerCount,
+                        heapSizeMb, taskRequestQueue, pipelineDefinitionNodeId,
+                        taskRequestThreadCountdownLatch);
+                    taskRequestThreadPool.submit(handler);
+                    handlers.add(handler);
+                }
+                if (storeTaskRequestHandlers) {
+                    taskRequestHandlers.add(handlers);
+                }
+
+                // Wait for the countdown latch to hit zero.
+                taskRequestThreadCountdownLatch.await();
+
+                // Discard the existing thread pool and loop back to the top to wait for
+                // a new task request.
+                pipelineDefinitionNodeId = null;
+            }
+        } catch (InterruptedException e) {
+            shutdown();
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    /**
+     * Shuts down the {@link TaskRequestHandler} threads and discards the thread pool. This is used
+     * by the shutdown hook and thus must have public scope.
+     */
+    public void shutdown() {
+        taskRequestQueue.clear();
+        if (taskRequestThreadPool != null) {
+            taskRequestThreadPool.shutdownNow();
+        }
+        taskRequestThreadPool = null;
+    }
+
+    WorkerResources workerResources(TaskRequest taskRequest) {
+        return (WorkerResources) DatabaseTransactionFactory
+            .performTransaction(() -> new PipelineTaskCrud().retrieve(taskRequest.getTaskId())
+                .getPipelineDefinitionNode()
+                .workerResources());
+    }
+
+    public static boolean taskOnKilledTaskList(long taskId) {
+        return instance.killedTaskIds.contains(taskId);
+    }
+
+    public static void removeTaskFromKilledTaskList(long taskId) {
+        instance.killedTaskIds.remove(taskId);
+    }
+
+    /** For testing only. */
+    List<List<TaskRequestHandler>> getTaskRequestHandlers() {
+        return taskRequestHandlers;
+    }
+
+    /** For testing only. */
+    ExecutorService getTaskRequestThreadPool() {
+        return taskRequestThreadPool;
+    }
+
+    /** For testing only. */
+    CountDownLatch getTaskRequestThreadCountdownLatch() {
+        return taskRequestThreadCountdownLatch;
+    }
+
+    /**
+     * For testing only. Public scope because the {@link AlgorithmMonitorTest} needs to see whether
+     * the task requests have been properly managed.
+     */
+    public int taskRequestSize() {
+        return taskRequestQueue.size();
+    }
+
+    /** For testing only. */
+    TaskRequest taskRequestQueuePeek() {
+        return taskRequestQueue.peek();
+    }
+
+    /** For testing only. */
+    void addTaskRequestToQueue(TaskRequest request) {
+        taskRequestQueue.add(request);
+    }
+
+    /** For testing only. */
+    Long getPipelineDefinitionNodeId() {
+        return pipelineDefinitionNodeId;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/worker/messaging/TriggerRequestManager.java b/src/main/java/gov/nasa/ziggy/supervisor/TriggerRequestManager.java
similarity index 72%
rename from src/main/java/gov/nasa/ziggy/worker/messaging/TriggerRequestManager.java
rename to src/main/java/gov/nasa/ziggy/supervisor/TriggerRequestManager.java
index 0a6244a..98143ff 100644
--- a/src/main/java/gov/nasa/ziggy/worker/messaging/TriggerRequestManager.java
+++ b/src/main/java/gov/nasa/ziggy/supervisor/TriggerRequestManager.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.worker.messaging;
+package gov.nasa.ziggy.supervisor;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -7,18 +7,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.services.messages.FireTriggerRequest;
 import gov.nasa.ziggy.services.messages.NoRunningOrQueuedPipelinesMessage;
 import gov.nasa.ziggy.services.messages.RunningPipelinesCheckRequest;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
-import gov.nasa.ziggy.services.messaging.WorkerCommunicator;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
 import gov.nasa.ziggy.util.ZiggyShutdownHook;
-import gov.nasa.ziggy.worker.PipelineInstanceManager;
 
 /**
  * Provides lifecycle storage of trigger requests to the worker and manages messages associated with
  * such requests.
  * <p>
- * Specifically, the class responds to {@link WorkerFireTriggerRequest} messages by creating a new
+ * Specifically, the class responds to {@link FireTriggerRequest} messages by creating a new
  * {@link Thread} for an instance of {@link PipelineInstanceManager}, which in turn fires the
  * trigger and manages any subsequent re-firings of the trigger that get scheduled. The class
  * responds to {@link RunningPipelinesCheckRequest} messages by checking whether there are any live
@@ -37,7 +36,7 @@ public class TriggerRequestManager {
      * Constructor. Establishes a shutdown hook that interrupts any {@link Thread}s that are still
      * running active {@link PipelineInstanceManager} instances.
      */
-    public TriggerRequestManager() {
+    private TriggerRequestManager() {
         ZiggyShutdownHook.addShutdownHook(() -> {
             log.info("SHUTDOWN: Shutting down trigger manager threads");
             triggerManagerThreads.shutdownNow();
@@ -45,11 +44,21 @@ public TriggerRequestManager() {
         });
     }
 
+    public static void start() {
+        TriggerRequestManager triggerRequestManager = new TriggerRequestManager();
+        ZiggyMessenger.subscribe(RunningPipelinesCheckRequest.class, message -> {
+            triggerRequestManager.processRequest();
+        });
+        ZiggyMessenger.subscribe(FireTriggerRequest.class, message -> {
+            triggerRequestManager.processRequest(message);
+        });
+    }
+
     /**
      * Launches a {@link PipelineInstanceManager} in a {@link Thread} to respond to a
-     * {@link WorkerFireTriggerRequest} message.
+     * {@link FireTriggerRequest} message.
      */
-    public synchronized void processRequest(WorkerFireTriggerRequest request) {
+    private synchronized void processRequest(FireTriggerRequest request) {
         log.info("Got a message, processing...");
         triggerManagerThreads.execute(() -> {
             new PipelineInstanceManager(request).fireTrigger();
@@ -62,12 +71,11 @@ public synchronized void processRequest(WorkerFireTriggerRequest request) {
      * that the current run(s) are really and truly complete and it can thus turn the pipeline
      * "idiot light" to dark gray.
      */
-    public synchronized void processRequest(RunningPipelinesCheckRequest request) {
+    private synchronized void processRequest() {
         ThreadPoolExecutor e = (ThreadPoolExecutor) triggerManagerThreads;
         if (e.getActiveCount() == 0) {
             log.info("Sending no-more-instances message to console");
-            WorkerCommunicator.broadcast(new NoRunningOrQueuedPipelinesMessage());
+            ZiggyMessenger.publish(new NoRunningOrQueuedPipelinesMessage());
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/services/metrics/logger/package.html b/src/main/java/gov/nasa/ziggy/supervisor/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/services/metrics/logger/package.html
rename to src/main/java/gov/nasa/ziggy/supervisor/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/AboutDialog.java b/src/main/java/gov/nasa/ziggy/ui/AboutDialog.java
index fc0831e..2065047 100644
--- a/src/main/java/gov/nasa/ziggy/ui/AboutDialog.java
+++ b/src/main/java/gov/nasa/ziggy/ui/AboutDialog.java
@@ -1,17 +1,19 @@
 package gov.nasa.ziggy.ui;
 
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.OK;
+
 import java.awt.BorderLayout;
 import java.awt.GridLayout;
+import java.awt.Window;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
 
-import gov.nasa.ziggy.util.ZiggyVersion;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
 
 /**
  * About dialog for the console
@@ -21,12 +23,13 @@
 @SuppressWarnings("serial")
 public class AboutDialog extends javax.swing.JDialog {
 
-    public AboutDialog(JFrame frame) {
-        super(frame, true);
-        initGUI();
+    public AboutDialog(Window owner) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        buildComponent();
+        setLocationRelativeTo(owner);
     }
 
-    private void initGUI() {
+    private void buildComponent() {
         setSize(500, 160);
         getContentPane().add(contentPanel(), BorderLayout.CENTER);
         getContentPane().add(buttonPanel(), BorderLayout.SOUTH);
@@ -39,9 +42,8 @@ private JPanel contentPanel() {
         JPanel contentPanel = new JPanel();
         contentPanel.setLayout(new GridLayout(3, 2));
         contentPanel.add(new JLabel("Software version: ", SwingConstants.RIGHT));
-        contentPanel.add(new JLabel(ZiggyVersion.getSoftwareVersion()));
-        contentPanel.add(new JLabel("Build date: ", SwingConstants.RIGHT));
-        contentPanel.add(new JLabel(ZiggyVersion.getBuildDate().toString()));
+        contentPanel.add(new JLabel(
+            ZiggyConfiguration.getInstance().getString(PropertyName.ZIGGY_VERSION.property())));
         contentPanel.add(new JLabel("URI: ", SwingConstants.RIGHT));
         contentPanel.add(new JLabel("github.com/nasa/ziggy"));
 
@@ -49,7 +51,7 @@ private JPanel contentPanel() {
     }
 
     private JPanel buttonPanel() {
-        JButton closeButton = new JButton("OK");
+        JButton closeButton = new JButton(OK);
         closeButton.addActionListener(event -> {
             setVisible(false);
             dispose();
@@ -60,16 +62,7 @@ private JPanel buttonPanel() {
         return buttonPanel;
     }
 
-    /**
-     * Auto-generated main method to display this JDialog
-     */
     public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JFrame frame = new JFrame();
-            frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-            AboutDialog dialog = new AboutDialog(frame);
-            dialog.setVisible(true);
-            frame.dispose();
-        });
+        ZiggySwingUtils.displayTestDialog(new AboutDialog(null));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/ClusterController.java b/src/main/java/gov/nasa/ziggy/ui/ClusterController.java
index 4d0097c..59d969c 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ClusterController.java
+++ b/src/main/java/gov/nasa/ziggy/ui/ClusterController.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -34,6 +34,8 @@
 
 package gov.nasa.ziggy.ui;
 
+import static gov.nasa.ziggy.supervisor.PipelineSupervisor.supervisorCommand;
+
 import java.io.File;
 import java.io.FilenameFilter;
 import java.nio.file.Files;
@@ -44,14 +46,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.io.FileUtils;
+import org.apache.commons.configuration2.ImmutableConfiguration;
+import org.apache.commons.exec.CommandLine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,26 +67,33 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineModuleDefinitionCrud;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.DatabaseController;
 import gov.nasa.ziggy.services.database.DatabaseTransaction;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 import gov.nasa.ziggy.services.events.ZiggyEventHandlerDefinitionImporter;
+import gov.nasa.ziggy.services.messages.ShutdownMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiClient;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiServer;
 import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.WrapperUtils.WrapperCommand;
+import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
  * Tool to manage the pipeline cluster (here "cluster" means the combination of a database instance,
- * a datastore directory, and a worker process). The available options are:
+ * a datastore directory, and a supervisor process). The available options are:
  * <ol>
  * <li>Initialize the cluster: this means clearing out the existing database and datastore and
  * constructing a fresh database from the schema, plus populating the parameters, data types, and
  * pipeline definitions.
- * <li>Start the cluster: this means updating the Java heap space available for the worker, starting
- * the worker, and starting the database.
- * <li>Stop the cluster: this means stopping the worker and stopping the database.
- * <li>Check cluster status: check that the cluster is initialized and that both the worker and the
- * database are running.
+ * <li>Start the cluster: this means updating the Java heap space available for the workers,
+ * starting the supervisor, and starting the database.
+ * <li>Stop the cluster: this means stopping the workers, stopping the supervisor, and stopping the
+ * database.
+ * <li>Check cluster status: check that the cluster is initialized and that both the supervisor and
+ * the database are running (or available in the case of the database).
  * <li>Start pipeline console: check whether the cluster is running and if so start an instance of
  * the {@link ZiggyGuiConsole} class.
  * </ol>
@@ -101,22 +109,22 @@
  * user must do the following:
  * <ol>
  * <li>Have the DBA create a database account for the user and a database owned by the user.
- * <li>Specify that database name via the {@value PropertyNames#DATABASE_NAME_PROP_NAME} property in
- * the properties file.
- * <li>Ensure that the {@value PropertyNames#DATABASE_DIR_PROP_NAME} property is empty or missing.
+ * <li>Specify that database name via the {@link PropertyName#DATABASE_NAME} property in the
+ * properties file.
+ * <li>Ensure that the {@link PropertyName#DATABASE_DIR} property is empty or missing.
  * </ol>
  * <p>
  * If the database name is not a supported database, the user will also have to do the following:
  * <ol>
- * <li>Ensure that the {@value PropertyNames#DATABASE_SOFTWARE_PROP_NAME} property is empty,
- * missing, or contains a string not in the list of supported databases.
- * <li>Specify the database SQL dialect via the {@value PropertyNames#HIBERNATE_DIALECT_PROP_NAME}
- * property in the properties file.
+ * <li>Ensure that the {@link PropertyName#DATABASE_SOFTWARE} property is empty, missing, or
+ * contains a string not in the list of supported databases.
+ * <li>Specify the database SQL dialect via the {@link PropertyName#HIBERNATE_DIALECT} property in
+ * the properties file.
  * <li>Specify the fully-qualified Java class to use as a driver for communication with the database
- * via the {@value PropertyNames#HIBERNATE_DRIVER_PROP_NAME} property in the properties file. The
- * driver must be on Ziggy's classpath.
+ * via the {@link PropertyName#HIBERNATE_DRIVER} property in the properties file. The driver must be
+ * on Ziggy's classpath.
  * <li>Update the build to create a schema for the database.
- * <li>Manually load this database schema, as well as the pipeline definitions by calling runjava
+ * <li>Manually load this database schema, as well as the pipeline definitions by calling ziggy
  * p*import.
  * </ol>
  *
@@ -125,7 +133,8 @@
  */
 public class ClusterController {
 
-    public static final Logger log = LoggerFactory.getLogger(ClusterController.class);
+    private static final Logger log = LoggerFactory.getLogger(ClusterController.class);
+    private static final String NAME = "ClusterController";
 
     // Parameters related to cluster initialization
     private static final String PARAM_LIBRARY_PREFIX = "pl-";
@@ -134,23 +143,18 @@ public class ClusterController {
     private static final String EVENT_HANDLER_DEF_FILE_PREFIX = "pe-";
     private static final String XML_SUFFIX = ".xml";
 
-    private static final String WRAPPER_LIBRARY_PATH_PROP_NAME_PREFIX = "wrapper.java.library.path.";
-    private static final String WRAPPER_JAVA_ADDITIONAL_PROP_NAME_PREFIX = "wrapper.java.additional.";
-    private static final String WRAPPER_APP_PARAMETER_PROP_NAME_PREFIX = "wrapper.app.parameter.";
-
-    // Parameters related to the worker process
-    private static final String WORKER_BIN_NAME = "worker";
+    // Parameters related to the supervisor process
     private static final int WORKER_HEAP_SIZE_DEFAULT = 16000;
     private static final int WORKER_THREAD_COUNT_DEFAULT = 1;
-    private static final int WORKER_THREAD_COUNT_ALL_CORES = 0; // use number of cores
-    private static final String WORKER_LOG_FILE_NAME = "worker.log";
+    private static final int WORKER_COUNT_ALL_CORES = 0; // use number of cores
 
-    private static final String RUNJAVA_CONSOLE_COMMAND = "runjava console";
+    private static final String ZIGGY_CONSOLE_COMMAND = "ziggy console";
 
     // Cluster options
     private static final String FORCE_OPTION = "force";
+    private static final String HELP_OPTION = "help";
     private static final String WORKER_HEAP_SIZE_OPTION = "workerHeapSize";
-    private static final String WORKER_THREAD_COUNT_OPTION = "workerThreadCount";
+    private static final String WORKER_COUNT_OPTION = "workerCount";
 
     // Commands
     private static final String INIT_COMMAND = "init";
@@ -158,9 +162,12 @@ public class ClusterController {
     private static final String STOP_COMMAND = "stop";
     private static final String STATUS_COMMAND = "status";
     private static final String CONSOLE_COMMAND = "console";
+    private static final String VERSION_COMMAND = "version";
     private static final List<String> ALL_COMMANDS = ImmutableList.of(INIT_COMMAND, START_COMMAND,
-        STOP_COMMAND, STATUS_COMMAND, CONSOLE_COMMAND);
+        STOP_COMMAND, STATUS_COMMAND, CONSOLE_COMMAND, VERSION_COMMAND);
 
+    // Uncategorized constants
+    private static final long DATABASE_SETTLE_MILLIS = 4000L;
     private static final String COMMAND_HELP = """
 
         Commands:
@@ -169,20 +176,19 @@ public class ClusterController {
         stop                    Stop the cluster
         status                  Check cluster status
         console                 Start pipeline console GUI
+        version                 Display the version (as a Git tag)
 
         Options:""";
 
     private final DatabaseController databaseController;
 
     private final int workerHeapSize;
-    private final int workerThreadCount;
+    private final int workerCount;
 
-    public ClusterController(int workerHeapSize, int workerThreadCount) {
+    public ClusterController(int workerHeapSize, int workerCount) {
         databaseController = DatabaseController.newInstance();
         this.workerHeapSize = workerHeapSize;
-        this.workerThreadCount = workerThreadCount != WORKER_THREAD_COUNT_ALL_CORES
-            ? workerThreadCount
-            : cpuCount();
+        this.workerCount = workerCount != WORKER_COUNT_ALL_CORES ? workerCount : cpuCount();
     }
 
     private int cpuCount() {
@@ -200,22 +206,23 @@ public static void main(String[] args) {
                 .longOpt(FORCE_OPTION)
                 .desc("Force initialization if cluster is already initialized")
                 .build())
+            .addOption(Option.builder("h").longOpt(HELP_OPTION).desc("Show this help").build())
             .addOption(Option.builder()
                 .longOpt(WORKER_HEAP_SIZE_OPTION)
                 .hasArg()
                 .desc("Total heap size used by all workers (MB)")
                 .build())
             .addOption(Option.builder()
-                .longOpt(WORKER_THREAD_COUNT_OPTION)
+                .longOpt(WORKER_COUNT_OPTION)
                 .hasArg()
                 .desc("Number of worker threads or 0 to use all cores")
                 .build());
 
-        CommandLine cmdLine = null;
+        org.apache.commons.cli.CommandLine cmdLine = null;
         try {
             cmdLine = new DefaultParser().parse(options, args);
         } catch (ParseException e) {
-            usageAndExit(options, e);
+            usageAndExit(options, e.getMessage());
         }
         // If no commands, go to usage and exit.
         List<String> commands = cmdLine.getArgList();
@@ -230,18 +237,17 @@ public static void main(String[] args) {
         int workerHeapSize = -1;
         int workerThreadCount = -1;
         try {
-            Configuration config = ZiggyConfiguration.getInstance();
+            ImmutableConfiguration config = ZiggyConfiguration.getInstance();
             if (cmdLine.hasOption(WORKER_HEAP_SIZE_OPTION)) {
                 workerHeapSize = Integer.parseInt(cmdLine.getOptionValue(WORKER_HEAP_SIZE_OPTION));
             } else {
-                workerHeapSize = config.getInt(PropertyNames.WORKER_HEAP_SIZE_PROP_NAME,
+                workerHeapSize = config.getInt(PropertyName.WORKER_HEAP_SIZE.property(),
                     WORKER_HEAP_SIZE_DEFAULT);
             }
-            if (cmdLine.hasOption(WORKER_THREAD_COUNT_OPTION)) {
-                workerThreadCount = Integer
-                    .parseInt(cmdLine.getOptionValue(WORKER_THREAD_COUNT_OPTION));
+            if (cmdLine.hasOption(WORKER_COUNT_OPTION)) {
+                workerThreadCount = Integer.parseInt(cmdLine.getOptionValue(WORKER_COUNT_OPTION));
             } else {
-                workerThreadCount = config.getInt(PropertyNames.WORKER_THREAD_COUNT_PROP_NAME,
+                workerThreadCount = config.getInt(PropertyName.WORKER_COUNT.property(),
                     WORKER_THREAD_COUNT_DEFAULT);
             }
         } catch (NumberFormatException e) {
@@ -270,7 +276,7 @@ public static void main(String[] args) {
             try {
                 clusterController.initializeCluster(cmdLine.hasOption(FORCE_OPTION));
             } catch (Exception e) {
-                usageAndExit(null, e);
+                usageAndExit("Failed to initialize cluster", e);
             }
         }
 
@@ -290,17 +296,21 @@ public static void main(String[] args) {
             clusterController.startPipelineConsole();
         }
 
+        if (commands.contains(VERSION_COMMAND)) {
+            log.info(
+                ZiggyConfiguration.getInstance().getString(PropertyName.ZIGGY_VERSION.property()));
+        }
     }
 
     private static List<String> unrecognizedCommands(List<String> commands) {
         return commands.stream()
             .filter(s -> !ALL_COMMANDS.contains(s))
             .collect(Collectors.toList());
-
     }
 
     private void initializeCluster(boolean force) throws Exception {
-        if (isWorkerRunning() || databaseController != null && databaseController.status() == 0) {
+        if (isSupervisorRunning()
+            || databaseController != null && databaseController.status() == 0) {
             throw new PipelineException("Cannot reinitialize cluster when cluster is running");
         }
         if (isInitialized() && !force) {
@@ -310,43 +320,45 @@ private void initializeCluster(boolean force) throws Exception {
 
         if (databaseController != null) {
             if (databaseController.isSystemDatabase()) {
-                log.info("INIT: deleting contents of existing database");
+                log.info("Deleting contents of existing database");
                 databaseController.dropDatabase();
-                log.info("INIT: deleting contents of existing database...done");
+                log.info("Deleting contents of existing database...done");
             } else {
-                log.info("INIT: deleting existing database directory");
-                FileUtils.deleteDirectory(DirectoryProperties.databaseDir().toFile());
-                log.info("INIT: deleting existing database directory...done");
+                log.info("Deleting existing database directory {}",
+                    DirectoryProperties.databaseDir());
+                FileUtil.deleteDirectoryTree(DirectoryProperties.databaseDir(), true);
+                log.info("Deleting existing database directory...done");
             }
         }
 
-        log.info("INIT: deleting existing datastore directory");
-        FileUtils.deleteDirectory(DirectoryProperties.datastoreRootDir().toFile());
-        log.info("INIT: deleting existing datastore directory...done");
+        log.info("Deleting existing datastore directory");
+        FileUtil.deleteDirectoryTree(DirectoryProperties.datastoreRootDir(), true);
+        log.info("Deleting existing datastore directory...done");
 
         if (databaseController != null) {
-            log.info("INIT: creating database");
+            log.info("Creating database");
             databaseController.createDatabase();
-            log.info("INIT: creating database...done");
+            log.info("Creating database...done");
         }
 
-        log.info("INIT: creating datastore directory");
+        log.info("Creating datastore directory");
         if (!DirectoryProperties.datastoreRootDir().toFile().mkdirs()) {
-            throw new PipelineException("Unable to create directory defined by "
-                + PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME);
+            throw new PipelineException(
+                "Unable to create directory defined by " + PropertyName.DATASTORE_ROOT_DIR);
         }
-        log.info("INIT: creating datastore directory...done");
+        log.info("Creating datastore directory...done");
 
-        int dbStartRetCode = databaseController.start();
+        int dbStartRetCode = databaseController != null ? databaseController.start()
+            : DatabaseController.NOT_SUPPORTED;
         if (dbStartRetCode == DatabaseController.NOT_SUPPORTED) {
-            log.info("INIT: system database should be started already");
+            log.info("Database should be available");
         } else if (dbStartRetCode != 0) {
             throw new PipelineException("Unable to start initialized database");
         }
 
-        log.info("INIT: Creating utility pipeline modules...");
+        log.info("Creating utility pipeline modules...");
         createUtilityPipelineModules();
-        log.info("INIT: Creating utility pipeline modules...done");
+        log.info("Creating utility pipeline modules...done");
 
         DatabaseTransactionFactory.performTransaction(new DatabaseTransaction<Void>() {
             @Override
@@ -359,8 +371,8 @@ public Void transaction() throws Exception {
                         + pipelineDefsDir.toString() + " does not exist");
                 }
 
-                log.info("INIT: importing parameter libraries from directory "
-                    + pipelineDefsDir.toString());
+                log.info(
+                    "Importing parameter libraries from directory " + pipelineDefsDir.toString());
                 File[] parameterFiles = pipelineDefsDir.toFile()
                     .listFiles(
                         (FilenameFilter) (dir, name) -> (name.startsWith(PARAM_LIBRARY_PREFIX)
@@ -368,25 +380,24 @@ public Void transaction() throws Exception {
                 Arrays.sort(parameterFiles, Comparator.comparing(File::getName));
                 ParametersOperations paramsOps = new ParametersOperations();
                 for (File parameterFile : parameterFiles) {
-                    log.info("INIT: importing library " + parameterFile.getName());
+                    log.info("Importing library " + parameterFile.getName());
                     paramsOps.importParameterLibrary(parameterFile, null, ParamIoMode.STANDARD);
                 }
 
-                log.info(
-                    "INIT: importing data file types from directory " + pipelineDefsDir.toString());
+                log.info("Importing data file types from directory " + pipelineDefsDir.toString());
                 File[] dataTypeFiles = pipelineDefsDir.toFile()
                     .listFiles((FilenameFilter) (dir,
                         name) -> (name.startsWith(TYPE_FILE_PREFIX) && name.endsWith(XML_SUFFIX)));
                 Arrays.sort(dataTypeFiles, Comparator.comparing(File::getName));
                 List<String> dataTypeFileNames = new ArrayList<>(dataTypeFiles.length);
                 for (File dataTypeFile : dataTypeFiles) {
-                    log.info("INIT: adding " + dataTypeFile.getName() + " to imports list");
+                    log.info("Adding " + dataTypeFile.getName() + " to imports list");
                     dataTypeFileNames.add(dataTypeFile.getAbsolutePath());
                 }
                 new DataFileTypeImporter(dataTypeFileNames, false).importFromFiles();
 
-                log.info("INIT: importing pipeline definitions from directory "
-                    + pipelineDefsDir.toString());
+                log.info(
+                    "Importing pipeline definitions from directory " + pipelineDefsDir.toString());
                 File[] pipelineDefinitionFiles = pipelineDefsDir.toFile()
                     .listFiles(
                         (FilenameFilter) (dir, name) -> (name.startsWith(PIPELINE_DEF_FILE_PREFIX)
@@ -394,14 +405,13 @@ public Void transaction() throws Exception {
                 Arrays.sort(pipelineDefinitionFiles, Comparator.comparing(File::getName));
                 List<File> pipelineDefFileList = new ArrayList<>();
                 for (File pipelineDefinitionFile : pipelineDefinitionFiles) {
-                    log.info(
-                        "INIT: adding " + pipelineDefinitionFile.getName() + " to imports list");
+                    log.info("Adding " + pipelineDefinitionFile.getName() + " to imports list");
                     pipelineDefFileList.add(pipelineDefinitionFile);
                 }
                 new PipelineDefinitionOperations().importPipelineConfiguration(pipelineDefFileList);
 
-                log.info("INIT: importing event definitions from directory "
-                    + pipelineDefsDir.toString());
+                log.info(
+                    "Importing event definitions from directory " + pipelineDefsDir.toString());
                 File[] handlerDefinitionFiles = pipelineDefsDir.toFile()
                     .listFiles((FilenameFilter) (dir,
                         name) -> (name.startsWith(EVENT_HANDLER_DEF_FILE_PREFIX)
@@ -414,11 +424,12 @@ public Void transaction() throws Exception {
 
             @Override
             public void finallyBlock() {
-                databaseController.stop();
+                if (databaseController != null) {
+                    databaseController.stop();
+                }
             }
-
         });
-        log.info("INIT: database initialization and creation complete");
+        log.info("Database initialization and creation complete");
     }
 
     /**
@@ -432,7 +443,7 @@ private void createUtilityPipelineModules() {
 
         DatabaseTransactionFactory.performTransaction(() -> {
             new PipelineModuleDefinitionCrud()
-                .createOrUpdate(DataReceiptPipelineModule.createDataReceiptPipelineForDb());
+                .merge(DataReceiptPipelineModule.createDataReceiptPipelineForDb());
             return null;
         });
     }
@@ -442,87 +453,44 @@ private boolean isInitialized() {
     }
 
     private boolean isClusterRunning() {
-        return isDatabaseRunning() && isWorkerRunning();
+        return isDatabaseAvailable() && isSupervisorRunning();
     }
 
     /**
-     * If an unsupported or system database is in use, we have to assume it is running.
-     *
-     * @return false if we know for sure the database is not running; true if we know for sure or
-     * don't know
+     * Returns false if we know for sure the database is not running; true if we know for sure or
+     * don't know.
      */
-    public boolean isDatabaseRunning() {
-        return databaseController == null
-            || databaseController.status() == DatabaseController.NOT_SUPPORTED
-            || databaseController.status() == 0;
+    public boolean isDatabaseAvailable() {
+        return switch (databaseStatus()) {
+            case 0 -> true;
+            case DatabaseController.NOT_SUPPORTED -> true;
+            default -> false;
+        };
     }
 
-    public boolean isWorkerRunning() {
-        WorkerCommandLine workerStatusCommand = workerCommand(WorkerCommand.STATUS);
-        log.debug("Command line: " + workerStatusCommand);
-        return ExternalProcess.simpleExternalProcess(workerStatusCommand).execute() == 0;
+    public int databaseStatus() {
+        return databaseController != null ? databaseController.status()
+            : DatabaseController.NOT_SUPPORTED;
     }
 
-    private enum WorkerCommand {
-        START, STOP, STATUS;
-
-        @Override
-        public String toString() {
-            return name().toLowerCase();
-        }
-    }
-
-    private WorkerCommandLine workerCommand(WorkerCommand cmd) {
-        Path workerPath = DirectoryProperties.ziggyBinDir().resolve(WORKER_BIN_NAME);
-        WorkerCommandLine commandLine = new WorkerCommandLine(workerPath.toString());
-        if (cmd == WorkerCommand.START) {
-            // Refer to worker.wrapper.conf for appropriate indices for the parameters specified
-            // here.
-            String ziggyLibDir = DirectoryProperties.ziggyLibDir().toString();
-            commandLine
-                .addWorkerOption(PropertyNames.WRAPPER_LOG_FILE_PROP_NAME,
-                    DirectoryProperties.workerLogDir().resolve(WORKER_LOG_FILE_NAME).toString())
-                .addWorkerOption(PropertyNames.WRAPPER_HEAP_SIZE_PROP_NAME,
-                    Integer.toString(workerHeapSize))
-                .addWorkerOption(
-                    wrapperParameterString(PropertyNames.WRAPPER_CLASSPATH_PROP_NAME, 1),
-                    DirectoryProperties.ziggyHomeDir().resolve("libs").resolve("*.jar").toString())
-                .addWorkerOption(wrapperParameterString(WRAPPER_LIBRARY_PATH_PROP_NAME_PREFIX, 1),
-                    ziggyLibDir)
-                .addWorkerOption(
-                    wrapperParameterString(WRAPPER_JAVA_ADDITIONAL_PROP_NAME_PREFIX, 5),
-                    "-Djna.library.path=" + ziggyLibDir)
-                .addWorkerOption(wrapperParameterString(WRAPPER_APP_PARAMETER_PROP_NAME_PREFIX, 2),
-                    Integer.toString(workerThreadCount));
-
-            // Add classpaths for pipeline side, if any are needed.
-            String pipelineClasspath = ZiggyConfiguration.getInstance()
-                .getString(PropertyNames.PIPELINE_CLASSPATH_PROP_NAME, null);
-            if (pipelineClasspath != null) {
-                String[] pipelineClasspaths = pipelineClasspath.split(":");
-                for (int i = 0; i < pipelineClasspaths.length; i++) {
-                    int classpathIndex = i + 2;
-                    commandLine.addWorkerOption(
-                        wrapperParameterString(PropertyNames.WRAPPER_CLASSPATH_PROP_NAME,
-                            classpathIndex),
-                        pipelineClasspaths[i]);
-                }
-            }
-        }
-
-        return commandLine.addArgument(cmd.toString());
+    public boolean isSupervisorRunning() {
+        CommandLine supervisorStatusCommand = supervisorCommand(WrapperCommand.STATUS, workerCount,
+            workerHeapSize);
+        log.debug("Command line: " + supervisorStatusCommand);
+        return ExternalProcess.simpleExternalProcess(supervisorStatusCommand).execute() == 0;
     }
 
     /**
-     * Returns a wrapper parameter string such as wrapper.app.parameter.1.
-     *
-     * @param index counter to append to parameter prefix
-     * @param wrapperPropNamePrefix wrapper parameter prefix
+     * Waits the given number of milliseconds for a process to settle. Some processes, like
+     * Postgres, will shut down and exit if they are pinged too soon.
      */
-    private String wrapperParameterString(String wrapperPropNamePrefix, int index) {
-        StringBuilder s = new StringBuilder();
-        s.append(wrapperPropNamePrefix).append(index);
-        return s.toString();
+    private void waitForProcessToSettle(long millis) {
+        try {
+            log.debug("Waiting for process to settle");
+            Thread.sleep(millis);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
     }
 
     private void startCluster(boolean force) {
@@ -538,8 +506,8 @@ private void startCluster(boolean force) {
         }
 
         try {
-            if (isDatabaseRunning()) {
-                log.info("Database already running");
+            if (isDatabaseAvailable()) {
+                log.info("Database available");
             } else {
                 log.info("Starting database");
                 if (databaseController == null) {
@@ -547,6 +515,7 @@ private void startCluster(boolean force) {
                 } else {
                     int dbStartStatus = databaseController.start();
                     if (dbStartStatus == 0) {
+                        waitForProcessToSettle(DATABASE_SETTLE_MILLIS);
                         log.info("Database started");
                     } else if (dbStartStatus == DatabaseController.NOT_SUPPORTED) {
                         log.info("Not starting a system database");
@@ -556,18 +525,19 @@ private void startCluster(boolean force) {
                 }
             }
 
-            if (isWorkerRunning()) {
-                log.info("Worker already running");
+            if (isSupervisorRunning()) {
+                log.info("Supervisor already running");
             } else {
-                log.info("Starting worker");
-                log.debug("Creating directory " + DirectoryProperties.workerLogDir());
-                Files.createDirectories(DirectoryProperties.workerLogDir());
-                WorkerCommandLine workerStatusCommand = workerCommand(WorkerCommand.START);
-                log.debug("Command line: " + workerStatusCommand.toString());
-                ExternalProcess.simpleExternalProcess(workerStatusCommand)
+                log.info("Starting supervisor");
+                log.debug("Creating directory " + DirectoryProperties.supervisorLogDir());
+                Files.createDirectories(DirectoryProperties.supervisorLogDir());
+                CommandLine supervisorStartCommand = supervisorCommand(WrapperCommand.START,
+                    workerCount, workerHeapSize);
+                log.debug("Command line: " + supervisorStartCommand.toString());
+                ExternalProcess.simpleExternalProcess(supervisorStartCommand)
                     .exceptionOnFailure()
                     .execute();
-                log.info("Worker started");
+                log.info("Supervisor started");
             }
             log.info("Cluster started");
         } catch (Throwable t) {
@@ -578,14 +548,27 @@ private void startCluster(boolean force) {
     }
 
     private void stopCluster() {
-        log.info("Worker stopping");
-        WorkerCommandLine workerStopCommand = workerCommand(WorkerCommand.STOP);
-        log.debug("Command line: " + workerStopCommand.toString());
-        ExternalProcess.simpleExternalProcess(workerStopCommand).execute(true);
-        if (!isWorkerRunning()) {
-            log.info("Worker stopped");
+        // Start RMI in order to publish the shutdown message.
+        int rmiPort = ZiggyConfiguration.getInstance()
+            .getInt(PropertyName.SUPERVISOR_PORT.property(), ZiggyRmiServer.RMI_PORT_DEFAULT);
+        log.info("Starting ZiggyRmiClient instance with registry on port " + rmiPort);
+        try {
+            ZiggyRmiClient.initializeInstance(rmiPort, NAME);
+            log.info("Starting ZiggyRmiClient instance...done");
+            ZiggyMessenger.publish(new ShutdownMessage());
+        } catch (PipelineException e) {
+            log.info("Starting ZiggyRmiClient instance...(no server to talk to)");
+        }
+
+        log.info("Supervisor stopping");
+        CommandLine supervisorStopCommand = supervisorCommand(WrapperCommand.STOP, workerCount,
+            workerHeapSize);
+        log.debug("Command line: " + supervisorStopCommand.toString());
+        ExternalProcess.simpleExternalProcess(supervisorStopCommand).execute(true);
+        if (!isSupervisorRunning()) {
+            log.info("Supervisor stopped");
         } else {
-            log.error("Unable to stop worker process!");
+            log.error("Unable to stop supervisor process!");
         }
         log.info("Database stopping");
         if (databaseController == null) {
@@ -600,20 +583,23 @@ private void stopCluster() {
                 log.error("Unable to stop database!");
             }
         }
+        ZiggyRmiClient.reset();
         log.info("Cluster stopped");
+
+        // Force exit due to the RMI client.
+        System.exit(0);
     }
 
     private void status() {
-        boolean supportedDatabase = databaseController != null;
-        boolean systemDatabase = supportedDatabase
-            && databaseController.status() == DatabaseController.NOT_SUPPORTED;
-
+        int databaseStatus = databaseStatus();
         log.info("Cluster is " + (isInitialized() ? "initialized" : "NOT initialized"));
-        log.info("Worker is " + (isWorkerRunning() ? "running" : "NOT running"));
-        log.info((systemDatabase ? "System database is " : "Database is ")
-            + (isDatabaseRunning() ? "running" : "NOT running"));
-        log.info(
-            "Cluster is " + (isInitialized() && isDatabaseRunning() && isWorkerRunning() ? "running"
+        log.info("Supervisor is " + (isSupervisorRunning() ? "running" : "NOT running"));
+        log.info("Database "
+            + (databaseStatus == 0 ? "is"
+                : databaseStatus == DatabaseController.NOT_SUPPORTED ? "should be" : "is NOT")
+            + " available");
+        log.info("Cluster is "
+            + (isInitialized() && isDatabaseAvailable() && isSupervisorRunning() ? "running"
                 : "NOT running"));
     }
 
@@ -623,59 +609,33 @@ private void startPipelineConsole() {
                 "Cannot start pipeline console when cluster is not running");
         }
         String consoleCommand = DirectoryProperties.ziggyBinDir()
-            .resolve(RUNJAVA_CONSOLE_COMMAND)
+            .resolve(ZIGGY_CONSOLE_COMMAND)
             .toString();
         log.debug("Command line: " + consoleCommand);
         ExternalProcess.simpleExternalProcess(consoleCommand).execute(false);
     }
 
-    private static void usageAndExit(Options options, Throwable e) {
-        Throwable rootCause = e;
-        StringBuilder s = new StringBuilder();
-        while (rootCause != null) {
-            s.append(rootCause.getClass().toString());
-            rootCause = rootCause.getCause();
-            if (rootCause != null) {
-                s.append(": ");
-            }
-        }
-        usageAndExit(options, s.length() > 0 ? s.toString() : e != null ? e.toString() : null);
+    private static void usageAndExit(Options options, String message) {
+        usageAndExit(options, message, null);
     }
 
-    private static void usageAndExit(Options options, String message) {
-        if (message != null) {
-            System.err.println(message);
-        }
+    private static void usageAndExit(String message, Throwable e) {
+        usageAndExit(null, message, e);
+    }
+
+    private static void usageAndExit(Options options, String message, Throwable e) {
+        // Until we've gotten through argument parsing, emit errors to stderr. Once we start the
+        // program, we'll be logging and throwing exceptions.
         if (options != null) {
+            if (message != null) {
+                System.err.println(message);
+            }
             new HelpFormatter().printHelp("ClusterController [options] command...", COMMAND_HELP,
                 options, null);
-
+        } else if (e != null) {
+            log.error(message, e);
         }
-        System.exit(-1);
-    }
-
-    /**
-     * Convenience class that allows us to use both the Apache commons CLI command line class and
-     * the Apache commons Exec command line class without using the fully-qualified class of either
-     * one in all the places it appears. It also provides a specialized method for adding a worker
-     * option to the command line.
-     *
-     * @author PT
-     */
-    private static class WorkerCommandLine extends org.apache.commons.exec.CommandLine {
 
-        public WorkerCommandLine(String command) {
-            super(command);
-        }
-
-        @Override
-        public WorkerCommandLine addArgument(String command) {
-            super.addArgument(command);
-            return this;
-        }
-
-        public WorkerCommandLine addWorkerOption(String optionName, String optionValue) {
-            return addArgument(optionName + "=" + optionValue);
-        }
+        System.exit(-1);
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/PipelineUIException.java b/src/main/java/gov/nasa/ziggy/ui/PipelineUIException.java
deleted file mode 100644
index 60ec94c..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/PipelineUIException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package gov.nasa.ziggy.ui;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class PipelineUIException extends Exception {
-    public PipelineUIException() {
-        // TODO Auto-generated constructor stub
-    }
-
-    /**
-     * @param message
-     */
-    public PipelineUIException(String message) {
-        super(message);
-        // TODO Auto-generated constructor stub
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public PipelineUIException(String message, Throwable cause) {
-        super(message, cause);
-        // TODO Auto-generated constructor stub
-    }
-
-    /**
-     * @param cause
-     */
-    public PipelineUIException(Throwable cause) {
-        super(cause);
-        // TODO Auto-generated constructor stub
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/UiDatabaseException.java b/src/main/java/gov/nasa/ziggy/ui/UiDatabaseException.java
index c46f968..1d2c7a5 100644
--- a/src/main/java/gov/nasa/ziggy/ui/UiDatabaseException.java
+++ b/src/main/java/gov/nasa/ziggy/ui/UiDatabaseException.java
@@ -2,7 +2,7 @@
 
 import org.hibernate.Session;
 
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
 
 /**
  * This exception is thrown by {@link CrudProxy} methods in response to a Hibernate/database error.
@@ -13,7 +13,7 @@
  * @author Todd Klaus
  */
 public class UiDatabaseException extends RuntimeException {
-    private static final long serialVersionUID = -5914169915880060654L;
+    private static final long serialVersionUID = 20230511L;
 
     public UiDatabaseException() {
     }
diff --git a/src/main/java/gov/nasa/ziggy/ui/ZiggyConsole.java b/src/main/java/gov/nasa/ziggy/ui/ZiggyConsole.java
index 62d5288..4d21cb3 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ZiggyConsole.java
+++ b/src/main/java/gov/nasa/ziggy/ui/ZiggyConsole.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
  *
  * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
  * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
@@ -35,14 +35,26 @@
 package gov.nasa.ziggy.ui;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionGroup;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.metrics.report.PerformanceReport;
 import gov.nasa.ziggy.models.ModelRegistryOperations;
-import gov.nasa.ziggy.pipeline.PipelineExecutor;
+import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.PipelineOperations;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
@@ -52,20 +64,23 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceNodeCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.ProcessingSummaryOperations;
 import gov.nasa.ziggy.services.alert.AlertLog;
 import gov.nasa.ziggy.services.alert.AlertLogCrud;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.DatabaseTransaction;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
-import gov.nasa.ziggy.ui.messaging.ConsoleMessageDispatcher;
-import gov.nasa.ziggy.ui.proxy.PipelineExecutorProxy;
+import gov.nasa.ziggy.services.messages.FireTriggerRequest;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiClient;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiServer;
+import gov.nasa.ziggy.ui.util.proxy.PipelineExecutorProxy;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.Iso8601Formatter;
 import gov.nasa.ziggy.util.TasksStates;
 import gov.nasa.ziggy.util.ZiggyShutdownHook;
 import gov.nasa.ziggy.util.dispmod.AlertLogDisplayModel;
@@ -82,562 +97,627 @@
  *
  * @author Todd Klaus
  * @author PT
+ * @author Bill Wohler
  */
 
 public class ZiggyConsole {
-    private static final int DEFAULT_STATUS_WAIT_MILLIS = 10000;
-
-    public ZiggyConsole() {
-    }
-
-    public void processCommand(String[] args) throws Exception {
-        String command = args[0];
-        if (command.equals("instance") || command.equals("i")) {
-            processInstanceCommand(args);
-        } else if (command.equals("task") || command.equals("t")) {
-            processTaskCommand(args);
-        } else if (command.equals("worker") || command.equals("w")) {
-            processWorkerCommand(args);
-        } else if (command.equals("reports") || command.equals("r")) {
-            processReportsCommand(args);
-        } else if (command.equals("fire") || command.equals("f")) {
-            fireTriggerCommand(args);
-        } else if (command.equals("show") || command.equals("s")) {
-            if (args.length <= 2) {
-                System.err.println("Too few arguments for show command");
-                usage();
-                System.exit(-1);
-            }
-            if (args[1].equals("trigger")) {
-                processShowTriggerCommand(Arrays.copyOfRange(args, 2, args.length));
-            } else {
-                System.err.println("Unknown show command option '" + args[1] + "'");
-                usage();
-                System.exit(-1);
-            }
-        } else if (command.equals("Restart") || command.equals("R")) {
-            processRestartCommand(args);
-        } else {
-            System.err.println("Unknown command: " + printCommandLine(args));
-            usage();
-            System.exit(-1);
+    private static final Logger log = LoggerFactory.getLogger(ZiggyConsole.class);
+
+    private static final String NAME = "CLI Console";
+
+    private enum Command {
+        CANCEL, CONFIG, DISPLAY, HELP, LOG, RESET, RESTART, START, VERSION;
+
+        @Override
+        public String toString() {
+            return name().toLowerCase();
         }
     }
 
-    private void processInstanceCommand(String[] args) throws Exception {
-        PipelineInstanceCrud pipelineInstanceCrud = new PipelineInstanceCrud();
+    private enum ConfigType {
+        DATA_MODEL_REGISTRY, INSTANCE, PIPELINE, PIPELINE_NODES;
+    }
 
-        if (args.length == 1) {
-            // i[nstance] : display status of all pipeline instances
-            List<PipelineInstance> instances = pipelineInstanceCrud.retrieveAll();
-            InstancesDisplayModel instancesDisplayModel = new InstancesDisplayModel(instances);
+    private enum DisplayType {
+        ALERTS, ERRORS, FULL, STATISTICS, STATISTICS_DETAILED;
+    }
 
-            instancesDisplayModel.print(System.out, "Pipeline Instances");
-        } else if (args[1].equals("c")) {
-            List<PipelineInstance> activeInstances = pipelineInstanceCrud.retrieveAllActive();
-            System.out.println("Cancelling Active Instances:");
-            for (PipelineInstance instance : activeInstances) {
-                System.out.println(" " + instance.getName());
-            }
-            pipelineInstanceCrud.cancelAllActive();
-        } else {
-            long id = -1;
-            try {
-                id = Long.parseLong(args[1]);
-            } catch (NumberFormatException e) {
-                System.err.println("Invalid ID: " + args[1]);
-                usage();
-                System.exit(-1);
-            }
+    private enum ResetType {
+        ALL, SUBMITTED;
+    }
 
-            PipelineInstance instance = pipelineInstanceCrud.retrieve(id);
+    // Options
+    private static final String CONFIG_TYPE_OPTION = "configType";
+    private static final String DISPLAY_TYPE_OPTION = "displayType";
+    private static final String ERRORS_OPTION = "errors";
+    private static final String HELP_OPTION = "help";
+    private static final String INSTANCE_OPTION = "instance";
+    private static final String PIPELINE_OPTION = "pipeline";
+    private static final String RESET_TYPE_OPTION = "resetType";
+    private static final String TASK_OPTION = "task";
+
+    private static final String COMMAND_HELP = """
+
+        Commands:
+        cancel                 Cancel running pipelines
+        config --configType TYPE [--instance ID | --pipeline NAME]
+                               Display pipeline configuration
+        display [[--displayType TYPE] --instance ID | --task ID]
+                               Display pipeline activity
+        log --task ID | --errors
+                               Request logs for the given task(s)
+        reset --resetType TYPE --instance ID
+                               Put tasks in the ERROR state so they can be restarted
+        restart --task ID ...  Restart tasks
+        start PIPELINE [NAME [START_NODE [STOP_NODE]]]
+                               Start the given pipeline and assign its name to NAME
+                               (default: NAME is the current time, and the NODES are
+                               the first and last nodes of the pipeline respectively)
+        version                Display the version (as a Git tag)
+
+        Options:""";
+
+    private static final int HELP_WIDTH = 100;
+
+    @AcceptableCatchBlock(rationale = Rationale.USAGE)
+    @AcceptableCatchBlock(rationale = Rationale.SYSTEM_EXIT)
+    public static void main(String[] args) throws Exception {
 
-            if (instance == null) {
-                System.err.println("No instance found with ID = " + id);
-                System.exit(-1);
-            }
+        Options options = new Options()
+
+            .addOption(Option.builder("c")
+                .longOpt(CONFIG_TYPE_OPTION)
+                .hasArg()
+                .desc(
+                    "Configuration type (data-model-registry | instance | pipeline | pipeline-nodes)")
+                .build())
+            .addOption(Option.builder("d")
+                .longOpt(DISPLAY_TYPE_OPTION)
+                .desc("Display type (alerts | errors | full | statistics | statistics-detailed)")
+                .hasArg()
+                .build())
+            .addOption(
+                Option.builder("e").longOpt(ERRORS_OPTION).desc("Selects all failed tasks").build())
+            .addOption(Option.builder("h").longOpt(HELP_OPTION).desc("Show this help").build())
+            .addOption(Option.builder("i")
+                .longOpt(INSTANCE_OPTION)
+                .hasArg()
+                .type(Long.class) // if only this did the type checking for us
+                .desc("Instance ID")
+                .build())
+            .addOption(
+                Option.builder("p").longOpt(PIPELINE_OPTION).hasArg().desc("Pipeline name").build())
+            .addOption(Option.builder("r")
+                .longOpt(RESET_TYPE_OPTION)
+                .hasArg()
+                .desc("Reset type (all | submitted)")
+                .build())
+            .addOption(Option.builder("t")
+                .longOpt(TASK_OPTION)
+                .hasArgs()
+                .type(Long.class) // if only this did the type checking for us
+                .desc("Task ID")
+                .build());
+
+        options.addOptionGroup(new OptionGroup()
+
+            .addOption(options.getOption(INSTANCE_OPTION))
+            .addOption(options.getOption(PIPELINE_OPTION))
+            .addOption(options.getOption(TASK_OPTION)));
+
+        CommandLine cmdLine = null;
+        try {
+            cmdLine = new DefaultParser().parse(options, args);
+        } catch (ParseException e) {
+            usageAndExit(options, e.getMessage());
+        }
+        if (cmdLine.hasOption(HELP_OPTION)) {
+            usageAndExit(options, (String) null);
+        }
 
-            InstancesDisplayModel instancesDisplayModel = new InstancesDisplayModel(instance);
-            instancesDisplayModel.print(System.out, "Instance Summary");
-            System.out.println();
-
-            if (args.length == 2) {
-                // i[nstance] ID : display status and task count summary of
-                // specified pipeline instance
-
-                PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-                List<PipelineTask> tasks = pipelineTaskCrud.retrieveTasksForInstance(instance);
-
-                Map<Long, ProcessingSummary> taskAttrs = new ProcessingSummaryOperations()
-                    .processingSummaries(tasks);
-                displayTaskSummary(tasks, taskAttrs);
-            } else {
-                String subCommand = args[2];
-
-                if (subCommand.equals("full") || subCommand.equals("f")) {
-                    // i[nstance] ID f[ull]: display status of all tasks for
-                    // specified pipeline instance
-
-                    PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-                    List<PipelineTask> tasks = pipelineTaskCrud.retrieveTasksForInstance(instance);
-                    Map<Long, ProcessingSummary> taskAttrs = new ProcessingSummaryOperations()
-                        .processingSummaries(tasks);
-
-                    displayTaskSummary(tasks, taskAttrs);
-                    TasksDisplayModel tasksDisplayModel = new TasksDisplayModel(tasks, taskAttrs);
-                    tasksDisplayModel.print(System.out, "Pipeline Tasks");
-                } else if (subCommand.equals("reset")) {
-                    if (args.length < 4) {
-                        System.err.println("The reset command requires an additional arg: "
-                            + printCommandLine(args));
-                        usage();
-                        System.exit(-1);
-                    }
+        // If no commands, launch the GUI
+        List<String> commands = cmdLine.getArgList();
+        if (commands.isEmpty()) {
+            ZiggyGuiConsole.launch();
+            return;
+        }
 
-                    String taskType = args[3];
-
-                    if (taskType.equals("s")) {
-                        resetPipelineInstance(instance, false, null);
-                    } else if (taskType.equals("a")) {
-                        resetPipelineInstance(instance, true, null);
-                    } else if (taskType.matches(".*\\d.*")) {
-                        // If the arg contains a digit, then assume it's a list of taskIds
-                        resetPipelineInstance(instance, true, taskType);
-                    } else {
-                        System.err.println("Unknown reset arg: " + printCommandLine(args));
-                        usage();
-                        System.exit(-1);
-                    }
-                } else if (subCommand.equals("report") || subCommand.equals("r")) {
-                    // i[nstance] ID r[eport]: display report for specified
-                    // pipeline instance
-
-                    PipelineOperations ops = new PipelineOperations();
-                    String report = ops.generatePedigreeReport(instance);
-                    System.out.println(report);
-                    PerformanceReport perfReport = new PerformanceReport(instance.getId(),
-                        DirectoryProperties.taskDataDir().toFile(), null);
-                    perfReport.generateReport();
-                } else if (subCommand.equals("alerts") || subCommand.equals("a")) {
-                    // i[nstance] ID a[lerts]: display alerts for specified
-                    // pipeline instance
-
-                    AlertLogCrud alertLogCrud = new AlertLogCrud();
-                    List<AlertLog> alerts = alertLogCrud
-                        .retrieveForPipelineInstance(instance.getId());
-                    AlertLogDisplayModel alertLogDisplayModel = new AlertLogDisplayModel(alerts);
-                    alertLogDisplayModel.print(System.out, "Alerts");
-                } else if (subCommand.equals("statistics") || subCommand.equals("s")) {
-                    // i[nstance] ID s[statistics]: display processing time statistics for
-                    // specified pipeline instance
-
-                    PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-                    List<PipelineTask> tasks = pipelineTaskCrud.retrieveTasksForInstance(instance);
-
-                    Map<Long, ProcessingSummary> taskAttrs = new ProcessingSummaryOperations()
-                        .processingSummaries(tasks);
-
-                    TasksStates tasksStates = displayTaskSummary(tasks, taskAttrs);
-                    List<String> orderedModuleNames = tasksStates.getModuleNames();
-
-                    PipelineStatsDisplayModel pipelineStatsDisplayModel = new PipelineStatsDisplayModel(
-                        tasks, orderedModuleNames);
-                    pipelineStatsDisplayModel.print(System.out, "Processing Time Statistics");
-
-                    TaskMetricsDisplayModel taskMetricsDisplayModel = new TaskMetricsDisplayModel(
-                        tasks, orderedModuleNames);
-                    taskMetricsDisplayModel.print(System.out,
-                        "Processing Time Breakdown (completed tasks only)");
-                } else if (subCommand.equals("errors") || subCommand.equals("e")) {
-                    // i[nstance] ID e[rrors]: display status and worker logs for all failed
-                    // tasks for specified pipeline instance
-
-                    PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-                    List<PipelineTask> tasks = pipelineTaskCrud.retrieveAll(instance,
-                        PipelineTask.State.ERROR);
-
-                    Map<Long, ProcessingSummary> taskAttrs = new ProcessingSummaryOperations()
-                        .processingSummaries(tasks);
+        Command command = null;
+        try {
+            command = checkForAmbiguousCommand(commands.get(0));
+            commands.remove(0);
+            new ZiggyConsole().runCommand(command, cmdLine, commands);
+        } catch (IllegalArgumentException e) {
+            usageAndExit(options, e.getMessage());
+        } catch (Exception e) {
+            // This is a runtime error so don't show options.
+            usageAndExit(e.getMessage(), e);
+        }
 
-                    for (PipelineTask task : tasks) {
-                        TasksDisplayModel tasksDisplayModel = new TasksDisplayModel(task,
-                            taskAttrs.get(task.getId()));
-                        tasksDisplayModel.print(System.out, "Task Summary");
+        System.exit(0);
+    }
+
+    private static void usageAndExit(Options options, String message) {
+        usageAndExit(options, message, null);
+    }
 
-                        System.out.println();
-                        System.out.println("Worker log: ");
+    private static void usageAndExit(String message, Throwable e) {
+        usageAndExit(null, message, e);
+    }
 
-//                            System.out.println(WorkerTaskLogRequest.requestTaskLog(task));
-                    }
-                } else {
-                    System.err.println("Unknown instance subcommand: " + printCommandLine(args));
-                    usage();
-                    System.exit(-1);
-                }
+    private static void usageAndExit(Options options, String message, Throwable e) {
+        // Until we've gotten through argument parsing, emit errors to stderr. Once we start the
+        // program, we'll be logging and throwing exceptions.
+        if (options != null) {
+            if (message != null) {
+                System.err.println(message);
             }
+            new HelpFormatter().printHelp(HELP_WIDTH, "ZiggyConsole [options] command...",
+                COMMAND_HELP, options, null);
+        } else if (e != null) {
+            log.error(message, e);
         }
+
+        System.exit(-1);
     }
 
     /**
-     * @param instance
-     * @param allStalledTasks If true, reset SUBMITTED and PROCESSING tasks, else just SUBMITTED
-     * tasks
+     * Checks that the possibly abbreviated user command matches 1 and only 1 known command. That
+     * command is returned; otherwise, an {@link IllegalArgumentException} is thrown.
      */
-    private void resetPipelineInstance(PipelineInstance instance, boolean allStalledTasks,
-        String taskIds) {
-        long instanceId = instance.getId();
-
-        /*
-         * Set the pipeline task state to ERROR for any tasks assigned to this worker that are in
-         * the PROCESSING state. This condition indicates that the previous instance of the worker
-         * process on this host died abnormally
-         */
-        DatabaseTransactionFactory.performTransaction(() -> {
-            PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-            pipelineTaskCrud.resetTaskStates(instanceId, allStalledTasks, taskIds);
-            return null;
-        });
-
-        /*
-         * Update the pipeline instance state for the instances associated with the stale tasks from
-         * above since that change may result in a change to the instances
-         */
-        DatabaseTransactionFactory.performTransaction(() -> {
-            PipelineExecutor pe = new PipelineExecutor();
+    private static Command checkForAmbiguousCommand(String userCommand) {
+        Set<Command> commands = new HashSet<>();
+        for (Command command : Command.values()) {
+            if (command.toString().startsWith(userCommand)) {
+                commands.add(command);
+            }
+        }
+        if (commands.size() > 1) {
+            throw new IllegalArgumentException(
+                "Ambiguous command: " + userCommand + " (could be: " + commands + ")");
+        }
+        if (commands.size() == 0) {
+            throw new IllegalArgumentException("Unknown command " + userCommand);
+        }
 
-            // handle the corner case in which the task counts in the instance nodes
-            // have gotten out of sync with the task counts in the tasks themselves
+        return commands.iterator().next();
+    }
 
-            new PipelineInstanceNodeCrud().updateTaskCountsFromTasks(instanceId);
-            pe.updateInstanceState(instance);
-            return null;
+    private static void startZiggyClient() {
+        int rmiPort = ZiggyConfiguration.getInstance()
+            .getInt(PropertyName.SUPERVISOR_PORT.property(), ZiggyRmiServer.RMI_PORT_DEFAULT);
+        ZiggyRmiClient.initializeInstance(rmiPort, NAME);
+        ZiggyShutdownHook.addShutdownHook(() -> {
+            ZiggyRmiClient.reset();
         });
+    }
 
+    private void runCommand(Command command, CommandLine cmdLine, List<String> commands)
+        throws Exception {
+
+        switch (command) {
+            case CANCEL -> cancel();
+            case CONFIG -> config(cmdLine);
+            case DISPLAY -> display(cmdLine);
+            case HELP -> throw new IllegalArgumentException("");
+            case LOG -> log();
+            case RESET -> reset(cmdLine);
+            case RESTART -> restart(cmdLine);
+            case START -> start(commands);
+            case VERSION -> System.out.println(
+                ZiggyConfiguration.getInstance().getString(PropertyName.ZIGGY_VERSION.property()));
+        }
     }
 
-    private TasksStates displayTaskSummary(List<PipelineTask> tasks,
-        Map<Long, ProcessingSummary> taskAttrs) throws Exception {
-        TaskSummaryDisplayModel taskSummaryDisplayModel = new TaskSummaryDisplayModel(
-            new TasksStates(tasks, taskAttrs));
-        taskSummaryDisplayModel.print(System.out, "Instance Task Summary");
-        return taskSummaryDisplayModel.getTaskStates();
+    private void cancel() {
+        List<PipelineInstance> activeInstances = new PipelineInstanceCrud().retrieveAllActive();
+        System.out.println("Cancelling running pipelines:");
+        for (PipelineInstance instance : activeInstances) {
+            System.out.println(" " + instance.getName());
+        }
+        new PipelineInstanceCrud().cancelAllActive();
     }
 
-    private void processTaskCommand(String[] args) throws Exception {
-        if (args.length == 2 || args.length == 3 || args.length == 4) {
-            PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-            long id = -1;
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void config(CommandLine cmdLine) {
+        switch (parseConfigType(cmdLine)) {
+            case DATA_MODEL_REGISTRY:
+                System.out.println("Data Model Registry\n");
+                ModelRegistryOperations modelMetadataOps = new ModelRegistryOperations();
+                System.out.println(modelMetadataOps.report());
+                break;
+            case INSTANCE:
+                System.out.println("Pipeline Instance Configuration(s)\n");
+                if (cmdLine.hasOption(INSTANCE_OPTION)) {
+                    PipelineInstance instance = pipelineInstance(
+                        cmdLine.getOptionValue(INSTANCE_OPTION));
+                    System.out.println(new PipelineOperations().generatePedigreeReport(instance));
+                } else {
+                    for (PipelineInstance instance : new PipelineInstanceCrud().retrieveAll()) {
+                        System.out
+                            .println(new PipelineOperations().generatePedigreeReport(instance));
+                    }
+                }
+                break;
+            case PIPELINE:
+                System.out.println("Pipeline Configuration(s)\n");
+                List<PipelineDefinition> pipelines;
+                if (cmdLine.hasOption(PIPELINE_OPTION)) {
+                    pipelines = new PipelineDefinitionCrud()
+                        .retrieveAllVersionsForName(cmdLine.getOptionValue(PIPELINE_OPTION));
+                } else {
+                    pipelines = new PipelineDefinitionCrud().retrieveAll();
+                }
+                for (PipelineDefinition pipeline : pipelines) {
+                    System.out.println(new PipelineOperations().generatePipelineReport(pipeline));
+                }
+                break;
+            case PIPELINE_NODES:
+                if (!cmdLine.hasOption(PIPELINE_OPTION)) {
+                    throw new IllegalArgumentException("A pipeline name is not specified");
+                }
+                showPipelineNodes(cmdLine.getOptionValue(PIPELINE_OPTION));
+                break;
+        }
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private ConfigType parseConfigType(CommandLine cmdLine) {
+        ConfigType configType = null;
+        if (cmdLine.hasOption(CONFIG_TYPE_OPTION)) {
             try {
-                id = Long.parseLong(args[1]);
-            } catch (NumberFormatException e) {
-                System.err.println("Invalid ID: " + args[1]);
-                usage();
-                System.exit(-1);
+                // Allow input to be lowercase and to use dashes instead of underscores.
+                configType = ConfigType.valueOf(
+                    cmdLine.getOptionValue(CONFIG_TYPE_OPTION).toUpperCase().replace("-", "_"));
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException("The config type "
+                    + cmdLine.getOptionValue(CONFIG_TYPE_OPTION) + " is not recognized");
             }
+        }
+        if (configType == null) {
+            throw new IllegalArgumentException("The config type is not specified");
+        }
 
-            PipelineTask task = pipelineTaskCrud.retrieve(id);
+        return configType;
+    }
 
-            ProcessingSummary taskAttr = new ProcessingSummaryOperations().processingSummary(id);
+    private boolean showPipelineNodes(String pipelineName) {
+        DatabaseTransactionFactory.performTransaction(new DatabaseTransaction<Void>() {
 
-            if (task == null) {
-                System.err.println("No task found with ID = " + id);
-                System.exit(-1);
+            @Override
+            public void catchBlock(Throwable e) {
+                System.out.println("Unable to retrieve pipeline: " + e);
             }
 
-            TasksDisplayModel tasksDisplayModel = new TasksDisplayModel(task, taskAttr);
-            tasksDisplayModel.print(System.out, "Task Summary");
-            System.out.println();
-
-            if (args.length >= 3) {
-                String subCommand = args[2];
-
-                if (subCommand.equals("log") || subCommand.equals("l")) {
-                    // t[ask] ID l[og] : display status and log (fetched from worker) for selected
-                    // task
-
-                    System.out.println("Requesting log from worker...");
+            @Override
+            public Void transaction() throws Exception {
+                PipelineDefinition pipelineDefinition = new PipelineDefinitionCrud()
+                    .retrieveLatestVersionForName(pipelineName);
+                if (pipelineDefinition == null) {
+                    System.err.println("Pipeline " + pipelineName + " not found");
+                    return null;
+                }
 
-//                    System.out.println(WorkerTaskLogRequest.requestTaskLog(task));
-                } else {
-                    System.err.println("Unknown task subcommand: " + printCommandLine(args));
-                    usage();
-                    System.exit(-1);
+                System.out.println("Nodes for pipeline " + pipelineName + ":");
+                int index = 1;
+                for (PipelineDefinitionNode node : pipelineDefinition.getRootNodes()) {
+                    index += showPipelineNode(node, index);
                 }
+                return null;
             }
-        } else {
-            System.err.println("Too many arguments: " + printCommandLine(args));
-            usage();
-            System.exit(-1);
-        }
+        });
+        return true;
     }
 
-    private String printCommandLine(String[] args) {
-        StringBuilder sb = new StringBuilder();
-        for (String arg : args) {
-            sb.append(arg + " ");
+    private int showPipelineNode(PipelineDefinitionNode node, int index) {
+        int count = 1;
+        System.out.println(String.format("%6d: %s", index, node.getModuleName()));
+        for (PipelineDefinitionNode sibling : node.getNextNodes()) {
+            count += showPipelineNode(sibling, index + count);
         }
-        return sb.toString();
+
+        return count;
     }
 
-    private void processWorkerCommand(String[] args) {
-        int waitTimeMillis = DEFAULT_STATUS_WAIT_MILLIS;
+    private void display(CommandLine cmdLine) {
+        PipelineInstance instance = null;
+        PipelineTask task = null;
+        if (cmdLine.hasOption(INSTANCE_OPTION)) {
+            instance = pipelineInstance(cmdLine.getOptionValue(INSTANCE_OPTION));
+        } else if (cmdLine.hasOption(TASK_OPTION)) {
+            task = pipelineTask(cmdLine.getOptionValue(TASK_OPTION));
+        }
+        DisplayType displayType = parseDisplayType(cmdLine);
+
+        boolean displayed = false;
+        if (displayType != null) {
+            displayed = switch (displayType) {
+                case ALERTS -> displayAlert(instance);
+                case ERRORS -> displayErrors(instance);
+                case STATISTICS -> displayStatistics(instance);
+                case STATISTICS_DETAILED -> displayDetailedStatistics(instance);
+                default -> false;
+            };
+        }
+        if (displayed) {
+            return;
+        }
 
-        if (args.length == 2) {
-            try {
-                waitTimeMillis = Integer.parseInt(args[1]) * 1000;
-            } catch (NumberFormatException e) {
-                System.err.println("Invalid Wait time: " + args[1]);
-                usage();
-                System.exit(-1);
-            }
+        if (instance != null) {
+            InstancesDisplayModel instancesDisplayModel = new InstancesDisplayModel(instance);
+            instancesDisplayModel.print(System.out, "Instance Summary");
+            displayTaskSummary(instance, displayType == DisplayType.FULL);
+        } else if (task != null) {
+            ProcessingSummary taskAttr = new ProcessingSummaryOperations()
+                .processingSummary(task.getId());
+            TasksDisplayModel tasksDisplayModel = new TasksDisplayModel(task, taskAttr);
+            tasksDisplayModel.print(System.out, "Task Summary");
+        } else {
+            List<PipelineInstance> instances = new PipelineInstanceCrud().retrieveAll();
+            new InstancesDisplayModel(instances).print(System.out, "Pipeline Instances");
         }
+    }
 
-        try {
-            Thread.sleep(waitTimeMillis);
-        } catch (InterruptedException e) {
+    private PipelineInstance pipelineInstance(String instanceOption) {
+        long id = parseId(instanceOption);
+
+        PipelineInstance instance = new PipelineInstanceCrud().retrieve(id);
+        if (instance == null) {
+            throw new PipelineException("No instance found with ID " + id);
         }
 
-        System.exit(0);
+        return instance;
     }
 
-    private void processReportsCommand(String[] args) {
-        if (args.length == 2) {
-            String reportType = args[1];
-            PipelineOperations pipelineOps = new PipelineOperations();
-            if (reportType.equals("i") || reportType.equals("instance")) {
-                PipelineInstanceCrud instanceCrud = new PipelineInstanceCrud();
-                List<PipelineInstance> instances = instanceCrud.retrieveAll();
+    private PipelineTask pipelineTask(String taskOption) {
+        long id = parseId(taskOption);
 
-                System.out.println("***** Pipeline Instance Reports *****");
+        PipelineTask task = new PipelineTaskCrud().retrieve(id);
+        if (task == null) {
+            throw new PipelineException("No task found with ID " + id);
+        }
 
-                for (PipelineInstance instance : instances) {
-                    String instanceReport = pipelineOps.generatePedigreeReport(instance);
-                    System.out.println(instanceReport);
-                    System.out.println();
-                    System.out.println();
-                }
-            } else if (reportType.equals("t") || reportType.equals("trigger")) {
-                List<PipelineDefinition> pipelines = new PipelineDefinitionCrud().retrieveAll();
+        return task;
+    }
 
-                System.out.println("***** Trigger Reports *****");
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private DisplayType parseDisplayType(CommandLine cmdLine) {
+        DisplayType displayType = null;
 
-                for (PipelineDefinition pipeline : pipelines) {
-                    String triggerReport = pipelineOps.generateTriggerReport(pipeline);
-                    System.out.println(triggerReport);
-                    System.out.println();
-                    System.out.println();
-                }
-            } else if (reportType.equals("d") || reportType.equals("data-model-registry")) {
-                System.out.println("Data Model Registry");
-                System.out.println();
-                ModelRegistryOperations modelMetadataOps = new ModelRegistryOperations();
-                System.out.println(modelMetadataOps.report());
-            } else {
-                System.err.println("Unrecognized report type: " + reportType);
-                usage();
-                System.exit(-1);
+        if (cmdLine.hasOption(DISPLAY_TYPE_OPTION)) {
+            try {
+                // Allow input to be lowercase and to use dashes instead of underscores.
+                displayType = DisplayType.valueOf(
+                    cmdLine.getOptionValue(DISPLAY_TYPE_OPTION).toUpperCase().replace("-", "_"));
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException("The display type "
+                    + cmdLine.getOptionValue(CONFIG_TYPE_OPTION) + " is not recognized");
             }
-        } else {
-            System.err.println("Report type not specified (instance or trigger)");
-            usage();
-            System.exit(-1);
         }
 
-        System.exit(0);
+        return displayType;
     }
 
-    private void fireTriggerCommand(String[] args) {
-        if (args.length < 3) {
-            System.err.println("Too few arguments for firing trigger");
-            usage();
-            System.exit(-1);
-        } else {
-            String triggerName = args[1];
-            String instanceName = args[2];
-
-            String startNodeName = null;
-            String endNodeName = null;
-            if (args.length >= 5) {
-                startNodeName = args[3];
-                endNodeName = args[4];
-            }
+    private boolean displayAlert(PipelineInstance instance) {
+        if (instance == null) {
+            throw new IllegalArgumentException("An instance is not specified");
+        }
+        List<AlertLog> alerts = new AlertLogCrud().retrieveForPipelineInstance(instance.getId());
+        AlertLogDisplayModel alertLogDisplayModel = new AlertLogDisplayModel(alerts);
+        alertLogDisplayModel.print(System.out, "Alerts");
+        return true;
+    }
 
-            fireTrigger(triggerName, instanceName, startNodeName, endNodeName);
+    private boolean displayErrors(PipelineInstance instance) {
+        if (instance == null) {
+            throw new IllegalArgumentException("An instance is not specified");
         }
+        List<PipelineTask> tasks = new PipelineTaskCrud().retrieveAll(instance,
+            PipelineTask.State.ERROR);
 
-        System.exit(0);
+        Map<Long, ProcessingSummary> taskAttrs = new ProcessingSummaryOperations()
+            .processingSummaries(tasks);
+
+        for (PipelineTask task : tasks) {
+            TasksDisplayModel tasksDisplayModel = new TasksDisplayModel(task,
+                taskAttrs.get(task.getId()));
+            tasksDisplayModel.print(System.out, "Task Summary");
+        }
+        return true;
     }
 
-    private void fireTrigger(final String pipelineName, String instanceName, String startNodeName,
-        String endNodeName) {
+    private boolean displayStatistics(PipelineInstance instance) {
+        if (instance == null) {
+            throw new IllegalArgumentException("An instance is not specified");
+        }
+        List<PipelineTask> tasks = new PipelineTaskCrud().retrieveTasksForInstance(instance);
+        List<String> orderedModuleNames = displayTaskSummary(instance, false).getModuleNames();
+
+        PipelineStatsDisplayModel pipelineStatsDisplayModel = new PipelineStatsDisplayModel(tasks,
+            orderedModuleNames);
+        pipelineStatsDisplayModel.print(System.out, "Processing Time Statistics");
+
+        TaskMetricsDisplayModel taskMetricsDisplayModel = new TaskMetricsDisplayModel(tasks,
+            orderedModuleNames);
+        taskMetricsDisplayModel.print(System.out,
+            "Processing Time Breakdown (completed tasks only)");
+        return true;
+    }
 
-        System.out.println("Launching " + pipelineName);
+    private boolean displayDetailedStatistics(PipelineInstance instance) {
+        if (instance == null) {
+            throw new IllegalArgumentException("An instance is not specified");
+        }
+        PerformanceReport perfReport = new PerformanceReport(instance.getId(),
+            DirectoryProperties.taskDataDir().toFile(), null);
+        perfReport.generateReport();
+        return true;
+    }
 
-        PipelineOperations pipelineOps = new PipelineOperations();
-        pipelineOps.sendTriggerMessage(new WorkerFireTriggerRequest(pipelineName, instanceName,
-            startNodeName, endNodeName, 1, 0));
-        System.out.println("Done launching " + pipelineName);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private long parseId(String id) {
+        try {
+            return Long.parseLong(id);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("ID " + id + " is not a number");
+        }
     }
 
-    private void processShowTriggerCommand(String[] args) {
-        if (args.length != 1) {
-            usage();
-            System.exit(-1);
+    private TasksStates displayTaskSummary(PipelineInstance instance, boolean full) {
+        List<PipelineTask> tasks = new PipelineTaskCrud().retrieveTasksForInstance(instance);
+        Map<Long, ProcessingSummary> taskSummaryById = new ProcessingSummaryOperations()
+            .processingSummaries(tasks);
+        TaskSummaryDisplayModel taskSummaryDisplayModel = new TaskSummaryDisplayModel(
+            new TasksStates(tasks, taskSummaryById));
+        taskSummaryDisplayModel.print(System.out, "Instance Task Summary");
+
+        if (full) {
+            TasksDisplayModel tasksDisplayModel = new TasksDisplayModel(tasks, taskSummaryById);
+            tasksDisplayModel.print(System.out, "Pipeline Tasks");
         }
 
-        String triggerName = args[0];
+        return taskSummaryDisplayModel.getTaskStates();
+    }
+
+    private void log() {
+        System.out.println("Not implemented");
+        // TODO Implement log retrieval
+//        startZiggyClient();
+//        if (cmdLine.hasOption(TASK_OPTION)) {
+//            PipelineTask task = pipelineTask(cmdLine.getOptionValue(TASK_OPTION));
+//            System.out.println("Requesting log from worker...");
+//            System.out.println(WorkerTaskLogRequest.requestTaskLog(task));
+//        } else if (cmdLine.hasOption(ERRORS_OPTION)) {
+//            if (!cmdLine.hasOption(INSTANCE_OPTION)) {
+//                throw new IllegalArgumentException("An instance is not specified");
+//            }
+//            PipelineInstance instance = pipelineInstance(cmdLine.getOptionValue(INSTANCE_OPTION));
+//            List<PipelineTask> tasks = new PipelineTaskCrud().retrieveAll(instance,
+//                PipelineTask.State.ERROR);
+//            for (PipelineTask task : tasks) {
+//                System.out.println();
+//                System.out.println("Worker log: ");
+//                System.out.println(WorkerTaskLogRequest.requestTaskLog(task));
+//            }
+//        }
+    }
 
-        DatabaseTransactionFactory.performTransaction(new DatabaseTransaction<Void>() {
+    private void reset(CommandLine cmdLine) {
+        if (!cmdLine.hasOption(INSTANCE_OPTION)) {
+            throw new IllegalArgumentException("An instance is not specified");
+        }
 
-            @Override
-            public void catchBlock(Throwable e) {
-                System.out.println("Unable to fire trigger, caught e = " + e);
-            }
+        PipelineInstance instance = pipelineInstance(cmdLine.getOptionValue(INSTANCE_OPTION));
 
-            @Override
-            public Void transaction() throws Exception {
-                PipelineDefinitionCrud pipelineDefinitionCrud = new PipelineDefinitionCrud();
-                PipelineDefinition pipelineDefinition = pipelineDefinitionCrud
-                    .retrieveLatestVersionForName(triggerName);
-                if (pipelineDefinition == null) {
-                    System.err.println("Trigger '" + triggerName + "' not found");
-                    System.exit(-1);
-                }
+        switch (parseResetType(cmdLine)) {
+            case ALL -> resetPipelineInstance(instance, true);
+            case SUBMITTED -> resetPipelineInstance(instance, false);
+        }
+    }
 
-                System.out.println("Nodes for trigger '" + triggerName + "':");
-                int index = 1;
-                for (PipelineDefinitionNode node : pipelineDefinition.getRootNodes()) {
-                    index += showNode(node, index);
-                }
-                return null;
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private ResetType parseResetType(CommandLine cmdLine) {
+        ResetType resetType = null;
+        if (cmdLine.hasOption(RESET_TYPE_OPTION)) {
+            try {
+                // Allow input to be lowercase and to use dashes instead of underscores.
+                resetType = ResetType.valueOf(
+                    cmdLine.getOptionValue(RESET_TYPE_OPTION).toUpperCase().replace("-", "_"));
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException("The reset type "
+                    + cmdLine.getOptionValue(RESET_TYPE_OPTION) + " is not recognized");
             }
-        });
+        }
+        if (resetType == null) {
+            throw new IllegalArgumentException("The reset type is not specified");
+        }
+
+        return resetType;
     }
 
-    private int showNode(PipelineDefinitionNode node, int index) {
-        int count = 1;
-        System.out.println(String.format("%6d: %s", index, node.getModuleName().getName()));
-        for (PipelineDefinitionNode sibling : node.getNextNodes()) {
-            count += showNode(sibling, index + count);
-        }
+    private void resetPipelineInstance(PipelineInstance instance, boolean allStalledTasks) {
 
-        return count;
+        /*
+         * Set the pipeline task state to ERROR for any tasks assigned to this worker that are in
+         * the PROCESSING state. This condition indicates that the previous instance of the worker
+         * process on this host died abnormally.
+         */
+        DatabaseTransactionFactory.performTransaction(() -> {
+            new PipelineTaskCrud().resetTaskStates(instance.getId(), allStalledTasks);
+            return null;
+        });
     }
 
-    private void processRestartCommand(String[] args) {
-        if (args.length < 2) {
-            System.err.println("No task IDs specified");
-            usage();
-            System.exit(-1);
+    private void restart(CommandLine cmdLine) {
+        if (!cmdLine.hasOption(TASK_OPTION)) {
+            throw new IllegalArgumentException("One or more tasks are not specified");
         }
 
-        Collection<Long> taskIDs = new ArrayList<>();
-        for (int i = 1; i < args.length; ++i) {
-            try {
-                long taskID = Long.parseLong(args[i]);
-                taskIDs.add(taskID);
-            } catch (NumberFormatException ex) {
-                System.err.println("Task ID is not an integer: " + args[i]);
-                usage();
-                System.exit(-1);
-            }
+        startZiggyClient();
+
+        Collection<Long> taskIds = new ArrayList<>();
+        for (String taskId : cmdLine.getOptionValues(TASK_OPTION)) {
+            taskIds.add(parseId(taskId));
         }
 
         DatabaseTransactionFactory.performTransaction(new DatabaseTransaction<Void>() {
             @Override
             public void catchBlock(Throwable e) {
-                System.out.println("Unable to restart tasks, caught e = " + e);
+                System.out.println("Unable to restart tasks: " + e);
             }
 
             @Override
             public Void transaction() throws Exception {
-                List<PipelineTask> tasks = new PipelineTaskCrud().retrieveAll(taskIDs);
-                for (long taskID : taskIDs) {
+                List<PipelineTask> tasks = new PipelineTaskCrud().retrieveAll(taskIds);
+                List<Long> missingTasks = new ArrayList<>();
+                for (long taskId : taskIds) {
                     boolean found = false;
                     for (PipelineTask task : tasks) {
-                        if (task.getId() == taskID) {
+                        if (task.getId() == taskId) {
                             found = true;
                             break;
                         }
                     }
 
                     if (!found) {
-                        throw new IllegalArgumentException("Task not found with ID " + taskID);
+                        missingTasks.add(taskId);
                     }
                 }
+                if (missingTasks.size() > 0) {
+                    System.out.println("Tasks not found with the following IDs: " + missingTasks);
+                    return null;
+                }
+
+                new PipelineExecutorProxy().restartTasks(tasks, RunMode.RESTART_FROM_BEGINNING);
 
-                PipelineExecutorProxy pipelineExecutor = new PipelineExecutorProxy();
-                System.out.println("Restarting " + tasks.size() + " tasks");
-                pipelineExecutor.restartTasks(tasks, RunMode.RESTART_FROM_BEGINNING);
                 return null;
             }
         });
     }
 
-    private static void usage() {
-        System.out.println("picli COMMAND ARGS");
-        System.out.println("  Examples:");
-        System.out.println("    i[nstance] : display status of all pipeline instances");
-        System.out.println(
-            "    i[nstance] ID : display status and task count summary of specified pipeline instance");
-        System.out.println(
-            "    i[nstance] ID f[ull]: display status of all tasks for specified pipeline instance");
-        System.out
-            .println("    i[nstance] ID r[eport]: display report for specified pipeline instance");
-        System.out
-            .println("    i[nstance] ID a[lerts]: display alerts for specified pipeline instance");
-        System.out.println(
-            "    i[nstance] ID s[statistics]: display processing time statistics for specified pipeline instance");
-        System.out.println(
-            "    i[nstance] ID e[rrors]: display status and worker logs for all failed tasks for specified pipeline instance");
-        System.out.println(
-            "    i[nstance] ID reset s: (reset submitted): Puts all SUBMITTED tasks in the specified pipeline instance in the ERROR state so that they can be restarted");
-        System.out.println(
-            "    i[nstance] ID reset a: (reset all): Puts all SUBMITTED or PROCESSING tasks in the specified pipeline instance in the ERROR state so that they can be restarted");
-        System.out.println(
-            "    i[nstance] ID reset task_IDs: (reset task_IDs): Puts all SUBMITTED or PROCESSING tasks in the specified pipeline instance and on the supplied list of task_IDs in the ERROR state so that they can be restarted. task_IDs is a comma-separated list of task IDs with no spaces (For example, 10000 or 100,101,105)");
-        System.out
-            .println("    i[nstance] c[ancel]: Puts all running instances in the STOPPED state");
-        System.out.println("    t[ask] ID : display status for selected task");
-        System.out.println(
-            "    t[ask] ID l[og] : display status and log (fetched from worker) for selected task");
-        System.out.println(
-            "    t[ask] ID c[opy] DESTINATION_PATH : display status and log (fetched from worker) for selected task");
-        System.out.println("    w[orker] : display worker health status (10 second wait)");
-        System.out.println("    w[orker] WAIT : display worker health status (WAIT seconds wait)");
-        System.out.println(
-            "    r[eports] d[ata-model-registry] : current state of the data model registry");
-        System.out.println(
-            "    r[eports] i[instance] : dump all pipeline instance reports (WARNING: could be big & slow!)");
-        System.out.println(
-            "    r[eports] t[rigger] : dump all trigger reports (WARNING: could be big & slow!)");
-        System.out.println(
-            "    f[ire] TRIGGER_NAME INSTANCE_NAME [startnode stopnode] : Fire the specified trigger and assign INSTANCE_NAME as the name of the new pipeline instance");
-        System.out.println("    s[how] trigger TRIGGER_NAME : show nodes in a trigger");
-        System.out.println("    R[estart] task_IDs: restarts specified tasks");
-    }
-
-    public static void main(String[] args) throws Exception {
-
-        if (args.length > 0) { // CLI control
-
-            ZiggyConsole cli = new ZiggyConsole();
+    private void start(List<String> commands) {
+        if (commands.size() < 1) {
+            throw new IllegalArgumentException("A pipeline name is not specified");
+        }
 
-            MessageHandler messageHandler = new MessageHandler(
-                new ConsoleMessageDispatcher(null, null, false));
-            int rmiPort = ZiggyConfiguration.getInstance()
-                .getInt(MessageHandler.RMI_REGISTRY_PORT_PROP,
-                    MessageHandler.RMI_REGISTRY_PORT_PROP_DEFAULT);
-            UiCommunicator.initializeInstance(messageHandler, rmiPort);
-            ZiggyShutdownHook.addShutdownHook(() -> {
-                UiCommunicator.reset();
-            });
+        startZiggyClient();
 
-            cli.processCommand(args);
+        String pipelineName = commands.get(0);
+        String instanceName = commands.size() > 1 ? commands.get(1) : null;
+        String startNodeName = commands.size() > 2 ? commands.get(2) : null;
+        String stopNodeName = commands.size() > 3 ? commands.get(3) : null;
 
-            System.exit(0);
-        } else { // GUI control
-            ZiggyGuiConsole.launch();
+        if (instanceName == null) {
+            instanceName = Iso8601Formatter.dateTimeLocalFormatter().format(new Date());
         }
+
+        System.out.println(String.format("Launching %s: name=%s, start=%s, stop=%s...",
+            pipelineName, instanceName, startNodeName != null ? startNodeName : "",
+            stopNodeName != null ? stopNodeName : ""));
+        ZiggyMessenger.publish(
+            new FireTriggerRequest(pipelineName, instanceName, startNodeName, stopNodeName, 1, 0));
+        System.out.println(String.format("Launching %s: name=%s, start=%s, stop=%s...done",
+            pipelineName, instanceName, startNodeName != null ? startNodeName : "",
+            stopNodeName != null ? stopNodeName : ""));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/ZiggyConsolePanel.java b/src/main/java/gov/nasa/ziggy/ui/ZiggyConsolePanel.java
new file mode 100644
index 0000000..e15f69b
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/ZiggyConsolePanel.java
@@ -0,0 +1,245 @@
+package gov.nasa.ziggy.ui;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CONTAINER_GAP;
+
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.GridBagLayout;
+import java.awt.Image;
+import java.util.function.Supplier;
+
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.ListModel;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.ui.dr.DataReceiptPanel;
+import gov.nasa.ziggy.ui.events.ZiggyEventHandlerPanel;
+import gov.nasa.ziggy.ui.instances.InstancesTasksPanel;
+import gov.nasa.ziggy.ui.metrilyzer.MetrilyzerPanel;
+import gov.nasa.ziggy.ui.module.ViewEditModuleLibraryPanel;
+import gov.nasa.ziggy.ui.parameters.ViewEditParameterSetsPanel;
+import gov.nasa.ziggy.ui.pipeline.ViewEditPipelinesPanel;
+import gov.nasa.ziggy.ui.security.ViewEditRolesPanel;
+import gov.nasa.ziggy.ui.security.ViewEditUsersPanel;
+import gov.nasa.ziggy.ui.status.StatusPanel;
+import gov.nasa.ziggy.ui.util.ViewEditKeyValuePairPanel;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * The main content panel for the Ziggy console.
+ *
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class ZiggyConsolePanel extends JSplitPane {
+
+    /** Initial location of divider between navigation menu and panels. */
+    private static final int DIVIDER_LOCATION = 150;
+
+    // To add new panels:
+    // 1. Add the item to this enum in the order that it should appear. The text is used in
+    // navigation. By default, an item is visible in the navigation and contains content. To hide
+    // the item, set the visible flag to false. If the item doesn't have a panel associated with it,
+    // then set the content to false to display the configured logo. If content is true, provide a
+    // method reference to a method or constructor that returns a Component.
+    private enum ContentItem {
+        LOGO("Logo", false, true, ContentPanel::createLogoCard),
+        PARAMETER_LIBRARY("Parameter Library", ViewEditParameterSetsPanel::newInstance),
+        PIPELINES("Pipelines", ViewEditPipelinesPanel::newInstance),
+        INSTANCES("Instances", InstancesTasksPanel::new),
+        STATUS("Status", StatusPanel::new),
+        DATA_RECEIPT("Data Receipt", DataReceiptPanel::new),
+        EVENT_HANDLERS("Event Definitions", ZiggyEventHandlerPanel::new),
+        MODULE_LIBRARY("Module Library", ViewEditModuleLibraryPanel::new),
+        METRILYZER("Metrilyzer", false, true, MetrilyzerPanel::new),
+        USERS("Users", false, true, ViewEditUsersPanel::new),
+        ROLES("Roles", false, true, ViewEditRolesPanel::new),
+        GENERAL("General", false, true, ViewEditKeyValuePairPanel::new);
+
+        private String label;
+        private boolean visible;
+        private boolean content;
+        private Supplier<Component> create;
+
+        ContentItem(String label, Supplier<Component> create) {
+            this(label, true, true, create);
+        }
+
+        ContentItem(String label, boolean visible, boolean content, Supplier<Component> create) {
+            this.label = label;
+            this.visible = visible;
+            this.content = content;
+            this.create = create;
+        }
+
+        @Override
+        public String toString() {
+            return label;
+        }
+
+        public boolean isVisible() {
+            return visible;
+        }
+
+        boolean hasContent() {
+            return content;
+        }
+
+        public Supplier<Component> create() {
+            return create;
+        }
+    }
+
+    private ContentMenu contentMenu;
+
+    public ZiggyConsolePanel() {
+        ContentPanel contentPanel = new ContentPanel();
+        contentMenu = new ContentMenu(contentPanel);
+        JScrollPane contentMenuScrollPane = new JScrollPane(contentMenu);
+
+        // Add breathing room.
+        contentMenuScrollPane.setViewportBorder(
+            BorderFactory.createLineBorder(contentMenu.getBackground(), CONTAINER_GAP));
+
+        add(contentMenuScrollPane, JSplitPane.LEFT);
+        add(contentPanel, JSplitPane.RIGHT);
+
+        setDividerLocation(DIVIDER_LOCATION);
+        setOneTouchExpandable(true);
+    }
+
+    public ContentMenu getContentMenu() {
+        return contentMenu;
+    }
+
+    public static void main(String[] args) {
+        try {
+            ZiggySwingUtils.displayTestDialog(new ContentPanel());
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * The navigation menu for the console.
+     *
+     * @author Todd Klaus
+     * @author Bill Wohler
+     */
+    private static class ContentMenu extends JList<ContentItem> implements ListSelectionListener {
+
+        @SuppressWarnings("unused")
+        private static final Logger log = LoggerFactory.getLogger(ContentMenu.class);
+
+        private ContentPanel contentPanel;
+
+        public ContentMenu(ContentPanel contentPanel) {
+            super(createModel());
+            this.contentPanel = contentPanel;
+            getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+            setVisibleRowCount(-1);
+            addListSelectionListener(this);
+        }
+
+        private static ListModel<ContentItem> createModel() {
+            DefaultListModel<ContentItem> model = new DefaultListModel<>();
+            for (ContentItem value : ContentItem.values()) {
+                if (value.isVisible()) {
+                    model.addElement(value);
+                }
+            }
+            return model;
+        }
+
+        @Override
+        public void valueChanged(ListSelectionEvent evt) {
+            if (evt.getValueIsAdjusting() || getSelectedValue() == null) {
+                return;
+            }
+
+            setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+            contentPanel.select(getSelectedValue());
+            setCursor(null);
+        }
+    }
+
+    /**
+     * The main Ziggy GUI content panel.
+     *
+     * @author Todd Klaus
+     * @author Bill Wohler
+     */
+    private static class ContentPanel extends javax.swing.JPanel {
+        private static final Logger log = LoggerFactory.getLogger(ContentPanel.class);
+
+        private static int PREFERRED_WIDTH = 400;
+        private static int PREFERRED_HEIGHT = 300;
+
+        public ContentPanel() {
+            buildComponent();
+        }
+
+        private void buildComponent() {
+            setLayout(new CardLayout());
+            setPreferredSize(new Dimension(PREFERRED_WIDTH, PREFERRED_HEIGHT));
+
+            for (ContentItem value : ContentItem.values()) {
+                add(value.create().get(), value.toString());
+            }
+        }
+
+        private static JPanel createLogoCard() {
+            ScalingImagePanel logoCard = new ScalingImagePanel(
+                ZiggyGuiConsole.pipelineOrZiggyImage());
+            logoCard.setLayout(new GridBagLayout());
+            logoCard.setBackground(new java.awt.Color(255, 255, 255));
+
+            return logoCard;
+        }
+
+        public void select(Object selection) {
+            log.debug("selection={}", selection);
+            ContentItem item = (ContentItem) selection;
+            ((CardLayout) getLayout()).show(this,
+                item.hasContent() ? item.toString() : ContentItem.LOGO.toString());
+        }
+
+        private static class ScalingImagePanel extends JPanel {
+
+            private final Image image;
+
+            public ScalingImagePanel(Image image) {
+                this.image = image;
+            }
+
+            @Override
+            public void paintComponent(Graphics g) {
+                super.paintComponent(g);
+
+                // Determine scale to preserve aspect ratio of image.
+                double scale = Math.min((double) getWidth() / image.getWidth(null),
+                    (double) getHeight() / image.getHeight(null));
+
+                // Fit and center image to panel while honoring aspect ratio.
+                int newWidth = (int) (scale * image.getWidth(null));
+                int newHeight = (int) (scale * image.getHeight(null));
+                g.drawImage(image.getScaledInstance(newWidth, newHeight, Image.SCALE_SMOOTH),
+                    (getWidth() - newWidth) / 2, (getHeight() - newHeight) / 2, null);
+            }
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ZiggyGuiConsole.java b/src/main/java/gov/nasa/ziggy/ui/ZiggyGuiConsole.java
index 71080f8..315acf6 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ZiggyGuiConsole.java
+++ b/src/main/java/gov/nasa/ziggy/ui/ZiggyGuiConsole.java
@@ -1,5 +1,12 @@
 package gov.nasa.ziggy.ui;
 
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.ABOUT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.EXIT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.FILE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.HELP;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createMenu;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createMenuItem;
+
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.Image;
@@ -10,94 +17,41 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.List;
-import java.util.Map;
+import java.util.UUID;
 
 import javax.imageio.ImageIO;
-import javax.swing.Icon;
+import javax.swing.GroupLayout;
+import javax.swing.GroupLayout.Alignment;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
-import javax.swing.JMenu;
 import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
 import javax.swing.SwingConstants;
-import javax.swing.plaf.metal.MetalLookAndFeel;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.configuration2.ImmutableConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.jgoodies.looks.plastic.theme.SkyBluer;
-
-import gov.nasa.ziggy.data.management.DataReceiptInstance;
-import gov.nasa.ziggy.parameters.ParameterSetDescriptor;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.Group;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
-import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
-import gov.nasa.ziggy.services.config.KeyValuePair;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
+import gov.nasa.ziggy.services.messages.DefaultWorkerResourcesRequest;
+import gov.nasa.ziggy.services.messages.InvalidateConsoleModelsMessage;
+import gov.nasa.ziggy.services.messages.ShutdownMessage;
+import gov.nasa.ziggy.services.messages.WorkerResources;
+import gov.nasa.ziggy.services.messaging.ProcessHeartbeatManager;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiClient;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiServer;
 import gov.nasa.ziggy.services.security.User;
 import gov.nasa.ziggy.services.security.UserCrud;
-import gov.nasa.ziggy.ui.common.DoubleListDialog;
-import gov.nasa.ziggy.ui.common.GroupsDialog;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.config.ConfigDataPanel;
-import gov.nasa.ziggy.ui.config.ConfigTree;
-import gov.nasa.ziggy.ui.config.datareceipt.DataReceiptInstanceDialog;
-import gov.nasa.ziggy.ui.config.general.KeyValuePairEditDialog;
-import gov.nasa.ziggy.ui.config.group.GroupSelectorDialog;
-import gov.nasa.ziggy.ui.config.module.ModuleEditDialog;
-import gov.nasa.ziggy.ui.config.parameters.ParamLibImportDialog;
-import gov.nasa.ziggy.ui.config.parameters.ParameterClassSelectorDialog;
-import gov.nasa.ziggy.ui.config.parameters.ParameterSetEditDialog;
-import gov.nasa.ziggy.ui.config.parameters.ParameterSetNewDialog;
-import gov.nasa.ziggy.ui.config.pipeline.PipelineEditDialog;
-import gov.nasa.ziggy.ui.config.pipeline.PipelineNodeEditDialog;
-import gov.nasa.ziggy.ui.config.security.UserEditDialog;
-import gov.nasa.ziggy.ui.messaging.ConsoleMessageDispatcher;
-import gov.nasa.ziggy.ui.metrilyzer.MetrilyzerPanel;
-import gov.nasa.ziggy.ui.mon.master.MasterStatusPanel;
-import gov.nasa.ziggy.ui.mon.master.ProcessesIndicatorPanel;
-import gov.nasa.ziggy.ui.mon.master.StatusSummaryPanel;
-import gov.nasa.ziggy.ui.ops.instances.AlertLogDialog;
-import gov.nasa.ziggy.ui.ops.instances.InstanceCostEstimateDialog;
-import gov.nasa.ziggy.ui.ops.instances.InstanceDetailsDialog;
-import gov.nasa.ziggy.ui.ops.instances.InstanceStatsDialog;
-import gov.nasa.ziggy.ui.ops.instances.OpsInstancesPanel;
-import gov.nasa.ziggy.ui.ops.instances.RestartDialog;
-import gov.nasa.ziggy.ui.ops.instances.TaskInfoDialog;
-import gov.nasa.ziggy.ui.ops.instances.TaskLogInformationDialog;
-import gov.nasa.ziggy.ui.ops.instances.TextualReportDialog;
-import gov.nasa.ziggy.ui.ops.parameters.EditParametersDialog;
-import gov.nasa.ziggy.ui.ops.parameters.ParameterSetSelectorDialog;
-import gov.nasa.ziggy.ui.ops.parameters.ViewParametersDialog;
-import gov.nasa.ziggy.ui.ops.triggers.EditTriggerDialog;
-import gov.nasa.ziggy.ui.ops.triggers.FireTriggerDialog;
-import gov.nasa.ziggy.ui.ops.triggers.NewTriggerDialog;
-import gov.nasa.ziggy.ui.ops.triggers.OpsTriggersPanel;
-import gov.nasa.ziggy.ui.ops.triggers.TriggersTreeModel;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-import gov.nasa.ziggy.ui.proxy.CrudProxyExecutor;
-import gov.nasa.ziggy.ui.proxy.UserCrudProxy;
-import gov.nasa.ziggy.util.ZiggyBuild;
+import gov.nasa.ziggy.ui.status.StatusSummaryPanel;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.DatabaseModelRegistry;
+import gov.nasa.ziggy.ui.util.proxy.UserCrudProxy;
+import gov.nasa.ziggy.util.Requestor;
 import gov.nasa.ziggy.util.ZiggyShutdownHook;
-import gov.nasa.ziggy.util.ZiggyVersion;
 
 /**
  * The console GUI.
@@ -108,106 +62,90 @@
  * @author PT
  */
 @SuppressWarnings("serial")
-public class ZiggyGuiConsole extends javax.swing.JFrame {
+public class ZiggyGuiConsole extends javax.swing.JFrame implements Requestor {
     private static final Logger log = LoggerFactory.getLogger(ZiggyGuiConsole.class);
 
-    private static final int MAIN_WINDOW_HEIGHT = 900;
-    private static final int MAIN_WINDOW_WIDTH = 1400;
+    public static final String NAME = "Ziggy Console";
 
     private static final String ZIGGY_LOGO_FILE_NAME = "ziggy-small-clear.png";
     private static final String ZIGGY_LOGO_DIR = "/images/";
 
-    private static ZiggyGuiConsole instance = null;
-    public static final CrudProxyExecutor crudProxyExecutor = new CrudProxyExecutor();
-
-    public static User currentUser = null;
+    public static User currentUser;
 
     private static Image pipelineImage;
     private static Image ziggyImage;
 
-    private JTabbedPane consoleTabbedPane;
-    private JPanel statusPanel;
-    private JMenuBar consoleMenuBar;
-    private JMenuItem helpMenuItem;
-    private JMenu helpMenu;
-    private JMenuItem exitMenuItem;
-    private JMenu fileMenu;
-    private JPanel poweredByPanel;
-    private JPanel spacerPanel;
-
-    /** Config tab */
-    private JPanel configDataPanel;
-    private JSplitPane configSplitPane;
-    private JScrollPane configDataScrollPane;
-    private ConfigTree configTree2;
-    private JScrollPane configTreeScrollPane;
-
-    /** Operations tab */
-    private JTabbedPane operationsTabbedPane;
-    private OpsInstancesPanel opsInstancesPanel;
-    private OpsTriggersPanel opsTriggersPanel;
-
-    /** Monitoring tab */
-    private JTabbedPane monitoringTabbedPane;
-    private StatusSummaryPanel statusSummaryPanel;
-    private MetrilyzerPanel metrilyzerPanel;
+    private final UUID uuid = UUID.randomUUID();
 
     {
-        // Set Look & Feel
-        try {
-            MetalLookAndFeel.setCurrentTheme(new SkyBluer());
-            javax.swing.UIManager.setLookAndFeel("com.jgoodies.looks.plastic.Plastic3DLookAndFeel");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        ZiggySwingUtils.setLookAndFeel();
+    }
+
+    private ZiggyGuiConsole() {
+        // Initialize the ProcessHeartbeatManager for this process.
+        log.info("Initializing ProcessHeartbeatManager");
+        ProcessHeartbeatManager
+            .initializeInstance(new ProcessHeartbeatManager.ConsoleHeartbeatManagerAssistant());
+        log.info("Initializing ProcessHeartbeatManager...done");
+
+        ZiggyMessenger.subscribe(ShutdownMessage.class, message -> {
+            log.info("Shutting down due to receipt of shutdown message");
+            shutdown();
+        });
+
+        ZiggyMessenger.subscribe(WorkerResources.class, message -> {
+            WorkerResources.setDefaultResources(message);
+        });
+
+        ZiggyMessenger.subscribe(InvalidateConsoleModelsMessage.class, message -> {
+            DatabaseModelRegistry.invalidateModels();
+        });
+
+        int rmiPort = ZiggyConfiguration.getInstance()
+            .getInt(PropertyName.SUPERVISOR_PORT.property(), ZiggyRmiServer.RMI_PORT_DEFAULT);
+        log.info("Starting ZiggyRmiClient instance with registry on port {}", rmiPort);
+        ZiggyRmiClient.initializeInstance(rmiPort, NAME);
+        ZiggyShutdownHook.addShutdownHook(() -> {
+            ZiggyRmiClient.reset();
+        });
+        log.info("Starting ZiggyRmiClient instance with registry on port {}...done", rmiPort);
+
+        buildComponent();
+
+        ZiggyMessenger.publish(new DefaultWorkerResourcesRequest());
     }
 
     public static void launch() {
         try {
-            ZiggyBuild.logVersionInfo(log);
+            log.info("Starting Ziggy Console ({})",
+                ZiggyConfiguration.getInstance().getString(PropertyName.ZIGGY_VERSION.property()));
 
-            log.info("Initializing Configuration Service");
-            ZiggyConfiguration.getInstance();
+            ZiggyConfiguration.logJvmProperties();
 
-            log.info("Initializing Database Service");
-            try {
-                CrudProxy.initialize();
-            } catch (Throwable t) {
-                log.error("Failed to connect to the database, caught: " + t, t);
-                System.exit(-1);
-            }
+            login();
 
-            doLogin();
+            ZiggyGuiConsole instance = new ZiggyGuiConsole();
+            instance.setLocationByPlatform(true);
+            instance.setVisible(true);
         } catch (Throwable e) {
-            log.error("PipelineConsole.main", e);
-
             MessageUtil.showError(null, e);
             System.exit(1);
         }
 
-        ZiggyGuiConsole.instance = new ZiggyGuiConsole();
-        ZiggyGuiConsole.instance.setVisible(true);
-        ZiggyGuiConsole.instance.configSplitPane.setDividerLocation(0.25);
-        MasterStatusPanel.setDividerLocation(0.25);
-
-        log.debug("Pipeline console initializeAndStart(): end");
-
+        log.debug("Ziggy Console initialization complete");
     }
 
-    public static void main(String[] args) {
-        if (args.length > 0) {
-            System.err.println("USAGE: console");
-            System.exit(-1);
-        }
-        launch();
-    }
+    private static void login() {
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+        boolean devModeRequireLogin = config
+            .getBoolean(PropertyName.REQUIRE_LOGIN_OVERRIDE.property(), false);
 
-    private static void doLogin() {
-        Configuration config = ZiggyConfiguration.getInstance();
-        boolean devModeRequireLogin = config.getBoolean(PropertyNames.REQUIRE_LOGIN_OVERRIDE,
-            false);
-
-        boolean requireLogin = devModeRequireLogin || ZiggyVersion.isRelease();
+        // TODO Resurrect ZiggyVersion.isRelease() or delete commented-out code
+        // In the unlikely event this is needed, I'd suggest resurrecting ZiggyVersion.version() as
+        // well and replace code that current says
+        // ZiggyConfiguration.getInstance().getString(PropertyName.ZIGGY_VERSION) with
+        // ZiggyVersion.version().
+        boolean requireLogin = devModeRequireLogin /* || ZiggyVersion.isRelease() */;
 
         // Don't require login if there are no configured users.
         if (new UserCrud().retrieveAllUsers().isEmpty()) {
@@ -217,7 +155,8 @@ private static void doLogin() {
         UserCrudProxy userCrud = new UserCrudProxy();
         if (requireLogin) {
 
-            currentUser = userCrud.retrieveUser(SystemUtils.USER_NAME);
+            currentUser = userCrud
+                .retrieveUser(config.getString(PropertyName.USER_NAME.property()));
 
             if (currentUser == null) {
                 log.error("Exceeded max login attempts");
@@ -226,214 +165,103 @@ private static void doLogin() {
         }
     }
 
-    private ZiggyGuiConsole() {
-        initGUI();
-    }
+    private void buildComponent() {
+        setTitle(NAME);
+        setSize(ZiggyGuiConstants.MAIN_WINDOW_WIDTH, ZiggyGuiConstants.MAIN_WINDOW_HEIGHT);
+        setIconImage(new ImageIcon(pipelineOrZiggyImage()).getImage());
 
-    private void initGUI() {
-        try {
-            setTitle("Ziggy Console");
-            {
-                addWindowListener(new WindowAdapter() {
-                    @Override
-                    public void windowClosing(WindowEvent evt) {
-                        System.exit(0);
-                    }
-                });
-            }
-            setSize(MAIN_WINDOW_WIDTH, MAIN_WINDOW_HEIGHT);
-            {
-                ImageIcon consoleImageIcon = getConsoleIcon();
-                setIconImage(consoleImageIcon.getImage());
-            }
-            {
-                consoleMenuBar = new JMenuBar();
-                getContentPane().add(getStatusPanel(), BorderLayout.NORTH);
-                getContentPane().add(getConsoleTabbedPane(), BorderLayout.CENTER);
-                setJMenuBar(consoleMenuBar);
-                consoleMenuBar.add(getFileMenu());
-                consoleMenuBar.add(getHelpMenu());
+        addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent evt) {
+                System.exit(0);
             }
-            {
-                int rmiPort = ZiggyConfiguration.getInstance()
-                    .getInt(MessageHandler.RMI_REGISTRY_PORT_PROP,
-                        MessageHandler.RMI_REGISTRY_PORT_PROP_DEFAULT);
-                log.info("Starting UiCommunicator instance with registry on port " + rmiPort);
-                MessageHandler messageHandler = new MessageHandler(
-                    new ConsoleMessageDispatcher(MasterStatusPanel.alertMessageTableModel(),
-                        MasterStatusPanel.processesStatusPanel(), true));
-                UiCommunicator.initializeInstance(messageHandler, rmiPort);
-                ZiggyShutdownHook.addShutdownHook(() -> {
-                    UiCommunicator.reset();
-                });
-                log.info("UiCommunicator instance started");
-                getOpsInstancesPanel().startAutoRefresh();
-                ProcessesIndicatorPanel.addWorkerDataComponents();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JTabbedPane getConsoleTabbedPane() {
-        if (consoleTabbedPane == null) {
-            consoleTabbedPane = new JTabbedPane();
-            consoleTabbedPane.addTab("Configuration", null, getConfigSplitPane(), null);
-            consoleTabbedPane.addTab("Operations", null, getOperationsTabbedPane(), null);
-            consoleTabbedPane.addTab("Monitoring", null, getMonitoringTabbedPane(), null);
-        }
-        return consoleTabbedPane;
-    }
-
-    private JTabbedPane getOperationsTabbedPane() {
-        if (operationsTabbedPane == null) {
-            operationsTabbedPane = new JTabbedPane();
-            operationsTabbedPane.addTab("Instances", null, getOpsInstancesPanel(), null);
-            operationsTabbedPane.addTab("Triggers", null, getOpsTriggersPanel(), null);
-        }
-        return operationsTabbedPane;
-    }
-
-    private JTabbedPane getMonitoringTabbedPane() {
-        if (monitoringTabbedPane == null) {
-            monitoringTabbedPane = new JTabbedPane();
-            monitoringTabbedPane.addTab("Status", null, MasterStatusPanel.masterStatusPanel(),
-                null);
-            monitoringTabbedPane.addTab("Metrilyzer", null, getMetrilyzerPanel(), null);
-        }
-        return monitoringTabbedPane;
-    }
-
-    private JSplitPane getConfigSplitPane() {
-        if (configSplitPane == null) {
-            configSplitPane = new JSplitPane();
-            configSplitPane.add(getConfigTreeScrollPane(), JSplitPane.LEFT);
-            configSplitPane.add(getConfigDataScrollPane(), JSplitPane.RIGHT);
-        }
-        return configSplitPane;
-    }
+        });
 
-    private JMenu getFileMenu() {
-        if (fileMenu == null) {
-            fileMenu = new JMenu();
-            fileMenu.setText("File");
-            fileMenu.add(getExitMenuItem());
-        }
-        return fileMenu;
-    }
+        JMenuBar consoleMenuBar = new JMenuBar();
+        consoleMenuBar.add(createMenu(FILE, createMenuItem(EXIT, this::exit)));
+        consoleMenuBar.add(createMenu(HELP, createMenuItem(ABOUT, this::displayHelp)));
+        setJMenuBar(consoleMenuBar);
 
-    private JMenuItem getExitMenuItem() {
-        if (exitMenuItem == null) {
-            exitMenuItem = new JMenuItem();
-            exitMenuItem.setText("Exit");
-            exitMenuItem.addActionListener(evt -> exitMenuItemActionPerformed());
-        }
-        return exitMenuItem;
+        getContentPane().add(getStatusPanel(), BorderLayout.NORTH);
+        getContentPane().add(new ZiggyConsolePanel(), BorderLayout.CENTER);
     }
 
-    private JMenu getHelpMenu() {
-        if (helpMenu == null) {
-            helpMenu = new JMenu();
-            helpMenu.setText("Help");
-            helpMenu.add(getHelpMenuItem());
-        }
-        return helpMenu;
-    }
-
-    private JMenuItem getHelpMenuItem() {
-        if (helpMenuItem == null) {
-            helpMenuItem = new JMenuItem();
-            helpMenuItem.setText("About");
-            helpMenuItem.addActionListener(this::helpMenuItemActionPerformed);
-        }
-        return helpMenuItem;
-    }
-
-    private void exitMenuItemActionPerformed() {
+    private void exit(ActionEvent evt) {
         shutdown();
     }
 
-    private JScrollPane getConfigTreeScrollPane() {
-        if (configTreeScrollPane == null) {
-            configTreeScrollPane = new JScrollPane();
-            configTreeScrollPane.setViewportView(getConfigTree());
-        }
-        return configTreeScrollPane;
+    private void shutdown() {
+        System.exit(0);
     }
 
-    private ConfigTree getConfigTree() {
-        if (configTree2 == null) {
-            configTree2 = new ConfigTree((ConfigDataPanel) getConfigDataPanel());
-        }
-        return configTree2;
+    private void displayHelp(ActionEvent evt) {
+        new AboutDialog(this).setVisible(true);
     }
 
-    private JScrollPane getConfigDataScrollPane() {
-        if (configDataScrollPane == null) {
-            configDataScrollPane = new JScrollPane();
-            configDataScrollPane.setViewportView(getConfigDataPanel());
-        }
-        return configDataScrollPane;
-    }
+    private JPanel getStatusPanel() {
+        JPanel strut = getSpacerPanel();
+        JPanel poweredByPanel = getPoweredByPanel();
+        StatusSummaryPanel statusSummaryPanel = new StatusSummaryPanel();
+
+        JPanel statusPanel = new JPanel();
+        GroupLayout statusPanelLayout = new GroupLayout(statusPanel);
+        statusPanel.setLayout(statusPanelLayout);
+
+        statusPanelLayout.setHorizontalGroup(statusPanelLayout.createSequentialGroup()
+            .addGroup(statusPanelLayout.createParallelGroup(Alignment.LEADING).addComponent(strut))
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(statusPanelLayout.createParallelGroup(Alignment.CENTER)
+                .addComponent(poweredByPanel))
+            .addPreferredGap(ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addGroup(statusPanelLayout.createParallelGroup(Alignment.TRAILING)
+                .addComponent(statusSummaryPanel, GroupLayout.PREFERRED_SIZE,
+                    GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)));
+
+        statusPanelLayout.setVerticalGroup(statusPanelLayout.createParallelGroup(Alignment.CENTER)
+            .addComponent(strut)
+            .addComponent(poweredByPanel)
+            .addComponent(statusSummaryPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE));
 
-    private JPanel getConfigDataPanel() {
-        if (configDataPanel == null) {
-            configDataPanel = new ConfigDataPanel();
-        }
-        return configDataPanel;
+        return statusPanel;
     }
 
-    private OpsTriggersPanel getOpsTriggersPanel() {
-        if (opsTriggersPanel == null) {
-            opsTriggersPanel = new OpsTriggersPanel();
-        }
-        return opsTriggersPanel;
+    private JPanel getPoweredByPanel() {
+        JPanel poweredByPanel = new JPanel();
+        ImageIcon optionalIcon = getPipelineIcon();
+        if (optionalIcon != null) {
+            JLabel pipelineLabel = new JLabel(scaledImageIcon(optionalIcon), SwingConstants.CENTER);
+            poweredByPanel.add(pipelineLabel);
+        }
+        JLabel poweredBy = new JLabel("powered by");
+        poweredByPanel.add(poweredBy);
+        JLabel ziggyLabel = new JLabel(scaledImageIcon(getZiggyIcon()), SwingConstants.CENTER);
+        poweredByPanel.add(ziggyLabel);
+        return poweredByPanel;
     }
 
-    private OpsInstancesPanel getOpsInstancesPanel() {
-        if (opsInstancesPanel == null) {
-            opsInstancesPanel = new OpsInstancesPanel();
+    private ImageIcon getPipelineIcon() {
+        ImageIcon pipelineIcon = null;
+        String pipelineImageLocation = ZiggyConfiguration.getInstance()
+            .getString(PropertyName.PIPELINE_LOGO_FILE.property(), null);
+        if (pipelineImage == null && pipelineImageLocation != null) {
+            pipelineImage = getImage(pipelineImageLocation);
         }
-        return opsInstancesPanel;
-    }
-
-    private MetrilyzerPanel getMetrilyzerPanel() {
-        if (metrilyzerPanel == null) {
-            metrilyzerPanel = new MetrilyzerPanel();
+        if (pipelineImage != null) {
+            pipelineIcon = new ImageIcon(pipelineImage);
         }
-        return metrilyzerPanel;
+        return pipelineIcon;
     }
 
-    private JPanel getStatusPanel() {
-        BorderLayout statusPanelLayout = new BorderLayout();
-        if (statusPanel == null) {
-            statusPanel = new JPanel();
-            statusPanel.setLayout(statusPanelLayout);
-            statusPanel.add(getPoweredByPanel(), BorderLayout.CENTER);
-            statusPanel.add(getStatusSummaryPanel(), BorderLayout.LINE_END);
-            statusPanel.add(getSpacerPanel(), BorderLayout.LINE_START);
+    private ImageIcon getZiggyIcon() {
+        ImageIcon ziggyIcon = null;
+        if (ziggyImage == null) {
+            ziggyImage = getImage(getClass().getResource(ZIGGY_LOGO_DIR + ZIGGY_LOGO_FILE_NAME));
         }
-        float y0 = statusPanelLayout.getLayoutAlignmentY(getPoweredByPanel());
-        float y1 = statusPanelLayout.getLayoutAlignmentY(getStatusSummaryPanel());
-        log.info("y0 == " + y0 + ", y1 == " + y1);
-        return statusPanel;
-    }
-
-    private JPanel getPoweredByPanel() {
-        if (poweredByPanel == null) {
-            poweredByPanel = new JPanel();
-            ImageIcon optionalIcon = getPipelineIcon();
-            if (optionalIcon != null) {
-                JLabel pipelineLabel = new JLabel(scaledImageIcon(optionalIcon),
-                    SwingConstants.CENTER);
-                poweredByPanel.add(pipelineLabel);
-            }
-            JLabel poweredBy = new JLabel("powered by");
-            poweredByPanel.add(poweredBy);
-            JLabel ziggyLabel = new JLabel(scaledImageIcon(getZiggyIcon()), SwingConstants.CENTER);
-            poweredByPanel.add(ziggyLabel);
+        if (ziggyImage != null) {
+            ziggyIcon = new ImageIcon(ziggyImage);
         }
-        return poweredByPanel;
+        return ziggyIcon;
     }
 
     private ImageIcon scaledImageIcon(ImageIcon originalImageIcon) {
@@ -441,40 +269,29 @@ private ImageIcon scaledImageIcon(ImageIcon originalImageIcon) {
         int height = originalImage.getHeight(null);
         int width = originalImage.getWidth(null);
         float scaleFactor = 30F / height;
-        float newHeight = height * scaleFactor;
-        float newWidth = width * scaleFactor;
-        Image scaledImage = originalImage.getScaledInstance((int) newWidth, (int) newHeight,
-            Image.SCALE_SMOOTH);
+        Image scaledImage = originalImage.getScaledInstance((int) (width * scaleFactor),
+            (int) (height * scaleFactor), Image.SCALE_SMOOTH);
         return new ImageIcon(scaledImage);
     }
 
     private JPanel getSpacerPanel() {
-        if (spacerPanel == null) {
-            spacerPanel = new JPanel();
-            spacerPanel.setPreferredSize(new Dimension(185, 40));
-        }
+        JPanel spacerPanel = new JPanel();
+        spacerPanel.setPreferredSize(new Dimension(140, 0));
         return spacerPanel;
     }
 
-    private StatusSummaryPanel getStatusSummaryPanel() {
-        if (statusSummaryPanel == null) {
-            statusSummaryPanel = new StatusSummaryPanel();
+    public static Image pipelineOrZiggyImage() {
+        Image image = pipelineImage();
+        if (image == null) {
+            image = ziggyImage();
         }
-        return statusSummaryPanel;
-    }
-
-    private void helpMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("helpMenuItem.actionPerformed, event=" + evt);
-
-        AboutDialog about = new AboutDialog(this);
-        about.setLocationRelativeTo(this);
-        about.setVisible(true);
+        return image;
     }
 
     private static Image pipelineImage() {
         if (pipelineImage == null) {
             String pipelineImageLocation = ZiggyConfiguration.getInstance()
-                .getString(PropertyNames.PIPELINE_LOGO_FILE_PROP_NAME, null);
+                .getString(PropertyName.PIPELINE_LOGO_FILE.property(), null);
             if (pipelineImageLocation != null) {
                 pipelineImage = getImage(pipelineImageLocation);
             }
@@ -509,216 +326,8 @@ private static Image getImage(URL url) {
         return image;
     }
 
-    public static Image pipelineOrZiggyImage() {
-        Image image = pipelineImage();
-        if (image == null) {
-            image = ziggyImage();
-        }
-        return image;
+    @Override
+    public UUID requestorIdentifier() {
+        return uuid;
     }
-
-    private ImageIcon getPipelineIcon() {
-        ImageIcon pipelineIcon = null;
-        String pipelineImageLocation = ZiggyConfiguration.getInstance()
-            .getString(PropertyNames.PIPELINE_LOGO_FILE_PROP_NAME, null);
-        if (pipelineImage == null && pipelineImageLocation != null) {
-            pipelineImage = getImage(pipelineImageLocation);
-        }
-        if (pipelineImage != null) {
-            pipelineIcon = new ImageIcon(pipelineImage);
-        }
-        return pipelineIcon;
-    }
-
-    private ImageIcon getZiggyIcon() {
-        ImageIcon ziggyIcon = null;
-        if (ziggyImage == null) {
-            ziggyImage = getImage(getClass().getResource(ZIGGY_LOGO_DIR + ZIGGY_LOGO_FILE_NAME));
-        }
-        if (ziggyImage != null) {
-            ziggyIcon = new ImageIcon(ziggyImage);
-        }
-        return ziggyIcon;
-    }
-
-    private ImageIcon getConsoleIcon() {
-        return new ImageIcon(pipelineOrZiggyImage());
-    }
-
-// Public static methods begin here. These execute a private method of the singleton
-// instance.
-
-    public static void reloadConfigTreeModel() {
-        instance.getConfigTree().reloadModel();
-    }
-
-    public static void shutdown() {
-        System.exit(0);
-    }
-
-// Factory methods: these are methods that return an instance of a Swing class that has
-// the singleton instance as its parent.
-
-    public static KeyValuePairEditDialog newKeyValuePairEditDialog(KeyValuePair keyValuePair) {
-        return new KeyValuePairEditDialog(instance, keyValuePair);
-    }
-
-    public static GroupSelectorDialog newGroupSelectorDialog() {
-        return new GroupSelectorDialog(instance);
-    }
-
-    public static ModuleEditDialog newModuleEditDialog(PipelineModuleDefinition module) {
-        return new ModuleEditDialog(instance, module);
-    }
-
-    public static ParameterClassSelectorDialog newParameterClassSelectorDialog() {
-        return new ParameterClassSelectorDialog(instance);
-    }
-
-    public static ParameterSetNewDialog newParameterSetNewDialog() {
-        return new ParameterSetNewDialog(instance);
-    }
-
-    public static ParameterSetEditDialog newParameterSetEditDialog(ParameterSet module,
-        boolean isNew) {
-        return new ParameterSetEditDialog(instance, module, isNew);
-    }
-
-    public static PipelineNodeEditDialog newPipelineNodeEditDialog(PipelineDefinition definition,
-        PipelineDefinitionNode node) throws Exception {
-        return new PipelineNodeEditDialog(instance, definition, node);
-    }
-
-    public static PipelineEditDialog newPipelineEditDialog(PipelineDefinition pipeline) {
-        return new PipelineEditDialog(instance, pipeline);
-    }
-
-    public static <T> DoubleListDialog<T> newDoubleListDialog(String title,
-        String availableListTitle, List<T> availableListContents, String selectedListTitle,
-        List<T> selectedListContents) {
-        return new DoubleListDialog<>(instance, title, availableListTitle, availableListContents,
-            selectedListTitle, selectedListContents);
-    }
-
-    public static UserEditDialog newUserEditDialog(User user) {
-        return new UserEditDialog(instance, user);
-    }
-
-    public static InstanceDetailsDialog newInstanceDetailsDialog(
-        PipelineInstance selectedInstance) {
-        return new InstanceDetailsDialog(instance, selectedInstance);
-    }
-
-    public static TaskLogInformationDialog newTaskLogInformationDialog(PipelineTask selectedTask) {
-        return new TaskLogInformationDialog(instance, selectedTask);
-    }
-
-    public static EditParametersDialog newEditParametersDialog(ParameterSet parameterSet) {
-        return new EditParametersDialog(instance, parameterSet);
-    }
-
-    public static ParameterSetSelectorDialog newParameterSetSelectorDialog() {
-        return new ParameterSetSelectorDialog(instance);
-    }
-
-    public static ParameterSetSelectorDialog newParameterSetSelectorDialog(
-        Class<? extends Parameters> filterClass) {
-        return new ParameterSetSelectorDialog(instance, filterClass);
-    }
-
-    public static ViewParametersDialog newViewParametersDialog(ParameterSet parameterSet) {
-        return new ViewParametersDialog(instance, parameterSet);
-    }
-
-    public static EditTriggerDialog newEditTriggerDialog(PipelineDefinition clonedTrigger,
-        TriggersTreeModel triggersTreeModel) {
-        return new EditTriggerDialog(instance, clonedTrigger, triggersTreeModel);
-    }
-
-    public static FireTriggerDialog newFireTriggerDialog(PipelineDefinition trigger) {
-        return new FireTriggerDialog(instance, trigger);
-    }
-
-    public static NewTriggerDialog newNewTriggerDialog() {
-        return new NewTriggerDialog(instance);
-    }
-
-    public static InstanceCostEstimateDialog newInstanceCostEstimateDialog(
-        PipelineInstance pipelineInstance) {
-        return new InstanceCostEstimateDialog(instance, pipelineInstance);
-    }
-
-    public static DataReceiptInstanceDialog newDataReceiptInstanceDialog(
-        DataReceiptInstance dataReceiptInstance) {
-        return new DataReceiptInstanceDialog(instance, dataReceiptInstance);
-    }
-
-// Show methods: these methods call a Swing show* method in a way that ensures that
-// the PipelineConsole singleton instance is the parent of the resulting object.
-
-    public static void showInstanceStatsDialog(PipelineInstance pipelineInstance) {
-        InstanceStatsDialog.showInstanceStatsDialog(instance, pipelineInstance);
-    }
-
-    public static void showError(Throwable t) {
-        MessageUtil.showError(instance, t);
-    }
-
-    public static void showMessageDialog(Object message, String title, int messageType) {
-        JOptionPane.showMessageDialog(instance, message, title, messageType);
-    }
-
-    public static void showAlertLogDialog(long id) {
-        AlertLogDialog.showAlertLogDialog(instance, id);
-    }
-
-    public static int showConfirmDialog(Object message, String title, int optionType) {
-        return JOptionPane.showConfirmDialog(instance, message, title, optionType);
-    }
-
-    public static void showTaskInfoDialog(PipelineTask selectedTask) {
-        TaskInfoDialog.showTaskInfoDialog(instance, selectedTask);
-    }
-
-    public static int showOptionDialog(Object message, String title, int optionType,
-        int messageType, Icon icon, Object[] options, Object initialValue) {
-        return JOptionPane.showOptionDialog(instance, message, title, optionType, messageType, icon,
-            options, initialValue);
-    }
-
-    public static void showReport(String report) {
-        TextualReportDialog.showReport(instance, report);
-    }
-
-    public static String showInputDialog(Object message, String title, int messageType) {
-        return JOptionPane.showInputDialog(instance, message, title, messageType);
-    }
-
-    public static Object showInputDialog(Object message, String title, int messageType, Icon icon,
-        Object[] selectionValues, Object initialSelectionValue) {
-        return JOptionPane.showInputDialog(instance, message, title, messageType, icon,
-            selectionValues, initialSelectionValue);
-    }
-
-// Action methods: these are methods that perform a specific action that requires use
-// of a Swing object, and further require that the object have the PipelineConsole
-// singleton instance as the parent of the Swing object.
-
-    public static List<String> selectParamSet(List<ParameterSetDescriptor> dryRunResults) {
-        return ParamLibImportDialog.selectParamSet(instance, dryRunResults);
-    }
-
-    public static RunMode restartTasks(List<PipelineTask> pipelineTasks,
-        Map<Long, ProcessingSummary> taskAttrs) {
-        return RestartDialog.restartTasks(instance, pipelineTasks, taskAttrs);
-    }
-
-    public static Group selectGroup() {
-        return GroupsDialog.selectGroup(instance);
-    }
-
-    public static void displayOperationsTab() {
-        instance.getConsoleTabbedPane().setSelectedComponent(instance.getOperationsTabbedPane());
-    }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/ZiggyGuiConstants.java b/src/main/java/gov/nasa/ziggy/ui/ZiggyGuiConstants.java
new file mode 100644
index 0000000..4cc7b36
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/ZiggyGuiConstants.java
@@ -0,0 +1,57 @@
+package gov.nasa.ziggy.ui;
+
+import javax.swing.GroupLayout;
+
+/**
+ * General constants used by the Ziggy Console.
+ * <p>
+ * Ziggy uses sentence capitalization for nearly all elements in menu items, button text, labels,
+ * table headings.
+ */
+public class ZiggyGuiConstants {
+
+    public static final int MAIN_WINDOW_WIDTH = 1400;
+    public static final int MAIN_WINDOW_HEIGHT = 900;
+
+    /**
+     * The size of the gap between the container and components that touch the border of the
+     * container. In most cases, {@link GroupLayout#setAutoCreateContainerGaps(boolean)} adds a
+     * little breathing room around a panel.
+     */
+    public static final int CONTAINER_GAP = 5;
+
+    // Button and menu item strings.
+    public static final String ABOUT = "About";
+    public static final String ADD = "Add";
+    public static final String ADD_SYMBOL = "+";
+    public static final String ASSIGN_GROUP = "Assign group";
+    public static final String CANCEL = "Cancel";
+    public static final String CLOSE = "Close";
+    public static final String COLLAPSE_ALL = "Collapse all";
+    public static final String COPY = "Copy";
+    public static final String CREATE = "Create";
+    public static final String DELETE = "Delete";
+    public static final String DIALOG = "...";
+    public static final String EDIT = "Edit";
+    public static final String EXIT = "Exit";
+    public static final String EXPAND_ALL = "Expand all";
+    public static final String EXPORT = "Export";
+    public static final String FILE = "File";
+    public static final String HELP = "Help";
+    public static final String IMPORT = "Import";
+    public static final String NEW = "New";
+    public static final String OK = "OK";
+    public static final String REFRESH = "Refresh";
+    public static final String REMOVE = "Remove";
+    public static final String REMOVE_SYMBOL = "-";
+    public static final String RENAME = "Rename";
+    public static final String REPORT = "Report";
+    public static final String RESTART = "Restart";
+    public static final String RESTORE_DEFAULTS = "Restore defaults";
+    public static final String SAVE = "Save";
+    public static final String SELECT = "Select";
+    public static final String START = "Start";
+    public static final String TO_BOTTOM = "To bottom";
+    public static final String TO_TOP = "To top";
+    public static final String VIEW = "View";
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayEditorDialog.java b/src/main/java/gov/nasa/ziggy/ui/collections/ArrayEditorDialog.java
deleted file mode 100644
index 6e08255..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayEditorDialog.java
+++ /dev/null
@@ -1,363 +0,0 @@
-package gov.nasa.ziggy.ui.collections;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.ui.common.FloatingPointTableCellRenderer;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-
-/**
- * Dialog for editing the contents of a Java array
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ArrayEditorDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(ArrayEditorDialog.class);
-
-    private JPanel dataPanel;
-    private JButton removeButton;
-    private JButton addButton;
-    private JTable elementsTable;
-    private JScrollPane scrollPane;
-    private JButton cancelButton;
-    private JButton okButton;
-    private JPanel actionPanel;
-
-    private boolean isCancelled = false;
-    private JButton exportButton;
-    private JButton importButton;
-    private JTextField addTextField;
-    private JPanel addPanel;
-
-    private ArrayEditorTableModel arrayEditorTableModel;
-
-    private Object array;
-
-    public ArrayEditorDialog(JFrame frame) {
-        super(frame);
-        initGUI();
-    }
-
-    public ArrayEditorDialog(JFrame owner, Object array) {
-        super(owner, true);
-        init(array);
-    }
-
-    public ArrayEditorDialog(JDialog owner, Object array) {
-        super(owner, true);
-        init(array);
-    }
-
-    private void init(Object array) {
-        this.array = array;
-
-        initGUI();
-
-        elementsTable.getColumnModel().getColumn(0).setPreferredWidth(10);
-        elementsTable.getColumnModel().getColumn(1).setPreferredWidth(300);
-    }
-
-    private void addButtonActionPerformed(ActionEvent evt) {
-        log.debug("addButton.actionPerformed, event=" + evt);
-
-        addElement();
-    }
-
-    private void addTextFieldActionPerformed(ActionEvent evt) {
-        log.debug("addTextField.actionPerformed, event=" + evt);
-
-        addElement();
-    }
-
-    private void addElement() {
-        int selectedIndex = elementsTable.getSelectedRow();
-
-        if (selectedIndex == -1) {
-            arrayEditorTableModel.insertElementAtEnd(addTextField.getText());
-        } else {
-            arrayEditorTableModel.insertElementAt(selectedIndex, addTextField.getText());
-            elementsTable.getSelectionModel()
-                .setSelectionInterval(selectedIndex + 1, selectedIndex + 1);
-        }
-
-        addTextField.setText("");
-    }
-
-    private void removeButtonActionPerformed(ActionEvent evt) {
-        log.debug("removeButton.actionPerformed, event=" + evt);
-
-        int selectedIndex = elementsTable.getSelectedRow();
-
-        if (selectedIndex != -1) {
-            arrayEditorTableModel.removeElementAt(selectedIndex);
-
-            int newSize = arrayEditorTableModel.getRowCount();
-            if (selectedIndex < newSize) {
-                elementsTable.getSelectionModel()
-                    .setSelectionInterval(selectedIndex, selectedIndex);
-            }
-        }
-    }
-
-    private void importButtonActionPerformed(ActionEvent evt) {
-        log.debug("importButton.actionPerformed, event=" + evt);
-
-        try {
-            JFileChooser fc = new JFileChooser();
-            int returnVal = fc.showOpenDialog(this);
-
-            if (returnVal == JFileChooser.APPROVE_OPTION) {
-                File file = fc.getSelectedFile();
-
-                List<String> newArray = ArrayImportExportUtils.importArray(file);
-                arrayEditorTableModel.replaceWith(newArray);
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void exportButtonActionPerformed(ActionEvent evt) {
-        log.debug("exportButton.actionPerformed, event=" + evt);
-
-        try {
-            JFileChooser fc = new JFileChooser();
-            int returnVal = fc.showSaveDialog(this);
-
-            if (returnVal == JFileChooser.APPROVE_OPTION) {
-                File file = fc.getSelectedFile();
-
-                List<String> values = arrayEditorTableModel.asStringList();
-                ArrayImportExportUtils.exportArray(file, values);
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void okButtonActionPerformed(ActionEvent evt) {
-        log.debug("okButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        isCancelled = true;
-        setVisible(false);
-    }
-
-    public static ArrayEditorDialog newDialog(Component owner, Object array) {
-        Window ownerWindow = findParentWindow(owner);
-
-        ArrayEditorDialog editor;
-        if (ownerWindow instanceof JFrame) {
-            editor = new ArrayEditorDialog((JFrame) ownerWindow, array);
-        } else {
-            editor = new ArrayEditorDialog((JDialog) ownerWindow, array);
-        }
-
-        editor.setLocationRelativeTo(owner);
-        return editor;
-    }
-
-    public Object editedArray() {
-        return arrayEditorTableModel.asArray();
-    }
-
-    private static Window findParentWindow(Component c) {
-        Component root = c;
-
-        while (!(root instanceof JFrame) && !(root instanceof JDialog)) {
-            root = root.getParent();
-            if (root == null) {
-                return null;
-            }
-        }
-        return (Window) root;
-    }
-
-    private void initGUI() {
-        try {
-            setTitle("Array Editor");
-            setPreferredSize(new java.awt.Dimension(491, 762));
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            this.setSize(491, 762);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getScrollPane(), BorderLayout.CENTER);
-            dataPanel.add(getAddPanel(), BorderLayout.SOUTH);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(50);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getOkButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getOkButton() {
-        if (okButton == null) {
-            okButton = new JButton();
-            okButton.setText("ok");
-            okButton.addActionListener(this::okButtonActionPerformed);
-        }
-        return okButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JScrollPane getScrollPane() {
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getElementsTable());
-        }
-        return scrollPane;
-    }
-
-    private JTable getElementsTable() {
-        if (elementsTable == null) {
-            elementsTable = new JTable();
-            elementsTable.setDefaultRenderer(Float.class, new FloatingPointTableCellRenderer());
-            elementsTable.setDefaultRenderer(Double.class, new FloatingPointTableCellRenderer());
-            arrayEditorTableModel = new ArrayEditorTableModel(array);
-            elementsTable.setModel(arrayEditorTableModel);
-        }
-        return elementsTable;
-    }
-
-    private JButton getAddButton() {
-        if (addButton == null) {
-            addButton = new JButton();
-            addButton.setText("+");
-            addButton.setToolTipText(
-                "Insert the specified element before the selected row (or at the end if no row is selected)");
-            addButton.addActionListener(this::addButtonActionPerformed);
-        }
-        return addButton;
-    }
-
-    private JButton getRemoveButton() {
-        if (removeButton == null) {
-            removeButton = new JButton();
-            removeButton.setText("-");
-            removeButton.setToolTipText("Remove the element at the selected row");
-            removeButton.addActionListener(this::removeButtonActionPerformed);
-        }
-        return removeButton;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JFrame frame = new JFrame();
-            ArrayEditorDialog inst = new ArrayEditorDialog(frame);
-            inst.setVisible(true);
-        });
-    }
-
-    private JPanel getAddPanel() {
-        if (addPanel == null) {
-            addPanel = new JPanel();
-            GridBagLayout addPanelLayout = new GridBagLayout();
-            addPanel.setBorder(BorderFactory.createTitledBorder("add/remove elements"));
-            addPanelLayout.rowWeights = new double[] { 0.1 };
-            addPanelLayout.rowHeights = new int[] { 7 };
-            addPanelLayout.columnWeights = new double[] { 1.0, 0.1, 0.1 };
-            addPanelLayout.columnWidths = new int[] { 7, 7, 7 };
-            addPanel.setLayout(addPanelLayout);
-            addPanel.add(getAddTextField(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            addPanel.add(getAddButton(), new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            addPanel.add(getRemoveButton(), new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            addPanel.add(getImportButton(), new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            addPanel.add(getExportButton(), new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return addPanel;
-    }
-
-    private JTextField getAddTextField() {
-        if (addTextField == null) {
-            addTextField = new JTextField();
-            addTextField.addActionListener(this::addTextFieldActionPerformed);
-        }
-        return addTextField;
-    }
-
-    private JButton getImportButton() {
-        if (importButton == null) {
-            importButton = new JButton();
-            importButton.setText("import");
-            importButton.addActionListener(this::importButtonActionPerformed);
-        }
-        return importButton;
-    }
-
-    private JButton getExportButton() {
-        if (exportButton == null) {
-            exportButton = new JButton();
-            exportButton.setText("export");
-            exportButton.addActionListener(this::exportButtonActionPerformed);
-        }
-        return exportButton;
-    }
-
-    public boolean wasCancelled() {
-        return isCancelled;
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayEditorTableModel.java b/src/main/java/gov/nasa/ziggy/ui/collections/ArrayEditorTableModel.java
deleted file mode 100644
index 3d1de55..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayEditorTableModel.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package gov.nasa.ziggy.ui.collections;
-
-import java.lang.reflect.Array;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.collections.ZiggyArrayUtils;
-import gov.nasa.ziggy.collections.ZiggyDataType;
-
-/**
- * Table model for editing an Object[]
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ArrayEditorTableModel extends AbstractTableModel {
-
-    private List<Object> elements = new LinkedList<>();
-
-    private ZiggyDataType componentType;
-
-    public ArrayEditorTableModel(Object array) {
-        int length = Array.getLength(array);
-        for (int i = 0; i < length; i++) {
-            elements.add(Array.get(array, i));
-        }
-
-        componentType = ZiggyDataType.getDataType(array);
-    }
-
-    public Object asArray() {
-        Object newArray = ZiggyArrayUtils.constructFullArray(new long[] { elements.size() },
-            componentType, false);
-
-        for (int index = 0; index < elements.size(); index++) {
-            Array.set(newArray, index, elements.get(index));
-        }
-
-        return newArray;
-    }
-
-    public List<String> asStringList() {
-        List<String> newList = new LinkedList<>();
-        for (Object element : elements) {
-            newList.add(ZiggyDataType.objectToString(element));
-        }
-        return newList;
-    }
-
-    public void replaceWith(List<String> newValues) {
-        elements = new LinkedList<>();
-        for (String newValue : newValues) {
-            elements.add(componentType.typedValue(newValue));
-        }
-
-        fireTableDataChanged();
-    }
-
-    public void insertElementAt(int index, String text) {
-        elements.add(index, componentType.typedValue(text));
-        fireTableDataChanged();
-    }
-
-    public void insertElementAtEnd(String text) {
-        insertElementAt(elements.size(), text);
-    }
-
-    public void removeElementAt(int selectedIndex) {
-        elements.remove(selectedIndex);
-        fireTableDataChanged();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 2;
-    }
-
-    @Override
-    public int getRowCount() {
-        return elements.size();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return rowIndex;
-            case 1:
-                return elements.get(rowIndex);
-            default:
-                throw new IllegalArgumentException("invalid columnIndex = " + columnIndex);
-        }
-    }
-
-    @Override
-    public void setValueAt(Object value, int rowIndex, int columnIndex) {
-        if (columnIndex == 1) {
-            elements.set(rowIndex, value);
-        }
-    }
-
-    @Override
-    public String getColumnName(int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return "idx";
-            case 1:
-                return "value";
-            default:
-                throw new IllegalArgumentException("invalid columnIndex = " + columnIndex);
-        }
-    }
-
-    @Override
-    public boolean isCellEditable(int rowIndex, int columnIndex) {
-        return columnIndex == 1;
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return Integer.class;
-            case 1:
-                return componentType.getJavaBoxedClass();
-            default:
-                throw new IllegalArgumentException("invalid columnIndex = " + columnIndex);
-        }
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/collections/ListEditorDialog.java b/src/main/java/gov/nasa/ziggy/ui/collections/ListEditorDialog.java
deleted file mode 100644
index 686bb49..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/collections/ListEditorDialog.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package gov.nasa.ziggy.ui.collections;
-
-import java.awt.Component;
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.GraphicsConfiguration;
-import java.awt.Window;
-
-import javax.swing.DefaultListModel;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JList;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
-import javax.swing.event.ListSelectionListener;
-
-/**
- * @author Sean McCauliff
- */
-@SuppressWarnings("serial")
-class ListEditorDialog extends JDialog {
-    private JList<Object> jList;
-
-    public ListEditorDialog() {
-        initUi();
-    }
-
-    /**
-     * @param owner
-     */
-    public ListEditorDialog(Frame owner) {
-        super(owner);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     */
-    public ListEditorDialog(Dialog owner) {
-        super(owner);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     */
-    public ListEditorDialog(Window owner) {
-        super(owner);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param modal
-     */
-    public ListEditorDialog(Frame owner, boolean modal) {
-        super(owner, modal);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param title
-     */
-    public ListEditorDialog(Frame owner, String title) {
-        super(owner, title);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param modal
-     */
-    public ListEditorDialog(Dialog owner, boolean modal) {
-        super(owner, modal);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param title
-     */
-    public ListEditorDialog(Dialog owner, String title) {
-        super(owner, title);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param modalityType
-     */
-    public ListEditorDialog(Window owner, ModalityType modalityType) {
-        super(owner, modalityType);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param title
-     */
-    public ListEditorDialog(Window owner, String title) {
-        super(owner, title);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param title
-     * @param modal
-     */
-    public ListEditorDialog(Frame owner, String title, boolean modal) {
-        super(owner, title, modal);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param title
-     * @param modal
-     */
-    public ListEditorDialog(Dialog owner, String title, boolean modal) {
-        super(owner, title, modal);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param title
-     * @param modalityType
-     */
-    public ListEditorDialog(Window owner, String title, ModalityType modalityType) {
-        super(owner, title, modalityType);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param title
-     * @param modal
-     * @param gc
-     */
-    public ListEditorDialog(Frame owner, String title, boolean modal, GraphicsConfiguration gc) {
-        super(owner, title, modal, gc);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param title
-     * @param modal
-     * @param gc
-     */
-    public ListEditorDialog(Dialog owner, String title, boolean modal, GraphicsConfiguration gc) {
-        super(owner, title, modal, gc);
-        initUi();
-    }
-
-    /**
-     * @param owner
-     * @param title
-     * @param modalityType
-     * @param gc
-     */
-    public ListEditorDialog(Window owner, String title, ModalityType modalityType,
-        GraphicsConfiguration gc) {
-        super(owner, title, modalityType, gc);
-        initUi();
-    }
-
-    private void initUi() {
-        jList = new JList<>();
-        jList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-        JScrollPane scrollPane = new JScrollPane(jList);
-        add(scrollPane);
-    }
-
-    public void addListSelectionListener(ListSelectionListener listener) {
-        jList.getSelectionModel().addListSelectionListener(listener);
-    }
-
-    public Object[] getSelectedValues() {
-        return jList.getSelectedValuesList().toArray();
-    }
-
-    public void setSelectedIndices(int[] selectedIndices) {
-        jList.setSelectedIndices(selectedIndices);
-    }
-
-    public void setAvailableValues(Object[] values) {
-        DefaultListModel<Object> data = new DefaultListModel<>();
-        for (Object value : values) {
-            data.addElement(value);
-        }
-        jList.setModel(data);
-    }
-
-    public static ListEditorDialog newDialog(Component owner) {
-        Window ownerWindow = SwingUtilities.windowForComponent(owner);
-
-        ListEditorDialog dialog;
-        if (ownerWindow instanceof JFrame) {
-            dialog = new ListEditorDialog((JFrame) ownerWindow);
-        } else {
-            dialog = new ListEditorDialog((JDialog) ownerWindow);
-        }
-        dialog.setModalityType(ModalityType.APPLICATION_MODAL);
-        return dialog;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/collections/ListPropertyEditor.java b/src/main/java/gov/nasa/ziggy/ui/collections/ListPropertyEditor.java
deleted file mode 100644
index 8ed39cc..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/collections/ListPropertyEditor.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package gov.nasa.ziggy.ui.collections;
-
-import java.awt.event.ActionListener;
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Comparator;
-
-import javax.swing.event.ListSelectionEvent;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.l2fprod.common.beans.editor.AbstractPropertyEditor;
-
-import gov.nasa.ziggy.collections.ZiggyArrayUtils;
-
-/**
- * Edit arrays with a JList. This will not work with arrays of primitive types.
- *
- * @author Sean McCauliff
- */
-public class ListPropertyEditor extends AbstractPropertyEditor {
-    private Object[] currentValues;
-    /** This array is sorted. */
-    private Object[] availableValues;
-    private Comparator<Object> comp;
-    private Class<?> arrayComponentType;
-    private final InTableButtonsPanel tableUi;
-    private final String title;
-    private ListEditorDialog dialog;
-
-    public ListPropertyEditor(String title) {
-        this.title = title;
-
-        ActionListener editActionListener = e -> showEditorUi();
-
-        ActionListener cancelActionListener = e -> eraseValue();
-
-        tableUi = new InTableButtonsPanel(false, editActionListener, cancelActionListener);
-        tableUi.setEditable(false);
-        editor = tableUi;
-    }
-
-    private int[] selectedIndicesFromOldValues() {
-        final int[] selectedIndices = new int[currentValues.length];
-        for (int i = 0; i < currentValues.length; i++) {
-            selectedIndices[i] = Arrays.binarySearch(availableValues, currentValues[i], comp);
-        }
-        return selectedIndices;
-    }
-
-    private void showEditorUi() {
-        dialog = ListEditorDialog.newDialog(editor);
-        dialog.setAvailableValues(availableValues);
-        if (currentValues != null) {
-            dialog.setSelectedIndices(selectedIndicesFromOldValues());
-        }
-        dialog.addListSelectionListener(this::listChanged);
-        dialog.setTitle(title);
-        dialog.setLocationRelativeTo(tableUi);
-        dialog.pack();
-        Object[] oldValues = currentValues;
-        // Important! modal.
-        dialog.setVisible(true);
-        tableUi.setText(valuesToString());
-        // Important! Only do this once per edit. Because the editor component
-        // gets removed after the first property change is triggered.
-        firePropertyChange(oldValues, currentValues);
-    }
-
-    private void eraseValue() {
-        setValue(Array.newInstance(arrayComponentType, 0));
-    }
-
-    private void listChanged(ListSelectionEvent event) {
-        if (event.getValueIsAdjusting()) {
-            return;
-        }
-
-        final Object[] fromListValues = dialog.getSelectedValues();
-        currentValues = (Object[]) ZiggyArrayUtils.copyArray(fromListValues, arrayComponentType);
-        tableUi.setText(valuesToString());
-    }
-
-    /**
-     * @return Here Object is actually an array of the arrayComponentType.
-     */
-    @Override
-    public Object getValue() {
-        return currentValues;
-    }
-
-    /**
-     * @param objValue is actually an array of objects.
-     */
-    @Override
-    public void setValue(Object objValue) {
-        final Object[] values = (Object[]) objValue;
-        if (values == null) {
-            currentValues = null;
-            return;
-        }
-        currentValues = values;
-
-        // jList.setSelectedIndices(selectedIndices);
-        arrayComponentType = objValue.getClass().getComponentType();
-        tableUi.setText(valuesToString());
-    }
-
-    public void setAvailableValues(Object[] values, Comparator<Object> comp) {
-        availableValues = Arrays.copyOf(values, values.length);
-        Arrays.sort(availableValues, comp);
-        this.comp = comp;
-    }
-
-    public void setArrayComponentType(Class<?> arrayComponentType) {
-        this.arrayComponentType = arrayComponentType;
-    }
-
-    private String valuesToString() {
-        if (currentValues == null) {
-            return "";
-        }
-
-        return StringUtils.join(currentValues, ", ");
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/AsyncListener.java b/src/main/java/gov/nasa/ziggy/ui/common/AsyncListener.java
deleted file mode 100644
index 8defe43..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/AsyncListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *
- */
-package gov.nasa.ziggy.ui.common;
-
-import gov.nasa.ziggy.services.messages.PipelineMessage;
-
-/**
- * TODO: This class....
- *
- * @author Todd Klaus
- */
-public interface AsyncListener {
-    /**
-     * @param reply
-     */
-    void receive(PipelineMessage reply);
-
-    /**
-     *
-     *
-     */
-    void timeoutReached();
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/ClasspathUtils.java b/src/main/java/gov/nasa/ziggy/ui/common/ClasspathUtils.java
deleted file mode 100644
index 594ab50..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/ClasspathUtils.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.util.ClasspathScanner;
-
-public class ClasspathUtils {
-    private static final Logger log = LoggerFactory.getLogger(ClasspathUtils.class);
-
-    private String packageFilters = "gov.nasa";
-
-    public ClasspathUtils() {
-    }
-
-    /**
-     * Scan for classes on the classpath that are Class.isAssignableFrom() the specified superclass.
-     * This requires loading the Class objects for all classes found on the classpath that match the
-     * package filters.
-     * <p>
-     * TODO: load the ClassFile objects into a Map, keyed by classname. Then use
-     * ClassFile.getSuperclass() and .getInterfaces() to provide the same functionality as
-     * Class.isAssignableFrom without the overhead and unintended consequences of class-loading
-     * every class on the classpath.
-     *
-     * @param superclass
-     * @return
-     * @throws Exception
-     */
-    public <E> Set<Class<? extends E>> scanFully(final Class<? extends E> superclass)
-        throws Exception {
-        final Set<Class<? extends E>> detectedClasses = new HashSet<>();
-
-        ClasspathScanner classpathScanner = new ClasspathScanner();
-        classpathScanner.addListener(classFile -> {
-            if (classFile.isAbstract() || classFile.getName().contains("$")) {
-                // ignore abstract and inner classes
-                return;
-            }
-            try {
-                @SuppressWarnings("unchecked")
-                Class<? extends E> clazz = (Class<? extends E>) Class.forName(classFile.getName());
-
-                if (superclass.isAssignableFrom(clazz)) {
-                    log.debug("found: " + clazz.getName());
-                    detectedClasses.add(clazz);
-                }
-            } catch (Throwable ignore) {
-            }
-        });
-        classpathScanner.getPackageFilters().add(packageFilters);
-        classpathScanner.scanForClasses();
-
-        return detectedClasses;
-    }
-
-    /**
-     * Scan for classes on the classpath that implement the specified interface. This method only
-     * loads the Class objects if they implement the specified interface
-     *
-     * @param interfaceClass
-     * @return
-     * @throws Exception
-     */
-    public <E> Set<Class<? extends E>> scanForInterfaceImpl(final Class<? extends E> interfaceClass)
-        throws Exception {
-        final Set<Class<? extends E>> detectedClasses = new HashSet<>();
-
-        ClasspathScanner classpathScanner = new ClasspathScanner();
-        classpathScanner.addListener(classFile -> {
-            String[] interfaces = classFile.getInterfaces();
-            for (String interfaceName : interfaces) {
-                if (interfaceName.equals(interfaceClass.getName())) {
-                    @SuppressWarnings("unchecked")
-                    Class<? extends E> detectedClass = (Class<? extends E>) Class
-                        .forName(classFile.getName());
-                    detectedClasses.add(detectedClass);
-                }
-            }
-        });
-        classpathScanner.getPackageFilters().add(packageFilters);
-        classpathScanner.scanForClasses();
-
-        return detectedClasses;
-    }
-
-    public String getPackageFilters() {
-        return packageFilters;
-    }
-
-    public void setPackageFilters(String packageFilters) {
-        this.packageFilters = packageFilters;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/EnumEditor.java b/src/main/java/gov/nasa/ziggy/ui/common/EnumEditor.java
deleted file mode 100644
index 9b74bc4..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/EnumEditor.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import com.l2fprod.common.beans.editor.ComboBoxPropertyEditor;
-
-/**
- * Property editor for enumerated types
- *
- * @author Todd Klaus
- */
-public class EnumEditor extends ComboBoxPropertyEditor {
-    Object value;
-
-    public EnumEditor() {
-    }
-
-    @Override
-    public Object getValue() {
-        return value;
-    }
-
-    @Override
-    public void setValue(Object value) {
-        this.value = value;
-
-        Object[] values = value.getClass().getEnumConstants();
-
-        String[] stringValues = new String[values.length];
-
-        for (int i = 0; i < values.length; i++) {
-            stringValues[i] = values[i].toString();
-        }
-
-        setAvailableValues(stringValues);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/ExecuteOnValidityCheck.java b/src/main/java/gov/nasa/ziggy/ui/common/ExecuteOnValidityCheck.java
deleted file mode 100644
index 7e45881..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/ExecuteOnValidityCheck.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-/**
- * Defines an interface that provides a single method, {@link execute}, which in turn takes a
- * boolean argument. The method can thus perform any necessary actions in the event that the
- * argument is true, and any other actions in the event that it is false.
- *
- * @author PT
- */
-public interface ExecuteOnValidityCheck {
-
-    void execute(boolean valid);
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/FindPipelineModuleClasses.java b/src/main/java/gov/nasa/ziggy/ui/common/FindPipelineModuleClasses.java
deleted file mode 100644
index 2801de1..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/FindPipelineModuleClasses.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineModule;
-
-/**
- * @author Todd Klaus
- */
-public class FindPipelineModuleClasses {
-    public FindPipelineModuleClasses() {
-    }
-
-    public void report() throws Exception {
-        ClasspathUtils classpathUtils = new ClasspathUtils();
-        Set<Class<? extends PipelineModule>> detectedClasses = classpathUtils
-            .scanFully(PipelineModule.class);
-        Map<String, List<String>> packageMap = new HashMap<>();
-
-        for (Class<? extends PipelineModule> clazz : detectedClasses) {
-            String className = clazz.getSimpleName();
-            String packageName = clazz.getPackage().getName();
-
-            List<String> classesForPackage = packageMap.get(packageName);
-
-            if (classesForPackage == null) {
-                classesForPackage = new ArrayList<>();
-                packageMap.put(packageName, classesForPackage);
-            }
-            classesForPackage.add(className);
-        }
-
-        List<String> packageNames = new LinkedList<>(packageMap.keySet());
-        Collections.sort(packageNames);
-
-        for (String packageName : packageNames) {
-            System.out.println(packageName);
-
-            List<String> classNames = packageMap.get(packageName);
-
-            for (String className : classNames) {
-                System.out.println("  " + className);
-            }
-        }
-
-        System.out.println("Done, found " + detectedClasses.size() + " classes");
-    }
-
-    public static void main(String[] args) throws Exception {
-        FindPipelineModuleClasses finder = new FindPipelineModuleClasses();
-        finder.report();
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/GroupsDialog.java b/src/main/java/gov/nasa/ziggy/ui/common/GroupsDialog.java
deleted file mode 100644
index 006d4bb..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/GroupsDialog.java
+++ /dev/null
@@ -1,353 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-import javax.swing.event.ListSelectionEvent;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.Group;
-import gov.nasa.ziggy.ui.proxy.GroupCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class GroupsDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(GroupsDialog.class);
-
-    private JPanel dataPanel;
-    private JPanel addRemovePanel;
-    private JPanel defaultPanel;
-    private JCheckBox defaultCheckBox;
-    private JButton removeButton;
-    private JButton addButton;
-    private JTextField newGroupTextField;
-    private JList<Group> groupsList;
-    private JScrollPane groupsScrollPane;
-    private JButton cancelButton;
-    private JButton okButton;
-    private JPanel buttonPanel;
-    private GenericListModel<Group> groupsListModel;
-    private GroupCrudProxy groupCrud;
-    private boolean isCancelled = false;
-    private final boolean defaultSelected = false;
-
-    public GroupsDialog(JFrame frame) {
-        super(frame, true);
-        initGUI();
-
-        groupCrud = new GroupCrudProxy();
-        loadFromDatabase();
-    }
-
-    public GroupsDialog(JDialog owner) {
-        super(owner, true);
-    }
-
-    public static Group selectGroup(Component owner) {
-        Window ownerWindow = findParentWindow(owner);
-
-        GroupsDialog editor;
-        if (ownerWindow instanceof JFrame) {
-            editor = new GroupsDialog((JFrame) ownerWindow);
-        } else {
-            editor = new GroupsDialog((JDialog) ownerWindow);
-        }
-
-        editor.setVisible(true);
-
-        if (editor.isCancelled) {
-            return null;
-        }
-        if (editor.defaultCheckBox.isSelected()) {
-            return Group.DEFAULT_GROUP;
-        } else {
-            return editor.getSelectedGroup();
-        }
-    }
-
-    public boolean isDefaultSelected() {
-        return defaultSelected;
-    }
-
-    private void loadFromDatabase(String selectedName) {
-        loadFromDatabase();
-
-        List<Group> groups = groupsListModel.getList();
-        int index = 0;
-
-        for (Group group : groups) {
-            if (group.getName().equals(selectedName)) {
-                groupsList.setSelectedIndex(index);
-            }
-            index++;
-        }
-    }
-
-    private void loadFromDatabase() {
-        List<Group> groups = groupCrud.retrieveAll();
-        groupsListModel.setList(groups);
-    }
-
-    private void defaultCheckBoxActionPerformed(ActionEvent evt) {
-        log.debug("defaultCheckBox.actionPerformed, event=" + evt);
-
-        groupsList.clearSelection();
-    }
-
-    private void groupsListValueChanged(ListSelectionEvent evt) {
-        log.debug("groupsList.valueChanged, event=" + evt);
-
-        defaultCheckBox.setSelected(groupsList.getSelectedIndex() == -1);
-    }
-
-    private void okButtonActionPerformed(ActionEvent evt) {
-        log.debug("okButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        isCancelled = true;
-        setVisible(false);
-    }
-
-    private void addButtonActionPerformed(ActionEvent evt) {
-        log.debug("addButton.actionPerformed, event=" + evt);
-
-        addGroup();
-    }
-
-    private void newGroupTextFieldActionPerformed(ActionEvent evt) {
-        log.debug("newGroupTextField.actionPerformed, event=" + evt);
-
-        addGroup();
-    }
-
-    private void addGroup() {
-        try {
-            String groupName = newGroupTextField.getText();
-            if (groupName != null && groupName.length() > 0) {
-                List<Group> currentList = groupsListModel.getList();
-                Group newGroup = new Group(groupName);
-                if (currentList.contains(newGroup)) {
-                    MessageUtil.showError(this, "A group by that name already exists");
-                } else {
-                    groupCrud.save(newGroup);
-
-                    loadFromDatabase(groupName);
-                }
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void removeButtonActionPerformed(ActionEvent evt) {
-        log.debug("removeButton.actionPerformed, event=" + evt);
-
-        try {
-            Group group = getSelectedGroup();
-            if (group != null) {
-                groupCrud.delete(group);
-                loadFromDatabase();
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private Group getSelectedGroup() {
-        int selectedIndex = groupsList.getSelectedIndex();
-        if (selectedIndex >= 0) {
-            return groupsListModel.get(selectedIndex);
-        }
-        return null;
-    }
-
-    private static Window findParentWindow(Component c) {
-        Component root = c;
-
-        while (!(root instanceof JFrame) && !(root instanceof JDialog)) {
-            root = root.getParent();
-            if (root == null) {
-                return null;
-            }
-        }
-        return (Window) root;
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Select Group");
-            }
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            this.setSize(269, 412);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getAddRemovePanel(), BorderLayout.SOUTH);
-            dataPanel.add(getGroupsScrollPane(), BorderLayout.CENTER);
-            dataPanel.add(getDefaultPanel(), BorderLayout.NORTH);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(50);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getOkButton());
-            buttonPanel.add(getCancelButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getOkButton() {
-        if (okButton == null) {
-            okButton = new JButton();
-            okButton.setText("ok");
-            okButton.addActionListener(this::okButtonActionPerformed);
-        }
-        return okButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JPanel getAddRemovePanel() {
-        if (addRemovePanel == null) {
-            addRemovePanel = new JPanel();
-            GridBagLayout addRemovePanelLayout = new GridBagLayout();
-            addRemovePanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1 };
-            addRemovePanelLayout.rowHeights = new int[] { 7, 7, 7, 7 };
-            addRemovePanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                0.1, 0.1, 0.1 };
-            addRemovePanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
-            addRemovePanel.setLayout(addRemovePanelLayout);
-            addRemovePanel.setBorder(BorderFactory.createTitledBorder("add/remove group"));
-            addRemovePanel.add(getNewGroupTextField(),
-                new GridBagConstraints(0, 1, 8, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            addRemovePanel.add(getAddButton(), new GridBagConstraints(8, 1, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            addRemovePanel.add(getRemoveButton(), new GridBagConstraints(9, 1, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return addRemovePanel;
-    }
-
-    private JScrollPane getGroupsScrollPane() {
-        if (groupsScrollPane == null) {
-            groupsScrollPane = new JScrollPane();
-            groupsScrollPane.setViewportView(getGroupsList());
-        }
-        return groupsScrollPane;
-    }
-
-    private JList<Group> getGroupsList() {
-        if (groupsList == null) {
-            groupsListModel = new GenericListModel<>();
-            groupsList = new JList<>();
-            groupsList.setModel(groupsListModel);
-            groupsList.addListSelectionListener(this::groupsListValueChanged);
-        }
-        return groupsList;
-    }
-
-    private JTextField getNewGroupTextField() {
-        if (newGroupTextField == null) {
-            newGroupTextField = new JTextField();
-            newGroupTextField.addActionListener(this::newGroupTextFieldActionPerformed);
-        }
-        return newGroupTextField;
-    }
-
-    private JButton getAddButton() {
-        if (addButton == null) {
-            addButton = new JButton();
-            addButton.setText("+");
-            addButton.addActionListener(this::addButtonActionPerformed);
-        }
-        return addButton;
-    }
-
-    private JButton getRemoveButton() {
-        if (removeButton == null) {
-            removeButton = new JButton();
-            removeButton.setText("-");
-            removeButton.addActionListener(this::removeButtonActionPerformed);
-        }
-        return removeButton;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JFrame frame = new JFrame();
-            GroupsDialog inst = new GroupsDialog(frame);
-            inst.setVisible(true);
-        });
-    }
-
-    private JPanel getDefaultPanel() {
-        if (defaultPanel == null) {
-            defaultPanel = new JPanel();
-            FlowLayout defaultPanelLayout = new FlowLayout();
-            defaultPanelLayout.setAlignment(FlowLayout.LEFT);
-            defaultPanel.setLayout(defaultPanelLayout);
-            defaultPanel.add(getDefaultCheckBox());
-        }
-        return defaultPanel;
-    }
-
-    private JCheckBox getDefaultCheckBox() {
-        if (defaultCheckBox == null) {
-            defaultCheckBox = new JCheckBox();
-            defaultCheckBox.setText("default group");
-            defaultCheckBox.addActionListener(this::defaultCheckBoxActionPerformed);
-        }
-        return defaultCheckBox;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/HtmlLabelBuilder.java b/src/main/java/gov/nasa/ziggy/ui/common/HtmlLabelBuilder.java
deleted file mode 100644
index 1adce54..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/HtmlLabelBuilder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import javax.swing.JLabel;
-
-/**
- * Convenience class for building HTML strings used for setting the text on {@link JLabel}s or other
- * Swing components that support HTML text.
- *
- * @author Todd Klaus
- */
-public class HtmlLabelBuilder {
-    StringBuilder html = new StringBuilder();
-
-    public HtmlLabelBuilder() {
-    }
-
-    public HtmlLabelBuilder(String text) {
-        append(text);
-    }
-
-    public HtmlLabelBuilder append(String text) {
-        html.append(text);
-        return this;
-    }
-
-    public HtmlLabelBuilder appendBold(String text) {
-        html.append("<b>");
-        html.append(text);
-        html.append("</b>");
-        return this;
-    }
-
-    public HtmlLabelBuilder appendItalic(String text) {
-        html.append("<i>");
-        html.append(text);
-        html.append("</i>");
-        return this;
-    }
-
-    public HtmlLabelBuilder appendColor(String text, String color) {
-        html.append("<font color=" + color + ">");
-        html.append(text);
-        html.append("</font>");
-        return this;
-    }
-
-    public HtmlLabelBuilder appendSizeModifier(String text, String size) {
-        html.append("<font size=" + size + ">");
-        html.append(text);
-        html.append("</font>");
-        return this;
-    }
-
-    public HtmlLabelBuilder appendCustomHtml(String htmlPrefix, String text, String htmlSuffix) {
-        html.append(htmlPrefix);
-        html.append(text);
-        html.append(htmlSuffix);
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "<html>" + html.toString() + "</html>";
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/IntFilter.java b/src/main/java/gov/nasa/ziggy/ui/common/IntFilter.java
deleted file mode 100644
index fdda3ef..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/IntFilter.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.util.regex.Pattern;
-
-/**
- * Text field filter class that accepts only positive integer values.
- *
- * @author PT
- */
-public class IntFilter extends NumericFilter {
-
-    // Pattern matcher for a non-negative integer -- contains only digits, no
-    // decimal point or minus sign needed.
-    static final Pattern POSITIVE_INT_PATTERN = Pattern.compile("\\d*");
-    static final Pattern[] PATTERNS = { POSITIVE_INT_PATTERN };
-
-    @Override
-    protected Pattern[] patterns() {
-        return PATTERNS;
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/LabelUtils.java b/src/main/java/gov/nasa/ziggy/ui/common/LabelUtils.java
deleted file mode 100644
index 01aa67b..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/LabelUtils.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.awt.Font;
-
-import javax.swing.JLabel;
-
-public class LabelUtils {
-
-    public static JLabel boldLabel() {
-        JLabel newLabel = new JLabel();
-        Font f = newLabel.getFont();
-        newLabel.setFont(f.deriveFont(f.getStyle() | Font.BOLD));
-        return newLabel;
-
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/MessageDialog.java b/src/main/java/gov/nasa/ziggy/ui/common/MessageDialog.java
deleted file mode 100644
index 7241d05..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/MessageDialog.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Display a String message in a scrollable JTextArea
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class MessageDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(MessageDialog.class);
-
-    private JPanel dataPanel;
-    private JTextArea messageTextArea;
-    private JScrollPane textAreaScrollPane;
-    private JButton closeButton;
-    private JPanel buttonPanel;
-
-    private String message = "";
-
-    public MessageDialog(JFrame parent, String message) {
-        super(parent, true);
-        this.message = message;
-
-        initGUI();
-    }
-
-    public MessageDialog(JDialog parent, String message) {
-        super(parent, true);
-        this.message = message;
-
-        initGUI();
-    }
-
-    public static void showMessageDialog(JFrame parent, String message) {
-        MessageDialog d = new MessageDialog(parent, message);
-        d.setVisible(true);
-    }
-
-    public static void showMessageDialog(JDialog parent, String message) {
-        MessageDialog d = new MessageDialog(parent, message);
-        d.setVisible(true);
-    }
-
-    private void closeButtonActionPerformed(ActionEvent evt) {
-        log.debug("closeButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            setSize(400, 300);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getTextAreaScrollPane(), BorderLayout.CENTER);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            buttonPanel.add(getCloseButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("close");
-            closeButton.addActionListener(this::closeButtonActionPerformed);
-        }
-        return closeButton;
-    }
-
-    private JScrollPane getTextAreaScrollPane() {
-        if (textAreaScrollPane == null) {
-            textAreaScrollPane = new JScrollPane();
-            textAreaScrollPane.setViewportView(getMessageTextArea());
-        }
-        return textAreaScrollPane;
-    }
-
-    private JTextArea getMessageTextArea() {
-        if (messageTextArea == null) {
-            messageTextArea = new JTextArea(message);
-        }
-        return messageTextArea;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/ProcessHeartbeatManager.java b/src/main/java/gov/nasa/ziggy/ui/common/ProcessHeartbeatManager.java
deleted file mode 100644
index 996cc94..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/ProcessHeartbeatManager.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.data.management.DataReceiptPipelineModule;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
-import gov.nasa.ziggy.ui.ClusterController;
-import gov.nasa.ziggy.ui.mon.master.Indicator;
-import gov.nasa.ziggy.ui.mon.master.MasterStatusPanel;
-import gov.nasa.ziggy.ui.mon.master.ProcessesIndicatorPanel;
-import gov.nasa.ziggy.util.SystemTime;
-import gov.nasa.ziggy.util.ZiggyShutdownHook;
-
-/**
- * Manages the process of responding to the presence or absence of heartbeat messages from the
- * worker. The worker heartbeat messages are sent out at regular intervals from the worker to
- * indicate that it has not crashed.
- * <p>
- * At startup, a UI puts the Processes summary into the "Gray" (undefined) state. When the
- * {@link UiCommunicator} is created, an instance of {@link ProcessHeartbeatManager} is also
- * created; it waits for 1 heartbeat interval to hear from the worker. If the worker is heard from
- * in that interval, the state of the Processes summary goes to "Green;" if not heard from, "Red."
- * <p>
- * Once the Processes summary is "Green," a {@link ScheduledThreadPoolExecutor} is started that
- * checks the timestamp of the latest heartbeat at an interval that is 2 * the heartbeat interval.
- * If there have been no new heartbeats since the last one recorded by the
- * {@link ProcessHeartbeatManager}, the Processes summary goes "Yellow," the {@link UiCommunicator}
- * instance is deleted, and a new instance is created; this is necessary because, if the worker has
- * restarted, it needs new copies of the {@link MessageHandler} from each UI, which are provided
- * during construction of the {@link UiCommunicator}.
- * <p>
- * If, after deleting and reconstructing the {@link UiCommunicator}, the worker is still not heard
- * from, the Processes summary goes to "Red," and the heartbeat monitoring is terminated. At this
- * point, it is assumed that whatever has happened to the worker is serious enough that it requires
- * human intervention.
- *
- * @author PT
- */
-public class ProcessHeartbeatManager {
-
-    static final String RMI_RED_MESSAGE = "Unable to establish communication with worker";
-    static final String RMI_AMBER_MESSAGE = "Attempting to establish communication with worker";
-    static final String WORKER_RED_MESSAGE = "Worker process has failed";
-    static final String DATABASE_RED_MESSAGE = "Database process has failed";
-
-    private static final Logger log = LoggerFactory.getLogger(DataReceiptPipelineModule.class);
-
-    private MessageHandler messageHandler;
-    private long heartbeatIntervalMillis;
-    private ScheduledThreadPoolExecutor heartbeatListener;
-    private long lastHeartbeatTime;
-    private HeartbeatManagerExternalMethods externalMethodsManager;
-    private boolean isInitialized = false;
-    private ClusterController clusterController;
-    private boolean reinitializeOnMissedHeartbeat = true;
-
-    public ProcessHeartbeatManager(MessageHandler messageHandler) {
-        this(messageHandler, new HeartbeatManagerExternalMethods(), new ClusterController(100, 1));
-    }
-
-    /**
-     * Constructor for test purposes. This allows the caller to supply a mocked instance of the
-     * class that performs all "external" methods (where in this case an external method is one we
-     * want to mock and/or detect the use of).
-     *
-     * @param messageHandler
-     * @param externalMethodsManager
-     */
-    protected ProcessHeartbeatManager(MessageHandler messageHandler,
-        HeartbeatManagerExternalMethods externalMethodsManager,
-        ClusterController clusterController) {
-        this.messageHandler = messageHandler;
-        this.externalMethodsManager = externalMethodsManager;
-        heartbeatIntervalMillis = messageHandler.heartbeatIntervalMillis();
-        this.clusterController = clusterController;
-    }
-
-    /**
-     * Start checking for heartbeats. If they are detected, start the automated at-intervals
-     * checking.
-     *
-     * @throws NoHeartbeatException
-     */
-    public void initialize() throws NoHeartbeatException {
-
-        if (isInitialized) {
-            return;
-        }
-        // wait for one heartbeat interval to see if we get a heartbeat message
-        long t0 = SystemTime.currentTimeMillis();
-        while (messageHandler.getLastHeartbeatTimeMillis() == 0
-            && SystemTime.currentTimeMillis() - t0 < heartbeatIntervalMillis) {
-        }
-        if (messageHandler.getLastHeartbeatTimeMillis() <= 0) {
-            setRmiIndicator(Indicator.State.RED);
-            if (heartbeatListener != null) {
-                heartbeatListener.shutdownNow();
-            }
-            throw new NoHeartbeatException("Unable to detect worker heartbeat messages");
-        }
-        setRmiIndicator(Indicator.State.GREEN);
-        lastHeartbeatTime = messageHandler.getLastHeartbeatTimeMillis();
-        if (heartbeatListener == null) {
-            startHeartbeatListener();
-        }
-        isInitialized = true;
-    }
-
-    /**
-     * Updates the state of the Processes idiot light.
-     */
-    protected void setRmiIndicator(Indicator.State state) {
-        externalMethodsManager.setRmiIndicator(state);
-    }
-
-    protected void setWorkerIndicator(Indicator.State state) {
-        externalMethodsManager.setWorkerIndicator(state);
-    }
-
-    protected void setDatabaseIndicator(Indicator.State state) {
-        externalMethodsManager.setDatabaseIndicator(state);
-    }
-
-    /**
-     * Start at-intervals checking for heartbeats, with a check interval that is 2 * the interval at
-     * which the worker emits heartbeats.
-     */
-    protected void startHeartbeatListener() {
-        heartbeatListener = new ScheduledThreadPoolExecutor(1);
-        if (heartbeatIntervalMillis == 0) {
-            return;
-        }
-        heartbeatListener.scheduleAtFixedRate(() -> {
-            try {
-                checkForHeartbeat();
-            } catch (Exception e) {
-                log.error("Exception occurred attempting to start heartbeat listener", e);
-                // NB: I'm pretty certain this block could never be executed because if there's
-                // a NoHeartbeatException thrown in checkForHeartbeat(), this thread will
-                // immediately be shut down.
-            }
-        }, 2 * heartbeatIntervalMillis, 2 * heartbeatIntervalMillis, TimeUnit.MILLISECONDS);
-        ZiggyShutdownHook.addShutdownHook(() -> {
-            heartbeatListener.shutdownNow();
-        });
-
-    }
-
-    /**
-     * Check for a heartbeat more recent than the last one recorded. If none has happened, attempt
-     * to delete and recreate the {@link UiCommunicator} and restart checking for heartbeats. If
-     * those attempts fail, stop all automated checking and set the Processes summary to "Red."
-     *
-     * @throws NoHeartbeatException
-     */
-    protected void checkForHeartbeat() throws NoHeartbeatException {
-        if (messageHandler.getLastHeartbeatTimeMillis() > lastHeartbeatTime) {
-            lastHeartbeatTime = messageHandler.getLastHeartbeatTimeMillis();
-        } else {
-            setRmiIndicator(Indicator.State.AMBER);
-            lastHeartbeatTime = 0L;
-            messageHandler.resetLastHeartbeatTime();
-            restartUiCommunicator();
-            isInitialized = false;
-            if (reinitializeOnMissedHeartbeat) {
-                initialize();
-            }
-        }
-        if (clusterController.isDatabaseRunning()) {
-            setDatabaseIndicator(Indicator.State.GREEN);
-        } else {
-            setDatabaseIndicator(Indicator.State.RED);
-        }
-        if (clusterController.isWorkerRunning()) {
-            setWorkerIndicator(Indicator.State.GREEN);
-        } else {
-            setWorkerIndicator(Indicator.State.RED);
-        }
-    }
-
-    protected void restartUiCommunicator() {
-        externalMethodsManager.restartUiCommunicator();
-    }
-
-    public ScheduledThreadPoolExecutor getHeartbeatListener() {
-        return heartbeatListener;
-    }
-
-    protected MessageHandler getMessageHandler() {
-        return messageHandler;
-    }
-
-    protected long getLastHeartbeatTime() {
-        return lastHeartbeatTime;
-    }
-
-    // For testing use only.
-    protected void setClusterController(ClusterController clusterController) {
-        this.clusterController = clusterController;
-    }
-
-    // For testing use only.
-    void setReinitializeOnMissedHeartbeat(boolean reinitialize) {
-        reinitializeOnMissedHeartbeat = reinitialize;
-    }
-
-    public static class HeartbeatManagerExternalMethods {
-
-        Indicator.State getProcessIdiotLightState() {
-            return MasterStatusPanel.processesIndicator().getState();
-        }
-
-        public void setRmiIndicator(Indicator.State state) {
-            setIndicator(ProcessesIndicatorPanel.messagingIndicator(), state, RMI_AMBER_MESSAGE,
-                RMI_RED_MESSAGE);
-        }
-
-        public void setWorkerIndicator(Indicator.State state) {
-            setIndicator(ProcessesIndicatorPanel.workerIndicator(), state, null,
-                WORKER_RED_MESSAGE);
-        }
-
-        public void setDatabaseIndicator(Indicator.State state) {
-            setIndicator(ProcessesIndicatorPanel.databaseIndicator(), state, null,
-                DATABASE_RED_MESSAGE);
-        }
-
-        void setIndicator(Indicator indicator, Indicator.State state, String amberTooltip,
-            String redTooltip) {
-            if (indicator == null) {
-                return;
-            }
-            String tooltip = null;
-            if (state == Indicator.State.AMBER) {
-                tooltip = amberTooltip;
-            }
-            if (state == Indicator.State.RED) {
-                tooltip = redTooltip;
-            }
-            indicator.setState(state, tooltip);
-            updateProcessesIndicator();
-
-        }
-
-        void updateProcessesIndicator() {
-            MasterStatusPanel.processesIndicator()
-                .setState(
-                    Indicator.summaryState(ProcessesIndicatorPanel.messagingIndicator(),
-                        ProcessesIndicatorPanel.workerIndicator(),
-                        ProcessesIndicatorPanel.databaseIndicator()),
-                    Indicator.summaryToolTipText(ProcessesIndicatorPanel.messagingIndicator(),
-                        ProcessesIndicatorPanel.workerIndicator(),
-                        ProcessesIndicatorPanel.databaseIndicator()));
-        }
-
-        void restartUiCommunicator() {
-            UiCommunicator.restart();
-        }
-    }
-
-    public static class NoHeartbeatException extends Exception {
-
-        private static final long serialVersionUID = 20210310L;
-
-        public NoHeartbeatException(String string) {
-            super(string);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/PropertySheetHelper.java b/src/main/java/gov/nasa/ziggy/ui/common/PropertySheetHelper.java
deleted file mode 100644
index 1a79e03..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/PropertySheetHelper.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.beans.PropertyEditor;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.l2fprod.common.beans.ExtendedPropertyDescriptor;
-import com.l2fprod.common.propertysheet.PropertySheetPanel;
-
-import gov.nasa.ziggy.parameters.DefaultParameters;
-import gov.nasa.ziggy.ui.collections.ArrayPropertyEditor;
-import gov.nasa.ziggy.ui.collections.ArrayTableCellRenderer;
-
-/**
- * Helper methods for working with L2fprod's {@link PropertySheetPanel}
- *
- * @author Todd Klaus
- */
-public class PropertySheetHelper {
-    private static final Logger log = LoggerFactory.getLogger(PropertySheetHelper.class);
-
-    private PropertySheetHelper() {
-    }
-
-    /**
-     * Initialize null fields since the property editors may not work correctly otherwise. This
-     * can't be done in the property editors themselves since they only get an Object and don't know
-     * the type (foo.getClass() doesn't work if foo is null!)
-     *
-     * @param parametersBean
-     * @throws Exception
-     */
-    public static void deNullify(Object parametersBean) throws Exception {
-        Class<?> beanClass = parametersBean.getClass();
-        Field[] fields = beanClass.getDeclaredFields();
-        for (Field field : fields) {
-            // allow us to access the value of private fields
-            field.setAccessible(true);
-
-            Object fieldValue = field.get(parametersBean);
-            Class<?> fieldClass = field.getType();
-            Object initialValue = null;
-
-            if (fieldValue == null) {
-                log.debug("Initializing null field: " + field.getName());
-
-                if (fieldClass.isArray()) {
-                    initialValue = Array.newInstance(fieldClass.getComponentType(), 0);
-                } else {
-                    initialValue = fieldClass.getDeclaredConstructor().newInstance();
-                }
-                field.set(parametersBean, initialValue);
-            }
-        }
-    }
-
-    /**
-     * Helper method that populates a {@link PropertySheetPanel} with the contents of a bean
-     * instance. Automatically adds an {@link ArrayPropertyEditor} and an
-     * {@link ArrayTableCellRenderer} for array fields that do not already have a custom
-     * {@link PropertyEditor}.
-     *
-     * @param parametersBean
-     * @param propertySheetPanel
-     * @throws IntrospectionException
-     */
-    public static void populatePropertySheet(Object parametersBean,
-        PropertySheetPanel propertySheetPanel) throws Exception {
-        // initialize null fields so the property editors won't get tripped up.
-
-        Class<?> beanClass = parametersBean.getClass();
-        if (beanClass.equals(DefaultParameters.class)) {
-            DefaultParameters parameters = (DefaultParameters) parametersBean;
-            propertySheetPanel.setProperties(parameters.typedProperties());
-            propertySheetPanel.setRendererFactory(new TypedParameterRendererFactory());
-            propertySheetPanel.setEditorFactory(new TypedParameterEditorFactory());
-        } else {
-            PropertySheetHelper.deNullify(parametersBean);
-            BeanInfo beanInfo;
-
-            beanInfo = Introspector.getBeanInfo(beanClass, Object.class);
-            PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
-
-            /*
-         * Add an ArrayPropertyEditor for fields that are arrays and don't already have a custom
-         * PropertyEditor assigned.
-         *
-         * @formatter:off
-         * if class is array
-         *   if propertyDescriptor is NOT ExtendedPropertyDescriptor
-         *     convert to ExtendedPropertyDescriptor
-         *   if getPropertyEditorClass not set
-         *     set to ArrayPropertyEditor
-         *   if getPropertyTableRendererClass not set
-         *     set to ArrayTableCellRenderer
-         * add property to propertySheetPanel
-         * @formatter:on
-         */
-
-            PropertyDescriptor[] newPropertyDescriptors = new PropertyDescriptor[propertyDescriptors.length];
-            int index = 0;
-
-            for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
-                Class<?> clazz = propertyDescriptor.getPropertyType();
-                log.debug("property class = " + clazz);
-
-                if (clazz.isArray()) {
-                    ExtendedPropertyDescriptor extendedPropertyDescriptor;
-
-                    if (propertyDescriptor instanceof ExtendedPropertyDescriptor) {
-                        extendedPropertyDescriptor = (ExtendedPropertyDescriptor) propertyDescriptor;
-                    } else {
-                        extendedPropertyDescriptor = ExtendedPropertyDescriptor
-                            .newPropertyDescriptor(propertyDescriptor.getName(), beanClass);
-                    }
-
-                    if (extendedPropertyDescriptor.getPropertyEditorClass() == null) {
-                        extendedPropertyDescriptor
-                            .setPropertyEditorClass(ArrayPropertyEditor.class);
-                    }
-
-                    if (extendedPropertyDescriptor.getPropertyTableRendererClass() == null) {
-                        extendedPropertyDescriptor
-                            .setPropertyTableRendererClass(ArrayTableCellRenderer.class);
-                    }
-
-                    newPropertyDescriptors[index++] = extendedPropertyDescriptor;
-                } else {
-                    newPropertyDescriptors[index++] = propertyDescriptor;
-                }
-            }
-
-            propertySheetPanel.setProperties(newPropertyDescriptors);
-        }
-        propertySheetPanel.readFromObject(parametersBean);
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/RealFilter.java b/src/main/java/gov/nasa/ziggy/ui/common/RealFilter.java
deleted file mode 100644
index 4f599b3..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/RealFilter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.util.regex.Pattern;
-
-/**
- * Text field filter class that accepts only positive real values.
- *
- * @author PT
- */
-public class RealFilter extends NumericFilter {
-
-    // Pattern matcher for a non-negative real, based on a design pattern in
-    // Stack Overflow:
-    // https://stackoverflow.com/a/51994332
-    static final Pattern POSITIVE_REAL_PATTERN = Pattern
-        .compile("[+]?(\\d+|\\d+\\.\\d+|\\.\\d+|\\d+\\.)([eE]\\d+)?");
-    static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");
-    static final Pattern EMPTY_PATTERN = Pattern.compile("");
-    static final Pattern[] PATTERNS = { POSITIVE_REAL_PATTERN, WHITESPACE_PATTERN, EMPTY_PATTERN };
-
-    @Override
-    protected Pattern[] patterns() {
-        return PATTERNS;
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/RealTextField.java b/src/main/java/gov/nasa/ziggy/ui/common/RealTextField.java
deleted file mode 100644
index bbca957..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/RealTextField.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import javax.swing.JTextField;
-import javax.swing.text.Document;
-import javax.swing.text.DocumentFilter;
-
-/**
- * Version of {@link JTextField} that accepts only non-negative real values.
- *
- * @author PT
- */
-public class RealTextField extends FilteredTextField {
-
-    private static final long serialVersionUID = 20210811L;
-
-    public RealTextField() {
-    }
-
-    public RealTextField(Document doc, String text, int columns) {
-        super(doc, text, columns);
-    }
-
-    public RealTextField(int columns) {
-        super(columns);
-    }
-
-    public RealTextField(String text) {
-        super(text);
-    }
-
-    public RealTextField(String text, int columns) {
-        super(text, columns);
-    }
-
-    @Override
-    protected DocumentFilter filter() {
-        return new RealFilter();
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/ScalableImageLabel.java b/src/main/java/gov/nasa/ziggy/ui/common/ScalableImageLabel.java
deleted file mode 100644
index 19f1077..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/ScalableImageLabel.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.awt.Graphics;
-import java.awt.Image;
-
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-import javax.swing.JLabel;
-
-public class ScalableImageLabel extends JLabel {
-
-    private static final long serialVersionUID = 20221220L;
-
-    private Image originalImage;
-
-    @Override
-    public void setIcon(Icon icon) {
-        super.setIcon(icon);
-        if (icon instanceof ImageIcon) {
-            originalImage = ((ImageIcon) icon).getImage();
-        }
-    }
-
-    @Override
-    public void paint(Graphics g) {
-        int height = getParent().getHeight();
-        int width = getParent().getWidth();
-        float originalHeight = originalImage.getHeight(null);
-        float originalWidth = originalImage.getWidth(null);
-        float heightScale = height / originalHeight;
-        float widthScale = width / originalWidth;
-        float scale = Math.min(heightScale, widthScale);
-        scale = Math.min(scale, 1.0F);
-        int scaledWidth = (int) (originalWidth * scale);
-        int scaledHeight = (int) (originalHeight * scale);
-        Image scaledImage = originalImage.getScaledInstance(scaledWidth, scaledHeight,
-            Image.SCALE_SMOOTH);
-        g.drawImage(scaledImage, 0, 0, null);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/ToolTipBorderJPanel.java b/src/main/java/gov/nasa/ziggy/ui/common/ToolTipBorderJPanel.java
deleted file mode 100644
index e054772..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/ToolTipBorderJPanel.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.awt.FontMetrics;
-import java.awt.LayoutManager;
-import java.awt.Rectangle;
-import java.awt.event.MouseEvent;
-
-import javax.swing.JPanel;
-import javax.swing.border.Border;
-import javax.swing.border.TitledBorder;
-
-public class ToolTipBorderJPanel extends JPanel {
-
-    private static final long serialVersionUID = 20210812L;
-
-    public ToolTipBorderJPanel() {
-    }
-
-    public ToolTipBorderJPanel(boolean isDoubleBuffered) {
-        super(isDoubleBuffered);
-    }
-
-    public ToolTipBorderJPanel(LayoutManager layout) {
-        super(layout);
-    }
-
-    public ToolTipBorderJPanel(LayoutManager layout, boolean isDoubleBuffered) {
-        super(layout, isDoubleBuffered);
-    }
-
-    @Override
-    public String getToolTipText(MouseEvent e) {
-        Border border = getBorder();
-
-        if (border instanceof TitledBorder) {
-            TitledBorder tb = (TitledBorder) border;
-            FontMetrics fm = getFontMetrics(tb.getTitleFont());
-            int titleWidth = fm.stringWidth(tb.getTitle()) + 20;
-            Rectangle bounds = new Rectangle(0, 0, titleWidth, fm.getHeight());
-            return bounds.contains(e.getPoint()) ? super.getToolTipText() : null;
-        }
-
-        return super.getToolTipText(e);
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/ZTable.java b/src/main/java/gov/nasa/ziggy/ui/common/ZTable.java
deleted file mode 100644
index b683750..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/common/ZTable.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package gov.nasa.ziggy.ui.common;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.font.FontRenderContext;
-import java.awt.font.LineBreakMeasurer;
-import java.awt.font.TextLayout;
-import java.text.AttributedCharacterIterator;
-import java.text.AttributedString;
-import java.text.BreakIterator;
-import java.util.Vector;
-
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.ListSelectionModel;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
-
-import org.netbeans.swing.etable.ETable;
-
-/**
- * Subclass of the NetBeans {@link ETable} class that provides 2 additional features:
- * <ol>
- * <li>Permits the user to select alternate-row shading, which can make the table easier to read.
- * <li>Permits the user to select wrapping of cell text and resizing of rows in which cell text is
- * wrapped.
- * </ol>
- *
- * @author PT
- */
-public class ZTable extends ETable {
-
-    private static final long serialVersionUID = 20220926L;
-    private static final int SHADED_ROW_INTERVAL = 2;
-    private static final Color LIGHTER_GREY = new Color(240, 240, 240);
-
-    private boolean rowShadingEnabled = false;
-    private boolean textWrappingEnabled = false;
-    private TableCellRenderer textWrapTableCellRenderer;
-    boolean resizing = false;
-
-    public ZTable() {
-    }
-
-    public ZTable(TableModel dm) {
-        super(dm);
-    }
-
-    public ZTable(TableModel dm, TableColumnModel cm) {
-        super(dm, cm);
-    }
-
-    public ZTable(TableModel dm, TableColumnModel cm, ListSelectionModel sm) {
-        super(dm, cm, sm);
-    }
-
-    public ZTable(int numRows, int numColumns) {
-        super(numRows, numColumns);
-    }
-
-    public ZTable(Vector<?> rowData, Vector<?> columnNames) {
-        super(rowData, columnNames);
-    }
-
-    public ZTable(Object[][] rowData, Object[] columnNames) {
-        super(rowData, columnNames);
-    }
-
-    public void setRowShadingEnabled(boolean rowShadingEnabled) {
-        this.rowShadingEnabled = rowShadingEnabled;
-    }
-
-    public void setTextWrappingEnabled(boolean textWrappingEnabled) {
-        this.textWrappingEnabled = textWrappingEnabled;
-        if (textWrappingEnabled && textWrapTableCellRenderer == null) {
-            textWrapTableCellRenderer = new TextWrapCellRenderer();
-        }
-    }
-
-    @Override
-    public Component prepareRenderer(TableCellRenderer renderer, int row, int column) {
-        Component comp = super.prepareRenderer(renderer, row, column);
-
-        // let ETable handle the shading of the selected row(s)
-        if (!isCellSelected(row, column) && rowShadingEnabled) {
-            if (row % SHADED_ROW_INTERVAL == 0) {
-                comp.setBackground(LIGHTER_GREY);
-            } else {
-                comp.setBackground(Color.white);
-            }
-        }
-
-        // If the wrapping changes, the row heights may need to be adjusted. However, when
-        // setRowHeight() is called, it apparently also calls prepareRenderer(). To prevent an
-        // infinite loop, don't call setRowHeight() again if we're already in the midst of
-        // setting the row height.
-        if (textWrappingEnabled) {
-            int optimalRowHeight = rowHeight(row);
-            if (optimalRowHeight != getRowHeight(row) && !resizing) {
-                resizing = true;
-                setRowHeight(row, optimalRowHeight);
-                resizing = false;
-            }
-        }
-        return comp;
-    }
-
-    @Override
-    public TableCellRenderer getCellRenderer(int row, int column) {
-        if (textWrappingEnabled && getColumnClass(column) != Boolean.class) {
-            return textWrapTableCellRenderer;
-        }
-        return super.getCellRenderer(row, column);
-    }
-
-    private float columnWidth(int columnIndex) {
-        return getColumnModel().getColumn(columnIndex).getWidth();
-    }
-
-    /**
-     * Calculates the height of a table cell.
-     * <p>
-     * There appears to be some sort of mismatch between the way that the {@link JTextArea} wraps
-     * text and the way that {@link LineBreakMeasurer} does, with the result that as the width of a
-     * column decreases, the text wants to wrap before the row height wants to increase. This
-     * results in an interval in which the line is wrapped but the latter part of the line is
-     * unreadable because the row height remains unchanged. To address this, the
-     * {@link LineBreakMeasurer} is given a wrapping width that is only 95\% as large as the column
-     * width.
-     * <p>
-     * There is also some problem with the way that the fonts are retrieved in this code, in that
-     * the fonts always have a landing of 0, resulting in the combination of ascent + descent +
-     * leading being too small. Empirically, it seems that each line of text wants a leading that's
-     * about equal to the descent, plus the cell wants an additional descent worth of height.
-     */
-    private int cellHeight(int row, int column) {
-        FontRenderContext fontRendererContext = getFontMetrics(getFont()).getFontRenderContext();
-        AttributedCharacterIterator characterIterator = new AttributedString(
-            getValueAt(row, column).toString()).getIterator();
-        LineBreakMeasurer lineMeasurer = new LineBreakMeasurer(characterIterator,
-            BreakIterator.getWordInstance(), fontRendererContext);
-        float formatWidth = columnWidth(column);
-        lineMeasurer.setPosition(characterIterator.getBeginIndex());
-        float height = 0;
-        float descent = 0;
-        while (lineMeasurer.getPosition() < characterIterator.getEndIndex()) {
-            TextLayout layout = lineMeasurer.nextLayout(0.95F * formatWidth);
-            height += layout.getAscent() + 2 * layout.getDescent();
-            descent = layout.getDescent();
-        }
-        return (int) (height + descent);
-    }
-
-    /**
-     * Calculates the height of a row by finding the maximum height of cells within the row.
-     */
-    private int rowHeight(int row) {
-        int height = 0;
-        for (int column = 0; column < getModel().getColumnCount(); column++) {
-            int cellHeight = cellHeight(row, column);
-            height = Math.max(height, cellHeight);
-        }
-        return height;
-    }
-
-    /**
-     * Implementation of {@link TableCellRenderer} that extends {@link JTextArea} in order to manage
-     * word wrapping when column resizing occurs.
-     *
-     * @author PT
-     */
-    private class TextWrapCellRenderer extends JTextArea implements TableCellRenderer {
-
-        private static final long serialVersionUID = 20220928L;
-
-        @Override
-        public Component getTableCellRendererComponent(JTable table, Object value,
-            boolean isSelected, boolean hasFocus, int row, int column) {
-            setText(value.toString());
-            setWrapStyleWord(true);
-            setLineWrap(true);
-
-            return this;
-        }
-
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/AbstractClonableViewEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/AbstractClonableViewEditPanel.java
deleted file mode 100644
index 8fe7d6f..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/AbstractClonableViewEditPanel.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package gov.nasa.ziggy.ui.config;
-
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.ui.PipelineUIException;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-
-@SuppressWarnings("serial")
-public abstract class AbstractClonableViewEditPanel extends AbstractViewEditPanel {
-    private static final Logger log = LoggerFactory.getLogger(AbstractClonableViewEditPanel.class);
-
-    protected JMenuItem cloneMenuItem;
-    protected JMenuItem renameMenuItem;
-
-    private final boolean supportsClone;
-    private final boolean supportsRename;
-
-    public AbstractClonableViewEditPanel(boolean supportsClone, boolean supportsRename) {
-        this.supportsClone = supportsClone;
-        this.supportsRename = supportsRename;
-    }
-
-    protected abstract void doClone(int row);
-
-    protected abstract String getCloneMenuText();
-
-    protected abstract void doRename(int row);
-
-    protected abstract String getRenameMenuText();
-
-    private void cloneMenuItemActionPerformed() {
-        try {
-            doClone(selectedModelRow);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void renameMenuItemActionPerformed() {
-        try {
-            doRename(selectedModelRow);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    @Override
-    protected void initGUI() throws PipelineUIException {
-        super.initGUI();
-
-        JPopupMenu menu = getPopupMenu();
-
-        if (supportsClone) {
-            menu.add(getCloneMenuItem());
-        }
-
-        if (supportsRename) {
-            menu.add(getRenameMenuItem());
-        }
-    }
-
-    protected JMenuItem getCloneMenuItem() {
-        log.debug("getCloneMenuItem() - start");
-
-        if (cloneMenuItem == null) {
-            cloneMenuItem = new JMenuItem();
-            cloneMenuItem.setText(getCloneMenuText());
-            cloneMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                cloneMenuItemActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getCloneMenuItem() - end");
-        return cloneMenuItem;
-    }
-
-    protected JMenuItem getRenameMenuItem() {
-        log.debug("getRenameMenuItem() - start");
-
-        if (renameMenuItem == null) {
-            renameMenuItem = new JMenuItem();
-            renameMenuItem.setText(getRenameMenuText());
-            renameMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                renameMenuItemActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getRenameMenuItem() - end");
-        return renameMenuItem;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/AbstractViewEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/AbstractViewEditPanel.java
deleted file mode 100644
index 73c0fc1..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/AbstractViewEditPanel.java
+++ /dev/null
@@ -1,297 +0,0 @@
-package gov.nasa.ziggy.ui.config;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-import javax.swing.JButton;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.ui.PipelineUIException;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public abstract class AbstractViewEditPanel extends javax.swing.JPanel {
-    private static final Logger log = LoggerFactory.getLogger(AbstractViewEditPanel.class);
-
-    protected JScrollPane scrollPane;
-    protected JPopupMenu popupMenu;
-    protected JMenuItem editMenuItem;
-    protected JMenuItem newMenuItem;
-    protected JMenuItem deleteMenuItem;
-    protected JButton refreshButton;
-    protected JButton newButton;
-    private JPanel buttonPanel;
-    protected ZTable table;
-    protected int selectedModelRow = -1;
-
-    public AbstractViewEditPanel() {
-    }
-
-    protected abstract AbstractTableModel getTableModel() throws PipelineUIException;
-
-    protected abstract void doEdit(int row);
-
-    protected abstract void doDelete(int row);
-
-    protected abstract void doNew();
-
-    protected abstract void doRefresh();
-
-    protected abstract String getEditMenuText();
-
-    protected abstract String getNewMenuText();
-
-    protected abstract String getDeleteMenuText();
-
-    private void newButtonActionPerformed(ActionEvent evt) {
-        log.debug("newButton.actionPerformed, event=" + evt);
-
-        try {
-            doNew();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        log.debug("refreshButton.actionPerformed, event=" + evt);
-
-        try {
-            doRefresh();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void editMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("editMenuItem.actionPerformed, event=" + evt);
-        log.debug("[PU] table row =" + selectedModelRow);
-
-        try {
-            doEdit(selectedModelRow);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void tableMouseClicked(MouseEvent evt) {
-        log.debug("tableMouseClicked(MouseEvent) - start");
-
-        if (evt.getClickCount() == 2) {
-            log.debug(
-                "tableMouseClicked(MouseEvent) - [DOUBLE-CLICK] table.mouseClicked, event=" + evt);
-            int tableRow = table.rowAtPoint(evt.getPoint());
-            selectedModelRow = table.convertRowIndexToModel(tableRow);
-            log.debug("tableMouseClicked(MouseEvent) - [DC] table row =" + selectedModelRow);
-
-            try {
-                doEdit(selectedModelRow);
-            } catch (Exception e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-
-        log.debug("tableMouseClicked(MouseEvent) - end");
-    }
-
-    private void deleteMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("deleteMenuItem.actionPerformed, event=" + evt);
-
-        try {
-            doDelete(selectedModelRow);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void newMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("newMenuItem.actionPerformed, event=" + evt);
-
-        try {
-            doNew();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    protected void initGUI() throws PipelineUIException {
-        log.debug("initGUI() - start");
-
-        BorderLayout thisLayout = new BorderLayout();
-        setLayout(thisLayout);
-        setPreferredSize(new Dimension(400, 300));
-        this.add(getScrollPane(), BorderLayout.CENTER);
-        this.add(getButtonPanel(), BorderLayout.NORTH);
-
-        log.debug("initGUI() - end");
-    }
-
-    private JScrollPane getScrollPane() throws PipelineUIException {
-        log.debug("getUsersPanelScrollPane() - start");
-
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getTable());
-        }
-
-        log.debug("getUsersPanelScrollPane() - end");
-        return scrollPane;
-    }
-
-    private ZTable getTable() throws PipelineUIException {
-        log.debug("getUsersTable() - start");
-
-        if (table == null) {
-            table = new ZTable();
-            table.setRowShadingEnabled(true);
-            table.setModel(getTableModel());
-            table.addMouseListener(new MouseAdapter() {
-                @Override
-                public void mouseClicked(MouseEvent evt) {
-                    tableMouseClicked(evt);
-                }
-            });
-            setComponentPopupMenu(table, getPopupMenu());
-        }
-
-        log.debug("getUsersTable() - end");
-        return table;
-    }
-
-    /**
-     * Auto-generated method for setting the popup menu for a component
-     */
-    private void setComponentPopupMenu(final java.awt.Component parent,
-        final javax.swing.JPopupMenu menu) {
-        log.debug("setComponentPopupMenu(java.awt.Component, javax.swing.JPopupMenu) - start");
-
-        parent.addMouseListener(new java.awt.event.MouseAdapter() {
-            @Override
-            public void mousePressed(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                    int tableRow = table.rowAtPoint(e.getPoint());
-                    // windows bug? works ok on Linux/gtk. Here's a workaround:
-                    if (tableRow == -1) {
-                        tableRow = table.getSelectedRow();
-                    }
-                    selectedModelRow = table.convertRowIndexToModel(tableRow);
-                }
-            }
-
-            @Override
-            public void mouseReleased(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                }
-            }
-        });
-
-        log.debug("setComponentPopupMenu(java.awt.Component, javax.swing.JPopupMenu) - end");
-    }
-
-    protected JPopupMenu getPopupMenu() {
-        log.debug("getUserMenu() - start");
-
-        if (popupMenu == null) {
-            popupMenu = new JPopupMenu();
-            popupMenu.add(getEditMenuItem());
-            popupMenu.add(getDeleteMenuItem());
-            popupMenu.add(getNewMenuItem());
-        }
-
-        log.debug("getUserMenu() - end");
-        return popupMenu;
-    }
-
-    private JMenuItem getEditMenuItem() {
-        log.debug("getEditMenuItem() - start");
-
-        if (editMenuItem == null) {
-            editMenuItem = new JMenuItem();
-            editMenuItem.setText(getEditMenuText());
-            editMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                editMenuItemActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getEditMenuItem() - end");
-        return editMenuItem;
-    }
-
-    private JMenuItem getDeleteMenuItem() {
-        log.debug("getDeleteMenuItem() - start");
-
-        if (deleteMenuItem == null) {
-            deleteMenuItem = new JMenuItem();
-            deleteMenuItem.setText(getDeleteMenuText());
-            deleteMenuItem.addActionListener(this::deleteMenuItemActionPerformed);
-        }
-
-        log.debug("getDeleteMenuItem() - end");
-        return deleteMenuItem;
-    }
-
-    private JMenuItem getNewMenuItem() {
-        log.debug("getNewMenuItem() - start");
-
-        if (newMenuItem == null) {
-            newMenuItem = new JMenuItem();
-            newMenuItem.setText(getNewMenuText());
-            newMenuItem.addActionListener(this::newMenuItemActionPerformed);
-        }
-
-        log.debug("getNewMenuItem() - end");
-        return newMenuItem;
-    }
-
-    protected JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setAlignment(FlowLayout.LEFT);
-            buttonPanelLayout.setHgap(20);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getNewButton());
-            buttonPanel.add(getRefreshButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getNewButton() {
-        if (newButton == null) {
-            newButton = new JButton();
-            newButton.setText("new");
-            newButton.addActionListener(this::newButtonActionPerformed);
-        }
-        return newButton;
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/ConfigDataPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/ConfigDataPanel.java
deleted file mode 100644
index eb6285b..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/ConfigDataPanel.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package gov.nasa.ziggy.ui.config;
-
-import java.awt.CardLayout;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.WindowConstants;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.config.datareceipt.DataReceiptPanel;
-import gov.nasa.ziggy.ui.config.events.ZiggyEventHandlerPanel;
-import gov.nasa.ziggy.ui.config.events.ZiggyEventPanel;
-import gov.nasa.ziggy.ui.config.general.KeyValuePairViewEditPanel;
-import gov.nasa.ziggy.ui.config.module.ModuleLibraryViewEditPanel;
-import gov.nasa.ziggy.ui.config.parameters.ParameterSetsViewEditPanel;
-import gov.nasa.ziggy.ui.config.pipeline.PipelineGraphCanvas;
-import gov.nasa.ziggy.ui.config.pipeline.PipelinesContainerNode;
-import gov.nasa.ziggy.ui.config.pipeline.PipelinesViewEditPanel;
-import gov.nasa.ziggy.ui.config.security.RolesViewEditPanel;
-import gov.nasa.ziggy.ui.config.security.UsersViewEditPanel;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ConfigDataPanel extends javax.swing.JPanel {
-    private static final Logger log = LoggerFactory.getLogger(ConfigDataPanel.class);
-
-    private static int PREFERRED_WIDTH = 400;
-    private static int PREFERRED_HEIGHT = 300;
-
-    private JPanel logoCard;
-    private PipelinesViewEditPanel pipelinesPanel = null;
-    private final Map<String, PipelineGraphCanvas> pipelineNodesPanelMap = new HashMap<>();
-    private ModuleLibraryViewEditPanel moduleLibraryPanel = null;
-    private ParameterSetsViewEditPanel moduleParamSetsPanel = null;
-    private UsersViewEditPanel usersPanel = null;
-    private RolesViewEditPanel rolesPanel = null;
-    private KeyValuePairViewEditPanel keyValuePanel = null;
-    private DataReceiptPanel dataReceiptPanel;
-    private ZiggyEventHandlerPanel eventHandlerPanel;
-    private ZiggyEventPanel eventPanel;
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        log.debug("main(String[]) - start");
-
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new ConfigDataPanel());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-
-        log.debug("main(String[]) - end");
-    }
-
-    public ConfigDataPanel() {
-        initGUI();
-    }
-
-    private void initGUI() {
-        log.debug("initGUI() - start");
-
-        try {
-            CardLayout thisLayout = new CardLayout();
-            setLayout(thisLayout);
-            setPreferredSize(new Dimension(PREFERRED_WIDTH, PREFERRED_HEIGHT));
-            this.add(getLogoCard(), "logoCard");
-        } catch (Exception e) {
-            log.error("initGUI()", e);
-
-            e.printStackTrace();
-        }
-
-        log.debug("initGUI() - end");
-    }
-
-    private JPanel getLogoCard() {
-        log.debug("getLogoCard() - start");
-
-        if (logoCard == null) {
-            logoCard = new ScalingImagePanel(ZiggyGuiConsole.pipelineOrZiggyImage());
-            GridBagLayout logoCardLayout = new GridBagLayout();
-            logoCard.setLayout(logoCardLayout);
-            logoCard.setBackground(new java.awt.Color(255, 255, 255));
-        }
-
-        log.debug("getLogoCard() - end");
-        return logoCard;
-    }
-
-    public void treeSelectionEvent(Object userObject) {
-        log.debug("treeSelectionEvent(Object) - start");
-
-        if (userObject instanceof ConfigTree.TreeLabel) {
-            ConfigTree.TreeLabel selection = (ConfigTree.TreeLabel) userObject;
-            log.debug("selection = " + selection);
-
-            if (selection.equals(ConfigTree.TreeLabel.MODULE_LIBRARY)) {
-                displayModuleLibraryPanel();
-            } else if (selection.equals(ConfigTree.TreeLabel.PARAMETER_LIBRARY)) {
-                displayModuleParamSetsPanel();
-            } else if (selection.equals(ConfigTree.TreeLabel.USERS)) {
-                displayUserPanel();
-            } else if (selection.equals(ConfigTree.TreeLabel.ROLES)) {
-                displayRolePanel();
-            } else if (selection.equals(ConfigTree.TreeLabel.GENERAL)) {
-                displayKeyValuePanel();
-            } else if (selection.equals(ConfigTree.TreeLabel.DR_AVAILABLE_DATASETS)) {
-                displayDataReceiptPanel();
-            } else if (selection.equals(ConfigTree.TreeLabel.EVENT_HANDLERS)) {
-                displayEventHandlers();
-            } else if (selection.equals(ConfigTree.TreeLabel.PIPELINE_EVENTS)) {
-                displayEvents();
-            } else {
-                ((CardLayout) getLayout()).show(this, "logoCard");
-            }
-        } else {
-            log.debug("selection class = " + userObject.getClass());
-
-            if (userObject instanceof PipelinesContainerNode) {
-                displayPipelinePanel();
-            } else if (userObject instanceof PipelineDefinition) {
-                displayPipelineNodesPanel((PipelineDefinition) userObject);
-            } else {
-                ((CardLayout) getLayout()).show(this, "logoCard");
-            }
-        }
-
-        log.debug("treeSelectionEvent(Object) - end");
-    }
-
-    private void displayEventHandlers() {
-        if (eventHandlerPanel == null) {
-            try {
-                eventHandlerPanel = new ZiggyEventHandlerPanel();
-                this.add(eventHandlerPanel, "eventHandlerCard");
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        ((CardLayout) getLayout()).show(this, "eventHandlerCard");
-    }
-
-    private void displayEvents() {
-        if (eventPanel == null) {
-            try {
-                eventPanel = new ZiggyEventPanel();
-                this.add(eventPanel, "eventCard");
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        ((CardLayout) getLayout()).show(this, "eventCard");
-    }
-
-    private void displayPipelinePanel() {
-        if (pipelinesPanel == null) {
-            try {
-                pipelinesPanel = new PipelinesViewEditPanel();
-                this.add(pipelinesPanel, "pipelinesCard");
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        ((CardLayout) getLayout()).show(this, "pipelinesCard");
-    }
-
-    private void displayDataReceiptPanel() {
-        if (dataReceiptPanel == null) {
-            dataReceiptPanel = new DataReceiptPanel();
-            this.add(dataReceiptPanel, "dataReceiptCard");
-        }
-        ((CardLayout) getLayout()).show(this, "dataReceiptCard");
-    }
-
-    private void displayPipelineNodesPanel(PipelineDefinition pipeline) {
-        String panelName = "pipelineNodesCard-" + pipeline.getId();
-        PipelineGraphCanvas pipelineNodesPanel = pipelineNodesPanelMap.get(panelName);
-
-        if (pipelineNodesPanel == null) {
-            try {
-                // pipelineNodesPanel = new PipelineNodesViewEditPanel( pipeline
-                // );
-                pipelineNodesPanel = new PipelineGraphCanvas(pipeline);
-                this.add(pipelineNodesPanel, panelName);
-                pipelineNodesPanelMap.put(panelName, pipelineNodesPanel);
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        ((CardLayout) getLayout()).show(this, panelName);
-    }
-
-    private void displayUserPanel() {
-        if (usersPanel == null) {
-            try {
-                usersPanel = new UsersViewEditPanel();
-                this.add(usersPanel, "usersCard");
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        ((CardLayout) getLayout()).show(this, "usersCard");
-    }
-
-    private void displayRolePanel() {
-        if (rolesPanel == null) {
-            try {
-                rolesPanel = new RolesViewEditPanel();
-                this.add(rolesPanel, "rolesCard");
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        ((CardLayout) getLayout()).show(this, "rolesCard");
-    }
-
-    private void displayModuleLibraryPanel() {
-        if (moduleLibraryPanel == null) {
-            try {
-                moduleLibraryPanel = new ModuleLibraryViewEditPanel();
-                this.add(moduleLibraryPanel, "moduleLibraryCard");
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        ((CardLayout) getLayout()).show(this, "moduleLibraryCard");
-    }
-
-    private void displayModuleParamSetsPanel() {
-        if (moduleParamSetsPanel == null) {
-            try {
-                moduleParamSetsPanel = new ParameterSetsViewEditPanel();
-                this.add(moduleParamSetsPanel, "moduleParamSetsCard");
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        ((CardLayout) getLayout()).show(this, "moduleParamSetsCard");
-    }
-
-    private void displayKeyValuePanel() {
-        if (keyValuePanel == null) {
-            try {
-                keyValuePanel = new KeyValuePairViewEditPanel();
-                this.add(keyValuePanel, "keyValueCard");
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        ((CardLayout) getLayout()).show(this, "keyValueCard");
-    }
-
-    private static class ScalingImagePanel extends JPanel {
-
-        private final Image image;
-
-        public ScalingImagePanel(Image image) {
-            this.image = image;
-        }
-
-        @Override
-        public void paintComponent(Graphics g) {
-            super.paintComponent(g);
-            g.drawImage(image.getScaledInstance(getWidth(), getHeight(), Image.SCALE_SMOOTH), 0, 0,
-                null);
-        }
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/ConfigTree.java b/src/main/java/gov/nasa/ziggy/ui/config/ConfigTree.java
deleted file mode 100644
index aff3f4a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/ConfigTree.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package gov.nasa.ziggy.ui.config;
-
-import java.awt.Cursor;
-
-import javax.swing.JTree;
-import javax.swing.event.TreeExpansionEvent;
-import javax.swing.event.TreeExpansionListener;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreePath;
-import javax.swing.tree.TreeSelectionModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.config.pipeline.PipelinesContainerNode;
-
-/**
- * This class implements the navigation tree for the config panel.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ConfigTree extends JTree implements TreeSelectionListener, TreeExpansionListener {
-    private static final Logger log = LoggerFactory.getLogger(ConfigTree.class);
-
-    private DefaultTreeModel model = null;
-    private ConfigDataPanel dataPanel = null;
-
-    public enum TreeLabel {
-        MODULE_LIBRARY("Module Library"),
-        PARAMETER_LIBRARY("Parameter Library"),
-        DATA_RECEIPT("Data Receipt"),
-        EVENT_HANDLERS("Event Definitions"),
-        PIPELINE_EVENTS("Pipeline Events"),
-        DR_AVAILABLE_DATASETS("Available Datasets"),
-        DR_DATA_ANOMALIES("Data Anomalies"),
-        SECURITY("Security"),
-        USERS("Users"),
-        ROLES("Roles"),
-        GENERAL("General");
-
-        private String displayValue;
-
-        TreeLabel(String displayValue) {
-            this.displayValue = displayValue;
-        }
-
-        @Override
-        public String toString() {
-            return displayValue;
-        }
-    }
-
-    public ConfigTree(ConfigDataPanel dataPanel) {
-        super(initModel());
-
-        this.dataPanel = dataPanel;
-        model = (DefaultTreeModel) getModel();
-
-        setRootVisible(false);
-        putClientProperty("JTree.lineStyle", "Vertical");
-        setShowsRootHandles(true);
-        getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
-
-        addTreeSelectionListener(this);
-        addTreeExpansionListener(this);
-    }
-
-    public void reloadModel() {
-        setModel(initModel());
-        model = (DefaultTreeModel) getModel();
-        expandRow(3);
-    }
-
-    public static DefaultTreeModel initModel() {
-        log.debug("initModel() - start");
-
-        DefaultMutableTreeNode root = new DefaultMutableTreeNode("root");
-        DefaultTreeModel model = new DefaultTreeModel(root);
-
-        DefaultMutableTreeNode pipelines = new DefaultMutableTreeNode(new PipelinesContainerNode());
-        root.add(pipelines);
-        ((TreeContainerNode) pipelines.getUserObject()).init(pipelines);
-
-        DefaultMutableTreeNode modules = new DefaultMutableTreeNode(TreeLabel.MODULE_LIBRARY);
-        root.add(modules);
-
-        DefaultMutableTreeNode moduleParamSets = new DefaultMutableTreeNode(
-            TreeLabel.PARAMETER_LIBRARY);
-        root.add(moduleParamSets);
-
-        DefaultMutableTreeNode dataReceipt = new DefaultMutableTreeNode(TreeLabel.DATA_RECEIPT);
-        root.add(dataReceipt);
-
-        DefaultMutableTreeNode availableDatasets = new DefaultMutableTreeNode(
-            TreeLabel.DR_AVAILABLE_DATASETS);
-        dataReceipt.add(availableDatasets);
-
-        DefaultMutableTreeNode dataAnomalies = new DefaultMutableTreeNode(
-            TreeLabel.DR_DATA_ANOMALIES);
-        dataReceipt.add(dataAnomalies);
-
-        DefaultMutableTreeNode eventHandlers = new DefaultMutableTreeNode(TreeLabel.EVENT_HANDLERS);
-        root.add(eventHandlers);
-
-        DefaultMutableTreeNode events = new DefaultMutableTreeNode(TreeLabel.PIPELINE_EVENTS);
-        root.add(events);
-
-        DefaultMutableTreeNode security = new DefaultMutableTreeNode(TreeLabel.SECURITY);
-        root.add(security);
-
-        DefaultMutableTreeNode users = new DefaultMutableTreeNode(TreeLabel.USERS);
-        security.add(users);
-
-        DefaultMutableTreeNode roles = new DefaultMutableTreeNode(TreeLabel.ROLES);
-        security.add(roles);
-
-        DefaultMutableTreeNode general = new DefaultMutableTreeNode(TreeLabel.GENERAL);
-        root.add(general);
-
-        log.debug("initModel() - end");
-        return model;
-    }
-
-    @Override
-    public void valueChanged(TreeSelectionEvent event) {
-        log.debug("valueChanged(TreeSelectionEvent) - start");
-
-        log.debug("valueChanged, event=" + event);
-        DefaultMutableTreeNode node = (DefaultMutableTreeNode) getLastSelectedPathComponent();
-
-        if (node == null) {
-            return;
-        }
-
-        Object nodeInfo = node.getUserObject();
-        if (node.isLeaf()) {
-            log.debug("leaf = " + nodeInfo + ", class = " + nodeInfo.getClass());
-        } else {
-            log.debug("folder = " + nodeInfo + ", class = " + nodeInfo.getClass());
-        }
-
-        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        dataPanel.treeSelectionEvent(nodeInfo);
-        setCursor(null);
-
-        log.debug("valueChanged(TreeSelectionEvent) - end");
-    }
-
-    @Override
-    public void treeExpanded(TreeExpansionEvent event) {
-        log.debug("treeExpanded(TreeExpansionEvent) - start");
-
-        log.debug("treeExpanded, event=" + event);
-        TreePath path = event.getPath();
-        DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
-        log.debug("expanded node = " + node);
-
-        Object userObject = node.getUserObject();
-        if (userObject instanceof TreeContainerNode) {
-            try {
-                setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-                ((TreeContainerNode) userObject).expand(model, node);
-                setCursor(null);
-                scrollPathToVisible(
-                    new TreePath(((DefaultMutableTreeNode) node.getFirstChild()).getPath()));
-            } catch (Exception e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-
-        log.debug("treeExpanded(TreeExpansionEvent) - end");
-    }
-
-    @Override
-    public void treeCollapsed(TreeExpansionEvent event) {
-        log.debug("treeCollapsed(TreeExpansionEvent) - start");
-
-        log.debug("treeCollapsed, event=" + event);
-
-        log.debug("treeCollapsed(TreeExpansionEvent) - end");
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/TreeContainerNode.java b/src/main/java/gov/nasa/ziggy/ui/config/TreeContainerNode.java
deleted file mode 100644
index 8b2cd68..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/TreeContainerNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package gov.nasa.ziggy.ui.config;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
-
-import gov.nasa.ziggy.ui.PipelineUIException;
-
-/**
- * @author Todd Klaus
- */
-public abstract class TreeContainerNode {
-    protected String displayName = null;
-    protected boolean loaded = false;
-
-    public TreeContainerNode(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public void init(DefaultMutableTreeNode node) {
-        DefaultMutableTreeNode loading = new DefaultMutableTreeNode("Loading...");
-
-        node.add(loading);
-    }
-
-    public abstract void expand(DefaultTreeModel model, DefaultMutableTreeNode node)
-        throws PipelineUIException;
-
-    @Override
-    public String toString() {
-        return displayName;
-    }
-
-    protected void deleteAllChildren(DefaultTreeModel model, DefaultMutableTreeNode node) {
-        for (int i = 0; i < node.getChildCount(); i++) {
-            model.removeNodeFromParent((MutableTreeNode) node.getChildAt(i));
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/datareceipt/DataReceiptInstanceDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/datareceipt/DataReceiptInstanceDialog.java
deleted file mode 100644
index 9ff8f79..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/datareceipt/DataReceiptInstanceDialog.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package gov.nasa.ziggy.ui.config.datareceipt;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-import gov.nasa.ziggy.data.management.DataReceiptFile;
-import gov.nasa.ziggy.data.management.DataReceiptInstance;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.DataReceiptOperationsProxy;
-
-/**
- * Displays detailed information on data receipt actions from a single instance.
- *
- * @author PT
- */
-public class DataReceiptInstanceDialog extends JDialog {
-
-    private static final long serialVersionUID = 20220624L;
-
-    private static final String[] COLUMN_HEADINGS = { "Task ID", "Name", "Type", "Status" };
-
-    private final DataReceiptInstance dataReceiptInstance;
-    private JScrollPane scrollPane;
-    private ZTable dataReceiptTable;
-    private DataReceiptInstanceTableModel tableModel;
-    private JPanel actionPanel;
-    private JButton closeButton;
-    private JButton refreshButton;
-    private JPanel labelPanel;
-    private JLabel instanceLabel;
-
-    public DataReceiptInstanceDialog(JFrame parent, DataReceiptInstance dataReceiptInstance) {
-        super(parent, false);
-        this.dataReceiptInstance = dataReceiptInstance;
-        initGUI();
-        refreshContents();
-        setVisible(true);
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            getContentPane().setLayout(thisLayout);
-            getContentPane().add(getScrollPane(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            getContentPane().add(getLabelPanel(), BorderLayout.NORTH);
-            this.setSize(900, 800);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JScrollPane getScrollPane() {
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getTable());
-        }
-        return scrollPane;
-    }
-
-    private ZTable getTable() {
-        if (dataReceiptTable == null) {
-            dataReceiptTable = new ZTable();
-            dataReceiptTable.setTextWrappingEnabled(true);
-            dataReceiptTable.setRowShadingEnabled(true);
-            dataReceiptTable.setModel(getTableModel());
-            dataReceiptTable.getColumnModel().getColumn(0).setPreferredWidth(100);
-            dataReceiptTable.getColumnModel().getColumn(2).setPreferredWidth(100);
-            dataReceiptTable.getColumnModel().getColumn(3).setPreferredWidth(100);
-            dataReceiptTable.getColumnModel().getColumn(1).setPreferredWidth(500);
-
-        }
-        return dataReceiptTable;
-    }
-
-    private DataReceiptInstanceTableModel getTableModel() {
-        if (tableModel == null) {
-            tableModel = new DataReceiptInstanceTableModel();
-        }
-        return tableModel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(20);
-            actionPanelLayout.setAlignment(FlowLayout.RIGHT);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getRefreshButton());
-            actionPanel.add(getCloseButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("Close");
-            closeButton.addActionListener(evt -> closeButtonActionPerformed());
-        }
-        return closeButton;
-    }
-
-    private void closeButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("Refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-
-    private JPanel getLabelPanel() {
-        if (labelPanel == null) {
-            labelPanel = new JPanel();
-            labelPanel.add(getInstanceLabel());
-        }
-        return labelPanel;
-    }
-
-    private JLabel getInstanceLabel() {
-        if (instanceLabel == null) {
-            instanceLabel = new JLabel();
-            instanceLabel.setText("Instance " + dataReceiptInstance.getInstanceId()
-                + " processed at " + dataReceiptInstance.getDate() + " imported files = "
-                + dataReceiptInstance.getSuccessfulImportCount() + " failed imports = "
-                + dataReceiptInstance.getFailedImportCount());
-        }
-        return instanceLabel;
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        refreshContents();
-    }
-
-    private void refreshContents() {
-        getTableModel().loadFromDatabase();
-    }
-
-    private class DataReceiptInstanceTableModel extends AbstractDatabaseModel {
-
-        private static final long serialVersionUID = 20220624L;
-
-        private List<DataReceiptFile> dataReceiptFiles = new ArrayList<>();
-
-        @Override
-        public int getRowCount() {
-            return dataReceiptFiles.size();
-        }
-
-        @Override
-        public int getColumnCount() {
-            return COLUMN_HEADINGS.length;
-        }
-
-        @Override
-        public String getColumnName(int columnIndex) {
-            return COLUMN_HEADINGS[columnIndex];
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            DataReceiptFile dataReceiptFile = dataReceiptFiles.get(rowIndex);
-            switch (columnIndex) {
-                case 0:
-                    return dataReceiptFile.getTaskId();
-                case 1:
-                    return dataReceiptFile.getName();
-                case 2:
-                    return dataReceiptFile.getFileType();
-                case 3:
-                    return dataReceiptFile.getStatus();
-                default:
-                    throw new IllegalArgumentException("Invalid column index: " + columnIndex);
-            }
-        }
-
-        @Override
-        public void loadFromDatabase() {
-            dataReceiptFiles = new DataReceiptOperationsProxy()
-                .dataReceiptFilesForInstance(dataReceiptInstance.getInstanceId());
-            fireTableDataChanged();
-        }
-
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/datareceipt/DataReceiptPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/datareceipt/DataReceiptPanel.java
deleted file mode 100644
index 987d9b1..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/datareceipt/DataReceiptPanel.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package gov.nasa.ziggy.ui.config.datareceipt;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-import gov.nasa.ziggy.data.management.DataReceiptInstance;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.DataReceiptOperationsProxy;
-
-/**
- * Panel that displays summary information for all pipeline instances that performed a data receipt
- * operation.
- *
- * @author PT
- */
-public class DataReceiptPanel extends JPanel implements MouseListener {
-
-    private static final long serialVersionUID = 20220624L;
-
-    private JScrollPane scrollPane;
-    private JPanel buttonPanel;
-    private JButton refreshButton;
-    private ZTable dataReceiptTable;
-    private DataReceiptTableModel tableModel;
-
-    public DataReceiptPanel() {
-        initGUI();
-        tableModel.loadFromDatabase();
-    }
-
-    /**
-     * Initializes the panel. The panel has a button panel on the top that provides the refresh
-     * button, and a scroll pane below the button panel that provides the table of data receipt
-     * instances.
-     */
-    protected void initGUI() {
-        BorderLayout thisLayout = new BorderLayout();
-        setLayout(thisLayout);
-        setPreferredSize(new Dimension(400, 300));
-        this.add(getScrollPane(), BorderLayout.CENTER);
-        this.add(getButtonPanel(), BorderLayout.NORTH);
-    }
-
-    private JScrollPane getScrollPane() {
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getTable());
-        }
-        return scrollPane;
-    }
-
-    protected JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setAlignment(FlowLayout.LEFT);
-            buttonPanelLayout.setHgap(20);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getRefreshButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        try {
-            getTableModel().loadFromDatabase();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private ZTable getTable() {
-        if (dataReceiptTable == null) {
-            dataReceiptTable = new ZTable();
-            dataReceiptTable.setRowShadingEnabled(true);
-            dataReceiptTable.setTextWrappingEnabled(true);
-            dataReceiptTable.setModel(getTableModel());
-            dataReceiptTable.addMouseListener(this);
-        }
-        return dataReceiptTable;
-    }
-
-    private DataReceiptTableModel getTableModel() {
-        if (tableModel == null) {
-            tableModel = new DataReceiptTableModel();
-        }
-        return tableModel;
-    }
-
-    /**
-     * Launches a dialog box that contains the table of files imported for a given instance.
-     */
-    @Override
-    public void mouseClicked(MouseEvent e) {
-        // On double-click, select the desired row and retrieve the corresponding log.
-        int row = getTable().rowAtPoint(e.getPoint());
-        if (e.getClickCount() == 2 && row != -1) {
-            ZiggyGuiConsole.newDataReceiptInstanceDialog(getTableModel().dataReceiptInstance(row));
-        }
-
-    }
-
-    @Override
-    public void mousePressed(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseReleased(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseEntered(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseExited(MouseEvent e) {
-    }
-
-    private static class DataReceiptTableModel extends AbstractDatabaseModel {
-
-        private static final long serialVersionUID = 20220624L;
-
-        private static final String[] COLUMN_HEADINGS = { "Instance", "Date", "# Successful",
-            "# Failed" };
-
-        private List<DataReceiptInstance> dataReceiptInstances = new ArrayList<>();
-
-        @Override
-        public int getRowCount() {
-            return dataReceiptInstances.size();
-        }
-
-        @Override
-        public int getColumnCount() {
-            return COLUMN_HEADINGS.length;
-        }
-
-        @Override
-        public String getColumnName(int columnIndex) {
-            return COLUMN_HEADINGS[columnIndex];
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            DataReceiptInstance dataReceiptInstance = dataReceiptInstances.get(rowIndex);
-            switch (columnIndex) {
-                case 0:
-                    return dataReceiptInstance.getInstanceId();
-                case 1:
-                    return dataReceiptInstance.getDate();
-                case 2:
-                    return dataReceiptInstance.getSuccessfulImportCount();
-                case 3:
-                    return dataReceiptInstance.getFailedImportCount();
-                default:
-                    throw new IllegalArgumentException("Invalid column index: " + columnIndex);
-            }
-        }
-
-        @Override
-        public void loadFromDatabase() {
-            dataReceiptInstances = new DataReceiptOperationsProxy().DataReceiptInstances();
-            fireTableDataChanged();
-        }
-
-        public DataReceiptInstance dataReceiptInstance(int rowIndex) {
-            return dataReceiptInstances.get(rowIndex);
-        }
-
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/events/ZiggyEventHandlerPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/events/ZiggyEventHandlerPanel.java
deleted file mode 100644
index 80eac95..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/events/ZiggyEventHandlerPanel.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package gov.nasa.ziggy.ui.config.events;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.events.ZiggyEventHandler;
-import gov.nasa.ziggy.services.events.ZiggyEventHandler.ZiggyEventHandlerInfoForDisplay;
-import gov.nasa.ziggy.services.messages.EventHandlerRequest;
-import gov.nasa.ziggy.services.messages.EventHandlerToggleStateRequest;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-
-/**
- * Panel to display the collection of {@link ZiggyEventHandler} instances and their states.
- *
- * @author PT
- */
-public class ZiggyEventHandlerPanel extends JPanel implements MouseListener {
-
-    private static final Logger log = LoggerFactory.getLogger(ZiggyEventHandlerPanel.class);
-
-    private static final long serialVersionUID = 20220707L;
-
-    private JScrollPane scrollPane;
-    private JPanel buttonPanel;
-    private JButton refreshButton;
-    private ZTable eventHandlerTable;
-    private EventHandlerTableModel tableModel;
-
-    public ZiggyEventHandlerPanel() {
-        initGUI();
-        getTableModel().update();
-    }
-
-    private void initGUI() {
-        BorderLayout thisLayout = new BorderLayout();
-        setLayout(thisLayout);
-        setPreferredSize(new Dimension(400, 300));
-        this.add(getScrollPane(), BorderLayout.CENTER);
-        this.add(getButtonPanel(), BorderLayout.NORTH);
-    }
-
-    private JScrollPane getScrollPane() {
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getTable());
-        }
-        return scrollPane;
-    }
-
-    protected JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setAlignment(FlowLayout.LEFT);
-            buttonPanelLayout.setHgap(20);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getRefreshButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        try {
-            getTableModel().update();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private ZTable getTable() {
-        if (eventHandlerTable == null) {
-            eventHandlerTable = new ZTable();
-            eventHandlerTable.setRowShadingEnabled(true);
-            eventHandlerTable.setTextWrappingEnabled(true);
-            eventHandlerTable.setModel(getTableModel());
-            eventHandlerTable.getColumnModel().getColumn(0).setPreferredWidth(100);
-            eventHandlerTable.getColumnModel().getColumn(1).setPreferredWidth(500);
-            eventHandlerTable.getColumnModel().getColumn(2).setPreferredWidth(100);
-            eventHandlerTable.getColumnModel().getColumn(3).setPreferredWidth(100);
-            eventHandlerTable.addMouseListener(this);
-        }
-        return eventHandlerTable;
-    }
-
-    private EventHandlerTableModel getTableModel() {
-        if (tableModel == null) {
-            tableModel = new EventHandlerTableModel();
-        }
-        return tableModel;
-    }
-
-    @Override
-    public void mouseClicked(MouseEvent e) {
-
-        // does the user want to enable or disable an event handler?
-        int row = getTable().rowAtPoint(e.getPoint());
-        int column = getTable().columnAtPoint(e.getPoint());
-        log.debug("row: " + row + ", column: " + column);
-        if (row != -1 && column == 3) {
-            EventHandlerToggleStateRequest.requestEventHandlerToggle(getTableModel().getName(row));
-            getTableModel().update();
-        }
-    }
-
-    @Override
-    public void mousePressed(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseReleased(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseEntered(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseExited(MouseEvent e) {
-    }
-
-    private static class EventHandlerTableModel extends AbstractTableModel {
-
-        private static final long serialVersionUID = 20220707L;
-
-        private static final String[] COLUMN_HEADERS = { "Name", "Directory", "Pipeline",
-            "Enabled" };
-
-        List<ZiggyEventHandlerInfoForDisplay> eventHandlers = new ArrayList<>();
-
-        public String getName(int rowIndex) {
-            return eventHandlers.get(rowIndex).getName();
-        }
-
-        @Override
-        public int getRowCount() {
-            return eventHandlers.size();
-        }
-
-        @Override
-        public int getColumnCount() {
-            return COLUMN_HEADERS.length;
-        }
-
-        @Override
-        public String getColumnName(int columnIndex) {
-            return COLUMN_HEADERS[columnIndex];
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            ZiggyEventHandlerInfoForDisplay eventHandler = eventHandlers.get(rowIndex);
-            switch (columnIndex) {
-                case 0:
-                    return eventHandler.getName();
-                case 1:
-                    return eventHandler.getDirectory();
-                case 2:
-                    return eventHandler.getPipelineName();
-                case 3:
-                    return eventHandler.isEnabled();
-                default:
-                    throw new IllegalArgumentException("Illegal column: " + columnIndex);
-            }
-        }
-
-        @Override
-        public Class<?> getColumnClass(int columnIndex) {
-            switch (columnIndex) {
-                case 0:
-                case 1:
-                case 2:
-                    return String.class;
-                case 3:
-                    return Boolean.class;
-                default:
-                    return String.class;
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        public void update() {
-            eventHandlers.clear();
-            eventHandlers
-                .addAll((Collection<? extends ZiggyEventHandlerInfoForDisplay>) UiCommunicator
-                    .send(new EventHandlerRequest()));
-            fireTableDataChanged();
-        }
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/events/ZiggyEventPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/events/ZiggyEventPanel.java
deleted file mode 100644
index 038b2d6..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/events/ZiggyEventPanel.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package gov.nasa.ziggy.ui.config.events;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-import gov.nasa.ziggy.services.events.ZiggyEvent;
-import gov.nasa.ziggy.services.events.ZiggyEventHandler;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.ZiggyEventCrudProxy;
-
-/**
- * Panel to display events detected and managed by {@link ZiggyEventHandler}.
- *
- * @author PT
- */
-public class ZiggyEventPanel extends JPanel {
-
-    private static final long serialVersionUID = 20220708L;
-
-    private JScrollPane scrollPane;
-    private JPanel buttonPanel;
-    private JButton refreshButton;
-    private ZTable eventTable;
-    private EventTableModel tableModel;
-
-    public ZiggyEventPanel() {
-        initGUI();
-        getTableModel().loadFromDatabase();
-    }
-
-    private void initGUI() {
-        BorderLayout thisLayout = new BorderLayout();
-        setLayout(thisLayout);
-        setPreferredSize(new Dimension(400, 300));
-        this.add(getScrollPane(), BorderLayout.CENTER);
-        this.add(getButtonPanel(), BorderLayout.NORTH);
-    }
-
-    private JScrollPane getScrollPane() {
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getTable());
-        }
-        return scrollPane;
-    }
-
-    protected JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setAlignment(FlowLayout.LEFT);
-            buttonPanelLayout.setHgap(20);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getRefreshButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        try {
-            getTableModel().loadFromDatabase();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private ZTable getTable() {
-        if (eventTable == null) {
-            eventTable = new ZTable();
-            eventTable.setRowShadingEnabled(true);
-            eventTable.setTextWrappingEnabled(true);
-            eventTable.setModel(getTableModel());
-        }
-        return eventTable;
-    }
-
-    private EventTableModel getTableModel() {
-        if (tableModel == null) {
-            tableModel = new EventTableModel();
-        }
-        return tableModel;
-    }
-
-    private static class EventTableModel extends AbstractDatabaseModel {
-
-        private static final long serialVersionUID = 20220708L;
-
-        public static final String[] COLUMN_NAMES = { "ID", "Handler Name", "Pipeline Name", "Date",
-            "Instance ID" };
-
-        List<ZiggyEvent> ziggyEvents = new ArrayList<>();
-
-        @Override
-        public int getRowCount() {
-            return ziggyEvents.size();
-        }
-
-        @Override
-        public int getColumnCount() {
-            return COLUMN_NAMES.length;
-        }
-
-        @Override
-        public String getColumnName(int columnIndex) {
-            return COLUMN_NAMES[columnIndex];
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            ZiggyEvent ziggyEvent = ziggyEvents.get(rowIndex);
-            switch (columnIndex) {
-                case 0:
-                    return ziggyEvent.getId();
-                case 1:
-                    return ziggyEvent.getEventHandlerName();
-                case 2:
-                    return ziggyEvent.getPipelineName().getName();
-                case 3:
-                    return ziggyEvent.getEventTime();
-                case 4:
-                    return ziggyEvent.getPipelineInstanceId();
-                default:
-                    throw new IllegalArgumentException("Column index " + columnIndex + " invalid");
-            }
-        }
-
-        @Override
-        public void loadFromDatabase() {
-            ziggyEvents = new ZiggyEventCrudProxy().retrieveAllEvents();
-            fireTableDataChanged();
-        }
-
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/general/KeyValuePairTableModel.java b/src/main/java/gov/nasa/ziggy/ui/config/general/KeyValuePairTableModel.java
deleted file mode 100644
index 446fd60..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/general/KeyValuePairTableModel.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package gov.nasa.ziggy.ui.config.general;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.config.KeyValuePair;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.KeyValuePairCrudProxy;
-
-@SuppressWarnings("serial")
-public class KeyValuePairTableModel extends AbstractDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(KeyValuePairTableModel.class);
-
-    private final KeyValuePairCrudProxy keyValuePairCrud;
-    private List<KeyValuePair> keyValuePairs = new LinkedList<>();
-
-    public KeyValuePairTableModel() {
-        keyValuePairCrud = new KeyValuePairCrudProxy();
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        log.debug("loadFromDatabase() - start");
-
-        if (keyValuePairs != null) {
-            keyValuePairCrud.evictAll(keyValuePairs);
-        }
-
-        try {
-            keyValuePairs = keyValuePairCrud.retrieveAll();
-        } catch (ConsoleSecurityException ignore) {
-        }
-
-        fireTableDataChanged();
-
-        log.debug("loadFromDatabase() - end");
-    }
-
-    public KeyValuePair getKeyValuePairAtRow(int rowIndex) {
-        validityCheck();
-        return keyValuePairs.get(rowIndex);
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return keyValuePairs.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 2;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-
-        KeyValuePair keyValuePair = keyValuePairs.get(rowIndex);
-
-        switch (columnIndex) {
-            case 0:
-                return keyValuePair.getKey();
-            case 1:
-                return keyValuePair.getValue();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        return String.class;
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Key";
-            case 1:
-                return "Value";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/general/KeyValuePairViewEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/general/KeyValuePairViewEditPanel.java
deleted file mode 100644
index 22dec82..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/general/KeyValuePairViewEditPanel.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package gov.nasa.ziggy.ui.config.general;
-
-import javax.swing.JOptionPane;
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.config.KeyValuePair;
-import gov.nasa.ziggy.services.config.KeyValuePairCrud;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.PipelineUIException;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.config.AbstractViewEditPanel;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class KeyValuePairViewEditPanel extends AbstractViewEditPanel {
-    private static final Logger log = LoggerFactory.getLogger(KeyValuePairViewEditPanel.class);
-
-    private KeyValuePairTableModel keyValuePairTableModel; // do NOT init to null! (see
-    // getTableModel)
-
-    public KeyValuePairViewEditPanel() throws PipelineUIException {
-        initGUI();
-    }
-
-    // $hide>>$
-    @Override
-    protected AbstractTableModel getTableModel() throws PipelineUIException {
-        log.debug("getTableModel() - start");
-
-        if (keyValuePairTableModel == null) {
-            keyValuePairTableModel = new KeyValuePairTableModel();
-            keyValuePairTableModel.register();
-        }
-
-        log.debug("getTableModel() - end");
-        return keyValuePairTableModel;
-    }
-
-    // $hide<<$
-
-    @Override
-    protected void doNew() {
-        log.debug("doNew() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        showEditDialog(new KeyValuePair());
-
-        log.debug("doNew() - end");
-    }
-
-    @Override
-    protected void doEdit(int row) {
-        log.debug("doEdit(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        showEditDialog(keyValuePairTableModel.getKeyValuePairAtRow(row));
-
-        log.debug("doEdit(int) - end");
-    }
-
-    // $hide>>$
-    @Override
-    protected void doDelete(int row) {
-        log.debug("doDelete(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        KeyValuePair keyValuePair = keyValuePairTableModel.getKeyValuePairAtRow(row);
-
-        int choice = JOptionPane.showConfirmDialog(this,
-            "Are you sure you want to delete key '" + keyValuePair.getKey() + "'?");
-
-        if (choice == JOptionPane.YES_OPTION) {
-            try {
-                // TODO: Need transaction/conversation context
-                // TODO: only call create for new
-                KeyValuePairCrud keyValuePairCrud = new KeyValuePairCrud();
-                keyValuePairCrud.delete(keyValuePair);
-
-                // ConfigurationOperations.deleteKeyValuePairTransacted( keyValuePair );
-                keyValuePairTableModel.loadFromDatabase();
-            } catch (Exception e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-
-        log.debug("doDelete(int) - end");
-    }
-
-    @Override
-    protected void doRefresh() {
-        try {
-            keyValuePairTableModel.loadFromDatabase();
-        } catch (Exception e) {
-            log.error("showEditDialog(User)", e);
-
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void showEditDialog(KeyValuePair keyValuePair) {
-        log.debug("showEditDialog() - start");
-
-        KeyValuePairEditDialog inst = ZiggyGuiConsole.newKeyValuePairEditDialog(keyValuePair);
-
-        inst.setVisible(true);
-
-        try {
-            keyValuePairTableModel.loadFromDatabase();
-        } catch (Exception e) {
-            log.error("showEditDialog(User)", e);
-
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("showEditDialog() - end");
-    }
-
-    // $hide<<$
-
-    @Override
-    protected String getEditMenuText() {
-        return "Edit selected key/value pair...";
-    }
-
-    @Override
-    protected String getNewMenuText() {
-        return "Add key/value pair...";
-    }
-
-    @Override
-    protected String getDeleteMenuText() {
-        return "Delete selected key/value pair...";
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/group/GroupSelectorDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/group/GroupSelectorDialog.java
deleted file mode 100644
index d113363..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/group/GroupSelectorDialog.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package gov.nasa.ziggy.ui.config.group;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.Group;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.proxy.GroupCrudProxy;
-
-/**
- * Prompt the user for a group selection. Also provides the ability to add/remove groups.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class GroupSelectorDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(GroupSelectorDialog.class);
-
-    private boolean cancelled = false;
-    private JPanel dataPanel;
-    private JScrollPane groupListScrollPane;
-    private JButton removeGroupButton;
-    private JButton addGroupButton;
-    private JPanel groupListEditPanel;
-    private JList<Group> groupList;
-    private JButton cancelButton;
-    private JButton selectButton;
-    private JPanel actionPanel;
-
-    private GroupListModel groupListModel;
-
-    public GroupSelectorDialog(JFrame frame) {
-        super(frame, true);
-        initGUI();
-    }
-
-    public static Group selectGroup() {
-        GroupSelectorDialog dialog = ZiggyGuiConsole.newGroupSelectorDialog();
-        dialog.setVisible(true); // blocks until user presses a button
-
-        if (!dialog.cancelled) {
-            return dialog.getSelectedGroup();
-        }
-        return null;
-    }
-
-    public Group getSelectedGroup() {
-        int selectedIndex = groupList.getSelectedIndex();
-
-        if (selectedIndex != -1) {
-            return groupListModel.getElementAt(selectedIndex);
-        }
-        return null;
-    }
-
-    private void selectButtonActionPerformed(ActionEvent evt) {
-        log.debug("selectButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        cancelled = true;
-
-        setVisible(false);
-    }
-
-    private void addGroupButtonActionPerformed(ActionEvent evt) {
-        log.debug("addGroupButton.actionPerformed, event=" + evt);
-
-        try {
-            String newGroupName = ZiggyGuiConsole.showInputDialog(
-                "Enter the name for the new Group", "New Group", JOptionPane.PLAIN_MESSAGE);
-
-            if (newGroupName == null || newGroupName.length() == 0) {
-                MessageUtil.showError(this, "Please enter a group name");
-                return;
-            }
-
-            Group group = new Group(newGroupName);
-
-            GroupCrudProxy groupCrud = new GroupCrudProxy();
-            groupCrud.save(group);
-
-            groupListModel.loadFromDatabase();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void removeGroupButtonActionPerformed(ActionEvent evt) {
-        log.debug("removeGroupButton.actionPerformed, event=" + evt);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Select Group");
-            }
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            this.setSize(229, 377);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JFrame frame = new JFrame();
-            GroupSelectorDialog inst = new GroupSelectorDialog(frame);
-            inst.setVisible(true);
-        });
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getGroupListScrollPane(), BorderLayout.CENTER);
-            dataPanel.add(getGroupListEditPanel(), BorderLayout.EAST);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(40);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getSelectButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getSelectButton() {
-        if (selectButton == null) {
-            selectButton = new JButton();
-            selectButton.setText("Select");
-            selectButton.addActionListener(this::selectButtonActionPerformed);
-        }
-        return selectButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JScrollPane getGroupListScrollPane() {
-        if (groupListScrollPane == null) {
-            groupListScrollPane = new JScrollPane();
-            groupListScrollPane.setViewportView(getGroupList());
-        }
-        return groupListScrollPane;
-    }
-
-    private JList<Group> getGroupList() {
-        if (groupList == null) {
-            groupListModel = new GroupListModel();
-            groupList = new JList<>();
-            groupList.setModel(groupListModel);
-        }
-        return groupList;
-    }
-
-    private JPanel getGroupListEditPanel() {
-        if (groupListEditPanel == null) {
-            groupListEditPanel = new JPanel();
-            GridBagLayout groupListEditPanelLayout = new GridBagLayout();
-            groupListEditPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                0.1, 0.1, 0.1 };
-            groupListEditPanelLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
-            groupListEditPanelLayout.columnWeights = new double[] { 0.1 };
-            groupListEditPanelLayout.columnWidths = new int[] { 7 };
-            groupListEditPanel.setLayout(groupListEditPanelLayout);
-            groupListEditPanel.add(getAddGroupButton(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            groupListEditPanel.add(getRemoveGroupButton(),
-                new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return groupListEditPanel;
-    }
-
-    private JButton getAddGroupButton() {
-        if (addGroupButton == null) {
-            addGroupButton = new JButton();
-            addGroupButton.setText("+");
-            addGroupButton.addActionListener(this::addGroupButtonActionPerformed);
-        }
-        return addGroupButton;
-    }
-
-    private JButton getRemoveGroupButton() {
-        if (removeGroupButton == null) {
-            removeGroupButton = new JButton();
-            removeGroupButton.setText("-");
-            removeGroupButton.addActionListener(this::removeGroupButtonActionPerformed);
-        }
-        return removeGroupButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/module/ModuleEditDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/module/ModuleEditDialog.java
deleted file mode 100644
index f6f56f4..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/module/ModuleEditDialog.java
+++ /dev/null
@@ -1,463 +0,0 @@
-package gov.nasa.ziggy.ui.config.module;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.PipelineModule;
-import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
-import gov.nasa.ziggy.ui.common.ClasspathUtils;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.proxy.PipelineModuleDefinitionCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ModuleEditDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(ModuleEditDialog.class);
-
-    private final PipelineModuleDefinition module;
-    private JTextField minMemoryTextField;
-    private JLabel minMemoryLabel;
-    private JPanel dataPanel;
-    private JPanel buttonPanel;
-    private JLabel nameLanel;
-    private JTextField nameText;
-    private JTextArea descTextArea;
-    private JLabel exeNameLabel;
-    private JComboBox<ClassWrapper<PipelineModule>> implementingClassComboBox;
-    private JScrollPane descScrollPane;
-    private JLabel versionLabel;
-    private JTextField exeTimeoutTextField;
-    private JLabel exeTimeoutLabel;
-    private JLabel descLabel;
-    private JButton cancelButton;
-    private JButton saveButton;
-    private boolean cancelled = false;
-
-    private final PipelineModuleDefinitionCrudProxy pipelineModuleDefinitionCrud;
-
-    public ModuleEditDialog(JFrame frame, PipelineModuleDefinition module) {
-        super(frame, "Edit Module " + module.getName(), true);
-        this.module = module;
-        pipelineModuleDefinitionCrud = new PipelineModuleDefinitionCrudProxy();
-        initGUI();
-    }
-
-    private void saveButtonActionPerformed(ActionEvent evt) {
-        log.debug("saveButtonActionPerformed(ActionEvent) - start");
-
-        log.debug("saveButton.actionPerformed, event=" + evt);
-
-        /*
-         * TODO: validate that the selected param sets are compatible with the selected
-         * implementingClass
-         */
-
-        try {
-            PipelineModuleDefinition newModule;
-
-            if (module.isLocked()) {
-                // module definition is locked, so make a new version
-                newModule = module.newVersion();
-            } else {
-                // just update the existing instance
-                newModule = module;
-            }
-
-            newModule.setDescription(descTextArea.getText());
-
-            @SuppressWarnings("unchecked")
-            ClassWrapper<PipelineModule> selectedImplementingClass = (ClassWrapper<PipelineModule>) implementingClassComboBox
-                .getSelectedItem();
-
-            newModule.setPipelineModuleClass(selectedImplementingClass);
-            newModule.setExeTimeoutSecs(string2int(exeTimeoutTextField.getText(), 0));
-            newModule.setMinMemoryMegaBytes(string2int(minMemoryTextField.getText(), 0));
-
-            pipelineModuleDefinitionCrud.save(newModule);
-
-            setVisible(false);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("saveButtonActionPerformed(ActionEvent) - end");
-    }
-
-    /**
-     * Convert the specified String to an int and return the defaultValue if the conversion fails
-     *
-     * @param s
-     * @param defaultValue
-     * @return
-     */
-    private int string2int(String s, int defaultValue) {
-        try {
-            return Integer.parseInt(s);
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        cancelled = true;
-
-        setVisible(false);
-    }
-
-    private JComboBox<ClassWrapper<PipelineModule>> getImplementingClassComboBox() {
-        if (implementingClassComboBox == null) {
-            DefaultComboBoxModel<ClassWrapper<PipelineModule>> implementingClassComboBoxModel = new DefaultComboBoxModel<>();
-
-            try {
-                ClasspathUtils classpathUtils = new ClasspathUtils();
-                Set<Class<? extends PipelineModule>> detectedClasses = classpathUtils
-                    .scanFully(PipelineModule.class);
-                List<ClassWrapper<PipelineModule>> wrapperList = new LinkedList<>();
-
-                for (Class<? extends PipelineModule> clazz : detectedClasses) {
-                    try {
-                        ClassWrapper<PipelineModule> wrapper = new ClassWrapper<>(clazz);
-
-                        wrapperList.add(wrapper);
-                    } catch (Exception ignore) {
-                    }
-                }
-
-                Collections.sort(wrapperList);
-
-                int selectedIndex = -1;
-                int index = 0;
-
-                for (ClassWrapper<PipelineModule> classWrapper : wrapperList) {
-                    implementingClassComboBoxModel.addElement(classWrapper);
-
-                    ClassWrapper<PipelineModule> implementingClass = module
-                        .getPipelineModuleClass();
-                    if (implementingClass != null
-                        && classWrapper.getClazz().equals(implementingClass.getClazz())) {
-                        selectedIndex = index;
-                    }
-                    index++;
-                }
-
-                implementingClassComboBox = new JComboBox<>();
-                implementingClassComboBox.setModel(implementingClassComboBoxModel);
-                implementingClassComboBox
-                    .addActionListener(evt -> implementingClassComboBoxActionPerformed());
-
-                if (selectedIndex != -1) {
-                    implementingClassComboBox.setSelectedIndex(selectedIndex);
-                }
-            } catch (Exception e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        return implementingClassComboBox;
-    }
-
-    private void implementingClassComboBoxActionPerformed() {
-        /*
-         * TODO check that the Parameters and Parameters are compatible with the selected
-         * PipelineModule
-         */
-    }
-
-    private void initGUI() {
-        log.debug("initGUI() - start");
-
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            getContentPane().setLayout(thisLayout);
-            setTitle("Edit Module");
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            this.setSize(461, 389);
-        } catch (Exception e) {
-            log.error("initGUI()", e);
-
-            e.printStackTrace();
-        }
-
-        log.debug("initGUI() - end");
-    }
-
-    private JPanel getDataPanel() {
-        log.debug("getDataPanel() - start");
-
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7 };
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanelLayout.rowHeights = new int[] {};
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getNameLanel(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getNameText(),
-                new GridBagConstraints(1, 0, 4, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getDescLabel(),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.FIRST_LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getVersionLabel(),
-                new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getDescScrollPane(), new GridBagConstraints(1, 1, 4, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getImplementingClassComboBox(),
-                new GridBagConstraints(1, 2, 4, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getExeNameLabel(),
-                new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getExeTimeoutLabel(),
-                new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getExeTimeoutTextField(),
-                new GridBagConstraints(1, 4, 4, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getMinMemoryLabel(),
-                new GridBagConstraints(0, 5, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getMinMemoryTextField(),
-                new GridBagConstraints(1, 5, 4, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        }
-
-        log.debug("getDataPanel() - end");
-        return dataPanel;
-    }
-
-    /**
-     * Auto-generated method for setting the popup menu for a component
-     */
-    // private void setComponentPopupMenu(final java.awt.Component parent, final
-    // javax.swing.JPopupMenu menu) {
-    // log.debug("setComponentPopupMenu(java.awt.Component,
-    // javax.swing.JPopupMenu) - start");
-    //
-    // parent.addMouseListener(new java.awt.event.MouseAdapter() {
-    // public void mousePressed(java.awt.event.MouseEvent e) {
-    // log.debug("mousePressed(java.awt.event.MouseEvent) - start");
-    //
-    // if (e.isPopupTrigger()){
-    // popupRow = paramSetsTable.rowAtPoint(e.getPoint());
-    // menu.show(parent, e.getX(), e.getY());
-    // }
-    // log.debug("mousePressed(java.awt.event.MouseEvent) - end");
-    // }
-    //
-    // public void mouseReleased(java.awt.event.MouseEvent e) {
-    // log.debug("mouseReleased(java.awt.event.MouseEvent) - start");
-    //
-    // if (e.isPopupTrigger()){
-    // popupRow = paramSetsTable.rowAtPoint(e.getPoint());
-    // menu.show(parent, e.getX(), e.getY());
-    // }
-    // log.debug("mouseReleased(java.awt.event.MouseEvent) - end");
-    // }
-    // });
-    //
-    // log.debug("setComponentPopupMenu(java.awt.Component,
-    // javax.swing.JPopupMenu) - end");
-    // }
-    private JPanel getButtonPanel() {
-        log.debug("getButtonPanel() - start");
-
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(40);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getSaveButton());
-            buttonPanel.add(getCancelButton());
-        }
-
-        log.debug("getButtonPanel() - end");
-        return buttonPanel;
-    }
-
-    private JButton getSaveButton() {
-        log.debug("getSaveButton() - start");
-
-        if (saveButton == null) {
-            saveButton = new JButton();
-            saveButton.setText("Save Changes");
-            saveButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                saveButtonActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getSaveButton() - end");
-        return saveButton;
-    }
-
-    private JButton getCancelButton() {
-        log.debug("getCancelButton() - start");
-
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                cancelButtonActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getCancelButton() - end");
-        return cancelButton;
-    }
-
-    private JLabel getNameLanel() {
-        log.debug("getNameLanel() - start");
-
-        if (nameLanel == null) {
-            nameLanel = new JLabel();
-            nameLanel.setText("Name");
-        }
-
-        log.debug("getNameLanel() - end");
-        return nameLanel;
-    }
-
-    private JTextField getNameText() {
-        log.debug("getNameText() - start");
-
-        if (nameText == null) {
-            nameText = new JTextField();
-            nameText.setText(module.getName().getName());
-            nameText.setEditable(false);
-        }
-
-        log.debug("getNameText() - end");
-        return nameText;
-    }
-
-    private JLabel getDescLabel() {
-        log.debug("getDescLabel() - start");
-
-        if (descLabel == null) {
-            descLabel = new JLabel();
-            descLabel.setText("Description");
-        }
-
-        log.debug("getDescLabel() - end");
-        return descLabel;
-    }
-
-    private JTextArea getDescTextArea() {
-        log.debug("getDescTextArea() - start");
-
-        if (descTextArea == null) {
-            descTextArea = new JTextArea();
-            descTextArea.setRows(4);
-            descTextArea.setLineWrap(true);
-            descTextArea.setWrapStyleWord(true);
-            descTextArea.setText(module.getDescription());
-        }
-
-        log.debug("getDescTextArea() - end");
-        return descTextArea;
-    }
-
-    private JLabel getVersionLabel() {
-        log.debug("getVersionLabel() - start");
-
-        if (versionLabel == null) {
-            versionLabel = new JLabel();
-            versionLabel.setText("Implementing class");
-        }
-
-        log.debug("getVersionLabel() - end");
-        return versionLabel;
-    }
-
-    private JScrollPane getDescScrollPane() {
-        log.debug("getDescScrollPane() - start");
-
-        if (descScrollPane == null) {
-            descScrollPane = new JScrollPane();
-            descScrollPane.setViewportView(getDescTextArea());
-        }
-
-        log.debug("getDescScrollPane() - end");
-        return descScrollPane;
-    }
-
-    private JLabel getExeNameLabel() {
-        if (exeNameLabel == null) {
-            exeNameLabel = new JLabel();
-            exeNameLabel.setText("Executable name");
-        }
-        return exeNameLabel;
-    }
-
-    private JLabel getExeTimeoutLabel() {
-        if (exeTimeoutLabel == null) {
-            exeTimeoutLabel = new JLabel();
-            exeTimeoutLabel.setText("Executable timeout (secs)");
-        }
-        return exeTimeoutLabel;
-    }
-
-    private JTextField getExeTimeoutTextField() {
-        if (exeTimeoutTextField == null) {
-            exeTimeoutTextField = new JTextField("" + module.getExeTimeoutSecs());
-        }
-        return exeTimeoutTextField;
-    }
-
-    private JLabel getMinMemoryLabel() {
-        if (minMemoryLabel == null) {
-            minMemoryLabel = new JLabel();
-            minMemoryLabel.setText("Minimum Memory (mb)");
-        }
-        return minMemoryLabel;
-    }
-
-    private JTextField getMinMemoryTextField() {
-        if (minMemoryTextField == null) {
-            minMemoryTextField = new JTextField("" + module.getMinMemoryMegaBytes());
-        }
-        return minMemoryTextField;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/module/ModuleLibraryTableModel.java b/src/main/java/gov/nasa/ziggy/ui/config/module/ModuleLibraryTableModel.java
deleted file mode 100644
index 5492194..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/module/ModuleLibraryTableModel.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package gov.nasa.ziggy.ui.config.module;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.AuditInfo;
-import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
-import gov.nasa.ziggy.services.security.User;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.PipelineModuleDefinitionCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ModuleLibraryTableModel extends AbstractDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(ModuleLibraryTableModel.class);
-
-    private List<PipelineModuleDefinition> modules = new LinkedList<>();
-    private final PipelineModuleDefinitionCrudProxy pipelineModuleDefinitionCrud;
-
-    public ModuleLibraryTableModel() {
-        pipelineModuleDefinitionCrud = new PipelineModuleDefinitionCrudProxy();
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        log.info("loadFromDatabase() - start");
-
-        if (modules != null) {
-            pipelineModuleDefinitionCrud.evictAll(modules);
-        }
-
-        try {
-            modules = pipelineModuleDefinitionCrud.retrieveLatestVersions();
-        } catch (ConsoleSecurityException ignore) {
-        }
-
-        fireTableDataChanged();
-
-        log.debug("loadFromDatabase() - end");
-    }
-
-    public PipelineModuleDefinition getModuleAtRow(int rowIndex) {
-        validityCheck();
-        return modules.get(rowIndex);
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return modules.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        validityCheck();
-        return 6;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-
-        PipelineModuleDefinition module = modules.get(rowIndex);
-
-        AuditInfo auditInfo = module.getAuditInfo();
-
-        User lastChangedUser = null;
-        Date lastChangedTime = null;
-
-        if (auditInfo != null) {
-            lastChangedUser = auditInfo.getLastChangedUser();
-            lastChangedTime = auditInfo.getLastChangedTime();
-        }
-
-        switch (columnIndex) {
-            case 0:
-                return module.getId();
-            case 1:
-                return module.getName().getName();
-            case 2:
-                return module.getVersion();
-            case 3:
-                return module.isLocked();
-            case 4:
-                if (lastChangedUser != null) {
-                    return lastChangedUser.getLoginName();
-                } else {
-                    return "---";
-                }
-            case 5:
-                if (lastChangedTime != null) {
-                    return lastChangedTime;
-                } else {
-                    return "---";
-                }
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        validityCheck();
-
-        switch (columnIndex) {
-            case 0:
-                return Integer.class;
-            case 1:
-                return String.class;
-            case 2:
-                return Integer.class;
-            case 3:
-                return Boolean.class;
-            case 4:
-                return String.class;
-            case 5:
-                return Object.class;
-            default:
-                return String.class;
-        }
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        validityCheck();
-        switch (column) {
-            case 0:
-                return "ID";
-            case 1:
-                return "Name";
-            case 2:
-                return "Version";
-            case 3:
-                return "Locked";
-            case 4:
-                return "User";
-            case 5:
-                return "Mod. Time";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/module/ModuleLibraryViewEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/module/ModuleLibraryViewEditPanel.java
deleted file mode 100644
index 2d6db32..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/module/ModuleLibraryViewEditPanel.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package gov.nasa.ziggy.ui.config.module;
-
-import javax.swing.JOptionPane;
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.PipelineUIException;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.config.AbstractClonableViewEditPanel;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-import gov.nasa.ziggy.ui.proxy.PipelineModuleDefinitionCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ModuleLibraryViewEditPanel extends AbstractClonableViewEditPanel {
-    public static final Logger log = LoggerFactory.getLogger(ModuleLibraryViewEditPanel.class);
-
-    private ModuleLibraryTableModel moduleLibraryTableModel; // do NOT init to null! (see
-    // getTableModel)
-
-    private final PipelineModuleDefinitionCrudProxy pipelineModuleDefinitionCrud;
-
-    public ModuleLibraryViewEditPanel() throws PipelineUIException {
-        super(true, true);
-
-        pipelineModuleDefinitionCrud = new PipelineModuleDefinitionCrudProxy();
-
-        initGUI();
-    }
-
-    @Override
-    protected AbstractTableModel getTableModel() throws PipelineUIException {
-        log.debug("getTableModel() - start");
-
-        if (moduleLibraryTableModel == null) {
-            moduleLibraryTableModel = new ModuleLibraryTableModel();
-            moduleLibraryTableModel.register();
-        }
-
-        log.debug("getTableModel() - end");
-        return moduleLibraryTableModel;
-    }
-
-    @Override
-    protected void doNew() {
-        log.debug("doNew() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        String newModuleName = ZiggyGuiConsole.showInputDialog(
-            "Enter the name for the new Module Definition", "New Pipeline Module Definition",
-            JOptionPane.PLAIN_MESSAGE);
-
-        if (newModuleName == null || newModuleName.length() == 0) {
-            MessageUtil.showError(this, "Please enter a module name");
-            return;
-        }
-
-        showEditDialog(new PipelineModuleDefinition(newModuleName));
-
-        log.debug("doNew() - end");
-    }
-
-    @Override
-    protected void doClone(int row) {
-        log.debug("doClone() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        PipelineModuleDefinition selectedModule = moduleLibraryTableModel.getModuleAtRow(row);
-
-        try {
-            String newModuleName = ZiggyGuiConsole.showInputDialog(
-                "Enter the name for the new Module Definition", "New Module Definition",
-                JOptionPane.PLAIN_MESSAGE);
-
-            if (newModuleName == null || newModuleName.length() == 0) {
-                MessageUtil.showError(this, "Please enter a module name");
-                return;
-            }
-
-            PipelineModuleDefinition newModuleDefinition = new PipelineModuleDefinition(
-                selectedModule);
-            newModuleDefinition.rename(newModuleName);
-
-            showEditDialog(newModuleDefinition);
-
-            moduleLibraryTableModel.loadFromDatabase();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doClone() - end");
-    }
-
-    @Override
-    protected void doRename(int row) {
-        log.debug("doRename() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        PipelineModuleDefinition selectedModule = moduleLibraryTableModel.getModuleAtRow(row);
-
-        try {
-            String newModuleName = ZiggyGuiConsole.showInputDialog(
-                "Enter the new name for this Module Definition", "Rename Module Definition",
-                JOptionPane.PLAIN_MESSAGE);
-
-            if (newModuleName == null || newModuleName.length() == 0) {
-                MessageUtil.showError(this, "Please enter a module name");
-                return;
-            }
-
-            pipelineModuleDefinitionCrud.rename(selectedModule, newModuleName);
-            moduleLibraryTableModel.loadFromDatabase();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doRename() - end");
-    }
-
-    @Override
-    protected void doEdit(int row) {
-        log.debug("doEdit(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        showEditDialog(moduleLibraryTableModel.getModuleAtRow(row));
-
-        log.debug("doEdit(int) - end");
-    }
-
-    @Override
-    protected void doDelete(int row) {
-        log.debug("doDelete(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        PipelineModuleDefinition module = moduleLibraryTableModel.getModuleAtRow(row);
-
-        if (!module.isLocked()) {
-            int choice = JOptionPane.showConfirmDialog(this,
-                "Are you sure you want to delete module '" + module.getName() + "'?");
-
-            if (choice == JOptionPane.YES_OPTION) {
-                try {
-                    pipelineModuleDefinitionCrud.delete(module);
-                    moduleLibraryTableModel.loadFromDatabase();
-                } catch (Throwable e) {
-                    MessageUtil.showError(this, e);
-                }
-            }
-        } else {
-            JOptionPane.showMessageDialog(this,
-                "Can't delete a locked module definition.  Modules are locked when referenced by a pipeline instance",
-                "Error", JOptionPane.ERROR_MESSAGE);
-        }
-
-        log.debug("doDelete(int) - end");
-    }
-
-    @Override
-    protected void doRefresh() {
-        try {
-            moduleLibraryTableModel.loadFromDatabase();
-        } catch (Throwable e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void showEditDialog(PipelineModuleDefinition module) {
-        log.debug("showEditDialog() - start");
-
-        ModuleEditDialog inst = ZiggyGuiConsole.newModuleEditDialog(module);
-
-        inst.setVisible(true);
-
-        if (!inst.isCancelled()) {
-            try {
-                moduleLibraryTableModel.loadFromDatabase();
-            } catch (Exception e) {
-                log.error("showEditDialog(User)", e);
-
-                MessageUtil.showError(this, e);
-            }
-        }
-
-        log.debug("showEditDialog() - end");
-    }
-
-    @Override
-    protected String getEditMenuText() {
-        return "Edit selected module...";
-    }
-
-    @Override
-    protected String getNewMenuText() {
-        return "Add module...";
-    }
-
-    @Override
-    protected String getDeleteMenuText() {
-        return "Delete selected module...";
-    }
-
-    @Override
-    protected String getCloneMenuText() {
-        return "Clone selected module...";
-    }
-
-    @Override
-    protected String getRenameMenuText() {
-        return "Rename selected module...";
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/AllParameterClassListModel.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/AllParameterClassListModel.java
deleted file mode 100644
index 3a89d4a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/AllParameterClassListModel.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import gov.nasa.ziggy.ui.ops.parameters.ParametersClassCache;
-
-@SuppressWarnings("serial")
-public class AllParameterClassListModel extends ParameterClassListModel {
-    public AllParameterClassListModel() throws Exception {
-        // super(new LinkedList<ClassWrapper<Parameters>>());
-        super(ParametersClassCache.getCache());
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParamLibImportDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParamLibImportDialog.java
deleted file mode 100644
index b4da58e..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParamLibImportDialog.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.ParameterSetDescriptor;
-import gov.nasa.ziggy.parameters.ParameterSetDescriptor.State;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.ops.instances.TextualReportDialog;
-import gov.nasa.ziggy.util.StringUtils;
-
-/**
- * This dialog is used to import a parameter library from disk into the parameter library in the
- * database. It is initialized by running the parameter library importer in "dry run" mode, which
- * tells the user what actions will take effect when the import is run for real. The user can also
- * choose to exclude some of the parameter sets from the import if desired.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParamLibImportDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(ParamLibImportDialog.class);
-
-    private JPanel dataPanel;
-    private JButton importButton;
-    private JButton reportButton;
-    private ZTable paramImportTable;
-    private JScrollPane scrollPane;
-    private JButton cancelButton;
-    private JPanel buttonPanel;
-    private ParamLibImportTableModel paramImportTableModel;
-    private boolean cancelled = false;
-    private List<ParameterSetDescriptor> dryRunResults = null;
-
-    public ParamLibImportDialog(JFrame frame, List<ParameterSetDescriptor> dryRunResults) {
-        super(frame, true);
-
-        this.dryRunResults = dryRunResults;
-
-        initGUI();
-    }
-
-    public static List<String> selectParamSet(JFrame frame,
-        List<ParameterSetDescriptor> dryRunResults) {
-        ParamLibImportDialog dialog = new ParamLibImportDialog(frame, dryRunResults);
-        dialog.setVisible(true); // blocks until user presses a button
-
-        if (!dialog.cancelled) {
-            return dialog.paramImportTableModel.getExcludeList();
-        }
-        return null;
-    }
-
-    private void importButtonActionPerformed(ActionEvent evt) {
-        log.debug("importButton.actionPerformed, event=" + evt);
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-        cancelled = true;
-        setVisible(false);
-    }
-
-    private void reportButtonActionPerformed(ActionEvent evt) {
-        log.debug("reportButton.actionPerformed, event=" + evt);
-
-        StringBuilder report = new StringBuilder();
-
-        List<String> excludes = paramImportTableModel.getExcludeList();
-        Map<ParameterSetDescriptor.State, List<ParameterSetDescriptor>> binnedByState = new HashMap<>();
-
-        for (ParameterSetDescriptor d : dryRunResults) {
-            String name = d.getName();
-            State descState = d.getState();
-
-            if (excludes.contains(name)) {
-                // override state since the user de-selected this one for import
-                descState = ParameterSetDescriptor.State.IGNORE;
-            }
-
-            List<ParameterSetDescriptor> list = binnedByState.get(descState);
-            if (list == null) {
-                list = new LinkedList<>();
-                binnedByState.put(descState, list);
-            }
-            list.add(d);
-        }
-
-        report.append("Parameter Sets to be Created:\n\n");
-        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.CREATE));
-        report.append("Parameter Sets to be Updated:\n\n");
-        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.UPDATE));
-        report.append("Parameter Sets in the library, but not in the export:\n\n");
-        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.LIBRARY_ONLY));
-        report.append("Parameter Sets that are the same (no change needed):\n\n");
-        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.SAME));
-        report.append("Parameter Sets to be Ignored (on the exclude list):\n\n");
-        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.IGNORE));
-
-        TextualReportDialog.showReport(this, report.toString());
-    }
-
-    private void appendToReport(StringBuilder report, List<ParameterSetDescriptor> descs) {
-        if (descs == null || descs.isEmpty()) {
-            report.append("NONE\n");
-        } else {
-            int maxNameLength = 0;
-            for (ParameterSetDescriptor desc : descs) {
-                int nameLength = desc.getName().length();
-                if (nameLength > maxNameLength) {
-                    maxNameLength = nameLength;
-                }
-            }
-
-            for (ParameterSetDescriptor desc : descs) {
-                report.append(StringUtils.pad(desc.getName(), maxNameLength + 5) + "["
-                    + desc.shortClassName() + "]\n");
-            }
-        }
-        report.append("\n\n");
-    }
-
-    private void tableMouseClicked(MouseEvent evt, ZTable table) {
-        log.debug("tableMouseClicked(MouseEvent) - start, evt=" + evt);
-
-        if (evt.getClickCount() == 2) {
-            log.debug(
-                "tableMouseClicked(MouseEvent) - [DOUBLE-CLICK] table.mouseClicked, event=" + evt);
-            int tableRow = table.rowAtPoint(evt.getPoint());
-            int selectedModelRow = table.convertRowIndexToModel(tableRow);
-            log.info("tableMouseClicked(MouseEvent) - [DC] table row =" + selectedModelRow);
-
-            ParameterSetDescriptor desc = paramImportTableModel.getDescriptorAt(selectedModelRow);
-            String report = "Library Version:\n\n" + desc.getLibraryProps()
-                + "\n\nImport Version:\n\n" + desc.getFileProps();
-            TextualReportDialog.showReport(this, report);
-        }
-
-        log.debug("tableMouseClicked(MouseEvent) - end");
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Import Parameter Library");
-                getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-                getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            }
-            this.setSize(740, 567);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getScrollPane(), BorderLayout.CENTER);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(100);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getReportButton());
-            buttonPanel.add(getImportButton());
-            buttonPanel.add(getCancelButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getImportButton() {
-        if (importButton == null) {
-            importButton = new JButton();
-            importButton.setText("import");
-            importButton.addActionListener(this::importButtonActionPerformed);
-        }
-        return importButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JScrollPane getScrollPane() {
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getParamImportTable());
-        }
-        return scrollPane;
-    }
-
-    private ZTable getParamImportTable() {
-        if (paramImportTable == null) {
-            paramImportTableModel = new ParamLibImportTableModel(dryRunResults);
-
-            paramImportTable = new ZTable();
-            paramImportTable.setRowShadingEnabled(true);
-            paramImportTable.getSelectionModel()
-                .setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-            paramImportTable.setModel(paramImportTableModel);
-
-            paramImportTable.addMouseListener(new MouseAdapter() {
-                @Override
-                public void mouseClicked(MouseEvent evt) {
-                    tableMouseClicked(evt, paramImportTable);
-                }
-            });
-        }
-        return paramImportTable;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JFrame frame = new JFrame();
-            ParamLibImportDialog inst = new ParamLibImportDialog(frame, null);
-            inst.setVisible(true);
-        });
-    }
-
-    private JButton getReportButton() {
-        if (reportButton == null) {
-            reportButton = new JButton();
-            reportButton.setText("report");
-            reportButton.addActionListener(this::reportButtonActionPerformed);
-        }
-        return reportButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParamLibImportTableModel.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParamLibImportTableModel.java
deleted file mode 100644
index d3af82d..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParamLibImportTableModel.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.parameters.ParameterSetDescriptor;
-import gov.nasa.ziggy.parameters.ParameterSetDescriptor.State;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParamLibImportTableModel extends AbstractTableModel {
-    private List<ParameterSetDescriptor> paramMap = new LinkedList<>();
-    // private List<String> names = new ArrayList<>();
-    private List<Boolean> includeFlags = new ArrayList<>();
-
-    public ParamLibImportTableModel() {
-    }
-
-    public ParamLibImportTableModel(List<ParameterSetDescriptor> paramMap) {
-        this.paramMap = paramMap;
-
-        // names = new ArrayList<>(paramMap.keySet());
-        // initially in alphabetical order (until the user sorts by some other column)
-        // Collections.sort(names);
-
-        // everything included by default
-        includeFlags = new ArrayList<>();
-        for (@SuppressWarnings("unused")
-        ParameterSetDescriptor param : paramMap) {
-            includeFlags.add(true);
-        }
-    }
-
-    public List<String> getExcludeList() {
-        List<String> excludeList = new LinkedList<>();
-
-        for (int index = 0; index < paramMap.size(); index++) {
-            if (!includeFlags.get(index)) {
-                excludeList.add(paramMap.get(index).getName());
-            }
-        }
-        return excludeList;
-    }
-
-    public ParameterSetDescriptor getDescriptorAt(int rowIndex) {
-        // String name = names.get(rowIndex);
-        // ParameterSetDescriptor param = paramMap.get(name);
-
-        return paramMap.get(rowIndex);
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 4;
-    }
-
-    @Override
-    public int getRowCount() {
-        return paramMap.size();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        // String name = names.get(rowIndex);
-        boolean include = includeFlags.get(rowIndex);
-        ParameterSetDescriptor param = paramMap.get(rowIndex);
-        String className = param.shortClassName();
-
-        switch (columnIndex) {
-            case 0:
-                return include;
-            case 1:
-                return param.getName();
-            case 2:
-                return className;
-            case 3:
-                State state = param.getState();
-                String color = "black";
-
-                switch (state) {
-                    case CREATE:
-                        color = "blue";
-                        break;
-
-                    case IGNORE:
-                    case CLASS_MISSING:
-                        color = "maroon";
-                        break;
-
-                    case SAME:
-                        color = "green";
-                        break;
-
-                    case UPDATE:
-                        color = "red";
-                        break;
-
-                    case LIBRARY_ONLY:
-                        color = "purple";
-                        break;
-
-                    case NONE:
-                        color = "black";
-                        break;
-
-                    default:
-                }
-
-                return "<html><b><font color=" + color + ">" + state.toString()
-                    + "</font></b></html>";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Include";
-            case 1:
-                return "Parameter Set Name";
-            case 2:
-                return "Class";
-            case 3:
-                return "Action";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-
-    @Override
-    public boolean isCellEditable(int rowIndex, int columnIndex) {
-        if (columnIndex == 0) {
-            return true;
-        }
-        return super.isCellEditable(rowIndex, columnIndex);
-    }
-
-    @Override
-    public void setValueAt(Object value, int rowIndex, int columnIndex) {
-        if (columnIndex != 0) {
-            throw new IllegalArgumentException("read-only columnIndex = " + columnIndex);
-        }
-        Boolean newInclude = (Boolean) value;
-        includeFlags.set(rowIndex, newInclude);
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        if (columnIndex == 0) {
-            return Boolean.class;
-        }
-        return super.getColumnClass(columnIndex);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParamSetSelectorDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParamSetSelectorDialog.java
deleted file mode 100644
index a864280..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParamSetSelectorDialog.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.Dialog;
-import java.awt.FlowLayout;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParamSetSelectorDialog extends javax.swing.JDialog {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(ParamSetSelectorDialog.class);
-
-    private JPanel dataPanel;
-    private JScrollPane paramSetsScrollPane;
-    private ZTable paramSetsTable;
-    private JButton cancelButton;
-    private JButton okButton;
-    private JPanel actionPanel;
-    private boolean cancelled = false;
-
-    private ParameterSetsTableModel paramSetsTableModel;
-
-    public ParamSetSelectorDialog(JFrame frame) {
-        super(frame, true);
-        initGUI();
-    }
-
-    public ParamSetSelectorDialog(Dialog owner) {
-        super(owner, true);
-        initGUI();
-    }
-
-    public ParameterSet selectParamSet() {
-        setVisible(true); // blocks until user presses a button
-
-        if (!cancelled) {
-            int selectedModelRow = paramSetsTable
-                .convertRowIndexToModel(paramSetsTable.getSelectedRow());
-            if (selectedModelRow != -1) {
-                return paramSetsTableModel.getParamSetAtRow(selectedModelRow);
-            }
-        }
-        return null;
-    }
-
-    private void okButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed() {
-        cancelled = true;
-
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Select new Parameter Set");
-            }
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            setSize(400, 600);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getParamSetsScrollPane(), BorderLayout.CENTER);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(50);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getOkButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getOkButton() {
-        if (okButton == null) {
-            okButton = new JButton();
-            okButton.setText("Ok");
-            okButton.addActionListener(evt -> okButtonActionPerformed());
-        }
-        return okButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(evt -> cancelButtonActionPerformed());
-        }
-        return cancelButton;
-    }
-
-    private JScrollPane getParamSetsScrollPane() {
-        if (paramSetsScrollPane == null) {
-            paramSetsScrollPane = new JScrollPane();
-            paramSetsScrollPane.setViewportView(getParamSetsTable());
-        }
-        return paramSetsScrollPane;
-    }
-
-    private ZTable getParamSetsTable() {
-        if (paramSetsTable == null) {
-            try {
-                paramSetsTableModel = new ParameterSetsTableModel();
-                paramSetsTable = new ZTable();
-                paramSetsTable.setModel(paramSetsTableModel);
-            } catch (PipelineException e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-        return paramSetsTable;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterClassSelectorDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterClassSelectorDialog.java
deleted file mode 100644
index 6ea65a3..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterClassSelectorDialog.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterClassSelectorDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(ParameterClassSelectorDialog.class);
-
-    private boolean cancelled = false;
-    private ParameterClassSelectorPanel dataPanel;
-    private JButton cancelButton;
-    private JButton okButton;
-    private JPanel actionPanel;
-
-    public ParameterClassSelectorDialog(JDialog dialog) {
-        super(dialog, true);
-        initGUI();
-    }
-
-    public ParameterClassSelectorDialog(JFrame frame) {
-        super(frame, true);
-        initGUI();
-    }
-
-    public static ClassWrapper<Parameters> selectParameterClass() {
-        ParameterClassSelectorDialog dialog = ZiggyGuiConsole.newParameterClassSelectorDialog();
-        dialog.setVisible(true); // blocks until user presses a button
-
-        if (!dialog.cancelled) {
-            return dialog.dataPanel.getSelectedElement();
-        }
-        return null;
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-
-            setSize(400, 600);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void okButtonActionPerformed(ActionEvent evt) {
-        log.debug("okButton.actionPerformed, event=" + evt);
-
-        ClassWrapper<Parameters> selectedClass = dataPanel.getSelectedElement();
-
-        if (selectedClass == null) {
-            MessageUtil.showError(this, "Please select a Parameters class");
-        } else {
-            setVisible(false);
-        }
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        cancelled = true;
-
-        setVisible(false);
-    }
-
-    private ParameterClassSelectorPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new ParameterClassSelectorPanel();
-        }
-        return dataPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(40);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getOkButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getOkButton() {
-        if (okButton == null) {
-            okButton = new JButton();
-            okButton.setText("ok");
-            okButton.addActionListener(this::okButtonActionPerformed);
-        }
-        return okButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterClassSelectorPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterClassSelectorPanel.java
deleted file mode 100644
index 746fe86..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterClassSelectorPanel.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.awt.BorderLayout;
-
-import javax.swing.JList;
-import javax.swing.JScrollPane;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterClassSelectorPanel extends javax.swing.JPanel {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(ParameterClassSelectorPanel.class);
-
-    private JScrollPane paramClassScrollPane;
-    private JList<ClassWrapper<Parameters>> paramClassList;
-
-    private ParameterClassListModel paramClassListModel;
-
-    public ParameterClassSelectorPanel() {
-        initGUI();
-    }
-
-    public ClassWrapper<Parameters> getSelectedElement() {
-        int selectedIndex = paramClassList.getSelectedIndex();
-        if (selectedIndex != -1) {
-            return paramClassListModel.getElementAt(selectedIndex);
-        }
-        return null;
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            this.add(getParamClassScrollPane(), BorderLayout.CENTER);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private JScrollPane getParamClassScrollPane() throws Exception {
-        if (paramClassScrollPane == null) {
-            paramClassScrollPane = new JScrollPane();
-            paramClassScrollPane.setViewportView(getParamClassList());
-        }
-        return paramClassScrollPane;
-    }
-
-    private JList<ClassWrapper<Parameters>> getParamClassList() throws Exception {
-        if (paramClassList == null) {
-            paramClassListModel = new AllParameterClassListModel();
-            paramClassList = new JList<>();
-            paramClassList.setModel(paramClassListModel);
-        }
-        return paramClassList;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetEditDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetEditDialog.java
deleted file mode 100644
index 5cba897..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetEditDialog.java
+++ /dev/null
@@ -1,394 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.io.File;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.l2fprod.common.propertysheet.PropertySheetPanel;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.parameters.ParametersUtils;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.PropertySheetHelper;
-import gov.nasa.ziggy.ui.proxy.PipelineOperationsProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetEditDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(ParameterSetEditDialog.class);
-
-    private final ParameterSet parameterSet;
-    private Parameters currentParams;
-    private boolean initializing = true;
-    private PropertySheetPanel paramsPropPanel;
-    private JButton defaultsButton;
-    private JButton exportButton;
-    private JButton importButton;
-    private JPanel buttonPanel;
-    private JPanel namePanel;
-    private JButton cancelButton;
-    private JButton saveButton;
-    private JPanel actionPanel;
-    private JTextArea descriptionTextArea;
-    private JScrollPane descriptionScrollPane;
-    private JPanel descriptionPanel;
-    private JTextField versionTextField;
-    private JPanel versionPanel;
-    private JTextField nameTextField;
-    private JPanel parametersPanel;
-    private JPanel dataPanel;
-
-    private boolean cancelled = false;
-
-    private boolean isNew = false;
-
-    public ParameterSetEditDialog(JFrame frame, ParameterSet parameterSet, boolean isNew) {
-        super(frame, true);
-        this.parameterSet = parameterSet;
-        this.isNew = isNew;
-
-        initializeCurrentParamsfromDefinition();
-
-        initGUI();
-        initializing = false;
-    }
-
-    private void initializeCurrentParamsfromDefinition() {
-        BeanWrapper<Parameters> moduleParamsBean = parameterSet.getParameters();
-
-        if (moduleParamsBean != null && moduleParamsBean.isInitialized()) {
-            try {
-                currentParams = moduleParamsBean.getInstance();
-            } catch (PipelineException e) {
-                throw new PipelineException(
-                    "Can't edit this Parameter Set because the underlying Java class has been deleted",
-                    e);
-            }
-        }
-    }
-
-    private void populateParamsPropertySheet() {
-        if (currentParams != null) {
-            try {
-                PropertySheetHelper.populatePropertySheet(currentParams, paramsPropPanel);
-            } catch (Exception e) {
-                throw new PipelineException("Failed to introspect Parameters bean", e);
-            }
-        }
-    }
-
-    private void defaultsButtonActionPerformed(ActionEvent evt) {
-        log.debug("defaultsButton.actionPerformed, event=" + evt);
-
-        BeanWrapper<Parameters> newBean = new BeanWrapper<>(currentParams.getClass());
-        paramsPropPanel.readFromObject(newBean.getInstance());
-    }
-
-    private void importButtonActionPerformed(ActionEvent evt) {
-        log.debug("importButton.actionPerformed, event=" + evt);
-
-        try {
-            JFileChooser fc = new JFileChooser();
-            int returnVal = fc.showOpenDialog(this);
-
-            if (returnVal == JFileChooser.APPROVE_OPTION) {
-                File file = fc.getSelectedFile();
-
-                currentParams = ParametersUtils.importParameters(file, currentParams.getClass());
-                paramsPropPanel.readFromObject(currentParams);
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void exportButtonActionPerformed(ActionEvent evt) {
-        log.debug("exportButton.actionPerformed, event=" + evt);
-
-        try {
-            JFileChooser fc = new JFileChooser();
-            int returnVal = fc.showSaveDialog(this);
-
-            if (returnVal == JFileChooser.APPROVE_OPTION) {
-                File file = fc.getSelectedFile();
-                paramsPropPanel.writeToObject(currentParams);
-                ParametersUtils.exportParameters(file, currentParams);
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void saveButtonActionPerformed(ActionEvent evt) {
-        log.debug("saveButton.actionPerformed, event=" + evt);
-
-        try {
-            paramsPropPanel.writeToObject(currentParams);
-            String description = descriptionTextArea.getText();
-
-            PipelineOperationsProxy pipelineOperations = new PipelineOperationsProxy();
-            pipelineOperations.updateParameterSet(parameterSet, currentParams, description, isNew);
-
-            setVisible(false);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        cancelled = true;
-
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                BorderLayout thisLayout = new BorderLayout();
-                getContentPane().setLayout(thisLayout);
-                setTitle("Edit Parameter Set");
-                getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-                getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            }
-            setSize(500, 600);
-
-            populateParamsPropertySheet();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * @return the cancelled
-     */
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    /**
-     * @return the initializing
-     */
-    public boolean isInitializing() {
-        return initializing;
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7 };
-            dataPanelLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
-            dataPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                0.1 };
-            dataPanel.setLayout(dataPanelLayout);
-
-            dataPanel.add(getParametersPanel(), new GridBagConstraints(0, 5, 5, 5, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getNamePanel(), new GridBagConstraints(0, 0, 5, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getVersionPanel(), new GridBagConstraints(0, 1, 5, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getDescriptionPanel(), new GridBagConstraints(0, 2, 5, 2, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return dataPanel;
-    }
-
-    private JPanel getParametersPanel() {
-        if (parametersPanel == null) {
-            parametersPanel = new JPanel();
-            BorderLayout parametersPanelLayout = new BorderLayout();
-            parametersPanel.setLayout(parametersPanelLayout);
-            parametersPanel.setBorder(BorderFactory.createTitledBorder(
-                "Parameters (" + parameterSet.getParameters().getClazz().getSimpleName() + ")"));
-            parametersPanel.add(getButtonPanel(), BorderLayout.SOUTH);
-            parametersPanel.add(getParamsPropPanel(), BorderLayout.CENTER);
-        }
-        return parametersPanel;
-    }
-
-    private PropertySheetPanel getParamsPropPanel() {
-        if (paramsPropPanel == null) {
-            paramsPropPanel = new PropertySheetPanel();
-        }
-        return paramsPropPanel;
-    }
-
-    private JPanel getNamePanel() {
-        if (namePanel == null) {
-            namePanel = new JPanel();
-            GridBagLayout namePanelLayout = new GridBagLayout();
-            namePanelLayout.columnWidths = new int[] { 7 };
-            namePanelLayout.rowHeights = new int[] { 7 };
-            namePanelLayout.columnWeights = new double[] { 0.1 };
-            namePanelLayout.rowWeights = new double[] { 0.1 };
-            namePanel.setLayout(namePanelLayout);
-            namePanel.setBorder(BorderFactory.createTitledBorder("Name"));
-            namePanel.add(getNameTextField(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return namePanel;
-    }
-
-    private JTextField getNameTextField() {
-        if (nameTextField == null) {
-            nameTextField = new JTextField();
-            nameTextField.setEditable(false);
-            nameTextField.setText(parameterSet.getName().getName());
-        }
-        return nameTextField;
-    }
-
-    private JPanel getVersionPanel() {
-        if (versionPanel == null) {
-            versionPanel = new JPanel();
-            GridBagLayout versionPanelLayout = new GridBagLayout();
-            versionPanelLayout.columnWidths = new int[] { 7 };
-            versionPanelLayout.rowHeights = new int[] { 7 };
-            versionPanelLayout.columnWeights = new double[] { 0.1 };
-            versionPanelLayout.rowWeights = new double[] { 0.1 };
-            versionPanel.setLayout(versionPanelLayout);
-            versionPanel.setBorder(BorderFactory.createTitledBorder("Version"));
-            versionPanel.add(getVersionTextField(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return versionPanel;
-    }
-
-    private JTextField getVersionTextField() {
-        if (versionTextField == null) {
-            versionTextField = new JTextField();
-            versionTextField.setEditable(false);
-            versionTextField.setText(parameterSet.getVersion() + "");
-        }
-        return versionTextField;
-    }
-
-    private JPanel getDescriptionPanel() {
-        if (descriptionPanel == null) {
-            descriptionPanel = new JPanel();
-            GridBagLayout descriptionPanelLayout = new GridBagLayout();
-            descriptionPanelLayout.columnWidths = new int[] { 7 };
-            descriptionPanelLayout.rowHeights = new int[] { 7 };
-            descriptionPanelLayout.columnWeights = new double[] { 0.1 };
-            descriptionPanelLayout.rowWeights = new double[] { 0.1 };
-            descriptionPanel.setLayout(descriptionPanelLayout);
-            descriptionPanel.setBorder(BorderFactory.createTitledBorder("Description"));
-            descriptionPanel.add(getDescriptionScrollPane(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return descriptionPanel;
-    }
-
-    private JScrollPane getDescriptionScrollPane() {
-        if (descriptionScrollPane == null) {
-            descriptionScrollPane = new JScrollPane();
-            descriptionScrollPane.setViewportView(getDescriptionTextArea());
-        }
-        return descriptionScrollPane;
-    }
-
-    private JTextArea getDescriptionTextArea() {
-        if (descriptionTextArea == null) {
-            descriptionTextArea = new JTextArea();
-            descriptionTextArea.setText(parameterSet.getDescription());
-        }
-        return descriptionTextArea;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(70);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getSaveButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getSaveButton() {
-        if (saveButton == null) {
-            saveButton = new JButton();
-            saveButton.setText("Save");
-            saveButton.addActionListener(this::saveButtonActionPerformed);
-        }
-        return saveButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getDefaultsButton());
-            buttonPanel.add(getImportButton());
-            buttonPanel.add(getExportButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getImportButton() {
-        if (importButton == null) {
-            importButton = new JButton();
-            importButton.setText("Import");
-            importButton.addActionListener(this::importButtonActionPerformed);
-        }
-        return importButton;
-    }
-
-    private JButton getExportButton() {
-        if (exportButton == null) {
-            exportButton = new JButton();
-            exportButton.setText("Export");
-            exportButton.addActionListener(this::exportButtonActionPerformed);
-        }
-        return exportButton;
-    }
-
-    private JButton getDefaultsButton() {
-        if (defaultsButton == null) {
-            defaultsButton = new JButton();
-            defaultsButton.setText("Replace with Defaults");
-            defaultsButton.addActionListener(this::defaultsButtonActionPerformed);
-        }
-        return defaultsButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetListModel.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetListModel.java
deleted file mode 100644
index c99e808..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetListModel.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.ListModel;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseListModel;
-import gov.nasa.ziggy.ui.proxy.ParameterSetCrudProxy;
-
-/**
- * {@link ListModel} that holds {@link ParameterSet}s of a specified type.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetListModel extends AbstractDatabaseListModel<ParameterSet> {
-    Class<? extends Parameters> filterClass;
-
-    List<ParameterSet> paramSets = new LinkedList<>();
-    ParameterSetCrudProxy paramSetCrud = new ParameterSetCrudProxy();
-
-    public ParameterSetListModel(Class<? extends Parameters> filterClass) {
-        this.filterClass = filterClass;
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        if (paramSets != null) {
-            paramSetCrud.evictAll(paramSets);
-        }
-
-        paramSets = new LinkedList<>();
-
-        List<ParameterSet> allParamSets = paramSetCrud.retrieveLatestVersions();
-
-        for (ParameterSet parameterSet : allParamSets) {
-            Class<?> clazz = null;
-
-            try {
-                clazz = parameterSet.getParameters().getClazz();
-            } catch (RuntimeException e) {
-                // ignore this parameter set
-            }
-
-            if (clazz != null && (filterClass == null || clazz.equals(filterClass))) {
-                paramSets.add(parameterSet);
-            }
-        }
-
-        fireContentsChanged(this, 0, paramSets.size() - 1);
-    }
-
-    @Override
-    public ParameterSet getElementAt(int index) {
-        validityCheck();
-        return paramSets.get(index);
-    }
-
-    @Override
-    public int getSize() {
-        validityCheck();
-        return paramSets.size();
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetNewDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetNewDialog.java
deleted file mode 100644
index 93c1966..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetNewDialog.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetNewDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(ParameterSetNewDialog.class);
-
-    private JPanel dataPanel;
-    private JPanel namePanel;
-    private JPanel typePanel;
-    private JPanel descPanel;
-    private ParameterClassSelectorPanel parameterClassSelectorPanel;
-    private JScrollPane descriptionScrollPane;
-    private JTextArea descriptionTextArea;
-    private JTextField nameTextField;
-    private JButton cancelButton;
-    private JButton okButton;
-    private JPanel actionPanel;
-
-    private boolean cancelled = false;
-
-    private ParameterSet newParamSet = null;
-
-    public ParameterSetNewDialog(JFrame frame) {
-        super(frame, true);
-        initGUI();
-    }
-
-    public static ParameterSet createParameterSet() {
-        ParameterSetNewDialog dialog = ZiggyGuiConsole.newParameterSetNewDialog();
-        dialog.setVisible(true); // blocks until user presses a button
-
-        if (!dialog.cancelled) {
-            return dialog.newParamSet;
-        }
-        return null;
-    }
-
-    private void okButtonActionPerformed(ActionEvent evt) {
-        log.debug("okButton.actionPerformed, event=" + evt);
-
-        String paramSetName = getNameTextField().getText();
-
-        if (paramSetName.isEmpty()) {
-            JOptionPane.showMessageDialog(this,
-                "Please enter a unique name for the new Parameter Set", "Error",
-                JOptionPane.ERROR_MESSAGE);
-            return;
-        }
-
-        String paramSetDesc = getDescriptionTextArea().getText();
-
-        ClassWrapper<Parameters> paramSetClassWrapper = getParameterClassSelectorPanel()
-            .getSelectedElement();
-
-        if (paramSetClassWrapper == null) {
-            JOptionPane.showMessageDialog(this, "Please select a class for the new Parameter Set",
-                "Error", JOptionPane.ERROR_MESSAGE);
-            return;
-        }
-
-        Class<? extends Parameters> paramSetClass = paramSetClassWrapper.getClazz();
-
-        newParamSet = new ParameterSet(paramSetName);
-        newParamSet.setDescription(paramSetDesc);
-        newParamSet.setParameters(new BeanWrapper<Parameters>(paramSetClass));
-
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        cancelled = true;
-
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("New Parameter Set");
-            }
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            setSize(400, 500);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanelLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7, 7, 7 };
-            dataPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7 };
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getNamePanel(), new GridBagConstraints(0, 0, 6, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getDescPanel(), new GridBagConstraints(0, 1, 6, 2, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getTypePanel(), new GridBagConstraints(0, 4, 6, 4, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return dataPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(30);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getOkButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getOkButton() {
-        if (okButton == null) {
-            okButton = new JButton();
-            okButton.setText("ok");
-            okButton.addActionListener(this::okButtonActionPerformed);
-        }
-        return okButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JTextField getNameTextField() {
-        if (nameTextField == null) {
-            nameTextField = new JTextField();
-        }
-        return nameTextField;
-    }
-
-    private JTextArea getDescriptionTextArea() {
-        if (descriptionTextArea == null) {
-            descriptionTextArea = new JTextArea();
-        }
-        return descriptionTextArea;
-    }
-
-    private JScrollPane getDescriptionScrollPane() {
-        if (descriptionScrollPane == null) {
-            descriptionScrollPane = new JScrollPane();
-            descriptionScrollPane.setViewportView(getDescriptionTextArea());
-        }
-        return descriptionScrollPane;
-    }
-
-    private ParameterClassSelectorPanel getParameterClassSelectorPanel() {
-        if (parameterClassSelectorPanel == null) {
-            parameterClassSelectorPanel = new ParameterClassSelectorPanel();
-        }
-        return parameterClassSelectorPanel;
-    }
-
-    private JPanel getNamePanel() {
-        if (namePanel == null) {
-            namePanel = new JPanel();
-            GridBagLayout namePanelLayout = new GridBagLayout();
-            namePanelLayout.rowWeights = new double[] { 0.1 };
-            namePanelLayout.rowHeights = new int[] { 7 };
-            namePanelLayout.columnWeights = new double[] { 0.1 };
-            namePanelLayout.columnWidths = new int[] { 7 };
-            namePanel.setLayout(namePanelLayout);
-            namePanel.setBorder(BorderFactory.createTitledBorder("Name"));
-            namePanel.add(getNameTextField(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return namePanel;
-    }
-
-    private JPanel getDescPanel() {
-        if (descPanel == null) {
-            descPanel = new JPanel();
-            GridBagLayout descPanelLayout = new GridBagLayout();
-            descPanelLayout.rowWeights = new double[] { 0.1 };
-            descPanelLayout.rowHeights = new int[] { 7 };
-            descPanelLayout.columnWeights = new double[] { 0.1 };
-            descPanelLayout.columnWidths = new int[] { 7 };
-            descPanel.setLayout(descPanelLayout);
-            descPanel.setBorder(BorderFactory.createTitledBorder("Description"));
-            descPanel.add(getDescriptionScrollPane(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return descPanel;
-    }
-
-    private JPanel getTypePanel() {
-        if (typePanel == null) {
-            typePanel = new JPanel();
-            BorderLayout typePanelLayout = new BorderLayout();
-            typePanel.setLayout(typePanelLayout);
-            typePanel.setBorder(BorderFactory.createTitledBorder("Type"));
-            typePanel.add(getParameterClassSelectorPanel(), BorderLayout.CENTER);
-        }
-        return typePanel;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JFrame frame = new JFrame();
-            ParameterSetNewDialog inst = new ParameterSetNewDialog(frame);
-            inst.setVisible(true);
-        });
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetsTableModel.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetsTableModel.java
deleted file mode 100644
index f5d4bfe..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetsTableModel.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.pipeline.definition.AuditInfo;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
-import gov.nasa.ziggy.services.security.User;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.ParameterSetCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetsTableModel extends AbstractDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(ParameterSetsTableModel.class);
-
-    private final ParameterSetCrudProxy parameterSetCrud;
-    protected List<ParameterSet> paramSets = new ArrayList<>();
-
-    public ParameterSetsTableModel() {
-        parameterSetCrud = new ParameterSetCrudProxy();
-    }
-
-    public ParameterSetsTableModel(List<ParameterSet> paramSets) {
-        this.paramSets = paramSets;
-        parameterSetCrud = new ParameterSetCrudProxy();
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        log.debug("loadFromDatabase() - start");
-
-        if (paramSets != null) {
-            parameterSetCrud.evictAll(paramSets);
-        }
-
-        try {
-            paramSets = parameterSetCrud.retrieveLatestVersions();
-        } catch (ConsoleSecurityException ignore) {
-        }
-
-        fireTableDataChanged();
-
-        log.debug("loadFromDatabase() - end");
-    }
-
-    public void loadByNames(List<ParameterSetName> parameterSetNames) {
-        if (paramSets != null) {
-            parameterSetCrud.evictAll(paramSets);
-            paramSets.clear();
-        }
-
-        for (ParameterSetName parameterSetName : parameterSetNames) {
-            ParameterSet paramSet = parameterSetCrud.retrieveLatestVersionForName(parameterSetName);
-            paramSets.add(paramSet);
-        }
-    }
-
-    public ParameterSet getParamSetAtRow(int rowIndex) {
-        validityCheck();
-        return paramSets.get(rowIndex);
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return paramSets.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 6;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-
-        ParameterSet paramSet = paramSets.get(rowIndex);
-
-        AuditInfo auditInfo = paramSet.getAuditInfo();
-
-        User lastChangedUser = null;
-        Date lastChangedTime = null;
-
-        if (auditInfo != null) {
-            lastChangedUser = auditInfo.getLastChangedUser();
-            lastChangedTime = auditInfo.getLastChangedTime();
-        }
-
-        String type = "<deleted>";
-
-        try {
-            type = paramSet.getParameters().getClazz().getSimpleName();
-        } catch (PipelineException e) {
-            // ignore if the class is not on the classpath
-        }
-
-        switch (columnIndex) {
-            case 0:
-                return paramSet.getName().getName();
-            case 1:
-                return type;
-            case 2:
-                return paramSet.getVersion();
-            case 3:
-                return paramSet.isLocked();
-            case 4:
-                if (lastChangedUser != null) {
-                    return lastChangedUser.getLoginName();
-                } else {
-                    return "---";
-                }
-            case 5:
-                if (lastChangedTime != null) {
-                    return lastChangedTime;
-                } else {
-                    return "---";
-                }
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        validityCheck();
-
-        switch (columnIndex) {
-            case 0:
-                return String.class;
-            case 1:
-                return String.class;
-            case 2:
-                return Integer.class;
-            case 3:
-                return Boolean.class;
-            case 4:
-                return String.class;
-            case 5:
-                return Object.class;
-            default:
-                return String.class;
-        }
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        validityCheck();
-
-        switch (column) {
-            case 0:
-                return "Name";
-            case 1:
-                return "Type";
-            case 2:
-                return "Version";
-            case 3:
-                return "Locked";
-            case 4:
-                return "User";
-            case 5:
-                return "Mod. Time";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-
-    public void setParamSets(List<ParameterSet> paramSets) {
-        this.paramSets = paramSets;
-        fireTableDataChanged();
-    }
-
-    public boolean add(ParameterSet e) {
-        boolean added = paramSets.add(e);
-        fireTableDataChanged();
-        return added;
-    }
-
-    public boolean remove(ParameterSet paramSet) {
-        boolean removed = paramSets.remove(paramSet);
-        fireTableDataChanged();
-        return removed;
-    }
-
-    public ParameterSet remove(int index) {
-        ParameterSet removed = paramSets.remove(index);
-        fireTableDataChanged();
-        return removed;
-    }
-
-    public List<ParameterSet> getParamSets() {
-        return paramSets;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetsViewEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetsViewEditPanel.java
deleted file mode 100644
index 5fbe0b2..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterSetsViewEditPanel.java
+++ /dev/null
@@ -1,377 +0,0 @@
-package gov.nasa.ziggy.ui.config.parameters;
-
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.ParameterSetDescriptor;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.PipelineUIException;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.config.AbstractClonableViewEditPanel;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-import gov.nasa.ziggy.ui.proxy.ParameterSetCrudProxy;
-import gov.nasa.ziggy.ui.proxy.ParametersOperationsProxy;
-import gov.nasa.ziggy.ui.proxy.PipelineOperationsProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetsViewEditPanel extends AbstractClonableViewEditPanel {
-    private static final Logger log = LoggerFactory.getLogger(ParameterSetsViewEditPanel.class);
-
-    // do NOT init to null!
-    // (see getTableModel)
-    private ParameterSetsTableModel parameterSetsTableModel;
-
-    private final ParameterSetCrudProxy parameterSetCrud;
-
-    private JButton reportButton;
-    private JButton importButton;
-    private JButton exportButton;
-
-    private static String defaultParamLibImportExportPath = null;
-
-    public ParameterSetsViewEditPanel() throws PipelineUIException {
-        super(true, true);
-
-        parameterSetCrud = new ParameterSetCrudProxy();
-
-        initGUI();
-
-        getButtonPanel().add(getReportButton());
-        getButtonPanel().add(getImportButton());
-        getButtonPanel().add(getExportButton());
-    }
-
-    private void reportButtonActionPerformed(ActionEvent evt) {
-        log.debug("reportButton.actionPerformed, event=" + evt);
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        Object[] options = { "Formatted", "Colon-delimited" };
-        int n = ZiggyGuiConsole.showOptionDialog("Specify report type", "ReportType",
-            JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options,
-            options[0]);
-
-        boolean csvMode = (n == 0) == false;
-
-        PipelineOperationsProxy ops = new PipelineOperationsProxy();
-        String report = ops.generateParameterLibraryReport(csvMode);
-
-        ZiggyGuiConsole.showReport(report);
-    }
-
-    private void importButtonActionPerformed(ActionEvent evt) {
-        log.debug("importButton.actionPerformed, event=" + evt);
-
-        try {
-            JFileChooser fc = new JFileChooser(defaultParamLibImportExportPath);
-
-            fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-            fc.setDialogTitle("Select parameter library file to import");
-
-            int returnVal = fc.showDialog(this, "Import");
-
-            if (returnVal == JFileChooser.APPROVE_OPTION) {
-                File file = fc.getSelectedFile();
-                defaultParamLibImportExportPath = file.getAbsolutePath();
-
-                ParametersOperationsProxy paramsOps = new ParametersOperationsProxy();
-                List<ParameterSetDescriptor> dryRunResults = paramsOps
-                    .importParameterLibrary(file.getAbsolutePath(), null, true);
-
-                List<String> excludeList = ZiggyGuiConsole.selectParamSet(dryRunResults);
-
-                if (excludeList != null) { // null means user cancelled
-                    paramsOps.importParameterLibrary(file.getAbsolutePath(), excludeList, false);
-                }
-            }
-        } catch (Exception e) {
-            log.warn("caught e = ", e);
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void exportButtonActionPerformed(ActionEvent evt) {
-        log.debug("exportButton.actionPerformed, event=" + evt);
-
-        try {
-            JFileChooser fc = new JFileChooser(defaultParamLibImportExportPath);
-            fc.setDialogTitle("Select the destination file for the parameter library export");
-
-            fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-
-            int returnVal = fc.showDialog(this, "Export");
-
-            if (returnVal == JFileChooser.APPROVE_OPTION) {
-                File file = fc.getSelectedFile();
-                defaultParamLibImportExportPath = file.getAbsolutePath();
-
-                ParametersOperationsProxy paramsOps = new ParametersOperationsProxy();
-                // excludes not supported ATM
-                paramsOps.exportParameterLibrary(file.getAbsolutePath(), null, false);
-            }
-        } catch (Exception e) {
-            log.warn("caught e = ", e);
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    @Override
-    protected AbstractTableModel getTableModel() throws PipelineUIException {
-        log.debug("getTableModel() - start");
-
-        if (parameterSetsTableModel == null) {
-            parameterSetsTableModel = new ParameterSetsTableModel();
-            parameterSetsTableModel.register();
-        }
-
-        log.debug("getTableModel() - end");
-        return parameterSetsTableModel;
-    }
-
-    @Override
-    protected void doNew() {
-        log.debug("doNew() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        ParameterSet newParameterSet = ParameterSetNewDialog.createParameterSet();
-
-        if (newParameterSet == null) {
-            // user cancelled
-            return;
-        }
-        ParameterSetCrudProxy paramSetCrud = new ParameterSetCrudProxy();
-        paramSetCrud.save(newParameterSet);
-        parameterSetsTableModel.loadFromDatabase();
-
-        log.debug("doNew() - end");
-    }
-
-    @Override
-    protected void doClone(int row) {
-        log.debug("doClone() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        ParameterSet selectedParameterSet = parameterSetsTableModel.getParamSetAtRow(row);
-
-        try {
-            String newParameterSetName = ZiggyGuiConsole.showInputDialog(
-                "Enter the name for the new Parameter Set", "New Parameter Set",
-                JOptionPane.PLAIN_MESSAGE);
-
-            if (newParameterSetName == null || newParameterSetName.length() == 0) {
-                MessageUtil.showError(this, "Please enter a Parameter Set name");
-                return;
-            }
-
-            ParameterSet newParameterSet = new ParameterSet(selectedParameterSet);
-            newParameterSet.rename(newParameterSetName);
-
-            showEditDialog(newParameterSet, true);
-
-            parameterSetsTableModel.loadFromDatabase();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doClone() - end");
-    }
-
-    @Override
-    protected void doRename(int row) {
-        log.debug("doRename() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        ParameterSet selectedParameterSet = parameterSetsTableModel.getParamSetAtRow(row);
-
-        try {
-            String newParameterSetName = ZiggyGuiConsole.showInputDialog(
-                "Enter the new name for this Parameter Set", "Rename Parameter Set",
-                JOptionPane.PLAIN_MESSAGE);
-
-            if (newParameterSetName == null || newParameterSetName.length() == 0) {
-                MessageUtil.showError(this, "Please enter a Parameter Set name");
-                return;
-            }
-
-            parameterSetCrud.rename(selectedParameterSet, newParameterSetName);
-            parameterSetsTableModel.loadFromDatabase();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doRename() - end");
-    }
-
-    @Override
-    protected void doEdit(int row) {
-        log.debug("doEdit(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        ParameterSet parameterSet = parameterSetsTableModel.getParamSetAtRow(row);
-        showEditDialog(parameterSet, false);
-
-        log.debug("doEdit(int) - end");
-    }
-
-    @Override
-    protected void doRefresh() {
-        try {
-            parameterSetsTableModel.loadFromDatabase();
-        } catch (Exception e) {
-            log.error("showEditDialog(User)", e);
-
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    @Override
-    protected void doDelete(int row) {
-        log.debug("doDelete(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        ParameterSet parameterSet = parameterSetsTableModel.getParamSetAtRow(row);
-
-        if (!parameterSet.isLocked()) {
-            int choice = JOptionPane.showConfirmDialog(this,
-                "Are you sure you want to delete Parameter Set '" + parameterSet.getName() + "'?");
-
-            if (choice == JOptionPane.YES_OPTION) {
-                try {
-                    parameterSetCrud.delete(parameterSet);
-                    parameterSetsTableModel.loadFromDatabase();
-                } catch (Throwable e) {
-                    MessageUtil.showError(this, e);
-                }
-            }
-        } else {
-            MessageUtil.showError(this,
-                "Can't delete a locked parameter set. Parameter sets are locked"
-                    + "when referenced by a pipeline instance");
-        }
-
-        log.debug("doDelete(int) - end");
-    }
-
-    @Override
-    protected String getEditMenuText() {
-        return "Edit selected Parameter Set...";
-    }
-
-    @Override
-    protected String getNewMenuText() {
-        return "Create new Parameter Set...";
-    }
-
-    @Override
-    protected String getDeleteMenuText() {
-        return "Delete selected Parameter Set...";
-    }
-
-    @Override
-    protected String getCloneMenuText() {
-        return "Clone selected Parameter Set";
-    }
-
-    @Override
-    protected String getRenameMenuText() {
-        return "Rename selected Parameter Set";
-    }
-
-    private void showEditDialog(ParameterSet module, boolean isNew) {
-        log.debug("showEditDialog() - start");
-
-        try {
-            ParameterSetEditDialog inst = ZiggyGuiConsole.newParameterSetEditDialog(module, isNew);
-            inst.setVisible(true);
-
-            if (!inst.isCancelled()) {
-                parameterSetsTableModel.loadFromDatabase();
-            }
-        } catch (Exception e) {
-            log.error("showEditDialog(User)", e);
-
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("showEditDialog() - end");
-    }
-
-    private JButton getReportButton() {
-        if (reportButton == null) {
-            reportButton = new JButton();
-            reportButton.setText("report");
-            reportButton.addActionListener(this::reportButtonActionPerformed);
-        }
-        return reportButton;
-    }
-
-    private JButton getImportButton() {
-        if (importButton == null) {
-            importButton = new JButton();
-            importButton.setText("import");
-            importButton.addActionListener(this::importButtonActionPerformed);
-        }
-
-        return importButton;
-    }
-
-    private JButton getExportButton() {
-        if (exportButton == null) {
-            exportButton = new JButton();
-            exportButton.setText("export");
-            exportButton.addActionListener(this::exportButtonActionPerformed);
-        }
-
-        return exportButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineDefinitionListModel.java b/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineDefinitionListModel.java
deleted file mode 100644
index ddf26cd..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineDefinitionListModel.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package gov.nasa.ziggy.ui.config.pipeline;
-
-import java.util.List;
-
-import javax.swing.ComboBoxModel;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseListModel;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class PipelineDefinitionListModel extends AbstractDatabaseListModel<PipelineDefinition>
-    implements ComboBoxModel<PipelineDefinition> {
-    private List<PipelineDefinition> pipelineDefinitions = null;
-    private PipelineDefinition selectedPipelineDefinition = null;
-    PipelineDefinitionCrudProxy pipelineDefinitionCrud = new PipelineDefinitionCrudProxy();
-
-    public PipelineDefinitionListModel() {
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        if (pipelineDefinitions != null) {
-            pipelineDefinitionCrud.evictAll(pipelineDefinitions);
-        }
-
-        pipelineDefinitions = pipelineDefinitionCrud.retrieveLatestVersions();
-
-        if (pipelineDefinitions.size() > 0) {
-            selectedPipelineDefinition = pipelineDefinitions.get(0);
-        }
-    }
-
-    @Override
-    public PipelineDefinition getElementAt(int index) {
-        validityCheck();
-        return pipelineDefinitions.get(index);
-    }
-
-    @Override
-    public int getSize() {
-        validityCheck();
-        return pipelineDefinitions.size();
-    }
-
-    @Override
-    public Object getSelectedItem() {
-        validityCheck();
-        return selectedPipelineDefinition;
-    }
-
-    @Override
-    public void setSelectedItem(Object anItem) {
-        validityCheck();
-        selectedPipelineDefinition = (PipelineDefinition) anItem;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineEditDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineEditDialog.java
deleted file mode 100644
index 9ba75e6..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineEditDialog.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package gov.nasa.ziggy.ui.config.pipeline;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.Group;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-
-/**
- * Allows editing a new or existing {@link PipelineDefinition}, including selecting an optional
- * {@link Parameters} class and editing its properties.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class PipelineEditDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(PipelineEditDialog.class);
-
-    private JPanel dataPanel;
-    private JPanel buttonPanel;
-    private JTextField nameText;
-    private JTextArea descText;
-    private JScrollPane descScrollPane;
-    private JLabel metadataLabel;
-    private JLabel descLabel;
-    private JLabel nameLabel;
-    private JButton cancelButton;
-    private JButton saveButton;
-
-    private final PipelineDefinition pipelineDef;
-
-    private final PipelineDefinitionCrudProxy pipelineDefinitionCrud;
-    private JTextField groupNameTextField;
-    private JLabel groupLabel;
-
-    public PipelineEditDialog(JFrame frame, PipelineDefinition pipeline) {
-        super(frame, "Edit Pipeline " + pipeline.getName(), true);
-        pipelineDef = pipeline;
-
-        pipelineDefinitionCrud = new PipelineDefinitionCrudProxy();
-        initGUI();
-    }
-
-    private void initGUI() {
-        log.debug("initGUI() - start");
-
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            getContentPane().setLayout(thisLayout);
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            this.setSize(500, 300);
-        } catch (Exception e) {
-            log.error("initGUI()", e);
-
-            e.printStackTrace();
-        }
-
-        log.debug("initGUI() - end");
-    }
-
-    private void saveButtonActionPerformed() {
-        log.debug("saveButtonActionPerformed(ActionEvent) - start");
-
-        try {
-            PipelineDefinition newPipelineDef;
-
-            if (pipelineDef.isLocked()) {
-                // pipeline definition is locked, so make a new version
-                newPipelineDef = pipelineDef.newVersion();
-            } else {
-                // just update the existing instance
-                newPipelineDef = pipelineDef;
-            }
-
-            // newPipelineDef.setName(nameText.getText());
-            newPipelineDef.setDescription(descText.getText());
-
-            pipelineDefinitionCrud.save(newPipelineDef);
-            setVisible(false);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("saveButtonActionPerformed(ActionEvent) - end");
-    }
-
-    private void cancelButtonActionPerformed() {
-        log.debug("cancelButtonActionPerformed(ActionEvent) - start");
-
-        setVisible(false);
-
-        log.debug("cancelButtonActionPerformed(ActionEvent) - end");
-    }
-
-    private JPanel getDataPanel() {
-        log.debug("getDataPanel() - start");
-
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                0.1, 0.1, 0.1, 0.1 };
-            dataPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanelLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7, 7, 7 };
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getNameLabel(),
-                new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getNameText(),
-                new GridBagConstraints(2, 1, 9, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getDescLabel(),
-                new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getDescScrollPane(),
-                new GridBagConstraints(2, 3, 9, 3, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getMetadataLabel(),
-                new GridBagConstraints(1, 7, 11, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            dataPanel.add(getGroupLabel(),
-                new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getGroupNameTextField(),
-                new GridBagConstraints(2, 2, 9, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        }
-
-        log.debug("getDataPanel() - end");
-        return dataPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        log.debug("getButtonPanel() - start");
-
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(40);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getSaveButton());
-            buttonPanel.add(getCancelButton());
-        }
-
-        log.debug("getButtonPanel() - end");
-        return buttonPanel;
-    }
-
-    private JButton getSaveButton() {
-        log.debug("getSaveButton() - start");
-
-        if (saveButton == null) {
-            saveButton = new JButton();
-            saveButton.setText("Save Changes");
-            saveButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                saveButtonActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getSaveButton() - end");
-        return saveButton;
-    }
-
-    private JButton getCancelButton() {
-        log.debug("getCancelButton() - start");
-
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                cancelButtonActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getCancelButton() - end");
-        return cancelButton;
-    }
-
-    private JLabel getNameLabel() {
-        log.debug("getNameLabel() - start");
-
-        if (nameLabel == null) {
-            nameLabel = new JLabel();
-            nameLabel.setText("Name");
-        }
-
-        log.debug("getNameLabel() - end");
-        return nameLabel;
-    }
-
-    private JTextField getNameText() {
-        log.debug("getNameText() - start");
-
-        if (nameText == null) {
-            nameText = new JTextField(pipelineDef.getName().toString());
-            nameText.setEditable(false);
-        }
-
-        log.debug("getNameText() - end");
-        return nameText;
-    }
-
-    private JLabel getDescLabel() {
-        log.debug("getDescLabel() - start");
-
-        if (descLabel == null) {
-            descLabel = new JLabel();
-            descLabel.setText("Desc.");
-        }
-
-        log.debug("getDescLabel() - end");
-        return descLabel;
-    }
-
-    private JScrollPane getDescScrollPane() {
-        log.debug("getDescScrollPane() - start");
-
-        if (descScrollPane == null) {
-            descScrollPane = new JScrollPane();
-            descScrollPane.setViewportView(getDescText());
-        }
-
-        log.debug("getDescScrollPane() - end");
-        return descScrollPane;
-    }
-
-    private JTextArea getDescText() {
-        log.debug("getDescText() - start");
-
-        if (descText == null) {
-            descText = new JTextArea();
-            descText.setText(pipelineDef.getDescription());
-        }
-
-        log.debug("getDescText() - end");
-        return descText;
-    }
-
-    private JLabel getMetadataLabel() {
-        log.debug("getMetadataLabel() - start");
-
-        if (metadataLabel == null) {
-            metadataLabel = new JLabel();
-            metadataLabel.setText("ID: xxx Created 1/1/2005 12:00:00 by admin");
-            metadataLabel.setFont(new java.awt.Font("Dialog", 2, 12));
-        }
-
-        log.debug("getMetadataLabel() - end");
-        return metadataLabel;
-    }
-
-    private JLabel getGroupLabel() {
-        if (groupLabel == null) {
-            groupLabel = new JLabel();
-            groupLabel.setText("Group");
-        }
-        return groupLabel;
-    }
-
-    private JTextField getGroupNameTextField() {
-        if (groupNameTextField == null) {
-            groupNameTextField = new JTextField();
-            Group groupName = pipelineDef.getGroup();
-            if (groupName != null) {
-                groupNameTextField.setText(groupName.toString());
-            } else {
-                groupNameTextField.setText("<default>");
-            }
-            groupNameTextField.setEditable(false);
-        }
-        return groupNameTextField;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineNodesTableModel.java b/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineNodesTableModel.java
deleted file mode 100644
index b383531..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineNodesTableModel.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gov.nasa.ziggy.ui.config.pipeline;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class PipelineNodesTableModel extends AbstractDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(PipelineNodesTableModel.class);
-
-    private static class NodeWrapper {
-        public PipelineDefinitionNode node;
-        public PipelineDefinitionNode predecessorNode;
-        public String predecessorId;
-
-        public NodeWrapper(PipelineDefinitionNode node, PipelineDefinitionNode predecessorNode) {
-            this.node = node;
-            this.predecessorNode = predecessorNode;
-            if (predecessorNode != null) {
-                predecessorId = predecessorNode.getId() + "";
-            } else {
-                predecessorId = "START";
-            }
-        }
-    }
-
-    private final PipelineDefinition pipeline;
-    private List<NodeWrapper> pipelineNodes = new LinkedList<>();
-
-    public PipelineNodesTableModel(PipelineDefinition pipeline) {
-        this.pipeline = pipeline;
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        log.debug("loadFromDatabase() - start");
-
-        try {
-            pipelineNodes = new LinkedList<>();
-
-            // TODO: currently only supports one root node
-            PipelineDefinitionNode rootNode = pipeline.getRootNodes().get(0);
-            pipelineNodes.add(new NodeWrapper(rootNode, null));
-            addChildren(pipelineNodes, rootNode);
-        } catch (ConsoleSecurityException ignore) {
-        }
-        fireTableDataChanged();
-
-        log.debug("loadFromDatabase() - end");
-    }
-
-    /**
-     * @param list
-     * @param node
-     */
-    private void addChildren(List<NodeWrapper> list, PipelineDefinitionNode node) {
-        for (PipelineDefinitionNode childNode : node.getNextNodes()) {
-            list.add(new NodeWrapper(childNode, node));
-            addChildren(list, childNode);
-        }
-    }
-
-    public PipelineDefinitionNode getPipelineNodeAtRow(int rowIndex) {
-        validityCheck();
-        return pipelineNodes.get(rowIndex).node;
-    }
-
-    public PipelineDefinitionNode getPredecessorForNodeAtRow(int rowIndex) {
-        validityCheck();
-        return pipelineNodes.get(rowIndex).predecessorNode;
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return pipelineNodes.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 3;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-
-        NodeWrapper nodeWrapper = pipelineNodes.get(rowIndex);
-
-        switch (columnIndex) {
-            case 0:
-                return nodeWrapper.node.getId();
-            case 1:
-                return nodeWrapper.node.getModuleName();
-            case 2:
-                return nodeWrapper.predecessorId;
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        return String.class;
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "ID";
-            case 1:
-                return "Module Name";
-            case 2:
-                return "Predecessor";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesChangeListener.java b/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesChangeListener.java
deleted file mode 100644
index 97aaae6..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesChangeListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package gov.nasa.ziggy.ui.config.pipeline;
-
-public interface PipelinesChangeListener {
-    void changed();
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesContainerNode.java b/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesContainerNode.java
deleted file mode 100644
index 7ad8312..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesContainerNode.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package gov.nasa.ziggy.ui.config.pipeline;
-
-import java.util.Collection;
-import java.util.LinkedList;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.PipelineUIException;
-import gov.nasa.ziggy.ui.config.TreeContainerNode;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-public class PipelinesContainerNode extends TreeContainerNode {
-    private final PipelineDefinitionCrudProxy pipelineDefinitionCrud;
-
-    public PipelinesContainerNode() {
-        super("Pipelines");
-        pipelineDefinitionCrud = new PipelineDefinitionCrudProxy();
-    }
-
-    public void load() {
-    }
-
-    @Override
-    public void expand(DefaultTreeModel model, DefaultMutableTreeNode node)
-        throws PipelineUIException {
-        if (!loaded) {
-            deleteAllChildren(model, node);
-
-            int index = 0;
-            Collection<PipelineDefinition> pipelinesCollection = new LinkedList<>();
-            try {
-                // TODO: update when pipelines are added/deleted, or when the db session is
-                // invalidated
-                try {
-                    pipelinesCollection = pipelineDefinitionCrud.retrieveLatestVersions();
-                } catch (ConsoleSecurityException ignore) {
-                }
-            } catch (Throwable e) {
-                throw new PipelineUIException("Failed to retrieve Pipeline list from datastore.",
-                    e);
-            }
-
-            for (PipelineDefinition pipeline : pipelinesCollection) {
-                DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(pipeline);
-                model.insertNodeInto(newNode, node, index++);
-            }
-
-            loaded = true;
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesTableModel.java b/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesTableModel.java
deleted file mode 100644
index 88117dc..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesTableModel.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package gov.nasa.ziggy.ui.config.pipeline;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.AuditInfo;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.services.security.User;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-
-@SuppressWarnings("serial")
-public class PipelinesTableModel extends AbstractDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(PipelinesTableModel.class);
-
-    private List<PipelineDefinition> pipelines = new LinkedList<>();
-    private final PipelineDefinitionCrudProxy pipelineDefinitionCrud;
-
-    public PipelinesTableModel() {
-        pipelineDefinitionCrud = new PipelineDefinitionCrudProxy();
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        log.debug("loadFromDatabase() - start");
-
-        if (pipelines != null) {
-            pipelineDefinitionCrud.evictAll(pipelines);
-        }
-
-        try {
-            pipelines = pipelineDefinitionCrud.retrieveLatestVersions();
-        } catch (ConsoleSecurityException ignore) {
-        }
-
-        fireTableDataChanged();
-
-        log.debug("loadFromDatabase() - end");
-    }
-
-    public PipelineDefinition getPipelineAtRow(int rowIndex) {
-        validityCheck();
-        return pipelines.get(rowIndex);
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return pipelines.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 6;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-
-        PipelineDefinition pipeline = pipelines.get(rowIndex);
-
-        AuditInfo auditInfo = pipeline.getAuditInfo();
-
-        User lastChangedUser = null;
-        Date lastChangedTime = null;
-
-        if (auditInfo != null) {
-            lastChangedUser = auditInfo.getLastChangedUser();
-            lastChangedTime = auditInfo.getLastChangedTime();
-        }
-
-        switch (columnIndex) {
-            case 0:
-                return pipeline.getId();
-            case 1:
-                return pipeline.getName();
-            case 2:
-                return pipeline.getVersion();
-            case 3:
-                return pipeline.isLocked();
-            case 4:
-                if (lastChangedUser != null) {
-                    return lastChangedUser.getLoginName();
-                } else {
-                    return "---";
-                }
-            case 5:
-                if (lastChangedTime != null) {
-                    return lastChangedTime;
-                } else {
-                    return "---";
-                }
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return Long.class;
-            case 1:
-                return String.class;
-            case 2:
-                return Integer.class;
-            case 3:
-                return Boolean.class;
-            case 4:
-                return String.class;
-            case 5:
-                return Object.class;
-            default:
-                return String.class;
-        }
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "ID";
-            case 1:
-                return "Name";
-            case 2:
-                return "Version";
-            case 3:
-                return "Locked";
-            case 4:
-                return "User";
-            case 5:
-                return "Mod. Time";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-
-    @Override
-    public boolean isCellEditable(int row, int col) {
-        return false;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesViewEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesViewEditPanel.java
deleted file mode 100644
index c05845e..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelinesViewEditPanel.java
+++ /dev/null
@@ -1,365 +0,0 @@
-package gov.nasa.ziggy.ui.config.pipeline;
-
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.Group;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.PipelineUIException;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.config.AbstractClonableViewEditPanel;
-import gov.nasa.ziggy.ui.config.group.GroupSelectorDialog;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class PipelinesViewEditPanel extends AbstractClonableViewEditPanel {
-    private static final Logger log = LoggerFactory.getLogger(PipelinesViewEditPanel.class);
-
-    private PipelinesTableModel pipelinesTableModel; // do NOT init to null! (see getTableModel)
-    private final PipelineDefinitionCrudProxy pipelineDefinitionCrud;
-
-    private JMenuItem versionMenuItem;
-
-    private JMenuItem groupMenuItem;
-
-    public PipelinesViewEditPanel() throws PipelineUIException {
-        super(true, true);
-
-        pipelineDefinitionCrud = new PipelineDefinitionCrudProxy();
-
-        initGUI();
-
-        JPopupMenu menu = getPopupMenu();
-        menu.add(getVersionMenuItem());
-        menu.add(getGroupMenuItem());
-    }
-
-    @Override
-    protected void doNew() {
-        log.debug("doNew() - start");
-
-        try {
-            String newPipelineName = ZiggyGuiConsole.showInputDialog(
-                "Enter the name for the new Pipeline Definition", "New Pipeline Definition",
-                JOptionPane.PLAIN_MESSAGE);
-
-            if (newPipelineName == null || newPipelineName.length() == 0) {
-                MessageUtil.showError(this, "Please enter a pipeline name");
-                return;
-            }
-
-            showEditDialog(new PipelineDefinition(newPipelineName));
-
-            pipelinesTableModel.loadFromDatabase();
-
-            ZiggyGuiConsole.reloadConfigTreeModel();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doNew() - end");
-    }
-
-    @Override
-    protected void doClone(int row) {
-        log.debug("doClone() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        PipelineDefinition selectedPipeline = pipelinesTableModel.getPipelineAtRow(row);
-
-        try {
-            String newPipelineName = ZiggyGuiConsole.showInputDialog(
-                "Enter the name for the new Pipeline Definition", "New Pipeline Definition",
-                JOptionPane.PLAIN_MESSAGE);
-
-            if (newPipelineName == null || newPipelineName.length() == 0) {
-                MessageUtil.showError(this, "Please enter a pipeline name");
-                return;
-            }
-
-            PipelineDefinition newPipelineDefinition = new PipelineDefinition(selectedPipeline);
-            newPipelineDefinition.rename(newPipelineName);
-
-            showEditDialog(newPipelineDefinition);
-
-            pipelinesTableModel.loadFromDatabase();
-
-            ZiggyGuiConsole.reloadConfigTreeModel();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doClone() - end");
-    }
-
-    @Override
-    protected void doRename(int row) {
-        log.debug("doRename() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        PipelineDefinition selectedPipeline = pipelinesTableModel.getPipelineAtRow(row);
-
-        try {
-            String newPipelineName = ZiggyGuiConsole.showInputDialog(
-                "Enter the new name for this Pipeline Definition", "Rename Pipeline Definition",
-                JOptionPane.PLAIN_MESSAGE);
-
-            if (newPipelineName == null || newPipelineName.length() == 0) {
-                MessageUtil.showError(this, "Please enter a pipeline name");
-                return;
-            }
-
-            pipelineDefinitionCrud.rename(selectedPipeline, newPipelineName);
-            pipelinesTableModel.loadFromDatabase();
-
-            ZiggyGuiConsole.reloadConfigTreeModel();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doRename() - end");
-    }
-
-    private void doVersion(int row) {
-        log.debug("doVersion() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        PipelineDefinition selectedPipeline = pipelinesTableModel.getPipelineAtRow(row);
-
-        try {
-            PipelineDefinition newPipelineDefinition = selectedPipeline.newVersion();
-
-            PipelineDefinitionCrudProxy pipelineDefCrud = new PipelineDefinitionCrudProxy();
-            pipelineDefCrud.save(newPipelineDefinition);
-
-            pipelinesTableModel.loadFromDatabase();
-
-            ZiggyGuiConsole.reloadConfigTreeModel();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doVersion() - end");
-    }
-
-    private void doGroup(int row) {
-        log.debug("doGroup() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        try {
-            PipelineDefinition selectedPipeline = pipelinesTableModel.getPipelineAtRow(row);
-            Group selectedGroup = GroupSelectorDialog.selectGroup();
-
-            if (selectedGroup != null) {
-                selectedPipeline.setGroup(selectedGroup);
-                PipelineDefinitionCrudProxy pipelineDefCrud = new PipelineDefinitionCrudProxy();
-                pipelineDefCrud.saveChanges(selectedPipeline);
-            }
-
-            pipelinesTableModel.loadFromDatabase();
-
-            ZiggyGuiConsole.reloadConfigTreeModel();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doGroup() - end");
-    }
-
-    @Override
-    protected void doEdit(int row) {
-        log.debug("doEdit(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        showEditDialog(pipelinesTableModel.getPipelineAtRow(row));
-
-        pipelinesTableModel.loadFromDatabase();
-
-        log.debug("doEdit(int) - end");
-    }
-
-    @Override
-    protected void doDelete(int row) {
-        log.debug("doDelete(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        PipelineDefinition pipeline = pipelinesTableModel.getPipelineAtRow(row);
-
-        if (!pipeline.isLocked()) {
-            int choice = JOptionPane.showConfirmDialog(this,
-                "Are you sure you want to delete pipeline '" + pipeline.getName() + "'?");
-
-            if (choice == JOptionPane.YES_OPTION) {
-                try {
-                    pipelineDefinitionCrud.deletePipeline(pipeline);
-                    pipelinesTableModel.loadFromDatabase();
-                    ZiggyGuiConsole.reloadConfigTreeModel();
-                } catch (Exception e) {
-                    MessageUtil.showError(this, e);
-                }
-            }
-        } else {
-            JOptionPane.showMessageDialog(this,
-                "Can't delete a locked pipeline definition.  Pipeline definitions are locked when referenced by a pipeline instance",
-                "Error", JOptionPane.ERROR_MESSAGE);
-        }
-
-        log.debug("doDelete(int) - end");
-    }
-
-    @Override
-    protected void doRefresh() {
-        try {
-            pipelinesTableModel.loadFromDatabase();
-            ZiggyGuiConsole.reloadConfigTreeModel();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void showEditDialog(PipelineDefinition pipeline) {
-        log.debug("showEditDialog() - start");
-
-        try {
-            PipelineEditDialog inst = ZiggyGuiConsole.newPipelineEditDialog(pipeline);
-
-            inst.setVisible(true);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("showEditDialog() - end");
-    }
-
-    @Override
-    protected AbstractTableModel getTableModel() throws PipelineUIException {
-        log.debug("getTableModel() - start");
-
-        if (pipelinesTableModel == null) {
-            pipelinesTableModel = new PipelinesTableModel();
-            pipelinesTableModel.register();
-        }
-
-        log.debug("getTableModel() - end");
-        return pipelinesTableModel;
-    }
-
-    private JMenuItem getVersionMenuItem() {
-        log.debug("getversionMenuItem() - start");
-
-        if (versionMenuItem == null) {
-            versionMenuItem = new JMenuItem();
-            versionMenuItem.setText("New version of selected pipeline (unlock)...");
-            versionMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                versionMenuItemActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getVersionMenuItem() - end");
-        return versionMenuItem;
-    }
-
-    private void versionMenuItemActionPerformed() {
-        doVersion(selectedModelRow);
-    }
-
-    private JMenuItem getGroupMenuItem() {
-        log.debug("getGroupMenuItem() - start");
-
-        if (groupMenuItem == null) {
-            groupMenuItem = new JMenuItem();
-            groupMenuItem.setText("Set Group...");
-            groupMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                groupMenuItemActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getGroupMenuItem() - end");
-        return groupMenuItem;
-    }
-
-    private void groupMenuItemActionPerformed() {
-        doGroup(selectedModelRow);
-    }
-
-    @Override
-    protected String getEditMenuText() {
-        return "Edit selected Pipeline...";
-    }
-
-    @Override
-    protected String getNewMenuText() {
-        return "New Pipeline...";
-    }
-
-    @Override
-    protected String getDeleteMenuText() {
-        return "Delete selected Pipeline...";
-    }
-
-    @Override
-    protected String getCloneMenuText() {
-        return "Clone selected Pipeline...";
-    }
-
-    @Override
-    protected String getRenameMenuText() {
-        return "Rename selected pipeline...";
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/security/RolesTableModel.java b/src/main/java/gov/nasa/ziggy/ui/config/security/RolesTableModel.java
deleted file mode 100644
index de76ee6..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/security/RolesTableModel.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package gov.nasa.ziggy.ui.config.security;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.security.Role;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.UserCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class RolesTableModel extends AbstractDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(RolesTableModel.class);
-
-    private List<Role> roles = new LinkedList<>();
-    private final UserCrudProxy userCrud;
-
-    public RolesTableModel() {
-        userCrud = new UserCrudProxy();
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        log.debug("loadFromDatabase() - start");
-
-        if (roles != null) {
-            userCrud.evictAll(roles);
-        }
-
-        try {
-            roles = userCrud.retrieveAllRoles();
-        } catch (ConsoleSecurityException ignore) {
-        }
-
-        fireTableDataChanged();
-
-        log.debug("loadFromDatabase() - end");
-    }
-
-    public Role getRoleAtRow(int rowIndex) {
-        validityCheck();
-        return roles.get(rowIndex);
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return roles.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 2;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-
-        Role role = roles.get(rowIndex);
-
-        switch (columnIndex) {
-            case 0:
-                return role.getName();
-            case 1:
-                return getPrivilegeList(role);
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    private String getPrivilegeList(Role role) {
-        StringBuilder privList = new StringBuilder();
-        boolean first = true;
-
-        for (String privilege : role.getPrivileges()) {
-            if (!first) {
-                privList.append(", ");
-            }
-            first = false;
-            privList.append(privilege);
-        }
-        return privList.toString();
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        return String.class;
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Role";
-            case 1:
-                return "Privileges";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/security/RolesViewEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/security/RolesViewEditPanel.java
deleted file mode 100644
index 3ca046e..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/security/RolesViewEditPanel.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package gov.nasa.ziggy.ui.config.security;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.JOptionPane;
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.services.security.Role;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.PipelineUIException;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.DoubleListDialog;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.config.AbstractViewEditPanel;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-import gov.nasa.ziggy.ui.proxy.UserCrudProxy;
-
-@SuppressWarnings("serial")
-public class RolesViewEditPanel extends AbstractViewEditPanel {
-    private static final Logger log = LoggerFactory.getLogger(RolesViewEditPanel.class);
-
-    private RolesTableModel rolesTableModel; // do NOT init to null! (see getTableModel)
-
-    private final UserCrudProxy userCrud;
-
-    public RolesViewEditPanel() throws PipelineUIException {
-        userCrud = new UserCrudProxy();
-
-        initGUI();
-    }
-
-    @Override
-    protected AbstractTableModel getTableModel() throws PipelineUIException {
-        log.debug("getTableModel() - start");
-
-        if (rolesTableModel == null) {
-            rolesTableModel = new RolesTableModel();
-            rolesTableModel.register();
-        }
-
-        log.debug("getTableModel() - end");
-        return rolesTableModel;
-    }
-
-    @Override
-    protected void doNew() {
-        log.debug("doNew() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        String roleName = (String) ZiggyGuiConsole.showInputDialog("Enter a name for the new Role",
-            "New Role", JOptionPane.QUESTION_MESSAGE, null, null, "");
-
-        if (roleName != null && roleName.length() > 0) {
-            showEditDialog(new Role(roleName));
-        }
-
-        log.debug("doNew() - end");
-    }
-
-    @Override
-    protected void doEdit(int row) {
-        log.debug("doEdit(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        showEditDialog(rolesTableModel.getRoleAtRow(row));
-
-        log.debug("doEdit(int) - end");
-    }
-
-    @Override
-    protected void doDelete(int row) {
-        log.debug("doDelete(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        Role role = rolesTableModel.getRoleAtRow(row);
-
-        int choice = JOptionPane.showConfirmDialog(this,
-            "Are you sure you want to delete role '" + role.getName() + "'?");
-
-        if (choice == JOptionPane.YES_OPTION) {
-            try {
-                try {
-                    userCrud.deleteRole(role);
-                } catch (ConsoleSecurityException e) {
-                    MessageUtil.showError(this, e);
-                }
-
-                rolesTableModel.loadFromDatabase();
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-
-        log.debug("doDelete(int) - end");
-    }
-
-    @Override
-    protected void doRefresh() {
-        try {
-            rolesTableModel.loadFromDatabase();
-        } catch (Throwable e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void showEditDialog(Role role) {
-        log.debug("showEditDialog() - start");
-
-        try {
-            List<String> currentPrivs = role.getPrivileges();
-            List<String> availablePrivs = new LinkedList<>();
-            for (Privilege priv : Privilege.values()) {
-                if (!currentPrivs.contains(priv.toString())) {
-                    availablePrivs.add(priv.toString());
-                }
-            }
-
-            DoubleListDialog<String> privSelectionDialog = ZiggyGuiConsole.newDoubleListDialog(
-                "Privileges for Role " + role.getName(), "Available Privileges", availablePrivs,
-                "Selected Privileges", currentPrivs);
-            privSelectionDialog.setVisible(true);
-
-            if (privSelectionDialog.wasSavePressed()) {
-                List<String> selectedPrivs = privSelectionDialog.getSelectedListContents();
-                role.setPrivileges(selectedPrivs);
-                try {
-                    userCrud.saveRole(role);
-                } catch (ConsoleSecurityException e) {
-                    MessageUtil.showError(this, e);
-                }
-                rolesTableModel.loadFromDatabase();
-            }
-        } catch (Throwable e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("showEditDialog() - end");
-    }
-
-    @Override
-    protected String getEditMenuText() {
-        return "Edit selected role...";
-    }
-
-    @Override
-    protected String getNewMenuText() {
-        return "Add role...";
-    }
-
-    @Override
-    protected String getDeleteMenuText() {
-        return "Delete selected role...";
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/security/UserEditDialog.java b/src/main/java/gov/nasa/ziggy/ui/config/security/UserEditDialog.java
deleted file mode 100644
index 2c4ec1e..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/security/UserEditDialog.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package gov.nasa.ziggy.ui.config.security;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.WindowConstants;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.security.User;
-import gov.nasa.ziggy.ui.proxy.UserCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class UserEditDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(UserEditDialog.class);
-
-    private UserEditPanel userPanel;
-    private final User user;
-    private JButton cancelButton;
-    private JButton saveButton;
-    private JPanel buttonPanel;
-
-    private final UserCrudProxy userCrud;
-
-    public UserEditDialog(JFrame frame, User user) {
-        super(frame, true);
-        this.user = user;
-        userCrud = new UserCrudProxy();
-        initGUI();
-    }
-
-    public UserEditDialog(JFrame frame) {
-        super(frame, true);
-        user = new User();
-        userCrud = new UserCrudProxy();
-        initGUI();
-    }
-
-    private void initGUI() {
-        log.debug("initGUI() - start");
-
-        try {
-            // START >> this
-            BorderLayout thisLayout = new BorderLayout();
-            getContentPane().setLayout(thisLayout);
-            setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-            setTitle("Edit User " + user.getDisplayName());
-            // END << this
-            getContentPane().add(getUserPanel(), BorderLayout.CENTER);
-            getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            this.setSize(700, 483);
-        } catch (Exception e) {
-            log.error("initGUI()", e);
-
-            e.printStackTrace();
-        }
-
-        log.debug("initGUI() - end");
-    }
-
-    private void saveButtonActionPerformed() {
-        log.debug("saveButtonActionPerformed(ActionEvent) - start");
-        try {
-            userPanel.updateUser();
-            userCrud.saveUser(user);
-            setVisible(false);
-        } catch (Exception e) {
-            log.warn("caught e = ", e);
-            JOptionPane.showMessageDialog(this, e, "Error Saving User", JOptionPane.ERROR_MESSAGE);
-        }
-
-        log.debug("saveButtonActionPerformed(ActionEvent) - end");
-    }
-
-    private void cancelButtonActionPerformed() {
-        log.debug("cancelButtonActionPerformed(ActionEvent) - start");
-
-        setVisible(false);
-
-        log.debug("cancelButtonActionPerformed(ActionEvent) - end");
-    }
-
-    private UserEditPanel getUserPanel() {
-        log.debug("getUserPanel() - start");
-
-        if (userPanel == null) {
-            userPanel = new UserEditPanel(user);
-        }
-
-        log.debug("getUserPanel() - end");
-        return userPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        log.debug("getButtonPanel() - start");
-
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(40);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getSaveButton());
-            buttonPanel.add(getCancelButton());
-        }
-
-        log.debug("getButtonPanel() - end");
-        return buttonPanel;
-    }
-
-    private JButton getSaveButton() {
-        log.debug("getSaveButton() - start");
-
-        if (saveButton == null) {
-            saveButton = new JButton();
-            saveButton.setText("Save Changes");
-            saveButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                saveButtonActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getSaveButton() - end");
-        return saveButton;
-    }
-
-    private JButton getCancelButton() {
-        log.debug("getCancelButton() - start");
-
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                cancelButtonActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getCancelButton() - end");
-        return cancelButton;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        log.debug("main(String[]) - start");
-
-        JFrame frame = new JFrame();
-        UserEditDialog inst = new UserEditDialog(frame);
-        inst.setVisible(true);
-
-        log.debug("main(String[]) - end");
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/security/UsersTableModel.java b/src/main/java/gov/nasa/ziggy/ui/config/security/UsersTableModel.java
deleted file mode 100644
index c99df69..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/security/UsersTableModel.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package gov.nasa.ziggy.ui.config.security;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.security.User;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.UserCrudProxy;
-
-@SuppressWarnings("serial")
-public class UsersTableModel extends AbstractDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(UsersTableModel.class);
-
-    private List<User> users = new LinkedList<>();
-    private final UserCrudProxy userCrud;
-
-    public UsersTableModel() {
-        userCrud = new UserCrudProxy();
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        log.debug("loadFromDatabase() - start");
-
-        if (users != null) {
-            userCrud.evictAll(users);
-        }
-
-        try {
-            users = userCrud.retrieveAllUsers();
-        } catch (ConsoleSecurityException ignore) {
-        }
-
-        fireTableDataChanged();
-
-        log.debug("loadFromDatabase() - end");
-    }
-
-    public User getUserAtRow(int rowIndex) {
-        validityCheck();
-        return users.get(rowIndex);
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return users.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 2;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-
-        User user = users.get(rowIndex);
-
-        switch (columnIndex) {
-            case 0:
-                return user.getLoginName();
-            case 1:
-                return user.getDisplayName();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        return String.class;
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Login";
-            case 1:
-                return "Name";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/security/UsersViewEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/config/security/UsersViewEditPanel.java
deleted file mode 100644
index f144dc7..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/config/security/UsersViewEditPanel.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package gov.nasa.ziggy.ui.config.security;
-
-import javax.swing.JOptionPane;
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.services.security.User;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.PipelineUIException;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.config.AbstractViewEditPanel;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-import gov.nasa.ziggy.ui.proxy.UserCrudProxy;
-
-@SuppressWarnings("serial")
-public class UsersViewEditPanel extends AbstractViewEditPanel {
-    private static final Logger log = LoggerFactory.getLogger(UsersViewEditPanel.class);
-
-    private UsersTableModel usersTableModel; // do NOT init to null! (see getTableModel)
-    private final UserCrudProxy userCrud;
-
-    public UsersViewEditPanel() throws PipelineUIException {
-        userCrud = new UserCrudProxy();
-
-        initGUI();
-    }
-
-    @Override
-    protected AbstractTableModel getTableModel() throws PipelineUIException {
-        log.debug("getTableModel() - start");
-
-        if (usersTableModel == null) {
-            usersTableModel = new UsersTableModel();
-            usersTableModel.register();
-        }
-
-        log.debug("getTableModel() - end");
-        return usersTableModel;
-    }
-
-    @Override
-    protected void doNew() {
-        log.debug("doNew() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        showEditDialog(new User());
-
-        log.debug("doNew() - end");
-    }
-
-    @Override
-    protected void doEdit(int row) {
-        log.debug("doEdit(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        showEditDialog(usersTableModel.getUserAtRow(row));
-
-        log.debug("doEdit(int) - end");
-    }
-
-    @Override
-    protected void doDelete(int row) {
-        log.debug("doDelete(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        User user = usersTableModel.getUserAtRow(row);
-
-        int choice = JOptionPane.showConfirmDialog(this,
-            "Are you sure you want to delete user '" + user.getLoginName() + "'?");
-
-        if (choice == JOptionPane.YES_OPTION) {
-            try {
-                try {
-                    userCrud.deleteUser(user);
-                } catch (ConsoleSecurityException e) {
-                    MessageUtil.showError(this, e);
-                }
-                usersTableModel.loadFromDatabase();
-            } catch (Throwable e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-
-        log.debug("doDelete(int) - end");
-    }
-
-    @Override
-    protected void doRefresh() {
-        try {
-            usersTableModel.loadFromDatabase();
-        } catch (Throwable e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void showEditDialog(User user) {
-        log.debug("showEditDialog() - start");
-
-        UserEditDialog inst = ZiggyGuiConsole.newUserEditDialog(user);
-
-        log.debug("before visible");
-        inst.setVisible(true);
-        log.debug("after visible");
-        try {
-            usersTableModel.loadFromDatabase();
-        } catch (Exception e) {
-            log.error("showEditDialog(User)", e);
-
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("showEditDialog() - end");
-    }
-
-    @Override
-    protected String getEditMenuText() {
-        return "Edit selected user...";
-    }
-
-    @Override
-    protected String getNewMenuText() {
-        return "Add user...";
-    }
-
-    @Override
-    protected String getDeleteMenuText() {
-        return "Delete selected user...";
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/dr/DataReceiptInstanceDialog.java b/src/main/java/gov/nasa/ziggy/ui/dr/DataReceiptInstanceDialog.java
new file mode 100644
index 0000000..da9bd0d
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/dr/DataReceiptInstanceDialog.java
@@ -0,0 +1,185 @@
+package gov.nasa.ziggy.ui.dr;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REFRESH;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import gov.nasa.ziggy.data.management.DataReceiptFile;
+import gov.nasa.ziggy.data.management.DataReceiptInstance;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseModel;
+import gov.nasa.ziggy.ui.util.proxy.DataReceiptOperationsProxy;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * Displays detailed information on data receipt actions from a single instance.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class DataReceiptInstanceDialog extends JDialog {
+
+    private static final long serialVersionUID = 20230823L;
+    ZiggyTable<DataReceiptFile> ziggyTable;
+
+    public DataReceiptInstanceDialog(Window owner, DataReceiptInstance dataReceiptInstance) {
+        super(owner, ModalityType.MODELESS);
+        buildComponent(dataReceiptInstance);
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent(DataReceiptInstance dataReceiptInstance) {
+        setTitle("Data receipt details");
+
+        getContentPane().add(createDataPanel(dataReceiptInstance), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(createButton(REFRESH, this::refresh),
+            createButton(CLOSE, this::close)), BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private Component createDataPanel(DataReceiptInstance dataReceiptInstance) {
+
+        JLabel instance = boldLabel("Instance:");
+        JLabel instanceText = new JLabel(Long.toString(dataReceiptInstance.getInstanceId()));
+
+        JLabel date = boldLabel("Date:");
+        JLabel dateText = new JLabel(dataReceiptInstance.getDate().toString());
+
+        JLabel successful = boldLabel("Successful:");
+        JLabel successfulText = new JLabel(
+            Integer.toString(dataReceiptInstance.getSuccessfulImportCount()));
+
+        JLabel failed = boldLabel("Failed:");
+        JLabel failedText = new JLabel(
+            Integer.toString(dataReceiptInstance.getFailedImportCount()));
+
+        ziggyTable = new ZiggyTable<>(new DataReceiptInstanceTableModel(dataReceiptInstance));
+        for (int column = 0; column < DataReceiptInstanceTableModel.COLUMN_WIDTHS.length; column++) {
+            ziggyTable.setPreferredColumnWidth(column,
+                DataReceiptInstanceTableModel.COLUMN_WIDTHS[column]);
+        }
+        JScrollPane tableScrollPane = new JScrollPane(ziggyTable.getTable());
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(instance)
+                    .addComponent(date)
+                    .addComponent(successful)
+                    .addComponent(failed))
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(instanceText)
+                    .addComponent(dateText)
+                    .addComponent(successfulText)
+                    .addComponent(failedText)))
+            .addComponent(tableScrollPane));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(instance)
+                .addComponent(instanceText))
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(date).addComponent(dateText))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(successful)
+                .addComponent(successfulText))
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(failed).addComponent(failedText))
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(tableScrollPane));
+
+        return dataPanel;
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void refresh(ActionEvent evt) {
+        ziggyTable.loadFromDatabase();
+    }
+
+    private static class DataReceiptInstanceTableModel
+        extends AbstractDatabaseModel<DataReceiptFile> {
+
+        private static final long serialVersionUID = 20230823L;
+
+        private static final String[] COLUMN_NAMES = { "Task ID", "Name", "Type", "Status" };
+        private static final int[] COLUMN_WIDTHS = { 100, 500, 100, 100 };
+
+        private List<DataReceiptFile> dataReceiptFiles = new ArrayList<>();
+        private DataReceiptInstance dataReceiptInstance;
+
+        public DataReceiptInstanceTableModel(DataReceiptInstance dataReceiptInstance) {
+            this.dataReceiptInstance = dataReceiptInstance;
+            loadFromDatabase();
+        }
+
+        @Override
+        public int getRowCount() {
+            return dataReceiptFiles.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public String getColumnName(int columnIndex) {
+            return COLUMN_NAMES[columnIndex];
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            DataReceiptFile dataReceiptFile = dataReceiptFiles.get(rowIndex);
+            return switch (columnIndex) {
+                case 0 -> dataReceiptFile.getTaskId();
+                case 1 -> dataReceiptFile.getName();
+                case 2 -> dataReceiptFile.getFileType();
+                case 3 -> dataReceiptFile.getStatus();
+                default -> throw new IllegalArgumentException(
+                    "Invalid column index: " + columnIndex);
+            };
+        }
+
+        @Override
+        public void loadFromDatabase() {
+            dataReceiptFiles = new DataReceiptOperationsProxy()
+                .dataReceiptFilesForInstance(dataReceiptInstance.getInstanceId());
+            fireTableDataChanged();
+        }
+
+        @Override
+        public DataReceiptFile getContentAtRow(int row) {
+            return dataReceiptFiles.get(row);
+        }
+
+        @Override
+        public Class<DataReceiptFile> tableModelContentClass() {
+            return DataReceiptFile.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/dr/DataReceiptPanel.java b/src/main/java/gov/nasa/ziggy/ui/dr/DataReceiptPanel.java
new file mode 100644
index 0000000..8d48ae5
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/dr/DataReceiptPanel.java
@@ -0,0 +1,153 @@
+package gov.nasa.ziggy.ui.dr;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REFRESH;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+
+import gov.nasa.ziggy.data.management.DataReceiptInstance;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseModel;
+import gov.nasa.ziggy.ui.util.proxy.DataReceiptOperationsProxy;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * Panel that displays summary information for all pipeline instances that performed a data receipt
+ * operation.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class DataReceiptPanel extends JPanel {
+
+    private static final long serialVersionUID = 20230823L;
+
+    private ZiggyTable<DataReceiptInstance> ziggyTable;
+
+    public DataReceiptPanel() {
+        buildComponent();
+    }
+
+    /**
+     * Initializes the panel. The panel has a button panel on the top that provides the refresh
+     * button, and a scroll pane below the button panel that provides the table of data receipt
+     * instances.
+     */
+    protected void buildComponent() {
+        JPanel buttonPanel = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton(REFRESH, this::refresh));
+
+        ziggyTable = createDataReceiptTable();
+        JScrollPane tableScrollPane = new JScrollPane(ziggyTable.getTable());
+
+        GroupLayout layout = new GroupLayout(this);
+        setLayout(layout);
+
+        layout.setHorizontalGroup(
+            layout.createParallelGroup().addComponent(buttonPanel).addComponent(tableScrollPane));
+
+        layout.setVerticalGroup(layout.createSequentialGroup()
+            .addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(tableScrollPane));
+    }
+
+    private ZiggyTable<DataReceiptInstance> createDataReceiptTable() {
+        ZiggyTable<DataReceiptInstance> ziggyTable = new ZiggyTable<>(new DataReceiptTableModel());
+        ziggyTable.loadFromDatabase();
+        ziggyTable.addMouseListener(new MouseAdapter() {
+
+            /**
+             * Launches a dialog box that contains the table of files imported for a given instance.
+             */
+            @Override
+            public void mouseClicked(MouseEvent evt) {
+                // On double-click, select the desired row and retrieve the corresponding log.
+                int row = ziggyTable.rowAtPoint(evt.getPoint());
+                if (evt.getClickCount() == 2 && row != -1) {
+                    try {
+                        new DataReceiptInstanceDialog(
+                            SwingUtilities.getWindowAncestor(DataReceiptPanel.this),
+                            ziggyTable.getContentAtViewRow(row)).setVisible(true);
+                    } catch (Throwable e) {
+                        MessageUtil
+                            .showError(SwingUtilities.getWindowAncestor(DataReceiptPanel.this), e);
+                    }
+                }
+            }
+        });
+        return ziggyTable;
+    }
+
+    private void refresh(ActionEvent evt) {
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private static class DataReceiptTableModel extends AbstractDatabaseModel<DataReceiptInstance> {
+
+        private static final long serialVersionUID = 20230823L;
+
+        private static final String[] COLUMN_NAMES = { "Instance", "Date", "Successful", "Failed" };
+
+        private List<DataReceiptInstance> dataReceiptInstances = new ArrayList<>();
+
+        @Override
+        public int getRowCount() {
+            return dataReceiptInstances.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public String getColumnName(int columnIndex) {
+            return COLUMN_NAMES[columnIndex];
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            DataReceiptInstance dataReceiptInstance = dataReceiptInstances.get(rowIndex);
+            return switch (columnIndex) {
+                case 0 -> dataReceiptInstance.getInstanceId();
+                case 1 -> dataReceiptInstance.getDate();
+                case 2 -> dataReceiptInstance.getSuccessfulImportCount();
+                case 3 -> dataReceiptInstance.getFailedImportCount();
+                default -> throw new IllegalArgumentException(
+                    "Invalid column index: " + columnIndex);
+            };
+        }
+
+        @Override
+        public void loadFromDatabase() {
+            dataReceiptInstances = new DataReceiptOperationsProxy().dataReceiptInstances();
+            fireTableDataChanged();
+        }
+
+        @Override
+        public DataReceiptInstance getContentAtRow(int row) {
+            return dataReceiptInstances.get(row);
+        }
+
+        @Override
+        public Class<DataReceiptInstance> tableModelContentClass() {
+            return DataReceiptInstance.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/collections/package.html b/src/main/java/gov/nasa/ziggy/ui/dr/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/collections/package.html
rename to src/main/java/gov/nasa/ziggy/ui/dr/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/events/ZiggyEventHandlerPanel.java b/src/main/java/gov/nasa/ziggy/ui/events/ZiggyEventHandlerPanel.java
new file mode 100644
index 0000000..958bc42
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/events/ZiggyEventHandlerPanel.java
@@ -0,0 +1,254 @@
+package gov.nasa.ziggy.ui.events;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REFRESH;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+import javax.swing.table.AbstractTableModel;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.services.events.ZiggyEventHandler;
+import gov.nasa.ziggy.services.events.ZiggyEventHandler.ZiggyEventHandlerInfoForDisplay;
+import gov.nasa.ziggy.services.messages.EventHandlerRequest;
+import gov.nasa.ziggy.services.messages.EventHandlerToggleStateRequest;
+import gov.nasa.ziggy.services.messages.ZiggyEventHandlerInfoMessage;
+import gov.nasa.ziggy.services.messaging.MessageAction;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+import gov.nasa.ziggy.util.Requestor;
+
+/**
+ * Panel to display the collection of {@link ZiggyEventHandler} instances and their states.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class ZiggyEventHandlerPanel extends JPanel {
+
+    private static final Logger log = LoggerFactory.getLogger(ZiggyEventHandlerPanel.class);
+    private static final long serialVersionUID = 20230824L;
+
+    private EventHandlerTableModel tableModel;
+
+    public ZiggyEventHandlerPanel() {
+        buildComponent();
+        update();
+    }
+
+    private void buildComponent() {
+        JPanel buttonPanel = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton(REFRESH, this::refresh));
+        tableModel = new EventHandlerTableModel();
+        JScrollPane tableScrollPane = new JScrollPane(
+            createEventHandlerTable(tableModel).getTable());
+
+        GroupLayout layout = new GroupLayout(this);
+        setLayout(layout);
+
+        layout.setHorizontalGroup(
+            layout.createParallelGroup().addComponent(buttonPanel).addComponent(tableScrollPane));
+
+        layout.setVerticalGroup(layout.createSequentialGroup()
+            .addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(tableScrollPane));
+    }
+
+    private ZiggyTable<ZiggyEventHandlerInfoForDisplay> createEventHandlerTable(
+        EventHandlerTableModel tableModel) {
+
+        ZiggyTable<ZiggyEventHandlerInfoForDisplay> ziggyTable = new ZiggyTable<>(tableModel);
+
+        for (int column = 0; column < EventHandlerTableModel.COLUMN_WIDTHS.length; column++) {
+            ziggyTable.setPreferredColumnWidth(column,
+                EventHandlerTableModel.COLUMN_WIDTHS[column]);
+        }
+        ziggyTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+
+                // does the user want to enable or disable an event handler?
+                int row = ziggyTable.rowAtPoint(e.getPoint());
+                int column = ziggyTable.columnAtPoint(e.getPoint());
+                log.debug("row={}, column={}", row, column);
+                if (row != -1 && column == 3) {
+                    EventHandlerToggleStateRequest
+                        .requestEventHandlerToggle(tableModel.getName(row));
+                    update();
+                }
+            }
+        });
+        return ziggyTable;
+    }
+
+    private void refresh(ActionEvent evt) {
+        try {
+            log.debug("evt={}", evt);
+            update();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    public void update() {
+        log.debug("Calling EventHandlerPanelUpdater");
+        new EventHandlerPanelUpdater(SwingUtilities.getWindowAncestor(this), tableModel).execute();
+    }
+
+    private static class EventHandlerTableModel extends AbstractTableModel
+        implements TableModelContentClass<ZiggyEventHandlerInfoForDisplay>, Requestor {
+
+        private static final long serialVersionUID = 20230824L;
+
+        private static final String[] COLUMN_NAMES = { "Name", "Directory", "Pipeline", "Enabled" };
+        private static final int[] COLUMN_WIDTHS = { 100, 500, 100, 100 };
+
+        private final UUID uuid = UUID.randomUUID();
+        private List<ZiggyEventHandlerInfoForDisplay> eventHandlers = new ArrayList<>();
+
+        public String getName(int rowIndex) {
+            return eventHandlers.get(rowIndex).getName();
+        }
+
+        @Override
+        public int getRowCount() {
+            return eventHandlers.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public String getColumnName(int columnIndex) {
+            return COLUMN_NAMES[columnIndex];
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            ZiggyEventHandlerInfoForDisplay eventHandler = eventHandlers.get(rowIndex);
+            return switch (columnIndex) {
+                case 0 -> eventHandler.getName();
+                case 1 -> eventHandler.getDirectory();
+                case 2 -> eventHandler.getPipelineName();
+                case 3 -> eventHandler.isEnabled();
+                default -> throw new IllegalArgumentException("Illegal column: " + columnIndex);
+            };
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            return switch (columnIndex) {
+                case 3 -> Boolean.class;
+                default -> String.class;
+            };
+        }
+
+        @Override
+        public Class<ZiggyEventHandlerInfoForDisplay> tableModelContentClass() {
+            return ZiggyEventHandlerInfoForDisplay.class;
+        }
+
+        @Override
+        public UUID requestorIdentifier() {
+            return uuid;
+        }
+
+        /**
+         * Updates the models event handlers.
+         */
+        private void setEventHandlers(Collection<ZiggyEventHandlerInfoForDisplay> handlerInfo) {
+            log.debug("Updating model");
+            eventHandlers.clear();
+            eventHandlers.addAll(handlerInfo);
+            fireTableDataChanged();
+        }
+    }
+
+    /**
+     * Event handler panel updater. Call the {@code execute()} method to update the panel. This
+     * method can only be called once per object.
+     *
+     * @author PT
+     * @author Bill Wohler
+     */
+    private static class EventHandlerPanelUpdater
+        extends SwingWorker<Set<ZiggyEventHandlerInfoForDisplay>, Void> {
+
+        private static final long PANEL_CONTENT_TIMEOUT_MILLIS = 2000L;
+
+        private final Window owner;
+        private EventHandlerTableModel tableModel;
+        private ZiggyEventHandlerInfoMessage message;
+
+        public EventHandlerPanelUpdater(Window owner, EventHandlerTableModel tableModel) {
+            this.owner = owner;
+            this.tableModel = tableModel;
+        }
+
+        /**
+         * Retrieves the event handler information. This is done by publishing an
+         * {@link EventHandlerRequest} and subscribing to {@link ZiggyEventHandlerInfoMessage} for
+         * the response.
+         */
+        @Override
+        protected Set<ZiggyEventHandlerInfoForDisplay> doInBackground() throws Exception {
+            CountDownLatch countdownLatch = new CountDownLatch(1);
+
+            MessageAction<ZiggyEventHandlerInfoMessage> action = message -> {
+                if (tableModel.isDestination(message)) {
+                    log.debug("thread={}, message={}", Thread.currentThread().getName(), message);
+                    this.message = message;
+                    countdownLatch.countDown();
+                }
+            };
+            ZiggyMessenger.subscribe(ZiggyEventHandlerInfoMessage.class, action);
+            ZiggyMessenger.publish(new EventHandlerRequest(tableModel));
+            countdownLatch.await(PANEL_CONTENT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+
+            log.debug("thread={}, message={}", Thread.currentThread().getName(), message);
+            ZiggyMessenger.unsubscribe(ZiggyEventHandlerInfoMessage.class, action);
+
+            return message != null ? message.getEventHandlerInfo() : null;
+        }
+
+        @Override
+        protected void done() {
+            try {
+                Set<ZiggyEventHandlerInfoForDisplay> displayContent = get();
+                log.debug("Received {} items", displayContent == null ? 0 : displayContent.size());
+                if (displayContent == null) {
+                    MessageUtil.showError(owner, "Event handler update timed out.");
+                    return;
+                }
+                tableModel.setEventHandlers(displayContent);
+            } catch (InterruptedException | ExecutionException e) {
+                MessageUtil.showError(owner, e);
+            }
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/package.html b/src/main/java/gov/nasa/ziggy/ui/events/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/common/package.html
rename to src/main/java/gov/nasa/ziggy/ui/events/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/AlertLogDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/AlertLogDialog.java
new file mode 100644
index 0000000..d7469de
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/AlertLogDialog.java
@@ -0,0 +1,122 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.table.AbstractTableModel;
+
+import gov.nasa.ziggy.services.alert.AlertLog;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
+import gov.nasa.ziggy.ui.util.proxy.AlertLogCrudProxy;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+import gov.nasa.ziggy.util.dispmod.AlertLogDisplayModel;
+
+/**
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class AlertLogDialog extends javax.swing.JDialog {
+
+    public AlertLogDialog(Window owner, long pipelineInstanceId) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+
+        buildComponent(pipelineInstanceId);
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent(long pipelineInstanceId) {
+        setTitle("Alerts");
+
+        getContentPane().add(createDataPanel(pipelineInstanceId), BorderLayout.CENTER);
+        getContentPane().add(ZiggySwingUtils.createButtonPanel(createButton(CLOSE, this::close)),
+            BorderLayout.SOUTH);
+
+        setMinimumSize(ZiggySwingUtils.MIN_DIALOG_SIZE);
+        pack();
+    }
+
+    private JPanel createDataPanel(long pipelineInstanceId) {
+        ZiggyTable<AlertLog> ziggyTable = new ZiggyTable<>(
+            new AlertLogTableModel(pipelineInstanceId));
+        JScrollPane tableScrollPane = new JScrollPane(ziggyTable.getTable());
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(
+            dataPanelLayout.createParallelGroup().addComponent(tableScrollPane));
+
+        dataPanelLayout.setVerticalGroup(
+            dataPanelLayout.createSequentialGroup().addComponent(tableScrollPane));
+
+        return dataPanel;
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private static class AlertLogTableModel extends AbstractTableModel
+        implements TableModelContentClass<AlertLog> {
+        private final AlertLogCrudProxy alertLogCrud;
+        private List<AlertLog> alerts = new ArrayList<>();
+        private final long pipelineInstanceId;
+        private final AlertLogDisplayModel alertLogDisplayModel = new AlertLogDisplayModel();
+
+        public AlertLogTableModel(long pipelineInstanceId) {
+            this.pipelineInstanceId = pipelineInstanceId;
+
+            alertLogCrud = new AlertLogCrudProxy();
+
+            loadFromDatabase();
+        }
+
+        public void loadFromDatabase() {
+            try {
+                alerts = alertLogCrud.retrieveForPipelineInstance(pipelineInstanceId);
+                alertLogDisplayModel.update(alerts);
+            } catch (ConsoleSecurityException ignore) {
+            }
+
+            fireTableDataChanged();
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            return alertLogDisplayModel.getValueAt(rowIndex, columnIndex);
+        }
+
+        @Override
+        public int getColumnCount() {
+            return alertLogDisplayModel.getColumnCount();
+        }
+
+        @Override
+        public int getRowCount() {
+            return alertLogDisplayModel.getRowCount();
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return alertLogDisplayModel.getColumnName(column);
+        }
+
+        @Override
+        public Class<AlertLog> tableModelContentClass() {
+            return AlertLog.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/InstanceCostEstimateDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/InstanceCostEstimateDialog.java
new file mode 100644
index 0000000..626064a
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/InstanceCostEstimateDialog.java
@@ -0,0 +1,185 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.table.AbstractTableModel;
+
+import org.netbeans.swing.etable.ETable;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.LabelType;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
+import gov.nasa.ziggy.ui.util.proxy.PipelineTaskOperationsProxy;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * Displays cost estimates for a pipeline instance and the tasks within that instance. Costs will be
+ * in Standard Billing Units (SBUs) for tasks run on Pleiades, or in dollars for tasks run on AWS.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class InstanceCostEstimateDialog extends JDialog {
+
+    private static final long serialVersionUID = 20230817L;
+
+    public InstanceCostEstimateDialog(Window owner, PipelineInstance pipelineInstance) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+
+        buildComponent(pipelineInstance);
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent(PipelineInstance pipelineInstance) {
+        setTitle("Cost estimate");
+
+        getContentPane().add(createDataPanel(pipelineInstance), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(createButton(CLOSE, this::close)),
+            BorderLayout.SOUTH);
+
+        setMinimumSize(ZiggySwingUtils.MIN_DIALOG_SIZE);
+        pack();
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+    }
+
+    private JPanel createDataPanel(PipelineInstance pipelineInstance) {
+        List<PipelineTask> pipelineTasksInInstance = new PipelineTaskOperationsProxy()
+            .updateAndRetrieveTasks(pipelineInstance);
+
+        JLabel instance = boldLabel("Pipeline instance", LabelType.HEADING);
+        instance.setToolTipText("Displays estimated cost of the full pipeline instance.");
+
+        JLabel instanceId = boldLabel("ID:");
+        JLabel instanceText = new JLabel(Long.toString(pipelineInstance.getId()));
+
+        JLabel state = boldLabel("State:");
+        JLabel stateText = new JLabel(pipelineInstance.getState().toString());
+
+        JLabel cost = boldLabel("Cost estimate:");
+        JLabel costText = new JLabel(instanceCost(pipelineTasksInInstance));
+
+        JLabel tasks = boldLabel("Pipeline tasks", LabelType.HEADING);
+        tasks.setToolTipText("Displays estimated cost of tasks in the selected pipeline instance.");
+
+        ZiggyTable<PipelineTask> ziggyTable = new ZiggyTable<>(
+            new TaskCostEstimateTableModel(pipelineTasksInInstance));
+
+        ETable taskTable = ziggyTable.getTable();
+        taskTable.setCellSelectionEnabled(false);
+        taskTable.setRowSelectionAllowed(false);
+        JScrollPane tableScrollPane = new JScrollPane(taskTable);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(instance)
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGap(ZiggySwingUtils.INDENT)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(instanceId)
+                    .addComponent(state)
+                    .addComponent(cost))
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(instanceText)
+                    .addComponent(stateText)
+                    .addComponent(costText)))
+            .addComponent(tasks)
+            .addComponent(tableScrollPane));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(instance)
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(instanceId)
+                .addComponent(instanceText))
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(state).addComponent(stateText))
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(cost).addComponent(costText))
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(tasks)
+            .addComponent(tableScrollPane));
+
+        return dataPanel;
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private String instanceCost(List<PipelineTask> pipelineTasksInInstance) {
+        double totalCost = 0;
+        for (PipelineTask task : pipelineTasksInInstance) {
+            totalCost += task.costEstimate();
+        }
+        return Long.toString(Math.round(totalCost));
+    }
+
+    private static class TaskCostEstimateTableModel extends AbstractTableModel
+        implements TableModelContentClass<PipelineTask> {
+
+        private static final long serialVersionUID = 20230817L;
+
+        private static final String[] COLUMN_NAMES = { "ID", "Module", "UOW", "State",
+            "Cost estimate" };
+
+        private final List<PipelineTask> pipelineTasks;
+
+        public TaskCostEstimateTableModel(List<PipelineTask> pipelineTasks) {
+            this.pipelineTasks = pipelineTasks;
+        }
+
+        @Override
+        public int getRowCount() {
+            return pipelineTasks.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public String getColumnName(int columnIndex) {
+            return COLUMN_NAMES[columnIndex];
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            PipelineTask task = pipelineTasks.get(rowIndex);
+            return switch (columnIndex) {
+                case 0 -> task.getId();
+                case 1 -> task.getModuleName();
+                case 2 -> task.uowTaskInstance().briefState();
+                case 3 -> task.getState().toString();
+                case 4 -> Long.toString(Math.round(task.costEstimate()));
+                default -> throw new IllegalArgumentException(
+                    "Illegal column number: " + columnIndex);
+            };
+        }
+
+        @Override
+        public Class<PipelineTask> tableModelContentClass() {
+            return PipelineTask.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/InstanceDetailsDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/InstanceDetailsDialog.java
new file mode 100644
index 0000000..8416e72
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/InstanceDetailsDialog.java
@@ -0,0 +1,253 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REFRESH;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REPORT;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import gov.nasa.ziggy.metrics.report.ReportFilePaths;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
+import gov.nasa.ziggy.pipeline.definition.TaskCounts;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.TextualReportDialog;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.LabelType;
+import gov.nasa.ziggy.ui.util.models.AbstractZiggyTableModel;
+import gov.nasa.ziggy.ui.util.proxy.PipelineInstanceCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.PipelineInstanceNodeCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.PipelineOperationsProxy;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class InstanceDetailsDialog extends javax.swing.JDialog {
+    private JLabel nameText;
+    private ZiggyTable<PipelineInstanceNode> ziggyTable;
+    private final PipelineInstance pipelineInstance;
+
+    public InstanceDetailsDialog(Window owner, PipelineInstance pipelineInstance) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.pipelineInstance = pipelineInstance;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Pipeline instance details");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(ZiggySwingUtils.createButton(REFRESH, this::refresh),
+            ZiggySwingUtils.createButton(REPORT, this::generateReport),
+            ZiggySwingUtils.createButton(CLOSE, this::close)), BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        JLabel instanceGroup = boldLabel("Pipeline instance", LabelType.HEADING1);
+
+        JLabel id = boldLabel("ID: ");
+        JLabel idText = new JLabel(Long.toString(pipelineInstance.getId()));
+
+        JLabel name = boldLabel("Name:");
+        nameText = new JLabel(pipelineInstance.getName());
+
+        JLabel start = boldLabel("Start:");
+        JLabel startText = new JLabel(pipelineInstance.getStartProcessingTime().toString());
+
+        JLabel end = boldLabel("End:");
+        Date endProcessingTime = pipelineInstance.getEndProcessingTime();
+        JLabel endText = new JLabel(
+            endProcessingTime.getTime() == 0 ? "-" : endProcessingTime.toString());
+
+        JLabel total = boldLabel("Total:");
+        JLabel totalText = new JLabel(pipelineInstance.elapsedTime());
+
+        JLabel pipelineParametersGroup = boldLabel("Pipeline parameter sets", LabelType.HEADING1);
+        ParameterSetViewPanel pipelineParameterSetsPanel = new ParameterSetViewPanel(
+            pipelineInstance.getPipelineParameterSets());
+
+        JLabel modulesGroup = boldLabel("Modules", LabelType.HEADING1);
+        JPanel modulesButtonPanel = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton("View module parameters", this::viewModuleParameters));
+        ziggyTable = new ZiggyTable<>(new InstanceModulesTableModel(pipelineInstance));
+        JScrollPane tableScrollPane = new JScrollPane(ziggyTable.getTable());
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(instanceGroup)
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGap(ZiggySwingUtils.INDENT)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(id)
+                    .addComponent(name)
+                    .addComponent(start)
+                    .addComponent(end)
+                    .addComponent(total))
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(idText)
+                    .addComponent(nameText)
+                    .addComponent(startText)
+                    .addComponent(endText)
+                    .addComponent(totalText)))
+            .addComponent(pipelineParametersGroup)
+            .addComponent(pipelineParameterSetsPanel)
+            .addComponent(modulesGroup)
+            .addComponent(modulesButtonPanel)
+            .addComponent(tableScrollPane));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(instanceGroup)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(dataPanelLayout.createParallelGroup().addComponent(id).addComponent(idText))
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(name).addComponent(nameText))
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(start).addComponent(startText))
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(dataPanelLayout.createParallelGroup().addComponent(end).addComponent(endText))
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(total).addComponent(totalText))
+            .addGap(ZiggySwingUtils.GROUP_GAP)
+            .addComponent(pipelineParametersGroup)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(pipelineParameterSetsPanel)
+            .addGap(ZiggySwingUtils.GROUP_GAP)
+            .addComponent(modulesGroup)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(modulesButtonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(tableScrollPane));
+
+        return dataPanel;
+    }
+
+    private void viewModuleParameters(ActionEvent evt) {
+        int selectedRow = ziggyTable.getSelectedRow();
+
+        if (selectedRow == -1) {
+            MessageUtil.showError(this, "No module selected");
+        } else {
+            PipelineInstanceNode node = ziggyTable.getContentAtViewRow(selectedRow);
+            new ParameterSetViewDialog(this, node.getModuleParameterSets()).setVisible(true);
+        }
+    }
+
+    private void refresh(ActionEvent evt) {
+
+        try {
+            String newName = nameText.getText();
+
+            if (!newName.equals(pipelineInstance.getName())) {
+                PipelineInstanceCrudProxy instanceCrud = new PipelineInstanceCrudProxy();
+                instanceCrud.updateName(pipelineInstance.getId(), newName);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void generateReport(ActionEvent evt) {
+        PipelineOperationsProxy ops = new PipelineOperationsProxy();
+        String report = ops.generatePedigreeReport(pipelineInstance);
+
+        TextualReportDialog.showReport(this, report, "Instance report",
+            ReportFilePaths.instanceDetailsReportPath(pipelineInstance.getId()));
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private static class InstanceModulesTableModel
+        extends AbstractZiggyTableModel<PipelineInstanceNode> {
+
+        private static final String[] COLUMN_NAMES = { "Name", "Tasks", "Submitted", "Completed",
+            "Failed" };
+
+        private List<PipelineInstanceNode> pipelineInstanceNodes = new LinkedList<>();
+        private Map<PipelineInstanceNode, TaskCounts> nodeTaskCounts = new HashMap<>();
+
+        public InstanceModulesTableModel(PipelineInstance instance) {
+            if (instance != null) {
+                PipelineInstanceNodeCrudProxy pipelineInstanceNodeCrud = new PipelineInstanceNodeCrudProxy();
+                pipelineInstanceNodes = pipelineInstanceNodeCrud.retrieveAll(instance);
+                PipelineOperationsProxy pipelineOperations = new PipelineOperationsProxy();
+                for (PipelineInstanceNode node : pipelineInstanceNodes) {
+                    nodeTaskCounts.put(node, pipelineOperations.taskCounts(node));
+                }
+            }
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public int getRowCount() {
+            return pipelineInstanceNodes.size();
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            PipelineInstanceNode node = pipelineInstanceNodes.get(rowIndex);
+            TaskCounts taskCounts = nodeTaskCounts.get(node);
+
+            return switch (columnIndex) {
+                case 0 -> node.getPipelineDefinitionNode().getModuleName();
+                case 1 -> taskCounts.getTaskCount();
+                case 2 -> taskCounts.getSubmittedTaskCount();
+                case 3 -> taskCounts.getCompletedTaskCount();
+                case 4 -> taskCounts.getFailedTaskCount();
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public Class<PipelineInstanceNode> tableModelContentClass() {
+            return PipelineInstanceNode.class;
+        }
+
+        @Override
+        public PipelineInstanceNode getContentAtRow(int row) {
+            return pipelineInstanceNodes.get(row);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/InstanceStatsDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/InstanceStatsDialog.java
new file mode 100644
index 0000000..c09ca3a
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/InstanceStatsDialog.java
@@ -0,0 +1,179 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REFRESH;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.table.AbstractTableModel;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.LabelType;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
+import gov.nasa.ziggy.ui.util.proxy.PipelineTaskCrudProxy;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+import gov.nasa.ziggy.util.dispmod.PipelineStatsDisplayModel;
+import gov.nasa.ziggy.util.dispmod.PipelineStatsDisplayModel.ProcessingStatistics;
+import gov.nasa.ziggy.util.dispmod.TaskMetricsDisplayModel.ModuleTaskMetrics;
+
+/**
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class InstanceStatsDialog extends javax.swing.JDialog {
+
+    private ZiggyTable<ProcessingStatistics> processingTimeZiggyTable;
+    private ZiggyTable<ModuleTaskMetrics> processingBreakdownZiggyTable;
+
+    private final PipelineInstance pipelineInstance;
+    private TaskMetricsTableModel processingBreakdownTableModel;
+    private PipelineStatsTableModel processingTimeTableModel;
+    private final PipelineTaskCrudProxy pipelineTaskCrud = new PipelineTaskCrudProxy();
+    private List<PipelineTask> tasks;
+    private ArrayList<String> orderedModuleNames;
+
+    public InstanceStatsDialog(Window owner, PipelineInstance instance) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+
+        pipelineInstance = instance;
+        loadFromDatabase();
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void loadFromDatabase() {
+        tasks = pipelineTaskCrud.retrieveAll(pipelineInstance);
+        orderedModuleNames = new ArrayList<>();
+
+        for (PipelineTask task : tasks) {
+            String moduleName = task.getPipelineInstanceNode()
+                .getPipelineModuleDefinition()
+                .getName();
+            if (!orderedModuleNames.contains(moduleName)) {
+                orderedModuleNames.add(moduleName);
+            }
+        }
+    }
+
+    private void buildComponent() {
+        try {
+            setTitle("Pipeline instance performance statistics");
+
+            getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+            getContentPane().add(ZiggySwingUtils.createButtonPanel(
+                ZiggySwingUtils.createButton(REFRESH, this::refresh),
+                ZiggySwingUtils.createButton(CLOSE, this::close)), BorderLayout.SOUTH);
+
+            pack();
+        } catch (Exception e) {
+            throw e;
+        }
+    }
+
+    private JPanel createDataPanel() {
+        JLabel processingTime = ZiggySwingUtils.boldLabel("Processing time statistics",
+            LabelType.HEADING);
+        processingTimeZiggyTable = new ZiggyTable<>(
+            new PipelineStatsTableModel(tasks, orderedModuleNames));
+        JScrollPane processingTimeScrollPane = new JScrollPane(processingTimeZiggyTable.getTable());
+
+        JLabel processingBreakdown = ZiggySwingUtils
+            .boldLabel("Processing time breakdown for completed tasks", LabelType.HEADING);
+        processingBreakdownZiggyTable = new ZiggyTable<>(
+            new TaskMetricsTableModel(tasks, orderedModuleNames, false));
+        JScrollPane processingBreakdownScrollPane = new JScrollPane(
+            processingBreakdownZiggyTable.getTable());
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(processingTime)
+            .addComponent(processingTimeScrollPane)
+            .addComponent(processingBreakdown)
+            .addComponent(processingBreakdownScrollPane));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(processingTime)
+            .addComponent(processingTimeScrollPane)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(processingBreakdown)
+            .addComponent(processingBreakdownScrollPane));
+
+        return dataPanel;
+    }
+
+    private void refresh(ActionEvent evt) {
+        loadFromDatabase();
+        updateTables();
+    }
+
+    private void updateTables() {
+        processingTimeTableModel.update(tasks, orderedModuleNames);
+        processingBreakdownTableModel.update(tasks, orderedModuleNames);
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private static class PipelineStatsTableModel extends AbstractTableModel
+        implements TableModelContentClass<ProcessingStatistics> {
+
+        private PipelineStatsDisplayModel pipelineStatsDisplayModel;
+
+        public PipelineStatsTableModel(List<PipelineTask> tasks, List<String> orderedModuleNames) {
+            update(tasks, orderedModuleNames);
+        }
+
+        public void update(List<PipelineTask> tasks, List<String> orderedModuleNames) {
+            try {
+                pipelineStatsDisplayModel = new PipelineStatsDisplayModel(tasks,
+                    orderedModuleNames);
+            } catch (ConsoleSecurityException ignore) {
+            }
+
+            fireTableDataChanged();
+        }
+
+        @Override
+        public int getRowCount() {
+            return pipelineStatsDisplayModel.getRowCount();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return pipelineStatsDisplayModel.getColumnCount();
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            return pipelineStatsDisplayModel.getValueAt(rowIndex, columnIndex);
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return pipelineStatsDisplayModel.getColumnName(column);
+        }
+
+        @Override
+        public Class<ProcessingStatistics> tableModelContentClass() {
+            return ProcessingStatistics.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/InstancesControlPanel.java b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesControlPanel.java
new file mode 100644
index 0000000..f79d947
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesControlPanel.java
@@ -0,0 +1,274 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.GroupLayout;
+import javax.swing.GroupLayout.Alignment;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.State;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceFilter;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.LabelType;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class InstancesControlPanel extends javax.swing.JPanel {
+    private static final Logger log = LoggerFactory.getLogger(InstancesControlPanel.class);
+
+    private JCheckBox errorsStalledCheckBox;
+    private JCheckBox initializedCheckBox;
+    private JCheckBox processingCheckBox;
+    private JCheckBox errorsRunningCheckBox;
+    private JCheckBox completeCheckBox;
+    private JTextField ageTextField;
+    private JTextField instanceNameTextField;
+
+    private final PipelineInstanceFilter filter;
+    private InstancesPanel listener;
+
+    public InstancesControlPanel(PipelineInstanceFilter filter) {
+        this.filter = filter;
+        buildComponent();
+    }
+
+    private void buildComponent() {
+        setLayout(new BorderLayout());
+        setOpaque(false);
+        add(createDataPanel(), BorderLayout.CENTER);
+    }
+
+    private JPanel createDataPanel() {
+        JButton clearFiltersButton = new JButton("Clear filters");
+        clearFiltersButton.addActionListener(this::clear);
+
+        JLabel showInstancesGroup = boldLabel("Show instances", LabelType.HEADING);
+        JLabel startLabel = new JLabel("Started within the last");
+        ageTextField = new JTextField("" + filter.getAgeDays());
+        ageTextField.setColumns(4);
+        ageTextField.addActionListener(this::search);
+        JLabel daysLabel = new JLabel("days");
+
+        JPanel dayButtonPanel = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton("1d", this::view1Day), createButton("7d", this::view7Days),
+            createButton("14d", this::view14Days), createButton("30d", this::view30Days),
+            createButton("90d", this::view90Days));
+
+        Set<State> states = filter.getStates();
+        JLabel limitStatesGroup = boldLabel("Limit states", LabelType.HEADING);
+
+        // TODO Replace the following strings with a future enum.toString()
+        initializedCheckBox = new JCheckBox("Initialized");
+        initializedCheckBox
+            .setSelected(states != null && states.contains(PipelineInstance.State.INITIALIZED));
+        initializedCheckBox.addActionListener(this::search);
+
+        processingCheckBox = new JCheckBox("Processing");
+        processingCheckBox
+            .setSelected(states != null && states.contains(PipelineInstance.State.PROCESSING));
+        processingCheckBox.addActionListener(this::search);
+
+        completeCheckBox = new JCheckBox("Completed");
+        completeCheckBox
+            .setSelected(states != null && states.contains(PipelineInstance.State.COMPLETED));
+        completeCheckBox.addActionListener(this::search);
+
+        errorsRunningCheckBox = new JCheckBox("Errors (running)");
+        errorsRunningCheckBox
+            .setSelected(states != null && states.contains(PipelineInstance.State.ERRORS_RUNNING));
+        errorsRunningCheckBox.addActionListener(this::search);
+
+        errorsStalledCheckBox = new JCheckBox("Errors (stalled)");
+        errorsStalledCheckBox
+            .setSelected(states != null && states.contains(PipelineInstance.State.ERRORS_STALLED));
+        errorsStalledCheckBox.addActionListener(this::search);
+
+        JLabel instanceNameGroup = boldLabel("Instance name", LabelType.HEADING);
+        String name = filter.getNameContains();
+        instanceNameTextField = new JTextField();
+        instanceNameTextField.setColumns(15);
+        instanceNameTextField.setText(name != null ? name : "");
+
+        JButton searchButton = new JButton("Search");
+        searchButton.addActionListener(this::search);
+
+        JPanel filtersPanel = new JPanel();
+        GroupLayout filtersPanelLayout = new GroupLayout(filtersPanel);
+        filtersPanel.setLayout(filtersPanelLayout);
+
+        filtersPanelLayout.setHorizontalGroup(filtersPanelLayout.createParallelGroup()
+            .addComponent(clearFiltersButton)
+            .addComponent(showInstancesGroup)
+            .addGroup(filtersPanelLayout.createSequentialGroup()
+                .addGap(ZiggySwingUtils.INDENT)
+                .addComponent(startLabel)
+                .addGap(5) // PREFERRED is too big, no gap is too small
+                .addComponent(ageTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                    GroupLayout.PREFERRED_SIZE)
+                .addGap(5) // PREFERRED is too big, no gap is too small
+                .addComponent(daysLabel)
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addComponent(dayButtonPanel))
+            .addComponent(limitStatesGroup)
+            .addGroup(filtersPanelLayout.createSequentialGroup()
+                .addGap(ZiggySwingUtils.INDENT)
+                .addGroup(filtersPanelLayout.createParallelGroup()
+                    .addComponent(initializedCheckBox)
+                    .addComponent(processingCheckBox)
+                    .addComponent(completeCheckBox))
+                .addPreferredGap(ComponentPlacement.UNRELATED)
+                .addGroup(filtersPanelLayout.createParallelGroup()
+                    .addComponent(errorsRunningCheckBox)
+                    .addComponent(errorsStalledCheckBox)))
+            .addComponent(instanceNameGroup)
+            .addGroup(filtersPanelLayout.createSequentialGroup()
+                .addGap(ZiggySwingUtils.INDENT)
+                .addGroup(filtersPanelLayout.createSequentialGroup()
+                    .addComponent(instanceNameTextField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(searchButton))));
+
+        filtersPanelLayout.setVerticalGroup(filtersPanelLayout.createSequentialGroup()
+            .addComponent(clearFiltersButton)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(showInstancesGroup)
+            .addGroup(filtersPanelLayout.createParallelGroup(Alignment.CENTER)
+                .addComponent(startLabel)
+                .addComponent(ageTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                    GroupLayout.PREFERRED_SIZE)
+                .addComponent(daysLabel)
+                .addComponent(dayButtonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                    GroupLayout.PREFERRED_SIZE))
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(limitStatesGroup)
+            .addGroup(filtersPanelLayout.createParallelGroup()
+                .addGroup(filtersPanelLayout.createSequentialGroup()
+                    .addComponent(initializedCheckBox)
+                    .addComponent(processingCheckBox)
+                    .addComponent(completeCheckBox))
+                .addGroup(filtersPanelLayout.createSequentialGroup()
+                    .addComponent(errorsRunningCheckBox)
+                    .addComponent(errorsStalledCheckBox)))
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(instanceNameGroup)
+            .addGroup(filtersPanelLayout.createParallelGroup(Alignment.CENTER)
+                .addComponent(instanceNameTextField, GroupLayout.PREFERRED_SIZE,
+                    GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                .addComponent(searchButton, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                    GroupLayout.PREFERRED_SIZE)));
+
+        return filtersPanel;
+    }
+
+    private void view1Day(ActionEvent evt) {
+        ageTextField.setText("1");
+        search(evt);
+    }
+
+    private void view7Days(ActionEvent evt) {
+        ageTextField.setText("7");
+        search(evt);
+    }
+
+    private void view14Days(ActionEvent evt) {
+        ageTextField.setText("14");
+        search(evt);
+    }
+
+    private void view30Days(ActionEvent evt) {
+        ageTextField.setText("30");
+        search(evt);
+    }
+
+    private void view90Days(ActionEvent evt) {
+        ageTextField.setText("90");
+        search(evt);
+    }
+
+    private void clear(ActionEvent evt) {
+        ageTextField.setText(Integer.toString(PipelineInstanceFilter.DEFAULT_AGE));
+        initializedCheckBox.setSelected(false);
+        processingCheckBox.setSelected(false);
+        completeCheckBox.setSelected(false);
+        errorsRunningCheckBox.setSelected(false);
+        errorsStalledCheckBox.setSelected(false);
+        instanceNameTextField.setText("");
+        updateFilter();
+        if (listener != null) {
+            listener.applyFilters();
+        }
+    }
+
+    private void search(ActionEvent evt) {
+        updateFilter();
+        if (listener != null) {
+            listener.applyFilters();
+        }
+    }
+
+    private void updateFilter() {
+        // Age
+        try {
+            int age = Integer.parseInt(ageTextField.getText());
+            filter.setAgeDays(age);
+        } catch (NumberFormatException e) {
+            JOptionPane.showMessageDialog(this,
+                "Invalid age: " + ageTextField.getText() + ": " + e.getMessage(), "Error",
+                JOptionPane.ERROR_MESSAGE);
+        }
+
+        // States
+        Set<State> states = new HashSet<>();
+        if (initializedCheckBox.isSelected()) {
+            states.add(PipelineInstance.State.INITIALIZED);
+        }
+        if (processingCheckBox.isSelected()) {
+            states.add(PipelineInstance.State.PROCESSING);
+        }
+        if (completeCheckBox.isSelected()) {
+            states.add(PipelineInstance.State.COMPLETED);
+        }
+        if (errorsRunningCheckBox.isSelected()) {
+            states.add(PipelineInstance.State.ERRORS_RUNNING);
+        }
+        if (errorsStalledCheckBox.isSelected()) {
+            states.add(PipelineInstance.State.ERRORS_STALLED);
+        }
+        filter.setStates(states);
+
+        // Name
+        filter.setNameContains(instanceNameTextField.getText());
+
+        log.debug("filter={}", filter);
+    }
+
+    public InstancesPanel getListener() {
+        return listener;
+    }
+
+    public void setListener(InstancesPanel listener) {
+        this.listener = listener;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/InstancesPanel.java b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesPanel.java
new file mode 100644
index 0000000..79a98db
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesPanel.java
@@ -0,0 +1,72 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceFilter;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.LabelType;
+
+/**
+ * The left hand side subpanel of the instances panel. This side of the panel displays a table of
+ * pipeline instances and provides controls for a filter that selects instances based on when they
+ * ran, condition, etc.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class InstancesPanel extends JPanel {
+
+    private static final long serialVersionUID = 20230817L;
+
+    private InstancesTable instancesTable;
+
+    public InstancesPanel(InstancesTasksPanel instancesTasksPanel) {
+        buildComponent(instancesTasksPanel, new PipelineInstanceFilter());
+    }
+
+    private void buildComponent(InstancesTasksPanel instancesTasksPanel,
+        PipelineInstanceFilter instancesFilter) {
+        JLabel instances = boldLabel("Pipeline instances", LabelType.HEADING1);
+
+        InstancesControlPanel instancesControlPanel = new InstancesControlPanel(instancesFilter);
+        instancesControlPanel.setListener(this);
+
+        instancesTable = new InstancesTable(instancesTasksPanel, instancesFilter);
+        JScrollPane instancesTableScrollPane = new JScrollPane(instancesTable.getTable());
+
+        GroupLayout layout = new GroupLayout(this);
+        layout.setAutoCreateContainerGaps(true);
+        setLayout(layout);
+
+        layout.setHorizontalGroup(layout.createParallelGroup()
+            .addComponent(instances)
+            .addComponent(instancesControlPanel)
+            .addComponent(instancesTableScrollPane));
+
+        layout.setVerticalGroup(layout.createSequentialGroup()
+            .addComponent(instances)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(instancesControlPanel)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(instancesTableScrollPane, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE,
+                GroupLayout.DEFAULT_SIZE));
+    }
+
+    public void applyFilters() {
+        instancesTable.loadFromDatabase();
+    }
+
+    public PipelineInstance selectedPipelineInstance() {
+        return instancesTable.selectedPipelineInstance();
+    }
+
+    public InstancesTable instancesTable() {
+        return instancesTable;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/InstancesTable.java b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesTable.java
new file mode 100644
index 0000000..14febe6
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesTable.java
@@ -0,0 +1,451 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.DIALOG;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createMenuItem;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createPopupMenu;
+
+import java.awt.Desktop;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+
+import org.netbeans.swing.etable.ETable;
+import org.netbeans.swing.etable.ETableColumnModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.metrics.report.PerformanceReport;
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.State;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceFilter;
+import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.events.ZiggyEvent;
+import gov.nasa.ziggy.services.messages.DisplayTasksForInstanceMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseModel;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxyExecutor;
+import gov.nasa.ziggy.ui.util.proxy.PipelineInstanceCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.ZiggyEventCrudProxy;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * Displays just the table of instances.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class InstancesTable extends JPanel {
+    private static final long serialVersionUID = 20230822L;
+
+    private InstancesTasksPanel instancesTasksPanel;
+    private ZiggyTable<PipelineInstance> instancesTable;
+    private InstancesTableModel instancesTableModel;
+
+    // Index in the table model of the selected instance, not to be confused with the instance
+    // ID of that instance, which is instanceId.
+    private int selectedInstanceIndex = -1;
+    private long instanceId = -1;
+
+    public InstancesTable(PipelineInstanceFilter filter) {
+        this(null, filter);
+    }
+
+    public InstancesTable(InstancesTasksPanel instancesTasksPanel,
+        PipelineInstanceFilter instancesFilter) {
+        this.instancesTasksPanel = instancesTasksPanel;
+        createInstancesTable(instancesFilter);
+    }
+
+    private void createInstancesTable(PipelineInstanceFilter instancesFilter) {
+        instancesTable = new ZiggyTable<>(instancesTableModel(instancesFilter));
+        instancesTable.registerModel();
+        instancesTable.setWrapText(false);
+        instancesTable.getTable()
+            .getSelectionModel()
+            .setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        instancesTable.getTable().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        instancesTable.getTable().getSelectionModel().addListSelectionListener(event -> {
+            try {
+                // Ignore extra messages.
+                if (event.getValueIsAdjusting()) {
+                    return;
+                }
+
+                ListSelectionModel selectionModel = instancesTable.getTable().getSelectionModel();
+                if (selectionModel.isSelectionEmpty()) {
+                    reselectPipelineInstance();
+                } else {
+                    selectNewPipelineInstance(selectionModel);
+                }
+            } catch (Exception e) {
+                MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+            }
+        });
+
+        // Initially hide the Event name column to save space.
+        ETableColumnModel columnModel = (ETableColumnModel) instancesTable.getTable()
+            .getColumnModel();
+        columnModel.setColumnHidden(
+            columnModel.getColumn(columnModel.getColumnIndex(InstancesTableModel.EVENT_NAME)),
+            true);
+
+        configurePopupMenu(instancesTable);
+    }
+
+    public InstancesTableModel instancesTableModel(PipelineInstanceFilter instancesFilter) {
+        if (instancesTableModel == null) {
+            instancesTableModel = new InstancesTableModel(instancesFilter);
+        }
+        return instancesTableModel;
+    }
+
+    /**
+     * Reselects the correct row in the pipeline instance table after the table has been reset
+     * (typically by auto-refresh).
+     */
+    private void reselectPipelineInstance() {
+
+        // If the selected instance from before the update is still in the
+        // table, then select it again
+        int instanceModelIndex = instancesTableModel.getModelIndexOfInstance(instanceId);
+
+        if (instanceModelIndex == -1) {
+            instanceId = -1;
+        } else {
+            int rowIndex = instancesTable.getTable().convertRowIndexToView(instanceModelIndex);
+            instancesTable.getTable().getSelectionModel().setSelectionInterval(rowIndex, rowIndex);
+        }
+        ZiggyMessenger.publish(new DisplayTasksForInstanceMessage(true, instanceId));
+    }
+
+    /**
+     * Captures the selected row and selected pipeline instance ID. Executes when the user selects a
+     * row in the instances table.
+     */
+    private void selectNewPipelineInstance(ListSelectionModel lsm) {
+
+        int selectedRow = lsm.getMinSelectionIndex();
+        selectedInstanceIndex = instancesTable.convertRowIndexToModel(selectedRow);
+        instanceId = instancesTableModel.getContentAtRow(selectedInstanceIndex)
+            .getPipelineInstance()
+            .getId();
+        ZiggyMessenger.publish(new DisplayTasksForInstanceMessage(false, instanceId));
+    }
+
+    /**
+     * Configures the pipeline instances popup menu.
+     */
+    private void configurePopupMenu(ZiggyTable<PipelineInstance> instancesTable) {
+        JPopupMenu instancesPopupMenu = instancesPopupMenu();
+        if (instancesPopupMenu == null) {
+            return;
+        }
+        instancesTable.getTable().addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
+            public void mousePressed(java.awt.event.MouseEvent e) {
+                if (instanceId == -1) {
+                    return;
+                }
+                if (e.isPopupTrigger()) {
+                    instancesPopupMenu.show(instancesTable.getTable(), e.getX(), e.getY());
+                }
+            }
+        });
+    }
+
+    private JPopupMenu instancesPopupMenu() {
+        if (instancesTasksPanel == null) {
+            return null;
+        }
+        return createPopupMenu(createMenuItem("Details" + DIALOG, this::displayDetails),
+            createMenuItem("Performance report" + DIALOG, this::displayPerformanceReport),
+            createMenuItem("Alerts" + DIALOG, this::displayAlerts),
+            createMenuItem("Performance statistics" + DIALOG, this::displayStatistics),
+            createMenuItem("Estimate cost" + DIALOG, this::estimateCost),
+            ZiggySwingUtils.MENU_SEPARATOR,
+            createMenuItem("Restart all failed tasks" + DIALOG, this::restartTasks),
+            ZiggySwingUtils.MENU_SEPARATOR,
+            createMenuItem("Kill all incomplete tasks", this::killTasks));
+    }
+
+    private void displayDetails(ActionEvent evt) {
+        try {
+            InstanceDetailsDialog instanceDetailsDialog = new InstanceDetailsDialog(
+                SwingUtilities.getWindowAncestor(this),
+                instancesTableModel.getContentAtRow(selectedInstanceIndex).getPipelineInstance());
+            instanceDetailsDialog.setVisible(true);
+        } catch (Throwable e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+        }
+    }
+
+    private void displayPerformanceReport(ActionEvent evt) {
+        PerformanceReport report = new PerformanceReport(
+            instancesTableModel.getContentAtRow(selectedInstanceIndex)
+                .getPipelineInstance()
+                .getId(),
+            DirectoryProperties.taskDataDir().toFile(), null);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            try {
+                Desktop.getDesktop().open(report.generateReport().toFile());
+            } catch (Exception e) {
+                MessageUtil.showError(this, e);
+            }
+            return null;
+        });
+    }
+
+    private void displayAlerts(ActionEvent evt) {
+        try {
+            new AlertLogDialog(SwingUtilities.getWindowAncestor(this),
+                instancesTableModel.getContentAtRow(selectedInstanceIndex)
+                    .getPipelineInstance()
+                    .getId()).setVisible(true);
+        } catch (Exception e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this), "Failed to Restart Tasks",
+                e.getMessage(), e);
+        }
+    }
+
+    private void displayStatistics(ActionEvent evt) {
+        try {
+            new InstanceStatsDialog(SwingUtilities.getWindowAncestor(this),
+                instancesTableModel.getContentAtRow(selectedInstanceIndex).getPipelineInstance())
+                    .setVisible(true);
+        } catch (Exception e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this),
+                "Failed to Retrieve Performance Stats", e.getMessage(), e);
+        }
+    }
+
+    private void estimateCost(ActionEvent evt) {
+        try {
+            new InstanceCostEstimateDialog(SwingUtilities.getWindowAncestor(this),
+                instancesTableModel.getContentAtRow(selectedInstanceIndex).getPipelineInstance())
+                    .setVisible(true);
+        } catch (Throwable e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+        }
+    }
+
+    private void restartTasks(ActionEvent evt) {
+        instancesTasksPanel.restartTasks(null);
+    }
+
+    private void killTasks(ActionEvent evt) {
+        instancesTasksPanel.killTasks(null);
+    }
+
+    public ETable getTable() {
+        return instancesTable.getTable();
+    }
+
+    public void loadFromDatabase() {
+        try {
+            instancesTableModel.loadFromDatabase();
+        } catch (PipelineException e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+        }
+    }
+
+    public State getStateOfInstanceWithMaxid() {
+        return instancesTableModel.getStateOfInstanceWithMaxid();
+    }
+
+    public PipelineInstance selectedPipelineInstance() {
+        if (selectedInstanceIndex <= 0) {
+            return null;
+        }
+        return instancesTableModel.getContentAtRow(selectedInstanceIndex).getPipelineInstance();
+    }
+
+    @SuppressWarnings("serial")
+    static class InstancesTableModel extends AbstractDatabaseModel<InstanceEventInfo> {
+
+        private static final Logger log = LoggerFactory.getLogger(InstancesTableModel.class);
+
+        private static final String EVENT_NAME = "Event name";
+        private static final String[] COLUMN_NAMES = { "ID", "Pipeline name", EVENT_NAME, "Date",
+            "State", "P-time" };
+
+        private final PipelineInstanceCrudProxy pipelineInstanceCrud = new PipelineInstanceCrudProxy();
+        private final ZiggyEventCrudProxy ziggyEventCrud = new ZiggyEventCrudProxy();
+        private final PipelineInstanceFilter filter;
+        private List<InstanceEventInfo> instanceEventInfoList = new LinkedList<>();
+
+        public InstancesTableModel(PipelineInstanceFilter filter) {
+            this.filter = filter;
+        }
+
+        @Override
+        public void loadFromDatabase() {
+            SwingWorker<Void, Void> swingWorker = new SwingWorker<>() {
+
+                @Override
+                protected Void doInBackground() throws Exception {
+                    try {
+                        // Read the pipeline instances and associated events and merge them in a
+                        // map sorted by instance ID (the key).
+                        log.trace("filter={}", filter);
+                        Map<Long, InstanceEventInfo> instanceEventInfoById = new TreeMap<>();
+                        List<PipelineInstance> instances = pipelineInstanceCrud.retrieve(filter);
+                        for (PipelineInstance instance : instances) {
+                            instanceEventInfoById.putIfAbsent(instance.getId(),
+                                new InstanceEventInfo(instance, null));
+                        }
+                        for (ZiggyEvent ziggyEvent : ziggyEventCrud.retrieve(instances)) {
+                            instanceEventInfoById.computeIfPresent(
+                                ziggyEvent.getPipelineInstanceId(),
+                                (k, v) -> new InstanceEventInfo(v.getPipelineInstance(),
+                                    ziggyEvent));
+                        }
+
+                        // Use the sorted map to create a sorted list of container objects.
+                        instanceEventInfoList = new ArrayList<>(instanceEventInfoById.values());
+
+                        // TODO Delete once comfortable that the content is the same
+                        for (InstanceEventInfo instanceEventInfo : instanceEventInfoList) {
+                            log.trace("pipeline name: instance={}, event={}",
+                                instanceEventInfo.getPipelineInstance()
+                                    .getPipelineDefinition()
+                                    .getName(),
+                                instanceEventInfo.getZiggyEvent() != null
+                                    ? instanceEventInfo.getZiggyEvent().getPipelineName()
+                                    : "null");
+                            log.trace("date: instance={}, event={}",
+                                instanceEventInfo.getPipelineInstance().getStartProcessingTime(),
+                                instanceEventInfo.getZiggyEvent() != null
+                                    ? instanceEventInfo.getZiggyEvent().getEventTime()
+                                    : "null");
+                        }
+                    } catch (ConsoleSecurityException ignore) {
+                    }
+                    return null;
+                }
+
+                @Override
+                protected void done() {
+                    if (isModelValid()) {
+                        fireTableDataChanged();
+                    }
+                }
+            };
+            swingWorker.execute();
+        }
+
+        /**
+         * Returns the model ID corresponding to a selected pipeline instance ID. If the selected
+         * pipeline instance ID is less than zero, or if it is not present in the model, -1 is
+         * returned.
+         */
+        public int getModelIndexOfInstance(long instanceId) {
+            int modelId = -1;
+            if (instanceId < 0) {
+                return modelId;
+            }
+            for (int i = 0; i < instanceEventInfoList.size(); i++) {
+                if (instanceEventInfoList.get(i).getPipelineInstance().getId() == instanceId) {
+                    modelId = i;
+                    break;
+                }
+            }
+            return modelId;
+        }
+
+        /**
+         * Returns the state of the instance with max ID. Assumes that the list of instances is
+         * sorted ascending, which is the expected behavior of the PipelineInstanceCrudProxy
+         * retriever.
+         *
+         * @return State of instance with max ID number.
+         */
+        public State getStateOfInstanceWithMaxid() {
+            if (instanceEventInfoList.isEmpty()) {
+                return State.COMPLETED;
+            }
+            return instanceEventInfoList.get(instanceEventInfoList.size() - 1)
+                .getPipelineInstance()
+                .getState();
+        }
+
+        @Override
+        public int getRowCount() {
+            validityCheck();
+            return instanceEventInfoList.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            validityCheck();
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            validityCheck();
+            InstanceEventInfo instanceEventInfo = instanceEventInfoList.get(rowIndex);
+            PipelineInstance pipelineInstance = instanceEventInfo.getPipelineInstance();
+            ZiggyEvent ziggyEvent = instanceEventInfo.getZiggyEvent();
+
+            return switch (columnIndex) {
+                case 0 -> pipelineInstance.getId();
+                case 1 -> pipelineInstance.getPipelineDefinition().getName() + ": "
+                    + pipelineInstance.getName();
+                case 2 -> ziggyEvent != null ? ziggyEvent.getEventHandlerName() : "-";
+                case 3 -> ziggyEvent != null ? ziggyEvent.getEventTime()
+                    : pipelineInstance.getStartProcessingTime();
+                case 4 -> pipelineInstance.getState().toString();
+                case 5 -> pipelineInstance.elapsedTime();
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            validityCheck();
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public InstanceEventInfo getContentAtRow(int row) {
+            validityCheck();
+            return instanceEventInfoList.get(row);
+        }
+
+        @Override
+        public Class<InstanceEventInfo> tableModelContentClass() {
+            return InstanceEventInfo.class;
+        }
+    }
+
+    private static class InstanceEventInfo {
+        private PipelineInstance pipelineInstance;
+        private ZiggyEvent ziggyEvent;
+
+        public InstanceEventInfo(PipelineInstance pipelineInstance, ZiggyEvent ziggyEvent) {
+            this.pipelineInstance = pipelineInstance;
+            this.ziggyEvent = ziggyEvent;
+        }
+
+        public PipelineInstance getPipelineInstance() {
+            return pipelineInstance;
+        }
+
+        public ZiggyEvent getZiggyEvent() {
+            return ziggyEvent;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/InstancesTasksPanel.java b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesTasksPanel.java
new file mode 100644
index 0000000..83cc9b5
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesTasksPanel.java
@@ -0,0 +1,208 @@
+package gov.nasa.ziggy.ui.instances;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.swing.GroupLayout;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+import org.apache.commons.collections4.CollectionUtils;
+
+import gov.nasa.ziggy.module.remote.QueueCommandManager;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
+import gov.nasa.ziggy.pipeline.definition.ProcessingState;
+import gov.nasa.ziggy.services.messages.KillTasksRequest;
+import gov.nasa.ziggy.services.messages.NoRunningOrQueuedPipelinesMessage;
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.proxy.PipelineExecutorProxy;
+import gov.nasa.ziggy.ui.util.proxy.PipelineTaskCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.ProcessingSummaryOpsProxy;
+
+/**
+ * @author Todd Klaus
+ * @author PT
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class InstancesTasksPanel extends javax.swing.JPanel {
+    private InstancesPanel instancesPanel;
+
+    // Indices in the tasks table of the selected tasks. Not to be confused with the
+    // task IDs of the selected tasks (see below).
+    protected List<Integer> selectedTasksIndices = new ArrayList<>();
+
+    private static boolean instancesRemaining = true;
+
+    public InstancesTasksPanel() {
+
+        buildComponent();
+
+        // Subscribe to the NoRunningOrQueuedPipelinesMessage.
+        ZiggyMessenger.subscribe(NoRunningOrQueuedPipelinesMessage.class,
+            this::clearInstancesRemaining);
+    }
+
+    private void buildComponent() {
+
+        try {
+            instancesPanel = new InstancesPanel(this);
+            TasksPanel tasksPanel = new TasksPanel(this);
+
+            GroupLayout layout = new GroupLayout(this);
+            setLayout(layout);
+
+            layout.setHorizontalGroup(layout.createSequentialGroup()
+                .addComponent(instancesPanel)
+                .addComponent(tasksPanel));
+
+            layout.setVerticalGroup(
+                layout.createParallelGroup().addComponent(instancesPanel).addComponent(tasksPanel));
+
+            new InstancesTasksPanelAutoRefresh(instancesPanel.instancesTable(),
+                tasksPanel.tasksTableModel(), tasksPanel.taskStatusSummaryPanel()).start();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    /**
+     * Unified restart logic for all-tasks-in-instance restart or selected-tasks restart.
+     */
+    void restartTasks(Collection<Long> tasksToRestart) {
+
+        try {
+            PipelineInstance selectedInstance = instancesPanel.selectedPipelineInstance();
+            if (selectedInstance == null) {
+                return;
+            }
+
+            ProcessingSummaryOpsProxy attrOps = new ProcessingSummaryOpsProxy();
+            Map<Long, ProcessingSummary> taskAttrs = attrOps
+                .retrieveByInstanceId(selectedInstance.getId());
+
+            // Identify the tasks: for the first step, pull in all the tasks for the instance
+            // if we are responding to the instance restart menu item, or the selected tasks
+            // if we are responding to the tasks restart menu item.
+            PipelineTaskCrudProxy taskCrud = new PipelineTaskCrudProxy();
+            List<PipelineTask> selectedTasks = taskCrud.retrieveAll(selectedInstance);
+            if (!CollectionUtils.isEmpty(tasksToRestart)) { // selected tasks use case
+                selectedTasks = selectedTasks.stream()
+                    .filter(s -> tasksToRestart.contains(s.getId()))
+                    .collect(Collectors.toList());
+            }
+
+            // Filter the tasks to keep only the ones that are in the correct state for the
+            // selected restart mode.
+            List<PipelineTask> failedTasks = new ArrayList<>();
+            for (PipelineTask task : selectedTasks) {
+                ProcessingSummary attributes = taskAttrs.get(task.getId());
+                if (checkTaskState(task, attributes)) {
+                    failedTasks.add(task);
+                }
+            }
+
+            if (failedTasks.isEmpty()) {
+                JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(this),
+                    "No restart-ready tasks found!", "Restart tasks", JOptionPane.ERROR_MESSAGE);
+                return;
+            }
+
+            RunMode restartMode = RestartDialog.restartTasks(SwingUtilities.getWindowAncestor(this),
+                failedTasks, taskAttrs);
+
+            if (restartMode != null) {
+                PipelineExecutorProxy pipelineExecutor = new PipelineExecutorProxy();
+                pipelineExecutor.restartTasks(failedTasks, restartMode);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this), "Failed to restart tasks",
+                e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Tests whether a given {@link PipelineTask} is in an appropriate state for rerunning. At the
+     * moment this is a pretty simple method, but once we add reruns of completed tasks it will get
+     * more useful.
+     */
+    private boolean checkTaskState(PipelineTask task, ProcessingSummary attributes) {
+        return task.getState() == PipelineTask.State.ERROR
+            || attributes.getProcessingState() == ProcessingState.COMPLETE
+                && attributes.getFailedSubtaskCount() > 0;
+    }
+
+    /**
+     * Unified task-killing logic for all-tasks-in-instance or selected-tasks use-cases.
+     */
+    void killTasks(Collection<Long> taskIdsToKill) {
+
+        try {
+
+            PipelineInstance selectedInstance = instancesPanel.selectedPipelineInstance();
+            if (selectedInstance == null) {
+                return;
+            }
+
+            PipelineTaskCrudProxy taskCrud = new PipelineTaskCrudProxy();
+
+            // collect all the processing pipeline tasks.
+            List<PipelineTask> tasksToKill = taskCrud.retrieveAll(selectedInstance,
+                PipelineTask.State.PROCESSING);
+            tasksToKill
+                .addAll(taskCrud.retrieveAll(selectedInstance, PipelineTask.State.SUBMITTED));
+
+            if (!CollectionUtils.isEmpty(taskIdsToKill)) { // selected tasks use-case.
+                tasksToKill = tasksToKill.stream()
+                    .filter(s -> taskIdsToKill.contains(s.getId()))
+                    .collect(Collectors.toList());
+            }
+            if (CollectionUtils.isEmpty(tasksToKill)) {
+                JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(this),
+                    "No running tasks found!", "Kill tasks", JOptionPane.ERROR_MESSAGE);
+                return;
+            }
+
+            // are you sure you want to do this?
+            int confirm = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this),
+                "Confirm kill tasks?", "Confirm delete", JOptionPane.OK_CANCEL_OPTION);
+            if (confirm == JOptionPane.OK_OPTION) {
+
+                // Delete any local-execution tasks.
+                ZiggyMessenger.publish(new KillTasksRequest(tasksToKill));
+
+                // Delete any remote execution tasks.
+                QueueCommandManager queueCommandManager = QueueCommandManager.newInstance();
+                queueCommandManager.deleteJobsForPipelineTasks(tasksToKill);
+            } else {
+
+                // well, never mind then.
+                JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(this),
+                    "Delete tasks canceled", "Delete tasks", JOptionPane.OK_OPTION);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this), "Failed to kill jobs",
+                e.getMessage(), e);
+        }
+    }
+
+    public static boolean getInstancesRemaining() {
+        return instancesRemaining;
+    }
+
+    public static void setInstancesRemaining() {
+        instancesRemaining = true;
+    }
+
+    private <T extends PipelineMessage> void clearInstancesRemaining(T message) {
+        instancesRemaining = false;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/InstancesTasksPanelAutoRefresh.java b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesTasksPanelAutoRefresh.java
new file mode 100644
index 0000000..2d0939d
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/InstancesTasksPanelAutoRefresh.java
@@ -0,0 +1,141 @@
+package gov.nasa.ziggy.ui.instances;
+
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.SwingUtilities;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.services.messages.TaskCompletionNotification;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.ui.status.Indicator;
+import gov.nasa.ziggy.ui.status.StatusPanel;
+import gov.nasa.ziggy.ui.util.proxy.PipelineOperationsProxy;
+
+/**
+ * Performs and manages the automatic refresh of the Instances panel of the console. The class uses
+ * a ScheduledThreadPoolExecutor with 1 thread to perform the main action of waiting for specified
+ * intervals and then performing the refresh.
+ *
+ * @author PT
+ */
+public class InstancesTasksPanelAutoRefresh implements Runnable {
+
+    @SuppressWarnings("unused")
+    private static final Logger log = LoggerFactory.getLogger(InstancesTasksPanelAutoRefresh.class);
+
+    public static final long REFRESH_INTERVAL_MILLIS = 2500L;
+    private static final String WARNING_MESSAGE = "One or more tasks failed but execution continues";
+    private static final String ERROR_MESSAGE = "One or more tasks failed, execution halted";
+
+    private ScheduledThreadPoolExecutor pool = new ScheduledThreadPoolExecutor(1);
+    private final InstancesTable instancesTable;
+    private final TasksTableModel tasksTableModel;
+    private final TaskStatusSummaryPanel taskStatusSummaryPanel;
+
+    // Used to ensure that when an instance completes, a message is sent to the
+    // worker looking for queued instances; once that message is sent, it's not sent
+    // again until after the next instance completes.
+    private boolean instancesCheckMessageSent = false;
+
+    public InstancesTasksPanelAutoRefresh(InstancesTable instancesTable,
+        TasksTableModel tasksTableModel, TaskStatusSummaryPanel taskStatusSummaryPanel) {
+        this.instancesTable = instancesTable;
+        this.tasksTableModel = tasksTableModel;
+        this.taskStatusSummaryPanel = taskStatusSummaryPanel;
+
+        // Whenever a worker status message comes through, update the display.
+        ZiggyMessenger.subscribe(TaskCompletionNotification.class, message -> {
+            updatePanel();
+        });
+    }
+
+    @Override
+    public void run() {
+        Thread.currentThread().setName("OpsInstancePanelAutoRefresh");
+        updatePanel();
+    }
+
+    /**
+     * Asks the instance and task tables to update themselves. Updates the instance status light and
+     * task scoreboard in the event dispatch thread.
+     */
+    public void updatePanel() {
+        instancesTable.loadFromDatabase();
+        tasksTableModel.loadFromDatabase();
+        SwingUtilities.invokeLater(() -> {
+            setInstancesStatusLight(instancesTable.getStateOfInstanceWithMaxid());
+            taskStatusSummaryPanel.update(tasksTableModel);
+        });
+    }
+
+    /**
+     * Starts the thread pool activities by calling scheduleWithFixedDelay() with appropriate
+     * arguments.
+     */
+    public void start() {
+
+        // Send a request to find out whether any pipelines are running or queued. Since we
+        // automatically find out about running pipelines when the first refresh fires, this
+        // is mainly aimed at finding out about queued instances. But the receiver can't actually
+        // tell the difference between queued and running...
+        new PipelineOperationsProxy().sendRunningPipelinesCheckRequestMessage();
+
+        pool.scheduleWithFixedDelay(this, 0L, REFRESH_INTERVAL_MILLIS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Shuts down and destroys the thread pool.
+     */
+    public void stop() {
+        pool.shutdownNow();
+        pool = null;
+    }
+
+    /**
+     * Sets the "idiot light" for pipelines based on a PipelineInstance state. A gray indicator
+     * indicates that the selected instance was completed; green indicates initialized, processing,
+     * or queued; yellow indicates errors running status; red indicates stopped or errors stalled
+     * state. When an initialized or processing state is detected, the instancesRemaining member of
+     * the OpsInstancesPanel is set.
+     *
+     * @param instanceState PipelineInstance state to be encoded as the light color.
+     */
+    private void setInstancesStatusLight(PipelineInstance.State instanceState) {
+
+        boolean instancesRemaining = InstancesTasksPanel.getInstancesRemaining();
+        Indicator instancesIndicator = StatusPanel.ContentItem.PIPELINES.menuItem();
+        switch (instanceState) {
+            case COMPLETED:
+                if (instancesRemaining) {
+                    instancesIndicator.setState(Indicator.State.NORMAL);
+                    if (!instancesCheckMessageSent) {
+                        new PipelineOperationsProxy().sendRunningPipelinesCheckRequestMessage();
+                        instancesCheckMessageSent = true;
+                    }
+                } else {
+                    instancesIndicator.setState(Indicator.State.IDLE);
+                }
+                break;
+            case INITIALIZED:
+            case PROCESSING:
+                instancesIndicator.setState(Indicator.State.NORMAL);
+                InstancesTasksPanel.setInstancesRemaining();
+                instancesCheckMessageSent = false;
+                break;
+            case ERRORS_RUNNING:
+                instancesIndicator.setState(Indicator.State.WARNING, WARNING_MESSAGE);
+                break;
+            case ERRORS_STALLED:
+            case STOPPED:
+                instancesIndicator.setState(Indicator.State.ERROR, ERROR_MESSAGE);
+                break;
+            default:
+                throw new IllegalStateException(
+                    "Unsupported pipeline instance state " + instanceState.toString());
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/ParameterSetViewDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/ParameterSetViewDialog.java
new file mode 100644
index 0000000..a667d6f
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/ParameterSetViewDialog.java
@@ -0,0 +1,73 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.Map;
+
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class ParameterSetViewDialog extends javax.swing.JDialog {
+
+    public ParameterSetViewDialog(Window owner,
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetsMap) {
+
+        super(owner);
+
+        buildComponent(parameterSetsMap);
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent(
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetsMap) {
+        setTitle("View parameter sets");
+
+        getContentPane().add(createDataPanel(parameterSetsMap), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(createButton(CLOSE, this::close)),
+            BorderLayout.SOUTH);
+
+        setMinimumSize(ZiggySwingUtils.MIN_DIALOG_SIZE);
+        pack();
+    }
+
+    private JPanel createDataPanel(
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetsMap) {
+        ParameterSetViewPanel parameterSetViewPanel = new ParameterSetViewPanel(parameterSetsMap);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(
+            dataPanelLayout.createParallelGroup().addComponent(parameterSetViewPanel));
+
+        dataPanelLayout.setVerticalGroup(
+            dataPanelLayout.createSequentialGroup().addComponent(parameterSetViewPanel));
+
+        return dataPanel;
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new ParameterSetViewDialog(null, null));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/ParameterSetViewPanel.java b/src/main/java/gov/nasa/ziggy/ui/instances/ParameterSetViewPanel.java
new file mode 100644
index 0000000..d5f3b4d
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/ParameterSetViewPanel.java
@@ -0,0 +1,141 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.models.AbstractZiggyTableModel;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * Display a {@link Map} from {@link ClassWrapper} instances to {@link ParameterSet} instances in
+ * read-only mode. Used for viewing the parameters used for a particular pipeline instance.
+ *
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class ParameterSetViewPanel extends javax.swing.JPanel {
+    private ZiggyTable<ParameterSet> ziggyTable;
+
+    public ParameterSetViewPanel(
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetsMap) {
+        buildComponent(parameterSetsMap);
+    }
+
+    private void buildComponent(
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetsMap) {
+        setLayout(new BorderLayout());
+
+        add(createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton("View", this::viewParameterSet)), BorderLayout.NORTH);
+        add(createDataPanel(parameterSetsMap), BorderLayout.CENTER);
+    }
+
+    private JPanel createDataPanel(
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetsMap) {
+
+        ziggyTable = new ZiggyTable<>(new ParameterSetTableModel(parameterSetsMap));
+
+        JPanel growPanel = new JPanel(new BorderLayout());
+        growPanel.add(new JScrollPane(ziggyTable.getTable()));
+
+        return growPanel;
+    }
+
+    private void viewParameterSet(ActionEvent evt) {
+        int selectedModelRow = ziggyTable.convertRowIndexToModel(ziggyTable.getSelectedRow());
+
+        if (selectedModelRow == -1) {
+            MessageUtil.showError(this, "No parameter set selected");
+        } else {
+            new ViewParametersDialog(SwingUtilities.getWindowAncestor(this),
+                ziggyTable.getContentAtViewRow(selectedModelRow)).setVisible(true);
+        }
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new ParameterSetViewPanel(null));
+    }
+
+    private static class ParameterSetTableModel extends AbstractZiggyTableModel<ParameterSet> {
+
+        private static final String[] COLUMN_NAMES = { "Type", "Name" };
+
+        protected List<ParameterSet> paramSets = new ArrayList<>();
+        protected List<ClassWrapper<ParametersInterface>> paramSetTypes = new ArrayList<>();
+
+        public ParameterSetTableModel(
+            Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetsMap) {
+            update(parameterSetsMap);
+        }
+
+        public void update(Map<ClassWrapper<ParametersInterface>, ParameterSet> parameterSetsMap) {
+            paramSets.clear();
+            paramSetTypes.clear();
+
+            if (parameterSetsMap != null) {
+                for (ClassWrapper<ParametersInterface> classWrapper : parameterSetsMap.keySet()) {
+                    ParameterSet paramSet = parameterSetsMap.get(classWrapper);
+
+                    paramSets.add(paramSet);
+                    paramSetTypes.add(classWrapper);
+                }
+            }
+
+            fireTableDataChanged();
+        }
+
+        @Override
+        public int getRowCount() {
+            return paramSets.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            ParameterSet paramSet = paramSets.get(rowIndex);
+            ClassWrapper<ParametersInterface> paramSetType = paramSetTypes.get(rowIndex);
+
+            return switch (columnIndex) {
+                case 0 -> paramSetType.getClazz().getSimpleName();
+                case 1 -> paramSet.getName();
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public Class<ParameterSet> tableModelContentClass() {
+            return ParameterSet.class;
+        }
+
+        @Override
+        public ParameterSet getContentAtRow(int row) {
+            return paramSets.get(row);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RefreshPanelListener.java b/src/main/java/gov/nasa/ziggy/ui/instances/RefreshPanelListener.java
similarity index 64%
rename from src/main/java/gov/nasa/ziggy/ui/ops/instances/RefreshPanelListener.java
rename to src/main/java/gov/nasa/ziggy/ui/instances/RefreshPanelListener.java
index 9446622..ff20560 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RefreshPanelListener.java
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/RefreshPanelListener.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.ops.instances;
+package gov.nasa.ziggy.ui.instances;
 
 public interface RefreshPanelListener {
     void refreshNowPressed();
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/RestartDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/RestartDialog.java
new file mode 100644
index 0000000..637fe29
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/RestartDialog.java
@@ -0,0 +1,309 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.RESTART;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableCellEditor;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
+import gov.nasa.ziggy.pipeline.definition.ProcessingState;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class RestartDialog extends javax.swing.JDialog {
+    private static final Logger log = LoggerFactory.getLogger(RestartDialog.class);
+
+    private RestartTableModel restartTableModel;
+    private boolean cancelled;
+
+    public RestartDialog(Window owner, List<PipelineTask> failedTasks,
+        Map<Long, ProcessingSummary> taskAttrs) {
+
+        super(owner, DEFAULT_MODALITY_TYPE);
+
+        buildComponent(failedTasks, taskAttrs);
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent(List<PipelineTask> failedTasks,
+        Map<Long, ProcessingSummary> taskAttrs) {
+
+        setTitle("Restart failed tasks");
+
+        getContentPane().add(createDataPanel(failedTasks, taskAttrs), BorderLayout.CENTER);
+        getContentPane().add(ZiggySwingUtils.createButtonPanel(createButton(RESTART, this::restart),
+            createButton(CANCEL, this::cancel)), BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private JScrollPane createDataPanel(List<PipelineTask> failedTasks,
+        Map<Long, ProcessingSummary> taskAttrs) {
+        return new JScrollPane(createRestartTable(failedTasks, taskAttrs));
+    }
+
+    private JTable createRestartTable(List<PipelineTask> failedTasks,
+        Map<Long, ProcessingSummary> taskAttrs) {
+
+        restartTableModel = new RestartTableModel(failedTasks, taskAttrs);
+
+        List<RestartAttributes> modules = restartTableModel.getModuleList();
+        final List<TableCellEditor> editors = new ArrayList<>();
+
+        for (RestartAttributes module : modules) {
+            editors.add(
+                new DefaultCellEditor(new JComboBox<>(new Vector<>(module.getRestartModes()))));
+        }
+
+        JTable table = new JTable(restartTableModel) {
+            // Determine editor to be used by row
+            @Override
+            public TableCellEditor getCellEditor(int row, int column) {
+                int modelColumn = convertColumnIndexToModel(column);
+
+                if (modelColumn == 3) {
+                    return editors.get(row);
+                }
+                return super.getCellEditor(row, column);
+            }
+        };
+
+        table.setPreferredScrollableViewportSize(new Dimension(750, 350));
+
+        return table;
+    }
+
+    private void restart(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void cancel(ActionEvent evt) {
+        cancelled = true;
+        setVisible(false);
+    }
+
+    // TODO Return Map<PipelineTask, RunMode> and delete this comment
+    // Note that the restartAttrs variable is clobbered during the loop and the last task wins.
+    // Given that what eventually happens is that each task gets its own restart message, and
+    // the restart message includes the restart mode, the right thing to do is probably to
+    // change the logic such that a Map<PipelineTask, RunMode> is returned and then passed to
+    // the PipelineExecutorProxy. That way we can be sure that we’re doing the right thing.
+    public static RunMode restartTasks(Window owner, List<PipelineTask> failedTasks,
+        Map<Long, ProcessingSummary> taskAttrs) {
+
+        RestartDialog dialog = new RestartDialog(owner, failedTasks, taskAttrs);
+        dialog.cancelled = false;
+        dialog.setVisible(true);
+        if (dialog.cancelled) {
+            log.info("Restart cancelled by user");
+            return null;
+        }
+
+        RestartAttributes restartAttrs = null;
+        Map<String, RestartAttributes> moduleMap = dialog.restartTableModel.getModuleMap();
+
+        for (PipelineTask failedTask : failedTasks) {
+            String moduleName = failedTask.getModuleName();
+
+            ProcessingSummary attrs = taskAttrs.get(failedTask.getId());
+            String pState = ProcessingState.INITIALIZING.toString();
+
+            if (attrs != null) {
+                pState = attrs.getProcessingState().shortName();
+            }
+
+            String key = RestartAttributes.key(moduleName, pState);
+
+            restartAttrs = moduleMap.get(key);
+
+            log.info("Set task " + failedTask.getId() + " restartMode to "
+                + restartAttrs.getSelectedRestartMode());
+        }
+        return restartAttrs.getSelectedRestartMode();
+    }
+
+    private static class RestartTableModel extends AbstractTableModel {
+        private static final Logger log = LoggerFactory.getLogger(RestartTableModel.class);
+
+        private final List<RestartAttributes> moduleList;
+        private final Map<String, RestartAttributes> moduleMap;
+
+        public RestartTableModel(List<PipelineTask> failedTasks,
+            Map<Long, ProcessingSummary> taskAttrMap) {
+            moduleMap = new HashMap<>();
+
+            for (PipelineTask task : failedTasks) {
+                String moduleName = task.getModuleName();
+                String pState = ProcessingState.INITIALIZING.toString();
+
+                ProcessingSummary taskAttrs = taskAttrMap.get(task.getId());
+                if (taskAttrs != null) {
+                    pState = taskAttrs.getProcessingState().shortName();
+                }
+
+                String key = RestartAttributes.key(moduleName, pState);
+
+                RestartAttributes module = moduleMap.get(key);
+
+                if (module == null) {
+                    List<RunMode> supportedModes = task.getModuleImplementation()
+                        .supportedRestartModes();
+                    RunMode selectedMode = supportedModes.get(0);
+
+                    module = new RestartAttributes(moduleName, pState, 1, supportedModes,
+                        selectedMode);
+
+                    moduleMap.put(key, module);
+                } else {
+                    module.incrementCount();
+                }
+            }
+
+            moduleList = new LinkedList<>(moduleMap.values());
+
+            log.debug("moduleList.size() = " + moduleList.size());
+        }
+
+        @Override
+        public int getRowCount() {
+            return moduleList.size();
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            log.debug("getValueAt(r=" + rowIndex + ", c=" + columnIndex + ")");
+
+            RestartAttributes restartGroup = moduleList.get(rowIndex);
+
+            return switch (columnIndex) {
+                case 0 -> restartGroup.getModuleName();
+                case 1 -> restartGroup.getProcessingState();
+                case 2 -> restartGroup.getCount();
+                case 3 -> restartGroup.getSelectedRestartMode();
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        @Override
+        public int getColumnCount() {
+            return 4;
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return switch (column) {
+                case 0 -> "Module";
+                case 1 -> "P-state";
+                case 2 -> "Count";
+                case 3 -> "Restart mode";
+                default -> throw new IllegalArgumentException("Unexpected value: " + column);
+            };
+        }
+
+        @Override
+        public boolean isCellEditable(int rowIndex, int columnIndex) {
+            if (columnIndex == 3) {
+                return true;
+            }
+            return super.isCellEditable(rowIndex, columnIndex);
+        }
+
+        @Override
+        public void setValueAt(Object value, int rowIndex, int columnIndex) {
+            log.debug(
+                "setValueAt(r=" + rowIndex + ", c=" + columnIndex + ", value-=" + value + ")");
+
+            if (columnIndex != 3) {
+                throw new IllegalArgumentException("read-only columnIndex = " + columnIndex);
+            }
+            RestartAttributes module = moduleList.get(rowIndex);
+            module.setSelectedRestartMode((RunMode) value);
+        }
+
+        public List<RestartAttributes> getModuleList() {
+            return moduleList;
+        }
+
+        public Map<String, RestartAttributes> getModuleMap() {
+            return moduleMap;
+        }
+    }
+
+    /**
+     * @author Todd Klaus
+     */
+    private static class RestartAttributes {
+        private final String moduleName;
+        private final String processingState;
+        private int count;
+        private final List<RunMode> restartModes;
+        private RunMode selectedRestartMode;
+
+        public RestartAttributes(String moduleName, String processingState, int count,
+            List<RunMode> restartModes, RunMode selectedRestartMode) {
+            this.moduleName = moduleName;
+            this.processingState = processingState;
+            this.count = count;
+            this.restartModes = restartModes;
+            this.selectedRestartMode = selectedRestartMode;
+        }
+
+        public static String key(String moduleName, String pState) {
+            return moduleName + ":" + pState;
+        }
+
+        public void incrementCount() {
+            count++;
+        }
+
+        public String getModuleName() {
+            return moduleName;
+        }
+
+        public String getProcessingState() {
+            return processingState;
+        }
+
+        public int getCount() {
+            return count;
+        }
+
+        public List<RunMode> getRestartModes() {
+            return restartModes;
+        }
+
+        public RunMode getSelectedRestartMode() {
+            return selectedRestartMode;
+        }
+
+        public void setSelectedRestartMode(RunMode selectedRestartMode) {
+            this.selectedRestartMode = selectedRestartMode;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/SingleTaskLogDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/SingleTaskLogDialog.java
new file mode 100644
index 0000000..90a684e
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/SingleTaskLogDialog.java
@@ -0,0 +1,189 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REFRESH;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.TO_BOTTOM;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.TO_TOP;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.GroupLayout;
+import javax.swing.GroupLayout.Alignment;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingWorker;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.services.logging.TaskLogInformation;
+import gov.nasa.ziggy.services.messages.SingleTaskLogMessage;
+import gov.nasa.ziggy.services.messages.SingleTaskLogRequest;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.proxy.PipelineTaskCrudProxy;
+import gov.nasa.ziggy.util.Requestor;
+
+/**
+ * @author Bill Wohler
+ */
+public class SingleTaskLogDialog extends javax.swing.JDialog implements Requestor {
+
+    private static final Logger log = LoggerFactory.getLogger(TaskLogInformationDialog.class);
+    private static final long serialVersionUID = 20230817L;
+    private static final long LOG_CONTENT_TIMEOUT_MILLIS = 2000L;
+
+    private JLabel taskLogLabel;
+    private JTextArea textArea;
+    private JScrollPane textScrollPane;
+
+    private TaskLogInformation taskLogInformation;
+    private SingleTaskLogMessage currentMessage;
+    private CountDownLatch taskLogMessageCountdownLatch;
+
+    private final UUID uuid = UUID.randomUUID();
+
+    public SingleTaskLogDialog(Window owner, TaskLogInformation taskLogInformation) {
+
+        super(owner, ModalityType.MODELESS);
+        this.taskLogInformation = taskLogInformation;
+        buildComponent();
+        setLocationRelativeTo(owner);
+
+        ZiggyMessenger.subscribe(SingleTaskLogMessage.class, message -> {
+            if (isDestination(message)) {
+                currentMessage = message;
+                taskLogMessageCountdownLatch.countDown();
+            }
+        });
+    }
+
+    private void buildComponent() {
+        setTitle(taskLogInformation.getFilename() + " - Task log");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(ZiggySwingUtils.createButton(REFRESH, this::refresh),
+            ZiggySwingUtils.createButton(CLOSE, this::close)), BorderLayout.SOUTH);
+
+        refresh();
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        taskLogLabel = new JLabel();
+
+        JPanel navButtons = createButtonPanel(ZiggySwingUtils.createButton(TO_TOP, this::topOfLog),
+            ZiggySwingUtils.createButton(TO_BOTTOM, this::bottomOfLog));
+
+        textArea = new JTextArea();
+        textArea.setEditable(false);
+
+        textScrollPane = new JScrollPane(textArea);
+        textScrollPane.setPreferredSize(new Dimension(1300, 800));
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGap(10) // just enough to get the label away from the edge
+                .addComponent(taskLogLabel)
+                .addComponent(navButtons))
+            .addComponent(textScrollPane));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addGroup(dataPanelLayout.createParallelGroup(Alignment.CENTER)
+                .addComponent(taskLogLabel)
+                .addComponent(navButtons, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                    GroupLayout.PREFERRED_SIZE))
+            .addComponent(textScrollPane));
+
+        return dataPanel;
+    }
+
+    private void topOfLog(ActionEvent evt) {
+        JScrollBar verticalScrollBar = textScrollPane.getVerticalScrollBar();
+        verticalScrollBar.setValue(verticalScrollBar.getMinimum());
+    }
+
+    private void bottomOfLog(ActionEvent evt) {
+        JScrollBar verticalScrollBar = textScrollPane.getVerticalScrollBar();
+        verticalScrollBar.setValue(verticalScrollBar.getMaximum());
+    }
+
+    private void refresh(ActionEvent evt) {
+        refresh();
+    }
+
+    /**
+     * Refreshes the contents of the dialog box.
+     */
+    private void refresh() {
+        new SwingWorker<String, Void>() {
+
+            @Override
+            protected String doInBackground() throws Exception {
+
+                // Retrieve the task from the database
+                PipelineTask task = new PipelineTaskCrudProxy()
+                    .retrieve(taskLogInformation.getTaskId());
+                log.debug("selected task id = " + task.getId());
+                taskLogLabel.setText(task.taskLabelText());
+
+                // Request the log contents from the supervisor
+                taskLogMessageCountdownLatch = new CountDownLatch(1);
+                SingleTaskLogRequest.requestSingleTaskLog(SingleTaskLogDialog.this,
+                    taskLogInformation);
+
+                // Wait for the task log to be delivered, but don't wait too long.
+                if (!taskLogMessageCountdownLatch.await(LOG_CONTENT_TIMEOUT_MILLIS,
+                    TimeUnit.MILLISECONDS)) {
+                    MessageUtil.showError(rootPane, "Log request timed out.");
+                    return null;
+                }
+
+                // Strip the task log out of the message, and then send the message
+                // itself to Davy Jones' Locker.
+                String taskLogContents = currentMessage.taskLogContents();
+                currentMessage = null;
+                return taskLogContents;
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    String updatedText = get();
+                    if (updatedText == null) {
+                        return;
+                    }
+                    textArea.setText(updatedText);
+                } catch (InterruptedException | ExecutionException e) {
+                    MessageUtil.showError(rootPane, e);
+                }
+            }
+        }.execute();
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    @Override
+    public UUID requestorIdentifier() {
+        return uuid;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/TaskInfoDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/TaskInfoDialog.java
new file mode 100644
index 0000000..d45666a
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/TaskInfoDialog.java
@@ -0,0 +1,189 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+import gov.nasa.ziggy.util.dispmod.DisplayModel;
+import gov.nasa.ziggy.util.dispmod.TaskMetricsDisplayModel.ModuleTaskMetrics;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class TaskInfoDialog extends javax.swing.JDialog {
+    private PipelineTask pipelineTask;
+
+    public TaskInfoDialog(Window owner, PipelineTask pipelineTask) {
+        super(owner);
+        this.pipelineTask = pipelineTask;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Pipeline task details");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(createButton(CLOSE, this::close)),
+            BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private JPanel createDataPanel() {
+        JLabel idLabel = boldLabel("ID:");
+        JLabel idTextField = new JLabel(pipelineTask.getId() + "");
+
+        JLabel stateLabel = boldLabel("State:");
+        JLabel stateTextField = new JLabel(pipelineTask.getState().toString());
+
+        JLabel moduleLabel = boldLabel("Module:");
+        JLabel moduleTextField = new JLabel(
+            pipelineTask.getPipelineInstanceNode().getPipelineModuleDefinition().getName() + "");
+
+        JLabel uowLabel = boldLabel("Unit of work:");
+        JLabel uowTextField = new JLabel(pipelineTask.uowTaskInstance().briefState());
+
+        JLabel workerLabel = boldLabel("Worker:");
+        JLabel workerTextField = new JLabel(pipelineTask.getWorkerName());
+        JLabel workerHelpLabel = new JLabel("(host:thread)");
+
+        JLabel startLabel = boldLabel("Started:");
+        JLabel startTextField = new JLabel(
+            DisplayModel.formatDate(pipelineTask.getStartProcessingTime()));
+
+        JLabel endLabel = boldLabel("Completed:");
+        JLabel endTextField = new JLabel(
+            DisplayModel.formatDate(pipelineTask.getEndProcessingTime()));
+
+        JLabel createdLabel = boldLabel("Created:");
+        JLabel createdTextField = new JLabel(DisplayModel.formatDate(pipelineTask.getCreated()));
+
+        JLabel revisionLabel = boldLabel("Software revision:");
+        JLabel revisionTextField = new JLabel(pipelineTask.getSoftwareRevision());
+
+        JLabel failureCountLabel = boldLabel("Failure count:");
+        JLabel failureCountTextField = new JLabel(Integer.toString(pipelineTask.getFailureCount()));
+
+        JLabel transitionLabel = boldLabel("Transition complete:");
+        JCheckBox transitionCheckBox = new JCheckBox();
+        transitionCheckBox.setSelected(pipelineTask.isTransitionComplete());
+        transitionCheckBox.setEnabled(false);
+
+        ZiggyTable<ModuleTaskMetrics> processingBreakdownTable = createProcessingBreakdownTable();
+        JScrollPane processingBreakdownTableScrollPane = new JScrollPane(
+            processingBreakdownTable.getTable());
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanelLayout.setAutoCreateGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createSequentialGroup()
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addGroup(dataPanelLayout.createSequentialGroup()
+                    .addGroup(dataPanelLayout.createParallelGroup()
+                        .addComponent(idLabel)
+                        .addComponent(stateLabel)
+                        .addComponent(moduleLabel)
+                        .addComponent(uowLabel)
+                        .addComponent(workerLabel)
+                        .addComponent(startLabel)
+                        .addComponent(endLabel)
+                        .addComponent(createdLabel)
+                        .addComponent(revisionLabel)
+                        .addComponent(failureCountLabel)
+                        .addComponent(transitionLabel))
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addGroup(dataPanelLayout.createParallelGroup()
+                        .addComponent(idTextField)
+                        .addComponent(stateTextField)
+                        .addComponent(moduleTextField)
+                        .addComponent(uowTextField)
+                        .addGroup(dataPanelLayout.createSequentialGroup()
+                            .addComponent(workerTextField)
+                            .addComponent(workerHelpLabel))
+                        .addComponent(startTextField)
+                        .addComponent(endTextField)
+                        .addComponent(createdTextField)
+                        .addComponent(revisionTextField)
+                        .addComponent(failureCountTextField)
+                        .addComponent(transitionCheckBox)))
+                .addComponent(processingBreakdownTableScrollPane)));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(idLabel)
+                .addComponent(idTextField))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(stateLabel)
+                .addComponent(stateTextField))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(moduleLabel)
+                .addComponent(moduleTextField))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(uowLabel)
+                .addComponent(uowTextField))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(workerLabel)
+                .addComponent(workerTextField)
+                .addComponent(workerHelpLabel))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(startLabel)
+                .addComponent(startTextField))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(endLabel)
+                .addComponent(endTextField))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(createdLabel)
+                .addComponent(createdTextField))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(revisionLabel)
+                .addComponent(revisionTextField))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(failureCountLabel)
+                .addComponent(failureCountTextField))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(transitionLabel)
+                .addComponent(transitionCheckBox))
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(processingBreakdownTableScrollPane));
+
+        return dataPanel;
+    }
+
+    private ZiggyTable<ModuleTaskMetrics> createProcessingBreakdownTable() {
+        TaskMetricsTableModel processingBreakdownTableModel = new TaskMetricsTableModel(
+            List.of(pipelineTask),
+            List.of(pipelineTask.getPipelineInstanceNode().getPipelineModuleDefinition().getName()),
+            false);
+        return new ZiggyTable<>(processingBreakdownTableModel);
+    }
+
+    public static void showTaskInfoDialog(Window owner, PipelineTask pipelineTask) {
+        new TaskInfoDialog(owner, pipelineTask).setVisible(true);
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/TaskLogInformationDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/TaskLogInformationDialog.java
new file mode 100644
index 0000000..752a121
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/TaskLogInformationDialog.java
@@ -0,0 +1,319 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REFRESH;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.GroupLayout;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.SwingWorker;
+import javax.swing.table.AbstractTableModel;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask.State;
+import gov.nasa.ziggy.services.logging.TaskLogInformation;
+import gov.nasa.ziggy.services.messages.TaskLogInformationMessage;
+import gov.nasa.ziggy.services.messages.TaskLogInformationRequest;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.ui.util.HtmlBuilder;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.proxy.PipelineTaskCrudProxy;
+import gov.nasa.ziggy.util.Requestor;
+
+/**
+ * Dialog box that presents the user with a table of all log files for a given task, with types,
+ * sizes, etc. The user can then double-click on a row in the table to view the corresponding log
+ * file in full.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class TaskLogInformationDialog extends JDialog implements Requestor {
+
+    private static final Logger log = LoggerFactory.getLogger(TaskLogInformationDialog.class);
+    private static final long LOG_CONTENT_TIMEOUT_MILLIS = 2000L;
+
+    private static final long serialVersionUID = 20230817L;
+
+    private final long taskId;
+    private JLabel instanceText;
+    private JLabel workerText;
+    private JLabel moduleText;
+    private JLabel uowText;
+    private JLabel elapsedTimeText;
+    private JLabel stateText;
+    private TaskLogInformationTableModel taskLogTableModel;
+    private TaskLogInformationMessage currentMessage;
+
+    private CountDownLatch taskInfoRequestCountdownLatch;
+
+    private final UUID uuid = UUID.randomUUID();
+
+    public TaskLogInformationDialog(Window owner, PipelineTask pipelineTask) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        taskId = pipelineTask.getId();
+
+        // Subscribe to TaskLogInformationMessage instances, since this panel needs to
+        // get access to those messages.
+        ZiggyMessenger.subscribe(TaskLogInformationMessage.class, message -> {
+            if (isDestination(message)) {
+
+                // Store the message so that our SwingWorker can access it, and count
+                // down the CountDownLatch so the SwingWorker unblocks.
+                currentMessage = message;
+                taskInfoRequestCountdownLatch.countDown();
+            }
+        });
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Task log");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(ZiggySwingUtils.createButton(REFRESH, this::refresh),
+            ZiggySwingUtils.createButton(CLOSE, this::close)), BorderLayout.SOUTH);
+
+        refresh();
+        pack();
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+    }
+
+    private JPanel createDataPanel() {
+        JLabel instance = boldLabel("ID:");
+        instanceText = new JLabel();
+
+        JLabel worker = boldLabel("Worker:");
+        workerText = new JLabel();
+
+        JLabel module = boldLabel("Task:");
+        moduleText = new JLabel();
+
+        JLabel uow = boldLabel("UOW:");
+        uowText = new JLabel();
+
+        JLabel state = boldLabel("State:");
+        stateText = new JLabel();
+
+        JLabel elapsedTime = boldLabel("Elapsed time:");
+        elapsedTimeText = new JLabel();
+
+        JScrollPane taskLogScrollPane = new JScrollPane(createTaskLogTable());
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanelLayout.setAutoCreateGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(instance)
+                    .addComponent(worker)
+                    .addComponent(module)
+                    .addComponent(uow)
+                    .addComponent(state)
+                    .addComponent(elapsedTime))
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(instanceText)
+                    .addComponent(workerText)
+                    .addComponent(moduleText)
+                    .addComponent(uowText)
+                    .addComponent(stateText)
+                    .addComponent(elapsedTimeText)))
+            .addComponent(taskLogScrollPane));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(instance)
+                .addComponent(instanceText))
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(worker).addComponent(workerText))
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(module).addComponent(moduleText))
+            .addGroup(dataPanelLayout.createParallelGroup().addComponent(uow).addComponent(uowText))
+            .addGroup(
+                dataPanelLayout.createParallelGroup().addComponent(state).addComponent(stateText))
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(elapsedTime)
+                .addComponent(elapsedTimeText))
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(taskLogScrollPane));
+
+        return dataPanel;
+    }
+
+    private JTable createTaskLogTable() {
+        taskLogTableModel = new TaskLogInformationTableModel();
+        JTable taskLogTable = new JTable(taskLogTableModel);
+        taskLogTable.setPreferredScrollableViewportSize(new Dimension(750, 300));
+        taskLogTable.setCellSelectionEnabled(false);
+        taskLogTable.setRowSelectionAllowed(true);
+        taskLogTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent evt) {
+
+                // On double-click, select the desired row and retrieve the corresponding log.
+                int row = taskLogTable.rowAtPoint(evt.getPoint());
+                if (evt.getClickCount() == 2 && row != -1) {
+                    TaskLogInformation logInfo = taskLogTableModel.taskLogInformation(row);
+                    log.info("Obtaining log file: " + logInfo.getFilename());
+                    try {
+                        new SingleTaskLogDialog(TaskLogInformationDialog.this, logInfo)
+                            .setVisible(true);
+                    } catch (Throwable e) {
+                        MessageUtil.showError(TaskLogInformationDialog.this, null, e.getMessage(),
+                            e);
+                    }
+                }
+            }
+        });
+
+        return taskLogTable;
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void refresh(ActionEvent evt) {
+        refresh();
+    }
+
+    /**
+     * Refreshes the {@link TaskLogInformationDialog}.
+     */
+    public void refresh() {
+        new SwingWorker<Set<TaskLogInformation>, Void>() {
+
+            @Override
+            protected Set<TaskLogInformation> doInBackground() throws Exception {
+
+                // Get the pipeline task up-to-date information from the database.
+                PipelineTask task = new PipelineTaskCrudProxy().retrieve(taskId);
+                log.debug("selected task id = " + taskId);
+                instanceText.setText(Long.toString(task.getPipelineInstance().getId()));
+                workerText.setText(task.getWorkerName());
+                moduleText.setText(task.getModuleName());
+                uowText.setText(task.uowTaskInstance().briefState());
+                stateText.setText(HtmlBuilder.htmlBuilder()
+                    .appendBoldColor(task.getState().toString(),
+                        task.getState() == State.ERROR ? "red" : "green")
+                    .toString());
+                elapsedTimeText.setText(task.elapsedTime());
+
+                // Request the task log information.
+                taskInfoRequestCountdownLatch = new CountDownLatch(1);
+                TaskLogInformationRequest.requestTaskLogInformation(TaskLogInformationDialog.this,
+                    task);
+
+                // Wait for the task log to be delivered, but don't wait too long.
+                if (!taskInfoRequestCountdownLatch.await(LOG_CONTENT_TIMEOUT_MILLIS,
+                    TimeUnit.MILLISECONDS)) {
+                    MessageUtil.showError(rootPane, "Request for task log list timed out.");
+                    return null;
+                }
+
+                // Strip the TaskLogInformation out of the message and send the message
+                // itself to Davy Jones' locker.
+                Set<TaskLogInformation> updatedTaskLogInformation = currentMessage
+                    .taskLogInformation();
+                currentMessage = null;
+
+                return updatedTaskLogInformation;
+            }
+
+            @Override
+            public void done() {
+                try {
+                    Set<TaskLogInformation> taskLogInformation = get();
+                    if (taskLogInformation == null) {
+                        return;
+                    }
+                    taskLogTableModel.setTaskLogInformation(taskLogInformation);
+                } catch (InterruptedException | ExecutionException e) {
+                    MessageUtil.showError(rootPane, e);
+                }
+            }
+        }.execute();
+    }
+
+    @Override
+    public UUID requestorIdentifier() {
+        return uuid;
+    }
+
+    private static class TaskLogInformationTableModel extends AbstractTableModel {
+
+        private static final long serialVersionUID = 20230817L;
+
+        private static final String[] COLUMN_NAMES = { "Name", "Type", "Modified", "Size" };
+
+        private List<TaskLogInformation> taskLogInformationList = new ArrayList<>();
+
+        public void setTaskLogInformation(Set<TaskLogInformation> taskLogInformation) {
+            taskLogInformationList = new ArrayList<>(taskLogInformation.size());
+            taskLogInformationList.addAll(taskLogInformation);
+            fireTableDataChanged();
+        }
+
+        @Override
+        public int getRowCount() {
+            return taskLogInformationList.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public String getColumnName(int columnIndex) {
+            return COLUMN_NAMES[columnIndex];
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            TaskLogInformation information = taskLogInformationList.get(rowIndex);
+            return switch (columnIndex) {
+                case 0 -> information.getFilename();
+                case 1 -> information.getLogType().toString();
+                case 2 -> information.lastModifiedDateTime();
+                case 3 -> information.logFileSizeEngineeringNotation();
+                default -> throw new IllegalArgumentException(
+                    "Illegal column number: " + columnIndex);
+            };
+        }
+
+        public TaskLogInformation taskLogInformation(int rowIndex) {
+            return taskLogInformationList.get(rowIndex);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskMetricsTableModel.java b/src/main/java/gov/nasa/ziggy/ui/instances/TaskMetricsTableModel.java
similarity index 72%
rename from src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskMetricsTableModel.java
rename to src/main/java/gov/nasa/ziggy/ui/instances/TaskMetricsTableModel.java
index 2f32ac9..d009d00 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskMetricsTableModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/TaskMetricsTableModel.java
@@ -1,26 +1,24 @@
-package gov.nasa.ziggy.ui.ops.instances;
+package gov.nasa.ziggy.ui.instances;
 
 import java.util.List;
 
 import javax.swing.table.AbstractTableModel;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
 import gov.nasa.ziggy.util.dispmod.TaskMetricsDisplayModel;
+import gov.nasa.ziggy.util.dispmod.TaskMetricsDisplayModel.ModuleTaskMetrics;
 
 /**
  * @author Todd Klaus
  */
 @SuppressWarnings("serial")
-public class TaskMetricsTableModel extends AbstractTableModel {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(TaskMetricsTableModel.class);
+public class TaskMetricsTableModel extends AbstractTableModel
+    implements TableModelContentClass<ModuleTaskMetrics> {
 
-    private TaskMetricsDisplayModel taskMetricsDisplayModel = null;
-    private boolean completedTasksOnly = false;
+    private TaskMetricsDisplayModel taskMetricsDisplayModel;
+    private boolean completedTasksOnly;
 
     public TaskMetricsTableModel(List<PipelineTask> tasks, List<String> orderedModuleNames,
         boolean completedTasksOnly) {
@@ -57,4 +55,9 @@ public Object getValueAt(int rowIndex, int columnIndex) {
     public String getColumnName(int column) {
         return taskMetricsDisplayModel.getColumnName(column);
     }
+
+    @Override
+    public Class<ModuleTaskMetrics> tableModelContentClass() {
+        return ModuleTaskMetrics.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/TaskStatusSummaryPanel.java b/src/main/java/gov/nasa/ziggy/ui/instances/TaskStatusSummaryPanel.java
new file mode 100644
index 0000000..8fd9541
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/TaskStatusSummaryPanel.java
@@ -0,0 +1,78 @@
+package gov.nasa.ziggy.ui.instances;
+
+import java.awt.BorderLayout;
+
+import javax.swing.JScrollPane;
+
+import gov.nasa.ziggy.ui.util.models.AbstractZiggyTableModel;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+import gov.nasa.ziggy.util.TasksStates.Summary;
+import gov.nasa.ziggy.util.dispmod.TaskSummaryDisplayModel;
+
+/**
+ * @author Todd Klaus
+ */
+@SuppressWarnings("serial")
+public class TaskStatusSummaryPanel extends javax.swing.JPanel {
+    private TaskSummaryTableModel taskSummaryTableModel;
+
+    public TaskStatusSummaryPanel() {
+        taskSummaryTableModel = new TaskSummaryTableModel();
+        ZiggyTable<Summary> ziggyTable = new ZiggyTable<>(taskSummaryTableModel);
+        ziggyTable.setWrapText(false);
+        setLayout(new BorderLayout());
+        setPreferredSize(new java.awt.Dimension(400, 112));
+        add(new JScrollPane(ziggyTable.getTable()), BorderLayout.CENTER);
+    }
+
+    /**
+     * Updates the task status summary ("scoreboard") panel. This method must be called from the
+     * event dispatch thread only.
+     */
+    public void update(TasksTableModel tasksTableModel) {
+        taskSummaryTableModel.update(tasksTableModel);
+    }
+
+    private static class TaskSummaryTableModel extends AbstractZiggyTableModel<Summary> {
+        private final TaskSummaryDisplayModel taskSummaryDisplayModel = new TaskSummaryDisplayModel();
+
+        public TaskSummaryTableModel() {
+        }
+
+        public void update(TasksTableModel tasksTableModel) {
+            taskSummaryDisplayModel.update(tasksTableModel.getTaskStates());
+
+            fireTableDataChanged();
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            return taskSummaryDisplayModel.getValueAt(rowIndex, columnIndex);
+        }
+
+        @Override
+        public int getColumnCount() {
+            return taskSummaryDisplayModel.getColumnCount();
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return taskSummaryDisplayModel.getColumnName(column);
+        }
+
+        @Override
+        public int getRowCount() {
+            return taskSummaryDisplayModel.getRowCount();
+        }
+
+        @Override
+        public Class<Summary> tableModelContentClass() {
+            return Summary.class;
+        }
+
+        @Override
+        public Summary getContentAtRow(int row) {
+            return taskSummaryDisplayModel.getContentAtRow(row);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/TasksPanel.java b/src/main/java/gov/nasa/ziggy/ui/instances/TasksPanel.java
new file mode 100644
index 0000000..f69c537
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/TasksPanel.java
@@ -0,0 +1,304 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.DIALOG;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.MENU_SEPARATOR;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createMenuItem;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createPopupMenu;
+
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.services.messages.DisplayTasksForInstanceMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.LabelType;
+import gov.nasa.ziggy.ui.util.proxy.PipelineInstanceCrudProxy;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * The right hand side subpanel to the operations > instances panel. This panel displays the table
+ * of tasks for a given instance, plus the subtask "scoreboard."
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class TasksPanel extends JPanel {
+
+    private static final long serialVersionUID = 20230817L;
+
+    private InstancesTasksPanel instancesTasksPanel;
+    private TaskStatusSummaryPanel taskStatusSummaryPanel;
+    private ZiggyTable<PipelineTask> tasksTable;
+    private TasksTableModel tasksTableModel;
+
+    private Map<Integer, Long> selectedTasks = new HashMap<>();
+
+    public TasksPanel(InstancesTasksPanel instancesTasksPanel) {
+        this.instancesTasksPanel = instancesTasksPanel;
+        buildComponent();
+
+        // Subscribe to the messages that indicate that something has potentially changed
+        // with the instance panel's instance selection.
+        ZiggyMessenger.subscribe(DisplayTasksForInstanceMessage.class, message -> {
+            long instanceId = message.getPipelineInstanceId();
+
+            if (message.isReselect() && instanceId == -1) {
+
+                // If the message comes from a reselect action, we only need to do anything
+                // if the reselect resulted in no selected instance.
+                tasksTableModel.setPipelineInstance(null);
+                tasksTableModel.loadFromDatabase(false);
+                clearSelectedTasks();
+            } else if (!message.isReselect()) {
+
+                // If the message comes from a user clicking on a row in the table, we
+                // need to see whether this is a genuinely new instance, or if the user
+                // just clicked on the instance that was already selected.
+                PipelineInstance selectedInstance = new PipelineInstanceCrudProxy()
+                    .retrieve(instanceId);
+                boolean genuinelyNewInstance = tasksTableModel
+                    .updatePipelineInstance(selectedInstance);
+                tasksTableModel.loadFromDatabase(false);
+
+                // If the change is that a genuinely new instance was selected, clear the tasks
+                // table selections as they are no longer valid.
+                if (genuinelyNewInstance) {
+                    tasksTable.getTable().getSelectionModel().clearSelection();
+                    clearSelectedTasks();
+                }
+            }
+
+            // No matter what happened, update the summary display.
+            updateSummaryPanel();
+        });
+    }
+
+    private void buildComponent() {
+        JLabel instance = boldLabel("Pipeline tasks", LabelType.HEADING1);
+
+        taskStatusSummaryPanel = new TaskStatusSummaryPanel();
+
+        tasksTableModel = new TasksTableModel();
+        tasksTable = createTasksTable(tasksTableModel);
+        JScrollPane tasksTableScrollPane = new JScrollPane(tasksTable.getTable());
+        createTasksTablePopupMenu();
+
+        GroupLayout layout = new GroupLayout(this);
+        layout.setAutoCreateContainerGaps(true);
+        setLayout(layout);
+
+        layout.setHorizontalGroup(layout.createParallelGroup()
+            .addComponent(instance)
+            .addComponent(taskStatusSummaryPanel)
+            .addComponent(tasksTableScrollPane));
+
+        layout.setVerticalGroup(layout.createSequentialGroup()
+            .addComponent(instance)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(taskStatusSummaryPanel, GroupLayout.PREFERRED_SIZE,
+                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+            .addComponent(tasksTableScrollPane));
+    }
+
+    private ZiggyTable<PipelineTask> createTasksTable(TasksTableModel tasksTableModel) {
+        ZiggyTable<PipelineTask> tasksTable = new ZiggyTable<>(tasksTableModel);
+        tasksTable.setWrapText(false);
+        tasksTable.registerModel();
+
+        ListSelectionModel selectionModel = tasksTable.getTable().getSelectionModel();
+        selectionModel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        selectionModel.addListSelectionListener(e -> {
+            ListSelectionModel lsm = (ListSelectionModel) e.getSource();
+
+            if (!lsm.getValueIsAdjusting()) {
+
+                if (lsm.isSelectionEmpty()) {
+                    reselectTaskRows(lsm);
+                } else {
+                    captureSelectedTaskRows(lsm);
+                }
+            }
+        });
+
+        return tasksTable;
+    }
+
+    /**
+     * Repopulate the selected task rows after the table has been reset. If the table has been reset
+     * because the user selected a different pipeline instance, then the tasks that were selected
+     * are no longer present and the cache of selected rows / tasks needs to be cleared.
+     */
+    private void reselectTaskRows(ListSelectionModel lsm) {
+
+        // If there were no selected tasks in the first place, return.
+        if (selectedTasks.isEmpty()) {
+            return;
+        }
+
+        // Find the model indices of the selected task IDs. Here we use a List of
+        // task IDs so that the order of the task IDs and the model IDs match one another.
+        List<Long> selectedTaskIds = new ArrayList<>(selectedTasks.values());
+        List<Integer> taskModelIds = tasksTableModel.getModelIndicesOfTasks(selectedTaskIds);
+        selectedTasks.clear();
+
+        // If all the tasks that had been selected before are now gone from the table, return.
+        if (taskModelIds.isEmpty()) {
+            return;
+        }
+
+        // Convert the model indices to view indices and repopulate the Map.
+        for (int listIndex = 0; listIndex < taskModelIds.size(); listIndex++) {
+            int taskModelId = taskModelIds.get(listIndex);
+            long taskId = selectedTaskIds.get(listIndex);
+            int rowId = tasksTable.getTable().convertRowIndexToView(taskModelId);
+            lsm.addSelectionInterval(rowId, rowId);
+            selectedTasks.put(rowId, taskId);
+        }
+    }
+
+    /**
+     * Capture the selected task table rows and the corresponding task IDs.
+     */
+    private void captureSelectedTaskRows(ListSelectionModel lsm) {
+
+        // Get the range of selected rows.
+        int selectedTasksMinIndex = lsm.getMinSelectionIndex();
+        int selectedTasksMaxIndex = lsm.getMaxSelectionIndex();
+
+        // Clear the cache of selected rows / tasks.
+        selectedTasks.clear();
+
+        // Check each row in the range to see if it's selected; if so, capture the
+        // task ID and the row index in the cache.
+        for (int i = selectedTasksMinIndex; i <= selectedTasksMaxIndex; i++) {
+            if (lsm.isSelectedIndex(i)) {
+                int rowModel = tasksTable.convertRowIndexToModel(i);
+                long taskId = tasksTableModel.getContentAtRow(rowModel).getId();
+                selectedTasks.put(i, taskId);
+            }
+        }
+    }
+
+    /**
+     * Sets up the context menu for the tasks table.
+     */
+    private void createTasksTablePopupMenu() {
+        JMenuItem detailsMenuItem = createMenuItem("Task details" + DIALOG, this::showDetails);
+        JMenuItem retrieveLogInfoMenuItem = createMenuItem("List task logs" + DIALOG,
+            this::retrieveLogInfo);
+        JMenuItem restartFailedTasksMenuItem = createMenuItem("Restart failed tasks" + DIALOG,
+            this::restartFailedTasks);
+        JMenuItem killTasksMenuItem = createMenuItem("Kill selected tasks", this::killTasks);
+
+        JPopupMenu tasksPopupMenu = createPopupMenu(detailsMenuItem, retrieveLogInfoMenuItem,
+            MENU_SEPARATOR, restartFailedTasksMenuItem, MENU_SEPARATOR, killTasksMenuItem);
+
+        tasksTable.getTable().addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
+            public void mousePressed(java.awt.event.MouseEvent e) {
+                int numTasksSelected = selectedTasks.size();
+                if (numTasksSelected == 1) {
+                    detailsMenuItem.setEnabled(true);
+                    retrieveLogInfoMenuItem.setEnabled(true);
+                } else {
+                    detailsMenuItem.setEnabled(false);
+                    retrieveLogInfoMenuItem.setEnabled(false);
+                }
+                restartFailedTasksMenuItem.setEnabled(true);
+
+                if (numTasksSelected > 0 && e.isPopupTrigger()) {
+                    tasksPopupMenu.show(tasksTable.getTable(), e.getX(), e.getY());
+                }
+            }
+
+            @Override
+            public void mouseReleased(java.awt.event.MouseEvent e) {
+            }
+        });
+    }
+
+    private void showDetails(ActionEvent evt) {
+        PipelineTask selectedTask = selectedTask();
+        if (selectedTask != null) {
+            try {
+                TaskInfoDialog.showTaskInfoDialog(SwingUtilities.getWindowAncestor(this),
+                    selectedTask);
+            } catch (PipelineException e) {
+                MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+            }
+        }
+    }
+
+    private void retrieveLogInfo(ActionEvent evt) {
+        PipelineTask selectedTask = selectedTask();
+
+        if (selectedTask != null) {
+            try {
+                new TaskLogInformationDialog(SwingUtilities.getWindowAncestor(this), selectedTask)
+                    .setVisible(true);
+            } catch (PipelineException e) {
+                MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+            }
+        }
+    }
+
+    private void restartFailedTasks(ActionEvent evt) {
+        if (selectedTasks.isEmpty()) {
+            return;
+        }
+        instancesTasksPanel.restartTasks(selectedTasks.values());
+    }
+
+    private void killTasks(ActionEvent evt) {
+        if (selectedTasks.isEmpty()) {
+            return;
+        }
+        instancesTasksPanel.killTasks(selectedTasks.values());
+    }
+
+    private PipelineTask selectedTask() {
+        if (selectedTasks.size() != 1) {
+            return null;
+        }
+
+        int selectedIndex = selectedTasks.keySet().iterator().next();
+        int selectedModelRow = tasksTable.convertRowIndexToModel(selectedIndex);
+        return tasksTableModel.getContentAtRow(selectedModelRow);
+    }
+
+    /**
+     * Allows the instances panel to clear the selected tasks when necessary.
+     */
+    void clearSelectedTasks() {
+        selectedTasks.clear();
+    }
+
+    public TasksTableModel tasksTableModel() {
+        return tasksTableModel;
+    }
+
+    public TaskStatusSummaryPanel taskStatusSummaryPanel() {
+        return taskStatusSummaryPanel;
+    }
+
+    public void updateSummaryPanel() {
+        taskStatusSummaryPanel.update(tasksTableModel);
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TasksTableModel.java b/src/main/java/gov/nasa/ziggy/ui/instances/TasksTableModel.java
similarity index 64%
rename from src/main/java/gov/nasa/ziggy/ui/ops/instances/TasksTableModel.java
rename to src/main/java/gov/nasa/ziggy/ui/instances/TasksTableModel.java
index 76cae36..78fdd63 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TasksTableModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/TasksTableModel.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.ops.instances;
+package gov.nasa.ziggy.ui.instances;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,24 +8,18 @@
 
 import javax.swing.SwingWorker;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
 import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.PipelineTaskCrudProxy;
-import gov.nasa.ziggy.ui.proxy.ProcessingSummaryOpsProxy;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseModel;
+import gov.nasa.ziggy.ui.util.proxy.PipelineTaskCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.ProcessingSummaryOpsProxy;
 import gov.nasa.ziggy.util.TasksStates;
 import gov.nasa.ziggy.util.dispmod.TasksDisplayModel;
 
 @SuppressWarnings("serial")
-public class TasksTableModel extends AbstractDatabaseModel {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(TasksTableModel.class);
-
+public class TasksTableModel extends AbstractDatabaseModel<PipelineTask> {
     private PipelineInstance pipelineInstance;
     private List<PipelineTask> tasks = new LinkedList<>();
     private Map<Long, ProcessingSummary> taskAttrs = new HashMap<>();
@@ -60,67 +54,43 @@ public void loadFromDatabase(boolean forceUpdate) {
 
             @Override
             protected Void doInBackground() throws Exception {
-                refreshTasksFromDatabase(forceUpdate);
+                try {
+                    if (pipelineInstance == null) {
+                        tasks = new LinkedList<>();
+                        taskAttrs = new HashMap<>();
+                    } else {
+                        UpdateMode updateMode = getUpdateMode(forceUpdate);
+                        switch (updateMode) {
+                            case SAME_INSTANCE:
+                                break;
+                            case REPLACE_TEMP_NULL:
+                                tasks = stashedTasks;
+                                taskAttrs = stashedAttributes;
+                                break;
+                            case FULL_UPDATE:
+                                tasks = pipelineTaskCrud.retrieveAll(pipelineInstance);
+                                taskAttrs = attrOps.retrieveByInstanceId(pipelineInstance.getId());
+                                break;
+                            default:
+                                throw new IllegalStateException(
+                                    "Unsupported update mode " + updateMode.toString());
+                        }
+                    }
+                } catch (ConsoleSecurityException ignore) {
+                }
                 return null;
             }
 
             @Override
             protected void done() {
-                refreshGui();
+                try {
+                    tasksDisplayModel.update(tasks, taskAttrs);
+                } catch (ConsoleSecurityException ignore) {
+                }
+                fireTableDataChanged();
             }
-
         };
         swingWorker.execute();
-
-    }
-
-    public void refreshTasksFromDatabase() {
-        refreshTasksFromDatabase(true);
-    }
-
-    /**
-     * Performs the non-GUI portion of refreshing the pipeline task list from the database. The
-     * evictAll(), retrieveAll(), and retrieveByInstanceId() calls use the CrudProxyExecutor, which
-     * in turn uses a single threaded executor and synchronous execution.
-     * <p>
-     * If argument forceUpdate is false, the tasks and their attributes will be retrieved from the
-     * database only if the instance ID has changed from the last retrieval of a non-null pipeline
-     * instance's tasks; forceUpdate == true will retrieve from the database under any
-     * circumstances. The former option is used in the situation in which the task update is being
-     * performed only to keep the tasks list consistent with the instance and not for display. It
-     * also addresses a circumstance in which the instance is temporarily changed to null but then
-     * changed back to the instance that was in effect prior to the change to null.
-     */
-    public void refreshTasksFromDatabase(boolean forceUpdate) {
-        try {
-            if (tasks != null) {
-                pipelineTaskCrud.evictAll(tasks); // clear the cache
-            }
-
-            if (pipelineInstance == null) {
-                tasks = new LinkedList<>();
-                taskAttrs = new HashMap<>();
-            } else {
-                UpdateMode updateMode = getUpdateMode(forceUpdate);
-                switch (updateMode) {
-                    case SAME_INSTANCE:
-                        break;
-                    case REPLACE_TEMP_NULL:
-                        tasks = stashedTasks;
-                        taskAttrs = stashedAttributes;
-                        break;
-                    case FULL_UPDATE:
-                        tasks = pipelineTaskCrud.retrieveAll(pipelineInstance, true);
-                        taskAttrs = attrOps.retrieveByInstanceId(pipelineInstance.getId(), true);
-                        break;
-                    default:
-                        throw new IllegalStateException(
-                            "Unsupported update mode " + updateMode.toString());
-
-                }
-            }
-        } catch (ConsoleSecurityException ignore) {
-        }
     }
 
     /**
@@ -155,26 +125,6 @@ private UpdateMode getUpdateMode(boolean forceUpdate) {
         return updateMode;
     }
 
-    /**
-     * Performs the GUI portion of refreshing the pipeline task list from the database. This method
-     * must be called from the event dispatch thread for the console. Hence it must be called either
-     * directly within that thread or via the invokeLater() or invokeAndWait() methods of
-     * SwingUtilities.
-     */
-    public void refreshGui() {
-        try {
-            tasksDisplayModel.update(tasks, taskAttrs);
-        } catch (ConsoleSecurityException ignore) {
-        }
-        fireTableDataChanged();
-
-    }
-
-    public PipelineTask getPipelineTaskForRow(int row) {
-        validityCheck();
-        return tasksDisplayModel.getPipelineTaskForRow(row);
-    }
-
     @Override
     public int getRowCount() {
         validityCheck();
@@ -213,13 +163,11 @@ public boolean updatePipelineInstance(PipelineInstance pipelineInstance) {
             && pipelineInstance.getId() == instanceIdForStashedTaskInfo) {
             genuinelyNewInstance = false;
         }
-        if (this.pipelineInstance != null
-            && this.pipelineInstance.getId() == pipelineInstance.getId()) {
+        if (this.pipelineInstance != null && this.pipelineInstance.equals(pipelineInstance)) {
             genuinelyNewInstance = false;
         }
         setPipelineInstance(pipelineInstance);
         return genuinelyNewInstance;
-
     }
 
     public void setPipelineInstance(PipelineInstance pipelineInstance) {
@@ -258,4 +206,15 @@ private void stashTaskInfo() {
     public TasksStates getTaskStates() {
         return tasksDisplayModel.getTaskStates();
     }
+
+    @Override
+    public PipelineTask getContentAtRow(int row) {
+        validityCheck();
+        return tasks.get(row);
+    }
+
+    @Override
+    public Class<PipelineTask> tableModelContentClass() {
+        return PipelineTask.class;
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/instances/ViewParametersDialog.java b/src/main/java/gov/nasa/ziggy/ui/instances/ViewParametersDialog.java
new file mode 100644
index 0000000..95c21fd
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/instances/ViewParametersDialog.java
@@ -0,0 +1,161 @@
+package gov.nasa.ziggy.ui.instances;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.pipeline.definition.TypedParameter;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.AbstractZiggyTableModel;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * Dialog for viewing (read-only) a {@link Parameters} object.
+ *
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class ViewParametersDialog extends javax.swing.JDialog {
+
+    public ViewParametersDialog(Window owner, ParameterSet parameterSet) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+
+        buildComponent(parameterSet);
+        setLocationRelativeTo(owner);
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void buildComponent(ParameterSet parameterSet) {
+        try {
+            setTitle("View parameter set");
+
+            getContentPane().add(createDataPanel(parameterSet), BorderLayout.CENTER);
+            getContentPane().add(createButtonPanel(createButton(CLOSE, this::close)),
+                BorderLayout.SOUTH);
+
+            setMinimumSize(ZiggySwingUtils.MIN_DIALOG_SIZE);
+            pack();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private JPanel createDataPanel(ParameterSet parameterSet) {
+        JLabel parameterSetLabel = boldLabel("Parameter set");
+        JLabel parameterSetText = new JLabel(parameterSet.getName());
+
+        JLabel parameters = boldLabel("Parameters - " + parameterSet.clazz().getSimpleName());
+        ZiggyTable<ParameterProperties> ziggyTable = new ZiggyTable<>(
+            new ParameterPropsTableModel(parameterSet.getTypedParameters()));
+        JScrollPane tableScrollPane = new JScrollPane(ziggyTable.getTable());
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(parameterSetLabel)
+            .addComponent(parameterSetText)
+            .addComponent(parameters)
+            .addComponent(tableScrollPane));
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(parameterSetLabel)
+            .addComponent(parameterSetText)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(parameters)
+            .addComponent(tableScrollPane));
+
+        return dataPanel;
+    }
+
+    private static class ParameterPropsTableModel
+        extends AbstractZiggyTableModel<ParameterProperties> {
+
+        private static final String[] COLUMN_NAMES = { "Name", "Value" };
+
+        private final List<ParameterProperties> parameterProperties;
+
+        public ParameterPropsTableModel(Set<TypedParameter> properties) {
+            parameterProperties = new ArrayList<>(properties.size());
+
+            for (TypedParameter property : properties) {
+                parameterProperties.add(new ParameterProperties(property));
+            }
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public int getRowCount() {
+            return parameterProperties.size();
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            return switch (columnIndex) {
+                case 0 -> parameterProperties.get(rowIndex).getName();
+                case 1 -> parameterProperties.get(rowIndex).getValue();
+                default -> "Huh?";
+            };
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public Class<ParameterProperties> tableModelContentClass() {
+            return ParameterProperties.class;
+        }
+
+        @Override
+        public ParameterProperties getContentAtRow(int row) {
+            return parameterProperties.get(row);
+        }
+    }
+
+    private static class ParameterProperties {
+
+        private final String name;
+        private final String value;
+
+        public ParameterProperties(TypedParameter parameter) {
+            name = parameter.getName();
+            value = parameter.getString();
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/general/package.html b/src/main/java/gov/nasa/ziggy/ui/instances/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/config/general/package.html
rename to src/main/java/gov/nasa/ziggy/ui/instances/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/messaging/ConsoleMessageDispatcher.java b/src/main/java/gov/nasa/ziggy/ui/messaging/ConsoleMessageDispatcher.java
deleted file mode 100644
index eed7a4f..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/messaging/ConsoleMessageDispatcher.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package gov.nasa.ziggy.ui.messaging;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.alert.AlertMessage;
-import gov.nasa.ziggy.services.messages.WorkerShutdownMessage;
-import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
-import gov.nasa.ziggy.services.messaging.ClientMessageHandler;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.mon.alerts.AlertMessageTableModel;
-import gov.nasa.ziggy.ui.mon.master.WorkerStatusPanel;
-import gov.nasa.ziggy.ui.ops.instances.OpsInstancesPanel;
-
-/**
- * Performs processing of messages received by the console. This allows a separation between the
- * messages and their handleMessage methods, and the console and its GUI components.
- *
- * @author PT
- */
-public class ConsoleMessageDispatcher implements ClientMessageHandler {
-
-    private static final Logger log = LoggerFactory.getLogger(ConsoleMessageDispatcher.class);
-
-    private final AlertMessageTableModel alertMessageTableModel;
-    private final WorkerStatusPanel processesStatusPanel;
-
-    public ConsoleMessageDispatcher(AlertMessageTableModel tableModel,
-        WorkerStatusPanel statusPanel, boolean shutdownEnabled) {
-        alertMessageTableModel = tableModel;
-        processesStatusPanel = statusPanel;
-    }
-
-    // methods that handle message classes
-
-    @Override
-    public void handleAlert(AlertMessage message) {
-        if (alertMessageTableModel != null) {
-            alertMessageTableModel.addAlertMessage(message);
-        }
-    }
-
-    @Override
-    public void handleWorkerStatusMessage(WorkerStatusMessage message) {
-        if (processesStatusPanel != null) {
-            processesStatusPanel.update(message);
-        }
-    }
-
-    @Override
-    public synchronized void handleShutdownMessage(WorkerShutdownMessage message) {
-        log.info("Shutting down due to shutdown signal from worker");
-        ZiggyGuiConsole.shutdown();
-    }
-
-    @Override
-    public void handleNoRunningOrQueuedPipelinesMessage() {
-        OpsInstancesPanel.clearInstancesRemaining();
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/DatabaseMetricsTypeListModel.java b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/DatabaseMetricsTypeListModel.java
index 41e2dd5..2a06466 100644
--- a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/DatabaseMetricsTypeListModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/DatabaseMetricsTypeListModel.java
@@ -2,7 +2,7 @@
 
 import com.google.common.collect.ImmutableSet;
 
-import gov.nasa.ziggy.ui.proxy.MetricsLogCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.MetricsLogCrudProxy;
 
 /**
  * Get metric types from the database.
diff --git a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/DatabaseMetricsValueSource.java b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/DatabaseMetricsValueSource.java
index d8ef398..853bf61 100644
--- a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/DatabaseMetricsValueSource.java
+++ b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/DatabaseMetricsValueSource.java
@@ -9,7 +9,7 @@
 
 import gov.nasa.ziggy.metrics.MetricType;
 import gov.nasa.ziggy.metrics.MetricValue;
-import gov.nasa.ziggy.ui.proxy.MetricsLogCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.MetricsLogCrudProxy;
 import gov.nasa.ziggy.util.TimeRange;
 
 /**
diff --git a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/FileMetricsValueSource.java b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/FileMetricsValueSource.java
index 90839fd..15c6bd3 100644
--- a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/FileMetricsValueSource.java
+++ b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/FileMetricsValueSource.java
@@ -1,6 +1,5 @@
 package gov.nasa.ziggy.ui.metrilyzer;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedList;
@@ -13,7 +12,6 @@
 
 import gov.nasa.ziggy.metrics.MetricType;
 import gov.nasa.ziggy.metrics.MetricValue;
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.services.metrics.DeltaMetricValueGenerator;
 import gov.nasa.ziggy.services.metrics.MetricsFileParser;
 import gov.nasa.ziggy.util.TimeRange;
@@ -36,12 +34,8 @@ public Map<MetricType, Collection<MetricValue>> metricValues(
         Map<MetricType, Collection<MetricValue>> rv = Maps
             .newHashMapWithExpectedSize(selectedMetricTypes.size());
         Set<MetricType> typeSet = ImmutableSet.copyOf(selectedMetricTypes);
-        DeltaMetricValueGenerator metricIt = null;
-        try {
-            metricIt = new DeltaMetricValueGenerator(metricsFileParser.parseFile());
-        } catch (IOException ioe) {
-            throw new PipelineException(ioe);
-        }
+        DeltaMetricValueGenerator metricIt = new DeltaMetricValueGenerator(
+            metricsFileParser.parseFile());
         // TODO: could probably break this off after seeing a date
         // greater than the date we are interested in.
         for (MetricValue metricDelta : metricIt) {
diff --git a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/FileSourceMetricsTypeListModel.java b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/FileSourceMetricsTypeListModel.java
index 34e59f4..2b78b7d 100644
--- a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/FileSourceMetricsTypeListModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/FileSourceMetricsTypeListModel.java
@@ -1,8 +1,5 @@
 package gov.nasa.ziggy.ui.metrilyzer;
 
-import java.io.IOException;
-
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.services.metrics.MetricsFileParser;
 
 /**
@@ -20,10 +17,6 @@ class FileSourceMetricsTypeListModel extends MetricTypeListModel {
 
     @Override
     public void loadMetricTypes() {
-        try {
-            super.updateTypes(metricsFileParser.types());
-        } catch (IOException e) {
-            throw new PipelineException(e);
-        }
+        super.updateTypes(metricsFileParser.types());
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/MetricsSelectorPanel.java b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/MetricsSelectorPanel.java
index b22ef94..5a808d3 100644
--- a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/MetricsSelectorPanel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/MetricsSelectorPanel.java
@@ -17,13 +17,11 @@
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
-import javax.swing.WindowConstants;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,8 +29,9 @@
 import gov.nasa.ziggy.metrics.MetricType;
 import gov.nasa.ziggy.metrics.MetricValue;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.ui.common.DateTextField;
-import gov.nasa.ziggy.ui.common.MessageUtil;
+import gov.nasa.ziggy.ui.util.DateTextField;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
 import gov.nasa.ziggy.util.TimeRange;
 
 /**
@@ -44,6 +43,7 @@
  */
 @SuppressWarnings("serial")
 public class MetricsSelectorPanel extends javax.swing.JPanel {
+    @SuppressWarnings("unused")
     private static final Logger log = LoggerFactory.getLogger(MetricsSelectorPanel.class);
 
     private static final long DEFAULT_WINDOW_SIZE_MILLIS = 2 /* hrs */ * 60 /* mins/hr */
@@ -102,7 +102,7 @@ public MetricsSelectorPanel(MetricTypeListModel availListModel,
         if (metricsValueSource == null) {
             throw new NullPointerException("metricsValueSource");
         }
-        initGUI();
+        buildComponent();
     }
 
     public MetricsSelectorPanel(MetricTypeListModel availListModel,
@@ -110,20 +110,15 @@ public MetricsSelectorPanel(MetricTypeListModel availListModel,
         this(availListModel, selectedListModel, metricsValueSource, null);
     }
 
-    private void initGUI() {
-        try {
-            windowEnd = System.currentTimeMillis();
-            windowStart = windowEnd - currentWindowSize;
-
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            setPreferredSize(new Dimension(600, 300));
-            this.add(getListPanel(), BorderLayout.CENTER);
-            this.add(getFilterPanel(), BorderLayout.SOUTH);
-            this.add(getLoadFilterPanel(), BorderLayout.NORTH);
-        } catch (Exception e) {
-            log.error("initGUI()", e);
-        }
+    private void buildComponent() {
+        windowEnd = System.currentTimeMillis();
+        windowStart = windowEnd - currentWindowSize;
+
+        setLayout(new BorderLayout());
+        setPreferredSize(new Dimension(600, 300));
+        add(getListPanel(), BorderLayout.CENTER);
+        add(getFilterPanel(), BorderLayout.SOUTH);
+        add(getLoadFilterPanel(), BorderLayout.NORTH);
     }
 
     private JPanel getListPanel() {
@@ -379,9 +374,6 @@ private JButton getLastTwoHoursButton() {
     }
 
     private void loadButtonActionPerformed(ActionEvent evt) {
-        log.debug(
-            "loadButtonActionPerformed(ActionEvent) - loadButton.actionPerformed, event=" + evt);
-
         try {
             setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
             availListModel.loadMetricTypes();
@@ -393,9 +385,6 @@ private void loadButtonActionPerformed(ActionEvent evt) {
     }
 
     private void addButtonActionPerformed(ActionEvent evt) {
-        log.debug(
-            "addButtonActionPerformed(ActionEvent) - addButton.actionPerformed, event=" + evt);
-
         if (availListModel.getSize() <= 0) {
             return;
         }
@@ -410,9 +399,6 @@ private void addButtonActionPerformed(ActionEvent evt) {
     }
 
     private void removeButtonActionPerformed(ActionEvent evt) {
-        log.debug("removeButtonActionPerformed(ActionEvent) - removeButton.actionPerformed, event="
-            + evt);
-
         if (selectedListModel.getSize() <= 0) {
             return;
         }
@@ -427,10 +413,6 @@ private void removeButtonActionPerformed(ActionEvent evt) {
     }
 
     private void windowLeftButtonActionPerformed(ActionEvent evt) {
-        log.debug(
-            "windowLeftButtonActionPerformed(ActionEvent) - windowLeftButton.actionPerformed, event="
-                + evt);
-
         try {
             updateWindow();
         } catch (Exception e) {
@@ -444,10 +426,6 @@ private void windowLeftButtonActionPerformed(ActionEvent evt) {
     }
 
     private void windowRightButtonActionPerformed(ActionEvent evt) {
-        log.debug(
-            "windowRightButtonActionPerformed(ActionEvent) - windowRightButton.actionPerformed, event="
-                + evt);
-
         try {
             updateWindow();
         } catch (Exception e) {
@@ -461,9 +439,6 @@ private void windowRightButtonActionPerformed(ActionEvent evt) {
     }
 
     private void plotButtonActionPerformed(ActionEvent evt) {
-        log.debug(
-            "refreshButtonActionPerformed(ActionEvent) - plotButton.actionPerformed, event=" + evt);
-
         try {
             boolean binEnabled = binCheckBox.isSelected();
             int binSizeMillis = 0;
@@ -556,18 +531,11 @@ private void lastTwoHoursButtonActionPerformed() {
         currentWindowSize = windowEnd - windowStart;
     }
 
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
     public static void main(String[] args) {
-        JFrame frame = new JFrame();
         DatabaseMetricsTypeListModel availMetrics = new DatabaseMetricsTypeListModel();
         DatabaseMetricsTypeListModel selectedMetrics = new DatabaseMetricsTypeListModel();
         DatabaseMetricsValueSource metricsSource = new DatabaseMetricsValueSource();
-        frame.getContentPane()
-            .add(new MetricsSelectorPanel(availMetrics, selectedMetrics, metricsSource));
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
+        ZiggySwingUtils.displayTestDialog(
+            new MetricsSelectorPanel(availMetrics, selectedMetrics, metricsSource));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/MetrilyzerPanel.java b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/MetrilyzerPanel.java
index fdf3c06..b5520e8 100644
--- a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/MetrilyzerPanel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/MetrilyzerPanel.java
@@ -25,7 +25,7 @@ public MetrilyzerPanel() {
         availMetricsModel = new DatabaseMetricsTypeListModel();
         selectedMetricsModel = new DatabaseMetricsTypeListModel();
         metricValueSource = new DatabaseMetricsValueSource();
-        initGUI();
+        buildComponent();
     }
 
     /**
@@ -37,18 +37,13 @@ public MetrilyzerPanel(MetricsFileParser metricsFileParser) {
         availMetricsModel = new FileSourceMetricsTypeListModel(metricsFileParser);
         selectedMetricsModel = new FileSourceMetricsTypeListModel(metricsFileParser);
         metricValueSource = new FileMetricsValueSource(metricsFileParser);
-        initGUI();
+        buildComponent();
     }
 
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            this.add(getChartPanel(), BorderLayout.CENTER);
-            this.add(getSelectorPanel(), BorderLayout.NORTH);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    private void buildComponent() {
+        setLayout(new BorderLayout());
+        this.add(getChartPanel(), BorderLayout.CENTER);
+        this.add(getSelectorPanel(), BorderLayout.NORTH);
     }
 
     private MetricsSelectorPanel getSelectorPanel() {
diff --git a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/SampleList.java b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/SampleList.java
index a21d47f..29309cb 100644
--- a/src/main/java/gov/nasa/ziggy/ui/metrilyzer/SampleList.java
+++ b/src/main/java/gov/nasa/ziggy/ui/metrilyzer/SampleList.java
@@ -47,14 +47,11 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if ((obj == null) || (getClass() != obj.getClass())) {
+            if (obj == null || getClass() != obj.getClass()) {
                 return false;
             }
             Sample other = (Sample) obj;
-            if (!getOuterType().equals(other.getOuterType())) {
-                return false;
-            }
-            if (time != other.time) {
+            if (!getOuterType().equals(other.getOuterType()) || time != other.time) {
                 return false;
             }
             return true;
diff --git a/src/main/java/gov/nasa/ziggy/ui/module/EditModuleDialog.java b/src/main/java/gov/nasa/ziggy/ui/module/EditModuleDialog.java
new file mode 100644
index 0000000..23ce583
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/module/EditModuleDialog.java
@@ -0,0 +1,229 @@
+package gov.nasa.ziggy.ui.module;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SAVE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.GroupLayout;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule;
+import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
+import gov.nasa.ziggy.ui.util.ClasspathUtils;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.proxy.PipelineModuleDefinitionCrudProxy;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+public class EditModuleDialog extends javax.swing.JDialog {
+    @SuppressWarnings("unused")
+    private static final Logger log = LoggerFactory.getLogger(EditModuleDialog.class);
+    private static final long serialVersionUID = 20230824L;
+
+    private final PipelineModuleDefinition module;
+    private final PipelineModuleDefinitionCrudProxy pipelineModuleDefinitionCrud = new PipelineModuleDefinitionCrudProxy();
+
+    private JTextArea descText;
+    private JComboBox<ClassWrapper<PipelineModule>> implementingClassComboBox;
+    private JTextField exeTimeoutText;
+    private JTextField minMemoryText;
+
+    private boolean cancelled = false;
+
+    public EditModuleDialog(Window owner, PipelineModuleDefinition module) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.module = module;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Edit module");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(
+            createButtonPanel(createButton(SAVE, this::save), createButton(CANCEL, this::cancel)),
+            BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        JLabel name = boldLabel("Name");
+        JLabel nameText = new JLabel(module.getName());
+
+        JLabel desc = boldLabel("Description");
+        descText = new JTextArea();
+        descText.setRows(4);
+        descText.setLineWrap(true);
+        descText.setWrapStyleWord(true);
+        descText.setText(module.getDescription());
+        JScrollPane descScrollPane = new JScrollPane(descText);
+
+        JLabel implementingClass = boldLabel("Implementing class");
+        implementingClassComboBox = createImplementingClassComboBox();
+
+        JLabel exeTimeout = boldLabel("Executable timeout (seconds)");
+        exeTimeoutText = new JTextField(Integer.toString(module.getExeTimeoutSecs()));
+        exeTimeoutText.setColumns(15);
+
+        JLabel minMemory = boldLabel("Minimum memory (MB)");
+        minMemoryText = new JTextField(Integer.toString(module.getMinMemoryMegaBytes()));
+        minMemoryText.setColumns(15);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(name)
+            .addComponent(nameText)
+            .addComponent(desc)
+            .addComponent(descScrollPane)
+            .addComponent(implementingClass)
+            .addComponent(implementingClassComboBox, GroupLayout.PREFERRED_SIZE,
+                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+            .addComponent(exeTimeout)
+            .addComponent(exeTimeoutText, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(minMemory)
+            .addComponent(minMemoryText, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(name)
+            .addComponent(nameText)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(desc)
+            .addComponent(descScrollPane)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(implementingClass)
+            .addComponent(implementingClassComboBox, GroupLayout.PREFERRED_SIZE,
+                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(exeTimeout)
+            .addComponent(exeTimeoutText, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(minMemory)
+            .addComponent(minMemoryText, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE));
+        return dataPanel;
+    }
+
+    private JComboBox<ClassWrapper<PipelineModule>> createImplementingClassComboBox() {
+
+        DefaultComboBoxModel<ClassWrapper<PipelineModule>> implementingClassComboBoxModel = new DefaultComboBoxModel<>();
+        JComboBox<ClassWrapper<PipelineModule>> implementingClassComboBox = new JComboBox<>(
+            implementingClassComboBoxModel);
+        implementingClassComboBox.addActionListener(this::updateImplementingClass);
+
+        try {
+            Set<Class<? extends PipelineModule>> detectedClasses = ClasspathUtils
+                .scanFully(PipelineModule.class);
+            List<ClassWrapper<PipelineModule>> wrapperList = new LinkedList<>();
+
+            for (Class<? extends PipelineModule> clazz : detectedClasses) {
+                try {
+                    wrapperList.add(new ClassWrapper<>(clazz));
+                } catch (Exception ignore) {
+                }
+            }
+
+            Collections.sort(wrapperList);
+
+            int selectedIndex = -1;
+            int index = 0;
+
+            for (ClassWrapper<PipelineModule> classWrapper : wrapperList) {
+                implementingClassComboBoxModel.addElement(classWrapper);
+
+                ClassWrapper<PipelineModule> implementingClass = module.getPipelineModuleClass();
+                if (implementingClass != null
+                    && classWrapper.getClazz().equals(implementingClass.getClazz())) {
+                    selectedIndex = index;
+                }
+                index++;
+            }
+
+            if (selectedIndex != -1) {
+                implementingClassComboBox.setSelectedIndex(selectedIndex);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+        return implementingClassComboBox;
+    }
+
+    private void updateImplementingClass(ActionEvent evt) {
+        // TODO Validate that parameters are compatible with the selected PipelineModule (ZIGGY-224)
+    }
+
+    private void save(ActionEvent evt) {
+        // TODO Validate that the parameters are compatible with the selected implementingClass
+        // (ZIGGY-224)
+
+        try {
+            module.setDescription(descText.getText());
+
+            @SuppressWarnings("unchecked")
+            ClassWrapper<PipelineModule> selectedImplementingClass = (ClassWrapper<PipelineModule>) implementingClassComboBox
+                .getSelectedItem();
+
+            module.setPipelineModuleClass(selectedImplementingClass);
+            module.setExeTimeoutSecs(toInt(exeTimeoutText.getText(), 0));
+            module.setMinMemoryMegaBytes(toInt(minMemoryText.getText(), 0));
+
+            pipelineModuleDefinitionCrud.createOrUpdate(module);
+
+            setVisible(false);
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    /**
+     * Convert the specified String to an int and return the defaultValue if the conversion fails
+     */
+    private int toInt(String s, int defaultValue) {
+        try {
+            return Integer.parseInt(s);
+        } catch (NumberFormatException e) {
+            return defaultValue;
+        }
+    }
+
+    private void cancel(ActionEvent evt) {
+        cancelled = true;
+        setVisible(false);
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/module/ViewEditModuleLibraryPanel.java b/src/main/java/gov/nasa/ziggy/ui/module/ViewEditModuleLibraryPanel.java
new file mode 100644
index 0000000..f284c36
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/module/ViewEditModuleLibraryPanel.java
@@ -0,0 +1,252 @@
+package gov.nasa.ziggy.ui.module;
+
+import java.awt.Cursor;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+import gov.nasa.ziggy.pipeline.definition.AuditInfo;
+import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
+import gov.nasa.ziggy.services.security.Privilege;
+import gov.nasa.ziggy.services.security.User;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseModel;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.PipelineModuleDefinitionCrudProxy;
+import gov.nasa.ziggy.ui.util.table.AbstractViewEditPanel;
+
+/**
+ * @author Todd Klaus
+ */
+@SuppressWarnings("serial")
+public class ViewEditModuleLibraryPanel extends AbstractViewEditPanel<PipelineModuleDefinition> {
+
+    private final PipelineModuleDefinitionCrudProxy pipelineModuleDefinitionCrud = new PipelineModuleDefinitionCrudProxy();
+
+    public ViewEditModuleLibraryPanel() {
+        super(new ModuleLibraryTableModel());
+
+        buildComponent();
+    }
+
+    @Override
+    protected Set<OptionalViewEditFunctions> optionalViewEditFunctions() {
+        return Set.of(OptionalViewEditFunctions.DELETE, OptionalViewEditFunctions.NEW,
+            OptionalViewEditFunctions.RENAME);
+    }
+
+    @Override
+    protected void create() {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        String newModuleName = JOptionPane.showInputDialog(SwingUtilities.getWindowAncestor(this),
+            "Enter the name for the new Module Definition", "New Pipeline Module Definition",
+            JOptionPane.PLAIN_MESSAGE);
+
+        if (newModuleName == null) {
+            return;
+        }
+        if (newModuleName.isEmpty()) {
+            MessageUtil.showError(this, "Please enter a module name");
+            return;
+        }
+
+        // TODO Fix this wait cursor so it actually shows
+        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        showEditDialog(new PipelineModuleDefinition(newModuleName));
+        setCursor(null);
+    }
+
+    @Override
+    protected void rename(int row) {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        PipelineModuleDefinition selectedModule = ziggyTable.getContentAtViewRow(row);
+
+        try {
+            String newModuleName = JOptionPane.showInputDialog(
+                SwingUtilities.getWindowAncestor(this),
+                "Enter the new name for this Module Definition", "Rename Module Definition",
+                JOptionPane.PLAIN_MESSAGE);
+
+            if (newModuleName == null) {
+                return;
+            }
+            if (newModuleName.isEmpty()) {
+                MessageUtil.showError(this, "Please enter a module name");
+                return;
+            }
+
+            pipelineModuleDefinitionCrud.rename(selectedModule, newModuleName);
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected void edit(int row) {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        showEditDialog(ziggyTable.getContentAtViewRow(row));
+        setCursor(null);
+    }
+
+    @Override
+    protected void delete(int row) {
+
+        try {
+            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        PipelineModuleDefinition module = ziggyTable.getContentAtViewRow(row);
+
+        if (!module.isLocked()) {
+            int choice = JOptionPane.showConfirmDialog(this,
+                "Are you sure you want to delete module '" + module.getName() + "'?");
+
+            if (choice == JOptionPane.YES_OPTION) {
+                try {
+                    pipelineModuleDefinitionCrud.delete(module);
+                    ziggyTable.loadFromDatabase();
+                } catch (Throwable e) {
+                    MessageUtil.showError(this, e);
+                }
+            }
+        } else {
+            JOptionPane.showMessageDialog(this,
+                "Can't delete a locked module definition. Modules are locked when referenced by a pipeline instance",
+                "Error", JOptionPane.ERROR_MESSAGE);
+        }
+    }
+
+    @Override
+    protected void refresh() {
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Throwable e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void showEditDialog(PipelineModuleDefinition module) {
+        EditModuleDialog dialog = new EditModuleDialog(SwingUtilities.getWindowAncestor(this),
+            module);
+        dialog.setVisible(true);
+
+        if (!dialog.isCancelled()) {
+            try {
+                ziggyTable.loadFromDatabase();
+            } catch (Exception e) {
+                MessageUtil.showError(this, e);
+            }
+        }
+    }
+
+    private static class ModuleLibraryTableModel
+        extends AbstractDatabaseModel<PipelineModuleDefinition> {
+        private List<PipelineModuleDefinition> modules = new LinkedList<>();
+        private final PipelineModuleDefinitionCrudProxy pipelineModuleDefinitionCrud = new PipelineModuleDefinitionCrudProxy();
+
+        private static final String[] COLUMN_NAMES = { "ID", "Name", "Version", "Locked", "User",
+            "Modified" };
+        private static final Class<?>[] COLUMN_CLASSES = { Integer.class, String.class,
+            Integer.class, Boolean.class, String.class, Object.class };
+
+        @Override
+        public void loadFromDatabase() {
+            try {
+                modules = pipelineModuleDefinitionCrud.retrieveLatestVersions();
+            } catch (ConsoleSecurityException ignore) {
+            }
+
+            fireTableDataChanged();
+        }
+
+        @Override
+        public int getRowCount() {
+            validityCheck();
+            return modules.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            validityCheck();
+            return 6;
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            validityCheck();
+
+            PipelineModuleDefinition module = modules.get(rowIndex);
+
+            AuditInfo auditInfo = module.getAuditInfo();
+
+            User lastChangedUser = null;
+            Date lastChangedTime = null;
+
+            if (auditInfo != null) {
+                lastChangedUser = auditInfo.getLastChangedUser();
+                lastChangedTime = auditInfo.getLastChangedTime();
+            }
+
+            return switch (columnIndex) {
+                case 0 -> module.getId();
+                case 1 -> module.getName();
+                case 2 -> module.getVersion();
+                case 3 -> module.isLocked();
+                case 4 -> lastChangedUser != null ? lastChangedUser.getLoginName() : "---";
+                case 5 -> lastChangedTime != null ? lastChangedTime : "---";
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            validityCheck();
+            return COLUMN_CLASSES[columnIndex];
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            validityCheck();
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public PipelineModuleDefinition getContentAtRow(int row) {
+            validityCheck();
+            return modules.get(row);
+        }
+
+        @Override
+        public Class<PipelineModuleDefinition> tableModelContentClass() {
+            return PipelineModuleDefinition.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/group/package.html b/src/main/java/gov/nasa/ziggy/ui/module/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/config/group/package.html
rename to src/main/java/gov/nasa/ziggy/ui/module/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/alerts/AlertMessageTableModel.java b/src/main/java/gov/nasa/ziggy/ui/mon/alerts/AlertMessageTableModel.java
deleted file mode 100644
index a4b42c5..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/alerts/AlertMessageTableModel.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package gov.nasa.ziggy.ui.mon.alerts;
-
-import java.text.SimpleDateFormat;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.services.alert.Alert;
-import gov.nasa.ziggy.services.alert.AlertMessage;
-import gov.nasa.ziggy.ui.mon.master.Indicator;
-import gov.nasa.ziggy.ui.mon.master.MasterStatusPanel;
-
-@SuppressWarnings("serial")
-public class AlertMessageTableModel extends AbstractTableModel {
-    private static final int MAX_ALERTS = 1000;
-    private static final String AMBER_MESSAGE = "WARN level alerts present";
-    private static final String RED_MESSAGE = "ERROR/INFRASTRUCTURE level alerts present";
-
-    private final List<AlertMessage> alertMessages = new LinkedList<>();
-    private final SimpleDateFormat formatter;
-
-    public AlertMessageTableModel() {
-        formatter = new SimpleDateFormat("MM/dd/yy HH:mm:ss");
-    }
-
-    public void clear() {
-        alertMessages.clear();
-        fireTableDataChanged();
-    }
-
-    public void addAlertMessage(AlertMessage msg) {
-        if (alertMessages.size() >= MAX_ALERTS) {
-            // remove oldest (at the bottom)
-            alertMessages.remove(alertMessages.size() - 1);
-        }
-
-        alertMessages.add(0, msg); // add to the beginning
-
-        fireTableRowsInserted(alertMessages.size() - 1, alertMessages.size() - 1);
-
-        String severity = msg.getAlertData().getSeverity();
-        Indicator alertIndicator = MasterStatusPanel.alertsIndicator();
-        if (severity.equals("WARNING")) {
-            alertIndicator.setState(Indicator.State.AMBER, AMBER_MESSAGE);
-        } else if (severity.equals("ERROR") || severity.equals("INFRASTRUCTURE")) {
-            alertIndicator.setState(Indicator.State.RED, RED_MESSAGE);
-        }
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        Alert alert = alertMessages.get(rowIndex).getAlertData();
-
-        switch (columnIndex) {
-            case 0:
-                return formatter.format(alert.getTimestamp());
-            case 1:
-                return alert.getSourceComponent();
-            case 2:
-                return alert.getProcessHost();
-            case 3:
-                return alert.getSourceTaskId();
-            // return Long.toString(alert.getSourceTaskId());
-            case 4:
-                return alert.getSeverity();
-            case 5:
-                return alert.getMessage();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 6;
-    }
-
-    @Override
-    public int getRowCount() {
-        return alertMessages.size();
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Time";
-            case 1:
-                return "Source";
-            case 2:
-                return "Host";
-            case 3:
-                return "Task";
-            case 4:
-                return "Severity";
-            case 5:
-                return "Message";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/alerts/MonitoringAlertsPanel.java b/src/main/java/gov/nasa/ziggy/ui/mon/alerts/MonitoringAlertsPanel.java
deleted file mode 100644
index d910264..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/alerts/MonitoringAlertsPanel.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package gov.nasa.ziggy.ui.mon.alerts;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.mon.master.Indicator;
-import gov.nasa.ziggy.ui.mon.master.MasterStatusPanel;
-
-@SuppressWarnings("serial")
-public class MonitoringAlertsPanel extends javax.swing.JPanel {
-    private static final Logger log = LoggerFactory.getLogger(MonitoringAlertsPanel.class);
-
-    private JPanel buttonPanel;
-    private ZTable alertTable;
-    private JButton ackButton;
-    private JButton clearButton;
-    private JScrollPane alertTableScrollPane;
-    private JCheckBox enabledCheckBox;
-    private AlertMessageTableModel alertMessageTableModel;
-
-    public MonitoringAlertsPanel() {
-        initGUI();
-
-    }
-
-    private void enabledCheckBoxActionPerformed(ActionEvent evt) {
-        log.debug("enabledCheckBox.actionPerformed, event=" + evt);
-
-    }
-
-    private void clearButtonActionPerformed(ActionEvent evt) {
-        log.debug("clearButton.actionPerformed, event=" + evt);
-
-        alertMessageTableModel.clear();
-
-        MasterStatusPanel.alertsIndicator().setState(Indicator.State.GREEN);
-    }
-
-    private void ackButtonActionPerformed(ActionEvent evt) {
-        log.debug("ackButton.actionPerformed, event=" + evt);
-
-        MasterStatusPanel.alertsIndicator().setState(Indicator.State.GREEN);
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            setPreferredSize(new Dimension(400, 300));
-            this.add(getButtonPanel(), BorderLayout.NORTH);
-            this.add(getAlertTableScrollPane(), BorderLayout.CENTER);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(20);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getEnabledCheckBox());
-            buttonPanel.add(getClearButton());
-            buttonPanel.add(getAckButton());
-        }
-        return buttonPanel;
-    }
-
-    private JCheckBox getEnabledCheckBox() {
-        if (enabledCheckBox == null) {
-            enabledCheckBox = new JCheckBox();
-            enabledCheckBox.setText("Enabled");
-            enabledCheckBox.setSelected(true);
-            enabledCheckBox.addActionListener(this::enabledCheckBoxActionPerformed);
-        }
-        return enabledCheckBox;
-    }
-
-    private JScrollPane getAlertTableScrollPane() {
-        if (alertTableScrollPane == null) {
-            alertTableScrollPane = new JScrollPane();
-            alertTableScrollPane.setViewportView(getAlertTable());
-        }
-        return alertTableScrollPane;
-    }
-
-    private JButton getClearButton() {
-        if (clearButton == null) {
-            clearButton = new JButton();
-            clearButton.setText("Clear");
-            clearButton.addActionListener(this::clearButtonActionPerformed);
-        }
-        return clearButton;
-    }
-
-    private ZTable getAlertTable() {
-        if (alertTable == null) {
-            log.info("Getting alert table together");
-            alertMessageTableModel = new AlertMessageTableModel();
-            alertTable = new ZTable();
-            alertTable.setRowShadingEnabled(true);
-            alertTable.setTextWrappingEnabled(true);
-            alertTable.setModel(alertMessageTableModel);
-            alertTable.setShowVerticalLines(false);
-            alertTable.setShowHorizontalLines(false);
-        }
-        return alertTable;
-    }
-
-    private JButton getAckButton() {
-        if (ackButton == null) {
-            ackButton = new JButton();
-            ackButton.setText("Ack");
-            ackButton.addActionListener(this::ackButtonActionPerformed);
-        }
-        return ackButton;
-    }
-
-    public AlertMessageTableModel getAlertMessageTableModel() {
-        return alertMessageTableModel;
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/Indicator.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/Indicator.java
deleted file mode 100644
index cb72470..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/Indicator.java
+++ /dev/null
@@ -1,424 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.GridLayout;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
-import javax.swing.border.BevelBorder;
-
-/**
- * Represents a status information object that is a subclass of {@link JPanel}. The object can
- * include text information that provides detailed information, as well as a color-coded
- * {@link State} with the following values:
- * <ol>
- * <li>GRAY: the current state of the object being reported is inactive.
- * <li>GREEN: the current state of the object being reported is good.
- * <li>AMBER: the current state of the object being reported has a non-fatal warning.
- * <li>RED: the current state of the object being reported has a fatal error.
- * </ol>
- * The {@link Indicator} also supports user-supplied tool tip text. The text can be manually changed
- * on its own, or it can be changed when the state is changed. The user may also choose to supply a
- * static tool tip text {@link String} for each of the GRAY and GREEN states. These will be used
- * when the appropriate state is assigned to the {@link Indicator}.
- * <p>
- * In addition, each {@link Indicator} may also be paired with an instance of {@link IdiotLight}.
- * The {@link IdiotLight} class provides a less obtrusive and less informative summary of the object
- * state that's suitable for use on the pipeline console.
- *
- * @author PT
- */
-public class Indicator extends javax.swing.JPanel {
-    private static final long serialVersionUID = 20220510L;
-
-    public enum State {
-        GREEN(new java.awt.Color(0, 200, 0)),
-        AMBER(new java.awt.Color(250, 250, 0)),
-        RED(new java.awt.Color(250, 0, 0)),
-        GRAY(Color.GRAY);
-
-        private Color color;
-
-        State(Color color) {
-            this.color = color;
-        }
-
-        public Color getColor() {
-            return color;
-        }
-    }
-
-    /**
-     * should be globally unique among all {@link Indicator}s. Used for storing indicators in
-     * collections, etc.
-     */
-    private String id;
-    private String indicatorDisplayName = "name";
-    private State state = State.GREEN;
-
-    private final List<IndicatorListener> listeners = new LinkedList<>();
-    private JMenuItem dismissMenuItem;
-    private JPopupMenu popupMenu;
-
-    private JPanel topPanel;
-    private JPanel statePanel;
-    private JPanel dataPanel;
-    private JLabel namelabel;
-    private IdiotLight idiotLight;
-    private String toolTipContent;
-    private String greenStateToolTipText;
-    private String grayStateToolTipText;
-
-    private IndicatorPanel parentIndicatorPanel;
-
-    private long lastUpdated = System.currentTimeMillis();
-
-    public Indicator() {
-        initGUI();
-    }
-
-    public Indicator(IndicatorPanel parentIndicatorPanel, String displayName) {
-        this.parentIndicatorPanel = parentIndicatorPanel;
-        indicatorDisplayName = displayName;
-        initGUI();
-    }
-
-    /**
-     * Sets the state of the {@link Indicator} to a specified value. If the state is GREEN or GRAY,
-     * the appropriate tooltip text is also applied. The color and tooltip text are applied to the
-     * {@link Indicator} and its {@link IdiotLight}, if any.
-     */
-    public void setState(State state) {
-        if (!SwingUtilities.isEventDispatchThread()) {
-            SwingUtilities.invokeLater(() -> setState(state));
-            return;
-        }
-        this.state = state;
-        if (state == State.GREEN && greenStateToolTipText != null) {
-            toolTipContent = greenStateToolTipText;
-        }
-        if (state == State.GRAY && grayStateToolTipText != null) {
-            toolTipContent = grayStateToolTipText;
-        }
-        setToolTipText(toolTipContent);
-
-        statePanel.setBackground(state.getColor());
-        if (idiotLight != null) {
-            idiotLight.setState(state, toolTipContent);
-        }
-    }
-
-    /**
-     * Sets the state of the {@link Indicator} to a specified value, and sets the tooltip text to a
-     * specified {@link String}. If the state is GREEN or GRAY, and the tooltip text for these
-     * states is set, then the tooltip text argument to this method will be ignored. The color and
-     * tooltip text are applied to the {@link Indicator} and its {@link IdiotLight}, if any.
-     */
-    public void setState(State state, String toolTipText) {
-        setToolTipContent(toolTipText);
-        setState(state);
-    }
-
-    public State getState() {
-        return state;
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            setPreferredSize(new java.awt.Dimension(200, 75));
-            setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
-            setVerifyInputWhenFocusTarget(false);
-            addMouseListener(new MouseAdapter() {
-                @Override
-                public void mouseClicked(MouseEvent evt) {
-                    rootMouseClicked();
-                }
-            });
-            this.add(getTopPanel(), BorderLayout.NORTH);
-            this.add(getDataPanel(), BorderLayout.CENTER);
-            setComponentPopupMenu(this, getPopupMenu());
-            setState(state);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getTopPanel() {
-        if (topPanel == null) {
-            topPanel = new JPanel();
-            BorderLayout topPanelLayout = new BorderLayout();
-            topPanelLayout.setHgap(5);
-            topPanel.setLayout(topPanelLayout);
-            topPanel.add(getNamelabel(), BorderLayout.WEST);
-            topPanel.add(getStatePanel(), BorderLayout.CENTER);
-        }
-        return topPanel;
-    }
-
-    private JLabel getNamelabel() {
-        if (namelabel == null) {
-            namelabel = new JLabel();
-            namelabel.setText(indicatorDisplayName);
-        }
-        return namelabel;
-    }
-
-    private JPanel getStatePanel() {
-        if (statePanel == null) {
-            statePanel = new JPanel();
-            statePanel.setBackground(new java.awt.Color(0, 167, 0));
-            statePanel.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
-        }
-        return statePanel;
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridLayout dataPanelLayout = new GridLayout(3, 2);
-            dataPanelLayout.setColumns(2);
-            dataPanelLayout.setRows(3);
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.setBackground(new java.awt.Color(255, 255, 255));
-        }
-        return dataPanel;
-    }
-
-    public static State summaryState(Indicator... indicators) {
-        State sumState = State.GRAY;
-        for (Indicator indicator : indicators) {
-            if (indicator == null) {
-                continue;
-            }
-            if ((indicator.getState() == State.GREEN) && (sumState == State.GRAY)) {
-                sumState = State.GREEN;
-            }
-            if ((indicator.getState() == State.AMBER)
-                && (sumState == State.GRAY || sumState == State.GREEN)) {
-                sumState = State.AMBER;
-            }
-            if (indicator.getState() == State.RED) {
-                sumState = State.RED;
-            }
-        }
-        return sumState;
-    }
-
-    public static String summaryToolTipText(Indicator... indicators) {
-        List<String> stateStrings = new ArrayList<>();
-        for (Indicator indicator : indicators) {
-            if (indicator == null) {
-                continue;
-            }
-            if (indicator.getState() == State.AMBER || indicator.getState() == State.RED) {
-                stateStrings.add(indicator.getToolTipContent());
-            }
-        }
-        if (stateStrings.size() == 0) {
-            return null;
-        }
-        String summaryString = null;
-        for (int i = 0; i < stateStrings.size(); i++) {
-            summaryString += stateStrings.get(i);
-            if (i < stateStrings.size() - 1) {
-                summaryString += System.lineSeparator();
-            }
-        }
-        return summaryString;
-    }
-
-    public void addDataComponent(Component component) {
-        dataPanel.add(component);
-    }
-
-    /**
-     * @return Returns the indicatorName.
-     */
-    public String getIndicatorDisplayName() {
-        return indicatorDisplayName;
-    }
-
-    /**
-     * @param indicatorName The indicatorName to set.
-     */
-    public void setIndicatorDisplayName(String indicatorName) {
-        indicatorDisplayName = indicatorName;
-        namelabel.setText(indicatorName);
-    }
-
-    private void rootMouseClicked() {
-        fireIndicatorListeners();
-    }
-
-    private void fireIndicatorListeners() {
-        for (IndicatorListener listener : listeners) {
-            listener.clicked(this);
-        }
-    }
-
-    public boolean addIndicatorListener(IndicatorListener o) {
-        return listeners.add(o);
-    }
-
-    public void clearIndicatorListeners() {
-        listeners.clear();
-    }
-
-    public long getLastUpdated() {
-        return lastUpdated;
-    }
-
-    public void setLastUpdated(long lastUpdated) {
-        this.lastUpdated = lastUpdated;
-    }
-
-    public void setLastUpdatedNow() {
-        lastUpdated = System.currentTimeMillis();
-    }
-
-    private JPopupMenu getPopupMenu() {
-        if (popupMenu == null) {
-            popupMenu = new JPopupMenu();
-            popupMenu.add(getDismissMenuItem());
-        }
-        return popupMenu;
-    }
-
-    /**
-     * Auto-generated method for setting the popup menu for a component
-     */
-    private void setComponentPopupMenu(final java.awt.Component parent,
-        final javax.swing.JPopupMenu menu) {
-        parent.addMouseListener(new java.awt.event.MouseAdapter() {
-            @Override
-            public void mousePressed(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                }
-            }
-
-            @Override
-            public void mouseReleased(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                }
-            }
-        });
-    }
-
-    private JMenuItem getDismissMenuItem() {
-        if (dismissMenuItem == null) {
-            dismissMenuItem = new JMenuItem();
-            dismissMenuItem.setText("dismiss");
-            dismissMenuItem.addActionListener(evt -> dismissMenuItemActionPerformed());
-        }
-        return dismissMenuItem;
-    }
-
-    private void dismissMenuItemActionPerformed() {
-        parentIndicatorPanel.removeIndicator(this);
-
-        // TODO add your code for dismissMenuItem.actionPerformed
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public IdiotLight getIdiotLight() {
-        return idiotLight;
-    }
-
-    public void setIdiotLight(IdiotLight idiotLight) {
-        this.idiotLight = idiotLight;
-    }
-
-    public String getToolTipContent() {
-        return toolTipContent;
-    }
-
-    public void setToolTipContent(String toolTipText) {
-        toolTipContent = toolTipText;
-        setToolTipText(toolTipText);
-        if (idiotLight != null) {
-            idiotLight.setToolTipText(toolTipText);
-        }
-    }
-
-    public String getGreenStateToolTipText() {
-        return greenStateToolTipText;
-    }
-
-    public void setGreenStateToolTipText(String greenStateToolTipText) {
-        this.greenStateToolTipText = greenStateToolTipText;
-    }
-
-    public String getGrayStateToolTipText() {
-        return grayStateToolTipText;
-    }
-
-    public void setGrayStateToolTipText(String grayStateToolTipText) {
-        this.grayStateToolTipText = grayStateToolTipText;
-    }
-
-    /**
-     * Visual representation of one of the status summary panel idiot lights, in this case a filled
-     * circle of one of the standard solid colors.
-     *
-     * @author PT
-     */
-    public static class IdiotLight extends JPanel {
-
-        private static final long serialVersionUID = 1L;
-        private static final int LIGHT_SIZE = 12;
-        private State state = State.GREEN;
-
-        public IdiotLight() {
-            Dimension size = new Dimension(LIGHT_SIZE, LIGHT_SIZE + 10);
-            setPreferredSize(size);
-            setMinimumSize(size);
-            setMaximumSize(size);
-            setSize(size);
-            setLayout(null);
-        }
-
-        public void setState(State state, String toolTipText) {
-            if (this.state != state) {
-                this.state = state;
-                repaint();
-            }
-            setToolTipText(toolTipText);
-        }
-
-        public State getState() {
-            return state;
-        }
-
-        @Override
-        public void paintComponent(Graphics g) {
-            super.paintComponent(g);
-            g.setColor(state.getColor());
-            g.fillOval(0, 5, LIGHT_SIZE - 1, LIGHT_SIZE - 1);
-        }
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorDataPanel.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorDataPanel.java
deleted file mode 100644
index 7167ab8..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorDataPanel.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import java.awt.GridLayout;
-
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.WindowConstants;
-
-public class IndicatorDataPanel extends javax.swing.JPanel {
-    private static final long serialVersionUID = -5526091679673082052L;
-
-    private JLabel jLabel1;
-    private JLabel jLabel2;
-    private JLabel jLabel4;
-    private JLabel jLabel3;
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new IndicatorDataPanel());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-    }
-
-    public IndicatorDataPanel() {
-        initGUI();
-    }
-
-    private void initGUI() {
-        try {
-            GridLayout thisLayout = new GridLayout(3, 2);
-            thisLayout.setColumns(2);
-            thisLayout.setRows(3);
-            setLayout(thisLayout);
-            this.add(getJLabel1());
-            this.add(getJLabel2());
-            this.add(getJLabel3());
-            this.add(getJLabel4());
-            // setPreferredSize(new Dimension(400, 300));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JLabel getJLabel1() {
-        if (jLabel1 == null) {
-            jLabel1 = new JLabel();
-            jLabel1.setText("id: 42");
-            jLabel1.setFont(new java.awt.Font("Dialog", 0, 10));
-        }
-        return jLabel1;
-    }
-
-    private JLabel getJLabel2() {
-        if (jLabel2 == null) {
-            jLabel2 = new JLabel();
-            jLabel2.setText("state: processing");
-            jLabel2.setFont(new java.awt.Font("Dialog", 0, 10));
-        }
-        return jLabel2;
-    }
-
-    private JLabel getJLabel3() {
-        if (jLabel3 == null) {
-            jLabel3 = new JLabel();
-            jLabel3.setText("tasks: 40/10/3");
-            jLabel3.setFont(new java.awt.Font("Dialog", 0, 10));
-        }
-        return jLabel3;
-    }
-
-    private JLabel getJLabel4() {
-        if (jLabel4 == null) {
-            jLabel4 = new JLabel();
-            jLabel4.setText("workers: 5");
-            jLabel4.setFont(new java.awt.Font("Dialog", 0, 10));
-        }
-        return jLabel4;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorLayout.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorLayout.java
deleted file mode 100644
index abc8499..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorLayout.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Insets;
-import java.awt.LayoutManager;
-
-public class IndicatorLayout implements LayoutManager {
-    private int numRows = 3;
-    private int hGap = 10;
-    private int vGap = 10;
-
-    public IndicatorLayout() {
-    }
-
-    @Override
-    public void addLayoutComponent(String name, Component comp) {
-    }
-
-    @Override
-    public void removeLayoutComponent(Component comp) {
-    }
-
-    @Override
-    public Dimension preferredLayoutSize(Container parent) {
-        int width = 0;
-        int height = 0;
-        int columnHeight = 0;
-        int columnWidth = 0;
-        int currentRow = 0;
-
-        for (int i = 0; i < parent.getComponentCount(); i++) {
-            Component c = parent.getComponent(i);
-            Dimension d = c.getPreferredSize();
-
-            columnWidth = (int) Math.max(columnWidth, d.getWidth() + hGap);
-            columnHeight += d.getHeight() + vGap;
-
-            if (currentRow + 1 == numRows) {
-                // last row
-                width += columnWidth;
-                height = Math.max(height, columnHeight);
-                currentRow = 0;
-                columnWidth = 0;
-                columnHeight = 0;
-            } else {
-                currentRow++;
-            }
-        }
-
-        Insets insets = parent.getInsets();
-        return new Dimension(width + insets.left + insets.right,
-            height + insets.top + insets.bottom);
-    }
-
-    @Override
-    public Dimension minimumLayoutSize(Container parent) {
-        return preferredLayoutSize(parent);
-    }
-
-    @Override
-    public void layoutContainer(Container parent) {
-        Insets insets = parent.getInsets();
-        int x = insets.left + hGap;
-        int y = insets.top + vGap;
-        int currentRow = 0;
-        int columnWidth = 0;
-
-        for (int i = 0; i < parent.getComponentCount(); i++) {
-            Component c = parent.getComponent(i);
-            Dimension d = c.getPreferredSize();
-
-            c.setBounds(x, y, d.width, d.height);
-
-            columnWidth = (int) Math.max(columnWidth, d.getWidth() + hGap);
-
-            if (currentRow + 1 == numRows) {
-                // last row
-                x += columnWidth + hGap;
-                y = insets.top + vGap;
-                currentRow = 0;
-                columnWidth = 0;
-            } else {
-                currentRow++;
-                y += d.height + vGap;
-            }
-        }
-    }
-
-    /**
-     * @return Returns the hGap.
-     */
-    public int getHGap() {
-        return hGap;
-    }
-
-    /**
-     * @param gap The hGap to set.
-     */
-    public void setHGap(int gap) {
-        hGap = gap;
-    }
-
-    /**
-     * @return Returns the numRows.
-     */
-    public int getNumRows() {
-        return numRows;
-    }
-
-    /**
-     * @param numRows The numRows to set.
-     */
-    public void setNumRows(int numRows) {
-        this.numRows = numRows;
-    }
-
-    /**
-     * @return Returns the vGap.
-     */
-    public int getVGap() {
-        return vGap;
-    }
-
-    /**
-     * @param gap The vGap to set.
-     */
-    public void setVGap(int gap) {
-        vGap = gap;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorListener.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorListener.java
deleted file mode 100644
index ba0ce38..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-public interface IndicatorListener {
-    void clicked(Indicator source);
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorPanel.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorPanel.java
deleted file mode 100644
index f61223c..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/IndicatorPanel.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-/**
- * Superclass for all indicator panels.
- * <p>
- * An indicator panel is a {@link JPanel} that displays {@link Indicator} objects using the custom
- * {@link IndicatorLayout}. These Indicator objects display the realtime state of some system
- * element (a process, a worker thread, a pipeline instance, a metric, etc.) with a color-coded
- * health bar (green, amber, red, gray).
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public abstract class IndicatorPanel extends StatusPanel {
-    private int numRows = 5;
-    private IndicatorLayout layout;
-    private JPanel dataPanel;
-    private JScrollPane scrollPane;
-    private JButton resetButton;
-    private JLabel titleLabel;
-    private JPanel titleButtonBarPanel;
-
-    private boolean hasTitleButtonBar = true;
-
-    protected Indicator parentIndicator;
-    private JPanel buttonBarPanel;
-    private JPanel titlePanel;
-
-    public IndicatorPanel(Indicator parentIndicator) {
-        this.parentIndicator = parentIndicator;
-        initGUI();
-    }
-
-    public IndicatorPanel(Indicator parentIndicator, int numRows, boolean hasTitleButtonBar) {
-        this.parentIndicator = parentIndicator;
-        this.numRows = numRows;
-        this.hasTitleButtonBar = hasTitleButtonBar;
-        initGUI();
-    }
-
-    public abstract void dismissAll();
-
-    public void removeIndicator(Indicator indicator) {
-        dataPanel.remove(indicator);
-        repaint();
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            scrollPane = getScrollPane();
-            if (hasTitleButtonBar) {
-                this.add(getTitleButtonBarPanel(), BorderLayout.NORTH);
-            }
-            add(scrollPane, BorderLayout.CENTER);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JScrollPane getScrollPane() {
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getDataPanel());
-        }
-        return scrollPane;
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-
-            layout = new IndicatorLayout();
-            layout.setNumRows(numRows);
-            dataPanel.setLayout(layout);
-
-            // dataPanel.setBackground(new java.awt.Color(255, 255, 255));
-            // dataPanel.setPreferredSize(new Dimension(1500, 1500));
-        }
-        return dataPanel;
-    }
-
-    public void setTitle(String title) {
-        titleLabel.setText(title);
-    }
-
-    public void add(Indicator indicator) {
-        dataPanel.add(indicator);
-    }
-
-    /**
-     * @return Returns the numRows.
-     */
-    public int getNumRows() {
-        return numRows;
-    }
-
-    /**
-     * @param numRows The numRows to set.
-     */
-    public void setNumRows(int numRows) {
-        this.numRows = numRows;
-    }
-
-    private JPanel getTitleButtonBarPanel() {
-        if (titleButtonBarPanel == null) {
-            titleButtonBarPanel = new JPanel();
-            BorderLayout titleButtonBarPanelLayout = new BorderLayout();
-            titleButtonBarPanel.setLayout(titleButtonBarPanelLayout);
-            titleButtonBarPanel.add(getTitlePanel(), BorderLayout.WEST);
-            titleButtonBarPanel.add(getButtonBarPanel(), BorderLayout.EAST);
-        }
-        return titleButtonBarPanel;
-    }
-
-    private JLabel getTitleLabel() {
-        if (titleLabel == null) {
-            titleLabel = new JLabel();
-            titleLabel.setText("(title)");
-            titleLabel.setFont(new java.awt.Font("Dialog", 1, 14));
-        }
-        return titleLabel;
-    }
-
-    private JButton getResetButton() {
-        if (resetButton == null) {
-            resetButton = new JButton();
-            resetButton.setText("reset");
-            resetButton.addActionListener(evt -> resetButtonActionPerformed());
-        }
-        return resetButton;
-    }
-
-    private void resetButtonActionPerformed() {
-        dismissAll();
-    }
-
-    private JPanel getTitlePanel() {
-        if (titlePanel == null) {
-            titlePanel = new JPanel();
-            FlowLayout titlePanelLayout = new FlowLayout();
-            titlePanelLayout.setAlignment(FlowLayout.LEFT);
-            titlePanel.setLayout(titlePanelLayout);
-            titlePanel.add(getTitleLabel());
-        }
-        return titlePanel;
-    }
-
-    private JPanel getButtonBarPanel() {
-        if (buttonBarPanel == null) {
-            buttonBarPanel = new JPanel();
-            FlowLayout buttonBarPanelLayout = new FlowLayout();
-            buttonBarPanelLayout.setAlignOnBaseline(true);
-            buttonBarPanelLayout.setAlignment(FlowLayout.RIGHT);
-            buttonBarPanel.setLayout(buttonBarPanelLayout);
-            buttonBarPanel.add(getResetButton());
-        }
-        return buttonBarPanel;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/LabelValue.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/LabelValue.java
deleted file mode 100644
index c756266..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/LabelValue.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import java.awt.FlowLayout;
-
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.WindowConstants;
-
-public class LabelValue extends javax.swing.JPanel {
-    private static final long serialVersionUID = -5129404649677474189L;
-
-    private JLabel label;
-    private String name = "name";
-    private String value = "value";
-
-    public LabelValue() {
-        initGUI();
-    }
-
-    /**
-     * @param name
-     * @param value
-     */
-    public LabelValue(String name, String value) {
-        this.name = name;
-        this.value = value;
-        initGUI();
-    }
-
-    private void initGUI() {
-        try {
-            // START >> this
-            FlowLayout thisLayout = new FlowLayout();
-            thisLayout.setAlignment(FlowLayout.LEFT);
-            setLayout(thisLayout);
-            setBackground(new java.awt.Color(255, 255, 255));
-            // END << this
-            this.add(getLabel());
-            // setPreferredSize(new Dimension(400, 300));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JLabel getLabel() {
-        if (label == null) {
-            label = new JLabel();
-            label.setText(labelText());
-            label.setFont(new java.awt.Font("Dialog", 0, 10));
-        }
-        return label;
-    }
-
-    private String labelText() {
-        return "<html><b>" + name + ": </b> " + value + "</html>";
-        // return "<html>plain <B>Bold</B> and <I>Italic</I> Text</html>";
-    }
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new LabelValue());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-    }
-
-    /**
-     * @return Returns the name.
-     */
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @param name The name to set.
-     */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-        label.setText(labelText());
-    }
-
-    /**
-     * @return Returns the name.
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * @param value The value to set.
-     */
-    public void setValue(String value) {
-        this.value = value;
-        label.setText(labelText());
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/MasterStatusPanel.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/MasterStatusPanel.java
deleted file mode 100644
index a1ca6ed..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/MasterStatusPanel.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.WindowConstants;
-
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.mon.alerts.AlertMessageTableModel;
-import gov.nasa.ziggy.ui.mon.alerts.MonitoringAlertsPanel;
-import gov.nasa.ziggy.ui.mon.master.Indicator.IdiotLight;
-
-/**
- * This class provides a color-coded display that provides real-time status of pipeline elements,
- * including active pipelines, pipeline processes, worker threads, metrics, and alerts.
- *
- * @author Todd Klaus
- */
-public class MasterStatusPanel extends javax.swing.JPanel implements IndicatorListener {
-    private static final long serialVersionUID = 20220510L;
-
-    private static MasterStatusPanel instance;
-
-    private JSplitPane splitPane;
-    private JPanel detailedPanel;
-    private IndicatorPanel parentIndicatorPanel;
-    private Indicator workersIndicator;
-    private Indicator instancesIndicator;
-    private Indicator processesIndicator;
-    private Indicator alertsIndicator;
-    private CardLayout detailedPanelLayout;
-    private JScrollPane parentScrollPane;
-    private JScrollPane detailedScrollPane;
-
-    private WorkerStatusPanel workersPanel;
-    private MonitoringAlertsPanel alertsPanel;
-    private ProcessesIndicatorPanel processesPanel;
-
-    public MasterStatusPanel() {
-        initGUI();
-    }
-
-    private void initGUI() {
-        try {
-            setLayout(new BorderLayout());
-            this.add(getSplitPane(), BorderLayout.CENTER);
-            splitPane.setDividerLocation(0.35);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JSplitPane getSplitPane() {
-        if (splitPane == null) {
-            splitPane = new JSplitPane();
-            splitPane.add(getParentScrollPane(), JSplitPane.LEFT);
-            splitPane.add(getDetailedScrollPane(), JSplitPane.RIGHT);
-        }
-        return splitPane;
-    }
-
-    private JScrollPane getParentScrollPane() {
-        if (parentScrollPane == null) {
-            parentScrollPane = new JScrollPane();
-            parentScrollPane.setViewportView(getParentIndicatorPanel());
-        }
-        return parentScrollPane;
-    }
-
-    private JScrollPane getDetailedScrollPane() {
-        if (detailedScrollPane == null) {
-            detailedScrollPane = new JScrollPane();
-            detailedScrollPane.setViewportView(getDetailedPanel());
-        }
-        return detailedScrollPane;
-    }
-
-    private Indicator newIndicator(IndicatorPanel parent, String name, String greenStateToolTipText,
-        String grayStateToolTipText) {
-        Indicator indicator = new Indicator(parent, name);
-        indicator.setIdiotLight(new IdiotLight());
-        indicator.addIndicatorListener(this);
-        indicator.setGreenStateToolTipText(greenStateToolTipText);
-        indicator.setGrayStateToolTipText(grayStateToolTipText);
-        indicator.setState(Indicator.State.GREEN);
-        return indicator;
-    }
-
-    private StatusPanel getParentIndicatorPanel() {
-        if (parentIndicatorPanel == null) {
-            parentIndicatorPanel = new ParentIndicatorPanel(6, false);
-
-            instancesIndicator = newIndicator(parentIndicatorPanel, "Pipelines",
-                "Pipeline instance(s) executing normally", "No pipeline instances executing");
-            instancesIndicator.setState(Indicator.State.GRAY);
-
-            workersIndicator = newIndicator(parentIndicatorPanel, "Workers",
-                "Worker threads active", "All worker threads idle");
-            workersIndicator.setState(Indicator.State.GRAY);
-
-            processesIndicator = newIndicator(parentIndicatorPanel, "Processes",
-                "All processes running normally", null);
-
-            alertsIndicator = newIndicator(parentIndicatorPanel, "Alerts",
-                "No unacknowledged alerts present", null);
-
-            parentIndicatorPanel.add(instancesIndicator);
-            parentIndicatorPanel.add(workersIndicator);
-            parentIndicatorPanel.add(processesIndicator);
-            parentIndicatorPanel.add(alertsIndicator);
-        }
-        return parentIndicatorPanel;
-    }
-
-    private JPanel getDetailedPanel() {
-        if (detailedPanel == null) {
-            detailedPanel = new JPanel();
-            detailedPanelLayout = new CardLayout();
-            detailedPanel.setLayout(detailedPanelLayout);
-
-            detailedPanel.add(getWorkerPanel(), "workers");
-            detailedPanel.add(getAlertsPanel(), "alerts");
-            detailedPanel.add(getProcessesPanel(), "processes");
-            detailedPanel.add(new JPanel(), "metrics");
-        }
-        return detailedPanel;
-    }
-
-    private StatusPanel getProcessesPanel() {
-        if (processesPanel == null) {
-            processesPanel = ProcessesIndicatorPanel.processesIndicatorPanel(processesIndicator);
-        }
-        return processesPanel;
-    }
-
-    private MonitoringAlertsPanel getAlertsPanel() {
-        if (alertsPanel == null) {
-            alertsPanel = new MonitoringAlertsPanel();
-        }
-        return alertsPanel;
-    }
-
-    private StatusPanel getWorkerPanel() {
-        if (workersPanel == null) {
-            workersPanel = new WorkerStatusPanel();
-        }
-        return workersPanel;
-    }
-
-    private WorkerStatusPanel getWorkerStatusPanel() {
-        return workersPanel;
-    }
-
-    @Override
-    public void clicked(Indicator source) {
-        if (source == workersIndicator) {
-            detailedPanelLayout.show(detailedPanel, "workers");
-        } else if (source == instancesIndicator) {
-            ZiggyGuiConsole.displayOperationsTab();
-        } else if (source == processesIndicator) {
-            detailedPanelLayout.show(detailedPanel, "processes");
-        } else if (source == alertsIndicator) {
-            detailedPanelLayout.show(detailedPanel, "alerts");
-        }
-    }
-
-    private static void initializeSingletonInstance() {
-        if (instance == null) {
-            instance = new MasterStatusPanel();
-        }
-    }
-
-    /**
-     * Returns the singleton instance for inclusion in the master {@link ZiggyGuiConsole} GUI.
-     */
-    public static MasterStatusPanel masterStatusPanel() {
-        initializeSingletonInstance();
-        return instance;
-    }
-
-    public static void setDividerLocation(double d) {
-        initializeSingletonInstance();
-        instance.getSplitPane().setDividerLocation(d);
-    }
-
-    public static Indicator workersIndicator() {
-        initializeSingletonInstance();
-        return instance.workersIndicator;
-    }
-
-    public static Indicator processesIndicator() {
-        initializeSingletonInstance();
-        return instance.processesIndicator;
-    }
-
-    public static Indicator instancesIndicator() {
-        initializeSingletonInstance();
-        return instance.instancesIndicator;
-    }
-
-    public static Indicator alertsIndicator() {
-        initializeSingletonInstance();
-        return instance.alertsIndicator;
-    }
-
-    public static AlertMessageTableModel alertMessageTableModel() {
-        initializeSingletonInstance();
-        return instance.getAlertsPanel().getAlertMessageTableModel();
-    }
-
-    public static WorkerStatusPanel processesStatusPanel() {
-        initializeSingletonInstance();
-        return instance.getWorkerStatusPanel();
-    }
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        MasterStatusPanel masterStatusPanel = new MasterStatusPanel();
-        frame.getContentPane().add(masterStatusPanel);
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-        frame.setSize(1024, 700);
-        masterStatusPanel.splitPane.setDividerLocation(0.35);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/ParentIndicatorPanel.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/ParentIndicatorPanel.java
deleted file mode 100644
index 29d84b8..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/ParentIndicatorPanel.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import gov.nasa.ziggy.services.process.StatusMessage;
-
-/**
- * A special {@link IndicatorPanel} that has an {@link Indicator} for each indicator type
- * (processes, workers, pipeline instances, metrics). These parent indicators indicate the health of
- * the worst child indicator of that type (rollup status) and act as a navigation tool (clicking on
- * the parent indicator will display the IndicatorPanel for that type).
- *
- * @author Todd Klaus
- */
-public class ParentIndicatorPanel extends IndicatorPanel {
-    private static final long serialVersionUID = -2448349084476505804L;
-
-    public ParentIndicatorPanel() {
-        super(null);
-    }
-
-    public ParentIndicatorPanel(int numRows, boolean hasTitleButtonBar) {
-        super(null, numRows, hasTitleButtonBar);
-    }
-
-    @Override
-    public void update(StatusMessage statusMessage) {
-    }
-
-    @Override
-    public void dismissAll() {
-        // do nothing, parents are static
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/PipelineInstanceIndicator.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/PipelineInstanceIndicator.java
deleted file mode 100644
index 36abc60..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/PipelineInstanceIndicator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-public class PipelineInstanceIndicator extends Indicator {
-    private static final long serialVersionUID = 573620631554800492L;
-
-    private final LabelValue idLV = new LabelValue("id", "0");
-    private final LabelValue pipelineLV = new LabelValue("pipeline", "PA");
-    private final LabelValue stateLV = new LabelValue("state", "PROCESSING");
-    private final LabelValue tasksLV = new LabelValue("tasks", "140/5/20/3");
-    private final LabelValue workersLV = new LabelValue("workers", "5");
-
-    public PipelineInstanceIndicator(IndicatorPanel parentIndicatorPanel, String name) {
-        super(parentIndicatorPanel, name);
-        setPreferredSize(new java.awt.Dimension(220, 65));
-
-        // addDataComponent( idLV );
-        addDataComponent(pipelineLV);
-        addDataComponent(stateLV);
-        addDataComponent(tasksLV);
-        addDataComponent(workersLV);
-    }
-
-    /**
-     * @return Returns the id.
-     */
-    @Override
-    public String getId() {
-        return idLV.getValue();
-    }
-
-    /**
-     * @param id The id to set.
-     */
-    @Override
-    public void setId(String id) {
-        idLV.setValue(id);
-        setIndicatorDisplayName(id);
-    }
-
-    /**
-     * @return Returns the pipeline.
-     */
-    public String getPipeline() {
-        return pipelineLV.getValue();
-    }
-
-    /**
-     * @param pipeline The pipeline to set.
-     */
-    public void setPipeline(String pipeline) {
-        pipelineLV.setValue(pipeline);
-    }
-
-    /**
-     * @return Returns the state.
-     */
-    public String getLVState() {
-        return stateLV.getValue();
-    }
-
-    /**
-     * @param state The state to set.
-     */
-    public void setState(String state) {
-        stateLV.setValue(state);
-    }
-
-    /**
-     * @return Returns the tasks.
-     */
-    public String getTasks() {
-        return tasksLV.getValue();
-    }
-
-    /**
-     * @param tasks The tasks to set.
-     */
-    public void setTasks(String tasks) {
-        tasksLV.setValue(tasks);
-    }
-
-    /**
-     * @return Returns the workers.
-     */
-    public String getWorkers() {
-        return workersLV.getValue();
-    }
-
-    /**
-     * @param workers The workers to set.
-     */
-    public void setWorkers(String workers) {
-        workersLV.setValue(workers);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/ProcessNode.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/ProcessNode.java
deleted file mode 100644
index 9037047..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/ProcessNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import gov.nasa.ziggy.services.process.ProcessInfo;
-import gov.nasa.ziggy.services.process.StatusMessage;
-
-public class ProcessNode extends StatusNode {
-
-    private ProcessInfo processInfo;
-
-    public ProcessNode(StatusMessage statusMessage) {
-        update(statusMessage);
-    }
-
-    @Override
-    public void update(StatusMessage statusMessage) {
-        processInfo = new ProcessInfo(statusMessage.getSourceProcess());
-    }
-
-    @Override
-    public String toString() {
-        return processInfo.toString();
-    }
-
-    public String getName() {
-        return processInfo.getName();
-    }
-
-    public String getHost() {
-        return processInfo.getHost();
-    }
-
-    public int getPid() {
-        return processInfo.getPid();
-    }
-
-    public int getJvmid() {
-        return processInfo.getJvmid();
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/ProcessesIndicatorPanel.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/ProcessesIndicatorPanel.java
deleted file mode 100644
index eecd2be..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/ProcessesIndicatorPanel.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import java.util.concurrent.ExecutionException;
-
-import javax.swing.SwingWorker;
-
-import org.apache.commons.configuration.Configuration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.services.config.PropertyNames;
-import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.services.messages.WorkerResourceRequest;
-import gov.nasa.ziggy.services.messages.WorkerResourceRequest.WorkerResources;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
-import gov.nasa.ziggy.services.process.StatusMessage;
-
-public class ProcessesIndicatorPanel extends IndicatorPanel {
-
-    private static final long serialVersionUID = 20220614L;
-
-    private static Logger log = LoggerFactory.getLogger(ProcessesIndicatorPanel.class);
-
-    private static ProcessesIndicatorPanel instance;
-
-    private Indicator workerIndicator;
-    private Indicator databaseIndicator;
-    private Indicator messagingIndicator;
-
-    public ProcessesIndicatorPanel(Indicator parentIndicator) {
-        super(parentIndicator);
-        initGUI();
-    }
-
-    private void initGUI() {
-        Configuration config = ZiggyConfiguration.getInstance();
-        workerIndicator = newIndicator(this, "Worker", "Worker is running", null);
-
-        // See addWorkerDataComponents(), below.
-        add(workerIndicator);
-        messagingIndicator = newIndicator(this, "Messaging", "Messaging status: good", null);
-        messagingIndicator.addDataComponent(new LabelValue("Type", "RMI"));
-        messagingIndicator.addDataComponent(new LabelValue("Port",
-            Integer.toString(config.getInt(MessageHandler.RMI_REGISTRY_PORT_PROP,
-                MessageHandler.RMI_REGISTRY_PORT_PROP_DEFAULT))));
-        add(messagingIndicator);
-        if (config.getString(PropertyNames.DATABASE_SOFTWARE_PROP_NAME, null) != null) {
-            databaseIndicator = newIndicator(this, "Database", "Database is running", null);
-            databaseIndicator.addDataComponent(
-                new LabelValue("Name", config.getString(PropertyNames.DATABASE_NAME_PROP_NAME)));
-            databaseIndicator.addDataComponent(new LabelValue("Type",
-                config.getString(PropertyNames.DATABASE_SOFTWARE_PROP_NAME)));
-            databaseIndicator.addDataComponent(
-                new LabelValue("Host", config.getString(PropertyNames.DATABASE_HOST_PROP_NAME)));
-            databaseIndicator.addDataComponent(
-                new LabelValue("Port", config.getString(PropertyNames.DATABASE_PORT_PROP_NAME)));
-            databaseIndicator.addDataComponent(new LabelValue("Connections",
-                config.getString(PropertyNames.DATABASE_CONNECTIONS_PROP_NAME)));
-            add(databaseIndicator);
-        }
-        setTitle("Pipeline Processes");
-    }
-
-    private Indicator newIndicator(IndicatorPanel parent, String name, String greenStateToolTipText,
-        String grayStateToolTipText) {
-        Indicator indicator = new Indicator(parent, name);
-        indicator.setGreenStateToolTipText(greenStateToolTipText);
-        indicator.setGrayStateToolTipText(grayStateToolTipText);
-        indicator.setState(Indicator.State.GREEN);
-        return indicator;
-    }
-
-    private static String humanReadableHeapSize(long heapSize) {
-        long heapSizeMBytes = heapSize / 1000000;
-        if (heapSizeMBytes <= 1000) {
-            return Long.toString(heapSizeMBytes) + " MB";
-        }
-        if (heapSizeMBytes > 1000000) {
-            return Long.toString(heapSizeMBytes / 1000000) + " TB";
-        }
-        return Long.toString(heapSizeMBytes / 1000) + " GB";
-    }
-
-    @Override
-    public void dismissAll() {
-    }
-
-    @Override
-    public void update(StatusMessage statusMessage) {
-    }
-
-    private static void initializeSingletonInstance() {
-        if (instance == null) {
-            instance = new ProcessesIndicatorPanel(MasterStatusPanel.processesIndicator());
-        }
-    }
-
-    public static ProcessesIndicatorPanel processesIndicatorPanel(Indicator processesIndicator) {
-        if (instance == null) {
-            instance = new ProcessesIndicatorPanel(processesIndicator);
-        }
-        return instance;
-    }
-
-    // There's an ordering constraint on building the GUI components that I haven't been able
-    // to resolve. It goes like this:
-    // First, the panels (including this panel) must be instantiated.
-    // Then, the UiCommunicator can be constructed.
-    // Then, we can use the UiCommunicator to get the threads and heap size.
-    // When I try to exchange the order of the first 2 items, the GUI comes up blank, but
-    // obviously I can't use the UiCommunicator until I'm done constructing it. Thus the
-    // worker indicator needs to be instantiated in step 1 but populated in step 3. Thus
-    // the need for this method.
-    public static void addWorkerDataComponents() {
-
-        SwingWorker<WorkerResources, Void> swingWorker = new SwingWorker<>() {
-
-            @Override
-            protected WorkerResources doInBackground() throws Exception {
-                WorkerResources resources = (WorkerResources) UiCommunicator
-                    .send(new WorkerResourceRequest());
-                log.info("Resource values returned: threads " + resources.getWorkerThreads()
-                    + ", heap size " + resources.getHeapSize());
-                return resources;
-            }
-
-            @Override
-            protected void done() {
-                try {
-                    WorkerResources resources = get();
-                    log.info("Resource values returned: threads " + resources.getWorkerThreads()
-                        + ", heap size " + resources.getHeapSize());
-                    int workerThreads = resources.getWorkerThreads();
-                    long heapSize = resources.getHeapSize();
-                    workerIndicator().addDataComponent(
-                        new LabelValue("Threads", Integer.toString(workerThreads)));
-                    workerIndicator().addDataComponent(
-                        new LabelValue("Heap Size", humanReadableHeapSize(heapSize)));
-                } catch (InterruptedException | ExecutionException e) {
-                    throw new PipelineException("Unable to obtain worker resources", e);
-                }
-            }
-        };
-        swingWorker.execute();
-
-    }
-
-    public static Indicator workerIndicator() {
-        initializeSingletonInstance();
-        return instance.workerIndicator;
-    }
-
-    public static Indicator databaseIndicator() {
-        initializeSingletonInstance();
-        return instance.databaseIndicator;
-    }
-
-    public static Indicator messagingIndicator() {
-        initializeSingletonInstance();
-        return instance.messagingIndicator;
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusNode.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusNode.java
deleted file mode 100644
index fc72b5b..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusNode.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-
-import gov.nasa.ziggy.services.process.StatusMessage;
-
-public abstract class StatusNode {
-    private DefaultMutableTreeNode treeNode = null;
-
-    public abstract void update(StatusMessage statusMessage);
-
-    public DefaultMutableTreeNode getTreeNode() {
-        return treeNode;
-    }
-
-    public void setTreeNode(DefaultMutableTreeNode treeNode) {
-        this.treeNode = treeNode;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusPanel.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusPanel.java
deleted file mode 100644
index 62d357c..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusPanel.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import javax.swing.JPanel;
-
-import gov.nasa.ziggy.services.process.StatusMessage;
-
-/**
- * Superclass for panel that receive updates via JMS {@link StatusMessage}s.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public abstract class StatusPanel extends JPanel {
-    public abstract void update(StatusMessage statusMessage);
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusRowModel.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusRowModel.java
deleted file mode 100644
index de0a023..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusRowModel.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-
-import org.netbeans.swing.outline.RowModel;
-
-import gov.nasa.ziggy.util.StringUtils;
-
-public class StatusRowModel implements RowModel {
-    @Override
-    public Class<String> getColumnClass(int column) {
-        return String.class;
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 6;
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "State";
-            case 1:
-                return "Age";
-            case 2:
-                return "Instance";
-            case 3:
-                return "Task";
-            case 4:
-                return "Module";
-            case 5:
-                return "UOW";
-            default:
-                return "huh?";
-        }
-    }
-
-    @Override
-    public Object getValueFor(Object treeNode, int column) {
-        Object node = ((DefaultMutableTreeNode) treeNode).getUserObject();
-        if (node instanceof WorkerThreadNode) {
-            WorkerThreadNode workerThreadNode = (WorkerThreadNode) node;
-            switch (column) {
-                case 0:
-                    return workerThreadNode.getState();
-                case 1:
-                    return StringUtils.elapsedTime(workerThreadNode.getProcessingStartTime(),
-                        System.currentTimeMillis());
-                case 2:
-                    return workerThreadNode.getInstanceId();
-                case 3:
-                    return workerThreadNode.getTaskId();
-                case 4:
-                    return workerThreadNode.getModule();
-                case 5:
-                    return workerThreadNode.getModuleUow();
-                default:
-                    break;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isCellEditable(Object node, int column) {
-        return false;
-    }
-
-    @Override
-    public void setValueFor(Object node, int column, Object value) {
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusSummaryPanel.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusSummaryPanel.java
deleted file mode 100644
index 0358461..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/StatusSummaryPanel.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.WindowConstants;
-
-/**
- * Displays a set of summary indicators ("idiot lights") for the status of several pipeline systems:
- * pipelines, the worker, processes, alerts, and metrics. The indicators can be green, yellow, or
- * red for various status, or grey if not applicable ("light is out").
- *
- * @author PT
- */
-public class StatusSummaryPanel extends javax.swing.JPanel {
-    private static final long serialVersionUID = -7538149739596275583L;
-
-    public StatusSummaryPanel() {
-        initGUI();
-    }
-
-    private void initGUI() {
-        try {
-            FlowLayout thisLayout = new FlowLayout();
-            // setPreferredSize(new Dimension(400, 300));
-            thisLayout.setAlignment(FlowLayout.LEFT);
-            setLayout(thisLayout);
-            addIdiotLight(MasterStatusPanel.instancesIndicator(), "Pi", "Pipeline Instances");
-            addIdiotLight(MasterStatusPanel.workersIndicator(), "W", "Worker Threads");
-            addIdiotLight(MasterStatusPanel.processesIndicator(), "Pr", "Processes");
-            addIdiotLight(MasterStatusPanel.alertsIndicator(), "A", "Alerts");
-        } catch (
-
-        Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void addIdiotLight(Indicator indicator, String label, String tooltip) {
-        JLabel lightLabel = new JLabel(label);
-        lightLabel.setToolTipText(tooltip);
-        this.add(lightLabel);
-        lightLabel.setMinimumSize(new Dimension(0, 35));
-        lightLabel.setMaximumSize(new Dimension(Integer.MAX_VALUE, 35));
-        this.add(indicator.getIdiotLight());
-    }
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new StatusSummaryPanel());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/WorkerStatusPanel.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/WorkerStatusPanel.java
deleted file mode 100644
index 940af5a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/WorkerStatusPanel.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreePath;
-
-import org.netbeans.swing.outline.DefaultOutlineModel;
-import org.netbeans.swing.outline.Outline;
-import org.netbeans.swing.outline.OutlineModel;
-import org.netbeans.swing.outline.RenderDataProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
-import gov.nasa.ziggy.services.process.StatusMessage;
-
-/**
- * {@link StatusPanel} for worker threads. Status information is displayed using {@link Outline}.
- *
- * @author Todd Klaus
- * @author PT
- */
-@SuppressWarnings("serial")
-public class WorkerStatusPanel extends StatusPanel {
-    private static final Logger log = LoggerFactory.getLogger(WorkerStatusPanel.class);
-
-    private JScrollPane processesScrollPane;
-    private JButton clearButton;
-    private Outline processesOutline;
-    private JPanel buttonPanel;
-
-    private DefaultTreeModel treeModel;
-
-    private OutlineModel outlineModel;
-    private JButton collapseAllButton;
-    private JButton expandAllButton;
-
-    private Map<String, StatusNode> statusNodes = new HashMap<>();
-
-    private DefaultMutableTreeNode rootTreeNode;
-
-    public WorkerStatusPanel() {
-        initGUI();
-    }
-
-    @Override
-    public void update(StatusMessage statusMessage) {
-        SwingUtilities.invokeLater(() -> {
-            String key = statusMessage.uniqueKey();
-            String processKey = statusMessage.getSourceProcess().getKey();
-            StatusNode node = statusNodes.get(key);
-            StatusNode processNode = statusNodes.get(processKey);
-
-            // Add a "process node" if none present
-            if (processNode == null) {
-                processNode = new ProcessNode(statusMessage);
-                DefaultMutableTreeNode parent = rootTreeNode;
-                addNode(processKey, processNode, parent);
-            }
-
-            // Add a worker thread node if none present
-            if (node == null) {
-                StatusNode parentNode = statusNodes.get(processKey);
-                StatusNode newNode = new WorkerThreadNode((WorkerStatusMessage) statusMessage);
-
-                // add to owning process node
-                DefaultMutableTreeNode parent = parentNode.getTreeNode();
-                addNode(key, newNode, parent);
-            } else {
-                node.update(statusMessage);
-                treeModel.nodeChanged(node.getTreeNode());
-            }
-            Indicator.State workersState = Indicator.State.GRAY;
-            for (StatusNode statusNode : statusNodes.values()) {
-                if (statusNode instanceof WorkerThreadNode) {
-                    WorkerThreadNode workerNode = (WorkerThreadNode) statusNode;
-                    if (!workerNode.getState().equals("IDLE")) {
-                        workersState = Indicator.State.GREEN;
-                        break;
-                    }
-                }
-            }
-            MasterStatusPanel.workersIndicator().setState(workersState);
-            repaint();
-        });
-    }
-
-    private void addNode(String key, StatusNode node, DefaultMutableTreeNode parent) {
-        statusNodes.put(key, node);
-
-        DefaultMutableTreeNode childNode = new DefaultMutableTreeNode(node);
-        node.setTreeNode(childNode);
-
-        int index = parent.getChildCount();
-        treeModel.insertNodeInto(childNode, parent, index);
-        processesOutline.expandPath(new TreePath(childNode.getPath()));
-
-    }
-
-    private void clearButtonActionPerformed(ActionEvent evt) {
-        log.debug("clearButton.actionPerformed, event=" + evt);
-
-        statusNodes = new HashMap<>();
-
-        rootTreeNode = new DefaultMutableTreeNode("");
-        treeModel.setRoot(rootTreeNode);
-    }
-
-    private void expandAllButtonActionPerformed(ActionEvent evt) {
-        log.debug("expandAllButton.actionPerformed, event=" + evt);
-
-        int numKids = rootTreeNode.getChildCount();
-        for (int kidIndex = 0; kidIndex < numKids; kidIndex++) {
-            DefaultMutableTreeNode kid = (DefaultMutableTreeNode) rootTreeNode.getChildAt(kidIndex);
-            processesOutline.expandPath(new TreePath(kid.getPath()));
-        }
-    }
-
-    private void collapseAllButtonActionPerformed(ActionEvent evt) {
-        log.debug("collapseAllButton.actionPerformed, event=" + evt);
-
-        int numKids = rootTreeNode.getChildCount();
-        for (int kidIndex = 0; kidIndex < numKids; kidIndex++) {
-            DefaultMutableTreeNode kid = (DefaultMutableTreeNode) rootTreeNode.getChildAt(kidIndex);
-            processesOutline.collapsePath(new TreePath(kid.getPath()));
-        }
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            // setPreferredSize(new Dimension(400, 300));
-            this.add(getProcessesScrollPane(), BorderLayout.CENTER);
-            this.add(getButtonPanel(), BorderLayout.NORTH);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JScrollPane getProcessesScrollPane() {
-        if (processesScrollPane == null) {
-            processesScrollPane = new JScrollPane();
-            processesScrollPane.setViewportView(getProcessesOutline());
-        }
-        return processesScrollPane;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setAlignment(FlowLayout.LEFT);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getClearButton());
-            buttonPanel.add(getExpandAllButton());
-            buttonPanel.add(getCollapseAllButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getClearButton() {
-        if (clearButton == null) {
-            clearButton = new JButton();
-            clearButton.setText("clear");
-            clearButton.addActionListener(this::clearButtonActionPerformed);
-        }
-        return clearButton;
-    }
-
-    private Outline getProcessesOutline() {
-        if (processesOutline == null) {
-            rootTreeNode = new DefaultMutableTreeNode("");
-            treeModel = new DefaultTreeModel(rootTreeNode);
-
-            outlineModel = DefaultOutlineModel.createOutlineModel(treeModel, new StatusRowModel(),
-                false, "Worker Threads");
-
-            processesOutline = new Outline();
-            // if true, nothing is displayed
-            // processesOutline.setRootVisible(false);
-            processesOutline.setModel(outlineModel);
-            processesOutline.setRenderDataProvider(new RenderData());
-            processesOutline.expandPath(new TreePath(rootTreeNode.getPath()));
-        }
-        return processesOutline;
-    }
-
-    private static class RenderData implements RenderDataProvider {
-        @Override
-        public java.awt.Color getBackground(Object o) {
-            return null;
-        }
-
-        @Override
-        public String getDisplayName(Object o) {
-            DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) o;
-            Object userObject = treeNode.getUserObject();
-
-            if (userObject instanceof String) {
-                return (String) userObject;
-            }
-            if (userObject instanceof StatusNode) {
-                StatusNode node = (StatusNode) userObject;
-                return node.toString();
-            } else {
-                return "huh?";
-            }
-        }
-
-        @Override
-        public java.awt.Color getForeground(Object o) {
-            Object node = ((DefaultMutableTreeNode) o).getUserObject();
-
-            if (node instanceof WorkerThreadNode) {
-                return Color.GRAY;
-            }
-            return null;
-        }
-
-        @Override
-        public javax.swing.Icon getIcon(Object o) {
-            // TODO: use age-colored balls
-            return null;
-        }
-
-        @Override
-        public String getTooltipText(Object o) {
-            return "";
-        }
-
-        @Override
-        public boolean isHtmlDisplayName(Object o) {
-            return false;
-        }
-    }
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new WorkerStatusPanel());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-    }
-
-    private JButton getExpandAllButton() {
-        if (expandAllButton == null) {
-            expandAllButton = new JButton();
-            expandAllButton.setText("+");
-            expandAllButton.setToolTipText("Expand All");
-            expandAllButton.addActionListener(this::expandAllButtonActionPerformed);
-        }
-        return expandAllButton;
-    }
-
-    private JButton getCollapseAllButton() {
-        if (collapseAllButton == null) {
-            collapseAllButton = new JButton();
-            collapseAllButton.setText("-");
-            collapseAllButton.setToolTipText("Collapse All");
-            collapseAllButton.addActionListener(this::collapseAllButtonActionPerformed);
-        }
-        return collapseAllButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/WorkerThreadNode.java b/src/main/java/gov/nasa/ziggy/ui/mon/master/WorkerThreadNode.java
deleted file mode 100644
index 74409ae..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/WorkerThreadNode.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package gov.nasa.ziggy.ui.mon.master;
-
-import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
-import gov.nasa.ziggy.services.process.StatusMessage;
-
-public class WorkerThreadNode extends StatusNode {
-    private int threadNumber;
-    private String state;
-    private String instanceId;
-    private String taskId;
-    private String module;
-    private String moduleUow;
-    private long processingStartTime;
-
-    public WorkerThreadNode(WorkerStatusMessage workerStatusMessage) {
-        update(workerStatusMessage);
-    }
-
-    @Override
-    public void update(StatusMessage statusMessage) {
-        WorkerStatusMessage workerStatusMessage = (WorkerStatusMessage) statusMessage;
-
-        threadNumber = workerStatusMessage.getThreadNumber();
-        state = workerStatusMessage.getState();
-        instanceId = workerStatusMessage.getInstanceId();
-        taskId = workerStatusMessage.getTaskId();
-        module = workerStatusMessage.getModule();
-        moduleUow = workerStatusMessage.getModuleUow();
-        processingStartTime = workerStatusMessage.getProcessingStartTime();
-    }
-
-    @Override
-    public String toString() {
-        return "Thread #" + threadNumber;
-    }
-
-    public int getThreadNumber() {
-        return threadNumber;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public String getModule() {
-        return module;
-    }
-
-    public String getModuleUow() {
-        return moduleUow;
-    }
-
-    public long getProcessingStartTime() {
-        return processingStartTime;
-    }
-
-    public String getInstanceId() {
-        return instanceId;
-    }
-
-    public String getTaskId() {
-        return taskId;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/master/package.html b/src/main/java/gov/nasa/ziggy/ui/mon/master/package.html
deleted file mode 100644
index e86221a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/mon/master/package.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-  <body>
-    <p>
-      The first sentence is used as the brief description of the
-      package and appears at the top of the package documentation.
-      Additional sentences will appear at the bottom in the
-      Description section.
-    </p>
-    <dl>
-      <dt>Author</dt>
-      <dd>Bill Wohler</dd>
-      <dd>PT</dd>
-    </dl>
-    
-    <h2>Headings</h2>
-
-    <p>
-      Additional headings should use h2.
-    </p>
-
-    <h3>Sub-headings</h3>
-    
-    <p>
-      Sub-headings should use h3 and so on.
-    </p>
-
-  </body>
-</html>
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/AlertLogDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/AlertLogDialog.java
deleted file mode 100644
index 6841103..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/AlertLogDialog.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.table.TableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.ui.common.ZTable;
-
-@SuppressWarnings("serial")
-public class AlertLogDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(AlertLogDialog.class);
-
-    private JScrollPane alertLogScrollPane;
-    private JPanel buttonPanel;
-    private ZTable alertLogTable;
-    private JButton closeButton;
-
-    private final long pipelineInstanceId;
-
-    public AlertLogDialog(JFrame frame, long pipelineInstanceId) {
-        super(frame, true);
-
-        this.pipelineInstanceId = pipelineInstanceId;
-
-        initGUI();
-    }
-
-    private void closeButtonActionPerformed(ActionEvent evt) {
-        log.debug("closeButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    public static void showAlertLogDialog(JFrame frame, long pipelineInstanceId) {
-        AlertLogDialog dialog = new AlertLogDialog(frame, pipelineInstanceId);
-
-        dialog.setVisible(true);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Alerts");
-                getContentPane().add(getAlertLogScrollPane(), BorderLayout.CENTER);
-                getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            }
-            this.setSize(1173, 468);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JScrollPane getAlertLogScrollPane() {
-        if (alertLogScrollPane == null) {
-            alertLogScrollPane = new JScrollPane();
-            alertLogScrollPane.setViewportView(getAlertLogTable());
-        }
-        return alertLogScrollPane;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            buttonPanel.add(getCloseButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("close");
-            closeButton.addActionListener(this::closeButtonActionPerformed);
-        }
-        return closeButton;
-    }
-
-    private ZTable getAlertLogTable() {
-        if (alertLogTable == null) {
-            TableModel alertLogTableModel = new AlertLogTableModel(pipelineInstanceId);
-            alertLogTable = new ZTable();
-            alertLogTable.setTextWrappingEnabled(true);
-            alertLogTable.setRowShadingEnabled(true);
-            alertLogTable.setModel(alertLogTableModel);
-        }
-        return alertLogTable;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/AlertLogTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/AlertLogTableModel.java
deleted file mode 100644
index 47d3f47..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/AlertLogTableModel.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.services.alert.AlertLog;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.proxy.AlertLogCrudProxy;
-import gov.nasa.ziggy.util.dispmod.AlertLogDisplayModel;
-
-@SuppressWarnings("serial")
-public class AlertLogTableModel extends AbstractTableModel {
-    private final AlertLogCrudProxy alertLogCrud;
-    private List<AlertLog> alerts = new ArrayList<>();
-    private final long pipelineInstanceId;
-    private final AlertLogDisplayModel alertLogDisplayModel = new AlertLogDisplayModel();
-
-    public AlertLogTableModel(long pipelineInstanceId) {
-        this.pipelineInstanceId = pipelineInstanceId;
-
-        alertLogCrud = new AlertLogCrudProxy();
-
-        loadFromDatabase();
-    }
-
-    public void loadFromDatabase() {
-        try {
-            alerts = alertLogCrud.retrieveForPipelineInstance(pipelineInstanceId);
-            alertLogDisplayModel.update(alerts);
-        } catch (ConsoleSecurityException ignore) {
-        }
-
-        fireTableDataChanged();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        return alertLogDisplayModel.getValueAt(rowIndex, columnIndex);
-    }
-
-    @Override
-    public int getColumnCount() {
-        return alertLogDisplayModel.getColumnCount();
-    }
-
-    @Override
-    public int getRowCount() {
-        return alertLogDisplayModel.getRowCount();
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        return alertLogDisplayModel.getColumnName(column);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceCostEstimateDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceCostEstimateDialog.java
deleted file mode 100644
index 2444b7e..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceCostEstimateDialog.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import static gov.nasa.ziggy.ui.common.LabelUtils.boldLabel;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridLayout;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.SwingConstants;
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.ui.common.ToolTipBorderJPanel;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.proxy.PipelineTaskOperationsProxy;
-
-/**
- * Displays cost estimates for a pipeline instance and the tasks within that instance. Costs will be
- * in Standard Billing Units (SBUs) for tasks run on Pleiades, or in dollars for tasks run on AWS.
- *
- * @author PT
- */
-public class InstanceCostEstimateDialog extends JDialog {
-
-//    private static final Logger log = LoggerFactory.getLogger(InstanceCostEstimateDialog.class);
-
-    private static final long serialVersionUID = 20220425L;
-
-    private final PipelineInstance pipelineInstance;
-    private JButton closeButton;
-    private JPanel buttonPanel;
-    private JPanel instancePanel;
-    private JPanel tasksPanel;
-    private JScrollPane taskScrollPane;
-    private List<PipelineTask> pipelineTasksInInstance;
-
-    private JLabel instanceIdLabel = boldLabel();
-    private JLabel instanceStateLabel = boldLabel();
-    private JLabel instanceCostLabel = boldLabel();
-
-    public InstanceCostEstimateDialog(JFrame parent, PipelineInstance pipelineInstance) {
-        super(parent, true);
-        this.pipelineInstance = pipelineInstance;
-        initGUI();
-        setVisible(true);
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setTitle("Cost Estimate: Instance " + pipelineInstance.getId());
-            pipelineTasksInInstance = new PipelineTaskOperationsProxy()
-                .updateAndRetrieveTasks(pipelineInstance);
-            getContentPane().setLayout(thisLayout);
-            getContentPane().add(getTasksPanel(), BorderLayout.CENTER);
-            getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            getContentPane().add(getInstancePanel(), BorderLayout.NORTH);
-            this.setSize(750, 500);
-            setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    // At the bottom are some buttons: refresh and close.
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(20);
-            actionPanelLayout.setAlignment(FlowLayout.RIGHT);
-            buttonPanel.setLayout(actionPanelLayout);
-            buttonPanel.add(getCloseButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("Close");
-            closeButton.addActionListener(evt -> closeButtonActionPerformed());
-        }
-        return closeButton;
-    }
-
-    private void closeButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    // At the top: the roll-up of the instance state and cost estimate
-    private JPanel getInstancePanel() {
-        if (instancePanel == null) {
-            instancePanel = new ToolTipBorderJPanel();
-            instancePanel.setBorder(BorderFactory.createTitledBorder("Pipeline Instance"));
-            instancePanel.setToolTipText("Displays estimated cost of the full pipeline instance");
-            instancePanel.setLayout(new GridLayout(3, 2));
-            instancePanel.add(new JLabel("Instance ID:  ", SwingConstants.RIGHT));
-            instancePanel.add(instanceIdLabel);
-            instanceIdLabel.setText(Long.toString(pipelineInstance.getId()));
-            instancePanel.add(new JLabel("State:  ", SwingConstants.RIGHT));
-            instancePanel.add(instanceStateLabel);
-            instanceStateLabel.setText(pipelineInstance.getState().toString());
-            instancePanel.add(new JLabel("Cost estimate:  ", SwingConstants.RIGHT));
-            instancePanel.add(instanceCostLabel);
-            instanceCostLabel.setText(instanceCost());
-
-        }
-        return instancePanel;
-    }
-
-    private String instanceCost() {
-        double totalCost = 0;
-        for (PipelineTask task : pipelineTasksInInstance) {
-            totalCost += task.costEstimate();
-        }
-        return Long.toString(Math.round(totalCost));
-    }
-
-    private JPanel getTasksPanel() {
-        if (tasksPanel == null) {
-            tasksPanel = new ToolTipBorderJPanel();
-            tasksPanel.setBorder(BorderFactory.createTitledBorder("Pipeline Tasks"));
-            tasksPanel.setLayout(new BorderLayout());
-            tasksPanel.setToolTipText(
-                "Displays estimated cost of tasks in the selected pipeline instance");
-            tasksPanel.add(getTaskScrollPane());
-        }
-        return tasksPanel;
-    }
-
-    // In between: the table of task states and costs
-    private JScrollPane getTaskScrollPane() {
-        if (taskScrollPane == null) {
-            ZTable taskTable = new ZTable(new TaskCostEstimateTableModel(pipelineTasksInInstance));
-            taskTable.setRowShadingEnabled(true);
-            taskTable.setTextWrappingEnabled(true);
-            taskTable.setCellSelectionEnabled(false);
-            taskTable.setRowSelectionAllowed(false);
-            taskScrollPane = new JScrollPane(taskTable);
-        }
-        return taskScrollPane;
-    }
-
-    private static class TaskCostEstimateTableModel extends AbstractTableModel {
-
-        private static final long serialVersionUID = 20220425L;
-
-        private static final String[] COLUMN_HEADINGS = { "ID", "Module", "UOW", "State",
-            "Cost Estimate" };
-
-        private final List<PipelineTask> pipelineTasks;
-
-        public TaskCostEstimateTableModel(List<PipelineTask> pipelineTasks) {
-            this.pipelineTasks = pipelineTasks;
-        }
-
-        @Override
-        public int getRowCount() {
-            return pipelineTasks.size();
-        }
-
-        @Override
-        public int getColumnCount() {
-            return COLUMN_HEADINGS.length;
-        }
-
-        @Override
-        public String getColumnName(int columnIndex) {
-            return COLUMN_HEADINGS[columnIndex];
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            PipelineTask task = pipelineTasks.get(rowIndex);
-            switch (columnIndex) {
-                case 0:
-                    return task.getId();
-                case 1:
-                    return task.getModuleName();
-                case 2:
-                    return task.uowTaskInstance().briefState();
-                case 3:
-                    return task.getState().toString();
-                case 4:
-                    return Long.toString(Math.round(task.costEstimate()));
-                default:
-                    throw new IllegalArgumentException("Illegal column number: " + columnIndex);
-            }
-        }
-
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceDetailsDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceDetailsDialog.java
deleted file mode 100644
index 062b4a2..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceDetailsDialog.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.util.Date;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.metrics.report.ReportFilePaths;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.ops.parameters.ParameterSetViewDialog;
-import gov.nasa.ziggy.ui.ops.parameters.ParameterSetViewPanel;
-import gov.nasa.ziggy.ui.proxy.PipelineInstanceCrudProxy;
-import gov.nasa.ziggy.ui.proxy.PipelineOperationsProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class InstanceDetailsDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(InstanceDetailsDialog.class);
-
-    private JPanel infoPanel;
-    private JPanel nodesPanel;
-    private JPanel actionPanel;
-    private JButton viewNodeParamsButton;
-    private JPanel nodesButtonPanel;
-    private JScrollPane nodesScrollPane;
-    private JButton closeButton;
-    private ParameterSetViewPanel pipelineParameterSetsPanel;
-    private JLabel endLabel;
-    private JTextField endTextField;
-    private JTextField totalTextField;
-    private JTextField startTextField;
-    private JTextField idTextField;
-    private JTextField nameTextField;
-    private JButton updateButton;
-    private JButton reportButton;
-    private ZTable nodeTable;
-    private JLabel idLabel;
-    private JLabel totalLabel;
-    private JLabel startLabel;
-    private JLabel nameLabel;
-
-    private PipelineInstance pipelineInstance = null;
-
-    private InstanceModulesTableModel nodeTableModel;
-
-    /* for Jigloo use only */
-    public InstanceDetailsDialog(JFrame frame) {
-        this(frame, null);
-    }
-
-    public InstanceDetailsDialog(JFrame frame, PipelineInstance pipelineInstance) {
-        super(frame, true);
-        this.pipelineInstance = pipelineInstance;
-
-        initGUI();
-    }
-
-    private void updateButtonActionPerformed(ActionEvent evt) {
-        log.debug("updateButton.actionPerformed, event=" + evt);
-
-        try {
-            String newName = nameTextField.getText();
-
-            if (!newName.equals(pipelineInstance.getName())) {
-                PipelineInstanceCrudProxy instanceCrud = new PipelineInstanceCrudProxy();
-                instanceCrud.updateName(pipelineInstance.getId(), newName);
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void viewNodeParamsButtonActionPerformed(ActionEvent evt) {
-        log.debug("viewNodeParamsButton.actionPerformed, event=" + evt);
-
-        int selectedRow = nodeTable.getSelectedRow();
-
-        if (selectedRow == -1) {
-            MessageUtil.showError(this, "No module selected");
-        } else {
-            PipelineInstanceNode node = nodeTableModel.getPipelineNodeAt(selectedRow);
-            ParameterSetViewDialog.showParameterSet(this, node.getModuleParameterSets());
-        }
-    }
-
-    private void reportButtonActionPerformed(ActionEvent evt) {
-        log.debug("reportButton.actionPerformed, event=" + evt);
-
-        PipelineOperationsProxy ops = new PipelineOperationsProxy();
-        String report = ops.generatePedigreeReport(pipelineInstance);
-
-        TextualReportDialog.showReport(this, report,
-            ReportFilePaths.instanceDetailsReportPath(pipelineInstance.getId()));
-    }
-
-    private void closeButtonActionPerformed(ActionEvent evt) {
-        log.debug("closeButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                GridBagLayout thisLayout = new GridBagLayout();
-                setTitle("Pipeline Instance Details");
-                thisLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                    0.1, 0.1, 0.1, 0.1 };
-                thisLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
-                thisLayout.columnWeights = new double[] { 0.1 };
-                thisLayout.columnWidths = new int[] { 7 };
-                getContentPane().setLayout(thisLayout);
-                getContentPane().add(getInfoPanel(),
-                    new GridBagConstraints(0, 0, 1, 4, 0.0, 0.0, GridBagConstraints.CENTER,
-                        GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-                getContentPane().add(getPipelineParameterSetsPanel(),
-                    new GridBagConstraints(0, 4, 1, 4, 0.0, 1.0, GridBagConstraints.CENTER,
-                        GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-                getContentPane().add(getNodesPanel(),
-                    new GridBagConstraints(0, 8, 1, 4, 0.0, 1.0, GridBagConstraints.CENTER,
-                        GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-                getContentPane().add(getActionPanel(),
-                    new GridBagConstraints(0, 12, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                        GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            }
-            this.setSize(520, 648);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getInfoPanel() {
-        if (infoPanel == null) {
-            infoPanel = new JPanel();
-            GridBagLayout infoPanelLayout = new GridBagLayout();
-            infoPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7, 7, 7 };
-            infoPanelLayout.rowHeights = new int[] { 7, 7, 7, 7 };
-            infoPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            infoPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1 };
-            infoPanel.setLayout(infoPanelLayout);
-            infoPanel.setBorder(BorderFactory.createTitledBorder("Pipeline Instance"));
-            infoPanel.add(getNameLabel(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getStartLabel(),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getEndLabel(),
-                new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getTotalLabel(),
-                new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getIdLabel(),
-                new GridBagConstraints(6, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getNameTextField(),
-                new GridBagConstraints(1, 0, 4, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getIdTextField(),
-                new GridBagConstraints(7, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getStartTextField(),
-                new GridBagConstraints(1, 1, 7, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getEndTextField(),
-                new GridBagConstraints(1, 2, 8, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getTotalTextField(),
-                new GridBagConstraints(1, 3, 8, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            infoPanel.add(getUpdateButton(), new GridBagConstraints(5, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return infoPanel;
-    }
-
-    private ParameterSetViewPanel getPipelineParameterSetsPanel() {
-        if (pipelineParameterSetsPanel == null) {
-            if (pipelineInstance != null) {
-                pipelineParameterSetsPanel = new ParameterSetViewPanel(
-                    pipelineInstance.getPipelineParameterSets());
-            } else {
-                pipelineParameterSetsPanel = new ParameterSetViewPanel();
-            }
-            pipelineParameterSetsPanel
-                .setBorder(BorderFactory.createTitledBorder("Pipeline Parameters"));
-        }
-        return pipelineParameterSetsPanel;
-    }
-
-    private JPanel getNodesPanel() {
-        if (nodesPanel == null) {
-            nodesPanel = new JPanel();
-            BorderLayout nodesPanelLayout = new BorderLayout();
-            nodesPanel.setLayout(nodesPanelLayout);
-            nodesPanel.setBorder(BorderFactory.createTitledBorder("Modules"));
-            nodesPanel.add(getNodesScrollPane(), BorderLayout.CENTER);
-            nodesPanel.add(getNodesButtonPanel(), BorderLayout.SOUTH);
-        }
-        return nodesPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(35);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getCloseButton());
-            actionPanel.add(getReportButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("close");
-            closeButton.addActionListener(this::closeButtonActionPerformed);
-        }
-        return closeButton;
-    }
-
-    private JScrollPane getNodesScrollPane() {
-        if (nodesScrollPane == null) {
-            nodesScrollPane = new JScrollPane();
-            nodesScrollPane.setViewportView(getNodeTable());
-        }
-        return nodesScrollPane;
-    }
-
-    private JPanel getNodesButtonPanel() {
-        if (nodesButtonPanel == null) {
-            nodesButtonPanel = new JPanel();
-            nodesButtonPanel.add(getViewNodeParamsButton());
-        }
-        return nodesButtonPanel;
-    }
-
-    private JButton getViewNodeParamsButton() {
-        if (viewNodeParamsButton == null) {
-            viewNodeParamsButton = new JButton();
-            viewNodeParamsButton.setText("view module parameters");
-            viewNodeParamsButton.addActionListener(this::viewNodeParamsButtonActionPerformed);
-        }
-        return viewNodeParamsButton;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JFrame frame = new JFrame();
-            InstanceDetailsDialog inst = new InstanceDetailsDialog(frame);
-            inst.setVisible(true);
-        });
-    }
-
-    private JLabel getNameLabel() {
-        if (nameLabel == null) {
-            nameLabel = new JLabel();
-            nameLabel.setText("Name ");
-        }
-        return nameLabel;
-    }
-
-    private JLabel getStartLabel() {
-        if (startLabel == null) {
-            startLabel = new JLabel();
-            startLabel.setText("Start ");
-        }
-        return startLabel;
-    }
-
-    private JLabel getEndLabel() {
-        if (endLabel == null) {
-            endLabel = new JLabel();
-            endLabel.setText("End ");
-        }
-        return endLabel;
-    }
-
-    private JLabel getTotalLabel() {
-        if (totalLabel == null) {
-            totalLabel = new JLabel();
-            totalLabel.setText("Total ");
-        }
-        return totalLabel;
-    }
-
-    private JLabel getIdLabel() {
-        if (idLabel == null) {
-            idLabel = new JLabel();
-            idLabel.setText("ID ");
-        }
-        return idLabel;
-    }
-
-    private JTextField getNameTextField() {
-        if (nameTextField == null) {
-            nameTextField = new JTextField();
-            nameTextField.setText(pipelineInstance.getName());
-        }
-        return nameTextField;
-    }
-
-    private JTextField getIdTextField() {
-        if (idTextField == null) {
-            idTextField = new JTextField();
-            idTextField.setText(pipelineInstance.getId() + "");
-            idTextField.setEditable(false);
-        }
-        return idTextField;
-    }
-
-    private JTextField getStartTextField() {
-        if (startTextField == null) {
-            startTextField = new JTextField();
-            startTextField.setText(pipelineInstance.getStartProcessingTime().toString());
-            startTextField.setEditable(false);
-        }
-        return startTextField;
-    }
-
-    private JTextField getEndTextField() {
-        if (endTextField == null) {
-            endTextField = new JTextField();
-            Date endProcessingTime = pipelineInstance.getEndProcessingTime();
-            if (endProcessingTime.getTime() == 0) {
-                endTextField.setText("-");
-            } else {
-                endTextField.setText(endProcessingTime.toString());
-            }
-            endTextField.setEditable(false);
-        }
-        return endTextField;
-    }
-
-    private JTextField getTotalTextField() {
-        if (totalTextField == null) {
-            totalTextField = new JTextField();
-            String elapsedTime = pipelineInstance.elapsedTime();
-            totalTextField.setText(elapsedTime);
-            totalTextField.setEditable(false);
-        }
-        return totalTextField;
-    }
-
-    private ZTable getNodeTable() {
-        if (nodeTable == null) {
-            nodeTableModel = new InstanceModulesTableModel(pipelineInstance);
-            nodeTable = new ZTable();
-            nodeTable.setRowShadingEnabled(true);
-            nodeTable.setModel(nodeTableModel);
-        }
-        return nodeTable;
-    }
-
-    private JButton getReportButton() {
-        if (reportButton == null) {
-            reportButton = new JButton();
-            reportButton.setText("report");
-            reportButton.addActionListener(this::reportButtonActionPerformed);
-        }
-        return reportButton;
-    }
-
-    private JButton getUpdateButton() {
-        if (updateButton == null) {
-            updateButton = new JButton();
-            updateButton.setText("update");
-            updateButton.addActionListener(this::updateButtonActionPerformed);
-        }
-        return updateButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceModulesListModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceModulesListModel.java
deleted file mode 100644
index 4b515c0..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceModulesListModel.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.AbstractListModel;
-import javax.swing.ComboBoxModel;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
-import gov.nasa.ziggy.ui.proxy.PipelineInstanceNodeCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class InstanceModulesListModel extends AbstractListModel<String>
-    implements ComboBoxModel<String> {
-    private final List<String> moduleNames = new LinkedList<>();
-    private List<PipelineInstanceNode> pipelineNodes = new LinkedList<>();
-
-    private String selectedName = null;
-
-    public InstanceModulesListModel(PipelineInstance instance) {
-        moduleNames.clear();
-        pipelineNodes.clear();
-
-        if (instance != null) {
-            PipelineInstanceNodeCrudProxy pipelineInstanceNodeCrud = new PipelineInstanceNodeCrudProxy();
-            pipelineNodes = pipelineInstanceNodeCrud.retrieveAll(instance);
-
-            for (PipelineInstanceNode node : pipelineNodes) {
-                moduleNames.add(
-                    node.getPipelineModuleDefinition().getName() + " (node:" + node.getId() + ")");
-            }
-        }
-
-        if (moduleNames.size() > 0) {
-            selectedName = moduleNames.get(0);
-        }
-    }
-
-    public PipelineInstanceNode getPipelineNodeAt(int index) {
-        return pipelineNodes.get(index);
-    }
-
-    public PipelineInstanceNode getSelectedPipelineNode() {
-        int selectedIndex = moduleNames.indexOf(selectedName);
-
-        if (selectedIndex != -1) {
-            return pipelineNodes.get(selectedIndex);
-        }
-        return null;
-    }
-
-    @Override
-    public String getElementAt(int index) {
-        return moduleNames.get(index);
-    }
-
-    @Override
-    public int getSize() {
-        return moduleNames.size();
-    }
-
-    @Override
-    public Object getSelectedItem() {
-        return selectedName;
-    }
-
-    @Override
-    public void setSelectedItem(Object selectedItem) {
-        selectedName = (String) selectedItem;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceModulesTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceModulesTableModel.java
deleted file mode 100644
index fb2ed78..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceModulesTableModel.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
-import gov.nasa.ziggy.ui.proxy.PipelineInstanceNodeCrudProxy;
-import gov.nasa.ziggy.util.dispmod.InstanceModulesDisplayModel;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class InstanceModulesTableModel extends AbstractTableModel {
-    private InstanceModulesDisplayModel instanceModulesDisplayModel = null;
-    private List<PipelineInstanceNode> pipelineInstanceNodes = new LinkedList<>();
-
-    public InstanceModulesTableModel(PipelineInstance instance) {
-        pipelineInstanceNodes.clear();
-
-        if (instance != null) {
-            PipelineInstanceNodeCrudProxy pipelineInstanceNodeCrud = new PipelineInstanceNodeCrudProxy();
-            pipelineInstanceNodes = pipelineInstanceNodeCrud.retrieveAll(instance);
-        }
-
-        instanceModulesDisplayModel = new InstanceModulesDisplayModel(pipelineInstanceNodes);
-    }
-
-    @Override
-    public int getColumnCount() {
-        return instanceModulesDisplayModel.getColumnCount();
-    }
-
-    @Override
-    public int getRowCount() {
-        return instanceModulesDisplayModel.getRowCount();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        return instanceModulesDisplayModel.getValueAt(rowIndex, columnIndex);
-    }
-
-    public PipelineInstanceNode getPipelineNodeAt(int index) {
-        return pipelineInstanceNodes.get(index);
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        return instanceModulesDisplayModel.getColumnName(column);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceStatsDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceStatsDialog.java
deleted file mode 100644
index f658bed..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstanceStatsDialog.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.proxy.PipelineTaskCrudProxy;
-
-@SuppressWarnings("serial")
-public class InstanceStatsDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(InstanceStatsDialog.class);
-
-    private JPanel dataPanel;
-    private JScrollPane processingBreakdownScrollPane;
-    private JButton refreshButton;
-    private JScrollPane processingTimeScrollPane;
-    private JPanel processingBreakdownPanel;
-    private JPanel processingTimePanel;
-    private JButton closeButton;
-    private JPanel buttonPanel;
-
-    private ZTable processingBreakdownTable;
-    private ZTable processingTimeTable;
-
-    private final PipelineInstance pipelineInstance;
-    private TaskMetricsTableModel processingBreakdownTableModel;
-    private PipelineStatsTableModel processingTimeTableModel;
-    private final PipelineTaskCrudProxy pipelineTaskCrud = new PipelineTaskCrudProxy();
-    private List<PipelineTask> tasks;
-    private ArrayList<String> orderedModuleNames;
-
-    public InstanceStatsDialog(JFrame frame, PipelineInstance pipelineInstance) {
-        super(frame, true);
-
-        this.pipelineInstance = pipelineInstance;
-
-        loadFromDatabase();
-        initGUI();
-    }
-
-    public static void showInstanceStatsDialog(JFrame frame, PipelineInstance pipelineInstance) {
-        InstanceStatsDialog dialog = new InstanceStatsDialog(frame, pipelineInstance);
-
-        dialog.setVisible(true);
-    }
-
-    private void loadFromDatabase() {
-        tasks = pipelineTaskCrud.retrieveAll(pipelineInstance);
-        orderedModuleNames = new ArrayList<>();
-
-        for (PipelineTask task : tasks) {
-            String moduleName = task.getPipelineInstanceNode()
-                .getPipelineModuleDefinition()
-                .getName()
-                .getName();
-            if (!orderedModuleNames.contains(moduleName)) {
-                orderedModuleNames.add(moduleName);
-            }
-        }
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        log.info("refreshButton.actionPerformed, event=" + evt);
-
-        loadFromDatabase();
-        updateTables();
-    }
-
-    private void updateTables() {
-        processingTimeTableModel.update(tasks, orderedModuleNames);
-        processingBreakdownTableModel.update(tasks, orderedModuleNames);
-    }
-
-    private void closeButtonActionPerformed(ActionEvent evt) {
-        log.info("closeButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Pipeline Instance Performance Statistics");
-                getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-                getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            }
-            setSize(1280, 500);
-        } catch (Exception e) {
-            throw e;
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.columnWidths = new int[] { 7 };
-            dataPanelLayout.rowHeights = new int[] { 7, 7 };
-            dataPanelLayout.columnWeights = new double[] { 0.1 };
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1 };
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getProcessingTimePanel(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getProcessingBreakdownPanel(),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return dataPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(50);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getRefreshButton());
-            buttonPanel.add(getCloseButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("<html><b>close</b></html>");
-            closeButton.addActionListener(this::closeButtonActionPerformed);
-        }
-        return closeButton;
-    }
-
-    private JPanel getProcessingTimePanel() {
-        if (processingTimePanel == null) {
-            processingTimePanel = new JPanel();
-            BorderLayout processingTimePanelLayout = new BorderLayout();
-            processingTimePanel.setLayout(processingTimePanelLayout);
-            processingTimePanel
-                .setBorder(BorderFactory.createTitledBorder("Processing Time Statistics"));
-            processingTimePanel.add(getProcessingTimeScrollPane(), BorderLayout.CENTER);
-        }
-        return processingTimePanel;
-    }
-
-    private JPanel getProcessingBreakdownPanel() {
-        if (processingBreakdownPanel == null) {
-            processingBreakdownPanel = new JPanel();
-            BorderLayout processingBreakdownPanelLayout = new BorderLayout();
-            processingBreakdownPanel.setLayout(processingBreakdownPanelLayout);
-            processingBreakdownPanel.setBorder(BorderFactory
-                .createTitledBorder("Processing Time Breakdown (completed tasks only)"));
-            processingBreakdownPanel.add(getProcessingBreakdownScrollPane(), BorderLayout.CENTER);
-        }
-        return processingBreakdownPanel;
-    }
-
-    private JScrollPane getProcessingTimeScrollPane() {
-        if (processingTimeScrollPane == null) {
-            processingTimeScrollPane = new JScrollPane();
-            processingTimeScrollPane.setViewportView(getProcessingTimeTable());
-        }
-        return processingTimeScrollPane;
-    }
-
-    private JScrollPane getProcessingBreakdownScrollPane() {
-        if (processingBreakdownScrollPane == null) {
-            processingBreakdownScrollPane = new JScrollPane();
-            processingBreakdownScrollPane.setViewportView(getProcessingBreakdownTable());
-        }
-        return processingBreakdownScrollPane;
-    }
-
-    private ZTable getProcessingTimeTable() {
-        if (processingTimeTable == null) {
-            processingTimeTableModel = new PipelineStatsTableModel(tasks, orderedModuleNames);
-            processingTimeTable = new ZTable();
-            processingTimeTable.setModel(processingTimeTableModel);
-        }
-        return processingTimeTable;
-    }
-
-    private ZTable getProcessingBreakdownTable() {
-        if (processingBreakdownTable == null) {
-            processingBreakdownTableModel = new TaskMetricsTableModel(tasks, orderedModuleNames,
-                false);
-            processingBreakdownTable = new ZTable();
-            processingBreakdownTable.setModel(processingBreakdownTableModel);
-        }
-        return processingBreakdownTable;
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstancesControlPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstancesControlPanel.java
deleted file mode 100644
index 0a42d0d..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstancesControlPanel.java
+++ /dev/null
@@ -1,626 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.border.BevelBorder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance.State;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceFilter;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class InstancesControlPanel extends javax.swing.JPanel {
-    private static final Logger log = LoggerFactory.getLogger(InstancesControlPanel.class);
-
-    private JPanel filtersPanel;
-    private JCheckBox stateErrorsStalledCheckBox;
-    private JCheckBox nameCheckBox;
-    private JCheckBox stateInitializedCheckBox;
-    private JCheckBox stateProcessingCheckBox;
-    private JCheckBox stateErrorsRunningCheckBox;
-    private JPanel ageOptionsFlowPanel;
-    private JLabel startLabel;
-    private JCheckBox ageCheckBox;
-    private JCheckBox stateCompleteCheckBox;
-    private JCheckBox statesCheckBox;
-    private JButton refreshNowButton;
-    private JTextField ageTextField;
-    private JButton clearFiltersButton;
-    private JPanel refreshButtonPanel;
-    private JLabel daysLabel;
-    private JButton day90Button;
-    private JButton day30Button;
-    private JButton day10Button;
-    private JButton day5Button;
-    private JButton day1Button;
-    private JPanel ageDefaultButtonsPanel;
-    private JPanel nameOptionsPanel;
-    private JTextField nameContainsTextField;
-    private JLabel containsLabel;
-    private JPanel nameOptionsFlowPanel;
-    private JPanel nameEnabledPanel;
-    private JPanel ageOptionsPanel;
-    private JPanel ageEnabledPanel;
-    private JPanel statesOptionsPanel;
-    private JPanel statesEnabledPanel;
-
-    private final PipelineInstanceFilter filter;
-
-    private OpsInstancesPanel listener = null;
-
-    /* for Jigloo use only */
-    public InstancesControlPanel() {
-        filter = new PipelineInstanceFilter();
-        initGUI();
-    }
-
-    public InstancesControlPanel(PipelineInstanceFilter filter) {
-        this.filter = filter;
-        initGUI();
-    }
-
-    private void day1ButtonActionPerformed(ActionEvent evt) {
-        log.debug("day1Button.actionPerformed, event=" + evt);
-
-        ageTextField.setText("1");
-    }
-
-    private void day5ButtonActionPerformed(ActionEvent evt) {
-        log.debug("day5Button.actionPerformed, event=" + evt);
-
-        ageTextField.setText("5");
-    }
-
-    private void day10ButtonActionPerformed(ActionEvent evt) {
-        log.debug("day10Button.actionPerformed, event=" + evt);
-
-        ageTextField.setText("10");
-    }
-
-    private void day30ButtonActionPerformed(ActionEvent evt) {
-        log.debug("day30Button.actionPerformed, event=" + evt);
-
-        ageTextField.setText("30");
-    }
-
-    private void day90ButtonActionPerformed(ActionEvent evt) {
-        log.debug("day90Button.actionPerformed, event=" + evt);
-
-        ageTextField.setText("90");
-    }
-
-    private void clearFiltersButtonActionPerformed(ActionEvent evt) {
-        log.debug("clearFiltersButton.actionPerformed, event=" + evt);
-
-        statesCheckBox.setSelected(false);
-        ageCheckBox.setSelected(false);
-        nameCheckBox.setSelected(false);
-
-        updateEnabledState();
-        updateFilter();
-    }
-
-    private void refreshNowButtonActionPerformed(ActionEvent evt) {
-        log.debug("refreshNowButton.actionPerformed, event=" + evt);
-
-        updateFilter();
-
-        refreshNowPressed();
-    }
-
-    private void statesCheckBoxActionPerformed(ActionEvent evt) {
-        log.debug("statesCheckBox.actionPerformed, event=" + evt);
-
-        updateEnabledState();
-    }
-
-    private void ageCheckBoxActionPerformed(ActionEvent evt) {
-        log.debug("ageCheckBox.actionPerformed, event=" + evt);
-
-        updateEnabledState();
-    }
-
-    private void nameCheckBoxActionPerformed(ActionEvent evt) {
-        log.debug("nameCheckBox.actionPerformed, event=" + evt);
-
-        updateEnabledState();
-    }
-
-    /**
-     * Update the 'enabled' state for the options components based on the state of the master
-     * checkboxes
-     */
-    private void updateEnabledState() {
-        // states
-        stateInitializedCheckBox.setEnabled(statesCheckBox.isSelected());
-        stateProcessingCheckBox.setEnabled(statesCheckBox.isSelected());
-        stateCompleteCheckBox.setEnabled(statesCheckBox.isSelected());
-        stateErrorsRunningCheckBox.setEnabled(statesCheckBox.isSelected());
-        stateErrorsStalledCheckBox.setEnabled(statesCheckBox.isSelected());
-
-        // age
-        startLabel.setEnabled(ageCheckBox.isSelected());
-        ageTextField.setEnabled(ageCheckBox.isSelected());
-        daysLabel.setEnabled(ageCheckBox.isSelected());
-        day1Button.setEnabled(ageCheckBox.isSelected());
-        day5Button.setEnabled(ageCheckBox.isSelected());
-        day10Button.setEnabled(ageCheckBox.isSelected());
-        day30Button.setEnabled(ageCheckBox.isSelected());
-        day90Button.setEnabled(ageCheckBox.isSelected());
-
-        // name
-        containsLabel.setEnabled(nameCheckBox.isSelected());
-        nameContainsTextField.setEnabled(nameCheckBox.isSelected());
-    }
-
-    private void updateFilter() {
-        // states
-        if (statesCheckBox.isSelected()) {
-            List<State> states = new ArrayList<>();
-            filter.setStates(states);
-
-            if (stateInitializedCheckBox.isSelected()) {
-                states.add(PipelineInstance.State.INITIALIZED);
-            }
-            if (stateProcessingCheckBox.isSelected()) {
-                states.add(PipelineInstance.State.PROCESSING);
-            }
-            if (stateCompleteCheckBox.isSelected()) {
-                states.add(PipelineInstance.State.COMPLETED);
-            }
-            if (stateErrorsRunningCheckBox.isSelected()) {
-                states.add(PipelineInstance.State.ERRORS_RUNNING);
-            }
-            if (stateErrorsStalledCheckBox.isSelected()) {
-                states.add(PipelineInstance.State.ERRORS_STALLED);
-            }
-        } else {
-            filter.setStates(null);
-        }
-
-        // age
-        if (ageCheckBox.isSelected()) {
-            int age = 0;
-            String ageText = ageTextField.getText();
-
-            try {
-                age = Integer.parseInt(ageText);
-            } catch (NumberFormatException e) {
-                JOptionPane.showMessageDialog(this,
-                    "Invalid age: " + ageText + ":" + e.getMessage(), "Error",
-                    JOptionPane.ERROR_MESSAGE);
-            }
-            filter.setAgeDays(age);
-        } else {
-            filter.setAgeDays(0);
-        }
-
-        // name
-        if (nameCheckBox.isSelected()) {
-            filter.setNameContains(nameContainsTextField.getText());
-        } else {
-            filter.setNameContains("");
-        }
-    }
-
-    private void initGUI() {
-        try {
-            GridBagLayout thisLayout = new GridBagLayout();
-            thisLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            thisLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7 };
-            thisLayout.rowWeights = new double[] { 0.1 };
-            thisLayout.rowHeights = new int[] { 7 };
-            setLayout(thisLayout);
-            setPreferredSize(new java.awt.Dimension(500, 226));
-            setOpaque(false);
-            this.add(getFiltersPanel(), new GridBagConstraints(0, 0, 6, 2, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getFiltersPanel() {
-        if (filtersPanel == null) {
-            filtersPanel = new JPanel();
-            GridBagLayout filtersPanelLayout = new GridBagLayout();
-            filtersPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                0.1 };
-            filtersPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7, 7, 7 };
-            filtersPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1 };
-            filtersPanelLayout.rowHeights = new int[] { 7, 7, 7, 7 };
-            filtersPanel.setLayout(filtersPanelLayout);
-            filtersPanel.setBorder(BorderFactory.createTitledBorder("Filter by"));
-            filtersPanel.add(getStatesEnabledPanel(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            filtersPanel.add(getStatesOptionsPanel(), new GridBagConstraints(1, 0, 7, 1, 1.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            filtersPanel.add(getAgeEnabledPanel(), new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            filtersPanel.add(getAgeOptionsPanel(), new GridBagConstraints(1, 1, 7, 1, 1.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            filtersPanel.add(getNameEnabledPanel(), new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            filtersPanel.add(getNameOptionsPanel(), new GridBagConstraints(1, 2, 7, 1, 1.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            filtersPanel.add(getRefreshButtonPanel(), new GridBagConstraints(0, 3, 8, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return filtersPanel;
-    }
-
-    private JPanel getStatesEnabledPanel() {
-        if (statesEnabledPanel == null) {
-            statesEnabledPanel = new JPanel();
-            statesEnabledPanel.add(getStatesCheckBox());
-        }
-        return statesEnabledPanel;
-    }
-
-    private JPanel getStatesOptionsPanel() {
-        if (statesOptionsPanel == null) {
-            statesOptionsPanel = new JPanel();
-            GridLayout statesOptionsPanelLayout = new GridLayout(3, 2);
-            statesOptionsPanelLayout.setColumns(2);
-            statesOptionsPanelLayout.setRows(3);
-            statesOptionsPanel.setLayout(statesOptionsPanelLayout);
-            statesOptionsPanel.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
-            statesOptionsPanel.add(getStateInitializedCheckBox());
-            statesOptionsPanel.add(getStateErrorsRunningCheckBox());
-            statesOptionsPanel.add(getStateProcessingCheckBox());
-            statesOptionsPanel.add(getStateErrorsStalledCheckBox());
-            statesOptionsPanel.add(getStateCompleteCheckBox());
-        }
-        return statesOptionsPanel;
-    }
-
-    private JPanel getAgeEnabledPanel() {
-        if (ageEnabledPanel == null) {
-            ageEnabledPanel = new JPanel();
-            ageEnabledPanel.add(getAgeCheckBox());
-        }
-        return ageEnabledPanel;
-    }
-
-    private JPanel getAgeOptionsPanel() {
-        if (ageOptionsPanel == null) {
-            ageOptionsPanel = new JPanel();
-            GridLayout datesOptionsPanelLayout = new GridLayout(2, 2);
-            datesOptionsPanelLayout.setColumns(2);
-            datesOptionsPanelLayout.setRows(2);
-            ageOptionsPanel.setLayout(datesOptionsPanelLayout);
-            ageOptionsPanel.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
-            ageOptionsPanel.add(getAgeOptionsFlowPanel());
-            ageOptionsPanel.add(getAgeDefaultButtonsPanel());
-        }
-        return ageOptionsPanel;
-    }
-
-    private JCheckBox getStatesCheckBox() {
-        if (statesCheckBox == null) {
-            statesCheckBox = new JCheckBox();
-            statesCheckBox.setText("States");
-            statesCheckBox.setSelected(filter.getStates() != null);
-            statesCheckBox.addActionListener(this::statesCheckBoxActionPerformed);
-        }
-        return statesCheckBox;
-    }
-
-    private JCheckBox getStateProcessingCheckBox() {
-        if (stateProcessingCheckBox == null) {
-            stateProcessingCheckBox = new JCheckBox();
-            stateProcessingCheckBox.setText("Processing");
-            List<State> states = filter.getStates();
-            stateProcessingCheckBox
-                .setSelected(states != null && states.contains(PipelineInstance.State.PROCESSING));
-            stateProcessingCheckBox.setEnabled(states != null);
-        }
-        return stateProcessingCheckBox;
-    }
-
-    private JCheckBox getStateInitializedCheckBox() {
-        if (stateInitializedCheckBox == null) {
-            stateInitializedCheckBox = new JCheckBox();
-            stateInitializedCheckBox.setText("Initialized");
-            List<State> states = filter.getStates();
-            stateInitializedCheckBox
-                .setSelected(states != null && states.contains(PipelineInstance.State.INITIALIZED));
-            stateInitializedCheckBox.setEnabled(states != null);
-        }
-        return stateInitializedCheckBox;
-    }
-
-    private JCheckBox getStateErrorsStalledCheckBox() {
-        if (stateErrorsStalledCheckBox == null) {
-            stateErrorsStalledCheckBox = new JCheckBox();
-            stateErrorsStalledCheckBox.setText("Errors (stalled)");
-            List<State> states = filter.getStates();
-            stateErrorsStalledCheckBox.setSelected(
-                states != null && states.contains(PipelineInstance.State.ERRORS_STALLED));
-            stateErrorsStalledCheckBox.setEnabled(states != null);
-        }
-        return stateErrorsStalledCheckBox;
-    }
-
-    private JCheckBox getStateErrorsRunningCheckBox() {
-        if (stateErrorsRunningCheckBox == null) {
-            stateErrorsRunningCheckBox = new JCheckBox();
-            stateErrorsRunningCheckBox.setText("Errors (running)");
-            List<State> states = filter.getStates();
-            stateErrorsRunningCheckBox.setSelected(
-                states != null && states.contains(PipelineInstance.State.ERRORS_RUNNING));
-            stateErrorsRunningCheckBox.setEnabled(states != null);
-        }
-        return stateErrorsRunningCheckBox;
-    }
-
-    private JCheckBox getStateCompleteCheckBox() {
-        if (stateCompleteCheckBox == null) {
-            stateCompleteCheckBox = new JCheckBox();
-            stateCompleteCheckBox.setText("Completed");
-            List<State> states = filter.getStates();
-            stateCompleteCheckBox
-                .setSelected(states != null && states.contains(PipelineInstance.State.COMPLETED));
-            stateCompleteCheckBox.setEnabled(states != null);
-        }
-        return stateCompleteCheckBox;
-    }
-
-    private JCheckBox getAgeCheckBox() {
-        if (ageCheckBox == null) {
-            ageCheckBox = new JCheckBox();
-            ageCheckBox.setText("Age");
-            ageCheckBox.setSelected(filter.getAgeDays() != 0);
-            ageCheckBox.addActionListener(this::ageCheckBoxActionPerformed);
-        }
-        return ageCheckBox;
-    }
-
-    private JLabel getStartLabel() {
-        if (startLabel == null) {
-            startLabel = new JLabel();
-            startLabel.setEnabled(filter.getAgeDays() > 0);
-            startLabel.setText("Started within the last");
-        }
-        return startLabel;
-    }
-
-    private JPanel getAgeOptionsFlowPanel() {
-        if (ageOptionsFlowPanel == null) {
-            ageOptionsFlowPanel = new JPanel();
-            FlowLayout datesOptionsStartPanelLayout = new FlowLayout();
-            datesOptionsStartPanelLayout.setAlignment(FlowLayout.LEFT);
-            ageOptionsFlowPanel.setLayout(datesOptionsStartPanelLayout);
-            ageOptionsFlowPanel.add(getStartLabel());
-            ageOptionsFlowPanel.add(getAgeTextField());
-            ageOptionsFlowPanel.add(getDaysLabel());
-        }
-        return ageOptionsFlowPanel;
-    }
-
-    /**
-     * @return Returns the listener.
-     */
-    public OpsInstancesPanel getListener() {
-        return listener;
-    }
-
-    /**
-     * @param listener The listener to set.
-     */
-    public void setListener(OpsInstancesPanel listener) {
-        this.listener = listener;
-    }
-
-    public void refreshNowPressed() {
-        if (listener != null) {
-            listener.refreshInstanceNowPressed();
-        }
-    }
-
-    private JCheckBox getNameCheckBox() {
-        if (nameCheckBox == null) {
-            nameCheckBox = new JCheckBox();
-            nameCheckBox.setText("Name");
-            String name = filter.getNameContains();
-            nameCheckBox.setSelected(name != null && name.length() > 0);
-            nameCheckBox.addActionListener(this::nameCheckBoxActionPerformed);
-        }
-        return nameCheckBox;
-    }
-
-    private JPanel getNameEnabledPanel() {
-        if (nameEnabledPanel == null) {
-            nameEnabledPanel = new JPanel();
-            nameEnabledPanel.add(getNameCheckBox());
-        }
-        return nameEnabledPanel;
-    }
-
-    private JPanel getNameOptionsFlowPanel() {
-        if (nameOptionsFlowPanel == null) {
-            nameOptionsFlowPanel = new JPanel();
-            FlowLayout nameOptionsPanelLayout = new FlowLayout();
-            nameOptionsPanelLayout.setAlignment(FlowLayout.LEFT);
-            nameOptionsFlowPanel.setLayout(nameOptionsPanelLayout);
-            nameOptionsFlowPanel.setEnabled(false);
-            nameOptionsFlowPanel.add(getContainsLabel());
-            nameOptionsFlowPanel.add(getNameContainsTextField());
-        }
-        return nameOptionsFlowPanel;
-    }
-
-    private JLabel getContainsLabel() {
-        if (containsLabel == null) {
-            containsLabel = new JLabel();
-            containsLabel.setText("Contains: ");
-            String name = filter.getNameContains();
-            containsLabel.setEnabled(name != null && name.length() > 0);
-        }
-        return containsLabel;
-    }
-
-    private JTextField getNameContainsTextField() {
-        if (nameContainsTextField == null) {
-            nameContainsTextField = new JTextField();
-            nameContainsTextField.setColumns(15);
-            String name = filter.getNameContains();
-            if (name != null) {
-                nameContainsTextField.setText(name);
-            }
-            nameContainsTextField.setEnabled(name != null && name.length() > 0);
-        }
-        return nameContainsTextField;
-    }
-
-    private JPanel getNameOptionsPanel() {
-        if (nameOptionsPanel == null) {
-            nameOptionsPanel = new JPanel();
-            GridBagLayout nameTextPanelLayout = new GridBagLayout();
-            nameTextPanelLayout.rowWeights = new double[] { 0.1 };
-            nameTextPanelLayout.rowHeights = new int[] { 7 };
-            nameTextPanelLayout.columnWeights = new double[] { 0.1 };
-            nameTextPanelLayout.columnWidths = new int[] { 7 };
-            nameOptionsPanel.setLayout(nameTextPanelLayout);
-            nameOptionsPanel.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
-            nameOptionsPanel.add(getNameOptionsFlowPanel(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return nameOptionsPanel;
-    }
-
-    private JPanel getAgeDefaultButtonsPanel() {
-        if (ageDefaultButtonsPanel == null) {
-            ageDefaultButtonsPanel = new JPanel();
-            FlowLayout ageDefaultButtonsPanelLayout = new FlowLayout();
-            ageDefaultButtonsPanelLayout.setAlignment(FlowLayout.LEFT);
-            ageDefaultButtonsPanel.setLayout(ageDefaultButtonsPanelLayout);
-            ageDefaultButtonsPanel.add(getDay1Button());
-            ageDefaultButtonsPanel.add(getDay5Button());
-            ageDefaultButtonsPanel.add(getDay10Button());
-            ageDefaultButtonsPanel.add(getDay30Button());
-            ageDefaultButtonsPanel.add(getDay90Button());
-        }
-        return ageDefaultButtonsPanel;
-    }
-
-    private JButton getDay1Button() {
-        if (day1Button == null) {
-            day1Button = new JButton();
-            day1Button.setText("1d");
-            day1Button.setEnabled(filter.getAgeDays() > 0);
-            day1Button.addActionListener(this::day1ButtonActionPerformed);
-        }
-        return day1Button;
-    }
-
-    private JButton getDay5Button() {
-        if (day5Button == null) {
-            day5Button = new JButton();
-            day5Button.setText("5d");
-            day5Button.setEnabled(filter.getAgeDays() > 0);
-            day5Button.addActionListener(this::day5ButtonActionPerformed);
-        }
-        return day5Button;
-    }
-
-    private JButton getDay10Button() {
-        if (day10Button == null) {
-            day10Button = new JButton();
-            day10Button.setText("10d");
-            day10Button.setEnabled(filter.getAgeDays() > 0);
-            day10Button.addActionListener(this::day10ButtonActionPerformed);
-        }
-        return day10Button;
-    }
-
-    private JButton getDay30Button() {
-        if (day30Button == null) {
-            day30Button = new JButton();
-            day30Button.setText("30d");
-            day30Button.setEnabled(filter.getAgeDays() > 0);
-            day30Button.addActionListener(this::day30ButtonActionPerformed);
-        }
-        return day30Button;
-    }
-
-    private JButton getDay90Button() {
-        if (day90Button == null) {
-            day90Button = new JButton();
-            day90Button.setText("90d");
-            day90Button.setEnabled(filter.getAgeDays() > 0);
-            day90Button.addActionListener(this::day90ButtonActionPerformed);
-        }
-        return day90Button;
-    }
-
-    private JLabel getDaysLabel() {
-        if (daysLabel == null) {
-            daysLabel = new JLabel();
-            daysLabel.setText("days");
-            daysLabel.setEnabled(filter.getAgeDays() > 0);
-        }
-        return daysLabel;
-    }
-
-    private JPanel getRefreshButtonPanel() {
-        if (refreshButtonPanel == null) {
-            refreshButtonPanel = new JPanel();
-            FlowLayout refreshButtonPanelLayout = new FlowLayout();
-            refreshButtonPanelLayout.setHgap(40);
-            refreshButtonPanel.setLayout(refreshButtonPanelLayout);
-            refreshButtonPanel.add(getClearFiltersButton());
-            refreshButtonPanel.add(getRefreshNowButton());
-        }
-        return refreshButtonPanel;
-    }
-
-    private JButton getClearFiltersButton() {
-        if (clearFiltersButton == null) {
-            clearFiltersButton = new JButton();
-            clearFiltersButton.setText("clear filters");
-            clearFiltersButton.addActionListener(this::clearFiltersButtonActionPerformed);
-        }
-        return clearFiltersButton;
-    }
-
-    private JButton getRefreshNowButton() {
-        if (refreshNowButton == null) {
-            refreshNowButton = new JButton();
-            refreshNowButton.setText("refresh");
-            refreshNowButton.addActionListener(this::refreshNowButtonActionPerformed);
-        }
-        return refreshNowButton;
-    }
-
-    private JTextField getAgeTextField() {
-        if (ageTextField == null) {
-            ageTextField = new JTextField();
-            ageTextField.setColumns(4);
-            ageTextField.setText("" + filter.getAgeDays());
-            ageTextField.setEnabled(filter.getAgeDays() > 0);
-        }
-        return ageTextField;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstancesTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstancesTableModel.java
deleted file mode 100644
index 5724ea7..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/InstancesTableModel.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.SwingWorker;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceFilter;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.PipelineInstanceCrudProxy;
-import gov.nasa.ziggy.util.dispmod.InstancesDisplayModel;
-
-@SuppressWarnings("serial")
-public class InstancesTableModel extends AbstractDatabaseModel {
-
-    private static final Logger log = LoggerFactory.getLogger(InstancesTableModel.class);
-
-    private final InstancesDisplayModel instancesDisplayModel = new InstancesDisplayModel();
-    private List<PipelineInstance> instances = new LinkedList<>();
-    private final PipelineInstanceCrudProxy pipelineInstanceCrud;
-    private final PipelineInstanceFilter filter;
-
-    public InstancesTableModel(PipelineInstanceFilter filter) {
-        this.filter = filter;
-        pipelineInstanceCrud = new PipelineInstanceCrudProxy();
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        SwingWorker<Void, Void> swingWorker = new SwingWorker<>() {
-
-            @Override
-            protected Void doInBackground() throws Exception {
-                refreshInstancesFromDatabase();
-                return null;
-            }
-
-            @Override
-            protected void done() {
-                if (isModelValid()) {
-                    refreshGui();
-                }
-
-            }
-
-        };
-        swingWorker.execute();
-    }
-
-    /**
-     * Performs the non-GUI portion of refreshing the pipeline instance list from the database. Both
-     * the evictAll() and retrieve() calls use the CrudProxyExecutor, which in turn uses a single
-     * threaded executor and synchronous execution.
-     */
-    public void refreshInstancesFromDatabase() {
-        if (instances != null) {
-            pipelineInstanceCrud.evictAll(instances);
-        }
-        try {
-            instances = pipelineInstanceCrud.retrieve(filter, true);
-        } catch (ConsoleSecurityException ignore) {
-        }
-    }
-
-    /**
-     * Performs the GUI portion of refreshing the pipeline instance list from the database. This
-     * method must be called from the event dispatch thread for the console. Hence it must be called
-     * either directly within that thread or via the invokeLater() or invokeAndWait() methods of
-     * SwingUtilities.
-     */
-    public void refreshGui() {
-        try {
-            instancesDisplayModel.update(instances);
-        } catch (ConsoleSecurityException ignore) {
-        }
-        fireTableDataChanged();
-        log.debug("end of refreshGui()");
-    }
-
-    /**
-     * Returns the model ID corresponding to a selected pipeline instance ID. If the selected
-     * pipeline instance ID is less than zero, or if it is not present in the model, -1 is returned.
-     */
-    public int getModelIndexOfInstance(long instanceId) {
-        int modelId = -1;
-        if (instanceId < 0) {
-            return modelId;
-        }
-        for (int i = 0; i < instances.size(); i++) {
-            if (instances.get(i).getId() == instanceId) {
-                modelId = i;
-                break;
-            }
-        }
-        return modelId;
-    }
-
-    /**
-     * Returns the state of the instance with max ID. Assumes that the list of instances is sorted
-     * ascending, which is the expected behavior of the PipelineInstanceCrudProxy retriever.
-     *
-     * @return State of instance with max ID number.
-     */
-    public PipelineInstance.State getStateOfInstanceWithMaxid() {
-        if (instances.isEmpty()) {
-            return PipelineInstance.State.COMPLETED;
-        }
-        return instances.get(instances.size() - 1).getState();
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return instancesDisplayModel.getRowCount();
-    }
-
-    @Override
-    public int getColumnCount() {
-        validityCheck();
-        return instancesDisplayModel.getColumnCount();
-    }
-
-    public PipelineInstance getInstanceAt(int rowIndex) {
-        validityCheck();
-        return instancesDisplayModel.getInstanceAt(rowIndex);
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-        return instancesDisplayModel.getValueAt(rowIndex, columnIndex);
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        validityCheck();
-        return instancesDisplayModel.getColumnName(column);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/OpsInstancePanelAutoRefresh.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/OpsInstancePanelAutoRefresh.java
deleted file mode 100644
index 3bf9626..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/OpsInstancePanelAutoRefresh.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import javax.swing.SwingWorker;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.ui.mon.master.Indicator;
-import gov.nasa.ziggy.ui.mon.master.MasterStatusPanel;
-import gov.nasa.ziggy.ui.proxy.PipelineOperationsProxy;
-
-/**
- * Performs and manages the automatic refresh of the Ops Instances panel of the console. The class
- * uses a ScheduledThreadPoolExecutor with 1 thread to perform the main action of waiting for
- * specified intervals and then performing the refresh.
- *
- * @author PT
- */
-public class OpsInstancePanelAutoRefresh implements Runnable {
-
-    private static final Logger log = LoggerFactory.getLogger(OpsInstancePanelAutoRefresh.class);
-
-    private static final long REFRESH_INTERVAL_MILLIS = 2500L;
-    private static final String AMBER_MESSAGE = "One or more tasks failed but execution continues";
-    private static final String RED_MESSAGE = "One or more tasks failed, execution halted";
-
-    private ScheduledThreadPoolExecutor pool = new ScheduledThreadPoolExecutor(1);
-    private final InstancesTableModel instancesTableModel;
-    private final TasksTableModel tasksTableModel;
-    private final TaskStatusSummaryPanel taskStatusSummaryPanel;
-
-    // Used to ensure that when an instance completes, a message is sent to the
-    // worker looking for queued instances; once that message is sent, it's not sent
-    // again until after the next instance completes.
-    private boolean instancesCheckMessageSent = false;
-
-    public OpsInstancePanelAutoRefresh(InstancesTableModel instancesTableModel,
-        TasksTableModel tasksTableModel, TaskStatusSummaryPanel taskStatusSummaryPanel) {
-        this.instancesTableModel = instancesTableModel;
-        this.tasksTableModel = tasksTableModel;
-        this.taskStatusSummaryPanel = taskStatusSummaryPanel;
-    }
-
-    /**
-     * Performs the Ops instances panel update. This performs the following steps synchronously:
-     * <ol>
-     * <li>Refreshes the instances in the instances table model from the database using the
-     * CrudProxyExecutor's single thread for its database activity.</li>
-     * <li>Refreshes the instances table GUI in the event dispatcher thread using
-     * invokeAndWait().</li>
-     * <li>Sets the selected instance from the instance table into the tasks table in the event
-     * dispatcher thread using invokeAndWait.</li>
-     * <li>Refreshes the tasks in the task table model from the database using the
-     * CrudProxyExecutor's single thread for its database activity.</li>
-     * <li>Refreshes the tasks table GUI in the event dispatcher thread using invokeLater().</li>
-     * <li>Updates the selected row in the tasks table in the event dispatcher thread.</li>
-     * </ol>
-     */
-    @Override
-    public void run() {
-
-        Thread.currentThread().setName("OpsInstancePanelAutoRefresh");
-
-        // All the rest of the action happens in the SwingWorker
-        SwingWorker<Void, Void> swingWorker = new SwingWorker<>() {
-
-            @Override
-            protected Void doInBackground() throws Exception {
-                updateFromDatabase();
-                return null;
-            }
-
-            @Override
-            protected void done() {
-                refreshGui();
-            }
-
-        };
-        swingWorker.execute();
-
-    }
-
-    /**
-     * Starts the thread pool activities by calling scheduleWithFixedDelay() with appropriate
-     * arguments.
-     */
-    public void start() {
-
-        // Send a request to find out whether any pipelines are running or queued. Since we
-        // automatically find out about running pipelines when the first refresh fires, this
-        // is mainly aimed at finding out about queued instances. But the receiver can't actually
-        // tell the difference between queued and running...
-
-        new PipelineOperationsProxy().sendRunningPipelinesCheckRequestMessage();
-        pool.scheduleWithFixedDelay(this, 0L, REFRESH_INTERVAL_MILLIS, TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Perform update of the instance and tasks table models from the database. This method is
-     * called by the {@link doInBackground} method of the object's {@link AutoRefreshSwingWorker}
-     * instance, thus executed in a Swing worker thread.
-     */
-    private void updateFromDatabase() {
-        instancesTableModel.refreshInstancesFromDatabase();
-        tasksTableModel.refreshTasksFromDatabase();
-    }
-
-    /**
-     * Update the GUI, specifically the instances table, the tasks table, and the sub-tasks
-     * scoreboard. Called by the {@link done} method of the object's {@link AutoRefreshSwingWorker}
-     * instance, thus executed in the event dispatcher thread.
-     */
-    private void refreshGui() {
-        log.debug("Starting GUI auto-refresh");
-        instancesTableModel.refreshGui();
-        setInstancesStatusLight(instancesTableModel.getStateOfInstanceWithMaxid());
-        tasksTableModel.refreshGui();
-        taskStatusSummaryPanel.update(tasksTableModel);
-        log.debug("Done with GUI auto-refresh");
-    }
-
-    /**
-     * Shuts down and destroys the thread pool.
-     */
-    public void stop() {
-        pool.shutdownNow();
-        pool = null;
-    }
-
-    /**
-     * Sets the "idiot light" for pipelines based on a PipelineInstance state. A gray indicator
-     * indicates that the selected instance was completed; green indicates initialized, processing,
-     * or queued; yellow indicates errors running status; red indicates stopped or errors stalled
-     * state. When an initialized or processing state is detected, the instancesRemaining member of
-     * the OpsInstancesPanel is set.
-     *
-     * @param instanceState PipelineInstance state to be encoded as the light color.
-     */
-    private void setInstancesStatusLight(PipelineInstance.State instanceState) {
-
-        boolean instancesRemaining = OpsInstancesPanel.getInstancesRemaining();
-        Indicator instancesIndicator = MasterStatusPanel.instancesIndicator();
-        switch (instanceState) {
-            case COMPLETED:
-                if (instancesRemaining) {
-                    instancesIndicator.setState(Indicator.State.GREEN);
-                    if (!instancesCheckMessageSent) {
-                        new PipelineOperationsProxy().sendRunningPipelinesCheckRequestMessage();
-                        instancesCheckMessageSent = true;
-                    }
-                } else {
-                    instancesIndicator.setState(Indicator.State.GRAY);
-                }
-                break;
-            case INITIALIZED:
-            case PROCESSING:
-                instancesIndicator.setState(Indicator.State.GREEN);
-                OpsInstancesPanel.setInstancesRemaining();
-                instancesCheckMessageSent = false;
-                break;
-            case ERRORS_RUNNING:
-                instancesIndicator.setState(Indicator.State.AMBER, AMBER_MESSAGE);
-                break;
-            case ERRORS_STALLED:
-            case STOPPED:
-                instancesIndicator.setState(Indicator.State.RED, RED_MESSAGE);
-                break;
-            default:
-                throw new IllegalStateException(
-                    "Unsupported pipeline instance state " + instanceState.toString());
-        }
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/OpsInstancesPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/OpsInstancesPanel.java
deleted file mode 100644
index 3819a45..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/OpsInstancesPanel.java
+++ /dev/null
@@ -1,997 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-import java.awt.Desktop;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.BorderFactory;
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.WindowConstants;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.metrics.report.PerformanceReport;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.module.remote.QueueCommandManager;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
-import gov.nasa.ziggy.pipeline.definition.ProcessingState;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceFilter;
-import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.messages.DeleteTasksRequest;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.proxy.PipelineExecutorProxy;
-import gov.nasa.ziggy.ui.proxy.PipelineTaskCrudProxy;
-import gov.nasa.ziggy.ui.proxy.ProcessingSummaryOpsProxy;
-
-/**
- * @author Todd Klaus
- * @author PT
- */
-@SuppressWarnings("serial")
-public class OpsInstancesPanel extends javax.swing.JPanel {
-    private static final Logger log = LoggerFactory.getLogger(OpsInstancesPanel.class);
-
-    private JMenuItem restartMenuItem;
-    private JMenuItem detailsMenuItem;
-    private JMenuItem statisticsMenuItem;
-    private JMenuItem costEstimateMenuItem;
-    private JMenuItem performanceMenuItem;
-    private JPopupMenu tasksPopupMenu;
-    private JPopupMenu instancesPopupMenu;
-    private JMenuItem alertsMenuItem;
-    private TaskStatusSummaryPanel taskStatusSummaryPanel;
-    private JPanel tasksTablePanel;
-    private JMenuItem restartAllFailedTasksMenuItem;
-    private JMenuItem deleteAllPbsJobsMenuItem;
-    private JMenuItem deleteFromPbsMenuItem;
-
-    private InstancesControlPanel instancesControlPanel;
-    private JScrollPane instancesTableScrollPane;
-    private JScrollPane tasksTableScrollPane;
-    private JPanel tasksPanel;
-    private JPanel instancesPanel;
-    private ZTable tasksTable;
-    private ZTable instancesTable;
-    private TasksControlPanel tasksControlPanel;
-
-    private TasksTableModel tasksTableModel;
-    private InstancesTableModel instancesTableModel;
-    private final PipelineInstanceFilter filter;
-
-    private OpsInstancePanelAutoRefresh autoRefresh;
-
-    private int selectedInstanceModelRow = -1;
-
-    private JMenuItem instanceDetailsMenuItem;
-
-    private JMenuItem retrieveLogInfoMenuItem;
-
-    // Indices in the tasks table of the selected tasks. Not to be confused with the
-    // task IDs of the selected tasks (see below).
-    protected List<Integer> selectedTasksIndices = new ArrayList<>();
-
-    private static boolean instancesRemaining = true;
-
-    // States of the instances and tasks tables, specifically the instance ID of the selected
-    // instance (if any), and the task IDs of the selected tasks (if any).
-    private long instanceId = -1;
-    private List<Long> taskIds = new ArrayList<>();
-
-    // =======================================================================================
-    // Instances panel and items on that side of the GUI
-
-    private JPanel getInstancesPanel() {
-        log.debug("getInstancesPanel() - start");
-
-        if (instancesPanel == null) {
-            instancesPanel = new JPanel();
-            BorderLayout instancesPanelLayout = new BorderLayout();
-            instancesPanel.setLayout(instancesPanelLayout);
-            instancesPanel.setBorder(BorderFactory.createTitledBorder("Pipeline Instances"));
-            instancesPanel.add(getInstancesControlPanel(), BorderLayout.NORTH);
-            instancesPanel.add(getInstancesTableScrollPane(), BorderLayout.CENTER);
-        }
-
-        log.debug("getInstancesPanel() - end");
-        return instancesPanel;
-    }
-
-    public void refreshInstanceNowPressed() {
-
-        log.debug("refreshInstanceNowPressed() - start");
-
-        try {
-            // For reasons I have yet to fathom, refreshing the instances always clears any
-            // selection of rows from the tasks. To avoid that fate, capture the current selection.
-            int taskRow = tasksTable.getSelectionModel().getMinSelectionIndex();
-
-            instancesTableModel.loadFromDatabase();
-
-            // Restore the current selection.
-            tasksTable.getSelectionModel().setSelectionInterval(taskRow, taskRow);
-        } catch (PipelineException e) {
-            ZiggyGuiConsole.showError(e);
-        }
-
-        log.debug("refreshInstanceNowPressed() - end");
-    }
-
-    private InstancesControlPanel getInstancesControlPanel() {
-
-        log.debug("getInstancesControlPanel() - start");
-
-        if (instancesControlPanel == null) {
-            instancesControlPanel = new InstancesControlPanel(filter);
-            instancesControlPanel.setListener(this);
-        }
-
-        log.debug("getInstancesControlPanel() - end");
-        return instancesControlPanel;
-    }
-
-    private ZTable getInstancesTable() {
-        log.debug("getInstancesTable() - start");
-
-        if (instancesTable == null) {
-            instancesTableModel = new InstancesTableModel(filter);
-            instancesTableModel.register();
-
-            instancesTable = new ZTable();
-            instancesTable.setRowShadingEnabled(true);
-            instancesTable.getSelectionModel()
-                .setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-            instancesTable.setModel(instancesTableModel);
-            instancesTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-            setComponentPopupMenu(instancesTable, getInstancesPopupMenu());
-
-            ListSelectionModel rowSM = instancesTable.getSelectionModel();
-            rowSM.addListSelectionListener(event -> {
-
-                try {
-                    // Ignore extra messages.
-                    if (event.getValueIsAdjusting()) {
-                        return;
-                    }
-
-                    ListSelectionModel lsm = instancesTable.getSelectionModel();
-                    if (lsm.isSelectionEmpty()) {
-
-                        // If the selected instance from before the update is still in the
-                        // table, then select it again
-                        int instanceModelIndex = instancesTableModel
-                            .getModelIndexOfInstance(instanceId);
-
-                        // If there isn't a selected pipeline instance, or if the selected
-                        // instance is no longer in the table, then the tasks table also has to
-                        // be updated
-                        if (instanceModelIndex == -1) {
-                            log.debug("Setting tasks table model pipeline instance to null");
-                            tasksTableModel.setPipelineInstance(null);
-                            tasksTableModel.loadFromDatabase(false);
-                            instanceId = -1;
-                            taskIds.clear();
-                        } else {
-                            log.debug("Setting instance ID to " + instanceId);
-                            int rowIndex = instancesTable.convertRowIndexToView(instanceModelIndex);
-                            instancesTable.getSelectionModel()
-                                .setSelectionInterval(rowIndex, rowIndex);
-                        }
-                    } else {
-
-                        // This is the code block that executes if the user selects a new instance
-                        // in the table
-                        int selectedRow = lsm.getMinSelectionIndex();
-                        int modelIndex = instancesTable.convertRowIndexToModel(selectedRow);
-                        log.debug("selected row in instances table: " + selectedRow);
-                        PipelineInstance selectedInstance = instancesTableModel
-                            .getInstanceAt(modelIndex);
-                        instanceId = selectedInstance.getId();
-                        boolean genuinelyNewInstance = tasksTableModel
-                            .updatePipelineInstance(selectedInstance);
-                        tasksTableModel.loadFromDatabase(false);
-
-                        // If the change that caused this listener to act is that a genuinely
-                        // new instance was selected, clear the tasks table selections as they
-                        // are no longer valid.
-                        if (genuinelyNewInstance) {
-                            log.debug(
-                                "Genuninely new instance so clearing tasks table selection model");
-                            tasksTable.getSelectionModel().clearSelection();
-                            taskIds.clear();
-                        }
-                    }
-                    taskStatusSummaryPanel.update(tasksTableModel);
-
-                } catch (Exception e) {
-                    ZiggyGuiConsole.showError(e);
-                }
-
-            });
-        }
-
-        log.debug("getInstancesTable() - end");
-        return instancesTable;
-    }
-
-    private JScrollPane getInstancesTableScrollPane() {
-        log.debug("getInstancesTableScrollPane() - start");
-
-        if (instancesTableScrollPane == null) {
-            instancesTableScrollPane = new JScrollPane();
-            instancesTableScrollPane.setViewportView(getInstancesTable());
-        }
-
-        log.debug("getInstancesTableScrollPane() - end");
-        return instancesTableScrollPane;
-    }
-
-    // =======================================================================================
-    // Tasks panel and items on that side of the GUI
-
-    private JPanel getTasksPanel() {
-        log.debug("getInstanceNodesPanel() - start");
-
-        if (tasksPanel == null) {
-            tasksPanel = new JPanel();
-            BorderLayout instanceNodesPanelLayout = new BorderLayout();
-            tasksPanel.setLayout(instanceNodesPanelLayout);
-            tasksPanel.setBorder(BorderFactory.createTitledBorder("Pipeline Tasks"));
-            tasksPanel.add(getTasksControlPanel(), BorderLayout.NORTH);
-            tasksPanel.add(getTasksTablePanel(), BorderLayout.CENTER);
-        }
-
-        log.debug("getInstanceNodesPanel() - end");
-        return tasksPanel;
-    }
-
-    private TasksControlPanel getTasksControlPanel() {
-        log.debug("getInstanceNodesControlPanel() - start");
-
-        if (tasksControlPanel == null) {
-            tasksControlPanel = new TasksControlPanel();
-            tasksControlPanel.setListener(this);
-        }
-
-        log.debug("getInstanceNodesControlPanel() - end");
-        return tasksControlPanel;
-    }
-
-    void refreshTaskNowPressed() {
-        try {
-            ListSelectionModel lsm = instancesTable.getSelectionModel();
-            if (!lsm.isSelectionEmpty()) {
-                int selectedRow = lsm.getMinSelectionIndex();
-                int selectedModelRow = instancesTable.convertRowIndexToModel(selectedRow);
-                tasksTableModel
-                    .setPipelineInstance(instancesTableModel.getInstanceAt(selectedModelRow));
-                tasksTableModel.loadFromDatabase();
-                taskStatusSummaryPanel.update(tasksTableModel);
-            }
-            log.debug("End of try block task refresh");
-        } catch (PipelineException e) {
-            ZiggyGuiConsole.showError(e);
-        }
-    }
-
-    private PipelineTask getSelectedTask() {
-        if (selectedTasksIndices.size() != 1) {
-            log.debug("Only one task may be selected!");
-            return null;
-        }
-
-        int selectedIndex = selectedTasksIndices.get(0);
-        int selectedModelRow = tasksTable.convertRowIndexToModel(selectedIndex);
-        return tasksTableModel.getPipelineTaskForRow(selectedModelRow);
-    }
-
-    private ZTable getTasksTable() {
-        log.debug("getInstanceNodesTable() - start");
-
-        if (tasksTable == null) {
-            tasksTableModel = new TasksTableModel();
-            tasksTableModel.register();
-
-            tasksTable = new ZTable();
-            tasksTable.setRowShadingEnabled(true);
-            ListSelectionModel selectionModel = tasksTable.getSelectionModel();
-            selectionModel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-            selectionModel.addListSelectionListener(e -> {
-                ListSelectionModel lsm = (ListSelectionModel) e.getSource();
-
-                if (!lsm.getValueIsAdjusting()) {
-                    selectedTasksIndices = new ArrayList<>();
-
-                    // If the tasks table has no selected rows, but the taskIds list is not
-                    // empty, it means that the tasks table got reset and now we need to
-                    // re-select the rows that had been selected prior to the reset. Note
-                    // that if the task IDs that had been selected before aren't even
-                    // in the current contents of the table, then the task IDs that had been
-                    // selected before are no longer valid and need to be cleared.
-                    if (lsm.isSelectionEmpty()) {
-                        if (!taskIds.isEmpty()) {
-                            List<Integer> taskModelIds = tasksTableModel
-                                .getModelIndicesOfTasks(taskIds);
-                            log.debug("Task model IDs: " + taskModelIds.toString());
-                            if (taskModelIds.isEmpty()) {
-                                taskIds.clear();
-                            }
-                            for (int taskModelId : taskModelIds) {
-                                int rowId = tasksTable.convertRowIndexToView(taskModelId);
-                                log.debug(
-                                    "Row ID for task model ID " + taskModelId + " == " + rowId);
-                                lsm.addSelectionInterval(rowId, rowId);
-                            }
-                        }
-                    } else {
-
-                        // Alternately, if the tasks table has selected rows, then
-                        // we need to capture the corresponding task IDs (and the indices
-                        // of those IDs in the table model) so that the next time the table's
-                        // selections are cleared we can re-select the appropriate tasks.
-                        int selectedTasksMinIndex = lsm.getMinSelectionIndex();
-                        int selectedTasksMaxIndex = lsm.getMaxSelectionIndex();
-                        log.debug("Selected tasks min, max index: " + selectedTasksMinIndex + ", "
-                            + selectedTasksMaxIndex);
-                        int count = 0;
-                        taskIds.clear();
-                        for (int i = selectedTasksMinIndex; i <= selectedTasksMaxIndex; i++) {
-                            if (lsm.isSelectedIndex(i)) {
-                                log.debug("selected index: " + i);
-                                selectedTasksIndices.add(i);
-                                int rowModel = tasksTable.convertRowIndexToModel(i);
-                                long taskId = tasksTableModel.getPipelineTaskForRow(rowModel)
-                                    .getId();
-                                log.debug("Row model for index == " + rowModel
-                                    + ", corresponds to task ID " + taskId);
-                                taskIds.add(taskId);
-                                count++;
-                            }
-                        }
-                        log.debug("Num selected: " + count);
-                    }
-                }
-            });
-
-            tasksTable.setModel(tasksTableModel);
-
-            // setComponentPopupMenu(tasksTable, getTasksPopupMenu());
-            getTasksPopupMenu();
-            tasksTable.addMouseListener(new java.awt.event.MouseAdapter() {
-                @Override
-                public void mousePressed(java.awt.event.MouseEvent e) {
-                    int numTasksSelected = selectedTasksIndices.size();
-                    if (numTasksSelected == 1) {
-                        detailsMenuItem.setEnabled(true);
-                        restartMenuItem.setEnabled(true);
-                        retrieveLogInfoMenuItem.setEnabled(true);
-
-                    } else {
-                        detailsMenuItem.setEnabled(false);
-                        restartMenuItem.setEnabled(true);
-                        retrieveLogInfoMenuItem.setEnabled(false);
-                    }
-
-                    if (numTasksSelected > 0 && e.isPopupTrigger()) {
-                        tasksPopupMenu.show(tasksTable, e.getX(), e.getY());
-                    }
-                }
-
-                @Override
-                public void mouseReleased(java.awt.event.MouseEvent e) {
-                }
-            });
-        }
-
-        log.debug("getInstanceNodesTable() - end");
-        return tasksTable;
-    }
-
-    private JScrollPane getTasksTableScrollPane() {
-        log.debug("getInstanceNodesTableScrollPane() - start");
-
-        if (tasksTableScrollPane == null) {
-            tasksTableScrollPane = new JScrollPane();
-            tasksTableScrollPane.setViewportView(getTasksTable());
-        }
-
-        log.debug("getInstanceNodesTableScrollPane() - end");
-        return tasksTableScrollPane;
-    }
-
-    private TaskStatusSummaryPanel getTaskStatusSummaryPanel() {
-        if (taskStatusSummaryPanel == null) {
-            taskStatusSummaryPanel = new TaskStatusSummaryPanel();
-        }
-        return taskStatusSummaryPanel;
-    }
-
-    private JPanel getTasksTablePanel() {
-        if (tasksTablePanel == null) {
-            tasksTablePanel = new JPanel();
-            BorderLayout jPanel1Layout = new BorderLayout();
-            tasksTablePanel.setLayout(jPanel1Layout);
-            tasksTablePanel.add(getTasksTableScrollPane(), BorderLayout.CENTER);
-            tasksTablePanel.add(getTaskStatusSummaryPanel(), BorderLayout.NORTH);
-        }
-        return tasksTablePanel;
-    }
-
-    // =======================================================================================
-    // Instances Popup menu
-
-    private JPopupMenu getInstancesPopupMenu() {
-        if (instancesPopupMenu == null) {
-            instancesPopupMenu = new JPopupMenu();
-            instancesPopupMenu.add(getInstanceDetailsMenuItem());
-            instancesPopupMenu.add(getPerformanceMenuItem());
-            instancesPopupMenu.add(getAlertsMenuItem());
-            instancesPopupMenu.add(getStatisticsMenuItem());
-            instancesPopupMenu.add(getCostEstimateMenuItem());
-            instancesPopupMenu.addSeparator();
-            instancesPopupMenu.add(getRestartAllFailedTasksMenuItem());
-            instancesPopupMenu.addSeparator();
-            instancesPopupMenu.add(getDeleteAllTasksMenuItem());
-
-        }
-        return instancesPopupMenu;
-    }
-
-    private JMenuItem getPerformanceMenuItem() {
-        if (performanceMenuItem == null) {
-            performanceMenuItem = new JMenuItem();
-            performanceMenuItem.setText("Performance report");
-            performanceMenuItem.addActionListener(evt -> {
-                PipelineInstance selectedInstance = instancesTableModel
-                    .getInstanceAt(selectedInstanceModelRow);
-                PerformanceReport report = new PerformanceReport(selectedInstance.getId(),
-                    DirectoryProperties.taskDataDir().toFile(), null);
-                ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-                    Path r = null;
-                    try {
-                        r = report.generateReport();
-                        Desktop.getDesktop().open(r.toFile());
-                    } catch (Exception e) {
-                        MessageUtil.showError(this, e);
-                    }
-                    return null;
-                });
-            });
-        }
-        return performanceMenuItem;
-    }
-
-    private JMenuItem getCostEstimateMenuItem() {
-        if (costEstimateMenuItem == null) {
-            costEstimateMenuItem = new JMenuItem();
-            costEstimateMenuItem.setText("Cost estimate");
-            costEstimateMenuItem.addActionListener(evt -> {
-                PipelineInstance selectedInstance = instancesTableModel
-                    .getInstanceAt(selectedInstanceModelRow);
-                ZiggyGuiConsole.newInstanceCostEstimateDialog(selectedInstance);
-            });
-        }
-        return costEstimateMenuItem;
-    }
-
-    private JMenuItem getInstanceDetailsMenuItem() {
-        if (instanceDetailsMenuItem == null) {
-            instanceDetailsMenuItem = new JMenuItem();
-            instanceDetailsMenuItem.setText("Details...");
-            instanceDetailsMenuItem
-                .addActionListener(evt -> instanceDetailsMenuItemActionPerformed());
-        }
-        return instanceDetailsMenuItem;
-    }
-
-    private void instanceDetailsMenuItemActionPerformed() {
-        PipelineInstance selectedInstance = instancesTableModel
-            .getInstanceAt(selectedInstanceModelRow);
-
-        log.debug("selected instance id = " + selectedInstance.getId());
-
-        if (selectedInstance != null) {
-            InstanceDetailsDialog instanceDetailsDialog = ZiggyGuiConsole
-                .newInstanceDetailsDialog(selectedInstance);
-            instanceDetailsDialog.setVisible(true);
-        }
-    }
-
-    private JMenuItem getAlertsMenuItem() {
-        if (alertsMenuItem == null) {
-            alertsMenuItem = new JMenuItem();
-            alertsMenuItem.setText("Alerts...");
-            alertsMenuItem.addActionListener(this::alertsMenuItemActionPerformed);
-        }
-        return alertsMenuItem;
-    }
-
-    private void alertsMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("alertsMenuItem.actionPerformed, event=" + evt);
-
-        try {
-            PipelineInstance selectedInstance = instancesTableModel
-                .getInstanceAt(selectedInstanceModelRow);
-            long id = selectedInstance.getId();
-
-            log.debug("selected instance id = " + id);
-
-            ZiggyGuiConsole.showAlertLogDialog(id);
-        } catch (Exception e) {
-            ZiggyGuiConsole.showMessageDialog("caught e = " + e, "Failed to Restart Tasks",
-                JOptionPane.ERROR_MESSAGE);
-        }
-    }
-
-    private JMenuItem getStatisticsMenuItem() {
-        if (statisticsMenuItem == null) {
-            statisticsMenuItem = new JMenuItem();
-            statisticsMenuItem.setText("Performance Statistics...");
-            statisticsMenuItem.addActionListener(this::statisticsMenuItemActionPerformed);
-        }
-        return statisticsMenuItem;
-    }
-
-    private void statisticsMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("statisticsMenuItem.actionPerformed, event=" + evt);
-
-        try {
-            PipelineInstance selectedInstance = instancesTableModel
-                .getInstanceAt(selectedInstanceModelRow);
-
-            log.debug("selected instance id = " + selectedInstance.getId());
-
-            ZiggyGuiConsole.showInstanceStatsDialog(selectedInstance);
-        } catch (Exception e) {
-            ZiggyGuiConsole.showMessageDialog("caught e = " + e,
-                "Failed to retrieve performance stats", JOptionPane.ERROR_MESSAGE);
-        }
-    }
-
-    private JMenuItem getRestartAllFailedTasksMenuItem() {
-        if (restartAllFailedTasksMenuItem == null) {
-            restartAllFailedTasksMenuItem = new JMenuItem();
-            restartAllFailedTasksMenuItem.setText("Restart all failed tasks...");
-            restartAllFailedTasksMenuItem
-                .addActionListener(this::restartAllFailedTasksMenuItemActionPerformed);
-        }
-        return restartAllFailedTasksMenuItem;
-    }
-
-    private void restartAllFailedTasksMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("restartAllFailedTasksMenuItem.actionPerformed, event=" + evt);
-
-        try {
-            PipelineInstance selectedInstance = instancesTableModel
-                .getInstanceAt(selectedInstanceModelRow);
-
-            log.debug("selected instance id = " + selectedInstance.getId());
-
-            PipelineTaskCrudProxy taskCrud = new PipelineTaskCrudProxy();
-            List<PipelineTask> failedTasks = taskCrud.retrieveAll(selectedInstance,
-                PipelineTask.State.ERROR);
-
-            ProcessingSummaryOpsProxy attrOps = new ProcessingSummaryOpsProxy();
-            Map<Long, ProcessingSummary> taskAttrs = attrOps
-                .retrieveByInstanceId(selectedInstance.getId());
-            List<Long> tasksWithFailedSubTasks = getTaskIdsWithFailedSubtasks(taskAttrs);
-            if (tasksWithFailedSubTasks != null && !tasksWithFailedSubTasks.isEmpty()) {
-                failedTasks.addAll(taskCrud.retrieveAll(tasksWithFailedSubTasks));
-            }
-
-            if (failedTasks.size() > 0) {
-                RunMode mode = ZiggyGuiConsole.restartTasks(failedTasks, taskAttrs);
-
-                if (mode != null) {
-                    PipelineExecutorProxy pipelineExecutor = new PipelineExecutorProxy();
-                    // TODO: let the use decide whether doTransitionOnly
-                    // should be true
-
-                    log.debug("Restarting " + failedTasks.size() + " failed tasks");
-
-                    pipelineExecutor.restartTasks(failedTasks, mode);
-                }
-            } else {
-                ZiggyGuiConsole.showMessageDialog(
-                    "No failed tasks found for the selected instance!", "Restart Tasks",
-                    JOptionPane.ERROR_MESSAGE);
-            }
-        } catch (Exception e) {
-            log.error("Failed to restart tasks, caught: " + e, e);
-            ZiggyGuiConsole.showMessageDialog("caught e = " + e, "Failed to Restart Tasks",
-                JOptionPane.ERROR_MESSAGE);
-        }
-    }
-
-    private JMenuItem getDeleteAllTasksMenuItem() {
-        if (deleteAllPbsJobsMenuItem == null) {
-            deleteAllPbsJobsMenuItem = new JMenuItem();
-            deleteAllPbsJobsMenuItem.setText("Delete all tasks");
-            deleteAllPbsJobsMenuItem.addActionListener(this::deleteAllTasksMenuItemActionPerformed);
-        }
-        return deleteAllPbsJobsMenuItem;
-    }
-
-    private void deleteAllTasksMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("deleteAllPbsJobsMenuItem.actionPerformed event = " + evt);
-
-        try {
-            PipelineInstance selectedInstance = instancesTableModel
-                .getInstanceAt(selectedInstanceModelRow);
-
-            log.debug("selected instance id = " + selectedInstance.getId());
-
-            PipelineTaskCrudProxy taskCrud = new PipelineTaskCrudProxy();
-
-            // collect all the processing pipeline tasks; the QdelCommandManager will
-            // do the work of identifying which ones are remote execution and which are not
-            List<PipelineTask> processingTasks = taskCrud.retrieveAll(selectedInstance,
-                PipelineTask.State.PROCESSING);
-            processingTasks
-                .addAll(taskCrud.retrieveAll(selectedInstance, PipelineTask.State.SUBMITTED));
-
-            if (processingTasks.size() > 0) {
-
-                // are you sure you want to do this?
-                int confirm = ZiggyGuiConsole.showConfirmDialog("Confirm delete tasks?",
-                    "Confirm Delete", JOptionPane.OK_CANCEL_OPTION);
-                if (confirm == JOptionPane.OK_OPTION) {
-
-                    // Delete any local-execution tasks.
-                    Boolean allTasksDeleted = (Boolean) UiCommunicator
-                        .send(new DeleteTasksRequest(processingTasks));
-
-                    // If any tasks remain, try to delete them from PBS.
-                    if (!allTasksDeleted) {
-                        QueueCommandManager queueCommandManager = QueueCommandManager.newInstance();
-                        queueCommandManager.deleteJobsForPipelineTasks(processingTasks);
-                    }
-
-                    // Now send a message to the worker to get it to delete the tasks that
-                    // execute locally.
-                } else {
-
-                    // well, never mind then.
-                    ZiggyGuiConsole.showMessageDialog("Delete tasks canceled", "Delete tasks",
-                        JOptionPane.OK_OPTION);
-                }
-            } else {
-                ZiggyGuiConsole.showMessageDialog(
-                    "No running tasks found for the selected instance!", "Delete tasks",
-                    JOptionPane.ERROR_MESSAGE);
-            }
-        } catch (Exception e) {
-
-            // If something above errored, we want to go out of our way to notify
-            // the operator
-            log.error("Failed to delete jobs, caught: " + e, e);
-            ZiggyGuiConsole.showMessageDialog("caught e = " + e, "Failed to delete jobs",
-                JOptionPane.ERROR_MESSAGE);
-
-        }
-    }
-
-    // =======================================================================================
-    // Tasks Popup menu
-
-    private JPopupMenu getTasksPopupMenu() {
-        if (tasksPopupMenu == null) {
-            tasksPopupMenu = new JPopupMenu();
-            tasksPopupMenu.add(getDetailsMenuItem());
-            tasksPopupMenu.add(getRestartMenuItem());
-            tasksPopupMenu.add(getRetrieveLogInfoMenuItem());
-            tasksPopupMenu.addSeparator();
-            tasksPopupMenu.add(getDeleteTasksMenuItem());
-        }
-        return tasksPopupMenu;
-    }
-
-    private JMenuItem getDetailsMenuItem() {
-        if (detailsMenuItem == null) {
-            detailsMenuItem = new JMenuItem();
-            detailsMenuItem.setText("Task Details...");
-            detailsMenuItem.addActionListener(evt -> detailsMenuItemActionPerformed());
-        }
-        return detailsMenuItem;
-    }
-
-    private void detailsMenuItemActionPerformed() {
-        PipelineTask selectedTask = getSelectedTask();
-
-        if (selectedTask != null) {
-            try {
-                ZiggyGuiConsole.showTaskInfoDialog(selectedTask);
-            } catch (PipelineException e) {
-                ZiggyGuiConsole.showError(e);
-            }
-        }
-    }
-
-    private JMenuItem getRestartMenuItem() {
-        if (restartMenuItem == null) {
-            restartMenuItem = new JMenuItem();
-            restartMenuItem.setText("Restart");
-            restartMenuItem.addActionListener(this::restartMenuItemActionPerformed);
-        }
-        return restartMenuItem;
-    }
-
-    private void restartMenuItemActionPerformed(ActionEvent evt) {
-        log.debug(
-            "restartMenuItemActionPerformed(ActionEvent) - restartMenuItem.actionPerformed, event="
-                + evt);
-
-        PipelineInstance selectedInstance = instancesTableModel
-            .getInstanceAt(selectedInstanceModelRow);
-
-        try {
-            if (selectedTasksIndices.isEmpty()) {
-                log.debug("No tasks selected");
-                return;
-            }
-
-            ProcessingSummaryOpsProxy attrOps = new ProcessingSummaryOpsProxy();
-            Map<Long, ProcessingSummary> taskAttrs = attrOps
-                .retrieveByInstanceId(selectedInstance.getId());
-            List<PipelineTask> failedTasks = new ArrayList<>();
-
-            for (int selectedIndex : selectedTasksIndices) {
-                int selectedModelRow = tasksTable.convertRowIndexToModel(selectedIndex);
-                PipelineTask task = tasksTableModel.getPipelineTaskForRow(selectedModelRow);
-                ProcessingSummary attributes = taskAttrs.get(task.getId());
-                if (task.getState() == PipelineTask.State.ERROR
-                    || attributes.getProcessingState() == ProcessingState.COMPLETE
-                        && attributes.getFailedSubtaskCount() > 0) {
-                    failedTasks.add(task);
-                }
-            }
-
-            if (failedTasks.isEmpty()) {
-                log.debug("Selected tasks contain no ERROR tasks");
-                ZiggyGuiConsole.showMessageDialog(
-                    "None of the selected tasks are in the ERROR state.", "Restart Tasks",
-                    JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-
-            RunMode restartMode = ZiggyGuiConsole.restartTasks(failedTasks, taskAttrs);
-
-            if (restartMode != null) {
-                PipelineExecutorProxy pipelineExecutor = new PipelineExecutorProxy();
-                // TODO: let the use decide whether doTransitionOnly
-                // should be true
-
-                log.debug("Restarting " + failedTasks.size() + " failed tasks");
-
-                pipelineExecutor.restartTasks(failedTasks, restartMode);
-            }
-        } catch (Exception e) {
-            ZiggyGuiConsole.showMessageDialog("caught e = " + e, "Failed to restart Tasks",
-                JOptionPane.ERROR_MESSAGE);
-        }
-    }
-
-    private JMenuItem getRetrieveLogInfoMenuItem() {
-        if (retrieveLogInfoMenuItem == null) {
-            retrieveLogInfoMenuItem = new JMenuItem();
-            retrieveLogInfoMenuItem.setText("List task logs");
-            retrieveLogInfoMenuItem
-                .addActionListener(evt -> retrieveLogInfoMenuItemActionPerformed());
-        }
-        return retrieveLogInfoMenuItem;
-    }
-
-    private void retrieveLogInfoMenuItemActionPerformed() {
-        PipelineTask selectedTask = getSelectedTask();
-
-        if (selectedTask != null) {
-            try {
-                ZiggyGuiConsole.newTaskLogInformationDialog(selectedTask);
-            } catch (PipelineException e) {
-                ZiggyGuiConsole.showError(e);
-            }
-        }
-
-    }
-
-    private JMenuItem getDeleteTasksMenuItem() {
-        if (deleteFromPbsMenuItem == null) {
-            deleteFromPbsMenuItem = new JMenuItem();
-            deleteFromPbsMenuItem.setText("Delete tasks");
-            deleteFromPbsMenuItem.addActionListener(this::deleteTasksMenuItemActionPerformed);
-        }
-        return deleteFromPbsMenuItem;
-    }
-
-    private void deleteTasksMenuItemActionPerformed(ActionEvent evt) {
-        log.debug(
-            "deleteFromPbsMenuItemActionPerformed(ActionEvent) - deleteFromPbsMenuItem.actionPerformed, event="
-                + evt);
-
-        try {
-            if (selectedTasksIndices.isEmpty()) {
-                log.debug("No tasks selected");
-                return;
-            }
-            List<PipelineTask> processingTasks = new ArrayList<>();
-
-            // make sure that the selected tasks are PROCESSING or SUBMITTED
-            for (int selectedIndex : selectedTasksIndices) {
-                int selectedModelRow = tasksTable.convertRowIndexToModel(selectedIndex);
-                PipelineTask task = tasksTableModel.getPipelineTaskForRow(selectedModelRow);
-                if (task.getState() == PipelineTask.State.PROCESSING
-                    || task.getState() == PipelineTask.State.SUBMITTED) {
-                    processingTasks.add(task);
-                }
-            }
-
-            if (processingTasks.isEmpty()) {
-                log.debug("Selected tasks contain no PROCESSING tasks");
-                ZiggyGuiConsole.showMessageDialog(
-                    "None of the selected tasks are in the PROCESSING state.", "Delete tasks",
-                    JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-
-            // are you sure you want to do this?
-            int confirm = ZiggyGuiConsole.showConfirmDialog("Confirm delete tasks?",
-                "Confirm Delete", JOptionPane.OK_CANCEL_OPTION);
-            if (confirm == JOptionPane.OK_OPTION) {
-
-                // Delete any tasks running locally.
-                Boolean returnBoolean = (Boolean) UiCommunicator
-                    .send(new DeleteTasksRequest(processingTasks));
-
-                // If some tasks were not found in local execution, try deleting from PBS.
-                if (!returnBoolean) {
-                    QueueCommandManager.newInstance().deleteJobsForPipelineTasks(processingTasks);
-                }
-
-            } else {
-
-                // well, never mind then.
-                ZiggyGuiConsole.showMessageDialog("Delete tasks canceled", "Delete tasks",
-                    JOptionPane.OK_OPTION);
-            }
-
-        } catch (Exception e) {
-
-            // If something above errored, we want to go out of our way to notify
-            // the operator
-            log.error("Failed to delete jobs, caught: " + e, e);
-            ZiggyGuiConsole.showMessageDialog("caught e = " + e, "Failed to delete jobs",
-                JOptionPane.ERROR_MESSAGE);
-        }
-
-    }
-
-    // =======================================================================================
-    // Utilities
-
-    private static List<Long> getTaskIdsWithFailedSubtasks(Map<Long, ProcessingSummary> taskAttrs) {
-        List<Long> taskIds = new ArrayList<>();
-        Set<Long> allTaskIds = taskAttrs.keySet();
-        for (Long taskId : allTaskIds) {
-            ProcessingSummary taskAttributes = taskAttrs.get(taskId);
-            if (taskAttributes.getProcessingState() == ProcessingState.COMPLETE
-                && taskAttributes.getFailedSubtaskCount() > 0) {
-                taskIds.add(taskId);
-            }
-
-        }
-        return taskIds;
-    }
-
-    /**
-     * Auto-generated method for setting the popup menu for a component
-     */
-    private void setComponentPopupMenu(final java.awt.Component parent,
-        final javax.swing.JPopupMenu menu) {
-        parent.addMouseListener(new java.awt.event.MouseAdapter() {
-            @Override
-            public void mousePressed(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                }
-                ZTable table = (ZTable) parent;
-                int selectedTableRow = table.rowAtPoint(e.getPoint());
-                // windows bug? works ok on Linux/gtk. Here's a workaround:
-                if (selectedTableRow == -1) {
-                    selectedTableRow = table.getSelectedRow();
-                }
-                selectedInstanceModelRow = table.convertRowIndexToModel(selectedTableRow);
-            }
-
-            @Override
-            public void mouseReleased(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                }
-            }
-        });
-    }
-
-    public static void setInstancesRemaining() {
-        instancesRemaining = true;
-    }
-
-    public static void clearInstancesRemaining() {
-        instancesRemaining = false;
-    }
-
-    public static boolean getInstancesRemaining() {
-        return instancesRemaining;
-    }
-
-    // =======================================================================================
-    // Top level
-
-    public OpsInstancesPanel() {
-        filter = new PipelineInstanceFilter();
-        initGUI();
-    }
-
-    private void initGUI() {
-        log.debug("initGUI() - start");
-
-        try {
-            GridBagLayout thisLayout = new GridBagLayout();
-            thisLayout.columnWeights = new double[] { 0.1, 0.1 };
-            thisLayout.columnWidths = new int[] { 7, 7 };
-            thisLayout.rowWeights = new double[] { 0.1 };
-            thisLayout.rowHeights = new int[] { 7 };
-            setLayout(thisLayout);
-            setPreferredSize(new java.awt.Dimension(1000, 700));
-            this.add(getInstancesPanel(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            this.add(getTasksPanel(), new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            autoRefresh = new OpsInstancePanelAutoRefresh(instancesTableModel, tasksTableModel,
-                taskStatusSummaryPanel);
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("initGUI() - end");
-    }
-
-    public void startAutoRefresh() {
-        autoRefresh.start();
-    }
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        log.debug("main(String[]) - start");
-
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new OpsInstancesPanel());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-
-        log.debug("main(String[]) - end");
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/PipelineStatsTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/PipelineStatsTableModel.java
deleted file mode 100644
index 3574b09..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/PipelineStatsTableModel.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.util.List;
-
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.util.dispmod.PipelineStatsDisplayModel;
-
-@SuppressWarnings("serial")
-public class PipelineStatsTableModel extends AbstractTableModel {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(TaskMetricsTableModel.class);
-
-    private PipelineStatsDisplayModel pipelineStatsDisplayModel = null;
-
-    public PipelineStatsTableModel(List<PipelineTask> tasks, List<String> orderedModuleNames) {
-        update(tasks, orderedModuleNames);
-    }
-
-    public void update(List<PipelineTask> tasks, List<String> orderedModuleNames) {
-        try {
-            pipelineStatsDisplayModel = new PipelineStatsDisplayModel(tasks, orderedModuleNames);
-        } catch (ConsoleSecurityException ignore) {
-        }
-
-        fireTableDataChanged();
-    }
-
-    @Override
-    public int getRowCount() {
-        return pipelineStatsDisplayModel.getRowCount();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return pipelineStatsDisplayModel.getColumnCount();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        return pipelineStatsDisplayModel.getValueAt(rowIndex, columnIndex);
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        return pipelineStatsDisplayModel.getColumnName(column);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RefreshPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/RefreshPanel.java
deleted file mode 100644
index 7c87c00..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RefreshPanel.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class RefreshPanel extends javax.swing.JPanel {
-    private JButton nowButton;
-    private JPanel nowButtonPanel;
-
-    private RefreshPanelListener listener = null;
-
-    public RefreshPanel() {
-        initGUI();
-    }
-
-    private void initGUI() {
-        try {
-            // START >> this
-
-            setBorder(BorderFactory.createTitledBorder("Refresh"));
-            GridBagLayout thisLayout = new GridBagLayout();
-            thisLayout.rowWeights = new double[] { 0.1 };
-            thisLayout.rowHeights = new int[] { 7 };
-            thisLayout.columnWeights = new double[] { 0.1 };
-            thisLayout.columnWidths = new int[] { 7 };
-            setLayout(thisLayout); // END << this
-            setPreferredSize(new java.awt.Dimension(126, 72));
-            this.add(getNowButtonPanel(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JButton getNowButton() {
-        if (nowButton == null) {
-            nowButton = new JButton();
-            nowButton.setText("Now");
-            nowButton.addActionListener(evt -> nowButtonActionPerformed());
-        }
-        return nowButton;
-    }
-
-    private JPanel getNowButtonPanel() {
-        if (nowButtonPanel == null) {
-            nowButtonPanel = new JPanel();
-            FlowLayout nowButtonPanelLayout = new FlowLayout();
-            nowButtonPanelLayout.setVgap(1);
-            nowButtonPanelLayout.setHgap(1);
-            nowButtonPanel.setLayout(nowButtonPanelLayout);
-            nowButtonPanel.add(getNowButton());
-        }
-        return nowButtonPanel;
-    }
-
-    /**
-     * @return Returns the listener.
-     */
-    public RefreshPanelListener getListener() {
-        return listener;
-    }
-
-    /**
-     * @param listener The listener to set.
-     */
-    public void setListener(RefreshPanelListener listener) {
-        this.listener = listener;
-    }
-
-    private void nowButtonActionPerformed() {
-        if (listener != null) {
-            listener.refreshNowPressed();
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RestartAttributes.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/RestartAttributes.java
deleted file mode 100644
index 2ba3c45..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RestartAttributes.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.util.List;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
-
-/**
- * @author Todd Klaus
- */
-class RestartAttributes {
-    private final String moduleName;
-    private final String processingState;
-    private int count;
-    private final List<RunMode> restartModes;
-    private RunMode selectedRestartMode;
-
-    public RestartAttributes(String moduleName, String processingState, int count,
-        List<RunMode> restartModes, RunMode selectedRestartMode) {
-        this.moduleName = moduleName;
-        this.processingState = processingState;
-        this.count = count;
-        this.restartModes = restartModes;
-        this.selectedRestartMode = selectedRestartMode;
-    }
-
-    public static String key(String moduleName, String pState) {
-        return moduleName + ":" + pState;
-    }
-
-    public void incrementCount() {
-        count++;
-    }
-
-    public String getModuleName() {
-        return moduleName;
-    }
-
-    public String getProcessingState() {
-        return processingState;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public List<RunMode> getRestartModes() {
-        return restartModes;
-    }
-
-    public RunMode getSelectedRestartMode() {
-        return selectedRestartMode;
-    }
-
-    public void setSelectedRestartMode(RunMode selectedRestartMode) {
-        this.selectedRestartMode = selectedRestartMode;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RestartDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/RestartDialog.java
deleted file mode 100644
index 1de9b5b..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RestartDialog.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.swing.DefaultCellEditor;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.table.TableCellEditor;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
-import gov.nasa.ziggy.pipeline.definition.ProcessingState;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class RestartDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(RestartDialog.class);
-
-    private JPanel dataPanel;
-    private JButton restartButton;
-    private JTable restartTable;
-    private JScrollPane scrollPane;
-    private JButton cancelButton;
-    private JPanel buttonPanel;
-    private RestartTableModel restartTableModel;
-    private final List<PipelineTask> failedTasks;
-    private final Map<Long, ProcessingSummary> taskAttrs;
-    private boolean cancelled = false;
-
-    public RestartDialog(JFrame frame, List<PipelineTask> failedTasks,
-        Map<Long, ProcessingSummary> taskAttrs) {
-        super(frame, true);
-
-        this.failedTasks = failedTasks;
-        this.taskAttrs = taskAttrs;
-
-        initGUI();
-    }
-
-    public static RunMode restartTasks(JFrame frame, List<PipelineTask> failedTasks,
-        Map<Long, ProcessingSummary> taskAttrs) {
-        RestartDialog dialog = new RestartDialog(frame, failedTasks, taskAttrs);
-        dialog.setVisible(true); // blocks until user presses a button
-        RestartAttributes restartAttrs = null;
-
-        if (dialog.cancelled) {
-            log.info("Restart cancelled by user");
-            return null;
-        }
-        Map<String, RestartAttributes> moduleMap = dialog.restartTableModel.getModuleMap();
-
-        for (PipelineTask failedTask : failedTasks) {
-            String moduleName = failedTask.getModuleName();
-
-            ProcessingSummary attrs = taskAttrs.get(failedTask.getId());
-            String pState = ProcessingState.INITIALIZING.toString();
-
-            if (attrs != null) {
-                pState = attrs.getProcessingState().shortName();
-            }
-
-            String key = RestartAttributes.key(moduleName, pState);
-
-            restartAttrs = moduleMap.get(key);
-
-            log.info("Set task " + failedTask.getId() + " restartMode to "
-                + restartAttrs.getSelectedRestartMode());
-        }
-        return restartAttrs.getSelectedRestartMode();
-    }
-
-    private void restartButtonActionPerformed(ActionEvent evt) {
-        log.debug("restartButton.actionPerformed, event=" + evt);
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-        cancelled = true;
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Restart Failed Tasks");
-                getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-                getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            }
-            this.setSize(740, 567);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getScrollPane(), BorderLayout.CENTER);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(100);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getRestartButton());
-            buttonPanel.add(getCancelButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getRestartButton() {
-        if (restartButton == null) {
-            restartButton = new JButton();
-            restartButton.setText("Restart");
-            restartButton.addActionListener(this::restartButtonActionPerformed);
-        }
-        return restartButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JScrollPane getScrollPane() {
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getRestartTable());
-        }
-        return scrollPane;
-    }
-
-    private JTable getRestartTable() {
-        if (restartTable == null) {
-            restartTableModel = new RestartTableModel(failedTasks, taskAttrs);
-
-            List<RestartAttributes> modules = restartTableModel.getModuleList();
-            final List<TableCellEditor> editors = new ArrayList<>();
-
-            for (RestartAttributes module : modules) {
-                JComboBox<RunMode> comboBox1 = new JComboBox<>(
-                    new Vector<>(module.getRestartModes()));
-                DefaultCellEditor dce1 = new DefaultCellEditor(comboBox1);
-                editors.add(dce1);
-            }
-
-            restartTable = new JTable(restartTableModel) {
-                // Determine editor to be used by row
-                @Override
-                public TableCellEditor getCellEditor(int row, int column) {
-                    int modelColumn = convertColumnIndexToModel(column);
-
-                    if (modelColumn == 3) {
-                        return editors.get(row);
-                    }
-                    return super.getCellEditor(row, column);
-                }
-            };
-        }
-        return restartTable;
-    }
-
-    /**
-     * @return the cancelled
-     */
-    public boolean isCancelled() {
-        return cancelled;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RestartTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/RestartTableModel.java
deleted file mode 100644
index b9bd02a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/RestartTableModel.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
-import gov.nasa.ziggy.pipeline.definition.ProcessingState;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class RestartTableModel extends AbstractTableModel {
-    private static final Logger log = LoggerFactory.getLogger(RestartTableModel.class);
-
-    private final List<RestartAttributes> moduleList;
-    private final Map<String, RestartAttributes> moduleMap;
-
-    public RestartTableModel(List<PipelineTask> failedTasks,
-        Map<Long, ProcessingSummary> taskAttrMap) {
-        moduleMap = new HashMap<>();
-
-        for (PipelineTask task : failedTasks) {
-            String moduleName = task.getModuleName();
-            String pState = ProcessingState.INITIALIZING.toString();
-
-            ProcessingSummary taskAttrs = taskAttrMap.get(task.getId());
-            if (taskAttrs != null) {
-                pState = taskAttrs.getProcessingState().shortName();
-            }
-
-            String key = RestartAttributes.key(moduleName, pState);
-
-            RestartAttributes module = moduleMap.get(key);
-
-            if (module == null) {
-                List<RunMode> supportedModes = task.getModuleImplementation()
-                    .supportedRestartModes();
-                RunMode selectedMode = supportedModes.get(0);
-
-                module = new RestartAttributes(moduleName, pState, 1, supportedModes, selectedMode);
-
-                moduleMap.put(key, module);
-            } else {
-                module.incrementCount();
-            }
-        }
-
-        moduleList = new LinkedList<>(moduleMap.values());
-
-        log.debug("moduleList.size() = " + moduleList.size());
-    }
-
-    @Override
-    public int getRowCount() {
-        return moduleList.size();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        log.debug("getValueAt(r=" + rowIndex + ", c=" + columnIndex + ")");
-
-        RestartAttributes restartGroup = moduleList.get(rowIndex);
-
-        switch (columnIndex) {
-            case 0:
-                return restartGroup.getModuleName();
-            case 1:
-                return restartGroup.getProcessingState();
-            case 2:
-                return restartGroup.getCount();
-            case 3:
-                return restartGroup.getSelectedRestartMode();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 4;
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Module";
-            case 1:
-                return "P-state";
-            case 2:
-                return "Count";
-            case 3:
-                return "Restart Mode";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-
-    @Override
-    public boolean isCellEditable(int rowIndex, int columnIndex) {
-        if (columnIndex == 3) {
-            return true;
-        }
-        return super.isCellEditable(rowIndex, columnIndex);
-    }
-
-    @Override
-    public void setValueAt(Object value, int rowIndex, int columnIndex) {
-        log.debug("setValueAt(r=" + rowIndex + ", c=" + columnIndex + ", value-=" + value + ")");
-
-        if (columnIndex != 3) {
-            throw new IllegalArgumentException("read-only columnIndex = " + columnIndex);
-        }
-        RestartAttributes module = moduleList.get(rowIndex);
-        module.setSelectedRestartMode((RunMode) value);
-    }
-
-    public List<RestartAttributes> getModuleList() {
-        return moduleList;
-    }
-
-    public Map<String, RestartAttributes> getModuleMap() {
-        return moduleMap;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/SingleTaskLogDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/SingleTaskLogDialog.java
deleted file mode 100644
index 07aecdc..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/SingleTaskLogDialog.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollBar;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.services.logging.TaskLogInformation;
-import gov.nasa.ziggy.services.messages.WorkerSingleTaskLogRequest;
-import gov.nasa.ziggy.ui.proxy.PipelineTaskCrudProxy;
-
-public class SingleTaskLogDialog extends javax.swing.JDialog {
-
-    private static final Logger log = LoggerFactory.getLogger(TaskLogInformationDialog.class);
-
-    private static final long serialVersionUID = -8926788606491576183L;
-
-    private JPanel textPanel;
-    private JButton refreshButton;
-    private JPanel upperButtonPanel;
-    private JLabel taskLogLabel;
-    private JPanel labelPanel;
-    private JTextArea textArea;
-    private JScrollPane textScrollPane;
-    private JButton closeButton;
-    private JPanel actionPanel;
-    private JButton topOfLogButton;
-    private JButton bottomOfLogButton;
-
-    private TaskLogInformation taskLogInformation;
-
-    public SingleTaskLogDialog(JDialog frame, TaskLogInformation taskLogInformation) {
-        super(frame, false);
-        this.taskLogInformation = taskLogInformation;
-        initGUI();
-        refreshContents();
-        setVisible(true);
-    }
-
-    private void refreshContents() {
-
-        long taskId = taskLogInformation.getTaskId();
-        PipelineTask task = new PipelineTaskCrudProxy().retrieve(taskId);
-
-        log.debug("selected task id = " + taskId);
-
-        taskLogLabel.setText(task.taskLabelText());
-
-        String taskLogs = WorkerSingleTaskLogRequest.requestSingleTaskLog(taskLogInformation);
-        textArea.setText(taskLogs);
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        log.debug("refreshButton.actionPerformed, event=" + evt);
-
-        refreshContents();
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setTitle("Task Log: " + taskLogInformation.getFilename());
-            getContentPane().setLayout(thisLayout);
-            getContentPane().add(getTextPanel(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            getContentPane().add(getLabelPanel(), BorderLayout.NORTH);
-            this.setSize(1192, 879);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getTextPanel() {
-        if (textPanel == null) {
-            textPanel = new JPanel();
-            BorderLayout textPanelLayout = new BorderLayout();
-            textPanel.setLayout(textPanelLayout);
-            textPanel.add(getTextScrollPane(), BorderLayout.CENTER);
-        }
-        return textPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(20);
-            actionPanelLayout.setAlignment(FlowLayout.RIGHT);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getRefreshButton());
-            actionPanel.add(getCloseButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("Close");
-            closeButton.addActionListener(evt -> closeButtonActionPerformed());
-        }
-        return closeButton;
-    }
-
-    private void closeButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    private JScrollPane getTextScrollPane() {
-        if (textScrollPane == null) {
-            textScrollPane = new JScrollPane();
-            textScrollPane.setViewportView(getTextArea());
-        }
-        return textScrollPane;
-    }
-
-    private JTextArea getTextArea() {
-        if (textArea == null) {
-            textArea = new JTextArea();
-            textArea.setEditable(false);
-        }
-        return textArea;
-    }
-
-    private JPanel getLabelPanel() {
-        if (labelPanel == null) {
-            labelPanel = new JPanel();
-            GridBagLayout labelPanelLayout = new GridBagLayout();
-            labelPanelLayout.rowWeights = new double[] { 0.1 };
-            labelPanelLayout.rowHeights = new int[] {};
-            labelPanelLayout.columnWeights = new double[] { 0.1 };
-            labelPanelLayout.columnWidths = new int[] { 7 };
-            labelPanel.setLayout(labelPanelLayout);
-            labelPanel.add(getTaskLogLabel(), new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 10, 0, 0), 0, 0));
-            labelPanel.add(getUpperButtonPanel(), new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return labelPanel;
-    }
-
-    private JLabel getTaskLogLabel() {
-        if (taskLogLabel == null) {
-            taskLogLabel = new JLabel();
-        }
-        return taskLogLabel;
-    }
-
-    private JPanel getUpperButtonPanel() {
-        if (upperButtonPanel == null) {
-            upperButtonPanel = new JPanel();
-            FlowLayout upperButtonPanelLayout = new FlowLayout();
-            upperButtonPanelLayout.setHgap(20);
-            upperButtonPanelLayout.setAlignment(FlowLayout.RIGHT);
-            upperButtonPanel.setLayout(upperButtonPanelLayout);
-            upperButtonPanel.add(getTopOfLogButton());
-            upperButtonPanel.add(getBottomOfLogButton());
-        }
-        return upperButtonPanel;
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("Refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-
-    private JButton getTopOfLogButton() {
-        if (topOfLogButton == null) {
-            topOfLogButton = new JButton();
-            topOfLogButton.setText("To Top");
-            topOfLogButton.addActionListener(this::topOfLogButtonActionPerformed);
-        }
-        return topOfLogButton;
-    }
-
-    private void topOfLogButtonActionPerformed(ActionEvent evt) {
-        JScrollBar vertical = textScrollPane.getVerticalScrollBar();
-        vertical.setValue(vertical.getMinimum());
-    }
-
-    private JButton getBottomOfLogButton() {
-        if (bottomOfLogButton == null) {
-            bottomOfLogButton = new JButton();
-            bottomOfLogButton.setText("To Bottom");
-            bottomOfLogButton.addActionListener(this::bottomOfLogButtonActionPerformed);
-        }
-        return bottomOfLogButton;
-    }
-
-    private void bottomOfLogButtonActionPerformed(ActionEvent evt) {
-        JScrollBar vertical = textScrollPane.getVerticalScrollBar();
-        vertical.setValue(vertical.getMaximum());
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskInfoDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskInfoDialog.java
deleted file mode 100644
index 7dfa2dc..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskInfoDialog.java
+++ /dev/null
@@ -1,475 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask.State;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.util.dispmod.DisplayModel;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class TaskInfoDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(TaskInfoDialog.class);
-
-    private JPanel detailsPanel;
-    private JLabel failureCountLabel;
-    private JTextField createdTextField;
-    private JTextField endTextField;
-    private JTextField startTextField;
-    private JTextField workerTextField;
-    private JTextField uowTextField;
-    private JTextField moduleTextField;
-    private JTextField stateTextField;
-    private ZTable processingBreakdownTable;
-    private JScrollPane processingBreakdownScrollPane;
-    private JPanel processingBreakdownPanel;
-    private JTextField revisionTextField;
-    private JTextField idTextField;
-    private JCheckBox transitionCheckBox;
-    private JTextField failCountTextField;
-    private JPanel miscPanel;
-    private JLabel stateLabel;
-    private JLabel revisionLabel;
-    private JLabel createdLabel;
-    private JLabel endLabel;
-    private JLabel startLabel;
-    private JLabel workerLabel;
-    private JLabel uowLabel;
-    private JLabel moduleLabel;
-    private JLabel idLabel;
-    private JPanel dataPanel;
-    private JButton closeButton;
-    private JPanel buttonPanel;
-
-    private TaskMetricsTableModel processingBreakdownTableModel;
-    private PipelineTask pipelineTask;
-
-    public TaskInfoDialog(JFrame frame, PipelineTask pipelineTask) {
-        super(frame);
-
-        this.pipelineTask = pipelineTask;
-
-        initGUI();
-    }
-
-    public static void showTaskInfoDialog(JFrame frame, PipelineTask pipelineTask) {
-        TaskInfoDialog dialog = new TaskInfoDialog(frame, pipelineTask);
-
-        dialog.setVisible(true);
-    }
-
-    private void closeButtonActionPerformed(ActionEvent evt) {
-        log.info("closeButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void transitionCheckBoxActionPerformed() {
-        transitionCheckBox.setSelected(pipelineTask.isTransitionComplete());
-    }
-
-    private void initGUI() {
-        try {
-            {
-                BorderLayout thisLayout = new BorderLayout();
-                thisLayout.setHgap(10);
-                thisLayout.setVgap(10);
-                getContentPane().setLayout(thisLayout);
-                setTitle("Pipeline Task Details");
-                getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-                getContentPane().add(getDataPanel(), BorderLayout.NORTH);
-            }
-            this.setSize(1280, 400);
-
-            String moduleName = pipelineTask.getPipelineInstanceNode()
-                .getPipelineModuleDefinition()
-                .getName()
-                .getName();
-
-            idTextField.setText(pipelineTask.getId() + "");
-            moduleTextField.setText(moduleName + "");
-            uowTextField.setText(pipelineTask.uowTaskInstance().briefState());
-            workerTextField.setText(pipelineTask.getWorkerName());
-            startTextField.setText(DisplayModel.formatDate(pipelineTask.getStartProcessingTime()));
-            endTextField.setText(DisplayModel.formatDate(pipelineTask.getEndProcessingTime()));
-            createdTextField.setText(DisplayModel.formatDate(pipelineTask.getCreated()));
-            revisionTextField.setText(pipelineTask.getSoftwareRevision());
-            failCountTextField.setText(pipelineTask.getFailureCount() + "");
-            transitionCheckBox.setSelected(pipelineTask.isTransitionComplete());
-
-            State state = pipelineTask.getState();
-            stateTextField.setText(state.toString());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getDetailsPanel() {
-        if (detailsPanel == null) {
-            detailsPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7, 7, 7 };
-            dataPanelLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
-            dataPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                0.1 };
-            detailsPanel.setLayout(dataPanelLayout);
-            detailsPanel.add(getIdLabel(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getStateLabel(),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getModuleLabel(),
-                new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getUowLabel(),
-                new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getWorkerLabel(),
-                new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getStartLabel(),
-                new GridBagConstraints(0, 5, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getEndLabel(),
-                new GridBagConstraints(0, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getCreatedLabel(),
-                new GridBagConstraints(0, 7, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getRevisionLabel(),
-                new GridBagConstraints(0, 8, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getMiscPanel(), new GridBagConstraints(0, 9, 8, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getIdTextField(),
-                new GridBagConstraints(1, 0, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getStateTextField(),
-                new GridBagConstraints(1, 1, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getModuleTextField(),
-                new GridBagConstraints(1, 2, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getUowTextField(),
-                new GridBagConstraints(1, 3, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getWorkerTextField(),
-                new GridBagConstraints(1, 4, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getStartTextField(),
-                new GridBagConstraints(1, 5, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getEndTextField(),
-                new GridBagConstraints(1, 6, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getCreatedTextField(),
-                new GridBagConstraints(1, 7, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            detailsPanel.add(getRevisionTextField(),
-                new GridBagConstraints(1, 8, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return detailsPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            buttonPanel.add(getCloseButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("close");
-            closeButton.addActionListener(this::closeButtonActionPerformed);
-        }
-        return closeButton;
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.columnWidths = new int[] { 7 };
-            dataPanelLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7 };
-            dataPanelLayout.columnWeights = new double[] { 0.1 };
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getDetailsPanel(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getMetricsPanel(), new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return dataPanel;
-    }
-
-    private JLabel getIdLabel() {
-        if (idLabel == null) {
-            idLabel = new JLabel();
-            idLabel.setText("ID: ");
-            idLabel.setHorizontalAlignment(SwingConstants.TRAILING);
-        }
-        return idLabel;
-    }
-
-    private JLabel getStateLabel() {
-        if (stateLabel == null) {
-            stateLabel = new JLabel();
-            stateLabel.setText("State: ");
-        }
-        return stateLabel;
-    }
-
-    private JLabel getModuleLabel() {
-        if (moduleLabel == null) {
-            moduleLabel = new JLabel();
-            moduleLabel.setText("Module Name: ");
-        }
-        return moduleLabel;
-    }
-
-    private JLabel getUowLabel() {
-        if (uowLabel == null) {
-            uowLabel = new JLabel();
-            uowLabel.setText("Unit of Work: ");
-        }
-        return uowLabel;
-    }
-
-    private JLabel getWorkerLabel() {
-        if (workerLabel == null) {
-            workerLabel = new JLabel();
-            workerLabel.setText("Worker (host:thread): ");
-        }
-        return workerLabel;
-    }
-
-    private JLabel getStartLabel() {
-        if (startLabel == null) {
-            startLabel = new JLabel();
-            startLabel.setText("Start Time: ");
-        }
-        return startLabel;
-    }
-
-    private JLabel getEndLabel() {
-        if (endLabel == null) {
-            endLabel = new JLabel();
-            endLabel.setText("End Time: ");
-        }
-        return endLabel;
-    }
-
-    private JLabel getCreatedLabel() {
-        if (createdLabel == null) {
-            createdLabel = new JLabel();
-            createdLabel.setText("Create Time: ");
-        }
-        return createdLabel;
-    }
-
-    private JLabel getRevisionLabel() {
-        if (revisionLabel == null) {
-            revisionLabel = new JLabel();
-            revisionLabel.setText("Software Revision: ");
-        }
-        return revisionLabel;
-    }
-
-    private JPanel getMiscPanel() {
-        if (miscPanel == null) {
-            miscPanel = new JPanel();
-            FlowLayout miscPanelLayout = new FlowLayout();
-            miscPanelLayout.setHgap(20);
-            miscPanel.setLayout(miscPanelLayout);
-            miscPanel.add(getFailureCountLabel());
-            miscPanel.add(getFailCountTextField());
-            miscPanel.add(getTransitionCheckBox());
-        }
-        return miscPanel;
-    }
-
-    private JLabel getFailureCountLabel() {
-        if (failureCountLabel == null) {
-            failureCountLabel = new JLabel();
-            failureCountLabel.setText("Failure Count");
-        }
-        return failureCountLabel;
-    }
-
-    private JTextField getFailCountTextField() {
-        if (failCountTextField == null) {
-            failCountTextField = new JTextField();
-            failCountTextField.setEditable(false);
-            failCountTextField.setColumns(2);
-        }
-        return failCountTextField;
-    }
-
-    private JCheckBox getTransitionCheckBox() {
-        if (transitionCheckBox == null) {
-            transitionCheckBox = new JCheckBox();
-            transitionCheckBox.setText("Transition Complete");
-            transitionCheckBox.setSelected(true);
-            transitionCheckBox.addActionListener(evt -> transitionCheckBoxActionPerformed());
-        }
-        return transitionCheckBox;
-    }
-
-    private JTextField getIdTextField() {
-        if (idTextField == null) {
-            idTextField = new JTextField();
-            idTextField.setColumns(10);
-            idTextField.setEditable(false);
-        }
-        return idTextField;
-    }
-
-    private JTextField getStateTextField() {
-        if (stateTextField == null) {
-            stateTextField = new JTextField();
-            stateTextField.setText("COMPLETED");
-            stateTextField.setColumns(50);
-            stateTextField.setEditable(false);
-        }
-        return stateTextField;
-    }
-
-    private JTextField getModuleTextField() {
-        if (moduleTextField == null) {
-            moduleTextField = new JTextField();
-            moduleTextField.setText("pa");
-            moduleTextField.setEditable(false);
-            moduleTextField.setColumns(50);
-        }
-        return moduleTextField;
-    }
-
-    private JTextField getUowTextField() {
-        if (uowTextField == null) {
-            uowTextField = new JTextField();
-            uowTextField.setColumns(50);
-            uowTextField.setEditable(false);
-        }
-        return uowTextField;
-    }
-
-    private JTextField getWorkerTextField() {
-        if (workerTextField == null) {
-            workerTextField = new JTextField();
-            workerTextField.setColumns(50);
-            workerTextField.setEditable(false);
-        }
-        return workerTextField;
-    }
-
-    private JTextField getStartTextField() {
-        if (startTextField == null) {
-            startTextField = new JTextField();
-            startTextField.setEditable(false);
-            startTextField.setColumns(50);
-        }
-        return startTextField;
-    }
-
-    private JTextField getEndTextField() {
-        if (endTextField == null) {
-            endTextField = new JTextField();
-            endTextField.setColumns(50);
-            endTextField.setEditable(false);
-        }
-        return endTextField;
-    }
-
-    private JTextField getCreatedTextField() {
-        if (createdTextField == null) {
-            createdTextField = new JTextField();
-            createdTextField.setEditable(false);
-            createdTextField.setColumns(50);
-        }
-        return createdTextField;
-    }
-
-    private JTextField getRevisionTextField() {
-        if (revisionTextField == null) {
-            revisionTextField = new JTextField();
-            revisionTextField.setColumns(50);
-            revisionTextField.setEditable(false);
-        }
-        return revisionTextField;
-    }
-
-    private JPanel getMetricsPanel() {
-        if (processingBreakdownPanel == null) {
-            processingBreakdownPanel = new JPanel();
-            BorderLayout metricsPanelLayout = new BorderLayout();
-            processingBreakdownPanel.setLayout(metricsPanelLayout);
-            processingBreakdownPanel.add(getMetricsScrollPane(), BorderLayout.CENTER);
-        }
-        return processingBreakdownPanel;
-    }
-
-    private JScrollPane getMetricsScrollPane() {
-        if (processingBreakdownScrollPane == null) {
-            processingBreakdownScrollPane = new JScrollPane();
-            processingBreakdownScrollPane.setViewportView(getMetricsTable());
-        }
-        return processingBreakdownScrollPane;
-    }
-
-    private ZTable getMetricsTable() {
-        if (processingBreakdownTable == null) {
-            List<PipelineTask> tasks = new ArrayList<>();
-            tasks.add(pipelineTask);
-
-            String moduleName = pipelineTask.getPipelineInstanceNode()
-                .getPipelineModuleDefinition()
-                .getName()
-                .getName();
-            List<String> moduleNames = new ArrayList<>();
-            moduleNames.add(moduleName);
-
-            processingBreakdownTableModel = new TaskMetricsTableModel(tasks, moduleNames, false);
-            processingBreakdownTable = new ZTable();
-            processingBreakdownTable.setTextWrappingEnabled(true);
-            processingBreakdownTable.setModel(processingBreakdownTableModel);
-        }
-        return processingBreakdownTable;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-
-    public TaskInfoDialog(JFrame frame) {
-        super(frame);
-        initGUI();
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskLogInformationDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskLogInformationDialog.java
deleted file mode 100644
index 4070280..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskLogInformationDialog.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.services.logging.TaskLogInformation;
-import gov.nasa.ziggy.services.messages.WorkerTaskLogInformationRequest;
-import gov.nasa.ziggy.ui.proxy.PipelineTaskCrudProxy;
-
-/**
- * Dialog box that presents the user with a table of all log files for a given task, with types,
- * sizes, etc. The user can then double-click on a row in the table to view the corresponding log
- * file in full.
- *
- * @author PT
- */
-public class TaskLogInformationDialog extends JDialog implements MouseListener {
-
-    private static final Logger log = LoggerFactory.getLogger(TaskLogInformationDialog.class);
-
-    private static final long serialVersionUID = 20220325L;
-
-    private final long taskId;
-    private JButton closeButton;
-    private JPanel actionPanel;
-    private JPanel labelPanel;
-    private JLabel taskLogLabel;
-    private JButton refreshButton;
-    private JTable taskLogTable;
-    private JScrollPane taskLogScrollPane;
-    private TaskLogInformationTableModel tableModel;
-
-    public TaskLogInformationDialog(JFrame parent, PipelineTask pipelineTask) {
-        super(parent, true);
-        taskId = pipelineTask.getId();
-        initGUI();
-        refreshContents();
-        setVisible(true);
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setTitle("Task Log");
-            getContentPane().setLayout(thisLayout);
-            getContentPane().add(getTaskLogScrollPane(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            getContentPane().add(getLabelPanel(), BorderLayout.NORTH);
-            this.setSize(750, 500);
-            setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    // At the top of the window is the label panel.
-    private JPanel getLabelPanel() {
-        if (labelPanel == null) {
-            labelPanel = new JPanel();
-            GridBagLayout labelPanelLayout = new GridBagLayout();
-            labelPanelLayout.rowWeights = new double[] { 0.1 };
-            labelPanelLayout.rowHeights = new int[] {};
-            labelPanelLayout.columnWeights = new double[] { 0.1 };
-            labelPanelLayout.columnWidths = new int[] { 7 };
-            labelPanel.setLayout(labelPanelLayout);
-            labelPanel.add(getTaskLogLabel(), new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 10, 0, 0), 0, 0));
-        }
-        return labelPanel;
-    }
-
-    // The label panel contains the task label information.
-    private JLabel getTaskLogLabel() {
-        if (taskLogLabel == null) {
-            taskLogLabel = new JLabel();
-        }
-        return taskLogLabel;
-    }
-
-    // In-between is the table itself
-    private JScrollPane getTaskLogScrollPane() {
-        if (taskLogScrollPane == null) {
-            tableModel = new TaskLogInformationTableModel();
-            taskLogTable = new JTable(tableModel);
-            taskLogTable.setCellSelectionEnabled(false);
-            taskLogTable.setRowSelectionAllowed(true);
-            taskLogTable.addMouseListener(this);
-            taskLogScrollPane = new JScrollPane(taskLogTable);
-        }
-        return taskLogScrollPane;
-    }
-
-    // At the bottom are some buttons: refresh and close.
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(20);
-            actionPanelLayout.setAlignment(FlowLayout.RIGHT);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getRefreshButton());
-            actionPanel.add(getCloseButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("Close");
-            closeButton.addActionListener(evt -> closeButtonActionPerformed());
-        }
-        return closeButton;
-    }
-
-    private void closeButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("Refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        log.debug("refreshButton.actionPerformed, event=" + evt);
-
-        refreshContents();
-    }
-
-    private void refreshContents() {
-
-        // Get the pipeline task up-to-date information from the database.
-        PipelineTask task = new PipelineTaskCrudProxy().retrieve(taskId);
-
-        log.debug("selected task id = " + taskId);
-
-        taskLogLabel.setText(task.taskLabelText());
-
-        // Retrieve the task log information and put into the table model.
-        tableModel
-            .setTaskLogInformation(WorkerTaskLogInformationRequest.requestTaskLogInformation(task));
-
-    }
-
-    // MouseListener methods
-
-    @Override
-    public void mouseClicked(MouseEvent e) {
-
-        // On double-click, select the desired row and retrieve the corresponding log.
-        int row = taskLogTable.rowAtPoint(e.getPoint());
-        if (e.getClickCount() == 2 && row != -1) {
-            TaskLogInformation logInfo = tableModel.taskLogInformation(row);
-            log.info("Obtaining log file: " + logInfo.getFilename());
-            new SingleTaskLogDialog(this, logInfo);
-        }
-    }
-
-    @Override
-    public void mousePressed(MouseEvent e) {
-        // do nothing special
-    }
-
-    @Override
-    public void mouseReleased(MouseEvent e) {
-        // do nothing special
-    }
-
-    @Override
-    public void mouseEntered(MouseEvent e) {
-        // do nothing special
-    }
-
-    @Override
-    public void mouseExited(MouseEvent e) {
-        // do nothing special
-    }
-
-    private static class TaskLogInformationTableModel extends AbstractTableModel {
-
-        private static final long serialVersionUID = 20220325L;
-
-        private static final String[] COLUMN_HEADINGS = { "Name", "Type", "Last Modified", "Size" };
-
-        private List<TaskLogInformation> taskLogInformationList;
-
-        public TaskLogInformationTableModel() {
-
-        }
-
-        public void setTaskLogInformation(Set<TaskLogInformation> taskLogInformation) {
-            taskLogInformationList = new ArrayList<>(taskLogInformation.size());
-            taskLogInformationList.addAll(taskLogInformation);
-        }
-
-        @Override
-        public int getRowCount() {
-            return taskLogInformationList.size();
-        }
-
-        @Override
-        public int getColumnCount() {
-            return COLUMN_HEADINGS.length;
-        }
-
-        @Override
-        public String getColumnName(int columnIndex) {
-            return COLUMN_HEADINGS[columnIndex];
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            TaskLogInformation information = taskLogInformationList.get(rowIndex);
-            switch (columnIndex) {
-                case 0:
-                    return information.getFilename();
-                case 1:
-                    return information.getLogType().toString();
-                case 2:
-                    return information.lastModifiedDateTime();
-                case 3:
-                    return information.logFileSizeEngineeringNotation();
-                default:
-                    throw new IllegalArgumentException("Illegal column number: " + columnIndex);
-            }
-        }
-
-        public TaskLogInformation taskLogInformation(int rowIndex) {
-            return taskLogInformationList.get(rowIndex);
-        }
-
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskStatusSummary.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskStatusSummary.java
deleted file mode 100644
index 3f7ec88..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskStatusSummary.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import javax.swing.JLabel;
-import javax.swing.SwingConstants;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class TaskStatusSummary extends JLabel {
-    public TaskStatusSummary() {
-        setHorizontalAlignment(SwingConstants.CENTER);
-        update(0, 0, 0, 0);
-    }
-
-    public void update(int submittedCount, int processingCount, int errorCount,
-        int completedCount) {
-        setText("<html><b><font color=green>SUBMITTED: </font></b>" + submittedCount + "      "
-            + "<b><font color=green>PROCESSING: </font></b>" + processingCount + "      "
-            + "<b><font color=red>FAILED: </font></b>" + errorCount + "      "
-            + "<b><font color=green>COMPLETED: </font></b>" + completedCount + "</html>");
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskStatusSummaryPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskStatusSummaryPanel.java
deleted file mode 100644
index 4d0f2a4..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskStatusSummaryPanel.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-
-import javax.swing.JScrollPane;
-
-import gov.nasa.ziggy.ui.common.ZTable;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class TaskStatusSummaryPanel extends javax.swing.JPanel {
-    private JScrollPane summaryTableScrollPane;
-    private ZTable taskSummaryTable;
-
-    private TaskSummaryTableModel taskSummaryTableModel;
-
-    public TaskStatusSummaryPanel() {
-        initGUI();
-    }
-
-    /**
-     * Updates the task status summary ("scoreboard") panel. This method must be called from the
-     * event dispatch thread only.
-     */
-    public void update(TasksTableModel tasksTableModel) {
-        taskSummaryTableModel.update(tasksTableModel);
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            setPreferredSize(new java.awt.Dimension(400, 112));
-            this.add(getSummaryTableScrollPane(), BorderLayout.CENTER);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JScrollPane getSummaryTableScrollPane() {
-        if (summaryTableScrollPane == null) {
-            summaryTableScrollPane = new JScrollPane();
-            summaryTableScrollPane.setViewportView(getTaskSummaryTable());
-        }
-        return summaryTableScrollPane;
-    }
-
-    private ZTable getTaskSummaryTable() {
-        if (taskSummaryTable == null) {
-            taskSummaryTableModel = new TaskSummaryTableModel();
-            taskSummaryTable = new ZTable();
-//            taskSummaryTable.setTextWrappingEnabled(true);
-            taskSummaryTable.setRowShadingEnabled(true);
-            taskSummaryTable.setModel(taskSummaryTableModel);
-        }
-        return taskSummaryTable;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskSummaryTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskSummaryTableModel.java
deleted file mode 100644
index d7ca1d0..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TaskSummaryTableModel.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.util.dispmod.TaskSummaryDisplayModel;
-
-@SuppressWarnings("serial")
-public class TaskSummaryTableModel extends AbstractTableModel {
-    private final TaskSummaryDisplayModel taskSummaryDisplayModel = new TaskSummaryDisplayModel();
-
-    public TaskSummaryTableModel() {
-    }
-
-    public void update(TasksTableModel tasksTableModel) {
-        taskSummaryDisplayModel.update(tasksTableModel.getTaskStates());
-
-        fireTableDataChanged();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        return taskSummaryDisplayModel.getValueAt(rowIndex, columnIndex);
-    }
-
-    @Override
-    public int getColumnCount() {
-        return taskSummaryDisplayModel.getColumnCount();
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        return taskSummaryDisplayModel.getColumnName(column);
-    }
-
-    @Override
-    public int getRowCount() {
-        return taskSummaryDisplayModel.getRowCount();
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TasksControlPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/TasksControlPanel.java
deleted file mode 100644
index 0777e4e..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TasksControlPanel.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class TasksControlPanel extends javax.swing.JPanel implements RefreshPanelListener {
-    private static final Logger log = LoggerFactory.getLogger(TasksControlPanel.class);
-
-    private OpsInstancesPanel listener = null;
-    private JButton refreshButton;
-
-    public TasksControlPanel() {
-        initGUI();
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        log.debug("refreshButton.actionPerformed, event=" + evt);
-
-        refreshNowPressed();
-    }
-
-    private void initGUI() {
-        try {
-            FlowLayout thisLayout = new FlowLayout();
-            setLayout(thisLayout);
-            this.add(getRefreshButton());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * @return Returns the listener.
-     */
-    public OpsInstancesPanel getListener() {
-        return listener;
-    }
-
-    /**
-     * @param listener The listener to set.
-     */
-    public void setListener(OpsInstancesPanel listener) {
-        this.listener = listener;
-    }
-
-    @Override
-    public void refreshNowPressed() {
-        if (listener != null) {
-            listener.refreshTaskNowPressed();
-        }
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new TasksControlPanel());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TextualReportDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/instances/TextualReportDialog.java
deleted file mode 100644
index 9c1ec88..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/TextualReportDialog.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package gov.nasa.ziggy.ui.ops.instances;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.SwingUtilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.util.io.FileUtil;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class TextualReportDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(TextualReportDialog.class);
-
-    private JScrollPane reportTextScrollPane;
-    private JButton saveButton;
-    private JTextArea reportTextArea;
-    private JButton closeButton;
-    private JPanel actionPanel;
-    private String report = "";
-    private Path reportSavePath;
-
-    public TextualReportDialog(JFrame frame, String report) {
-        super(frame, true);
-        this.report = report;
-
-        initGUI();
-    }
-
-    public TextualReportDialog(JDialog dialog, String report) {
-        super(dialog, true);
-        this.report = report;
-
-        initGUI();
-    }
-
-    public static TextualReportDialog showReport(JDialog parent, String report, Path savePath) {
-        TextualReportDialog dialog = new TextualReportDialog(parent, report);
-        if (savePath != null) {
-            dialog.setReportSavePath(savePath);
-        }
-        dialog.setVisible(true);
-        return dialog;
-    }
-
-    public static TextualReportDialog showReport(JDialog parent, String report) {
-        return showReport(parent, report, null);
-    }
-
-    public static TextualReportDialog showReport(JFrame parent, String report) {
-        TextualReportDialog dialog = new TextualReportDialog(parent, report);
-
-        dialog.setVisible(true);
-        return dialog;
-    }
-
-    public void setReportSavePath(Path reportSavePath) {
-        log.debug("Report save path: " + reportSavePath.toString());
-        this.reportSavePath = reportSavePath;
-    }
-
-    private void saveButtonActionPerformed(ActionEvent evt) {
-        log.debug("saveButton.actionPerformed, event=" + evt);
-
-        Path savePath = reportSavePath != null ? reportSavePath : savePathFromChooser();
-        if (savePath != null) {
-            try {
-                Files.createDirectories(savePath.getParent());
-            } catch (Exception e) {
-                MessageUtil.showError(this, e);
-                return;
-            }
-            File file = savePath.toFile();
-            try (BufferedWriter writer = new BufferedWriter(
-                new OutputStreamWriter(new FileOutputStream(file), FileUtil.ZIGGY_CHARSET))) {
-                writer.write(report);
-                setTitle(savePath.getFileName().toString());
-            } catch (Exception e) {
-                MessageUtil.showError(this, e);
-            }
-        }
-    }
-
-    private Path savePathFromChooser() {
-        Path selectedPath = null;
-        try {
-            JFileChooser fc = new JFileChooser();
-            int returnVal = fc.showSaveDialog(this);
-
-            if (returnVal == JFileChooser.APPROVE_OPTION) {
-                selectedPath = fc.getSelectedFile().toPath();
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-        return selectedPath;
-    }
-
-    private void closeButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            getContentPane().add(getReportTextScrollPane(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            this.setSize(615, 677);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JScrollPane getReportTextScrollPane() {
-        if (reportTextScrollPane == null) {
-            reportTextScrollPane = new JScrollPane();
-            reportTextScrollPane.setViewportView(getReportTextArea());
-        }
-        return reportTextScrollPane;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(100);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getSaveButton());
-            actionPanel.add(getCloseButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("close");
-            closeButton.addActionListener(evt -> closeButtonActionPerformed());
-        }
-        return closeButton;
-    }
-
-    private JTextArea getReportTextArea() {
-        if (reportTextArea == null) {
-            reportTextArea = new JTextArea();
-            reportTextArea.setText(report);
-            reportTextArea.setFont(new java.awt.Font("Monospaced", 0, 12));
-        }
-        return reportTextArea;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JDialog d = new JDialog();
-            TextualReportDialog inst = new TextualReportDialog(d, "hello!");
-            inst.setVisible(true);
-        });
-    }
-
-    private JButton getSaveButton() {
-        if (saveButton == null) {
-            saveButton = new JButton();
-            saveButton.setText("save to file");
-            saveButton.addActionListener(this::saveButtonActionPerformed);
-        }
-        return saveButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/instances/package.html b/src/main/java/gov/nasa/ziggy/ui/ops/instances/package.html
deleted file mode 100644
index e86221a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/instances/package.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-  <body>
-    <p>
-      The first sentence is used as the brief description of the
-      package and appears at the top of the package documentation.
-      Additional sentences will appear at the bottom in the
-      Description section.
-    </p>
-    <dl>
-      <dt>Author</dt>
-      <dd>Bill Wohler</dd>
-      <dd>PT</dd>
-    </dl>
-    
-    <h2>Headings</h2>
-
-    <p>
-      Additional headings should use h2.
-    </p>
-
-    <h3>Sub-headings</h3>
-    
-    <p>
-      Sub-headings should use h3 and so on.
-    </p>
-
-  </body>
-</html>
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/package.html b/src/main/java/gov/nasa/ziggy/ui/ops/package.html
deleted file mode 100644
index 70bb58d..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/package.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html>
-  <body>
-    <p>
-      Until this package has at least one class, this package.html
-      file will not be processed by Javadoc and included in the API
-      and therefore does not need to be completed. If a class is
-      added and this message apears in the API, delete this paragraph
-      and modify the template below accordingly.
-    </p>
-    <p>
-      The first sentence is used as the brief description of the
-      package and appears at the top of the package documentation.
-      Additional sentences will appear at the bottom in the
-      Description section.
-    </p>
-    <dl>
-      <dt>Author</dt>
-      <dd>Bill Wohler</dd>
-      <dd>PT</dd>
-    </dl>
-    
-    <h2>Headings</h2>
-
-    <p>
-      Additional headings should use h2.
-    </p>
-
-    <h3>Sub-headings</h3>
-    
-    <p>
-      Sub-headings should use h3 and so on.
-    </p>
-
-  </body>
-</html>
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/EditParametersDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/EditParametersDialog.java
deleted file mode 100644
index 0430cf3..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/EditParametersDialog.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-
-/**
- * Dialog for viewing/editing a {@link Parameters} java bean.
- * <p>
- * This dialog box is generated from the Edit Triggers popup that is launched from the Triggers tab.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class EditParametersDialog extends javax.swing.JDialog {
-    private EditParametersPanel parametersPanel = null;
-
-    private JPanel dataPanel;
-    private JPanel buttonPanel;
-    private JButton cancelButton;
-    private JButton saveButton;
-
-    private final ParameterSet parameterSet;
-
-    private boolean cancelled = false;
-
-    public EditParametersDialog(JFrame frame, ParameterSet parameterSet) {
-        super(frame, true);
-        this.parameterSet = parameterSet;
-
-        initGUI();
-    }
-
-    public static Parameters editParameters(ParameterSet parameterSet) {
-        EditParametersDialog dialog = ZiggyGuiConsole.newEditParametersDialog(parameterSet);
-        dialog.setVisible(true); // blocks until user presses a button
-
-        if (!dialog.cancelled) {
-            return dialog.parametersPanel.getParameters();
-        }
-        return null;
-    }
-
-    private void saveButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed() {
-        cancelled = true;
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            getContentPane().setLayout(thisLayout);
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            setSize(700, 500);
-
-            setTitle("Edit Parameter Set: " + parameterSet.getName());
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getParamPanel(), BorderLayout.CENTER);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getParamPanel() throws PipelineException {
-        if (parametersPanel == null) {
-            Parameters paramsObj = parameterSet.parametersInstance();
-            parametersPanel = new EditParametersPanel(paramsObj);
-        }
-        return parametersPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(40);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getSaveButton());
-            buttonPanel.add(getCancelButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getSaveButton() {
-        if (saveButton == null) {
-            saveButton = new JButton();
-            saveButton.setText("save");
-            saveButton.addActionListener(evt -> saveButtonActionPerformed());
-        }
-        return saveButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(evt -> cancelButtonActionPerformed());
-        }
-        return cancelButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/EditParametersPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/EditParametersPanel.java
deleted file mode 100644
index 3a96e9b..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/EditParametersPanel.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-
-import javax.swing.BorderFactory;
-
-import com.l2fprod.common.propertysheet.PropertySheet;
-import com.l2fprod.common.propertysheet.PropertySheetPanel;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.ui.common.PropertySheetHelper;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class EditParametersPanel extends javax.swing.JPanel {
-    private PropertySheetPanel propertySheetPanel = null;
-    private Parameters parameters = null;
-
-    public EditParametersPanel(Parameters parameters) {
-        this.parameters = parameters;
-
-        initGUI();
-    }
-
-    public EditParametersPanel() {
-        initGUI();
-    }
-
-    public Parameters getParameters() throws PipelineException {
-        propertySheetPanel.writeToObject(parameters);
-        return parameters;
-    }
-
-    public void makeReadOnly() {
-        propertySheetPanel.getTable().setEnabled(false);
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            setPreferredSize(new Dimension(400, 300));
-            setBorder(BorderFactory.createTitledBorder("Edit Parameters"));
-            this.add(getPropertySheetPanel(), BorderLayout.CENTER);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private PropertySheetPanel getPropertySheetPanel() {
-        if (propertySheetPanel == null) {
-            propertySheetPanel = new PropertySheetPanel();
-
-            propertySheetPanel.setMode(PropertySheet.VIEW_AS_CATEGORIES);
-            propertySheetPanel.setDescriptionVisible(true);
-            propertySheetPanel.setSortingCategories(true);
-            // propertySheetPanel.setSortingProperties(true);
-            propertySheetPanel.getTable().setWantsExtraIndent(true);
-
-            if (parameters != null) {
-                try {
-                    PropertySheetHelper.populatePropertySheet(parameters, propertySheetPanel);
-                } catch (Exception e) {
-                    throw new PipelineException("Failed to introspect Parameters bean", e);
-                }
-            }
-        }
-        return propertySheetPanel;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterPropsTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterPropsTableModel.java
deleted file mode 100644
index 267362c..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterPropsTableModel.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.pipeline.definition.TypedParameter;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterPropsTableModel extends AbstractTableModel {
-    private final List<String> propNames;
-    private final List<String> propValues;
-
-    public ParameterPropsTableModel(Set<TypedParameter> properties) {
-        propNames = new ArrayList<>(properties.size());
-        propValues = new ArrayList<>(properties.size());
-
-        for (TypedParameter property : properties) {
-            propNames.add(property.getName());
-            propValues.add(property.getString());
-        }
-    }
-
-    /**
-     * @see javax.swing.table.TableModel#getColumnCount()
-     */
-    @Override
-    public int getColumnCount() {
-        return 2;
-    }
-
-    /**
-     * @see javax.swing.table.TableModel#getRowCount()
-     */
-    @Override
-    public int getRowCount() {
-        return propNames.size();
-    }
-
-    /**
-     * @see javax.swing.table.TableModel#getValueAt(int, int)
-     */
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return propNames.get(rowIndex);
-            case 1:
-                return propValues.get(rowIndex);
-            default:
-                return "Huh?";
-        }
-    }
-
-    /**
-     * @see javax.swing.table.AbstractTableModel#getColumnName(int)
-     */
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Name";
-            case 1:
-                return "Value";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetMapEditorDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetMapEditorDialog.java
deleted file mode 100644
index 76cd4f5..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetMapEditorDialog.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.BorderLayout;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetMapEditorDialog extends javax.swing.JDialog
-    implements ParameterSetMapEditorListener {
-    private JPanel dataPanel;
-    private ParameterSetMapEditorPanel parameterSetMapEditorPanel;
-    private JButton closeButton;
-    private JPanel buttonPanel;
-
-    private Map<ClassWrapper<Parameters>, ParameterSetName> currentParameters = null;
-    private Set<ClassWrapper<Parameters>> requiredParameters;
-    private Map<ClassWrapper<Parameters>, ParameterSetName> currentPipelineParameters;
-
-    private ParameterSetMapEditorListener mapListener;
-
-    public ParameterSetMapEditorDialog(JFrame frame) {
-        super(frame, true);
-        initGUI();
-    }
-
-    public ParameterSetMapEditorDialog(JFrame frame,
-        Map<ClassWrapper<Parameters>, ParameterSetName> currentParameters,
-        Set<ClassWrapper<Parameters>> requiredParameters,
-        Map<ClassWrapper<Parameters>, ParameterSetName> currentPipelineParameters) {
-        super(frame, true);
-
-        this.currentParameters = currentParameters;
-        this.requiredParameters = requiredParameters;
-        this.currentPipelineParameters = currentPipelineParameters;
-
-        initGUI();
-    }
-
-    public ParameterSetMapEditorDialog(JDialog dialog,
-        Map<ClassWrapper<Parameters>, ParameterSetName> currentParameters,
-        Set<ClassWrapper<Parameters>> requiredParameters,
-        Map<ClassWrapper<Parameters>, ParameterSetName> currentPipelineParameters) {
-        super(dialog, true);
-
-        this.currentParameters = currentParameters;
-        this.requiredParameters = requiredParameters;
-        this.currentPipelineParameters = currentPipelineParameters;
-
-        initGUI();
-    }
-
-    private void initGUI() {
-        try {
-            {
-                dataPanel = new JPanel();
-                BorderLayout dataPanelLayout = new BorderLayout();
-                getContentPane().add(dataPanel, BorderLayout.CENTER);
-                dataPanel.setLayout(dataPanelLayout);
-                {
-                    parameterSetMapEditorPanel = new ParameterSetMapEditorPanel(currentParameters,
-                        requiredParameters, currentPipelineParameters);
-                    parameterSetMapEditorPanel.setMapListener(this);
-                    dataPanel.add(parameterSetMapEditorPanel, BorderLayout.CENTER);
-                    parameterSetMapEditorPanel
-                        .setBorder(BorderFactory.createTitledBorder("Parameter Sets"));
-                }
-            }
-            {
-                buttonPanel = new JPanel();
-                getContentPane().add(buttonPanel, BorderLayout.SOUTH);
-                {
-                    closeButton = new JButton();
-                    buttonPanel.add(closeButton);
-                    closeButton.setText("Close");
-                    closeButton.addActionListener(evt -> closeButtonActionPerformed());
-                }
-            }
-            this.setSize(536, 405);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void closeButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    public ParameterSetMapEditorListener getMapListener() {
-        return mapListener;
-    }
-
-    public void setMapListener(ParameterSetMapEditorListener mapListener) {
-        this.mapListener = mapListener;
-    }
-
-    @Override
-    public void notifyMapChanged(Object source) {
-        if (mapListener != null) {
-            mapListener.notifyMapChanged(this);
-        }
-    }
-
-    public Map<ClassWrapper<Parameters>, ParameterSetName> getParameterSetsMap() {
-        return parameterSetMapEditorPanel.getParameterSetsMap();
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetMapEditorPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetMapEditorPanel.java
deleted file mode 100644
index 4e370e1..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetMapEditorPanel.java
+++ /dev/null
@@ -1,489 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.JButton;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.proxy.ParameterSetCrudProxy;
-import gov.nasa.ziggy.ui.proxy.PipelineOperationsProxy;
-
-/**
- * Edit/view all of the {@link ParameterSet}s for a pipeline or node. This panel is the one that
- * appears when the operator goes to the Triggers tab, selects a trigger, and selects a parameter
- * set or pipeline module from the resulting Edit Trigger dialog box.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetMapEditorPanel extends javax.swing.JPanel {
-    private static final Logger log = LoggerFactory.getLogger(ParameterSetMapEditorPanel.class);
-
-    private ParameterSetMapEditorListener mapListener;
-    private JButton autoAssignButton;
-    private JMenuItem removeMenuItem;
-    private JMenuItem editMenuItem;
-    private JMenuItem selectMenuItem;
-    private JPopupMenu tablePopupMenu;
-    private JButton selectParamSetButton;
-    private JButton addButton;
-    private JButton editParamValuesButton;
-    private JPanel buttonPanel;
-    private ZTable paramSetMapTable;
-    private JScrollPane tableScrollPane1;
-    private JPanel tablePanel;
-    private int selectedModelIndex = -1;
-
-    private Map<ClassWrapper<Parameters>, ParameterSetName> currentParameters = null;
-    private Set<ClassWrapper<Parameters>> requiredParameters = null;
-    private Map<ClassWrapper<Parameters>, ParameterSetName> currentPipelineParameters = null;
-
-    private ParameterSetNamesTableModel paramSetMapTableModel;
-
-    /* For Jigloo use only */
-    public ParameterSetMapEditorPanel() {
-        initGUI();
-    }
-
-    public ParameterSetMapEditorPanel(
-        Map<ClassWrapper<Parameters>, ParameterSetName> currentParameters,
-        Set<ClassWrapper<Parameters>> requiredParameters,
-        Map<ClassWrapper<Parameters>, ParameterSetName> currentPipelineParameters) {
-        this.currentParameters = currentParameters;
-        this.requiredParameters = requiredParameters;
-        this.currentPipelineParameters = currentPipelineParameters;
-
-        initGUI();
-    }
-
-    private void initGUI() {
-        try {
-            GridBagLayout thisLayout = new GridBagLayout();
-            setPreferredSize(new Dimension(400, 300));
-            thisLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            thisLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7 };
-            thisLayout.columnWeights = new double[] { 0.1 };
-            thisLayout.columnWidths = new int[] { 7 };
-            setLayout(thisLayout);
-            this.add(getTablePanel(), new GridBagConstraints(0, 0, 1, 4, 0.0, 1.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            this.add(getButtonPanel(), new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void addButtonActionPerformed(ActionEvent evt) {
-        log.debug("addButton.actionPerformed, event=" + evt);
-
-        ParameterSet newParameterSet = ParameterSetSelectorDialog.selectParameterSet();
-
-        if (newParameterSet != null) {
-            @SuppressWarnings("unchecked")
-            Class<? extends Parameters> clazz = (Class<? extends Parameters>) newParameterSet
-                .getParameters()
-                .getClazz();
-
-            ClassWrapper<Parameters> classWrapper = new ClassWrapper<>(clazz);
-
-            if (currentParameters.containsKey(classWrapper)) {
-                MessageUtil.showError(this, "A parameter set for " + clazz.getSimpleName()
-                    + " already exists, use 'select' to change the existing instance");
-            } else {
-                currentParameters.put(classWrapper, newParameterSet.getName());
-
-                if (mapListener != null) {
-                    mapListener.notifyMapChanged(this);
-                }
-
-                paramSetMapTableModel.update(currentParameters, requiredParameters,
-                    currentPipelineParameters);
-            }
-        }
-    }
-
-    private void selectMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("selectMenuItem.actionPerformed, event=" + evt);
-
-        doSelect(selectedModelIndex);
-    }
-
-    private void selectParamSetButtonActionPerformed(ActionEvent evt) {
-        log.debug("selectParamSetButton.actionPerformed, event=" + evt);
-
-        int selectedRow = paramSetMapTable.getSelectedRow();
-
-        if (selectedRow == -1) {
-            MessageUtil.showError(this, "No parameter set selected");
-        } else {
-            int modelIndex = paramSetMapTable.convertRowIndexToModel(selectedRow);
-            doSelect(modelIndex);
-        }
-    }
-
-    /**
-     * @param selectedRow
-     */
-    private void doSelect(int modelIndex) {
-        ParameterSetAssignment paramSetAssignment = paramSetMapTableModel
-            .getParamAssignmentAtRow(modelIndex);
-
-        if (paramSetAssignment.isAssignedAtPipelineLevel()) {
-            MessageUtil.showError(this,
-                "Already assigned at the pipeline level.  Remove that assignment first.");
-            return;
-        }
-
-        ClassWrapper<Parameters> type = paramSetAssignment.getType();
-        boolean isDeleted = false;
-
-        try {
-            type.getClazz();
-        } catch (Exception e) {
-            isDeleted = true;
-        }
-
-        if (!isDeleted) {
-            Class<? extends Parameters> currentType = type.getClazz();
-            ParameterSet newParameterSet = ParameterSetSelectorDialog
-                .selectParameterSet(currentType);
-
-            if (newParameterSet != null) {
-                ParameterSetName previouslyAssignedName = paramSetAssignment.getAssignedName();
-                if (previouslyAssignedName == null || previouslyAssignedName != null
-                    && !newParameterSet.getName().equals(previouslyAssignedName)) {
-                    // changed, store the change
-                    ClassWrapper<Parameters> classWrapper = new ClassWrapper<>(currentType);
-                    currentParameters.put(classWrapper, newParameterSet.getName());
-
-                    if (mapListener != null) {
-                        mapListener.notifyMapChanged(this);
-                    }
-
-                    paramSetMapTableModel.update(currentParameters, requiredParameters,
-                        currentPipelineParameters);
-                }
-            }
-        } else {
-            MessageUtil.showError(this,
-                "Can't select a parameter set whose class has been deleted.");
-        }
-    }
-
-    private void editMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("editMenuItem.actionPerformed, event=" + evt);
-
-        doEdit(selectedModelIndex);
-    }
-
-    private void editParamValuesButtonActionPerformed(ActionEvent evt) {
-        log.debug("editParamValuesButton.actionPerformed, event=" + evt);
-
-        int selectedRow = paramSetMapTable.getSelectedRow();
-
-        if (selectedRow == -1) {
-            MessageUtil.showError(this, "No parameter set selected");
-        } else {
-            int modelIndex = paramSetMapTable.convertRowIndexToModel(selectedRow);
-            doEdit(modelIndex);
-        }
-    }
-
-    /**
-     * @param modelIndex
-     */
-    private void doEdit(int modelIndex) {
-        ParameterSetName paramSetName = paramSetMapTableModel.getParamSetAtRow(modelIndex);
-
-        if (paramSetName != null) {
-            PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
-
-            ParameterSet latestParameterSet = pipelineOps.retrieveLatestParameterSet(paramSetName);
-
-            if (!latestParameterSet.parametersClassDeleted()) {
-                Parameters newParameters = EditParametersDialog.editParameters(latestParameterSet);
-
-                if (newParameters != null) {
-                    pipelineOps.updateParameterSet(latestParameterSet, newParameters,
-                        latestParameterSet.getDescription(), false);
-                }
-            } else {
-                MessageUtil.showError(this,
-                    "Can't edit a parameter set whose class has been deleted.");
-            }
-        }
-    }
-
-    private void removeMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("removeMenuItem.actionPerformed, event=" + evt);
-
-        ClassWrapper<Parameters> type = paramSetMapTableModel
-            .getParamAssignmentAtRow(selectedModelIndex)
-            .getType();
-        currentParameters.remove(type);
-
-        if (mapListener != null) {
-            mapListener.notifyMapChanged(this);
-        }
-
-        paramSetMapTableModel.update(currentParameters, requiredParameters,
-            currentPipelineParameters);
-    }
-
-    private void autoAssignButtonActionPerformed(ActionEvent evt) {
-        log.debug("autoAssignButton.actionPerformed, event=" + evt);
-
-        ParameterSetCrudProxy crud = new ParameterSetCrudProxy();
-        List<ParameterSet> allParamSets = crud.retrieveLatestVersions();
-        LinkedList<ParameterSetAssignment> currentAssignments = paramSetMapTableModel
-            .getParamSetAssignments();
-        boolean changesMade = false;
-
-        for (ParameterSetAssignment assignment : currentAssignments) {
-            if (assignment.getAssignedName() == null) {
-                ClassWrapper<Parameters> type = assignment.getType();
-                ParameterSet instance = null;
-                int foundCount = 0;
-
-                for (ParameterSet parameterSet : allParamSets) {
-                    Class<?> clazz = null;
-
-                    try {
-                        clazz = parameterSet.getParameters().getClazz();
-                    } catch (RuntimeException e) {
-                        // ignore this parameter set
-                    }
-
-                    if (clazz != null
-                        && parameterSet.getParameters().getClazz().equals(type.getClazz())) {
-                        instance = parameterSet;
-                        foundCount++;
-                    }
-                }
-
-                if (foundCount == 1) {
-                    log.info("Found a match: " + instance.getName() + " for type: " + type);
-                    currentParameters.put(type, instance.getName());
-                    changesMade = true;
-                }
-            }
-        }
-
-        if (changesMade) {
-            if (mapListener != null) {
-                mapListener.notifyMapChanged(this);
-            }
-
-            paramSetMapTableModel.update(currentParameters, requiredParameters,
-                currentPipelineParameters);
-        }
-    }
-
-    public ParameterSetMapEditorListener getMapListener() {
-        return mapListener;
-    }
-
-    public void setMapListener(ParameterSetMapEditorListener mapListener) {
-        this.mapListener = mapListener;
-    }
-
-    public Map<ClassWrapper<Parameters>, ParameterSetName> getParameterSetsMap() {
-        return currentParameters;
-    }
-
-    private JPanel getTablePanel() {
-        if (tablePanel == null) {
-            tablePanel = new JPanel();
-            BorderLayout tablePanelLayout = new BorderLayout();
-            tablePanel.setLayout(tablePanelLayout);
-            tablePanel.add(getTableScrollPane1(), BorderLayout.CENTER);
-        }
-        return tablePanel;
-    }
-
-    private JScrollPane getTableScrollPane1() {
-        if (tableScrollPane1 == null) {
-            tableScrollPane1 = new JScrollPane();
-            tableScrollPane1.setViewportView(getParamSetMapTable());
-        }
-        return tableScrollPane1;
-    }
-
-    private ZTable getParamSetMapTable() {
-        if (paramSetMapTable == null) {
-            paramSetMapTableModel = new ParameterSetNamesTableModel(currentParameters,
-                requiredParameters, currentPipelineParameters);
-            paramSetMapTable = new ZTable();
-            paramSetMapTable.setRowShadingEnabled(true);
-            paramSetMapTable.setModel(paramSetMapTableModel);
-            paramSetMapTable.addMouseListener(new MouseAdapter() {
-                @Override
-                public void mouseClicked(MouseEvent evt) {
-                    tableMouseClicked(evt);
-                }
-            });
-            setComponentPopupMenu(paramSetMapTable, getTablePopupMenu());
-        }
-        return paramSetMapTable;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(20);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getAddButton());
-            buttonPanel.add(getSelectParamSetButton());
-            buttonPanel.add(getEditParamValuesButton());
-            buttonPanel.add(getAutoAssignButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getSelectParamSetButton() {
-        if (selectParamSetButton == null) {
-            selectParamSetButton = new JButton();
-            selectParamSetButton.setText("select");
-            selectParamSetButton
-                .setToolTipText("Select a different parameter set instance for this type");
-            selectParamSetButton.addActionListener(this::selectParamSetButtonActionPerformed);
-        }
-        return selectParamSetButton;
-    }
-
-    private JButton getEditParamValuesButton() {
-        if (editParamValuesButton == null) {
-            editParamValuesButton = new JButton();
-            editParamValuesButton.setText("edit values");
-            editParamValuesButton.setToolTipText(
-                "Shortcut to edit the values in this parameter set instance (same as editing the set in the Parameter Library)");
-            editParamValuesButton.addActionListener(this::editParamValuesButtonActionPerformed);
-        }
-        return editParamValuesButton;
-    }
-
-    private JButton getAddButton() {
-        if (addButton == null) {
-            addButton = new JButton();
-            addButton.setText("add");
-            addButton.setToolTipText("Add a new parameter set");
-            addButton.addActionListener(this::addButtonActionPerformed);
-        }
-        return addButton;
-    }
-
-    private JPopupMenu getTablePopupMenu() {
-        if (tablePopupMenu == null) {
-            tablePopupMenu = new JPopupMenu();
-            tablePopupMenu.add(getSelectMenuItem());
-            tablePopupMenu.add(getEditMenuItem());
-            tablePopupMenu.add(getRemoveMenuItem());
-        }
-        return tablePopupMenu;
-    }
-
-    private void setComponentPopupMenu(final java.awt.Component parent,
-        final javax.swing.JPopupMenu menu) {
-        parent.addMouseListener(new java.awt.event.MouseAdapter() {
-            @Override
-            public void mousePressed(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                    int tableRow = paramSetMapTable.rowAtPoint(e.getPoint());
-                    // windows bug? works ok on Linux/gtk. Here's a workaround:
-                    if (tableRow == -1) {
-                        tableRow = paramSetMapTable.getSelectedRow();
-                    }
-                    selectedModelIndex = paramSetMapTable.convertRowIndexToModel(tableRow);
-                }
-            }
-
-            @Override
-            public void mouseReleased(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                }
-            }
-        });
-    }
-
-    private void tableMouseClicked(MouseEvent evt) {
-        log.debug("tableMouseClicked(MouseEvent) - start");
-
-        if (evt.getClickCount() == 2) {
-            log.debug(
-                "tableMouseClicked(MouseEvent) - [DOUBLE-CLICK] table.mouseClicked, event=" + evt);
-            int tableRow = paramSetMapTable.rowAtPoint(evt.getPoint());
-            selectedModelIndex = paramSetMapTable.convertRowIndexToModel(tableRow);
-            log.debug("tableMouseClicked(MouseEvent) - [DC] table row =" + selectedModelIndex);
-
-            doEdit(selectedModelIndex);
-        }
-
-        log.debug("tableMouseClicked(MouseEvent) - end");
-    }
-
-    private JMenuItem getSelectMenuItem() {
-        if (selectMenuItem == null) {
-            selectMenuItem = new JMenuItem();
-            selectMenuItem.setText("Select Parameter Set...");
-            selectMenuItem.addActionListener(this::selectMenuItemActionPerformed);
-        }
-        return selectMenuItem;
-    }
-
-    private JMenuItem getEditMenuItem() {
-        if (editMenuItem == null) {
-            editMenuItem = new JMenuItem();
-            editMenuItem.setText("Edit Parameter Values...");
-            editMenuItem.addActionListener(this::editMenuItemActionPerformed);
-        }
-        return editMenuItem;
-    }
-
-    private JMenuItem getRemoveMenuItem() {
-        if (removeMenuItem == null) {
-            removeMenuItem = new JMenuItem();
-            removeMenuItem.setText("Remove Parameter Set");
-            removeMenuItem.addActionListener(this::removeMenuItemActionPerformed);
-        }
-        return removeMenuItem;
-    }
-
-    private JButton getAutoAssignButton() {
-        if (autoAssignButton == null) {
-            autoAssignButton = new JButton();
-            autoAssignButton.setText("auto-assign");
-            autoAssignButton.setToolTipText(
-                "Automatically assign a parameter set if there is only one available");
-            autoAssignButton.addActionListener(this::autoAssignButtonActionPerformed);
-        }
-        return autoAssignButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetNamesTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetNamesTableModel.java
deleted file mode 100644
index 29dedfa..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetNamesTableModel.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.table.AbstractTableModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
-import gov.nasa.ziggy.ui.common.HtmlLabelBuilder;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetNamesTableModel extends AbstractTableModel {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(ParameterSetNamesTableModel.class);
-
-    private final LinkedList<ParameterSetAssignment> paramSetAssignments = new LinkedList<>();
-
-    public ParameterSetNamesTableModel(
-        Map<ClassWrapper<Parameters>, ParameterSetName> currentParameters,
-        Set<ClassWrapper<Parameters>> requiredParameters,
-        Map<ClassWrapper<Parameters>, ParameterSetName> currentPipelineParameters) {
-        update(currentParameters, requiredParameters, currentPipelineParameters);
-    }
-
-    /**
-     * for each required param create a ParameterSetAssignment if reqd param exists in current
-     * params, use that name if reqd param exists in current pipeline params, use that name with
-     * '(pipeline)' if there are any left in current params (not reqd), add those
-     *
-     * @param currentParameters
-     * @param requiredParameters
-     * @param currentPipelineParameters
-     */
-    public void update(Map<ClassWrapper<Parameters>, ParameterSetName> currentParameters,
-        Set<ClassWrapper<Parameters>> requiredParameters,
-        Map<ClassWrapper<Parameters>, ParameterSetName> currentPipelineParameters) {
-        paramSetAssignments.clear();
-        Set<ClassWrapper<Parameters>> types = new HashSet<>();
-
-        // for each required param type, create a ParameterSetAssignment
-        for (ClassWrapper<Parameters> requiredType : requiredParameters) {
-            ParameterSetAssignment param = new ParameterSetAssignment(requiredType);
-
-            // if required param type exists in current params, use that
-            // ParameterSetName
-            ParameterSetName currentAssignment = currentParameters.get(requiredType);
-            if (currentAssignment != null) {
-                param.setAssignedName(currentAssignment);
-            }
-
-            // if required param type exists in current *pipeline* params,
-            // display that (read-only)
-            if (currentPipelineParameters.containsKey(requiredType)) {
-                param.setAssignedName(currentPipelineParameters.get(requiredType));
-                param.setAssignedAtPipelineLevel(true);
-
-                if (currentAssignment != null) {
-                    param.setAssignedAtBothLevels(true);
-                }
-            }
-
-            if (param.isAssignedAtPipelineLevel() || param.isAssignedAtBothLevels()) {
-                paramSetAssignments.addFirst(param);
-            } else {
-                paramSetAssignments.add(param);
-            }
-
-            types.add(requiredType);
-        }
-
-        // If there are any param types left over in current params (not
-        // required), add those
-        // This also covers the case where empty lists are passed in for
-        // required params and
-        // current pipeline params (when using this model to edit pipeline
-        // params on the EditTriggerDialog
-        for (ClassWrapper<Parameters> currentParam : currentParameters.keySet()) {
-            if (!types.contains(currentParam)) {
-                ParameterSetAssignment param = new ParameterSetAssignment(currentParam,
-                    currentParameters.get(currentParam), false, false);
-                paramSetAssignments.add(param);
-            }
-        }
-
-        fireTableDataChanged();
-    }
-
-    public ParameterSetName getParamSetAtRow(int rowIndex) {
-        return paramSetAssignments.get(rowIndex).getAssignedName();
-    }
-
-    public ParameterSetAssignment getParamAssignmentAtRow(int rowIndex) {
-        return paramSetAssignments.get(rowIndex);
-    }
-
-    /**
-     * @return the paramSetAssignments
-     */
-    public LinkedList<ParameterSetAssignment> getParamSetAssignments() {
-        return paramSetAssignments;
-    }
-
-    @Override
-    public int getRowCount() {
-        return paramSetAssignments.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 2;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        ParameterSetAssignment assignment = paramSetAssignments.get(rowIndex);
-        ClassWrapper<Parameters> assignmentType = assignment.getType();
-        ParameterSetName assignedName = assignment.getAssignedName();
-
-        HtmlLabelBuilder displayName = new HtmlLabelBuilder();
-
-        if (assignedName != null) {
-            displayName.append(assignedName.getName());
-        } else {
-            displayName.appendColor("--- not set ---", "red");
-        }
-
-        if (assignment.isAssignedAtBothLevels()) {
-            displayName.appendColor(" (ERROR: set at BOTH levels)", "red");
-        } else if (assignment.isAssignedAtPipelineLevel()) {
-            displayName.appendItalic(" (set at pipeline level)");
-        }
-
-        switch (columnIndex) {
-            case 0:
-                Class<?> clazz = null;
-                try {
-                    clazz = assignmentType.getClazz();
-                } catch (RuntimeException e) {
-                    return "<deleted>: " + assignmentType.getClassName();
-                }
-                return clazz.getSimpleName();
-            case 1:
-                return displayName;
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Type";
-            case 1:
-                return "Name";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetSelectorDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetSelectorDialog.java
deleted file mode 100644
index de1019c..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetSelectorDialog.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-
-/**
- * {@link JDialog} wrapper for the {@link ParameterSetSelectorPanel}
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetSelectorDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(ParameterSetSelectorDialog.class);
-
-    private final Class<? extends Parameters> filterClass;
-    private JPanel dataPanel;
-    private JButton cancelButton;
-    private JButton selectButton;
-    private JPanel actionPanel;
-    private ParameterSetSelectorPanel parameterSetSelectorPanel;
-
-    private boolean cancelled = false;
-
-    public ParameterSetSelectorDialog(JFrame frame) {
-        super(frame, true);
-        filterClass = null;
-        initGUI();
-    }
-
-    public ParameterSetSelectorDialog(JFrame frame, Class<? extends Parameters> filterClass) {
-        super(frame, true);
-        this.filterClass = filterClass;
-        initGUI();
-    }
-
-    /**
-     * Select a parameter set of the specified type from the parameter set library
-     *
-     * @param filterClass
-     * @return
-     */
-    public static ParameterSet selectParameterSet(Class<? extends Parameters> filterClass) {
-        ParameterSetSelectorDialog dialog = ZiggyGuiConsole
-            .newParameterSetSelectorDialog(filterClass);
-        dialog.setVisible(true); // blocks until user presses a button
-
-        if (!dialog.cancelled) {
-            return dialog.parameterSetSelectorPanel.getSelected();
-        }
-        return null;
-    }
-
-    /**
-     * Select a parameter set from the parameter set library with no filtering
-     *
-     * @return
-     */
-    public static ParameterSet selectParameterSet() {
-        ParameterSetSelectorDialog dialog = ZiggyGuiConsole.newParameterSetSelectorDialog();
-        dialog.setVisible(true); // blocks until user presses a button
-
-        if (!dialog.cancelled) {
-            return dialog.parameterSetSelectorPanel.getSelected();
-        }
-        return null;
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Select Parameter Set");
-                getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-                getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            }
-            this.setSize(300, 600);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void selectButtonActionPerformed(ActionEvent evt) {
-        log.debug("selectButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        cancelled = true;
-        setVisible(false);
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getParameterSetSelectorPanel(), BorderLayout.CENTER);
-        }
-        return dataPanel;
-    }
-
-    private ParameterSetSelectorPanel getParameterSetSelectorPanel() {
-        if (parameterSetSelectorPanel == null) {
-            parameterSetSelectorPanel = new ParameterSetSelectorPanel(filterClass);
-        }
-        return parameterSetSelectorPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(40);
-            actionPanelLayout.setHgap(40);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getSelectButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getSelectButton() {
-        if (selectButton == null) {
-            selectButton = new JButton();
-            selectButton.setText("Select");
-            selectButton.addActionListener(this::selectButtonActionPerformed);
-        }
-        return selectButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetSelectorPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetSelectorPanel.java
deleted file mode 100644
index ca99ab7..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetSelectorPanel.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-
-import javax.swing.JList;
-import javax.swing.JScrollPane;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
-import gov.nasa.ziggy.ui.config.parameters.ParameterSetListModel;
-
-/**
- * Select a {@link ParameterSetName} from a list or create a new one.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetSelectorPanel extends javax.swing.JPanel {
-    private JList<ParameterSet> paramSetList;
-    private JScrollPane scrollPane;
-    private ParameterSetListModel paramSetListModel;
-
-    private final Class<? extends Parameters> filterClass;
-
-    public ParameterSetSelectorPanel() {
-        filterClass = null;
-        initGUI();
-    }
-
-    public ParameterSetSelectorPanel(Class<? extends Parameters> filterClass) {
-        this.filterClass = filterClass;
-        initGUI();
-    }
-
-    public ParameterSet getSelected() {
-        int selectedIndex = paramSetList.getSelectedIndex();
-
-        if (selectedIndex != -1) {
-            return paramSetListModel.getElementAt(selectedIndex);
-        }
-        return null;
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            setPreferredSize(new Dimension(400, 300));
-            {
-                scrollPane = new JScrollPane();
-                this.add(scrollPane, BorderLayout.CENTER);
-                {
-                    paramSetListModel = new ParameterSetListModel(filterClass);
-                    paramSetList = new JList<>();
-                    scrollPane.setViewportView(paramSetList);
-                    paramSetList.setModel(paramSetListModel);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetTableModel.java
deleted file mode 100644
index a003f43..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetTableModel.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetTableModel extends AbstractTableModel {
-    protected List<ParameterSet> paramSets = new ArrayList<>();
-    protected List<ClassWrapper<Parameters>> paramSetTypes = new ArrayList<>();
-
-    public ParameterSetTableModel(Map<ClassWrapper<Parameters>, ParameterSet> parameterSetsMap) {
-        update(parameterSetsMap);
-    }
-
-    public void update(Map<ClassWrapper<Parameters>, ParameterSet> parameterSetsMap) {
-        paramSets.clear();
-        paramSetTypes.clear();
-
-        if (parameterSetsMap != null) {
-            for (ClassWrapper<Parameters> classWrapper : parameterSetsMap.keySet()) {
-                ParameterSet paramSet = parameterSetsMap.get(classWrapper);
-
-                paramSets.add(paramSet);
-                paramSetTypes.add(classWrapper);
-            }
-        }
-
-        fireTableDataChanged();
-    }
-
-    public ParameterSet getParamSetAtRow(int rowIndex) {
-        return paramSets.get(rowIndex);
-    }
-
-    @Override
-    public int getRowCount() {
-        return paramSets.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 2;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        ParameterSet paramSet = paramSets.get(rowIndex);
-        ClassWrapper<Parameters> paramSetType = paramSetTypes.get(rowIndex);
-
-        switch (columnIndex) {
-            case 0:
-                return paramSetType.getClazz().getSimpleName();
-            case 1:
-                return paramSet.getName();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Type";
-            case 1:
-                return "Selected Parameter Set";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetViewDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetViewDialog.java
deleted file mode 100644
index 8e2088c..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetViewDialog.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.BorderLayout;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetViewDialog extends javax.swing.JDialog {
-    // private static final Logger log = LoggerFactory.getLogger(ParameterSetViewDialog.class);
-
-    private JPanel actionPanel;
-    private ParameterSetViewPanel parameterSetViewPanel;
-    private JButton closeButton;
-
-    private Map<ClassWrapper<Parameters>, ParameterSet> parameterSetsMap = null;
-
-    public ParameterSetViewDialog(JDialog parentDialog) {
-        this(parentDialog, null);
-    }
-
-    public ParameterSetViewDialog(JDialog parentDialog,
-        Map<ClassWrapper<Parameters>, ParameterSet> parameterSetsMap) {
-        super(parentDialog);
-
-        this.parameterSetsMap = parameterSetsMap;
-
-        initGUI();
-    }
-
-    public static void showParameterSet(JDialog parentDialog,
-        Map<ClassWrapper<Parameters>, ParameterSet> parameterSetsMap) {
-        ParameterSetViewDialog dialog = new ParameterSetViewDialog(parentDialog, parameterSetsMap);
-
-        dialog.setVisible(true);
-    }
-
-    private void closeButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("View Parameter Sets");
-                getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-                getContentPane().add(getParameterSetViewPanel(), BorderLayout.CENTER);
-            }
-            setSize(400, 300);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            actionPanel.add(getCloseButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("close");
-            closeButton.addActionListener(evt -> closeButtonActionPerformed());
-        }
-        return closeButton;
-    }
-
-    private ParameterSetViewPanel getParameterSetViewPanel() {
-        if (parameterSetViewPanel == null) {
-            parameterSetViewPanel = new ParameterSetViewPanel(parameterSetsMap);
-        }
-        return parameterSetViewPanel;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JDialog d = new JDialog();
-            ParameterSetViewDialog inst = new ParameterSetViewDialog(d);
-            inst.setVisible(true);
-        });
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetViewPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetViewPanel.java
deleted file mode 100644
index acf63b7..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetViewPanel.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.WindowConstants;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-
-/**
- * Display a {@link Map} from {@link ClassWrapper} instances to {@link ParameterSet} instances in
- * read-only mode. Used for viewing the parameters used for a particular pipeline instance.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterSetViewPanel extends javax.swing.JPanel {
-    private static final Logger log = LoggerFactory.getLogger(ParameterSetViewPanel.class);
-
-    private JScrollPane paramSetsScrollPane;
-    private JButton viewParamSetButton;
-    private JPanel buttonPanel;
-    private ZTable paramSetsTable;
-    private Map<ClassWrapper<Parameters>, ParameterSet> parameterSetsMap = new HashMap<>();
-    private ParameterSetTableModel paramSetsTableModel;
-
-    public ParameterSetViewPanel() {
-        this(null);
-    }
-
-    public ParameterSetViewPanel(Map<ClassWrapper<Parameters>, ParameterSet> parameterSetsMap) {
-        this.parameterSetsMap = parameterSetsMap;
-
-        initGUI();
-    }
-
-    private void viewParamSetButtonActionPerformed(ActionEvent evt) {
-        log.debug("viewParamSetButton.actionPerformed, event=" + evt);
-
-        int selectedModelRow = paramSetsTable
-            .convertRowIndexToModel(paramSetsTable.getSelectedRow());
-
-        if (selectedModelRow == -1) {
-            MessageUtil.showError(this, "No parameter set selected");
-        } else {
-            ParameterSet paramSet = paramSetsTableModel.getParamSetAtRow(selectedModelRow);
-
-            ViewParametersDialog.viewParameters(paramSet);
-        }
-    }
-
-    private void initGUI() {
-        try {
-            GridBagLayout thisLayout = new GridBagLayout();
-            setPreferredSize(new Dimension(400, 300));
-            thisLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1 };
-            thisLayout.rowHeights = new int[] { 7, 7, 7, 7 };
-            thisLayout.columnWeights = new double[] { 0.1 };
-            thisLayout.columnWidths = new int[] { 7 };
-            setLayout(thisLayout);
-            this.add(getParamSetsScrollPane(), new GridBagConstraints(0, 0, 1, 3, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            this.add(getButtonPanel(), new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JScrollPane getParamSetsScrollPane() {
-        if (paramSetsScrollPane == null) {
-            paramSetsScrollPane = new JScrollPane();
-            paramSetsScrollPane.setViewportView(getParamSetsTable());
-        }
-        return paramSetsScrollPane;
-    }
-
-    private ZTable getParamSetsTable() {
-        if (paramSetsTable == null) {
-            paramSetsTableModel = new ParameterSetTableModel(parameterSetsMap);
-            paramSetsTable = new ZTable();
-            paramSetsTable.setModel(paramSetsTableModel);
-        }
-        return paramSetsTable;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            buttonPanel.add(getViewParamSetButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getViewParamSetButton() {
-        if (viewParamSetButton == null) {
-            viewParamSetButton = new JButton();
-            viewParamSetButton.setText("view parameters");
-            viewParamSetButton.addActionListener(this::viewParamSetButtonActionPerformed);
-        }
-        return viewParamSetButton;
-    }
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new ParameterSetViewPanel());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ViewParametersDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ViewParametersDialog.java
deleted file mode 100644
index 77a35b5..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ViewParametersDialog.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-
-/**
- * Dialog for viewing (read-only) a {@link Parameters} java bean.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ViewParametersDialog extends javax.swing.JDialog {
-    private ViewParametersPanel parametersPanel = null;
-
-    private JPanel dataPanel;
-    private JPanel buttonPanel;
-    private JButton closeButton;
-
-    private final ParameterSet parameterSet;
-
-    public ViewParametersDialog(JFrame frame, ParameterSet parameterSet) {
-        super(frame, true);
-        this.parameterSet = parameterSet;
-
-        initGUI();
-    }
-
-    public static void viewParameters(ParameterSet parameterSet) {
-        ViewParametersDialog dialog = ZiggyGuiConsole.newViewParametersDialog(parameterSet);
-
-        dialog.setVisible(true); // blocks until user presses a button
-    }
-
-    private void closeButtonActionPerformed() {
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            getContentPane().setLayout(thisLayout);
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            setSize(700, 500);
-
-            setTitle("View Parameter Set: " + parameterSet.getName() + " (read-only)");
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getParamPanel(), BorderLayout.CENTER);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getParamPanel() throws PipelineException {
-        if (parametersPanel == null) {
-            parametersPanel = new ViewParametersPanel(parameterSet);
-        }
-        return parametersPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(40);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getCloseButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("close");
-            closeButton.addActionListener(evt -> closeButtonActionPerformed());
-        }
-        return closeButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ViewParametersPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ViewParametersPanel.java
deleted file mode 100644
index 101c19e..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ViewParametersPanel.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package gov.nasa.ziggy.ui.ops.parameters;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-
-import javax.swing.BorderFactory;
-import javax.swing.JScrollPane;
-
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.ui.common.ZTable;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ViewParametersPanel extends javax.swing.JPanel {
-    private ParameterSet parameterSet = null;
-    private JScrollPane scrollPane;
-    private ZTable parametersTable;
-    private ParameterPropsTableModel parametersTableModel;
-
-    public ViewParametersPanel(ParameterSet parameterSet) {
-        this.parameterSet = parameterSet;
-
-        initGUI();
-    }
-
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            setPreferredSize(new Dimension(400, 300));
-            setBorder(BorderFactory.createTitledBorder("View Parameters"));
-            this.add(getScrollPane(), BorderLayout.CENTER);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JScrollPane getScrollPane() {
-        if (scrollPane == null) {
-            scrollPane = new JScrollPane();
-            scrollPane.setViewportView(getParametersTable());
-        }
-        return scrollPane;
-    }
-
-    private ZTable getParametersTable() {
-        if (parametersTable == null) {
-            parametersTableModel = new ParameterPropsTableModel(
-                parameterSet.getParameters().getTypedProperties());
-            parametersTable = new ZTable();
-            parametersTable.setModel(parametersTableModel);
-        }
-        return parametersTable;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/package.html b/src/main/java/gov/nasa/ziggy/ui/ops/parameters/package.html
deleted file mode 100644
index e86221a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/package.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-  <body>
-    <p>
-      The first sentence is used as the brief description of the
-      package and appears at the top of the package documentation.
-      Additional sentences will appear at the bottom in the
-      Description section.
-    </p>
-    <dl>
-      <dt>Author</dt>
-      <dd>Bill Wohler</dd>
-      <dd>PT</dd>
-    </dl>
-    
-    <h2>Headings</h2>
-
-    <p>
-      Additional headings should use h2.
-    </p>
-
-    <h3>Sub-headings</h3>
-    
-    <p>
-      Sub-headings should use h3 and so on.
-    </p>
-
-  </body>
-</html>
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/EditTriggerDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/EditTriggerDialog.java
deleted file mode 100644
index 2605496..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/EditTriggerDialog.java
+++ /dev/null
@@ -1,601 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSpinner;
-import javax.swing.JTextField;
-import javax.swing.SpinnerListModel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.metrics.report.ReportFilePaths;
-import gov.nasa.ziggy.module.SubtaskInformation;
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.PipelineTaskInformation;
-import gov.nasa.ziggy.pipeline.TriggerValidationResults;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.ops.instances.TextualReportDialog;
-import gov.nasa.ziggy.ui.ops.parameters.ParameterSetMapEditorDialog;
-import gov.nasa.ziggy.ui.ops.parameters.ParameterSetMapEditorPanel;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-import gov.nasa.ziggy.ui.proxy.PipelineOperationsProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class EditTriggerDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(EditTriggerDialog.class);
-
-    private JPanel modulesPanel;
-    private JButton syncButton;
-    private JButton validateButton;
-    private JSpinner prioritySpinner;
-    private JPanel prioriytPanel;
-    private JCheckBox validCheckBox;
-    private JLabel validLabel;
-    private JTextField pipelineDefNameTextField;
-    private JLabel pipelineLabel;
-    private JTextField triggerNameTextField;
-    private JLabel triggerNameLabel;
-    private JButton cancelButton;
-    private JButton saveButton;
-    private JPanel actionPanel;
-    private JButton editModulesButton;
-    private JPanel modulesButtonPanel;
-    private JList<String> modulesList;
-    private JScrollPane modulesScrollPane;
-    private ParameterSetMapEditorPanel parameterSetMapEditorPanel;
-    private JButton exportButton;
-    private JPanel labelsPanel;
-    private JPanel dataPanel;
-
-    private PipelineDefinition trigger;
-    private JButton reportButton;
-
-    private JButton infoButton;
-    private JButton remoteButton;
-
-    private TriggerModulesListModel triggerModulesListModel;
-    private TriggersTreeModel allTriggersModel;
-
-    public EditTriggerDialog(JFrame frame, PipelineDefinition trigger,
-        TriggersTreeModel triggerModel) {
-        super(frame, true);
-        this.trigger = trigger;
-        allTriggersModel = triggerModel;
-
-        initGUI();
-    }
-
-    /* For Jigloo use only */
-    public EditTriggerDialog(JFrame frame) {
-        super(frame, true);
-        initGUI();
-    }
-
-    /**
-     * Disabled for now since it doesn't work in all cases.
-     *
-     * @param evt
-     */
-    private void syncButtonActionPerformed(ActionEvent evt) {
-        log.debug("syncButton.actionPerformed, event=" + evt);
-
-        // verify
-        int ans = JOptionPane.showConfirmDialog(this,
-            "Are you sure you want to re-sync this trigger?  "
-                + "This will remove all parameter sets at the module level.",
-            "Are you sure?", JOptionPane.YES_NO_OPTION);
-
-        if (ans == JOptionPane.YES_OPTION) {
-            PipelineDefinitionCrudProxy pipelineCrud = new PipelineDefinitionCrudProxy();
-            pipelineCrud.update(trigger);
-
-            triggerModulesListModel.loadFromDatabase();
-        }
-    }
-
-    private void validateButtonActionPerformed(ActionEvent evt) {
-        log.debug("validateButton.actionPerformed, event=" + evt);
-
-        PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
-
-        TriggerValidationResults results = null;
-        try {
-            results = pipelineOps.validateTrigger(trigger);
-
-            if (results.hasErrors()) {
-                TriggerValidationResultsDialog.showValidationResults(this, results);
-            } else {
-                JOptionPane.showMessageDialog(this, "This trigger is valid", "Validation OK",
-                    JOptionPane.INFORMATION_MESSAGE);
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void reportButtonActionPerformed(ActionEvent evt) {
-        log.debug("reportButton.actionPerformed, event=" + evt);
-
-        PipelineOperationsProxy ops = new PipelineOperationsProxy();
-        String report = ops.generateTriggerReport(trigger);
-
-        TextualReportDialog.showReport(this, report,
-            ReportFilePaths.triggerReportPath(trigger.getName().getName()));
-    }
-
-    /**
-     * @param evt
-     */
-    private void exportButtonActionPerformed(ActionEvent evt) {
-        log.debug("exportButton.actionPerformed, event=" + evt);
-
-        try {
-            JFileChooser fc = new JFileChooser();
-            fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-
-            int returnVal = fc.showSaveDialog(this);
-
-            if (returnVal == JFileChooser.APPROVE_OPTION) {
-                File file = fc.getSelectedFile();
-
-                PipelineOperationsProxy ops = new PipelineOperationsProxy();
-                ops.exportPipelineParams(trigger, file);
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void initGUI() {
-        try {
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-
-            if (trigger != null) {
-                triggerNameTextField.setText(trigger.getName().getName());
-                pipelineDefNameTextField.setText(trigger.getName().toString());
-            }
-
-            setTitle("Edit Trigger");
-            this.setSize(572, 603);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void editModulesButtonActionPerformed(ActionEvent evt) {
-        log.debug("editModulesButton.actionPerformed, event=" + evt);
-
-        int selectedRow = modulesList.getSelectedIndex();
-
-        if (selectedRow == -1) {
-            MessageUtil.showError(this, "No parameter set selected");
-        } else {
-            final PipelineDefinitionNode triggerNode = triggerModulesListModel
-                .getTriggerNodeAt(selectedRow);
-
-            PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
-            Set<ClassWrapper<Parameters>> allRequiredParams = pipelineOps
-                .retrieveRequiredParameterClassesForNode(triggerNode);
-
-            Map<ClassWrapper<Parameters>, ParameterSetName> currentParams = triggerNode
-                .getModuleParameterSetNames();
-            Map<ClassWrapper<Parameters>, ParameterSetName> currentPipelineParams = trigger
-                .getPipelineParameterSetNames();
-
-            final ParameterSetMapEditorDialog dialog = new ParameterSetMapEditorDialog(this,
-                currentParams, allRequiredParams, currentPipelineParams);
-
-            dialog.setMapListener(
-                source -> triggerNode.setModuleParameterSetNames(dialog.getParameterSetsMap()));
-
-            dialog.setVisible(true); // block until user dismisses
-        }
-    }
-
-    private void saveButtonActionPerformed(ActionEvent evt) {
-        log.debug("saveButton.actionPerformed, event=" + evt);
-
-        PipelineDefinitionCrudProxy pipelineCrud = new PipelineDefinitionCrudProxy();
-
-        try {
-            String newName = triggerNameTextField.getText();
-
-            PipelineDefinition existingTrigger = allTriggersModel.triggerByName(newName);
-
-            if (existingTrigger != null && existingTrigger.getId() != trigger.getId()) {
-                // operator changed trigger name & it conflicts with an existing
-                // trigger
-                JOptionPane.showMessageDialog(this,
-                    "Trigger name already used, please enter a different name.",
-                    "Duplicate Trigger Name", JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-
-            String priorityString = (String) prioritySpinner.getValue();
-            int priority;
-
-            try {
-                priority = Integer.parseInt(priorityString);
-            } catch (NumberFormatException e) {
-                JOptionPane.showMessageDialog(this, e.getMessage(),
-                    "Error parsing priority: " + priorityString, JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-
-            trigger.rename(newName);
-            trigger.setInstancePriority(priority);
-
-            pipelineCrud.save(trigger);
-
-            setVisible(false);
-        } catch (Throwable e) {
-            JOptionPane.showMessageDialog(this, e.getMessage(), "Error Saving Trigger",
-                JOptionPane.ERROR_MESSAGE);
-        }
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-        setVisible(false);
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.columnWidths = new int[] { 7 };
-            dataPanelLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7 };
-            dataPanelLayout.columnWeights = new double[] { 0.1 };
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                0.1 };
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getLabelsPanel(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getPrioriytPanel(), new GridBagConstraints(0, 1, 4, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getParameterSetMapEditorPanel(),
-                new GridBagConstraints(0, 2, 1, 4, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getModulesPanel(), new GridBagConstraints(0, 6, 1, 4, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return dataPanel;
-    }
-
-    private JPanel getLabelsPanel() {
-        if (labelsPanel == null) {
-            labelsPanel = new JPanel();
-            GridBagLayout labelsPanelLayout = new GridBagLayout();
-            labelsPanel.setBorder(BorderFactory.createTitledBorder("Trigger"));
-            labelsPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1 };
-            labelsPanelLayout.rowHeights = new int[] { 7, 7, 7, 7 };
-            labelsPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1 };
-            labelsPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7 };
-            labelsPanel.setLayout(labelsPanelLayout);
-            labelsPanel.add(getTriggerNameLabel(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            labelsPanel.add(getTriggerNameTextField(),
-                new GridBagConstraints(1, 0, 4, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            labelsPanel.add(getPipelineLabel(),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            labelsPanel.add(getPipelineDefNameTextField(),
-                new GridBagConstraints(1, 1, 4, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            labelsPanel.add(getValidLabel(),
-                new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            labelsPanel.add(getValidCheckBox(), new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            labelsPanel.add(getValidateButton(), new GridBagConstraints(4, 3, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            labelsPanel.add(getReportButton(), new GridBagConstraints(3, 3, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            labelsPanel.add(getExportButton(), new GridBagConstraints(2, 3, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return labelsPanel;
-    }
-
-    private ParameterSetMapEditorPanel getParameterSetMapEditorPanel() {
-        if (parameterSetMapEditorPanel == null) {
-            parameterSetMapEditorPanel = new ParameterSetMapEditorPanel(
-                trigger.getPipelineParameterSetNames(), new HashSet<ClassWrapper<Parameters>>(),
-                new HashMap<ClassWrapper<Parameters>, ParameterSetName>());
-            parameterSetMapEditorPanel.setMapListener(source -> trigger
-                .setPipelineParameterSetNames(parameterSetMapEditorPanel.getParameterSetsMap()));
-            parameterSetMapEditorPanel
-                .setBorder(BorderFactory.createTitledBorder("Pipeline Parameter Sets"));
-        }
-        return parameterSetMapEditorPanel;
-    }
-
-    private JPanel getModulesPanel() {
-        if (modulesPanel == null) {
-            modulesPanel = new JPanel();
-            BorderLayout ModulesPanelLayout = new BorderLayout();
-            modulesPanel.setLayout(ModulesPanelLayout);
-            modulesPanel.setBorder(BorderFactory.createTitledBorder("Modules"));
-            modulesPanel.add(getModulesScrollPane(), BorderLayout.CENTER);
-            modulesPanel.add(getModulesButtonPanel(), BorderLayout.SOUTH);
-        }
-        return modulesPanel;
-    }
-
-    private JScrollPane getModulesScrollPane() {
-        if (modulesScrollPane == null) {
-            modulesScrollPane = new JScrollPane();
-            modulesScrollPane.setViewportView(getModulesList());
-        }
-        return modulesScrollPane;
-    }
-
-    private JList<String> getModulesList() {
-        if (modulesList == null) {
-            triggerModulesListModel = new TriggerModulesListModel(trigger);
-
-            modulesList = new JList<>();
-            modulesList.setModel(triggerModulesListModel);
-        }
-        return modulesList;
-    }
-
-    private JPanel getModulesButtonPanel() {
-        if (modulesButtonPanel == null) {
-            modulesButtonPanel = new JPanel();
-            FlowLayout modulesButtonPanelLayout = new FlowLayout();
-            modulesButtonPanel.setLayout(modulesButtonPanelLayout);
-            modulesButtonPanel.add(getInfoButton());
-            modulesButtonPanel.add(getEditModulesButton());
-            modulesButtonPanel.add(getSyncButton());
-            modulesButtonPanel.add(getRemoteButton());
-        }
-        return modulesButtonPanel;
-    }
-
-    private JButton getEditModulesButton() {
-        if (editModulesButton == null) {
-            editModulesButton = new JButton();
-            editModulesButton.setText("Edit Parameters");
-            editModulesButton.addActionListener(this::editModulesButtonActionPerformed);
-        }
-        return editModulesButton;
-    }
-
-    private JButton getInfoButton() {
-        if (infoButton == null) {
-            infoButton = new JButton();
-            infoButton.setText("Task Information");
-            infoButton.addActionListener(this::infoButtonActionPerformed);
-        }
-        return infoButton;
-    }
-
-    private void infoButtonActionPerformed(ActionEvent evt) {
-        log.debug("infoButton.actionPerformed, event =" + evt);
-        int selectedRow = modulesList.getSelectedIndex();
-
-        if (selectedRow == -1) {
-            MessageUtil.showError(this, "No module selected");
-        } else {
-            final PipelineDefinitionNode triggerNode = triggerModulesListModel
-                .getTriggerNodeAt(selectedRow);
-            TaskInformationDialog infoTable = new TaskInformationDialog(this, triggerNode);
-            infoTable.setVisible(true);
-        }
-    }
-
-    private JButton getRemoteButton() {
-        if (remoteButton == null) {
-            remoteButton = new JButton("Remote Execution");
-            remoteButton.addActionListener(this::remoteButtonActionPerformed);
-        }
-        return remoteButton;
-    }
-
-    private void remoteButtonActionPerformed(ActionEvent evt) {
-        log.debug("infoButton.actionPerformed, event =" + evt);
-        int selectedRow = modulesList.getSelectedIndex();
-
-        if (selectedRow == -1) {
-            MessageUtil.showError(this, "No module selected");
-        } else {
-            final PipelineDefinitionNode triggerNode = triggerModulesListModel
-                .getTriggerNodeAt(selectedRow);
-            ParameterSetName remoteParameters = PipelineTaskInformation
-                .remoteParameters(triggerNode);
-            if (remoteParameters == null) {
-                JOptionPane.showMessageDialog(this,
-                    "Selected node has no RemoteParameters instance");
-                return;
-            }
-            List<SubtaskInformation> subtaskInfo = PipelineTaskInformation
-                .subtaskInformation(triggerNode);
-            int subtasks = 0;
-            int maxParallelSubtasks = 0;
-            for (SubtaskInformation info : subtaskInfo) {
-                subtasks += info.getSubtaskCount();
-                maxParallelSubtasks += info.getMaxParallelSubtasks();
-            }
-            new RemoteExecutionDialog(this,
-                triggerNode.getPipelineName() + ":" + triggerNode.getModuleName().getName(),
-                remoteParameters, triggerNode, subtasks, maxParallelSubtasks);
-        }
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(35);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getCloseButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (saveButton == null) {
-            saveButton = new JButton();
-            saveButton.setText("Save");
-            saveButton.addActionListener(this::saveButtonActionPerformed);
-        }
-        return saveButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JLabel getTriggerNameLabel() {
-        if (triggerNameLabel == null) {
-            triggerNameLabel = new JLabel();
-            triggerNameLabel.setText("Name ");
-        }
-        return triggerNameLabel;
-    }
-
-    private JTextField getTriggerNameTextField() {
-        if (triggerNameTextField == null) {
-            triggerNameTextField = new JTextField();
-        }
-        return triggerNameTextField;
-    }
-
-    private JLabel getPipelineLabel() {
-        if (pipelineLabel == null) {
-            pipelineLabel = new JLabel();
-            pipelineLabel.setText("Pipeline ");
-        }
-        return pipelineLabel;
-    }
-
-    private JTextField getPipelineDefNameTextField() {
-        if (pipelineDefNameTextField == null) {
-            pipelineDefNameTextField = new JTextField();
-            pipelineDefNameTextField.setEditable(false);
-        }
-        return pipelineDefNameTextField;
-    }
-
-    private JLabel getValidLabel() {
-        if (validLabel == null) {
-            validLabel = new JLabel();
-            validLabel.setText("Valid? ");
-        }
-        return validLabel;
-    }
-
-    private JCheckBox getValidCheckBox() {
-        if (validCheckBox == null) {
-            validCheckBox = new JCheckBox();
-            validCheckBox.setEnabled(false);
-        }
-        return validCheckBox;
-    }
-
-    private JPanel getPrioriytPanel() {
-        if (prioriytPanel == null) {
-            prioriytPanel = new JPanel();
-            GridBagLayout prioriytPanelLayout = new GridBagLayout();
-            prioriytPanelLayout.rowWeights = new double[] { 0.1 };
-            prioriytPanelLayout.rowHeights = new int[] { 7 };
-            prioriytPanelLayout.columnWeights = new double[] { 0.1 };
-            prioriytPanelLayout.columnWidths = new int[] { 7 };
-            prioriytPanel.setLayout(prioriytPanelLayout);
-            prioriytPanel.setBorder(
-                BorderFactory.createTitledBorder("Priority (smaller numbers = higher priority)"));
-            prioriytPanel.add(getPrioritySpinner(), new GridBagConstraints(0, -1, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return prioriytPanel;
-    }
-
-    private JSpinner getPrioritySpinner() {
-        if (prioritySpinner == null) {
-            SpinnerListModel prioritySpinnerModel = new SpinnerListModel(
-                new String[] { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" });
-            prioritySpinner = new JSpinner();
-            prioritySpinner.setModel(prioritySpinnerModel);
-            prioritySpinner.setPreferredSize(new java.awt.Dimension(50, 22));
-            prioritySpinnerModel.setValue(trigger.getInstancePriority() + "");
-        }
-        return prioritySpinner;
-    }
-
-    private JButton getValidateButton() {
-        if (validateButton == null) {
-            validateButton = new JButton();
-            validateButton.setText("validate");
-            validateButton.addActionListener(this::validateButtonActionPerformed);
-        }
-        return validateButton;
-    }
-
-    private JButton getSyncButton() {
-        if (syncButton == null) {
-            syncButton = new JButton();
-            syncButton.setText("Re-sync");
-            syncButton.setToolTipText(
-                "Re-sync module list with latest version of the pipeline definition");
-            syncButton.addActionListener(this::syncButtonActionPerformed);
-        }
-        return syncButton;
-    }
-
-    private JButton getReportButton() {
-        if (reportButton == null) {
-            reportButton = new JButton();
-            reportButton.setText("report");
-            reportButton.addActionListener(this::reportButtonActionPerformed);
-        }
-        return reportButton;
-    }
-
-    private JButton getExportButton() {
-        if (exportButton == null) {
-            exportButton = new JButton();
-            exportButton.setText("export params");
-            exportButton.addActionListener(this::exportButtonActionPerformed);
-        }
-        return exportButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/FireTriggerDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/FireTriggerDialog.java
deleted file mode 100644
index a031025..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/FireTriggerDialog.java
+++ /dev/null
@@ -1,557 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.awt.BorderLayout;
-import java.awt.Cursor;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
-import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
-import gov.nasa.ziggy.ui.common.IntTextField;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.proxy.PipelineOperationsProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class FireTriggerDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(FireTriggerDialog.class);
-
-    private JPanel dataPanel;
-    private JPanel namePanel;
-    private JCheckBox overrideEndCheckBox;
-    private JComboBox<String> endNodeComboBox;
-    private JCheckBox overrideStartCheckBox;
-    private JComboBox<String> startNodeComboBox;
-    private JLabel endNodeLabel;
-    private JLabel startNodeLabel;
-    private JPanel startEndPanel;
-    private JTextField instanceNameTextField;
-    private JButton cancelButton;
-    private JButton fireButton;
-    private JPanel actionPanel;
-
-    private JPanel repetitionPanel;
-    private JComboBox<String> delayUnitsComboBox;
-    private JLabel delayUnitsLabel;
-    private JTextField delayTextField;
-    private JLabel delayTextLabel;
-    private JTextField repetitionsTextField;
-    private JLabel repetitionsTextLabel;
-    private JCheckBox unlimitedRepsCheckBox;
-
-    private TriggerModulesListModel startNodeComboBoxModel;
-    private TriggerModulesListModel endNodeComboBoxModel;
-
-    private PipelineDefinition trigger;
-
-    private enum DelayUnits {
-        minutes, hours, days;
-    }
-
-    /** for Jigloo use only **/
-    public FireTriggerDialog(JFrame frame) {
-        super(frame, true);
-
-        initGUI();
-    }
-
-    public FireTriggerDialog(JFrame frame, PipelineDefinition trigger) {
-        super(frame, true);
-        this.trigger = trigger;
-
-        initGUI();
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Launch Pipeline");
-                getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-                getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            }
-            setSize(350, 400);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void fireButtonActionPerformed(ActionEvent evt) {
-        log.debug("fireButton.actionPerformed, event=" + evt);
-
-        try {
-            setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-
-            PipelineDefinitionNode startNode = null;
-            PipelineDefinitionNode endNode = null;
-
-            if (overrideStartCheckBox.isSelected()) {
-                startNode = startNodeComboBoxModel.getSelectedPipelineNode();
-            }
-
-            if (overrideEndCheckBox.isSelected()) {
-                endNode = endNodeComboBoxModel.getSelectedPipelineNode();
-            }
-
-            RepetitionsAndDelay repsAndDelay = getRepetitionAndDelay();
-            int repetitions = repsAndDelay.getRepetitions();
-            int delayMinutes = repsAndDelay.getDelayMinutes();
-            if (repetitions == 1) {
-                log.info("Trigger fired with 1 repetition");
-            } else if (repetitions < 0) {
-                log.info("Trigger fired with unlimited repetitions at " + delayMinutes
-                    + " minutes interval");
-            } else {
-                log.info("Trigger fired with " + repetitions + " repetitions at " + delayMinutes
-                    + " minutes interval");
-            }
-
-            if (startNode == null) {
-                log.info("Trigger start at pipeline start nodes");
-            } else {
-                log.info("Trigger start at node: " + startNode.getModuleName().getName());
-            }
-
-            if (endNode == null) {
-                log.info("Trigger end at pipeline end nodes");
-            } else {
-                log.info("Trigger end at node: " + endNode.getModuleName().getName());
-            }
-
-            PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
-            pipelineOps.sendTriggerMessage(new WorkerFireTriggerRequest(trigger.getName().getName(),
-                instanceNameTextField.getText(), startNode, endNode, repetitions,
-                delayMinutes * 60));
-
-            setCursor(null);
-        } catch (Exception e) {
-            log.error("fireButtonActionPerformed(ActionEvent)", e);
-
-            MessageUtil.showError(this, e);
-        }
-
-        setVisible(false);
-    }
-
-    private void overrideStartCheckBoxActionPerformed(ActionEvent evt) {
-        log.debug("overrideStartCheckBox.actionPerformed, event=" + evt);
-
-        startNodeLabel.setEnabled(overrideStartCheckBox.isSelected());
-        startNodeComboBox.setEnabled(overrideStartCheckBox.isSelected());
-    }
-
-    private void overrideEndCheckBoxActionPerformed(ActionEvent evt) {
-        log.debug("overrideEndCheckBox.actionPerformed, event=" + evt);
-
-        endNodeLabel.setEnabled(overrideEndCheckBox.isSelected());
-        endNodeComboBox.setEnabled(overrideEndCheckBox.isSelected());
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7 };
-            dataPanelLayout.rowHeights = new int[] { 7, 7, 7, 7, 7 };
-            dataPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1 };
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getNamePanel(), new GridBagConstraints(0, 0, 6, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getRepetitionPanel(), new GridBagConstraints(0, 1, 6, 2, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getStartEndPanel(), new GridBagConstraints(0, 3, 6, 2, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return dataPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(35);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getFireButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getFireButton() {
-        if (fireButton == null) {
-            fireButton = new JButton();
-            fireButton.setText("Fire!");
-            fireButton.setFont(new java.awt.Font("Dialog", 1, 16));
-            fireButton.setForeground(new java.awt.Color(255, 0, 0));
-            fireButton.addActionListener(this::fireButtonActionPerformed);
-        }
-        return fireButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JPanel getNamePanel() {
-        if (namePanel == null) {
-            namePanel = new JPanel();
-            GridBagLayout namePanelLayout = new GridBagLayout();
-            namePanelLayout.columnWidths = new int[] { 7 };
-            namePanelLayout.rowHeights = new int[] { 7 };
-            namePanelLayout.columnWeights = new double[] { 0.1 };
-            namePanelLayout.rowWeights = new double[] { 0.1 };
-            namePanel.setLayout(namePanelLayout);
-            namePanel.setBorder(BorderFactory.createTitledBorder("Pipeline Instance Name"));
-            namePanel.add(getInstanceNameTextField(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return namePanel;
-    }
-
-    private JPanel getRepetitionPanel() {
-        if (repetitionPanel == null) {
-            repetitionPanel = new JPanel();
-            GridBagLayout repetitionPanelLayout = new GridBagLayout();
-            repetitionPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7 };
-            repetitionPanelLayout.rowHeights = new int[] { 5, 5 };
-            repetitionPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1 };
-            repetitionPanelLayout.rowWeights = new double[] { 0.1, 0.1 };
-            repetitionPanel.setLayout(repetitionPanelLayout);
-            repetitionPanel
-                .setBorder(BorderFactory.createTitledBorder("Pipeline Instance Repetitions"));
-
-            repetitionPanel.add(getUnlimitedRepsCheckBox(),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-
-            repetitionPanel.add(getRepetitionsTextLabel(),
-                new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.SOUTH,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            repetitionPanel.add(getRepetitionsTextField(),
-                new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-
-            repetitionPanel.add(getDelayTextLabel(), new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.SOUTH, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            repetitionPanel.add(getDelayTextField(),
-                new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-
-            repetitionPanel.add(getDelayUnitsLabel(), new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.SOUTH, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            repetitionPanel.add(getDelayUnitsComboBox(),
-                new GridBagConstraints(4, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return repetitionPanel;
-    }
-
-    private JCheckBox getUnlimitedRepsCheckBox() {
-        if (unlimitedRepsCheckBox == null) {
-            unlimitedRepsCheckBox = new JCheckBox();
-            unlimitedRepsCheckBox.setText("Unlimited");
-            unlimitedRepsCheckBox.addActionListener(this::unlimitedRepsCheckBoxActionPerformed);
-        }
-        return unlimitedRepsCheckBox;
-    }
-
-    private void unlimitedRepsCheckBoxActionPerformed(ActionEvent evt) {
-
-        if (unlimitedRepsCheckBox.isSelected()) {
-            repetitionsTextLabel.setEnabled(false);
-            repetitionsTextField.setEnabled(false);
-            repetitionsTextField.setText("");
-        } else {
-            repetitionsTextLabel.setEnabled(true);
-            repetitionsTextField.setEnabled(true);
-            repetitionsTextField.setText("1");
-            delayTextField.setText("");
-        }
-
-    }
-
-    private JTextField getRepetitionsTextField() {
-        if (repetitionsTextField == null) {
-            repetitionsTextField = new IntTextField("1");
-        }
-        return repetitionsTextField;
-    }
-
-    private JLabel getRepetitionsTextLabel() {
-        if (repetitionsTextLabel == null) {
-            repetitionsTextLabel = new JLabel();
-            repetitionsTextLabel.setText("Repetitions");
-        }
-        return repetitionsTextLabel;
-    }
-
-    private JTextField getDelayTextField() {
-        if (delayTextField == null) {
-            delayTextField = new IntTextField();
-        }
-        return delayTextField;
-    }
-
-    private JLabel getDelayTextLabel() {
-        if (delayTextLabel == null) {
-            delayTextLabel = new JLabel();
-            delayTextLabel.setText("Delay");
-        }
-        return delayTextLabel;
-    }
-
-    private JComboBox<String> getDelayUnitsComboBox() {
-        if (delayUnitsComboBox == null) {
-            String[] delayUnitsStrings = new String[DelayUnits.values().length];
-            for (int i = 0; i < delayUnitsStrings.length; i++) {
-                delayUnitsStrings[i] = DelayUnits.values()[i].toString();
-            }
-            delayUnitsComboBox = new JComboBox<>(delayUnitsStrings);
-            delayUnitsComboBox.setSelectedIndex(0);
-        }
-        return delayUnitsComboBox;
-    }
-
-    private JLabel getDelayUnitsLabel() {
-        if (delayUnitsLabel == null) {
-            delayUnitsLabel = new JLabel();
-            delayUnitsLabel.setText("Units");
-        }
-        return delayUnitsLabel;
-    }
-
-    private RepetitionsAndDelay getRepetitionAndDelay() {
-
-        int repetitions;
-        int delayMinutes;
-
-        if (getUnlimitedRepsCheckBox().isSelected()) {
-            repetitions = -1;
-        } else {
-            String repsText = getRepetitionsTextField().getText();
-            if (repsText.isEmpty()) {
-                throw new IllegalStateException("Number of repetitions is empty");
-            }
-            repetitions = Integer.parseInt(repsText);
-            if (repetitions == 0) {
-                throw new IllegalStateException("Number of repetitions is zero");
-            }
-        }
-
-        if (repetitions != 1) {
-            String delayText = getDelayTextField().getText();
-            if (delayText.isEmpty()) {
-                throw new IllegalStateException("Repetitions delay is empty");
-            }
-            int delay = Integer.parseInt(delayText);
-            if (delay == 0) {
-                throw new IllegalStateException("Delay is set to zero");
-            }
-            String delayUnitsString = (String) getDelayUnitsComboBox().getSelectedItem();
-            DelayUnits delayUnit = DelayUnits.valueOf(delayUnitsString);
-            switch (delayUnit) {
-                case minutes:
-                    delayMinutes = delay;
-                    break;
-                case hours:
-                    delayMinutes = 60 * delay;
-                    break;
-                case days:
-                    delayMinutes = 60 * 24 * delay;
-                    break;
-                default:
-                    throw new IllegalStateException(
-                        "Delay unit " + delayUnitsString + " not supported");
-            }
-        } else {
-            delayMinutes = 0;
-        }
-
-        return new RepetitionsAndDelay(repetitions, delayMinutes);
-    }
-
-    private JTextField getInstanceNameTextField() {
-        if (instanceNameTextField == null) {
-            instanceNameTextField = new JTextField();
-        }
-        return instanceNameTextField;
-    }
-
-    private JPanel getStartEndPanel() {
-        if (startEndPanel == null) {
-            startEndPanel = new JPanel();
-            GridBagLayout startEndPanelLayout = new GridBagLayout();
-            startEndPanelLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7 };
-            startEndPanelLayout.rowHeights = new int[] { 7, 7, 7 };
-            startEndPanelLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            startEndPanelLayout.rowWeights = new double[] { 0.1, 0.1, 0.1 };
-            startEndPanel.setLayout(startEndPanelLayout);
-            startEndPanel.setBorder(BorderFactory.createTitledBorder("Start & End Node Override"));
-            startEndPanel.add(getOverrideStartCheckBox(),
-                new GridBagConstraints(0, 0, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            startEndPanel.add(getStartNodeLabel(),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            startEndPanel.add(getEndNodeLabel(),
-                new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            startEndPanel.add(getStartNodeComboBox(),
-                new GridBagConstraints(1, 1, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            startEndPanel.add(getEndNodeComboBox(),
-                new GridBagConstraints(1, 3, 5, 1, 1.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-            startEndPanel.add(getOverrideEndCheckBox(),
-                new GridBagConstraints(0, 2, 6, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return startEndPanel;
-    }
-
-    private JCheckBox getOverrideStartCheckBox() {
-        if (overrideStartCheckBox == null) {
-            overrideStartCheckBox = new JCheckBox();
-            overrideStartCheckBox.setText("Override Start");
-            overrideStartCheckBox.addActionListener(this::overrideStartCheckBoxActionPerformed);
-        }
-        return overrideStartCheckBox;
-    }
-
-    private JLabel getStartNodeLabel() {
-        if (startNodeLabel == null) {
-            startNodeLabel = new JLabel();
-            startNodeLabel.setText("Start Node:");
-            startNodeLabel.setEnabled(false);
-        }
-        return startNodeLabel;
-    }
-
-    private JLabel getEndNodeLabel() {
-        if (endNodeLabel == null) {
-            endNodeLabel = new JLabel();
-            endNodeLabel.setText("End Node:");
-            endNodeLabel.setEnabled(false);
-        }
-        return endNodeLabel;
-    }
-
-    private JComboBox<String> getStartNodeComboBox() {
-        if (startNodeComboBox == null) {
-            startNodeComboBoxModel = new TriggerModulesListModel(trigger);
-            startNodeComboBox = new JComboBox<>();
-            startNodeComboBox.setModel(startNodeComboBoxModel);
-            startNodeComboBox.setEnabled(false);
-        }
-        return startNodeComboBox;
-    }
-
-    private JComboBox<String> getEndNodeComboBox() {
-        if (endNodeComboBox == null) {
-            endNodeComboBoxModel = new TriggerModulesListModel(trigger);
-            endNodeComboBox = new JComboBox<>();
-            endNodeComboBox.setModel(endNodeComboBoxModel);
-            endNodeComboBox.setEnabled(false);
-        }
-        return endNodeComboBox;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JFrame frame = new JFrame();
-            PipelineDefinition dummyPipeline = new PipelineDefinition("dummy");
-            PipelineModuleDefinition dummyModule = new PipelineModuleDefinition("dmy");
-            PipelineDefinitionNode dummyNode = new PipelineDefinitionNode(dummyModule.getName(),
-                dummyPipeline.getName().getName());
-            List<PipelineDefinitionNode> rootNode = new ArrayList<>();
-            rootNode.add(dummyNode);
-            dummyPipeline.setRootNodes(rootNode);
-            FireTriggerDialog inst = new FireTriggerDialog(frame, dummyPipeline);
-            inst.setVisible(true);
-        });
-    }
-
-    private JCheckBox getOverrideEndCheckBox() {
-        if (overrideEndCheckBox == null) {
-            overrideEndCheckBox = new JCheckBox();
-            overrideEndCheckBox.setText("Override Stop");
-            overrideEndCheckBox.addActionListener(this::overrideEndCheckBoxActionPerformed);
-        }
-        return overrideEndCheckBox;
-    }
-
-    private static class RepetitionsAndDelay {
-
-        private final int repetitions;
-        private final int delayMinutes;
-
-        public RepetitionsAndDelay(int repetitions, int delayMinutes) {
-            this.repetitions = repetitions;
-            this.delayMinutes = delayMinutes;
-        }
-
-        public int getRepetitions() {
-            return repetitions;
-        }
-
-        public int getDelayMinutes() {
-            return delayMinutes;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(delayMinutes, repetitions);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if ((obj == null) || (getClass() != obj.getClass())) {
-                return false;
-            }
-            RepetitionsAndDelay other = (RepetitionsAndDelay) obj;
-            return delayMinutes == other.delayMinutes && repetitions == other.repetitions;
-        }
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/NewTriggerDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/NewTriggerDialog.java
deleted file mode 100644
index 2a85ed4..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/NewTriggerDialog.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.ui.config.pipeline.PipelineDefinitionListModel;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class NewTriggerDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(NewTriggerDialog.class);
-
-    private JPanel dataPanel;
-    private JButton createButton;
-    private JPanel namePanel;
-    private JComboBox<PipelineDefinition> pipelineComboBox;
-    private JTextField nameTextField;
-    private JPanel pipelinePanel;
-    private JButton cancelButton;
-    private JPanel actionPanel;
-
-    private boolean cancelled = false;
-
-    PipelineDefinition pipelineDefinition;
-    private PipelineDefinitionListModel pipelineComboBoxModel;
-
-    public NewTriggerDialog(JFrame frame) {
-        super(frame, true);
-        initGUI();
-    }
-
-    public String getTriggerName() {
-        return nameTextField.getText();
-    }
-
-    public PipelineDefinition getPipelineDefinition() {
-        return (PipelineDefinition) pipelineComboBox.getSelectedItem();
-    }
-
-    private void initGUI() {
-        try {
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            getContentPane().add(getActionPanel(), BorderLayout.SOUTH);
-            setSize(300, 200);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void createButtonActionPerformed(ActionEvent evt) {
-        log.debug("createButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButton.actionPerformed, event=" + evt);
-
-        cancelled = true;
-
-        setVisible(false);
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            GridBagLayout dataPanelLayout = new GridBagLayout();
-            dataPanelLayout.columnWidths = new int[] { 7 };
-            dataPanelLayout.rowHeights = new int[] { 7, 7 };
-            dataPanelLayout.columnWeights = new double[] { 0.1 };
-            dataPanelLayout.rowWeights = new double[] { 0.1, 0.1 };
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getNamePanel(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-            dataPanel.add(getPipelinePanel(), new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return dataPanel;
-    }
-
-    private JPanel getActionPanel() {
-        if (actionPanel == null) {
-            actionPanel = new JPanel();
-            FlowLayout actionPanelLayout = new FlowLayout();
-            actionPanelLayout.setHgap(35);
-            actionPanel.setLayout(actionPanelLayout);
-            actionPanel.add(getCreateButton());
-            actionPanel.add(getCancelButton());
-        }
-        return actionPanel;
-    }
-
-    private JButton getCreateButton() {
-        if (createButton == null) {
-            createButton = new JButton();
-            createButton.setText("create");
-            createButton.addActionListener(this::createButtonActionPerformed);
-        }
-        return createButton;
-    }
-
-    private JButton getCancelButton() {
-        if (cancelButton == null) {
-            cancelButton = new JButton();
-            cancelButton.setText("cancel");
-            cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        }
-        return cancelButton;
-    }
-
-    private JPanel getNamePanel() {
-        if (namePanel == null) {
-            namePanel = new JPanel();
-            GridBagLayout namePanelLayout = new GridBagLayout();
-            namePanelLayout.columnWidths = new int[] { 7 };
-            namePanelLayout.rowHeights = new int[] { 7 };
-            namePanelLayout.columnWeights = new double[] { 0.1 };
-            namePanelLayout.rowWeights = new double[] { 0.1 };
-            namePanel.setLayout(namePanelLayout);
-            namePanel.setBorder(BorderFactory.createTitledBorder("Trigger Name"));
-            namePanel.add(getNameTextField(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return namePanel;
-    }
-
-    private JPanel getPipelinePanel() {
-        if (pipelinePanel == null) {
-            pipelinePanel = new JPanel();
-            GridBagLayout pipelinePanelLayout = new GridBagLayout();
-            pipelinePanelLayout.columnWidths = new int[] { 7 };
-            pipelinePanelLayout.rowHeights = new int[] { 7 };
-            pipelinePanelLayout.columnWeights = new double[] { 0.1 };
-            pipelinePanelLayout.rowWeights = new double[] { 0.1 };
-            pipelinePanel.setLayout(pipelinePanelLayout);
-            pipelinePanel.setBorder(BorderFactory.createTitledBorder("Pipeline Definition"));
-            pipelinePanel.add(getPipelineComboBox(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return pipelinePanel;
-    }
-
-    private JTextField getNameTextField() {
-        if (nameTextField == null) {
-            nameTextField = new JTextField();
-        }
-        return nameTextField;
-    }
-
-    private JComboBox<PipelineDefinition> getPipelineComboBox() {
-        if (pipelineComboBox == null) {
-            pipelineComboBoxModel = new PipelineDefinitionListModel();
-            pipelineComboBox = new JComboBox<>();
-            pipelineComboBox.setModel(pipelineComboBoxModel);
-        }
-        return pipelineComboBox;
-    }
-
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(() -> {
-            JFrame frame = new JFrame();
-            NewTriggerDialog inst = new NewTriggerDialog(frame);
-            inst.setVisible(true);
-        });
-    }
-
-    /**
-     * @return the cancelled
-     */
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    /**
-     * @param cancelled the cancelled to set
-     */
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/OpsTriggersPanel.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/OpsTriggersPanel.java
deleted file mode 100644
index c3ffba0..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/OpsTriggersPanel.java
+++ /dev/null
@@ -1,603 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.WindowConstants;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreePath;
-
-import org.netbeans.swing.outline.DefaultOutlineModel;
-import org.netbeans.swing.outline.Outline;
-import org.netbeans.swing.outline.OutlineModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.pipeline.definition.Group;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.common.ZTable;
-import gov.nasa.ziggy.ui.proxy.CrudProxy;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-
-@SuppressWarnings("serial")
-public class OpsTriggersPanel extends javax.swing.JPanel {
-    private static final Logger log = LoggerFactory.getLogger(OpsTriggersPanel.class);
-
-    private JScrollPane tableScrollPane;
-    private JPopupMenu triggerTablePopupMenu;
-    private JMenuItem editMenuItem;
-    private JButton refreshButton;
-    private JMenuItem deleteMenuItem;
-    private JMenuItem cloneMenuItem;
-    private JButton fireButton;
-    private JButton newButton;
-    private JPanel buttonPanel;
-
-    private OutlineModel triggersOutlineModel;
-    private TriggersTreeModel triggersTreeModel;
-
-    private int selectedModelRow;
-
-    private Outline triggersOutline;
-
-    private JMenuItem groupAssignMenuItem;
-
-    private JButton collapseAllButton;
-    private JButton expandAllButton;
-
-    public OpsTriggersPanel() {
-        initGUI();
-    }
-
-    private void expandAllButtonActionPerformed(ActionEvent evt) {
-        log.debug("expandAllButton.actionPerformed, event=" + evt);
-
-        DefaultMutableTreeNode rootNode = triggersTreeModel.getRootNode();
-        int numKids = rootNode.getChildCount();
-        for (int kidIndex = 0; kidIndex < numKids; kidIndex++) {
-            DefaultMutableTreeNode kid = (DefaultMutableTreeNode) rootNode.getChildAt(kidIndex);
-            triggersOutline.expandPath(new TreePath(kid.getPath()));
-        }
-    }
-
-    private void collapseAllButtonActionPerformed(ActionEvent evt) {
-        log.debug("collapseAllButton.actionPerformed, event=" + evt);
-
-        DefaultMutableTreeNode rootNode = triggersTreeModel.getRootNode();
-        int numKids = rootNode.getChildCount();
-        for (int kidIndex = 0; kidIndex < numKids; kidIndex++) {
-            DefaultMutableTreeNode kid = (DefaultMutableTreeNode) rootNode.getChildAt(kidIndex);
-            triggersOutline.collapsePath(new TreePath(kid.getPath()));
-        }
-    }
-
-    private void newButtonActionPerformed(ActionEvent evt) {
-        log.debug("newButtonActionPerformed(ActionEvent) - start");
-
-        log.debug("newButton.actionPerformed, event=" + evt);
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        NewTriggerDialog newTriggerDialog = ZiggyGuiConsole.newNewTriggerDialog();
-        newTriggerDialog.setVisible(true);
-
-        if (!newTriggerDialog.isCancelled()) {
-            PipelineDefinition pipelineDefinition = newTriggerDialog.getPipelineDefinition();
-
-            EditTriggerDialog editDialog = ZiggyGuiConsole.newEditTriggerDialog(pipelineDefinition,
-                triggersTreeModel);
-            editDialog.setVisible(true);
-
-            try {
-                triggersTreeModel.loadFromDatabase();
-            } catch (PipelineException e) {
-                log.error("newButtonActionPerformed(ActionEvent)", e);
-
-                MessageUtil.showError(this, e);
-            }
-        }
-
-        log.debug("newButtonActionPerformed(ActionEvent) - end");
-    }
-
-    private void fireButtonActionPerformed() {
-        log.debug("fireButtonActionPerformed(ActionEvent) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        int selectedRow = triggersOutline.getSelectedRow();
-        int modelIndex = triggersOutline.convertRowIndexToModel(selectedRow);
-        PipelineDefinition trigger = null;
-        if (selectedRow != -1) {
-            DefaultMutableTreeNode node = (DefaultMutableTreeNode) triggersOutlineModel
-                .getValueAt(modelIndex, 0);
-            Object userObject = node.getUserObject();
-            if (userObject instanceof PipelineDefinition) {
-                trigger = (PipelineDefinition) userObject;
-            }
-        }
-
-        if (trigger != null) {
-            FireTriggerDialog fireTriggerDialog = ZiggyGuiConsole.newFireTriggerDialog(trigger);
-            fireTriggerDialog.setVisible(true); // modal, blocks until user
-            // dismisses
-        }
-
-        log.debug("fireButtonActionPerformed(ActionEvent) - end");
-    }
-
-    private void triggerTableMouseClicked(MouseEvent evt) {
-        log.debug("triggerTableMouseClicked(MouseEvent) - start");
-
-        log.debug("triggerTable.mouseClicked, event=" + evt);
-
-        if (evt.getClickCount() == 2) {
-            log.debug("[DOUBLE-CLICK] table.mouseClicked, event=" + evt);
-            selectedModelRow = triggersOutline
-                .convertRowIndexToModel(triggersOutline.rowAtPoint(evt.getPoint()));
-
-            log.debug("table row =" + selectedModelRow);
-
-            doEdit();
-        }
-
-        log.debug("triggerTableMouseClicked(MouseEvent) - end");
-    }
-
-    private void doEdit() {
-        log.debug("doEdit(int) - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        int selectedRow = triggersOutline.getSelectedRow();
-        int modelIndex = triggersOutline.convertRowIndexToModel(selectedRow);
-        if (selectedRow != -1) {
-            DefaultMutableTreeNode node = (DefaultMutableTreeNode) triggersOutlineModel
-                .getValueAt(modelIndex, 0);
-            Object userObject = node.getUserObject();
-            if (userObject instanceof PipelineDefinition) {
-                PipelineDefinition trigger = (PipelineDefinition) userObject;
-                EditTriggerDialog editDialog = ZiggyGuiConsole.newEditTriggerDialog(trigger,
-                    triggersTreeModel);
-                editDialog.setVisible(true);
-
-                try {
-                    triggersTreeModel.loadFromDatabase();
-                } catch (Exception e) {
-                    log.error("showEditDialog(User)", e);
-
-                    MessageUtil.showError(this, e);
-                }
-            }
-        }
-
-        log.debug("doEdit(int) - end");
-    }
-
-    private void editMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("editMenuItem.actionPerformed, event=" + evt);
-
-        doEdit();
-    }
-
-    private void cloneMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("cloneMenuItem.actionPerformed, event=" + evt);
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        int selectedRow = triggersOutline.getSelectedRow();
-        int modelIndex = triggersOutline.convertRowIndexToModel(selectedRow);
-        if (selectedRow != -1) {
-            DefaultMutableTreeNode node = (DefaultMutableTreeNode) triggersOutlineModel
-                .getValueAt(modelIndex, 0);
-            Object userObject = node.getUserObject();
-            if (userObject instanceof PipelineDefinition) {
-                PipelineDefinition trigger = (PipelineDefinition) node.getUserObject();
-                PipelineDefinition clonedTrigger = new PipelineDefinition(trigger);
-
-                EditTriggerDialog editDialog = ZiggyGuiConsole.newEditTriggerDialog(clonedTrigger,
-                    triggersTreeModel);
-                editDialog.setVisible(true);
-
-                try {
-                    triggersTreeModel.loadFromDatabase();
-                } catch (Exception e) {
-                    log.error("showEditDialog(User)", e);
-
-                    MessageUtil.showError(this, e);
-                }
-            }
-        }
-    }
-
-    private void deleteMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("deleteMenuItem.actionPerformed, event=" + evt);
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        int selectedRow = triggersOutline.getSelectedRow();
-        int modelIndex = triggersOutline.convertRowIndexToModel(selectedRow);
-        PipelineDefinition trigger = null;
-        if (selectedRow != -1) {
-            DefaultMutableTreeNode node = (DefaultMutableTreeNode) triggersOutlineModel
-                .getValueAt(modelIndex, 0);
-            Object userObject = node.getUserObject();
-
-            if (userObject instanceof PipelineDefinition) {
-                trigger = (PipelineDefinition) userObject;
-            }
-        }
-
-        if (trigger != null) {
-            int choice = JOptionPane.showConfirmDialog(this,
-                "Are you sure you want to delete trigger: = " + trigger.getName() + "?");
-
-            if (choice == JOptionPane.YES_OPTION) {
-                try {
-                    PipelineDefinitionCrudProxy pipelineCrud = new PipelineDefinitionCrudProxy();
-                    pipelineCrud.delete(trigger);
-                    triggersTreeModel.loadFromDatabase();
-                } catch (Exception e) {
-                    MessageUtil.showError(this, e);
-                }
-            }
-        }
-    }
-
-    private void refreshButtonActionPerformed(ActionEvent evt) {
-        log.debug("refreshButton.actionPerformed, event=" + evt);
-        try {
-            triggersTreeModel.loadFromDatabase();
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void groupAssignMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("groupAssignMenuItem.actionPerformed, event=" + evt);
-
-        doGroup();
-    }
-
-    private List<PipelineDefinition> getSelectedTriggers() {
-        List<PipelineDefinition> selectedTriggers = new LinkedList<>();
-
-        int[] selectedRows = triggersOutline.getSelectedRows();
-
-        for (int selectedRow : selectedRows) {
-            if (selectedRow >= 0) {
-                int modelIndex = triggersOutline.convertRowIndexToModel(selectedRow);
-                DefaultMutableTreeNode node = (DefaultMutableTreeNode) triggersOutlineModel
-                    .getValueAt(modelIndex, 0);
-                Object userObject = node.getUserObject();
-                if (userObject instanceof PipelineDefinition) {
-                    PipelineDefinition trigger = (PipelineDefinition) userObject;
-
-                    selectedTriggers.add(trigger);
-                }
-            }
-        }
-
-        return selectedTriggers;
-    }
-
-    private void doGroup() {
-        log.debug("doGroup() - start");
-
-        try {
-            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        } catch (ConsoleSecurityException e) {
-            MessageUtil.showError(this, e);
-            return;
-        }
-
-        try {
-            Group group = ZiggyGuiConsole.selectGroup();
-
-            if (group != null) {
-                List<PipelineDefinition> selectedTriggers = getSelectedTriggers();
-
-                for (PipelineDefinition trigger : selectedTriggers) {
-                    if (group == Group.DEFAULT_GROUP) {
-                        trigger.setGroup(null);
-                    } else {
-                        trigger.setGroup(group);
-                    }
-                }
-
-                PipelineDefinitionCrudProxy pipelineCrud = new PipelineDefinitionCrudProxy();
-                pipelineCrud.saveChanges();
-
-                triggersTreeModel.loadFromDatabase();
-            }
-        } catch (Exception e) {
-            MessageUtil.showError(this, e);
-        }
-
-        log.debug("doGroup() - end");
-    }
-
-    private void initGUI() {
-        log.debug("initGUI() - start");
-
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            setLayout(thisLayout);
-            setPreferredSize(new Dimension(400, 300));
-            this.add(getTableScrollPane(), BorderLayout.CENTER);
-            this.add(getButtonPanel(), BorderLayout.NORTH);
-        } catch (Exception e) {
-            log.error("initGUI()", e);
-
-            e.printStackTrace();
-        }
-
-        log.debug("initGUI() - end");
-    }
-
-    private JScrollPane getTableScrollPane() {
-        log.debug("getTableScrollPane() - start");
-
-        if (tableScrollPane == null) {
-            tableScrollPane = new JScrollPane();
-            tableScrollPane.setViewportView(getTriggersOutline());
-        }
-
-        log.debug("getTableScrollPane() - end");
-        return tableScrollPane;
-    }
-
-    private JPanel getButtonPanel() {
-        log.debug("getButtonPanel() - start");
-
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            FlowLayout buttonPanelLayout = new FlowLayout();
-            buttonPanelLayout.setHgap(20);
-            buttonPanelLayout.setAlignment(FlowLayout.LEFT);
-            buttonPanel.setLayout(buttonPanelLayout);
-            buttonPanel.add(getNewButton());
-            buttonPanel.add(getFireButton());
-            buttonPanel.add(getRefreshButton());
-            buttonPanel.add(getExpandAllButton());
-            buttonPanel.add(getCollapseAllButton());
-        }
-
-        log.debug("getButtonPanel() - end");
-        return buttonPanel;
-    }
-
-    private Outline getTriggersOutline() {
-        if (triggersOutline == null) {
-            triggersTreeModel = new TriggersTreeModel();
-            TriggersRowModel triggersRowModel = new TriggersRowModel(triggersTreeModel);
-            triggersOutlineModel = DefaultOutlineModel.createOutlineModel(triggersTreeModel,
-                triggersRowModel, false, "Trigger Name");
-
-            triggersOutline = new Outline();
-            // triggersOutline.setRootVisible(false);
-            triggersOutline.setModel(triggersOutlineModel);
-            triggersTreeModel.setTriggersOutline(triggersOutline);
-            // triggersOutline.setRenderDataProvider(new RenderData());
-            DefaultMutableTreeNode defaultGroupNode = triggersTreeModel.getDefaultGroupNode();
-            if (defaultGroupNode != null) {
-                triggersOutline.expandPath(new TreePath(defaultGroupNode.getPath()));
-            }
-
-            setComponentPopupMenu(triggersOutline, getTriggerTablePopupMenu());
-            triggersOutline.addMouseListener(new MouseAdapter() {
-                @Override
-                public void mouseClicked(MouseEvent evt) {
-                    log.debug("mouseClicked(MouseEvent) - start");
-
-                    triggerTableMouseClicked(evt);
-
-                    log.debug("mouseClicked(MouseEvent) - end");
-                }
-            });
-        }
-        return triggersOutline;
-    }
-
-    private JButton getNewButton() {
-        log.debug("getNewButton() - start");
-
-        if (newButton == null) {
-            newButton = new JButton();
-            newButton.setText("New");
-            newButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                newButtonActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getNewButton() - end");
-        return newButton;
-    }
-
-    private JButton getFireButton() {
-        log.debug("getFireButton() - start");
-
-        if (fireButton == null) {
-            fireButton = new JButton();
-            fireButton.setText("Fire");
-            fireButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                fireButtonActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
-        }
-
-        log.debug("getFireButton() - end");
-        return fireButton;
-    }
-
-    private JPopupMenu getTriggerTablePopupMenu() {
-        if (triggerTablePopupMenu == null) {
-            triggerTablePopupMenu = new JPopupMenu();
-            triggerTablePopupMenu.add(getEditMenuItem());
-            triggerTablePopupMenu.add(getDeleteMenuItem());
-            triggerTablePopupMenu.add(getCloneMenuItem());
-            triggerTablePopupMenu.add(getGroupAssignMenuItem());
-        }
-        return triggerTablePopupMenu;
-    }
-
-    /**
-     * Auto-generated method for setting the popup menu for a component
-     */
-    private void setComponentPopupMenu(final java.awt.Component parent,
-        final javax.swing.JPopupMenu menu) {
-        parent.addMouseListener(new java.awt.event.MouseAdapter() {
-            @Override
-            public void mousePressed(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                }
-                ZTable table = (ZTable) parent;
-                int selectedTableRow = table.rowAtPoint(e.getPoint());
-                // windows bug? works ok on Linux/gtk. Here's a workaround:
-                if (selectedTableRow == -1) {
-                    selectedTableRow = table.getSelectedRow();
-                }
-                selectedModelRow = table.convertRowIndexToModel(selectedTableRow);
-
-                log.debug("selectedTableRow = " + selectedTableRow);
-                log.debug("selectedModelRow = " + selectedModelRow);
-            }
-
-            @Override
-            public void mouseReleased(java.awt.event.MouseEvent e) {
-                if (e.isPopupTrigger()) {
-                    menu.show(parent, e.getX(), e.getY());
-                }
-            }
-        });
-    }
-
-    private JMenuItem getEditMenuItem() {
-        if (editMenuItem == null) {
-            editMenuItem = new JMenuItem();
-            editMenuItem.setText("Edit Trigger Parameters...");
-            editMenuItem.addActionListener(this::editMenuItemActionPerformed);
-        }
-        return editMenuItem;
-    }
-
-    private JMenuItem getDeleteMenuItem() {
-        if (deleteMenuItem == null) {
-            deleteMenuItem = new JMenuItem();
-            deleteMenuItem.setText("Delete Trigger...");
-            deleteMenuItem.addActionListener(this::deleteMenuItemActionPerformed);
-        }
-        return deleteMenuItem;
-    }
-
-    private JButton getRefreshButton() {
-        if (refreshButton == null) {
-            refreshButton = new JButton();
-            refreshButton.setText("Refresh");
-            refreshButton.addActionListener(this::refreshButtonActionPerformed);
-        }
-        return refreshButton;
-    }
-
-    private JMenuItem getCloneMenuItem() {
-        if (cloneMenuItem == null) {
-            cloneMenuItem = new JMenuItem();
-            cloneMenuItem.setText("Clone Trigger...");
-            cloneMenuItem.addActionListener(this::cloneMenuItemActionPerformed);
-        }
-        return cloneMenuItem;
-    }
-
-    private JMenuItem getGroupAssignMenuItem() {
-        if (groupAssignMenuItem == null) {
-            groupAssignMenuItem = new JMenuItem();
-            groupAssignMenuItem.setText("Assign Group...");
-            groupAssignMenuItem.addActionListener(this::groupAssignMenuItemActionPerformed);
-        }
-        return groupAssignMenuItem;
-    }
-
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
-    public static void main(String[] args) {
-        log.debug("main(String[]) - start");
-
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new OpsTriggersPanel());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-
-        log.debug("main(String[]) - end");
-    }
-
-    private JButton getExpandAllButton() {
-        if (expandAllButton == null) {
-            expandAllButton = new JButton();
-            expandAllButton.setText("+");
-            expandAllButton.addActionListener(this::expandAllButtonActionPerformed);
-        }
-        return expandAllButton;
-    }
-
-    private JButton getCollapseAllButton() {
-        if (collapseAllButton == null) {
-            collapseAllButton = new JButton();
-            collapseAllButton.setText("-");
-            collapseAllButton.addActionListener(this::collapseAllButtonActionPerformed);
-        }
-        return collapseAllButton;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/ParameterClassTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/ParameterClassTableModel.java
deleted file mode 100644
index 9eca9f4..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/ParameterClassTableModel.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.util.List;
-
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class ParameterClassTableModel extends AbstractTableModel {
-    private List<ClassWrapper<Parameters>> list = null;
-
-    public ParameterClassTableModel(List<ClassWrapper<Parameters>> list) {
-        this.list = list;
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 1;
-    }
-
-    @Override
-    public int getRowCount() {
-        return list.size();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        return list.get(rowIndex);
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Type";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/RemoteExecutionDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/RemoteExecutionDialog.java
deleted file mode 100644
index 56268c5..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/RemoteExecutionDialog.java
+++ /dev/null
@@ -1,775 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import static gov.nasa.ziggy.ui.common.LabelUtils.boldLabel;
-
-import java.awt.BorderLayout;
-import java.awt.Dialog;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Insets;
-import java.awt.LayoutManager;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.text.NumberFormat;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import javax.swing.text.NumberFormatter;
-
-import org.apache.commons.lang3.StringUtils;
-
-import gov.nasa.ziggy.module.AlgorithmExecutor;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.module.remote.PbsParameters;
-import gov.nasa.ziggy.module.remote.RemoteArchitectureOptimizer;
-import gov.nasa.ziggy.module.remote.RemoteNodeDescriptor;
-import gov.nasa.ziggy.module.remote.RemoteParameters;
-import gov.nasa.ziggy.module.remote.RemoteQueueDescriptor;
-import gov.nasa.ziggy.pipeline.PipelineTaskInformation;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
-import gov.nasa.ziggy.ui.common.ExecuteOnValidityCheck;
-import gov.nasa.ziggy.ui.common.ToolTipBorderJPanel;
-import gov.nasa.ziggy.ui.common.ValidityTestingFormattedTextField;
-import gov.nasa.ziggy.ui.proxy.PipelineOperationsProxy;
-
-/**
- * Dialog box that allows the user to set values in an instance of {@link RemoteParameters} and
- * determine the resulting values in a corresponding {@link PbsParameters} instance.
- *
- * @author PT
- */
-public class RemoteExecutionDialog extends JDialog {
-
-    private static final long serialVersionUID = 20210810L;
-
-    // Data model
-    private RemoteParameters originalParameters;
-    private RemoteParameters currentParameters;
-    private PipelineDefinitionNode node;
-    private int subtaskCount;
-    private int maxParallelSubtaskCount;
-    private ParameterSet parameterSet;
-    private int originalSubtaskCount;
-    private int originalMaxParallelSubtaskCount;
-
-    // Dialog box elements
-    private JPanel subtasksPanel;
-    private JPanel remoteParamsPanel;
-    private JPanel pbsParamsPanel;
-    private JPanel remoteParamsValuesPanel;
-    private JPanel remoteParamsRequiredValuesPanel;
-    private JPanel remoteParamsOptionalValuesPanel;
-    private JPanel remoteParamsButtonsPanel;
-    private JPanel nodeSharingPanel;
-
-    private ValidityTestingFormattedTextField subtasksField;
-    private ValidityTestingFormattedTextField gigsPerSubtaskField;
-    private ValidityTestingFormattedTextField maxWallTimeField;
-    private ValidityTestingFormattedTextField wallTimeRatioField;
-    private JComboBox<RemoteArchitectureOptimizer> optimizerComboBox;
-    private JComboBox<String> architectureComboBox;
-    private JComboBox<String> queueComboBox;
-    private ValidityTestingFormattedTextField maxNodesField;
-    private ValidityTestingFormattedTextField subtasksPerCoreField;
-    private JButton resetButton;
-    private JButton calculateButton;
-    private JButton saveButton;
-    private JButton tasksButton;
-    private JCheckBox nodeSharingCheckBox = new JCheckBox("Node Sharing");
-    private JCheckBox wallTimeScalingCheckBox = new JCheckBox("Wall Time Scaling");
-
-    private JLabel pbsArch = boldLabel();
-    private JLabel pbsQueue = boldLabel();
-    private JLabel pbsWallTime = boldLabel();
-    private JLabel pbsNodeCount = boldLabel();
-    private JLabel pbsActiveCoresPerNode = boldLabel();
-    private JLabel pbsCost = boldLabel();
-
-    private Set<ValidityTestingFormattedTextField> validityTestingFormattedTextFields = new HashSet<>();
-
-    public RemoteExecutionDialog(Dialog parent, String title, ParameterSetName paramSetName,
-        PipelineDefinitionNode node, int subtaskCount, int maxParallelSubtaskCount) {
-        super(parent, true);
-        setTitle("Remote Execution: " + title);
-        PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
-        parameterSet = pipelineOps.retrieveLatestParameterSet(paramSetName);
-        originalParameters = parameterSet.parametersInstance();
-        currentParameters = new RemoteParameters(originalParameters);
-        this.node = node;
-        this.subtaskCount = subtaskCount;
-        this.maxParallelSubtaskCount = maxParallelSubtaskCount;
-        originalSubtaskCount = subtaskCount;
-        originalMaxParallelSubtaskCount = maxParallelSubtaskCount;
-
-        initGUI();
-        setVisible(true);
-    }
-
-    private void initGUI() {
-        setSize(650, 400);
-        getContentPane().add(subtasksPanel(), BorderLayout.NORTH);
-        getContentPane().add(remoteParamsPanel(), BorderLayout.CENTER);
-        getContentPane().add(getPbsParamsPanel(), BorderLayout.SOUTH);
-        populateTextFieldsAndComboBoxes();
-    }
-
-    private JPanel subtasksPanel() {
-        if (subtasksPanel == null) {
-            subtasksPanel = new ToolTipBorderJPanel();
-            subtasksPanel.setToolTipText("Controls the number of subtasks for the selected module");
-            subtasksPanel.setBorder(BorderFactory.createTitledBorder("Subtasks"));
-            FlowLayout subtasksLayout = new FlowLayout();
-            subtasksPanel.setLayout(subtasksLayout);
-            JLabel subtasksLabel = new JLabel();
-            subtasksLabel.setText("Total subtasks: ");
-            subtasksPanel.add(subtasksLabel);
-            subtasksPanel.add(subtasksField());
-        }
-        return subtasksPanel;
-    }
-
-    private void setButtonState() {
-        boolean allFieldsValid = true;
-        for (ValidityTestingFormattedTextField field : validityTestingFormattedTextFields) {
-            allFieldsValid = allFieldsValid && field.isValidState();
-        }
-        getCalculateButton().setEnabled(allFieldsValid);
-        getSaveButton().setEnabled(allFieldsValid);
-    }
-
-    private ExecuteOnValidityCheck checkFieldsAndEnableButtons = valid -> setButtonState();
-
-    private ValidityTestingFormattedTextField subtasksField() {
-        if (subtasksField == null) {
-            NumberFormat numberFormat = NumberFormat.getInstance();
-            NumberFormatter formatter = new NumberFormatter(numberFormat);
-            formatter.setValueClass(Integer.class);
-            formatter.setMinimum(1);
-            formatter.setMaximum(Integer.MAX_VALUE);
-            subtasksField = new ValidityTestingFormattedTextField(formatter);
-            subtasksField.setColumns(6);
-            subtasksField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
-            validityTestingFormattedTextFields.add(subtasksField);
-            subtasksField.setToolTipText("Set the total number of subtasks (must be >= 1).");
-        }
-        return subtasksField;
-    }
-
-    private JPanel remoteParamsPanel() {
-        if (remoteParamsPanel == null) {
-            remoteParamsPanel = new ToolTipBorderJPanel();
-            remoteParamsPanel.setBorder(BorderFactory
-                .createTitledBorder(BorderFactory.createEmptyBorder(), "Remote Parameters"));
-            remoteParamsPanel
-                .setToolTipText("Controls user-settable parameters for remote execution");
-            remoteParamsPanel.add(remoteParamsValuesPanel(), BorderLayout.NORTH);
-            remoteParamsPanel.add(getRemoteParamsButtonsPanel(), BorderLayout.SOUTH);
-        }
-        return remoteParamsPanel;
-    }
-
-    private JPanel remoteParamsValuesPanel() {
-        if (remoteParamsValuesPanel == null) {
-            remoteParamsValuesPanel = new JPanel();
-            remoteParamsValuesPanel.setLayout(remoteParamsLayout());
-            remoteParamsValuesPanel.add(nodeSharingPanel(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.NORTH,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsValuesPanel.add(remoteParamsRequiredValuesPanel());
-            remoteParamsValuesPanel.add(remoteParamsOptionalValuesPanel());
-            populateTextFieldsAndComboBoxes();
-        }
-        return remoteParamsValuesPanel;
-    }
-
-    private static LayoutManager remoteParamsLayout() {
-        GridBagLayout layout = new GridBagLayout();
-        layout.columnWidths = new int[] { 15, 30, 30 };
-        layout.rowHeights = new int[] { 15 };
-        return layout;
-    }
-
-    private JPanel nodeSharingPanel() {
-        if (nodeSharingPanel == null) {
-            nodeSharingPanel = new ToolTipBorderJPanel();
-            nodeSharingPanel.setBorder(BorderFactory.createTitledBorder("Node Sharing"));
-            nodeSharingPanel
-                .setToolTipText("Controls parallel processing of subtasks on each node");
-            nodeSharingPanel.setLayout(new GridLayout(2, 1));
-            nodeSharingPanel.add(nodeSharingCheckBox);
-            nodeSharingCheckBox
-                .setToolTipText("Enables concurrent processing of multiple subtasks on each node");
-            nodeSharingCheckBox.addItemListener(e -> nodeSharingCheckBoxEvent());
-            nodeSharingPanel.add(wallTimeScalingCheckBox);
-            wallTimeScalingCheckBox.setToolTipText(
-                "Scales subtask wall times inversely to the number of cores per node\n"
-                    + "Only enabled when node sharing is disabled");
-        }
-        return nodeSharingPanel;
-    }
-
-    private void nodeSharingCheckBoxEvent() {
-        wallTimeScalingCheckBox.setEnabled(!nodeSharingCheckBox.isSelected());
-        gigsPerSubtaskField().setEnabled(nodeSharingCheckBox.isSelected());
-        setGigsPerSubtaskToolTip();
-    }
-
-    private JPanel remoteParamsRequiredValuesPanel() {
-        if (remoteParamsRequiredValuesPanel == null) {
-            remoteParamsRequiredValuesPanel = new ToolTipBorderJPanel();
-            remoteParamsRequiredValuesPanel.setBorder(BorderFactory.createTitledBorder("Required"));
-            remoteParamsRequiredValuesPanel.setToolTipText("Parameters that must be set.");
-            GridBagLayout requiredValuesLayout = new GridBagLayout();
-            remoteParamsRequiredValuesPanel.setLayout(requiredValuesLayout);
-            requiredValuesLayout.columnWidths = new int[] { 7, 7 };
-            requiredValuesLayout.rowHeights = new int[] { 7, 7, 7, 7 };
-            requiredValuesLayout.columnWeights = new double[] { 0.1, 0.1 };
-            requiredValuesLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1 };
-            remoteParamsRequiredValuesPanel.add(new JLabel("Gigs per Subtask"),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsRequiredValuesPanel.add(new JLabel("Max Subtask Wall Time"),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsRequiredValuesPanel.add(new JLabel("Subtask Wall Time Ratio"),
-                new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsRequiredValuesPanel.add(new JLabel("Optimizer"),
-                new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-
-            remoteParamsRequiredValuesPanel.add(gigsPerSubtaskField(),
-                new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsRequiredValuesPanel.add(maxWallTimeField(),
-                new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsRequiredValuesPanel.add(typicalWallTimeField(),
-                new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsRequiredValuesPanel.add(optimizerComboBox(),
-                new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        }
-        return remoteParamsRequiredValuesPanel;
-    }
-
-    private ValidityTestingFormattedTextField gigsPerSubtaskField() {
-        if (gigsPerSubtaskField == null) {
-            NumberFormat numberFormat = NumberFormat.getInstance();
-            NumberFormatter formatter = new NumberFormatter(numberFormat);
-            formatter.setValueClass(Double.class);
-            formatter.setMinimum(Double.MIN_VALUE);
-            formatter.setMaximum(Double.MAX_VALUE);
-            gigsPerSubtaskField = new ValidityTestingFormattedTextField(formatter);
-            gigsPerSubtaskField.setColumns(6);
-            gigsPerSubtaskField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
-            validityTestingFormattedTextFields.add(gigsPerSubtaskField);
-        }
-        return gigsPerSubtaskField;
-    }
-
-    private void setGigsPerSubtaskToolTip() {
-        String enabledTip = "Enter the number of GB needed for each subtask (>0).";
-        String disabledTip = "Gigs per subtask disabled when node sharing is disabled";
-        String tip = gigsPerSubtaskField().isEnabled() ? enabledTip : disabledTip;
-        gigsPerSubtaskField().setToolTipText(tip);
-    }
-
-    private ValidityTestingFormattedTextField maxWallTimeField() {
-        if (maxWallTimeField == null) {
-            NumberFormat numberFormat = NumberFormat.getInstance();
-            NumberFormatter formatter = new NumberFormatter(numberFormat);
-            formatter.setValueClass(Double.class);
-            formatter.setMinimum(Double.MIN_VALUE);
-            formatter.setMaximum(Double.MAX_VALUE);
-            maxWallTimeField = new ValidityTestingFormattedTextField(formatter);
-            maxWallTimeField.setColumns(6);
-            maxWallTimeField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
-            validityTestingFormattedTextFields.add(maxWallTimeField);
-            maxWallTimeField.addFocusListener(new FocusListener() {
-
-                @Override
-                public void focusGained(FocusEvent e) {
-                }
-
-                // Here is where we modify the typical field when the max field has been
-                // updated
-                @Override
-                public void focusLost(FocusEvent e) {
-                    if (maxWallTimeField.isValidState()) {
-                        ValidityTestingFormattedTextField typicalField = typicalWallTimeField();
-                        double maxValue = (double) maxWallTimeField.getValue();
-                        double typicalValue = (double) typicalField.getValue();
-                        NumberFormatter formatter = (NumberFormatter) typicalField.getFormatter();
-                        formatter.setMaximum(maxValue);
-                        if (typicalValue > maxValue) {
-                            typicalField
-                                .setBorder(ValidityTestingFormattedTextField.INVALID_BORDER);
-                        }
-                    }
-                }
-
-            });
-            maxWallTimeField.setToolTipText(
-                "Enter the MAXIMUM wall time needed by any subtask, in hours (>0).");
-        }
-        return maxWallTimeField;
-    }
-
-    private ValidityTestingFormattedTextField typicalWallTimeField() {
-        if (wallTimeRatioField == null) {
-            NumberFormat numberFormat = NumberFormat.getInstance();
-            NumberFormatter formatter = new NumberFormatter(numberFormat);
-            formatter.setValueClass(Double.class);
-            formatter.setMinimum(Double.MIN_VALUE);
-            formatter.setMaximum(currentParameters.getSubtaskMaxWallTimeHours());
-            wallTimeRatioField = new ValidityTestingFormattedTextField(formatter);
-            wallTimeRatioField.setColumns(6);
-            wallTimeRatioField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
-            validityTestingFormattedTextFields.add(wallTimeRatioField);
-            wallTimeRatioField.setToolTipText(
-                "Enter the TYPICAL wall time needed by subtasks, in hours (>0, <= max wall time)");
-        }
-        return wallTimeRatioField;
-    }
-
-    private JComboBox<RemoteArchitectureOptimizer> optimizerComboBox() {
-        if (optimizerComboBox == null) {
-            optimizerComboBox = new JComboBox<>(RemoteArchitectureOptimizer.values());
-            optimizerComboBox
-                .setToolTipText("<html>Select the optimizer used to pick a remote architecture:<br>"
-                    + "&ensp;CORES minimizes the number of idle cores.<br>"
-                    + "&ensp;QUEUE_DEPTH minimizes the number of hours of queued tasks.<br>"
-                    + "&ensp;QUEUE_TIME minimizes the estimated total time including time in the queue.<br>"
-                    + "&ensp;COST minimizes the number of SBUs.</html>");
-        }
-        return optimizerComboBox;
-    }
-
-    private JPanel remoteParamsOptionalValuesPanel() {
-        if (remoteParamsOptionalValuesPanel == null) {
-            remoteParamsOptionalValuesPanel = new ToolTipBorderJPanel();
-            remoteParamsOptionalValuesPanel.setBorder(BorderFactory.createTitledBorder("Optional"));
-            remoteParamsOptionalValuesPanel
-                .setToolTipText("Parameters that can be calculated if not set. "
-                    + "Values set by users will be included when calculating PBS parameters.");
-            GridBagLayout optionalValuesLayout = new GridBagLayout();
-            remoteParamsOptionalValuesPanel.setLayout(optionalValuesLayout);
-            optionalValuesLayout.columnWidths = new int[] { 7, 7 };
-            optionalValuesLayout.rowHeights = new int[] { 7, 7, 7, 7 };
-            optionalValuesLayout.columnWeights = new double[] { 0.1, 0.1 };
-            optionalValuesLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1 };
-
-            remoteParamsOptionalValuesPanel.add(new JLabel("Architecture"),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsOptionalValuesPanel.add(new JLabel("Queue"),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsOptionalValuesPanel.add(new JLabel("Max Nodes"),
-                new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsOptionalValuesPanel.add(new JLabel("Subtasks per Core"),
-                new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-
-            remoteParamsOptionalValuesPanel.add(architectureComboBox(),
-                new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsOptionalValuesPanel.add(queueComboBox(),
-                new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsOptionalValuesPanel.add(maxNodesField(),
-                new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            remoteParamsOptionalValuesPanel.add(subtasksPerCoreField(),
-                new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-
-        }
-        return remoteParamsOptionalValuesPanel;
-    }
-
-    private JComboBox<String> architectureComboBox() {
-        if (architectureComboBox == null) {
-            architectureComboBox = new JComboBox<>(RemoteNodeDescriptor.allNames());
-            architectureComboBox.insertItemAt("", 0);
-            architectureComboBox.setToolTipText("Select remote node architecture.");
-        }
-        return architectureComboBox;
-    }
-
-    private JComboBox<String> queueComboBox() {
-        if (queueComboBox == null) {
-            queueComboBox = new JComboBox<>(RemoteQueueDescriptor.allNames());
-            queueComboBox.insertItemAt("", 0);
-            queueComboBox.setToolTipText("Select batch queue for use with these jobs.");
-        }
-        return queueComboBox;
-    }
-
-    private ValidityTestingFormattedTextField maxNodesField() {
-        if (maxNodesField == null) {
-            NumberFormat numberFormat = NumberFormat.getInstance();
-            NumberFormatter formatter = new NumberFormatter(numberFormat);
-            formatter.setValueClass(Integer.class);
-            formatter.setMinimum(1);
-            formatter.setMaximum(Integer.MAX_VALUE);
-            maxNodesField = new ValidityTestingFormattedTextField(formatter);
-            maxNodesField.setColumns(6);
-            maxNodesField.setEmptyIsValid(true);
-            maxNodesField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
-            validityTestingFormattedTextFields.add(maxNodesField);
-            maxNodesField
-                .setToolTipText("<html>Enter the maximum number of nodes to request (>=1)<br>"
-                    + "or leave empty to let the algorithm determine the number.");
-        }
-        return maxNodesField;
-    }
-
-    private ValidityTestingFormattedTextField subtasksPerCoreField() {
-        if (subtasksPerCoreField == null) {
-            NumberFormat numberFormat = NumberFormat.getInstance();
-            NumberFormatter formatter = new NumberFormatter(numberFormat);
-            formatter.setValueClass(Double.class);
-            formatter.setMinimum(1.0);
-            formatter.setMaximum(Double.MAX_VALUE);
-            subtasksPerCoreField = new ValidityTestingFormattedTextField(formatter);
-            subtasksPerCoreField.setColumns(6);
-            subtasksPerCoreField.setEmptyIsValid(true);
-            subtasksPerCoreField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
-            validityTestingFormattedTextFields.add(subtasksPerCoreField);
-            subtasksPerCoreField
-                .setToolTipText("<html>Enter the number of subtasks per active core (>=1)<br>"
-                    + "or leave empty to let the algorithm decide the number");
-        }
-        return subtasksPerCoreField;
-    }
-
-    private void populateTextFieldsAndComboBoxes() {
-
-        // Subtask counts
-        subtasksField().setValue(subtaskCount);
-
-        // Required parameters
-        if (!StringUtils.isEmpty(currentParameters.getOptimizer())
-            && RemoteArchitectureOptimizer.fromName(currentParameters.getOptimizer()) != null) {
-            optimizerComboBox.setSelectedItem(
-                RemoteArchitectureOptimizer.fromName(currentParameters.getOptimizer()));
-        }
-        typicalWallTimeField().setValue(currentParameters.getSubtaskTypicalWallTimeHours());
-        maxWallTimeField().setValue(currentParameters.getSubtaskMaxWallTimeHours());
-        gigsPerSubtaskField().setValue(currentParameters.getGigsPerSubtask());
-        nodeSharingCheckBox.setSelected(currentParameters.isNodeSharing());
-        wallTimeScalingCheckBox.setSelected(currentParameters.isWallTimeScaling());
-        wallTimeScalingCheckBox.setEnabled(!currentParameters.isNodeSharing());
-        gigsPerSubtaskField().setEnabled(currentParameters.isNodeSharing());
-        setGigsPerSubtaskToolTip();
-
-        // Optional parameters
-        if (!StringUtils.isEmpty(currentParameters.getRemoteNodeArchitecture())
-            && RemoteNodeDescriptor
-                .fromName(currentParameters.getRemoteNodeArchitecture()) != null) {
-            architectureComboBox().setSelectedItem(
-                RemoteNodeDescriptor.fromName(currentParameters.getRemoteNodeArchitecture())
-                    .name());
-        } else {
-            architectureComboBox().setSelectedIndex(0);
-        }
-
-        if (!StringUtils.isEmpty(currentParameters.getQueueName())
-            && RemoteQueueDescriptor.fromName(currentParameters.getQueueName()) != null) {
-            queueComboBox().setSelectedItem(
-                RemoteNodeDescriptor.fromName(currentParameters.getQueueName()).name());
-        } else {
-            queueComboBox().setSelectedIndex(0);
-        }
-
-        if (!StringUtils.isEmpty(currentParameters.getMaxNodes())) {
-            maxNodesField().setValue(Integer.parseInt(currentParameters.getMaxNodes()));
-        }
-        if (!StringUtils.isEmpty(currentParameters.getSubtasksPerCore())) {
-            subtasksPerCoreField()
-                .setValue(Double.parseDouble(currentParameters.getSubtasksPerCore()));
-        }
-
-    }
-
-    private void populateCurrentParameters() {
-
-        // Subtask counts.
-        subtaskCount = (int) subtasksField().getValue();
-
-        // Required parameters.
-        RemoteArchitectureOptimizer optimizerSelection = (RemoteArchitectureOptimizer) optimizerComboBox()
-            .getSelectedItem();
-        currentParameters.setOptimizer(optimizerSelection.name());
-        currentParameters
-            .setSubtaskTypicalWallTimeHours((double) typicalWallTimeField().getValue());
-        currentParameters.setSubtaskMaxWallTimeHours((double) maxWallTimeField.getValue());
-        currentParameters.setGigsPerSubtask((double) gigsPerSubtaskField().getValue());
-        currentParameters.setNodeSharing(nodeSharingCheckBox.isSelected());
-        currentParameters.setWallTimeScaling(wallTimeScalingCheckBox.isSelected());
-
-        // Optional parameters.
-        String choice = (String) architectureComboBox().getSelectedItem();
-        if (!StringUtils.isEmpty(choice)) {
-            RemoteNodeDescriptor chosenArch = RemoteNodeDescriptor.valueOf(choice);
-            currentParameters.setRemoteNodeArchitecture(chosenArch.getNodeName());
-        } else {
-            currentParameters.setRemoteNodeArchitecture("");
-        }
-
-        choice = (String) queueComboBox().getSelectedItem();
-        if (!StringUtils.isEmpty(choice)) {
-            RemoteQueueDescriptor chosenQueue = RemoteQueueDescriptor.valueOf(choice);
-            currentParameters.setQueueName(chosenQueue.getQueueName());
-        } else {
-            currentParameters.setQueueName("");
-        }
-
-        Object maxNodesValue = maxNodesField().getValue();
-        if (maxNodesValue != null) {
-            currentParameters.setMaxNodes(Integer.toString((int) maxNodesValue));
-        } else {
-            currentParameters.setMaxNodes("");
-        }
-
-        Object subtasksPerCoreValue = subtasksPerCoreField().getValue();
-        if (subtasksPerCoreValue != null) {
-            currentParameters.setSubtasksPerCore(Double.toString((double) subtasksPerCoreValue));
-        } else {
-            currentParameters.setSubtasksPerCore("");
-        }
-    }
-
-    private JPanel getRemoteParamsButtonsPanel() {
-        if (remoteParamsButtonsPanel == null) {
-            remoteParamsButtonsPanel = new JPanel();
-            remoteParamsButtonsPanel.add(getResetButton());
-            remoteParamsButtonsPanel.add(getCalculateButton());
-            remoteParamsButtonsPanel.add(getSaveButton());
-            remoteParamsButtonsPanel.add(getTasksButton());
-        }
-        return remoteParamsButtonsPanel;
-    }
-
-    private JButton getResetButton() {
-        if (resetButton == null) {
-            resetButton = new JButton("Reset to DB Values");
-            resetButton.addActionListener(e -> {
-                PipelineTaskInformation.reset(node);
-                currentParameters = new RemoteParameters(originalParameters);
-                subtaskCount = originalSubtaskCount;
-                maxParallelSubtaskCount = originalMaxParallelSubtaskCount;
-                populateTextFieldsAndComboBoxes();
-                displayPbsValues(null);
-            });
-            resetButton.setToolTipText("Reset RemoteParameters values to original (DB) values.");
-        }
-        return resetButton;
-    }
-
-    private JButton getCalculateButton() {
-        if (calculateButton == null) {
-            calculateButton = new JButton("Calculate PBS Parameters");
-            calculateButton
-                .setToolTipText("Generate PBS parameters from the RemoteParameters values.");
-            calculateButton.addActionListener(e -> {
-                calculatePbsParameters();
-            });
-
-            // NB: the FocusListener is needed because of the way that the field values are
-            // validated. When one of the ValidityTestingFormattedTextBox instances loses the
-            // focus, the resulting event causes the validity of that box to become false for
-            // a blink, which causes the calculate and save buttons to become disabled for a
-            // blink; as a result, the buttons are disabled when the action listener would tell
-            // them to take their actions, and the user has to hit the button again to get it to
-            // take its action. By performing the action when the button gains focus, we get
-            // back to needing only one button push to get the focus and perform the action.
-            calculateButton.addFocusListener(new FocusListener() {
-
-                @Override
-                public void focusGained(FocusEvent e) {
-                    if (calculateButton.isEnabled()) {
-                        calculatePbsParameters();
-                    }
-                }
-
-                @Override
-                public void focusLost(FocusEvent e) {
-                }
-            });
-        }
-        return calculateButton;
-    }
-
-    private void calculatePbsParameters() {
-        calculateButton.setEnabled(false);
-        try {
-            populateCurrentParameters();
-            AlgorithmExecutor executor = AlgorithmExecutor.newRemoteInstance(null);
-            String currentOptimizer = currentParameters.getOptimizer();
-            if (!currentParameters.isNodeSharing()
-                && currentOptimizer.equals(RemoteArchitectureOptimizer.CORES.name())) {
-                JOptionPane.showMessageDialog(this,
-                    "CORES optimization disabled when node sharing disabled.\n"
-                        + "COST optimization will be used instead.");
-                currentParameters.setOptimizer(RemoteArchitectureOptimizer.COST.name());
-            }
-            PbsParameters pbsParameters = executor.generatePbsParameters(currentParameters,
-                subtaskCount);
-            displayPbsValues(pbsParameters);
-            currentParameters.setOptimizer(currentOptimizer);
-            currentOptimizer = null;
-        } catch (Exception f) {
-            boolean handled = false;
-            if (f instanceof IllegalStateException || f instanceof PipelineException) {
-                handled = handlePbsParametersException(f.getStackTrace());
-            }
-            if (!handled) {
-                throw f;
-            }
-        } finally {
-            calculateButton.setEnabled(true);
-        }
-    }
-
-    private boolean handlePbsParametersException(StackTraceElement[] stackTrace) {
-        boolean handled = false;
-        String message = null;
-        for (StackTraceElement element : stackTrace) {
-            if (element.getClassName().equals(PbsParameters.class.getName())) {
-                if (element.getMethodName().equals("populateArchitecture")) {
-                    message = "Selected architecture has insufficient RAM";
-                    break;
-                }
-                if (element.getMethodName().equals("selectArchitecture")) {
-                    message = "All architectures lack sufficient RAM";
-                    break;
-                }
-                if (element.getMethodName().equals("computeWallTimeAndQueue")) {
-                    message = "No queue exists with sufficiently high time limit";
-                    break;
-                }
-            }
-        }
-        if (message != null) {
-            handled = true;
-            JOptionPane.showMessageDialog(this, message);
-        }
-        return handled;
-    }
-
-    private JButton getSaveButton() {
-        if (saveButton == null) {
-            saveButton = new JButton("Save to DB");
-            saveButton
-                .setToolTipText("Save RemoteParameters values to DB, replacing current values.");
-            saveButton.addActionListener(e -> saveRemoteParameters());
-
-            // NB: the FocusListener is needed because of the way that the field values are
-            // validated. When one of the ValidityTestingFormattedTextBox instances loses the
-            // focus, the resulting event causes the validity of that box to become false for
-            // a blink, which causes the calculate and save buttons to become disabled for a
-            // blink; as a result, the buttons are disabled when the action listener would tell
-            // them to take their actions, and the user has to hit the button again to get it to
-            // take its action. By performing the action when the button gains focus, we get
-            // back to needing only one button push to get the focus and perform the action.
-            saveButton.addFocusListener(new FocusListener() {
-
-                @Override
-                public void focusGained(FocusEvent e) {
-                    if (saveButton.isEnabled()) {
-                        saveRemoteParameters();
-                    }
-                }
-
-                @Override
-                public void focusLost(FocusEvent e) {
-                }
-            });
-        }
-        return saveButton;
-    }
-
-    private void saveRemoteParameters() {
-        PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
-        pipelineOps.updateParameterSet(parameterSet, currentParameters,
-            parameterSet.getDescription(), false);
-        originalParameters = new RemoteParameters(currentParameters);
-        originalSubtaskCount = subtaskCount;
-        originalMaxParallelSubtaskCount = maxParallelSubtaskCount;
-    }
-
-    private JButton getTasksButton() {
-        if (tasksButton == null) {
-            tasksButton = new JButton("Display Task Info");
-            tasksButton
-                .setToolTipText("Display task and subtask information for this pipeline node.");
-            tasksButton.addActionListener(e -> displayTaskInformation());
-        }
-        return tasksButton;
-    }
-
-    private void displayTaskInformation() {
-        TaskInformationDialog infoTable = new TaskInformationDialog(this, node);
-        infoTable.setVisible(true);
-    }
-
-    private JPanel getPbsParamsPanel() {
-        if (pbsParamsPanel == null) {
-            pbsParamsPanel = new ToolTipBorderJPanel();
-            pbsParamsPanel.setBorder(BorderFactory.createTitledBorder("PBS Parameters"));
-            pbsParamsPanel.setToolTipText("Displays parameters that will be sent to PBS");
-            pbsParamsPanel.setLayout(new GridLayout(6, 2));
-            pbsParamsPanel.add(new JLabel("Architecture:    ", SwingConstants.RIGHT));
-            pbsParamsPanel.add(pbsArch);
-            pbsParamsPanel.add(new JLabel("Queue:    ", SwingConstants.RIGHT));
-            pbsParamsPanel.add(pbsQueue);
-            pbsParamsPanel.add(new JLabel("Wall Time:    ", SwingConstants.RIGHT));
-            pbsParamsPanel.add(pbsWallTime);
-            pbsParamsPanel.add(new JLabel("Node Count:    ", SwingConstants.RIGHT));
-            pbsParamsPanel.add(pbsNodeCount);
-            pbsParamsPanel.add(new JLabel("Active Cores per Node:    ", SwingConstants.RIGHT));
-            pbsParamsPanel.add(pbsActiveCoresPerNode);
-            pbsParamsPanel.add(new JLabel("Cost (SBUs):    ", SwingConstants.RIGHT));
-            pbsParamsPanel.add(pbsCost);
-
-        }
-        return pbsParamsPanel;
-    }
-
-    private void displayPbsValues(PbsParameters pbsParameters) {
-        if (pbsParameters == null) {
-            pbsArch.setText("  ");
-            pbsQueue.setText("  ");
-            pbsWallTime.setText("  ");
-            pbsNodeCount.setText("  ");
-            pbsActiveCoresPerNode.setText("  ");
-            pbsCost.setText("  ");
-        } else {
-            pbsArch.setText(pbsParameters.getArchitecture().name());
-            pbsQueue.setText(pbsParameters.getQueueName());
-            pbsWallTime.setText(pbsParameters.getRequestedWallTime());
-            pbsNodeCount.setText(Integer.toString(pbsParameters.getRequestedNodeCount()));
-            pbsActiveCoresPerNode.setText(Integer.toString(pbsParameters.getActiveCoresPerNode()));
-            pbsCost.setText(String.format("%.2f", pbsParameters.getEstimatedCost()));
-        }
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/SelectPipelineTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/SelectPipelineTableModel.java
deleted file mode 100644
index f591614..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/SelectPipelineTableModel.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-
-/**
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class SelectPipelineTableModel extends AbstractDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(SelectPipelineTableModel.class);
-
-    private List<PipelineDefinition> pipelines = new LinkedList<>();
-    private final PipelineDefinitionCrudProxy pipelineDefinitionCrud;
-
-    public SelectPipelineTableModel() {
-        pipelineDefinitionCrud = new PipelineDefinitionCrudProxy();
-    }
-
-    @Override
-    public void loadFromDatabase() {
-        log.debug("loadFromDatabase() - start");
-
-        if (pipelines != null) {
-            pipelineDefinitionCrud.evictAll(pipelines);
-        }
-
-        try {
-            pipelines = pipelineDefinitionCrud.retrieveLatestVersions();
-        } catch (ConsoleSecurityException ignore) {
-        }
-
-        fireTableDataChanged();
-
-        log.debug("loadFromDatabase() - end");
-    }
-
-    public PipelineDefinition getPipelineAtRow(int rowIndex) {
-        validityCheck();
-        return pipelines.get(rowIndex);
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return pipelines.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 2;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-
-        PipelineDefinition pipeline = pipelines.get(rowIndex);
-
-        switch (columnIndex) {
-            case 0:
-                return pipeline.getId();
-            case 1:
-                return pipeline.getName();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        return String.class;
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "ID";
-            case 1:
-                return "Name";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TaskInformationDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TaskInformationDialog.java
deleted file mode 100644
index 9ee510d..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TaskInformationDialog.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.awt.BorderLayout;
-import java.awt.Dialog;
-import java.util.List;
-
-import javax.swing.JDialog;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
-
-import gov.nasa.ziggy.module.SubtaskInformation;
-import gov.nasa.ziggy.pipeline.PipelineTaskInformation;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
-
-/**
- * Displays task information for a {@link PipelineDefinitionNode}. Implemented as a modal dialog so
- * as to block until the user is done with it.
- *
- * @author PT
- */
-public class TaskInformationDialog extends JDialog {
-
-    private static final long serialVersionUID = 20210810L;
-
-    private PipelineDefinitionNode node;
-
-    public TaskInformationDialog(Dialog parent, PipelineDefinitionNode node) {
-        super(parent, true);
-        this.node = node;
-        initGUI();
-    }
-
-    public void initGUI() {
-        setSize(480, 400);
-        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-        setTitle(node.getPipelineName() + " : " + node.getModuleName().getName());
-        List<SubtaskInformation> subtaskInfo = PipelineTaskInformation.subtaskInformation(node);
-        boolean maxSubtaskLimtsEnabled = PipelineTaskInformation.parallelLimits(node);
-        JTable table = new JTable(
-            new TaskInformationTableModel(subtaskInfo, maxSubtaskLimtsEnabled));
-        table.setAutoCreateRowSorter(true);
-        JScrollPane jsp = new JScrollPane(table);
-        getContentPane().add(jsp, BorderLayout.CENTER);
-    }
-
-    private static class TaskInformationTableModel extends AbstractTableModel {
-
-        private static final long serialVersionUID = 20210818L;
-
-        private static final String MAX_PARALLEL_SUBTASK_HEADER = "Max Parallel Subtasks";
-        private static final String[] ALL_COLUMN_HEADERS = { "", "UOW", "Subtasks",
-            MAX_PARALLEL_SUBTASK_HEADER };
-        String[] columnHeaders;
-        List<SubtaskInformation> subtaskInfo;
-
-        public TaskInformationTableModel(List<SubtaskInformation> subtaskInfo,
-            boolean maxSubtaskLimitsEnabled) {
-            this.subtaskInfo = subtaskInfo;
-            if (!maxSubtaskLimitsEnabled) {
-                columnHeaders = new String[ALL_COLUMN_HEADERS.length - 1];
-                int iColumn = 0;
-                for (String columnHeader : ALL_COLUMN_HEADERS) {
-                    if (!columnHeader.equals(MAX_PARALLEL_SUBTASK_HEADER)) {
-                        columnHeaders[iColumn] = columnHeader;
-                        iColumn++;
-                    }
-                }
-            } else {
-                columnHeaders = ALL_COLUMN_HEADERS;
-            }
-        }
-
-        @Override
-        public int getRowCount() {
-            return subtaskInfo.size();
-        }
-
-        @Override
-        public int getColumnCount() {
-            return columnHeaders.length;
-        }
-
-        @Override
-        public String getColumnName(int columnIndex) {
-            return columnHeaders[columnIndex];
-        }
-
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            SubtaskInformation row = subtaskInfo.get(rowIndex);
-            Object returnValue = null;
-            switch (columnIndex) {
-                case 0:
-                    returnValue = rowIndex + 1;
-                    break;
-                case 1:
-                    returnValue = row.getUowBriefState();
-                    break;
-                case 2:
-                    returnValue = row.getSubtaskCount();
-                    break;
-                case 3:
-                    returnValue = row.getMaxParallelSubtasks();
-                    break;
-                default:
-                    throw new IllegalArgumentException("Illegal column number: " + columnIndex);
-            }
-            return returnValue;
-        }
-
-        @Override
-        public Class<?> getColumnClass(int columnIndex) {
-            if (subtaskInfo == null || subtaskInfo.isEmpty()) {
-                return Object.class;
-            }
-            return getValueAt(0, columnIndex).getClass();
-        }
-
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggerValidationResultsDialog.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggerValidationResultsDialog.java
deleted file mode 100644
index c6a5e1f..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggerValidationResultsDialog.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.TriggerValidationResults;
-
-@SuppressWarnings("serial")
-public class TriggerValidationResultsDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(TriggerValidationResultsDialog.class);
-
-    private JPanel dataPanel;
-    private JTextArea reportTextArea;
-    private JScrollPane reportScrollPane;
-    private JButton closeButton;
-    private JPanel buttonPanel;
-    private final TriggerValidationResults results;
-
-    public TriggerValidationResultsDialog(JFrame frame, TriggerValidationResults results) {
-        super(frame, true);
-
-        this.results = results;
-
-        initGUI();
-    }
-
-    public TriggerValidationResultsDialog(JDialog dialog, TriggerValidationResults results) {
-        super(dialog, true);
-
-        this.results = results;
-
-        initGUI();
-    }
-
-    public static void showValidationResults(JDialog parent, TriggerValidationResults results) {
-        TriggerValidationResultsDialog dialog = new TriggerValidationResultsDialog(parent, results);
-        dialog.setVisible(true); // blocks until user closes
-    }
-
-    private void closeButtonActionPerformed(ActionEvent evt) {
-        log.debug("closeButton.actionPerformed, event=" + evt);
-
-        setVisible(false);
-    }
-
-    private void initGUI() {
-        try {
-            {
-                setTitle("Trigger Validation Errors");
-                getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-                getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            }
-            this.setSize(1042, 405);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private JPanel getDataPanel() {
-        if (dataPanel == null) {
-            dataPanel = new JPanel();
-            BorderLayout dataPanelLayout = new BorderLayout();
-            dataPanel.setLayout(dataPanelLayout);
-            dataPanel.add(getReportScrollPane(), BorderLayout.CENTER);
-        }
-        return dataPanel;
-    }
-
-    private JPanel getButtonPanel() {
-        if (buttonPanel == null) {
-            buttonPanel = new JPanel();
-            buttonPanel.add(getCloseButton());
-        }
-        return buttonPanel;
-    }
-
-    private JButton getCloseButton() {
-        if (closeButton == null) {
-            closeButton = new JButton();
-            closeButton.setText("close");
-            closeButton.addActionListener(this::closeButtonActionPerformed);
-        }
-        return closeButton;
-    }
-
-    private JScrollPane getReportScrollPane() {
-        if (reportScrollPane == null) {
-            reportScrollPane = new JScrollPane();
-            reportScrollPane.setViewportView(getReportTextArea());
-        }
-        return reportScrollPane;
-    }
-
-    private JTextArea getReportTextArea() {
-        if (reportTextArea == null) {
-            reportTextArea = new JTextArea();
-            reportTextArea.setText(results.errorReport());
-            reportTextArea.setEditable(false);
-        }
-        return reportTextArea;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggersRowModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggersRowModel.java
deleted file mode 100644
index 56d9395..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggersRowModel.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.util.Date;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-
-import org.netbeans.swing.outline.RowModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.pipeline.definition.AuditInfo;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.services.security.User;
-
-public class TriggersRowModel implements RowModel {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(TriggersRowModel.class);
-
-    private TriggersTreeModel treeModel = null;
-
-    public TriggersRowModel(TriggersTreeModel treeModel) {
-        this.treeModel = treeModel;
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 4;
-    }
-
-    @Override
-    public boolean isCellEditable(Object node, int column) {
-        return false;
-    }
-
-    @Override
-    public void setValueFor(Object node, int column, Object value) {
-        // not editable
-    }
-
-    @Override
-    public Object getValueFor(Object treeNode, int columnIndex) {
-        treeModel.validityCheck();
-        Object node = ((DefaultMutableTreeNode) treeNode).getUserObject();
-
-        if (!(node instanceof PipelineDefinition)) {
-            return "";
-        }
-        PipelineDefinition trigger = (PipelineDefinition) node;
-
-        AuditInfo auditInfo = trigger.getAuditInfo();
-
-        User lastChangedUser = null;
-        Date lastChangedTime = null;
-
-        if (auditInfo != null) {
-            lastChangedUser = auditInfo.getLastChangedUser();
-            lastChangedTime = auditInfo.getLastChangedTime();
-        }
-
-        switch (columnIndex) {
-            case 0:
-                return trigger.getName();
-            case 1:
-                if (lastChangedUser != null) {
-                    return lastChangedUser.getLoginName();
-                } else {
-                    return "---";
-                }
-            case 2:
-                if (lastChangedTime != null) {
-                    return lastChangedTime;
-                } else {
-                    return "---";
-                }
-            case 3:
-                return trigger.getNodes().size();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return String.class;
-            case 1:
-                return String.class;
-            case 2:
-                return Object.class;
-            case 3:
-                return Integer.class;
-            default:
-                return String.class;
-        }
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Name";
-            case 1:
-                return "User";
-            case 2:
-                return "Mod. Time";
-            case 3:
-                return "Node Count";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggersTableModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggersTableModel.java
deleted file mode 100644
index fbb701a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggersTableModel.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.pipeline.definition.AuditInfo;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.services.security.User;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseModel;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-
-@SuppressWarnings("serial")
-public class TriggersTableModel extends AbstractDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(TriggersTableModel.class);
-
-    private List<PipelineDefinition> pipelines = new LinkedList<>();
-    private final PipelineDefinitionCrudProxy pipelineDefinitionCrud;
-
-    public TriggersTableModel() {
-        pipelineDefinitionCrud = new PipelineDefinitionCrudProxy();
-    }
-
-    @Override
-    public void loadFromDatabase() throws PipelineException {
-        try {
-            if (pipelines != null) {
-                log.info("Clearing the Hibernate cache of all loaded triggers");
-                pipelineDefinitionCrud.evictAll(pipelines); // clear the cache
-            }
-
-            pipelines = pipelineDefinitionCrud.retrieveLatestVersions();
-        } catch (ConsoleSecurityException ignore) {
-        }
-        fireTableDataChanged();
-    }
-
-    /**
-     * Returns true if a trigger already exists with the specified name. checked when the operator
-     * changes the trigger name so we can warn them before we get a database constraint violation.
-     *
-     * @param name
-     * @return
-     */
-    public PipelineDefinition triggerByName(String name) {
-        validityCheck();
-        for (PipelineDefinition triggerDef : pipelines) {
-            if (name.equals(triggerDef.getName().getName())) {
-                return triggerDef;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public int getRowCount() {
-        validityCheck();
-        return pipelines.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 3;
-    }
-
-    public PipelineDefinition getTriggerAt(int rowIndex) {
-        validityCheck();
-        return pipelines.get(rowIndex);
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        validityCheck();
-        PipelineDefinition trigger = pipelines.get(rowIndex);
-
-        AuditInfo auditInfo = trigger.getAuditInfo();
-
-        User lastChangedUser = null;
-        Date lastChangedTime = null;
-
-        if (auditInfo != null) {
-            lastChangedUser = auditInfo.getLastChangedUser();
-            lastChangedTime = auditInfo.getLastChangedTime();
-        }
-
-        switch (columnIndex) {
-            case 0:
-                return trigger.getName();
-            case 1:
-                if (lastChangedUser != null) {
-                    return lastChangedUser.getLoginName();
-                } else {
-                    return "---";
-                }
-            case 2:
-                if (lastChangedTime != null) {
-                    return lastChangedTime;
-                } else {
-                    return "---";
-                }
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex) {
-        validityCheck();
-
-        switch (columnIndex) {
-            case 0:
-                return String.class;
-            case 1:
-                return String.class;
-            case 2:
-                return Object.class;
-            default:
-                return String.class;
-        }
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Name";
-            case 1:
-                return "User";
-            case 2:
-                return "Mod. Time";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggersTreeModel.java b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggersTreeModel.java
deleted file mode 100644
index 75b88ab..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggersTreeModel.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package gov.nasa.ziggy.ui.ops.triggers;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.tree.AbstractLayoutCache;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreePath;
-
-import org.netbeans.swing.outline.Outline;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.pipeline.definition.Group;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.ui.ConsoleSecurityException;
-import gov.nasa.ziggy.ui.models.ConsoleDatabaseModel;
-import gov.nasa.ziggy.ui.models.DatabaseModelRegistry;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
-
-/**
- * Tree model that groups by Group. For use in Outline.
- *
- * @author Todd Klaus
- */
-@SuppressWarnings("serial")
-public class TriggersTreeModel extends DefaultTreeModel implements ConsoleDatabaseModel {
-    private static final Logger log = LoggerFactory.getLogger(TriggersTreeModel.class);
-
-    private List<PipelineDefinition> defaultGroupTriggers = new LinkedList<>();
-    private Map<Group, List<PipelineDefinition>> triggers = new HashMap<>();
-    private Map<String, PipelineDefinition> triggersByName = new HashMap<>();
-
-    private final PipelineDefinitionCrudProxy pipelineDefinitionCrud;
-
-    private final DefaultMutableTreeNode rootNode;
-    private DefaultMutableTreeNode defaultGroupNode;
-    private Map<String, DefaultMutableTreeNode> groupNodes;
-
-    private boolean modelValid = false;
-
-    private HashMap<String, Boolean> expansionState;
-    private boolean defaultGroupExpansionState;
-
-    private Outline triggersOutline;
-
-    public TriggersTreeModel() {
-        super(new DefaultMutableTreeNode(""));
-        rootNode = (DefaultMutableTreeNode) getRoot();
-        pipelineDefinitionCrud = new PipelineDefinitionCrudProxy();
-        DatabaseModelRegistry.registerModel(this);
-    }
-
-    public Outline getTriggersOutline() {
-        return triggersOutline;
-    }
-
-    public void setTriggersOutline(Outline triggersOutline) {
-        this.triggersOutline = triggersOutline;
-    }
-
-    public void loadFromDatabase() throws PipelineException {
-        recordExpansionState();
-        reloadModel();
-        applyExpansionState();
-
-        modelValid = true;
-    }
-
-    private void reloadModel() {
-        List<PipelineDefinition> allTriggers = null;
-
-        try {
-            if (triggers != null) {
-                log.debug("Clearing the Hibernate cache of all loaded triggers");
-                for (List<PipelineDefinition> pipelineList : triggers.values()) {
-                    pipelineDefinitionCrud.evictAll(pipelineList); // clear the cache
-                }
-            }
-
-            if (defaultGroupTriggers != null) {
-                pipelineDefinitionCrud.evictAll(defaultGroupTriggers); // clear the cache
-            }
-
-            defaultGroupTriggers = new LinkedList<>();
-            triggers = new HashMap<>();
-            triggersByName = new HashMap<>();
-            groupNodes = new HashMap<>();
-
-            allTriggers = pipelineDefinitionCrud.retrieveLatestVersions();
-        } catch (ConsoleSecurityException ignore) {
-            return;
-        }
-
-        for (PipelineDefinition trigger : allTriggers) {
-            triggersByName.put(trigger.getName().getName(), trigger);
-
-            Group group = trigger.getGroup();
-
-            if (group == null) {
-                // default group
-                defaultGroupTriggers.add(trigger);
-            } else {
-                List<PipelineDefinition> groupList = triggers.get(group);
-
-                if (groupList == null) {
-                    groupList = new LinkedList<>();
-                    triggers.put(group, groupList);
-                }
-
-                groupList.add(trigger);
-            }
-        }
-
-        // create the tree
-        rootNode.removeAllChildren();
-        defaultGroupNode = new DefaultMutableTreeNode("<Default Group>");
-        insertNodeInto(defaultGroupNode, rootNode, rootNode.getChildCount());
-
-        for (PipelineDefinition trigger : defaultGroupTriggers) {
-            DefaultMutableTreeNode triggerNode = new DefaultMutableTreeNode(trigger);
-            insertNodeInto(triggerNode, defaultGroupNode, defaultGroupNode.getChildCount());
-        }
-
-        // sort groups alphabetically
-
-        Set<Group> groupsSet = triggers.keySet();
-        List<Group> groupsList = new ArrayList<>(groupsSet);
-        Collections.sort(groupsList, Comparator.comparing(Group::getName));
-
-        for (Group group : groupsList) {
-            DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group.getName());
-            insertNodeInto(groupNode, rootNode, rootNode.getChildCount());
-            groupNodes.put(group.getName(), groupNode);
-
-            List<PipelineDefinition> groupTriggers = triggers.get(group);
-
-            for (PipelineDefinition trigger : groupTriggers) {
-                DefaultMutableTreeNode triggerNode = new DefaultMutableTreeNode(trigger);
-                insertNodeInto(triggerNode, groupNode, groupNode.getChildCount());
-            }
-        }
-
-        reload();
-
-        log.debug("triggersTreeModel: done loading");
-    }
-
-    public DefaultMutableTreeNode groupNode(String groupName) {
-        return groupNodes.get(groupName);
-    }
-
-    public Map<String, DefaultMutableTreeNode> getGroupNodes() {
-        return groupNodes;
-    }
-
-    /**
-     * Returns true if a trigger already exists with the specified name. checked when the operator
-     * changes the trigger name so we can warn them before we get a database constraint violation.
-     *
-     * @param name
-     * @return
-     */
-    public PipelineDefinition triggerByName(String name) {
-        return triggersByName.get(name);
-    }
-
-    @Override
-    public void invalidateModel() {
-        modelValid = false;
-    }
-
-    /**
-     * Reload the model if it has been marked invalid Should only be called by TriggersRowModel
-     */
-    void validityCheck() {
-        if (!modelValid) {
-            log.debug("Model invalid for " + this.getClass().getSimpleName()
-                + ", loading data from database...");
-            loadFromDatabase();
-        }
-    }
-
-    public DefaultMutableTreeNode getDefaultGroupNode() {
-        return defaultGroupNode;
-    }
-
-    public DefaultMutableTreeNode getRootNode() {
-        return rootNode;
-    }
-
-    private void recordExpansionState() {
-        expansionState = new HashMap<>();
-        if (triggersOutline != null) {
-            AbstractLayoutCache layoutCache = triggersOutline.getLayoutCache();
-
-            Map<String, DefaultMutableTreeNode> groupNodes = getGroupNodes();
-            for (String groupName : groupNodes.keySet()) {
-                DefaultMutableTreeNode node = groupNodes.get(groupName);
-                boolean isExpanded = layoutCache.isExpanded(new TreePath(node.getPath()));
-
-                expansionState.put(groupName, isExpanded);
-            }
-
-            defaultGroupExpansionState = layoutCache
-                .isExpanded(new TreePath(getDefaultGroupNode().getPath()));
-        }
-    }
-
-    private void applyExpansionState() {
-        if (triggersOutline != null) {
-            Map<String, DefaultMutableTreeNode> groupNodes = getGroupNodes();
-
-            for (String groupName : expansionState.keySet()) {
-                DefaultMutableTreeNode node = groupNodes.get(groupName);
-                if (node != null) {
-                    boolean shouldExpand = expansionState.get(groupName);
-                    if (shouldExpand) {
-                        triggersOutline.expandPath(new TreePath(node.getPath()));
-                    } else {
-                        triggersOutline.collapsePath(new TreePath(node.getPath()));
-                    }
-                }
-            }
-
-            if (defaultGroupExpansionState) {
-                triggersOutline.expandPath(new TreePath(getDefaultGroupNode().getPath()));
-            } else {
-                triggersOutline.collapsePath(new TreePath(getDefaultGroupNode().getPath()));
-            }
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/package.html b/src/main/java/gov/nasa/ziggy/ui/ops/triggers/package.html
deleted file mode 100644
index e86221a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/package.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-  <body>
-    <p>
-      The first sentence is used as the brief description of the
-      package and appears at the top of the package documentation.
-      Additional sentences will appear at the bottom in the
-      Description section.
-    </p>
-    <dl>
-      <dt>Author</dt>
-      <dd>Bill Wohler</dd>
-      <dd>PT</dd>
-    </dl>
-    
-    <h2>Headings</h2>
-
-    <p>
-      Additional headings should use h2.
-    </p>
-
-    <h3>Sub-headings</h3>
-    
-    <p>
-      Sub-headings should use h3 and so on.
-    </p>
-
-  </body>
-</html>
diff --git a/src/main/java/gov/nasa/ziggy/ui/parameters/EditParameterSetDialog.java b/src/main/java/gov/nasa/ziggy/ui/parameters/EditParameterSetDialog.java
new file mode 100644
index 0000000..28e86fe
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/parameters/EditParameterSetDialog.java
@@ -0,0 +1,208 @@
+package gov.nasa.ziggy.ui.parameters;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.EXPORT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.IMPORT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.RESTORE_DEFAULTS;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SAVE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.io.File;
+
+import javax.swing.GroupLayout;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import com.l2fprod.common.propertysheet.PropertySheetPanel;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersUtils;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.PropertySheetHelper;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.proxy.PipelineOperationsProxy;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class EditParameterSetDialog extends javax.swing.JDialog {
+    private final ParameterSet parameterSet;
+    private Parameters currentParams;
+    private PropertySheetPanel paramsPropPanel;
+    private JTextArea descriptionTextArea;
+
+    private boolean cancelled;
+    private boolean isNew;
+
+    public EditParameterSetDialog(Window owner, ParameterSet parameterSet, boolean isNew) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.parameterSet = parameterSet;
+        this.isNew = isNew;
+
+        initializeCurrentParamsfromDefinition();
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void initializeCurrentParamsfromDefinition() {
+        currentParams = parameterSet.parametersInstance();
+
+        // Make a copy of currentParams; otherwise the property sheet panel will overwrite the
+        // original parameters and the updateParameterSet() call in save() won't notice that
+        // anything has changed.
+        currentParams.setParameters(currentParams.getParametersCopy());
+    }
+
+    private void buildComponent() {
+        setTitle("Edit parameter set");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(
+            createButtonPanel(createButton(SAVE, this::save), createButton(CANCEL, this::cancel)),
+            BorderLayout.SOUTH);
+
+        populateParamsPropertySheet();
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        JLabel name = boldLabel("Name");
+        JLabel nameTextField = new JLabel(parameterSet.getName());
+
+        JLabel version = boldLabel("Version");
+        JLabel versionTextField = new JLabel(Integer.toString(parameterSet.getVersion()));
+
+        JLabel description = boldLabel("Description");
+        descriptionTextArea = new JTextArea(parameterSet.getDescription());
+        JScrollPane descriptionScrollPane = new JScrollPane(descriptionTextArea);
+
+        JPanel buttonPanel = ZiggySwingUtils.createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            ZiggySwingUtils.createButton(RESTORE_DEFAULTS, this::defaults),
+            ZiggySwingUtils.createButton(IMPORT, this::importParameters),
+            ZiggySwingUtils.createButton(EXPORT, this::exportParameters));
+
+        JLabel parameters = boldLabel("Parameters - " + parameterSet.clazz().getSimpleName());
+        paramsPropPanel = new PropertySheetPanel();
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(name)
+            .addComponent(nameTextField)
+            .addComponent(version)
+            .addComponent(versionTextField)
+            .addComponent(description)
+            .addComponent(descriptionScrollPane)
+            .addComponent(parameters)
+            .addComponent(buttonPanel)
+            .addComponent(paramsPropPanel));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(name)
+            .addComponent(nameTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(version)
+            .addComponent(versionTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(description)
+            .addComponent(descriptionScrollPane)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(parameters)
+            .addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(paramsPropPanel));
+
+        return dataPanel;
+    }
+
+    private void defaults(ActionEvent evt) {
+        paramsPropPanel.readFromObject(currentParams);
+    }
+
+    private void importParameters(ActionEvent evt) {
+        try {
+            JFileChooser fc = new JFileChooser();
+            int returnVal = fc.showOpenDialog(this);
+
+            if (returnVal == JFileChooser.APPROVE_OPTION) {
+                File file = fc.getSelectedFile();
+                currentParams = ParametersUtils.importParameters(file, currentParams.getClass());
+                paramsPropPanel.readFromObject(currentParams);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void exportParameters(ActionEvent evt) {
+        try {
+            JFileChooser fc = new JFileChooser();
+            int returnVal = fc.showSaveDialog(this);
+
+            if (returnVal == JFileChooser.APPROVE_OPTION) {
+                File file = fc.getSelectedFile();
+                paramsPropPanel.writeToObject(currentParams);
+                ParametersUtils.exportParameters(file, currentParams);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void save(ActionEvent evt) {
+        try {
+            paramsPropPanel.writeToObject(currentParams);
+            PipelineOperationsProxy pipelineOperations = new PipelineOperationsProxy();
+            pipelineOperations.updateParameterSet(parameterSet, currentParams,
+                descriptionTextArea.getText(), isNew);
+            setVisible(false);
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void cancel(ActionEvent evt) {
+        cancelled = true;
+        setVisible(false);
+    }
+
+    private void populateParamsPropertySheet() {
+        if (currentParams != null) {
+            try {
+                PropertySheetHelper.populatePropertySheet(currentParams, paramsPropPanel);
+            } catch (Exception e) {
+                throw new PipelineException("Failed to populate property sheet from parameters", e);
+            }
+        }
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public static void main(String[] args) {
+        ParameterSet parameters = new ParameterSet("test");
+        parameters.setTypedParameters(new Parameters().getParameters());
+        ZiggySwingUtils.displayTestDialog(new EditParameterSetDialog(null, parameters, false));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/parameters/ImportParamLibDialog.java b/src/main/java/gov/nasa/ziggy/ui/parameters/ImportParamLibDialog.java
new file mode 100644
index 0000000..f8c6e76
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/parameters/ImportParamLibDialog.java
@@ -0,0 +1,325 @@
+package gov.nasa.ziggy.ui.parameters;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.IMPORT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REPORT;
+import static gov.nasa.ziggy.ui.util.HtmlBuilder.htmlBuilder;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+
+import org.netbeans.swing.etable.ETable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.parameters.ParameterSetDescriptor;
+import gov.nasa.ziggy.parameters.ParameterSetDescriptor.State;
+import gov.nasa.ziggy.ui.util.TextualReportDialog;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.AbstractZiggyTableModel;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+import gov.nasa.ziggy.util.StringUtils;
+
+/**
+ * This dialog is used to import a parameter library from disk into the parameter library in the
+ * database. It is initialized by running the parameter library importer in "dry run" mode, which
+ * tells the user what actions will take effect when the import is run for real. The user can also
+ * choose to exclude some of the parameter sets from the import if desired.
+ *
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class ImportParamLibDialog extends JDialog {
+    private static final Logger log = LoggerFactory.getLogger(ImportParamLibDialog.class);
+
+    private ETable paramImportTable;
+    private ParamLibImportTableModel paramImportTableModel;
+    private boolean cancelled;
+    private List<ParameterSetDescriptor> dryRunResults;
+
+    public ImportParamLibDialog(Window owner, List<ParameterSetDescriptor> dryRunResults) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        paramImportTableModel = new ParamLibImportTableModel(dryRunResults);
+        this.dryRunResults = dryRunResults;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Import parameter library");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(ZiggySwingUtils.createButtonPanel(createButton(REPORT, this::report),
+            createButton(IMPORT, this::importParameterLibrary), createButton(CANCEL, this::cancel)),
+            BorderLayout.SOUTH);
+
+        setMinimumSize(new Dimension(700, 525));
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        paramImportTable = new ZiggyTable<>(paramImportTableModel).getTable();
+        paramImportTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+        paramImportTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent evt) {
+                tableMouseClicked(evt, paramImportTable);
+            }
+        });
+
+        JPanel dataPanel = new JPanel();
+        dataPanel.setLayout(new BorderLayout());
+        dataPanel.add(new JScrollPane(paramImportTable), BorderLayout.CENTER);
+        return dataPanel;
+    }
+
+    private void tableMouseClicked(MouseEvent evt, ETable table) {
+        if (evt.getClickCount() == 2) {
+            int tableRow = table.rowAtPoint(evt.getPoint());
+            int selectedModelRow = table.convertRowIndexToModel(tableRow);
+            log.info("[DC] selectedModelRow={}", selectedModelRow);
+
+            ParameterSetDescriptor desc = paramImportTableModel.getContentAtRow(selectedModelRow);
+            String report = "Library Version:\n\n" + desc.getLibraryProps()
+                + "\n\nImport Version:\n\n" + desc.getFileProps();
+            TextualReportDialog.showReport(this, report, "Import report");
+        }
+    }
+
+    private void importParameterLibrary(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void cancel(ActionEvent evt) {
+        cancelled = true;
+        setVisible(false);
+    }
+
+    private void report(ActionEvent evt) {
+
+        StringBuilder report = new StringBuilder();
+
+        List<String> excludes = paramImportTableModel.getExcludeList();
+        Map<ParameterSetDescriptor.State, List<ParameterSetDescriptor>> binnedByState = new HashMap<>();
+
+        for (ParameterSetDescriptor d : dryRunResults) {
+            String name = d.getName();
+            State descState = d.getState();
+
+            if (excludes.contains(name)) {
+                // override state since the user de-selected this one for import
+                descState = ParameterSetDescriptor.State.IGNORE;
+            }
+
+            List<ParameterSetDescriptor> list = binnedByState.get(descState);
+            if (list == null) {
+                list = new LinkedList<>();
+                binnedByState.put(descState, list);
+            }
+            list.add(d);
+        }
+
+        report.append("Parameter sets to be created:\n\n");
+        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.CREATE));
+        report.append("Parameter sets to be updated:\n\n");
+        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.UPDATE));
+        report.append("Parameter sets in the library, but not in the export:\n\n");
+        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.LIBRARY_ONLY));
+        report.append("Parameter sets that are the same (no change needed):\n\n");
+        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.SAME));
+        report.append("Parameter sets to be ignored (on the exclude list):\n\n");
+        appendToReport(report, binnedByState.get(ParameterSetDescriptor.State.IGNORE));
+
+        TextualReportDialog.showReport(this, report.toString(), "Import report");
+    }
+
+    private void appendToReport(StringBuilder report, List<ParameterSetDescriptor> descs) {
+        if (descs == null || descs.isEmpty()) {
+            report.append("NONE\n");
+        } else {
+            int maxNameLength = 0;
+            for (ParameterSetDescriptor desc : descs) {
+                int nameLength = desc.getName().length();
+                if (nameLength > maxNameLength) {
+                    maxNameLength = nameLength;
+                }
+            }
+
+            for (ParameterSetDescriptor desc : descs) {
+                report.append(StringUtils.pad(desc.getName(), maxNameLength + 5) + "["
+                    + desc.shortClassName() + "]\n");
+            }
+        }
+        report.append("\n\n");
+    }
+
+    public static List<String> selectParamSet(Window owner,
+        List<ParameterSetDescriptor> dryRunResults) {
+
+        ImportParamLibDialog dialog = new ImportParamLibDialog(owner, dryRunResults);
+        dialog.setVisible(true);
+
+        if (!dialog.cancelled) {
+            return dialog.paramImportTableModel.getExcludeList();
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(
+            new ImportParamLibDialog(null, List.of(new ParameterSetDescriptor("name", "class"))));
+    }
+
+    private static class ParamLibImportTableModel
+        extends AbstractZiggyTableModel<ParameterSetDescriptor> {
+
+        private static final String[] COLUMN_NAMES = { "Include", "Parameter set name", "Class",
+            "Action" };
+
+        private List<ParameterSetDescriptor> paramMap = new LinkedList<>();
+        private List<Boolean> includeFlags = new ArrayList<>();
+
+        public ParamLibImportTableModel(List<ParameterSetDescriptor> paramMap) {
+            this.paramMap = paramMap;
+
+            // Include everything by default.
+            includeFlags = new ArrayList<>();
+            for (@SuppressWarnings("unused")
+            ParameterSetDescriptor param : paramMap) {
+                includeFlags.add(true);
+            }
+        }
+
+        public List<String> getExcludeList() {
+            List<String> excludeList = new LinkedList<>();
+
+            for (int index = 0; index < paramMap.size(); index++) {
+                if (!includeFlags.get(index)) {
+                    excludeList.add(paramMap.get(index).getName());
+                }
+            }
+            return excludeList;
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public int getRowCount() {
+            return paramMap.size();
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            // String name = names.get(rowIndex);
+            boolean include = includeFlags.get(rowIndex);
+            ParameterSetDescriptor param = paramMap.get(rowIndex);
+            String className = param.shortClassName();
+
+            switch (columnIndex) {
+                case 0:
+                    return include;
+                case 1:
+                    return param.getName();
+                case 2:
+                    return className;
+                case 3:
+                    State state = param.getState();
+                    String color = "black";
+
+                    switch (state) {
+                        case CREATE:
+                            color = "blue";
+                            break;
+
+                        case IGNORE:
+                        case CLASS_MISSING:
+                            color = "maroon";
+                            break;
+
+                        case SAME:
+                            color = "green";
+                            break;
+
+                        case UPDATE:
+                            color = "red";
+                            break;
+
+                        case LIBRARY_ONLY:
+                            color = "purple";
+                            break;
+
+                        case NONE:
+                            color = "black";
+                            break;
+
+                        default:
+                    }
+
+                    return htmlBuilder().appendBoldColor(state.toString(), color);
+                default:
+                    throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            }
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public boolean isCellEditable(int rowIndex, int columnIndex) {
+            if (columnIndex == 0) {
+                return true;
+            }
+            return super.isCellEditable(rowIndex, columnIndex);
+        }
+
+        @Override
+        public void setValueAt(Object value, int rowIndex, int columnIndex) {
+            if (columnIndex != 0) {
+                throw new IllegalArgumentException("read-only columnIndex = " + columnIndex);
+            }
+            Boolean newInclude = (Boolean) value;
+            includeFlags.set(rowIndex, newInclude);
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            if (columnIndex == 0) {
+                return Boolean.class;
+            }
+            return super.getColumnClass(columnIndex);
+        }
+
+        @Override
+        public Class<ParameterSetDescriptor> tableModelContentClass() {
+            return ParameterSetDescriptor.class;
+        }
+
+        @Override
+        public ParameterSetDescriptor getContentAtRow(int row) {
+            return paramMap.get(row);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/parameters/NewParameterSetDialog.java b/src/main/java/gov/nasa/ziggy/ui/parameters/NewParameterSetDialog.java
new file mode 100644
index 0000000..74c274f
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/parameters/NewParameterSetDialog.java
@@ -0,0 +1,158 @@
+package gov.nasa.ziggy.ui.parameters;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.OK;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.SwingUtilities;
+
+import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class NewParameterSetDialog extends javax.swing.JDialog {
+
+    private ParameterClassSelectorPanel parameterClassSelectorPanel;
+    private JTextArea descriptionTextArea;
+    private JTextField nameTextField;
+
+    private boolean cancelled;
+    private ParameterSet newParamSet;
+
+    public NewParameterSetDialog(Window owner) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    public static ParameterSet createParameterSet(Component owner) {
+        NewParameterSetDialog dialog = new NewParameterSetDialog(
+            SwingUtilities.getWindowAncestor(owner));
+        dialog.setVisible(true);
+
+        if (!dialog.cancelled) {
+            return dialog.newParamSet;
+        }
+        return null;
+    }
+
+    private void buildComponent() {
+        setTitle("New parameter set");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(
+            createButtonPanel(createButton(OK, this::ok), createButton(CANCEL, this::cancel)),
+            BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        JLabel name = boldLabel("Name");
+        nameTextField = new JTextField();
+
+        JLabel description = boldLabel("Description");
+        descriptionTextArea = new JTextArea();
+        JScrollPane descriptionScrollPane = new JScrollPane(descriptionTextArea);
+
+        JLabel type = boldLabel("Type");
+        parameterClassSelectorPanel = new ParameterClassSelectorPanel();
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(name)
+            .addComponent(nameTextField)
+            .addComponent(description)
+            .addComponent(descriptionScrollPane)
+            .addComponent(type)
+            .addComponent(parameterClassSelectorPanel));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(name)
+            .addComponent(nameTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(description)
+            .addComponent(descriptionScrollPane, GroupLayout.PREFERRED_SIZE,
+                GroupLayout.DEFAULT_SIZE, 100)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(type)
+            .addComponent(parameterClassSelectorPanel));
+
+        return dataPanel;
+    }
+
+    private void ok(ActionEvent evt) {
+
+        String paramSetName = nameTextField.getText();
+
+        if (paramSetName.isEmpty()) {
+            JOptionPane.showMessageDialog(this,
+                "Please enter a unique name for the new parameter set", "Error",
+                JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
+        String paramSetDesc = descriptionTextArea.getText();
+
+        ClassWrapper<Parameters> paramSetClassWrapper = parameterClassSelectorPanel
+            .getSelectedElement();
+
+        if (paramSetClassWrapper == null) {
+            JOptionPane.showMessageDialog(this, "Please select a class for the new parameter set",
+                "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
+        newParamSet = new ParameterSet(paramSetName);
+        newParamSet.setDescription(paramSetDesc);
+        Class<? extends Parameters> paramSetClass = paramSetClassWrapper.getClazz();
+        try {
+            newParamSet.setTypedParameters(
+                paramSetClass.getDeclaredConstructor().newInstance().getParameters());
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+            | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+            JOptionPane.showMessageDialog(this,
+                "Unable to create instance of " + paramSetClass.getName(), "Error",
+                JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+
+        setVisible(false);
+    }
+
+    private void cancel(ActionEvent evt) {
+        cancelled = true;
+        setVisible(false);
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new NewParameterSetDialog(null));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterClassListModel.java b/src/main/java/gov/nasa/ziggy/ui/parameters/ParameterClassListModel.java
similarity index 96%
rename from src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterClassListModel.java
rename to src/main/java/gov/nasa/ziggy/ui/parameters/ParameterClassListModel.java
index cb6505a..8824d13 100644
--- a/src/main/java/gov/nasa/ziggy/ui/config/parameters/ParameterClassListModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/parameters/ParameterClassListModel.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.config.parameters;
+package gov.nasa.ziggy.ui.parameters;
 
 import java.util.List;
 
diff --git a/src/main/java/gov/nasa/ziggy/ui/parameters/ParameterClassSelectorPanel.java b/src/main/java/gov/nasa/ziggy/ui/parameters/ParameterClassSelectorPanel.java
new file mode 100644
index 0000000..3306b01
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/parameters/ParameterClassSelectorPanel.java
@@ -0,0 +1,48 @@
+package gov.nasa.ziggy.ui.parameters;
+
+import java.awt.BorderLayout;
+
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+
+import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+
+/**
+ * @author Todd Klaus
+ */
+@SuppressWarnings("serial")
+public class ParameterClassSelectorPanel extends javax.swing.JPanel {
+    private JList<ClassWrapper<Parameters>> paramClassList;
+    private ParameterClassListModel paramClassListModel;
+
+    public ParameterClassSelectorPanel() {
+        buildComponent();
+    }
+
+    private void buildComponent() {
+        try {
+            paramClassListModel = new AllParameterClassListModel();
+            paramClassList = new JList<>(paramClassListModel);
+            setLayout(new BorderLayout());
+            add(new JScrollPane(paramClassList), BorderLayout.CENTER);
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    public ClassWrapper<Parameters> getSelectedElement() {
+        int selectedIndex = paramClassList.getSelectedIndex();
+        if (selectedIndex != -1) {
+            return paramClassListModel.getElementAt(selectedIndex);
+        }
+        return null;
+    }
+
+    private static class AllParameterClassListModel extends ParameterClassListModel {
+        public AllParameterClassListModel() throws Exception {
+            super(ParametersClassCache.getCache());
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParametersClassCache.java b/src/main/java/gov/nasa/ziggy/ui/parameters/ParametersClassCache.java
similarity index 90%
rename from src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParametersClassCache.java
rename to src/main/java/gov/nasa/ziggy/ui/parameters/ParametersClassCache.java
index c2a18ed..fc8d71c 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParametersClassCache.java
+++ b/src/main/java/gov/nasa/ziggy/ui/parameters/ParametersClassCache.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.ops.parameters;
+package gov.nasa.ziggy.ui.parameters;
 
 import java.util.Collections;
 import java.util.LinkedList;
@@ -7,7 +7,7 @@
 
 import gov.nasa.ziggy.parameters.Parameters;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.ui.common.ClasspathUtils;
+import gov.nasa.ziggy.ui.util.ClasspathUtils;
 
 /**
  * Cache that holds {@link ClassWrapper} objects for all implementations of the {@link Parameters}
@@ -65,8 +65,7 @@ public static synchronized List<ClassWrapper<Parameters>> getCache(
     private static synchronized void initializeCache() throws Exception {
         cache = new LinkedList<>();
 
-        ClasspathUtils classpathUtils = new ClasspathUtils();
-        Set<Class<? extends Parameters>> detectedClasses = classpathUtils
+        Set<Class<? extends Parameters>> detectedClasses = ClasspathUtils
             .scanForInterfaceImpl(Parameters.class);
 
         for (Class<? extends Parameters> clazz : detectedClasses) {
diff --git a/src/main/java/gov/nasa/ziggy/ui/parameters/ViewEditParameterSetsPanel.java b/src/main/java/gov/nasa/ziggy/ui/parameters/ViewEditParameterSetsPanel.java
new file mode 100644
index 0000000..84d2043
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/parameters/ViewEditParameterSetsPanel.java
@@ -0,0 +1,383 @@
+package gov.nasa.ziggy.ui.parameters;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.EXPORT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.IMPORT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REPORT;
+
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import org.netbeans.swing.outline.Outline;
+import org.netbeans.swing.outline.RowModel;
+
+import gov.nasa.ziggy.parameters.ParameterSetDescriptor;
+import gov.nasa.ziggy.pipeline.definition.AuditInfo;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.services.security.Privilege;
+import gov.nasa.ziggy.services.security.User;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.TextualReportDialog;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
+import gov.nasa.ziggy.ui.util.models.ZiggyTreeModel;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.ParameterSetCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.ParametersOperationsProxy;
+import gov.nasa.ziggy.ui.util.proxy.PipelineOperationsProxy;
+import gov.nasa.ziggy.ui.util.proxy.RetrieveLatestVersionsCrudProxy;
+import gov.nasa.ziggy.ui.util.table.AbstractViewEditPanel;
+
+/**
+ * View / Edit panel for {@link ParameterSet} instances. The user can also use this panel to move
+ * parameter sets into {@link Group}s, which can then be expanded or collapsed.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class ViewEditParameterSetsPanel extends AbstractViewEditPanel<ParameterSet> {
+
+    private static final long serialVersionUID = 20230810L;
+
+    private ParameterSetCrudProxy parameterSetCrud = new ParameterSetCrudProxy();
+    private String defaultParamLibImportExportPath;
+
+    /**
+     * Convenience method that can be used instead of the constructor. Helpful because the row model
+     * for parameter sets needs the tree model in its constructor.
+     */
+    public static ViewEditParameterSetsPanel newInstance() {
+        ZiggyTreeModel<ParameterSet> treeModel = new ZiggyTreeModel<>(new ParameterSetCrudProxy());
+        ParameterSetsRowModel rowModel = new ParameterSetsRowModel(treeModel);
+        return new ViewEditParameterSetsPanel(rowModel, treeModel);
+    }
+
+    public ViewEditParameterSetsPanel(RowModel rowModel, ZiggyTreeModel<ParameterSet> treeModel) {
+        super(rowModel, treeModel, "Name");
+        buildComponent();
+
+        ZiggySwingUtils.addButtonsToPanel(getButtonPanel(),
+            ZiggySwingUtils.createButton(REPORT, this::report),
+            ZiggySwingUtils.createButton(IMPORT, this::importParameterLibrary),
+            ZiggySwingUtils.createButton(EXPORT, this::exportParameterLibrary));
+
+        for (int column = 0; column < ParameterSetsRowModel.COLUMN_WIDTHS.length; column++) {
+            ziggyTable.setPreferredColumnWidth(column, ParameterSetsRowModel.COLUMN_WIDTHS[column]);
+        }
+    }
+
+    private void report(ActionEvent evt) {
+
+        try {
+            CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        Object[] options = { "Formatted", "Colon-delimited" };
+        int n = JOptionPane.showOptionDialog(SwingUtilities.getWindowAncestor(this),
+            "Specify report type", "Report type", JOptionPane.YES_NO_CANCEL_OPTION,
+            JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
+
+        boolean csvMode = n != 0;
+
+        PipelineOperationsProxy ops = new PipelineOperationsProxy();
+        String report = ops.generateParameterLibraryReport(csvMode);
+
+        TextualReportDialog.showReport(SwingUtilities.getWindowAncestor(this), report,
+            "Parameter report");
+    }
+
+    private void importParameterLibrary(ActionEvent evt) {
+
+        try {
+            JFileChooser fc = new JFileChooser(defaultParamLibImportExportPath);
+
+            fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+            fc.setDialogTitle("Select parameter library file to import");
+
+            if (fc.showDialog(this, "Import") == JFileChooser.APPROVE_OPTION) {
+                File file = fc.getSelectedFile();
+                defaultParamLibImportExportPath = file.getAbsolutePath();
+
+                ParametersOperationsProxy paramsOps = new ParametersOperationsProxy();
+                List<ParameterSetDescriptor> dryRunResults = paramsOps
+                    .importParameterLibrary(file.getAbsolutePath(), null, true);
+
+                List<String> excludeList = ImportParamLibDialog
+                    .selectParamSet(SwingUtilities.getWindowAncestor(this), dryRunResults);
+
+                if (excludeList != null) { // null means user cancelled
+                    paramsOps.importParameterLibrary(file.getAbsolutePath(), excludeList, false);
+                }
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void exportParameterLibrary(ActionEvent evt) {
+
+        try {
+            JFileChooser fc = new JFileChooser(defaultParamLibImportExportPath);
+            fc.setDialogTitle("Select the destination file for the parameter library export");
+
+            fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+
+            int returnVal = fc.showDialog(this, "Export");
+
+            if (returnVal == JFileChooser.APPROVE_OPTION) {
+                File file = fc.getSelectedFile();
+                defaultParamLibImportExportPath = file.getAbsolutePath();
+
+                ParametersOperationsProxy paramsOps = new ParametersOperationsProxy();
+                // excludes not supported ATM
+                paramsOps.exportParameterLibrary(file.getAbsolutePath(), null, false);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected Set<OptionalViewEditFunctions> optionalViewEditFunctions() {
+        return Set.of(OptionalViewEditFunctions.DELETE, OptionalViewEditFunctions.NEW,
+            OptionalViewEditFunctions.COPY, OptionalViewEditFunctions.RENAME,
+            OptionalViewEditFunctions.GROUP);
+    }
+
+    @Override
+    protected RetrieveLatestVersionsCrudProxy<ParameterSet> getCrudProxy() {
+        return parameterSetCrud;
+    }
+
+    @Override
+    protected void copy(int row) {
+        checkPrivileges();
+
+        ParameterSet selectedParameterSet = ziggyTable.getContentAtViewRow(row);
+
+        try {
+            String newParameterSetName = JOptionPane.showInputDialog(
+                SwingUtilities.getWindowAncestor(this), "Enter the name for the new parameter set",
+                "New parameter set", JOptionPane.PLAIN_MESSAGE);
+            if (newParameterSetName == null) {
+                return;
+            }
+            if (newParameterSetName.isEmpty()) {
+                MessageUtil.showError(this, "Please enter a parameter set name");
+                return;
+            }
+            ParameterSet newParameterSet = selectedParameterSet.newInstance();
+            newParameterSet.rename(newParameterSetName);
+            showEditDialog(newParameterSet, true);
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void showEditDialog(ParameterSet module, boolean isNew) {
+        try {
+            EditParameterSetDialog dialog = new EditParameterSetDialog(
+                SwingUtilities.getWindowAncestor(this), module, isNew);
+            dialog.setVisible(true);
+
+            if (!dialog.isCancelled()) {
+                ziggyTable.loadFromDatabase();
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected void rename(int row) {
+        checkPrivileges();
+
+        ParameterSet selectedParameterSet = ziggyTable.getContentAtViewRow(row);
+
+        try {
+            String newParameterSetName = JOptionPane.showInputDialog(
+                SwingUtilities.getWindowAncestor(this), "Enter the new name for this parameter set",
+                "Rename parameter set", JOptionPane.PLAIN_MESSAGE);
+            if (newParameterSetName == null) {
+                return;
+            }
+            if (newParameterSetName.isEmpty()) {
+                MessageUtil.showError(this, "Please enter a parameter set name");
+                return;
+            }
+            parameterSetCrud.rename(selectedParameterSet, newParameterSetName);
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected void edit(int row) {
+        checkPrivileges();
+
+        ParameterSet selectedParameterSet = ziggyTable.getContentAtViewRow(row);
+        if (selectedParameterSet != null) {
+            showEditDialog(selectedParameterSet, false);
+        }
+    }
+
+    @Override
+    protected void delete(int row) {
+        checkPrivileges();
+
+        ParameterSet selectedParameterSet = ziggyTable.getContentAtViewRow(row);
+        if (selectedParameterSet.isLocked()) {
+            MessageUtil.showError(this,
+                "Can't delete a locked parameter set. Parameter sets are locked "
+                    + "when referenced by a pipeline instance");
+            return;
+        }
+        int choice = JOptionPane.showConfirmDialog(this,
+            "Are you sure you want to delete parameter set '" + selectedParameterSet.getName()
+                + "'?");
+
+        if (choice == JOptionPane.YES_OPTION) {
+            try {
+                parameterSetCrud.delete(selectedParameterSet);
+                ziggyTable.loadFromDatabase();
+            } catch (Throwable e) {
+                MessageUtil.showError(this, e);
+            }
+        }
+    }
+
+    @Override
+    protected void create() {
+        checkPrivileges();
+
+        setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        ParameterSet newParameterSet = NewParameterSetDialog.createParameterSet(this);
+        setCursor(null);
+
+        if (newParameterSet == null) {
+            return;
+        }
+        parameterSetCrud.save(newParameterSet);
+        ziggyTable.loadFromDatabase();
+    }
+
+    @Override
+    public void refresh() {
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    /**
+     * Implementation of {@link RowModel} for a NetBeans {@link Outline} of {@link ParameterSet}
+     * instances.
+     *
+     * @author PT
+     */
+    private static class ParameterSetsRowModel
+        implements RowModel, TableModelContentClass<ParameterSet> {
+
+        private ZiggyTreeModel<ParameterSet> treeModel;
+
+        private static final String[] COLUMN_NAMES = { "Type", "Version", "Locked", "User",
+            "Modified" };
+        private static final Class<?>[] COLUMN_CLASSES = { String.class, Integer.class,
+            Boolean.class, String.class, Object.class };
+        private static final int[] COLUMN_WIDTHS = { 250, 300, 30, 30, 100, 150 };
+
+        public ParameterSetsRowModel(ZiggyTreeModel<ParameterSet> treeModel) {
+            this.treeModel = treeModel;
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            checkColumnArgument(columnIndex);
+            return COLUMN_CLASSES[columnIndex];
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            checkColumnArgument(column);
+            return COLUMN_NAMES[column];
+        }
+
+        private void checkColumnArgument(int columnIndex) {
+            checkArgument(columnIndex >= 0 && columnIndex < COLUMN_NAMES.length, "column value of "
+                + columnIndex + " outside of expected range from 0 to " + COLUMN_NAMES.length);
+        }
+
+        @Override
+        public Object getValueFor(Object treeNode, int columnIndex) {
+            checkColumnArgument(columnIndex);
+
+            treeModel.validityCheck();
+            Object node = ((DefaultMutableTreeNode) treeNode).getUserObject();
+
+            if (!(node instanceof ParameterSet)) {
+                return null;
+            }
+            ParameterSet parameterSet = (ParameterSet) node;
+
+            AuditInfo auditInfo = parameterSet.getAuditInfo();
+
+            User lastChangedUser = null;
+            Date lastChangedTime = null;
+
+            if (auditInfo != null) {
+                lastChangedUser = auditInfo.getLastChangedUser();
+                lastChangedTime = auditInfo.getLastChangedTime();
+            }
+
+            return switch (columnIndex) {
+                case 0 -> shortClassname(parameterSet.getClassname());
+                case 1 -> parameterSet.getVersion();
+                case 2 -> parameterSet.isLocked();
+                case 3 -> lastChangedUser != null ? lastChangedUser : "---";
+                case 4 -> lastChangedTime != null ? lastChangedTime : "---";
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        private String shortClassname(String longClassname) {
+            String[] splitClassname = longClassname.split("\\.");
+            return splitClassname[splitClassname.length - 1];
+        }
+
+        @Override
+        public boolean isCellEditable(Object node, int column) {
+            return false;
+        }
+
+        @Override
+        public void setValueFor(Object node, int column, Object value) {
+            // Not editable.
+        }
+
+        @Override
+        public Class<ParameterSet> tableModelContentClass() {
+            return ParameterSet.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/module/package.html b/src/main/java/gov/nasa/ziggy/ui/parameters/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/config/module/package.html
rename to src/main/java/gov/nasa/ziggy/ui/parameters/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/EditParametersDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/EditParametersDialog.java
new file mode 100644
index 0000000..64d6efd
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/EditParametersDialog.java
@@ -0,0 +1,117 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+
+/**
+ * Dialog for viewing/editing a {@link Parameters} object.
+ * <p>
+ * This dialog box is generated from the Edit pipeline popup that is launched from the Pipelines
+ * panel.
+ * <p>
+ * The dialog box presents the user with two options: "Close" and "Cancel." If the user chooses
+ * cancel, their changes to the parameter set are abandoned. If the user chooses "Close," the
+ * changes are retained locally (i.e., in the console), but not yet saved. If the user chooses
+ * "Save" from the edit pipelines dialog box, any such retained changes are saved to the database at
+ * that time; if the user chooses "Cancel" from the pipelines dialog box, changes that had been
+ * retained in the console are lost, as are all other changes made since the edit pipelines dialog
+ * box appeared.
+ *
+ * @author Todd Klaus
+ * @author PT
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class EditParametersDialog extends javax.swing.JDialog {
+    private EditParametersPanel parametersPanel;
+    private final String parameterSetName;
+    private final ParametersInterface parameters;
+    private boolean cancelled = false;
+
+    public EditParametersDialog(Window owner, String parameterSetName,
+        ParametersInterface parameters) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.parameterSetName = parameterSetName;
+        this.parameters = parameters;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Edit parameter set");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(
+            createButtonPanel(createButton(CLOSE, this::close), createButton(CANCEL, this::cancel)),
+            BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        JLabel parameterSet = boldLabel("Parameter set");
+        JLabel parameterSetTextField = new JLabel(parameterSetName);
+        JLabel parametersLabel = boldLabel("Parameters");
+        parametersPanel = new EditParametersPanel(parameters);
+
+        // Enclose the panel in another panel to encourage the panel to fill the space.
+        JPanel growPanel = new JPanel(new BorderLayout());
+        growPanel.add(parametersPanel);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(parameterSet)
+            .addComponent(parameterSetTextField)
+            .addComponent(parametersLabel)
+            .addComponent(growPanel));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(parameterSet)
+            .addComponent(parameterSetTextField)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(parametersLabel)
+            .addComponent(growPanel));
+
+        return dataPanel;
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void cancel(ActionEvent evt) {
+        cancelled = true;
+        setVisible(false);
+    }
+
+    public static ParametersInterface editParameters(Window owner, String parameterSetName,
+        ParametersInterface parameters) {
+        EditParametersDialog dialog = new EditParametersDialog(owner, parameterSetName, parameters);
+        dialog.setVisible(true);
+
+        if (dialog.cancelled) {
+            return null;
+        }
+        return dialog.parametersPanel.getParameters();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/EditParametersPanel.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/EditParametersPanel.java
new file mode 100644
index 0000000..c387818
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/EditParametersPanel.java
@@ -0,0 +1,53 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import java.awt.BorderLayout;
+
+import com.l2fprod.common.propertysheet.PropertySheet;
+import com.l2fprod.common.propertysheet.PropertySheetPanel;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.ui.util.PropertySheetHelper;
+
+/**
+ * @author Todd Klaus
+ */
+@SuppressWarnings("serial")
+public class EditParametersPanel extends javax.swing.JPanel {
+    private PropertySheetPanel propertySheetPanel;
+    private ParametersInterface parameters;
+
+    public EditParametersPanel(ParametersInterface parameters) {
+        this.parameters = parameters;
+        buildComponent();
+    }
+
+    private void buildComponent() {
+        propertySheetPanel = new PropertySheetPanel();
+        propertySheetPanel.setMode(PropertySheet.VIEW_AS_CATEGORIES);
+        propertySheetPanel.setDescriptionVisible(true);
+        propertySheetPanel.setSortingCategories(true);
+        // propertySheetPanel.setSortingProperties(true);
+        propertySheetPanel.getTable().setWantsExtraIndent(true);
+
+        if (parameters != null) {
+            try {
+                PropertySheetHelper.populatePropertySheet(parameters, propertySheetPanel);
+            } catch (Exception e) {
+                throw new PipelineException("Failed to populate property sheet from parameters", e);
+            }
+        }
+
+        setLayout(new BorderLayout());
+        add(propertySheetPanel);
+    }
+
+    public ParametersInterface getParameters() throws PipelineException {
+        propertySheetPanel.writeToObject(parameters);
+        return parameters;
+    }
+
+    public void makeReadOnly() {
+        propertySheetPanel.getTable().setEnabled(false);
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/EditPipelineDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/EditPipelineDialog.java
new file mode 100644
index 0000000..e0cfe2b
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/EditPipelineDialog.java
@@ -0,0 +1,405 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REPORT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SAVE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.swing.GroupLayout;
+import javax.swing.JCheckBox;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.SpinnerListModel;
+
+import gov.nasa.ziggy.metrics.report.ReportFilePaths;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.PipelineTaskInformation;
+import gov.nasa.ziggy.pipeline.TriggerValidationResults;
+import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.Priority;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.TextualReportDialog;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.LabelType;
+import gov.nasa.ziggy.ui.util.models.ZiggyTreeModel;
+import gov.nasa.ziggy.ui.util.proxy.PipelineDefinitionCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.PipelineOperationsProxy;
+
+/**
+ * @author Todd Klaus
+ */
+@SuppressWarnings("serial")
+public class EditPipelineDialog extends javax.swing.JDialog {
+    private JSpinner prioritySpinner;
+    private JLabel pipelineNameTextField;
+    private JCheckBox validCheckBox;
+    private JList<String> modulesList;
+
+    private PipelineDefinition pipeline;
+    private String pipelineName;
+
+    private PipelineModulesListModel pipelineModulesListModel;
+    private ZiggyTreeModel<PipelineDefinition> pipelineModel;
+
+    // Contains all parameter sets (except remote parameters) that have been edited since this
+    // window was opened.
+    private Map<String, ParametersInterface> editedParameterSets = new HashMap<>();
+
+    // Contains all remote parameter sets that have been edited since this window was opened.
+    // This has to be done separately from the general edited parameter sets because the remote
+    // execution dialog needs some of the parameter set infrastructure.
+    private Map<String, ParameterSet> editedRemoteParameterSets = new HashMap<>();
+
+    public EditPipelineDialog(Window owner, String pipelineName,
+        ZiggyTreeModel<PipelineDefinition> pipelineModel) {
+        this(owner, pipelineName, null, pipelineModel);
+    }
+
+    public EditPipelineDialog(Window owner, PipelineDefinition pipeline,
+        ZiggyTreeModel<PipelineDefinition> pipelineModel) {
+        this(owner, null, pipeline, pipelineModel);
+    }
+
+    public EditPipelineDialog(Window owner, String pipelineName, PipelineDefinition pipeline,
+        ZiggyTreeModel<PipelineDefinition> pipelineModel) {
+
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.pipelineName = pipelineName;
+        this.pipeline = pipeline;
+        this.pipelineModel = pipelineModel;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Edit pipeline");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane()
+            .add(ZiggySwingUtils.createButtonPanel(ZiggySwingUtils.createButton(SAVE, this::save),
+                ZiggySwingUtils.createButton(CANCEL, this::cancel)), BorderLayout.SOUTH);
+
+        if (pipeline != null) {
+            pipelineNameTextField.setText(pipeline.getName());
+        }
+        if (pipelineName != null) {
+            pipelineNameTextField.setText(pipelineName);
+        }
+
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        JLabel pipelineGroup = boldLabel("Pipeline", LabelType.HEADING1);
+
+        JPanel pipelineToolBar = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton("Validate", this::validate), createButton(REPORT, this::report),
+            createButton("Export parameters", this::exportPipelineParameters));
+
+        JLabel pipelineName = boldLabel("Name");
+        pipelineNameTextField = new JLabel();
+
+        JLabel priority = boldLabel("Priority");
+        SpinnerListModel spinnerListModel = new SpinnerListModel(prioritySpinnerListModel());
+        prioritySpinner = new JSpinner(spinnerListModel);
+        prioritySpinner.setPreferredSize(new java.awt.Dimension(100, 22));
+        spinnerListModel.setValue(pipeline.getInstancePriority().name() + "");
+
+        JLabel valid = boldLabel("Valid? ");
+        validCheckBox = new JCheckBox();
+        validCheckBox.setEnabled(false);
+
+        JLabel pipelineParameterSetsGroup = boldLabel("Pipeline parameter sets",
+            LabelType.HEADING1);
+
+        ParameterSetMapEditorPanel pipelineParameterSetMapEditorPanel = new ParameterSetMapEditorPanel(
+            pipeline.getPipelineParameterSetNames(), new HashSet<>(), new HashMap<>(),
+            editedParameterSets);
+        pipelineParameterSetMapEditorPanel
+            .setMapListener(source -> pipeline.setPipelineParameterSetNames(
+                pipelineParameterSetMapEditorPanel.getParameterSetsMap()));
+
+        JLabel modulesGroup = boldLabel("Modules", LabelType.HEADING1);
+
+        JPanel modulesToolBar = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton("Task information", this::displayTaskInformation),
+            createButton("Resources", this::configureResources),
+            createButton("Parameters", this::editModuleParameters),
+            createButton("Remote execution", this::configureRemoteExecution));
+
+        pipelineModulesListModel = new PipelineModulesListModel(pipeline);
+        modulesList = new JList<>(pipelineModulesListModel);
+        modulesList.setVisibleRowCount(pipelineModulesListModel.getSize());
+        JScrollPane modulesListScrollPane = new JScrollPane(modulesList);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(pipelineGroup)
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGap(ZiggySwingUtils.INDENT)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(pipelineToolBar)
+                    .addComponent(pipelineName)
+                    .addComponent(pipelineNameTextField)
+                    .addComponent(priority)
+                    .addComponent(prioritySpinner, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addGroup(dataPanelLayout.createSequentialGroup()
+                        .addComponent(valid)
+                        .addComponent(validCheckBox))))
+            .addComponent(pipelineParameterSetsGroup)
+            .addComponent(pipelineParameterSetMapEditorPanel)
+            .addComponent(modulesGroup)
+            .addComponent(modulesToolBar)
+            .addComponent(modulesListScrollPane));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(pipelineGroup)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(pipelineToolBar, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(pipelineName)
+            .addComponent(pipelineNameTextField, GroupLayout.PREFERRED_SIZE,
+                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(priority)
+            .addComponent(prioritySpinner, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(valid)
+                .addComponent(validCheckBox))
+            .addGap(ZiggySwingUtils.GROUP_GAP)
+            .addComponent(pipelineParameterSetsGroup)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(pipelineParameterSetMapEditorPanel)
+            .addGap(ZiggySwingUtils.GROUP_GAP)
+            .addComponent(modulesGroup)
+            .addComponent(modulesToolBar, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(modulesListScrollPane));
+
+        return dataPanel;
+    }
+
+    private void validate(ActionEvent evt) {
+
+        PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
+
+        TriggerValidationResults results = null;
+        try {
+            results = pipelineOps.validatePipeline(pipeline);
+            validCheckBox.setSelected(!results.hasErrors());
+            if (results.hasErrors()) {
+                PipelineValidationResultsDialog.showValidationResults(this, results);
+            } else {
+                JOptionPane.showMessageDialog(this, "This pipeline is valid", "Validation OK",
+                    JOptionPane.INFORMATION_MESSAGE);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void report(ActionEvent evt) {
+
+        PipelineOperationsProxy ops = new PipelineOperationsProxy();
+        String report = ops.generatePipelineReport(pipeline);
+
+        TextualReportDialog.showReport(this, report, "Pipeline report",
+            ReportFilePaths.triggerReportPath(pipeline.getName()));
+    }
+
+    /**
+     * @param evt
+     */
+    private void exportPipelineParameters(ActionEvent evt) {
+
+        try {
+            JFileChooser fc = new JFileChooser();
+            fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+
+            int returnVal = fc.showSaveDialog(this);
+
+            if (returnVal == JFileChooser.APPROVE_OPTION) {
+                File file = fc.getSelectedFile();
+
+                PipelineOperationsProxy ops = new PipelineOperationsProxy();
+                ops.exportPipelineParams(pipeline, file);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void editModuleParameters(ActionEvent evt) {
+
+        int selectedRow = modulesList.getSelectedIndex();
+
+        if (selectedRow == -1) {
+            MessageUtil.showError(this, "No module selected");
+        } else {
+            final PipelineDefinitionNode pipelineNode = pipelineModulesListModel
+                .getPipelineNodeAt(selectedRow);
+
+            PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
+            Set<ClassWrapper<ParametersInterface>> allRequiredParams = pipelineOps
+                .retrieveRequiredParameterClassesForNode(pipelineNode);
+
+            Map<ClassWrapper<ParametersInterface>, String> currentModuleParams = pipelineNode
+                .getModuleParameterSetNames();
+            Map<ClassWrapper<ParametersInterface>, String> currentPipelineParams = pipeline
+                .getPipelineParameterSetNames();
+
+            try {
+                final ModuleParameterSetMapEditorDialog dialog = new ModuleParameterSetMapEditorDialog(
+                    this, currentModuleParams, allRequiredParams, currentPipelineParams,
+                    editedParameterSets);
+
+                dialog.setMapListener(source -> pipelineNode
+                    .setModuleParameterSetNames(dialog.getParameterSetsMap()));
+
+                dialog.setVisible(true);
+            } catch (Throwable e) {
+                MessageUtil.showError(this, e);
+            }
+        }
+    }
+
+    private void save(ActionEvent evt) {
+
+        PipelineDefinitionCrudProxy pipelineCrud = new PipelineDefinitionCrudProxy();
+
+        try {
+            String newName = pipelineNameTextField.getText();
+
+            PipelineDefinition existingPipeline = pipelineModel.pipelineByName(newName);
+
+            if (existingPipeline != null && newName != pipeline.getName()) {
+                // Operator changed pipeline name & it conflicts with an existing
+                // pipeline.
+                JOptionPane.showMessageDialog(this,
+                    "Pipeline name already used, please enter a different name.",
+                    "Duplicate pipeline name", JOptionPane.ERROR_MESSAGE);
+                return;
+            }
+
+            pipeline.rename(newName);
+            pipeline.setInstancePriority(Priority.valueOf((String) prioritySpinner.getValue()));
+
+            pipelineCrud.createOrUpdate(pipeline);
+
+            // Save any parameter sets that have been touched since the dialog box was opened.
+            PipelineOperationsProxy pipelineOperationsProxy = new PipelineOperationsProxy();
+            for (Map.Entry<String, ParametersInterface> mapEntry : editedParameterSets.entrySet()) {
+                pipelineOperationsProxy.updateParameterSet(mapEntry.getKey(), mapEntry.getValue());
+            }
+
+            // Save any remote parameter sets that have been touched since the dialog box
+            // was opened.
+            for (Map.Entry<String, ParameterSet> mapEntry : editedRemoteParameterSets.entrySet()) {
+                pipelineOperationsProxy.updateParameterSet(mapEntry.getKey(),
+                    mapEntry.getValue().parametersInstance());
+            }
+
+            setVisible(false);
+        } catch (Throwable e) {
+            MessageUtil.showError(this, "Error Saving Pipeline", e.getMessage(), e);
+        }
+    }
+
+    private void cancel(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void displayTaskInformation(ActionEvent evt) {
+        int selectedRow = modulesList.getSelectedIndex();
+
+        if (selectedRow == -1) {
+            MessageUtil.showError(this, "No module selected");
+        } else {
+            final PipelineDefinitionNode pipelineNode = pipelineModulesListModel
+                .getPipelineNodeAt(selectedRow);
+            TaskInformationDialog infoTable = new TaskInformationDialog(this, pipelineNode);
+            infoTable.setVisible(true);
+        }
+    }
+
+    private void configureResources(ActionEvent evt) {
+        try {
+            new WorkerResourcesDialog(this, pipeline).setVisible(true);
+        } catch (Throwable e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void configureRemoteExecution(ActionEvent evt) {
+        int selectedRow = modulesList.getSelectedIndex();
+
+        if (selectedRow == -1) {
+            MessageUtil.showError(this, "No module selected");
+        } else {
+            final PipelineDefinitionNode pipelineNode = pipelineModulesListModel
+                .getPipelineNodeAt(selectedRow);
+            String remoteParametersName = PipelineTaskInformation.remoteParameters(pipelineNode);
+            if (remoteParametersName == null) {
+                JOptionPane.showMessageDialog(this,
+                    "Selected node has no RemoteParameters instance");
+                return;
+            }
+
+            // Retrieve the remote parameter set if it's not already in the edited parameters map.
+            if (!editedRemoteParameterSets.containsKey(remoteParametersName)) {
+                ParameterSet remoteParameterSet = new PipelineOperationsProxy()
+                    .retrieveLatestParameterSet(remoteParametersName);
+                editedRemoteParameterSets.put(remoteParametersName, remoteParameterSet);
+            }
+            ParameterSet remoteParameters = editedRemoteParameterSets.get(remoteParametersName);
+
+            new RemoteExecutionDialog(this, remoteParameters, pipelineNode,
+                PipelineTaskInformation.subtaskInformation(pipelineNode)).setVisible(true);
+        }
+    }
+
+    /**
+     * Constructs a String array with the names of the {@link Priority} enum. The list is generated
+     * in reverse order so that on the spinner the up-arrow button leads to higher priorities, the
+     * down-arrow to lower ones.
+     */
+    private String[] prioritySpinnerListModel() {
+        int priorityCount = Priority.values().length;
+        String[] prioritySpinnerListModel = new String[priorityCount];
+        for (int priorityCounter = 0; priorityCounter < prioritySpinnerListModel.length; priorityCounter++) {
+            prioritySpinnerListModel[priorityCounter] = Priority.values()[priorityCount - 1
+                - priorityCounter].name();
+        }
+        return prioritySpinnerListModel;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineNodeEditDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/EditPipelineNodeDialog.java
similarity index 81%
rename from src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineNodeEditDialog.java
rename to src/main/java/gov/nasa/ziggy/ui/pipeline/EditPipelineNodeDialog.java
index d961301..49e8686 100644
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineNodeEditDialog.java
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/EditPipelineNodeDialog.java
@@ -1,10 +1,14 @@
-package gov.nasa.ziggy.ui.config.pipeline;
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SAVE;
 
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.util.List;
 
@@ -13,7 +17,6 @@
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
@@ -23,13 +26,12 @@
 
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ModuleName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule;
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.proxy.PipelineModuleDefinitionCrudProxy;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.proxy.PipelineModuleDefinitionCrudProxy;
 import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
 
 /**
@@ -38,8 +40,8 @@
  * @author Todd Klaus
  */
 @SuppressWarnings("serial")
-public class PipelineNodeEditDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(PipelineNodeEditDialog.class);
+public class EditPipelineNodeDialog extends javax.swing.JDialog {
+    private static final Logger log = LoggerFactory.getLogger(EditPipelineNodeDialog.class);
     private JLabel moduleLabel;
 
     private JPanel dataPanel;
@@ -60,18 +62,19 @@ public class PipelineNodeEditDialog extends javax.swing.JDialog {
     private final PipelineDefinition pipeline;
     private final PipelineDefinitionNode pipelineNode;
 
-    public PipelineNodeEditDialog(JFrame frame, PipelineDefinition pipeline,
+    public EditPipelineNodeDialog(Window owner, PipelineDefinition pipeline,
         PipelineDefinitionNode pipelineNode) throws Exception {
-        super(frame, "Edit Pipeline Node", true);
+
+        super(owner, DEFAULT_MODALITY_TYPE);
         this.pipeline = pipeline;
         this.pipelineNode = pipelineNode;
         pipelineModuleDefinitionCrud = new PipelineModuleDefinitionCrudProxy();
 
-        initGUI();
+        buildComponent();
+        setLocationRelativeTo(owner);
     }
 
-    private void saveButtonActionPerformed() {
-        log.debug("saveButtonActionPerformed(ActionEvent) - start");
+    private void save(ActionEvent evt) {
 
         try {
             boolean startNewUowSelected = startNewUowCheckBox.isSelected();
@@ -87,15 +90,10 @@ private void saveButtonActionPerformed() {
         }
 
         savePressed = true;
-        log.debug("saveButtonActionPerformed(ActionEvent) - end");
     }
 
-    private void cancelButtonActionPerformed() {
-        log.debug("cancelButtonActionPerformed(ActionEvent) - start");
-
+    private void cancel(ActionEvent evt) {
         setVisible(false);
-
-        log.debug("cancelButtonActionPerformed(ActionEvent) - end");
     }
 
     /**
@@ -144,7 +142,7 @@ private void validateUnitOfWork() {
     /**
      * @param evt
      */
-    private void startNewUowCheckBoxActionPerformed(ActionEvent evt) {
+    private void startNewUow(ActionEvent evt) {
         boolean selected = startNewUowCheckBox.isSelected();
         // grey out the uow tg settings if the checkbox is not checked
         uowTypeLabel.setEnabled(selected);
@@ -153,30 +151,25 @@ private void startNewUowCheckBoxActionPerformed(ActionEvent evt) {
         validateUnitOfWork();
     }
 
-    private void initGUI() throws Exception {
-        log.debug("initGUI() - start");
+    private void buildComponent() throws Exception {
+
+        setTitle("Edit pipeline node");
 
-        BorderLayout thisLayout = new BorderLayout();
-        getContentPane().setLayout(thisLayout);
-        getContentPane().add(getDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
         getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
 
         validateUnitOfWork();
-
-        this.setSize(424, 248);
-
-        log.debug("initGUI() - end");
+        pack();
     }
 
     private JComboBox<PipelineModuleDefinition> getModuleComboBox() {
-        log.debug("getModuleComboBox() - start");
 
         if (moduleComboBox == null) {
-            ModuleName moduleName = pipelineNode.getModuleName();
+            String moduleName = pipelineNode.getModuleName();
             String currentModuleName = null;
 
             if (moduleName != null) {
-                currentModuleName = moduleName.getName();
+                currentModuleName = moduleName;
             }
 
             int currentIndex = 0;
@@ -185,8 +178,7 @@ private JComboBox<PipelineModuleDefinition> getModuleComboBox() {
             List<PipelineModuleDefinition> modules = pipelineModuleDefinitionCrud.retrieveAll();
             for (PipelineModuleDefinition module : modules) {
                 moduleComboBoxModel.addElement(module);
-                if (currentModuleName != null
-                    && module.getName().getName().equals(currentModuleName)) {
+                if (currentModuleName != null && module.getName().equals(currentModuleName)) {
                     initialIndex = currentIndex;
                 }
                 currentIndex++;
@@ -199,12 +191,10 @@ private JComboBox<PipelineModuleDefinition> getModuleComboBox() {
             moduleComboBox.setEnabled(!pipeline.isLocked());
         }
 
-        log.debug("getModuleComboBox() - end");
         return moduleComboBox;
     }
 
-    private JPanel getDataPanel() {
-        log.debug("getDataPanel() - start");
+    private JPanel createDataPanel() {
 
         if (dataPanel == null) {
             dataPanel = new JPanel();
@@ -226,12 +216,10 @@ private JPanel getDataPanel() {
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
         }
 
-        log.debug("getDataPanel() - end");
         return dataPanel;
     }
 
     private JPanel getButtonPanel() {
-        log.debug("getButtonPanel() - start");
 
         if (buttonPanel == null) {
             buttonPanel = new JPanel();
@@ -242,46 +230,29 @@ private JPanel getButtonPanel() {
             buttonPanel.add(getCancelButton());
         }
 
-        log.debug("getButtonPanel() - end");
         return buttonPanel;
     }
 
     private JButton getSaveButton() {
-        log.debug("getSaveButton() - start");
 
         if (saveButton == null) {
             saveButton = new JButton();
-            saveButton.setText("Save Changes");
-            saveButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                saveButtonActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
+            saveButton.setText(SAVE);
+            saveButton.addActionListener(this::save);
             saveButton.setEnabled(!pipeline.isLocked());
         }
 
-        log.debug("getSaveButton() - end");
         return saveButton;
     }
 
     private JButton getCancelButton() {
-        log.debug("getCancelButton() - start");
 
         if (cancelButton == null) {
             cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                cancelButtonActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
+            cancelButton.setText(CANCEL);
+            cancelButton.addActionListener(this::cancel);
         }
 
-        log.debug("getCancelButton() - end");
         return cancelButton;
     }
 
@@ -340,7 +311,7 @@ private JCheckBox getStartNewUowCheckBox() {
             startNewUowCheckBox = new JCheckBox();
             startNewUowCheckBox.setText("Start new unit of work");
             startNewUowCheckBox.setSelected(pipelineNode.isStartNewUow());
-            startNewUowCheckBox.addActionListener(this::startNewUowCheckBoxActionPerformed);
+            startNewUowCheckBox.addActionListener(this::startNewUow);
             startNewUowCheckBox.setEnabled(!pipeline.isLocked());
         }
         return startNewUowCheckBox;
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/ModuleParameterSetMapEditorDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/ModuleParameterSetMapEditorDialog.java
new file mode 100644
index 0000000..70bbbfc
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/ModuleParameterSetMapEditorDialog.java
@@ -0,0 +1,95 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.Map;
+import java.util.Set;
+
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
+
+/**
+ * Dialog box that allows a user to select a module parameter set for editing.
+ *
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class ModuleParameterSetMapEditorDialog extends javax.swing.JDialog
+    implements ParameterSetMapEditorListener {
+
+    private ParameterSetMapEditorPanel parameterSetMapEditorPanel;
+    private ParameterSetMapEditorListener mapListener;
+
+    public ModuleParameterSetMapEditorDialog(Window owner,
+        Map<ClassWrapper<ParametersInterface>, String> currentModuleParameters,
+        Set<ClassWrapper<ParametersInterface>> requiredParameters,
+        Map<ClassWrapper<ParametersInterface>, String> currentPipelineParameters,
+        Map<String, ParametersInterface> editedParameterSets) {
+
+        super(owner, DEFAULT_MODALITY_TYPE);
+
+        buildComponent(currentModuleParameters, requiredParameters, currentPipelineParameters,
+            editedParameterSets);
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent(
+        Map<ClassWrapper<ParametersInterface>, String> currentModuleParameters,
+        Set<ClassWrapper<ParametersInterface>> requiredParameters,
+        Map<ClassWrapper<ParametersInterface>, String> currentPipelineParameters,
+        Map<String, ParametersInterface> editedParameterSets) {
+
+        setTitle("Edit parameter sets");
+
+        getContentPane().add(createDataPanel(currentModuleParameters, requiredParameters,
+            currentPipelineParameters, editedParameterSets), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(createButton(CLOSE, this::close)),
+            BorderLayout.SOUTH);
+
+        setMinimumSize(new Dimension(700, 450));
+        pack();
+    }
+
+    private ParameterSetMapEditorPanel createDataPanel(
+        Map<ClassWrapper<ParametersInterface>, String> currentModuleParameters,
+        Set<ClassWrapper<ParametersInterface>> requiredParameters,
+        Map<ClassWrapper<ParametersInterface>, String> currentPipelineParameters,
+        Map<String, ParametersInterface> editedParameterSets) {
+
+        parameterSetMapEditorPanel = new ParameterSetMapEditorPanel(currentModuleParameters,
+            requiredParameters, currentPipelineParameters, editedParameterSets);
+        parameterSetMapEditorPanel.setMapListener(this);
+
+        return parameterSetMapEditorPanel;
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    public ParameterSetMapEditorListener getMapListener() {
+        return mapListener;
+    }
+
+    public void setMapListener(ParameterSetMapEditorListener mapListener) {
+        this.mapListener = mapListener;
+    }
+
+    @Override
+    public void notifyMapChanged(Object source) {
+        if (mapListener != null) {
+            mapListener.notifyMapChanged(this);
+        }
+    }
+
+    public Map<ClassWrapper<ParametersInterface>, String> getParameterSetsMap() {
+        return parameterSetMapEditorPanel.getParameterSetsMap();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/NewPipelineDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/NewPipelineDialog.java
new file mode 100644
index 0000000..8db6f6f
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/NewPipelineDialog.java
@@ -0,0 +1,93 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CREATE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class NewPipelineDialog extends javax.swing.JDialog {
+    private JTextField nameTextField;
+
+    private boolean cancelled;
+
+    public NewPipelineDialog(Window owner) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("New pipeline definition");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(createButton(CREATE, this::create),
+            createButton(CANCEL, this::cancel)), BorderLayout.SOUTH);
+
+        setMinimumSize(ZiggySwingUtils.MIN_DIALOG_SIZE);
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        JLabel name = boldLabel("Pipeline name");
+        nameTextField = new JTextField();
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(
+            dataPanelLayout.createParallelGroup().addComponent(name).addComponent(nameTextField));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(name)
+            .addComponent(nameTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addPreferredGap(ComponentPlacement.UNRELATED));
+
+        return dataPanel;
+    }
+
+    private void create(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void cancel(ActionEvent evt) {
+        setCancelled(true);
+        setVisible(false);
+    }
+
+    public String getPipelineName() {
+        return nameTextField.getText();
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new NewPipelineDialog(null));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetAssignment.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetAssignment.java
similarity index 57%
rename from src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetAssignment.java
rename to src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetAssignment.java
index 9a3594c..9d4d3a9 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetAssignment.java
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetAssignment.java
@@ -1,8 +1,7 @@
-package gov.nasa.ziggy.ui.ops.parameters;
+package gov.nasa.ziggy.ui.pipeline;
 
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
 
 /**
  * Hold the ParameterSetName assigned for a specified type. Used by the ParameterSetNamesTableModel.
@@ -10,16 +9,16 @@
  * @author Todd Klaus
  */
 public class ParameterSetAssignment {
-    private ClassWrapper<Parameters> type = null;
-    private ParameterSetName assignedName = null;
+    private ClassWrapper<ParametersInterface> type = null;
+    private String assignedName = null;
     private boolean assignedAtPipelineLevel = false;
     private boolean assignedAtBothLevels = false;
 
-    public ParameterSetAssignment(ClassWrapper<Parameters> type) {
+    public ParameterSetAssignment(ClassWrapper<ParametersInterface> type) {
         this.type = type;
     }
 
-    public ParameterSetAssignment(ClassWrapper<Parameters> type, ParameterSetName assignedName,
+    public ParameterSetAssignment(ClassWrapper<ParametersInterface> type, String assignedName,
         boolean assignedAtPipelineLevel, boolean assignedAtBothLevels) {
         this.type = type;
         this.assignedName = assignedName;
@@ -27,26 +26,19 @@ public ParameterSetAssignment(ClassWrapper<Parameters> type, ParameterSetName as
         this.assignedAtBothLevels = assignedAtBothLevels;
     }
 
-//    public ParameterSetAssignment(ClassWrapper<Parameters> type, ParameterSetName assignedName,
-//        boolean assignedAtPipelineLevel) {
-//        this.type = type;
-//        this.assignedName = assignedName;
-//        this.assignedAtPipelineLevel = assignedAtPipelineLevel;
-//    }
-
-    public ClassWrapper<Parameters> getType() {
+    public ClassWrapper<ParametersInterface> getType() {
         return type;
     }
 
-    public void setType(ClassWrapper<Parameters> type) {
+    public void setType(ClassWrapper<ParametersInterface> type) {
         this.type = type;
     }
 
-    public ParameterSetName getAssignedName() {
+    public String getAssignedName() {
         return assignedName;
     }
 
-    public void setAssignedName(ParameterSetName assignedName) {
+    public void setAssignedName(String assignedName) {
         this.assignedName = assignedName;
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetMapEditorListener.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetMapEditorListener.java
similarity index 69%
rename from src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetMapEditorListener.java
rename to src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetMapEditorListener.java
index 6f34a8e..6380074 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ops/parameters/ParameterSetMapEditorListener.java
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetMapEditorListener.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.ops.parameters;
+package gov.nasa.ziggy.ui.pipeline;
 
 public interface ParameterSetMapEditorListener {
     void notifyMapChanged(Object source);
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetMapEditorPanel.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetMapEditorPanel.java
new file mode 100644
index 0000000..eb56aa2
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetMapEditorPanel.java
@@ -0,0 +1,502 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.ADD;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.DIALOG;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.EDIT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REMOVE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SELECT;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createMenuItem;
+
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.ui.util.HtmlBuilder;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.models.AbstractZiggyTableModel;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
+import gov.nasa.ziggy.ui.util.proxy.ParameterSetCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.PipelineOperationsProxy;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * Edit/view all of the {@link ParameterSet}s for a pipeline or node. This panel is the one that
+ * appears when the operator goes to the Pipelines panel, selects a pipeline, and selects a
+ * parameter set or pipeline module from the resulting Edit Pipeline dialog box.
+ *
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class ParameterSetMapEditorPanel extends javax.swing.JPanel {
+    private static final Logger log = LoggerFactory.getLogger(ParameterSetMapEditorPanel.class);
+
+    private ParameterSetMapEditorListener mapListener;
+    private ZiggyTable<ParameterSetAssignment> ziggyTable;
+    private int selectedModelIndex = -1;
+
+    private Map<ClassWrapper<ParametersInterface>, String> currentParameters;
+    private Set<ClassWrapper<ParametersInterface>> requiredParameters;
+    private Map<ClassWrapper<ParametersInterface>, String> currentPipelineParameters;
+    private Map<String, ParametersInterface> editedParameterSets;
+
+    private ParameterSetNamesTableModel paramSetMapTableModel;
+
+    public ParameterSetMapEditorPanel(
+        Map<ClassWrapper<ParametersInterface>, String> currentParameters,
+        Set<ClassWrapper<ParametersInterface>> requiredParameters,
+        Map<ClassWrapper<ParametersInterface>, String> currentPipelineParameters,
+        Map<String, ParametersInterface> editedParameterSets) {
+        this.currentParameters = currentParameters;
+        this.requiredParameters = requiredParameters;
+        this.currentPipelineParameters = currentPipelineParameters;
+        this.editedParameterSets = editedParameterSets;
+
+        buildComponent();
+    }
+
+    private void buildComponent() {
+        JPanel toolBar = ZiggySwingUtils.createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton(ADD, "Add a new parameter set.", this::add),
+            createButton(SELECT, "Select a different parameter set instance for this type.",
+                this::selectParamSet),
+            createButton(EDIT,
+                "Shortcut to edit the values in this parameter set instance (same as editing the set in the Parameter Library).",
+                this::editParamValues),
+            createButton("Auto-assign",
+                "Automatically assign a parameter set if there is only one available.",
+                this::autoAssign));
+
+        paramSetMapTableModel = new ParameterSetNamesTableModel(currentParameters,
+            requiredParameters, currentPipelineParameters);
+        ziggyTable = new ZiggyTable<>(paramSetMapTableModel);
+        JScrollPane parameterSets = new JScrollPane(ziggyTable.getTable());
+        parameterSets.setPreferredSize(new Dimension(0, 100));
+
+        GroupLayout dataPanelLayout = new GroupLayout(this);
+        setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(toolBar)
+            .addComponent(parameterSets));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(toolBar, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(parameterSets));
+
+        addMouseListener(ziggyTable);
+        addMouseListener(ziggyTable.getTable(),
+            ZiggySwingUtils.createPopupMenu(createMenuItem(SELECT + DIALOG, this::selectSelected),
+                createMenuItem(EDIT + DIALOG, this::editSelected),
+                createMenuItem(REMOVE, this::removeSelected)));
+    }
+
+    private void add(ActionEvent evt) {
+
+        ParameterSet newParameterSet = ParameterSetSelectorDialog
+            .selectParameterSet(SwingUtilities.getWindowAncestor(this));
+
+        if (newParameterSet != null) {
+            @SuppressWarnings("unchecked")
+            Class<ParametersInterface> clazz = (Class<ParametersInterface>) newParameterSet.clazz();
+
+            ClassWrapper<ParametersInterface> classWrapper = new ClassWrapper<>(clazz);
+
+            if (currentParameters.containsKey(classWrapper)) {
+                MessageUtil.showError(this, "A parameter set for " + clazz.getSimpleName()
+                    + " already exists, use 'select' to change the existing instance");
+            } else {
+                currentParameters.put(classWrapper, newParameterSet.getName());
+
+                if (mapListener != null) {
+                    mapListener.notifyMapChanged(this);
+                }
+
+                paramSetMapTableModel.update(currentParameters, requiredParameters,
+                    currentPipelineParameters);
+            }
+        }
+    }
+
+    private void selectParamSet(ActionEvent evt) {
+        int selectedRow = ziggyTable.getSelectedRow();
+
+        if (selectedRow == -1) {
+            MessageUtil.showError(this, "No parameter set selected.");
+        } else {
+            select(ziggyTable.convertRowIndexToModel(selectedRow));
+        }
+    }
+
+    private void select(int modelIndex) {
+        ParameterSetAssignment paramSetAssignment = ziggyTable.getContentAtViewRow(modelIndex);
+
+        if (paramSetAssignment.isAssignedAtPipelineLevel()) {
+            MessageUtil.showError(this,
+                "Already assigned at the pipeline level.  Remove that assignment first.");
+            return;
+        }
+
+        ClassWrapper<ParametersInterface> type = paramSetAssignment.getType();
+        boolean isDeleted = false;
+
+        try {
+            type.getClazz();
+        } catch (Exception e) {
+            isDeleted = true;
+        }
+
+        if (!isDeleted) {
+            Class<? extends ParametersInterface> currentType = type.getClazz();
+            ParameterSet newParameterSet = ParameterSetSelectorDialog
+                .selectParameterSet(SwingUtilities.getWindowAncestor(this), currentType);
+
+            if (newParameterSet != null) {
+                String previouslyAssignedName = paramSetAssignment.getAssignedName();
+                if (previouslyAssignedName == null || previouslyAssignedName != null
+                    && !newParameterSet.getName().equals(previouslyAssignedName)) {
+                    // changed, store the change
+                    ClassWrapper<ParametersInterface> classWrapper = new ClassWrapper<>(
+                        currentType);
+                    currentParameters.put(classWrapper, newParameterSet.getName());
+
+                    if (mapListener != null) {
+                        mapListener.notifyMapChanged(this);
+                    }
+
+                    paramSetMapTableModel.update(currentParameters, requiredParameters,
+                        currentPipelineParameters);
+                }
+            }
+        } else {
+            MessageUtil.showError(this,
+                "Can't select a parameter set whose class has been deleted.");
+        }
+    }
+
+    private void editParamValues(ActionEvent evt) {
+        int selectedRow = ziggyTable.getSelectedRow();
+
+        if (selectedRow == -1) {
+            MessageUtil.showError(this, "No parameter set selected.");
+        } else {
+            edit(ziggyTable.convertRowIndexToModel(selectedRow));
+        }
+    }
+
+    private void edit(int modelIndex) {
+        String paramSetName = paramSetMapTableModel.getParamSetAtRow(modelIndex);
+
+        String name = paramSetName;
+        ParametersInterface parameters = null;
+        if (paramSetName != null) {
+            if (editedParameterSets.containsKey(paramSetName)) {
+                parameters = editedParameterSets.get(paramSetName);
+            } else {
+                PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
+                ParameterSet latestParameterSet = pipelineOps
+                    .retrieveLatestParameterSet(paramSetName);
+                if (latestParameterSet.parametersClassDeleted()) {
+                    MessageUtil.showError(this,
+                        "Can't edit a parameter set whose class has been deleted.");
+                    return;
+                }
+                parameters = latestParameterSet.parametersInstance();
+            }
+            try {
+                ParametersInterface newParameters = EditParametersDialog
+                    .editParameters(SwingUtilities.getWindowAncestor(this), name, parameters);
+                if (newParameters != null) {
+                    editedParameterSets.put(paramSetName, newParameters);
+                }
+            } catch (Throwable e) {
+                MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+            }
+        }
+    }
+
+    private void autoAssign(ActionEvent evt) {
+        ParameterSetCrudProxy crud = new ParameterSetCrudProxy();
+        List<ParameterSet> allParamSets = crud.retrieveLatestVersions();
+        LinkedList<ParameterSetAssignment> currentAssignments = paramSetMapTableModel
+            .getParamSetAssignments();
+        boolean changesMade = false;
+
+        for (ParameterSetAssignment assignment : currentAssignments) {
+            if (assignment.getAssignedName() == null) {
+                ClassWrapper<ParametersInterface> type = assignment.getType();
+                ParameterSet instance = null;
+                int foundCount = 0;
+
+                for (ParameterSet parameterSet : allParamSets) {
+                    Class<?> clazz = null;
+
+                    try {
+                        clazz = parameterSet.clazz();
+                    } catch (RuntimeException e) {
+                        // ignore this parameter set
+                    }
+
+                    if (clazz != null && parameterSet.clazz().equals(type.getClazz())) {
+                        instance = parameterSet;
+                        foundCount++;
+                    }
+                }
+
+                if (foundCount == 1) {
+                    log.info("Found a match: " + instance.getName() + " for type: " + type);
+                    currentParameters.put(type, instance.getName());
+                    changesMade = true;
+                }
+            }
+        }
+
+        if (changesMade) {
+            if (mapListener != null) {
+                mapListener.notifyMapChanged(this);
+            }
+
+            paramSetMapTableModel.update(currentParameters, requiredParameters,
+                currentPipelineParameters);
+        }
+    }
+
+    private void addMouseListener(final ZiggyTable<ParameterSetAssignment> ziggyTable) {
+        ziggyTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent evt) {
+                if (evt.getClickCount() == 2) {
+                    int tableRow = ziggyTable.rowAtPoint(evt.getPoint());
+                    selectedModelIndex = ziggyTable.convertRowIndexToModel(tableRow);
+                    log.debug("[DC] selectedModelIndex={}", selectedModelIndex);
+
+                    edit(selectedModelIndex);
+                }
+            }
+        });
+    }
+
+    private void addMouseListener(final java.awt.Component component,
+        final javax.swing.JPopupMenu menu) {
+        component.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
+            public void mousePressed(java.awt.event.MouseEvent e) {
+                if (e.isPopupTrigger()) {
+                    menu.show(component, e.getX(), e.getY());
+                    int tableRow = ziggyTable.rowAtPoint(e.getPoint());
+                    // windows bug? works ok on Linux/gtk. Here's a workaround:
+                    if (tableRow == -1) {
+                        tableRow = ziggyTable.getSelectedRow();
+                    }
+                    selectedModelIndex = ziggyTable.convertRowIndexToModel(tableRow);
+                }
+            }
+
+            @Override
+            public void mouseReleased(java.awt.event.MouseEvent e) {
+                if (e.isPopupTrigger()) {
+                    menu.show(component, e.getX(), e.getY());
+                }
+            }
+        });
+    }
+
+    private void selectSelected(ActionEvent evt) {
+        select(selectedModelIndex);
+    }
+
+    private void editSelected(ActionEvent evt) {
+        edit(selectedModelIndex);
+    }
+
+    private void removeSelected(ActionEvent evt) {
+        ClassWrapper<ParametersInterface> type = ziggyTable.getContentAtViewRow(selectedModelIndex)
+            .getType();
+        currentParameters.remove(type);
+
+        if (mapListener != null) {
+            mapListener.notifyMapChanged(this);
+        }
+
+        paramSetMapTableModel.update(currentParameters, requiredParameters,
+            currentPipelineParameters);
+    }
+
+    public ParameterSetMapEditorListener getMapListener() {
+        return mapListener;
+    }
+
+    public void setMapListener(ParameterSetMapEditorListener mapListener) {
+        this.mapListener = mapListener;
+    }
+
+    public Map<ClassWrapper<ParametersInterface>, String> getParameterSetsMap() {
+        return currentParameters;
+    }
+
+    private class ParameterSetNamesTableModel
+        extends AbstractZiggyTableModel<ParameterSetAssignment>
+        implements TableModelContentClass<ParameterSetAssignment> {
+
+        private static final String[] COLUMN_NAMES = { "Type", "Name" };
+
+        private final LinkedList<ParameterSetAssignment> paramSetAssignments = new LinkedList<>();
+
+        public ParameterSetNamesTableModel(
+            Map<ClassWrapper<ParametersInterface>, String> currentParameters,
+            Set<ClassWrapper<ParametersInterface>> requiredParameters,
+            Map<ClassWrapper<ParametersInterface>, String> currentPipelineParameters) {
+            update(currentParameters, requiredParameters, currentPipelineParameters);
+        }
+
+        /**
+         * for each required param create a ParameterSetAssignment if reqd param exists in current
+         * params, use that name if reqd param exists in current pipeline params, use that name with
+         * '(pipeline)' if there are any left in current params (not reqd), add those
+         */
+        public void update(Map<ClassWrapper<ParametersInterface>, String> currentParameters,
+            Set<ClassWrapper<ParametersInterface>> requiredParameters,
+            Map<ClassWrapper<ParametersInterface>, String> currentPipelineParameters) {
+
+            paramSetAssignments.clear();
+            Set<ClassWrapper<ParametersInterface>> types = new HashSet<>();
+
+            // for each required param type, create a ParameterSetAssignment
+            for (ClassWrapper<ParametersInterface> requiredType : requiredParameters) {
+                ParameterSetAssignment param = new ParameterSetAssignment(requiredType);
+
+                // if required param type exists in current params, use that
+                // ParameterSetName
+                String currentAssignment = currentParameters.get(requiredType);
+                if (currentAssignment != null) {
+                    param.setAssignedName(currentAssignment);
+                }
+
+                // if required param type exists in current *pipeline* params,
+                // display that (read-only)
+                if (currentPipelineParameters.containsKey(requiredType)) {
+                    param.setAssignedName(currentPipelineParameters.get(requiredType));
+                    param.setAssignedAtPipelineLevel(true);
+
+                    if (currentAssignment != null) {
+                        param.setAssignedAtBothLevels(true);
+                    }
+                }
+
+                if (param.isAssignedAtPipelineLevel() || param.isAssignedAtBothLevels()) {
+                    paramSetAssignments.addFirst(param);
+                } else {
+                    paramSetAssignments.add(param);
+                }
+
+                types.add(requiredType);
+            }
+
+            // If there are any param types left over in current params (not required), add those.
+            // This also covers the case where empty lists are passed in for required params and
+            // current pipeline params (when using this model to edit pipeline params on the
+            // EditPipelineDialog.
+            for (ClassWrapper<ParametersInterface> currentParam : currentParameters.keySet()) {
+                if (!types.contains(currentParam)) {
+                    ParameterSetAssignment param = new ParameterSetAssignment(currentParam,
+                        currentParameters.get(currentParam), false, false);
+                    paramSetAssignments.add(param);
+                }
+            }
+
+            fireTableDataChanged();
+        }
+
+        public String getParamSetAtRow(int rowIndex) {
+            return paramSetAssignments.get(rowIndex).getAssignedName();
+        }
+
+        /**
+         * @return the paramSetAssignments
+         */
+        public LinkedList<ParameterSetAssignment> getParamSetAssignments() {
+            return paramSetAssignments;
+        }
+
+        @Override
+        public int getRowCount() {
+            return paramSetAssignments.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            ParameterSetAssignment assignment = paramSetAssignments.get(rowIndex);
+            ClassWrapper<ParametersInterface> assignmentType = assignment.getType();
+            String assignedName = assignment.getAssignedName();
+            HtmlBuilder displayName = new HtmlBuilder();
+
+            if (assignedName != null) {
+                displayName.append(assignedName);
+            } else {
+                displayName.appendColor("--- Not set ---", "red");
+            }
+
+            if (assignment.isAssignedAtBothLevels()) {
+                displayName.appendColor(" (ERROR: set at BOTH levels)", "red");
+            } else if (assignment.isAssignedAtPipelineLevel()) {
+                displayName.appendItalic(" (set at pipeline level)");
+            }
+
+            switch (columnIndex) {
+                case 0:
+                    Class<?> clazz = null;
+                    try {
+                        clazz = assignmentType.getClazz();
+                    } catch (RuntimeException e) {
+                        return "<deleted>: " + assignmentType.getClassName();
+                    }
+                    return clazz.getSimpleName();
+                case 1:
+                    return displayName;
+                default:
+                    throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            }
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public Class<ParameterSetAssignment> tableModelContentClass() {
+            return ParameterSetAssignment.class;
+        }
+
+        @Override
+        public ParameterSetAssignment getContentAtRow(int row) {
+            return paramSetAssignments.get(row);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetSelectorDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetSelectorDialog.java
new file mode 100644
index 0000000..41696c7
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetSelectorDialog.java
@@ -0,0 +1,96 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SELECT;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JDialog;
+
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+
+/**
+ * {@link JDialog} wrapper for the {@link ParameterSetSelectorPanel}
+ *
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class ParameterSetSelectorDialog extends javax.swing.JDialog {
+
+    private final Class<? extends ParametersInterface> filterClass;
+    private ParameterSetSelectorPanel parameterSetSelectorPanel;
+    private boolean cancelled = false;
+
+    private ParameterSetSelectorDialog(Window owner) {
+        this(owner, null);
+    }
+
+    private ParameterSetSelectorDialog(Window owner,
+        Class<? extends ParametersInterface> filterClass) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.filterClass = filterClass;
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Select parameter set");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(createButton(SELECT, this::select),
+            createButton(CANCEL, this::cancel)), BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private ParameterSetSelectorPanel createDataPanel() {
+        parameterSetSelectorPanel = new ParameterSetSelectorPanel(filterClass);
+
+        return parameterSetSelectorPanel;
+    }
+
+    private void select(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void cancel(ActionEvent evt) {
+        cancelled = true;
+        setVisible(false);
+    }
+
+    /**
+     * Select a parameter set of the specified type from the parameter set library.
+     *
+     * @return null, if a parameter set was not selected
+     */
+    public static ParameterSet selectParameterSet(Window owner,
+        Class<? extends ParametersInterface> filterClass) {
+
+        ParameterSetSelectorDialog dialog = new ParameterSetSelectorDialog(owner, filterClass);
+        dialog.setVisible(true);
+
+        if (dialog.cancelled) {
+            return null;
+        }
+        return dialog.parameterSetSelectorPanel.getSelected();
+    }
+
+    /**
+     * Select a parameter set from the parameter set library with no filtering.
+     */
+    public static ParameterSet selectParameterSet(Window owner) {
+        ParameterSetSelectorDialog dialog = new ParameterSetSelectorDialog(owner);
+        dialog.setVisible(true);
+
+        if (dialog.cancelled) {
+            return null;
+        }
+        return dialog.parameterSetSelectorPanel.getSelected();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetSelectorPanel.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetSelectorPanel.java
new file mode 100644
index 0000000..e2b0ad6
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/ParameterSetSelectorPanel.java
@@ -0,0 +1,105 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseListModel;
+import gov.nasa.ziggy.ui.util.proxy.ParameterSetCrudProxy;
+
+/**
+ * Select a {@link ParameterSetName} from a list or create a new one.
+ *
+ * @author Todd Klaus
+ */
+@SuppressWarnings("serial")
+public class ParameterSetSelectorPanel extends javax.swing.JPanel {
+    private JList<ParameterSet> paramSetList;
+    private ParameterSetListModel paramSetListModel;
+
+    private final Class<? extends ParametersInterface> filterClass;
+
+    public ParameterSetSelectorPanel() {
+        filterClass = null;
+        buildComponent();
+    }
+
+    public ParameterSetSelectorPanel(Class<? extends ParametersInterface> filterClass) {
+        this.filterClass = filterClass;
+        buildComponent();
+    }
+
+    private void buildComponent() {
+        setLayout(new BorderLayout());
+        setPreferredSize(new Dimension(400, 300));
+
+        paramSetListModel = new ParameterSetListModel(filterClass);
+        paramSetList = new JList<>(paramSetListModel);
+        add(new JScrollPane(paramSetList), BorderLayout.CENTER);
+    }
+
+    public ParameterSet getSelected() {
+        int selectedIndex = paramSetList.getSelectedIndex();
+
+        if (selectedIndex != -1) {
+            return paramSetListModel.getElementAt(selectedIndex);
+        }
+        return null;
+    }
+
+    private static class ParameterSetListModel extends AbstractDatabaseListModel<ParameterSet> {
+        Class<? extends ParametersInterface> filterClass;
+
+        List<ParameterSet> paramSets = new LinkedList<>();
+        ParameterSetCrudProxy paramSetCrud = new ParameterSetCrudProxy();
+
+        public ParameterSetListModel(Class<? extends ParametersInterface> filterClass) {
+            this.filterClass = filterClass;
+        }
+
+        @Override
+        public void loadFromDatabase() {
+            if (paramSets != null) {
+                paramSetCrud.evictAll(paramSets);
+            }
+
+            paramSets = new LinkedList<>();
+
+            List<ParameterSet> allParamSets = paramSetCrud.retrieveLatestVersions();
+
+            for (ParameterSet parameterSet : allParamSets) {
+                Class<?> clazz = null;
+
+                try {
+                    clazz = parameterSet.clazz();
+                } catch (RuntimeException e) {
+                    // ignore this parameter set
+                }
+
+                if (clazz != null && (filterClass == null || clazz.equals(filterClass))) {
+                    paramSets.add(parameterSet);
+                }
+            }
+
+            fireContentsChanged(this, 0, paramSets.size() - 1);
+        }
+
+        @Override
+        public ParameterSet getElementAt(int index) {
+            validityCheck();
+            return paramSets.get(index);
+        }
+
+        @Override
+        public int getSize() {
+            validityCheck();
+            return paramSets.size();
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineDefinitionNodeResourcesDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineDefinitionNodeResourcesDialog.java
new file mode 100644
index 0000000..39f441e
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineDefinitionNodeResourcesDialog.java
@@ -0,0 +1,451 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.HtmlBuilder.htmlBuilder;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.AWTEvent;
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.ItemEvent;
+import java.text.NumberFormat;
+import java.util.function.Consumer;
+
+import javax.swing.ButtonGroup;
+import javax.swing.GroupLayout;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.text.NumberFormatter;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.services.messages.WorkerResources;
+import gov.nasa.ziggy.ui.util.HumanReadableHeapSize;
+import gov.nasa.ziggy.ui.util.HumanReadableHeapSize.HeapSizeUnit;
+import gov.nasa.ziggy.ui.util.ValidityTestingFormattedTextField;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * Dialog box for editing the worker count and heap size for a {@link PipelineDefinitionNode}.
+ * <p>
+ * The dialog box is initialized from the state of the {@link PipelineDefinitionNode}: if the node
+ * uses default values for worker count or for heap size, that information is captured, the initial
+ * values of worker count and heap size are likewise captured. The user can then perform the
+ * following actions:
+ * <ol>
+ * <li>Switch between the default worker count and the user-specified worker count for the node in
+ * question.
+ * <li>Set the user-specified worker count for the node in question.
+ * <li>Switch between the default heap size and the user-specified heap size for the node in
+ * question.
+ * <li>Set the user-specified heap size for the node in question.
+ * <li>Capture any changes made by the user.
+ * <li>Revert any changes made by the user. In this case, the node's state on exit will be identical
+ * to its state on entry.
+ * </ol>
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class PipelineDefinitionNodeResourcesDialog extends JDialog {
+
+    private static final long serialVersionUID = 20230810L;
+
+    private final PipelineDefinitionNode node;
+    private final String pipelineDefinitionName;
+    private final WorkerResources initialResources;
+    private JCheckBox workerDefaultCheckBox;
+    private JCheckBox heapSizeDefaultCheckBox;
+    private JRadioButton mbUnitsButton;
+    private JRadioButton gbUnitsButton;
+    private JRadioButton tbUnitsButton;
+    private ValidityTestingFormattedTextField workerCountTextArea;
+    private ValidityTestingFormattedTextField heapSizeTextArea;
+    private ButtonGroup unitButtonGroup;
+    private int workerCountCurrentUserValue;
+    private int heapSizeMbCurrentUserValue;
+    private JButton closeButton;
+    private JButton cancelButton;
+
+    /**
+     * Whenever a validity check is performed, set the correct state for the close button.
+     */
+    private Consumer<Boolean> validityCheck = valid -> setCloseButtonState();
+
+    public PipelineDefinitionNodeResourcesDialog(Window owner, String pipelineDefinitionName,
+        PipelineDefinitionNode node) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.pipelineDefinitionName = pipelineDefinitionName;
+        this.node = node;
+
+        initialResources = node.workerResources();
+        workerCountCurrentUserValue = initialResources.getMaxWorkerCount();
+        heapSizeMbCurrentUserValue = initialResources.getHeapSizeMb();
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Edit worker resources");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        closeButton = createCloseButton();
+        cancelButton = createCancelButton();
+        getContentPane().add(createButtonPanel(cancelButton, closeButton), BorderLayout.SOUTH);
+
+        initializeFieldState();
+
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        JLabel pipeline = boldLabel("Pipeline");
+        JLabel pipelineText = new JLabel(pipelineDefinitionName);
+
+        JLabel module = boldLabel("Module");
+        JLabel moduleText = new JLabel(node.getModuleName());
+
+        JLabel maxWorkers = boldLabel("Maximum workers");
+        workerCountTextArea = createWorkerCountTextArea();
+        workerDefaultCheckBox = createWorkerDefaultCheckBox();
+
+        JLabel maxHeapSize = boldLabel("Maximum heap size");
+        heapSizeTextArea = createHeapSizeTextArea();
+        heapSizeDefaultCheckBox = createHeapSizeDefaultCheckBox();
+
+        unitButtonGroup = new ButtonGroup();
+        mbUnitsButton = new JRadioButton("MB");
+        mbUnitsButton.setToolTipText("Set heap size units to megabytes.");
+        unitButtonGroup.add(mbUnitsButton);
+        gbUnitsButton = new JRadioButton("GB");
+        gbUnitsButton.setToolTipText("Set heap size units to gigabytes.");
+        unitButtonGroup.add(gbUnitsButton);
+        tbUnitsButton = new JRadioButton("TB");
+        tbUnitsButton.setToolTipText("Set heap size units to terabytes.");
+        unitButtonGroup.add(tbUnitsButton);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(pipeline)
+            .addComponent(pipelineText)
+            .addComponent(module)
+            .addComponent(moduleText)
+            .addComponent(maxWorkers)
+            .addComponent(workerCountTextArea, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(workerDefaultCheckBox)
+            .addComponent(maxHeapSize)
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addComponent(heapSizeTextArea, GroupLayout.PREFERRED_SIZE,
+                    GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(ComponentPlacement.UNRELATED)
+                .addComponent(mbUnitsButton)
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addComponent(gbUnitsButton)
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addComponent(tbUnitsButton))
+            .addComponent(heapSizeDefaultCheckBox));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(pipeline)
+            .addComponent(pipelineText)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(module)
+            .addComponent(moduleText)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(maxWorkers)
+            .addComponent(workerCountTextArea, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(workerDefaultCheckBox)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(maxHeapSize)
+            .addGroup(dataPanelLayout.createParallelGroup(GroupLayout.Alignment.CENTER)
+                .addComponent(heapSizeTextArea, GroupLayout.PREFERRED_SIZE,
+                    GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                .addComponent(mbUnitsButton)
+                .addComponent(gbUnitsButton)
+                .addComponent(tbUnitsButton))
+            .addComponent(heapSizeDefaultCheckBox));
+
+        return dataPanel;
+    }
+
+    /**
+     * Configures the "Close" button, which captures the user's changes and exits the dialog box.
+     */
+    private JButton createCloseButton() {
+        JButton closeButton = ZiggySwingUtils.createButton(CLOSE,
+            htmlBuilder("Close this dialog box.").appendBreak()
+                .append(
+                    "Your worker resource parameter changes won't be saved until you hit Save on the edit pipeline dialog.")
+                .toString(),
+            this::updateWorkerResources);
+
+        // NB: the FocusListener is needed because of the way that the field values are
+        // validated. When one of the ValidityTestingFormattedTextBox instances loses the
+        // focus, the resulting event causes the validity of that box to become false for
+        // a blink, which causes the close button to become disabled for a
+        // blink; as a result, the buttons are disabled when the action listener would tell
+        // them to take their actions, and the user has to hit the button again to get it to
+        // take its action. By performing the action when the button gains focus, we get
+        // back to needing only one button push to get the focus and perform the action.
+        closeButton.addFocusListener(new FocusAdapter() {
+            @Override
+            public void focusGained(FocusEvent e) {
+                if (closeButton.isEnabled()) {
+                    updateWorkerResources(e);
+                }
+            }
+        });
+
+        return closeButton;
+    }
+
+    /**
+     * Capture the current state of worker resource parameters in the relevant
+     * {@link PipelineDefinitionNode} instance and close the dialog box.
+     */
+    private void updateWorkerResources(AWTEvent evt) {
+        Integer finalWorkerCount = null;
+        if (!workerDefaultCheckBox.isSelected()) {
+            finalWorkerCount = (Integer) workerCountTextArea.getValue();
+        }
+        Integer finalHeapSizeMb = null;
+        if (!heapSizeDefaultCheckBox.isSelected()) {
+            finalHeapSizeMb = heapSizeMbFromTextField();
+        }
+        node.applyWorkerResources(new WorkerResources(finalWorkerCount, finalHeapSizeMb));
+        dispose();
+    }
+
+    /**
+     * Converts the combined heap size text field and heap size units button into a value for heap
+     * size in MB.
+     */
+    private int heapSizeMbFromTextField() {
+        double heapSize = (double) heapSizeTextArea.getValue();
+        HeapSizeUnit heapSizeUnit = null;
+        if (mbUnitsButton.isSelected()) {
+            heapSizeUnit = HeapSizeUnit.MB;
+        } else if (gbUnitsButton.isSelected()) {
+            heapSizeUnit = HeapSizeUnit.GB;
+        } else if (tbUnitsButton.isSelected()) {
+            heapSizeUnit = HeapSizeUnit.TB;
+        }
+        return new HumanReadableHeapSize((float) heapSize, heapSizeUnit).heapSizeMb();
+    }
+
+    /**
+     * Enables or disables the close button based on whether there are valid values for both the
+     * worker count and the heap size. Either of these values is permitted to be invalid if the user
+     * has selected the default value for that parameter.
+     */
+    private void setCloseButtonState() {
+        closeButton
+            .setEnabled((workerDefaultCheckBox.isSelected() || workerCountTextArea.isValidState())
+                && (heapSizeDefaultCheckBox.isSelected() || heapSizeTextArea.isValidState()));
+    }
+
+    /**
+     * Creates the cancel button, which reverts the worker parameters to original values and exits
+     * the dialog box.
+     */
+    private JButton createCancelButton() {
+        JButton cancelButton = ZiggySwingUtils.createButton(CANCEL,
+            "Revert worker resource parameters to original values and close this dialog box.",
+            this::revertWorkerResources);
+        cancelButton.setEnabled(true);
+        return cancelButton;
+    }
+
+    /**
+     * Reverts the worker resources to their initial values and exits.
+     */
+    private void revertWorkerResources(ActionEvent evt) {
+        node.applyWorkerResources(initialResources);
+        dispose();
+    }
+
+    /**
+     * Creates the {@link #workerCountTextArea}. This text area allows the user to set the number of
+     * workers from 1 to the number of available processors. A validity check method is applied that
+     * disables the close button when there's an invalid value in this text field.
+     */
+    private ValidityTestingFormattedTextField createWorkerCountTextArea() {
+        NumberFormatter formatter = new NumberFormatter(NumberFormat.getInstance());
+        formatter.setValueClass(Integer.class);
+        formatter.setMinimum(1);
+        formatter.setMaximum(Runtime.getRuntime().availableProcessors());
+        ValidityTestingFormattedTextField workerCountTextArea = new ValidityTestingFormattedTextField(
+            formatter);
+        workerCountTextArea.setEmptyIsValid(false);
+        workerCountTextArea.setColumns(10);
+        workerCountTextArea
+            .setToolTipText(htmlBuilder("Set the maximum number of worker processes.").appendBreak()
+                .append("Must be between 1 and number of cores on your system (")
+                .append(Runtime.getRuntime().availableProcessors())
+                .append("), inclusive.")
+                .toString());
+        workerCountTextArea.setExecuteOnValidityCheck(validityCheck);
+        return workerCountTextArea;
+    }
+
+    /**
+     * Creates the {@link #workerDefaultCheckBox}. The initial value of the check box is set, a
+     * listener is added that runs when the box state changes, and that listener is executed once to
+     * correctly set the worker count field, if needed.
+     *
+     * @return
+     */
+    private JCheckBox createWorkerDefaultCheckBox() {
+        JCheckBox workerDefaultCheckBox = new JCheckBox(
+            "Default (" + WorkerResources.getDefaultResources().getMaxWorkerCount() + ")");
+        workerDefaultCheckBox.setSelected(initialResources.maxWorkerCountIsDefault());
+        workerDefaultCheckBox.setToolTipText("Use the pipeline default worker count.");
+        workerDefaultCheckBox.addItemListener(this::workerCheckBoxChanged);
+        return workerDefaultCheckBox;
+    }
+
+    /**
+     * Checks the state of the worker default check box. If the check box is selected, the text
+     * field for the worker count is disabled and the max worker count on the
+     * {@link PipelineDefinitionNode} is set to zero, indicating that the default value should be
+     * used; the user current value for the worker count is captured if the text field is valid.
+     */
+    private void workerCheckBoxChanged(ItemEvent evt) {
+        workerCountTextArea.setEnabled(!workerDefaultCheckBox.isSelected());
+
+        if (workerCountTextArea.isEnabled()) {
+            // Switching from the default value to a user-set one.
+            workerCountTextArea.setValue(workerCountCurrentUserValue);
+        } else {
+
+            // Switching from the user-set value to the default.
+            if (workerCountTextArea.isValidState()) {
+                workerCountCurrentUserValue = (int) workerCountTextArea.getValue();
+            } else {
+                // Force the text field into a valid state. This is a kind of kludgey way
+                // to do it, but I haven't been able to figure out any way for Java to
+                // do it automatically when the text field is disabled.
+                workerCountTextArea.setValue(1);
+            }
+            workerCountTextArea.setValue(null);
+        }
+    }
+
+    /**
+     * Creates the {@link #workerCountTextArea}. This text area allows users to enter integer values
+     * for the heap size from 1 to 1000 (there are also 3 buttons that set the units to MB, GB, or
+     * TB). A validity check is applied such that when the text field is invalid the close button is
+     * disabled.
+     */
+    private ValidityTestingFormattedTextField createHeapSizeTextArea() {
+        NumberFormatter formatter = new NumberFormatter(NumberFormat.getInstance());
+        formatter.setValueClass(Double.class);
+        formatter.setMinimum(1.0);
+        formatter.setMaximum(1000.0);
+        ValidityTestingFormattedTextField heapSizeTextArea = new ValidityTestingFormattedTextField(
+            formatter);
+        heapSizeTextArea.setEmptyIsValid(false);
+        heapSizeTextArea.setColumns(10);
+        heapSizeTextArea.setToolTipText(
+            htmlBuilder("Set the maximum Java heap size shared by all workers.").appendBreak()
+                .append("Must be between 1 and 1000, inclusive.")
+                .toString());
+        heapSizeTextArea.setExecuteOnValidityCheck(validityCheck);
+        return heapSizeTextArea;
+    }
+
+    /**
+     * Creates the {@link #heapSizeDefaultCheckBox}. The initial value of the check box is set, a
+     * listener is added that runs when the box state changes, and that listener is executed once to
+     * correctly set the heap size text field, if needed.
+     */
+    private JCheckBox createHeapSizeDefaultCheckBox() {
+        JCheckBox heapSizeDefaultCheckBox = new JCheckBox(
+            "Default (" + WorkerResources.getDefaultResources().humanReadableHeapSize() + ")");
+        heapSizeDefaultCheckBox.setSelected(initialResources.heapSizeIsDefault());
+        heapSizeDefaultCheckBox.setToolTipText("Use the pipeline default heap size.");
+        heapSizeDefaultCheckBox.addItemListener(this::heapSizeCheckBoxChanged);
+        return heapSizeDefaultCheckBox;
+    }
+
+    /**
+     * Take necessary actions when the default heap size box changes state. If the box goes from
+     * disabled to enabled, the {@link PipelineDefinitionNode} value of the heap size is set to a
+     * value that indicates that the default should be used, the text field and the unit buttons are
+     * disabled, and the current value of the text box is captured if it is valid. If the box goes
+     * from disabled to enabled, the text field and unit buttons are enabled and the current user
+     * value of the heap is entered into the text field.
+     */
+    private void heapSizeCheckBoxChanged(ItemEvent evt) {
+        heapSizeTextArea.setEnabled(!heapSizeDefaultCheckBox.isSelected());
+
+        if (heapSizeTextArea.isEnabled()) {
+            // Switching from the default heap size to the user-set one.
+            mbUnitsButton.setEnabled(true);
+            gbUnitsButton.setEnabled(true);
+            tbUnitsButton.setEnabled(true);
+            setHeapSizeTextFromCurrentUserValue();
+        } else {
+
+            // Switching from the user-set heap size to the default value.
+            if (heapSizeTextArea.isValidState()) {
+                heapSizeMbCurrentUserValue = heapSizeMbFromTextField();
+            } else {
+                // Force the text field into a valid state. This is a kind of kludgey way
+                // to do it, but I haven't been able to figure out any way for Java to
+                // do it automatically when the text field is disabled.
+                heapSizeTextArea.setValue(1.0);
+            }
+
+            heapSizeTextArea.setValue(null);
+            mbUnitsButton.setEnabled(false);
+            gbUnitsButton.setEnabled(false);
+            tbUnitsButton.setEnabled(false);
+        }
+    }
+
+    /**
+     * Converts the current user value of heap size (in MB) into a human-readable form and a unit,
+     * which are then applied to the heap size text field and heap size unit buttons.
+     */
+    private void setHeapSizeTextFromCurrentUserValue() {
+        HumanReadableHeapSize humanReadableHeapSize = new HumanReadableHeapSize(
+            heapSizeMbCurrentUserValue);
+        switch (humanReadableHeapSize.getHeapSizeUnit()) {
+            case MB:
+                mbUnitsButton.setSelected(true);
+                break;
+            case GB:
+                gbUnitsButton.setSelected(true);
+                break;
+            case TB:
+                tbUnitsButton.setSelected(true);
+                break;
+        }
+        heapSizeTextArea.setValue((double) humanReadableHeapSize.getHumanReadableHeapSize());
+    }
+
+    /**
+     * Ensures that components have the correct state per the initial content.
+     */
+    private void initializeFieldState() {
+        workerCheckBoxChanged(null);
+        heapSizeCheckBoxChanged(null);
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineGraphCanvas.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineGraphCanvas.java
similarity index 70%
rename from src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineGraphCanvas.java
rename to src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineGraphCanvas.java
index a697ab8..d7e741a 100644
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineGraphCanvas.java
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineGraphCanvas.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.config.pipeline;
+package gov.nasa.ziggy.ui.pipeline;
 
 import java.awt.BasicStroke;
 import java.awt.BorderLayout;
@@ -21,15 +21,15 @@
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.proxy.PipelineDefinitionCrudProxy;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.proxy.PipelineDefinitionCrudProxy;
 
 /**
  * Display the pipeline nodes as a directed graph with pop-up menus on each node.
@@ -41,8 +41,8 @@ public class PipelineGraphCanvas extends JPanel {
     private static final Logger log = LoggerFactory.getLogger(PipelineGraphCanvas.class);
 
     // size of the canvas (TODO: make dynamic based on # nodes)
-    private static final int CANVAS_HEIGHT = 5000;
-    private static final int CANVAS_WIDTH = 1500;
+    private static final int CANVAS_HEIGHT = 750;
+    private static final int CANVAS_WIDTH = 500;
 
     // spacing at the top and left of the canvas
     private final static int HORIZONTAL_INSET = 20;
@@ -79,31 +79,25 @@ private enum DrawType {
     public PipelineGraphCanvas(PipelineDefinition pipeline) {
         this.pipeline = pipeline;
         pipelineDefinitionCrud = new PipelineDefinitionCrudProxy();
-        initGUI();
+        buildComponent();
     }
 
-    private void initGUI() {
-        log.debug("initGUI() - start");
-
-        BorderLayout thisLayout = new BorderLayout();
-        setLayout(thisLayout);
+    private void buildComponent() {
+        BorderLayout layout = new BorderLayout();
+        setLayout(layout);
         scrollPane = getScrollPane();
         add(scrollPane, BorderLayout.CENTER);
 
-        setComponentPopupMenu(canvasPane, getCanvasPopupMenu());
-
-        log.debug("initGUI() - end");
+        // TODO Fix or delete menu
+        // Commands currently throw NullPointerException, so hide for now.
+        // setComponentPopupMenu(canvasPane, getCanvasPopupMenu());
     }
 
     public void redraw() {
-        log.debug("redraw() - start");
-
         canvasPane.removeAll();
         drawPipeline(pipeline, DrawType.NODES, null);
         revalidate();
         repaint();
-
-        log.debug("redraw() - end");
     }
 
     private void drawPipeline(PipelineDefinition pipeline, DrawType drawType, Graphics2D g2) {
@@ -125,7 +119,6 @@ private void drawPipeline(PipelineDefinition pipeline, DrawType drawType, Graphi
 
     private void drawNodes(PipelineDefinitionNode node, PipelineDefinitionNode parentNode, int row,
         int column, DrawType drawType, Rectangle parentBounds, Graphics2D g2) {
-        log.debug("drawNodes(PipelineNode, int, int, DrawType, Rectangle, Graphics2D) - start");
 
         Rectangle nodeBounds = new Rectangle(HORIZONTAL_INSET + COLUMN_SPACING * column,
             VERTICAL_INSET + ROW_SPACING * row, NODE_WIDGET_WIDTH, NODE_WIDGET_HEIGHT);
@@ -144,12 +137,9 @@ private void drawNodes(PipelineDefinitionNode node, PipelineDefinitionNode paren
             drawNodes(childNode, node, row + 1, childColumn, drawType, nodeBounds, g2);
             childColumn++;
         }
-
-        log.debug("drawNodes(PipelineNode, int, int, DrawType, Rectangle, Graphics2D) - end");
     }
 
     private void drawArrow(boolean startNewUow, Graphics2D g2, Rectangle start, Rectangle end) {
-        log.debug("drawArrow(Graphics2D, Rectangle, Rectangle) - start");
 
         Stroke oldStroke = g2.getStroke();
 
@@ -196,21 +186,47 @@ private void drawArrow(boolean startNewUow, Graphics2D g2, Rectangle start, Rect
         g2.fillPolygon(arrowHead);
 
         g2.setStroke(oldStroke);
-
-        log.debug("drawArrow(Graphics2D, Rectangle, Rectangle) - end");
     }
 
-    protected void doEdit() {
-        log.debug("doEdit(int) - start");
+    private void showEditDialog(PipelineDefinitionNode pipelineNode) {
+
+        try {
+            EditPipelineNodeDialog dialog = new EditPipelineNodeDialog(
+                SwingUtilities.getWindowAncestor(this), pipeline, pipelineNode);
+            dialog.setVisible(true);
 
-        showEditDialog(selectedNodeWidget.getPipelineNode());
+            if (dialog.wasSavePressed()) {
+                pipelineDefinitionCrud.createOrUpdate(pipeline);
+                redraw();
+            }
+        } catch (Throwable e) {
+            MessageUtil.showError(this, e);
+        }
+    }
 
-        log.debug("doEdit(int) - end");
+    private void enableMenuItemsPerContext(PipelineNodeWidget selectedNodeWidget) {
+        if (pipeline.isLocked()) {
+            insertAfterMenuItem.setEnabled(false);
+            insertBranchMenuItem.setEnabled(false);
+            insertBeforeMenuItem.setEnabled(false);
+            // editMenuItem.setEnabled(false);
+            deleteMenuItem.setEnabled(false);
+        } else if (selectedNodeWidget.isStartNode()) {
+            insertBeforeMenuItem.setEnabled(false);
+            editMenuItem.setEnabled(false);
+            deleteMenuItem.setEnabled(false);
+        } else {
+            insertBeforeMenuItem.setEnabled(true);
+            editMenuItem.setEnabled(true);
+            deleteMenuItem.setEnabled(true);
+        }
     }
 
-    protected void doDelete() {
-        log.debug("doDelete(int) - start");
+    private void edit(ActionEvent evt) {
+        showEditDialog(selectedNodeWidget.getPipelineNode());
+    }
 
+    private void delete(ActionEvent evt) {
         try {
             PipelineDefinitionNode selectedNode = selectedNodeWidget.getPipelineNode();
             PipelineDefinitionNode parentNode = selectedNodeWidget.getPipelineNodeParent();
@@ -239,15 +255,11 @@ protected void doDelete() {
                 redraw();
             }
         } catch (Throwable e) {
-            log.error("showEditDialog(User)", e);
-
             MessageUtil.showError(this, e);
         }
-
-        log.debug("doDelete(int) - end");
     }
 
-    private void doInsertBefore() {
+    private void insertBefore(ActionEvent evt) {
         try {
             PipelineDefinitionNode selectedNode = selectedNodeWidget.getPipelineNode();
             PipelineDefinitionNode predecessorNode = selectedNodeWidget.getPipelineNodeParent();
@@ -255,11 +267,11 @@ private void doInsertBefore() {
             newNode.setParentNode(predecessorNode);
             newNode.setStartNewUow(true);
 
-            PipelineNodeEditDialog pipelineNodeEditDialog = ZiggyGuiConsole
-                .newPipelineNodeEditDialog(pipeline, newNode);
-            pipelineNodeEditDialog.setVisible(true);
+            EditPipelineNodeDialog editPipelineNodeDialog = new EditPipelineNodeDialog(
+                SwingUtilities.getWindowAncestor(this), pipeline, newNode);
+            editPipelineNodeDialog.setVisible(true);
 
-            if (pipelineNodeEditDialog.wasSavePressed()) {
+            if (editPipelineNodeDialog.wasSavePressed()) {
                 List<PipelineDefinitionNode> predecessorsNextNodesList = null;
                 if (predecessorNode != null) {
                     predecessorsNextNodesList = predecessorNode.getNextNodes();
@@ -271,36 +283,34 @@ private void doInsertBefore() {
                 // change predecessor's nextNodes entry for this node to new
                 // node
                 int selectedNodeIndex = predecessorsNextNodesList.indexOf(selectedNode);
-                assert selectedNodeIndex != -1 : "PipelineNodesViewEditPanel:doInsertBefore: predecessor node does not point to this node!";
+                assert selectedNodeIndex != -1 : "PipelineGraphCanvas:doInsertBefore: predecessor node does not point to this node!";
 
                 predecessorsNextNodesList.set(selectedNodeIndex, newNode);
 
                 // set new node's nextNodes to this node
                 newNode.getNextNodes().add(selectedNode);
 
-                pipelineDefinitionCrud.save(pipeline);
+                pipelineDefinitionCrud.createOrUpdate(pipeline);
                 pipeline.buildPaths();
                 redraw();
             }
         } catch (Throwable e) {
-            log.error("showEditDialog(User)", e);
-
             MessageUtil.showError(this, e);
         }
     }
 
-    private void doInsertAfter() {
+    private void insertAfter(ActionEvent evt) {
         try {
             PipelineDefinitionNode selectedNode = selectedNodeWidget.getPipelineNode();
             PipelineDefinitionNode newNode = new PipelineDefinitionNode();
             newNode.setParentNode(selectedNode);
             newNode.setStartNewUow(true);
 
-            PipelineNodeEditDialog pipelineNodeEditDialog = ZiggyGuiConsole
-                .newPipelineNodeEditDialog(pipeline, newNode);
-            pipelineNodeEditDialog.setVisible(true);
+            EditPipelineNodeDialog editPipelineNodeDialog = new EditPipelineNodeDialog(
+                SwingUtilities.getWindowAncestor(this), pipeline, newNode);
+            editPipelineNodeDialog.setVisible(true);
 
-            if (pipelineNodeEditDialog.wasSavePressed()) {
+            if (editPipelineNodeDialog.wasSavePressed()) {
                 List<PipelineDefinitionNode> currentNextNodes = null;
 
                 if (selectedNodeWidget.isStartNode()) {
@@ -318,29 +328,27 @@ private void doInsertAfter() {
                 selectedNodeNextNodes.clear();
                 selectedNodeNextNodes.add(newNode);
 
-                pipelineDefinitionCrud.save(pipeline);
+                pipelineDefinitionCrud.createOrUpdate(pipeline);
                 pipeline.buildPaths();
                 redraw();
             }
         } catch (Throwable e) {
-            log.error("showEditDialog(User)", e);
-
             MessageUtil.showError(this, e);
         }
     }
 
-    private void doInsertBranch() {
+    private void insertBranch(ActionEvent evt) {
         try {
             PipelineDefinitionNode selectedNode = selectedNodeWidget.getPipelineNode();
             PipelineDefinitionNode newNode = new PipelineDefinitionNode();
             newNode.setParentNode(selectedNode);
             newNode.setStartNewUow(true);
 
-            PipelineNodeEditDialog pipelineNodeEditDialog = ZiggyGuiConsole
-                .newPipelineNodeEditDialog(pipeline, newNode);
-            pipelineNodeEditDialog.setVisible(true);
+            EditPipelineNodeDialog editPipelineNodeDialog = new EditPipelineNodeDialog(
+                SwingUtilities.getWindowAncestor(this), pipeline, newNode);
+            editPipelineNodeDialog.setVisible(true);
 
-            if (pipelineNodeEditDialog.wasSavePressed()) {
+            if (editPipelineNodeDialog.wasSavePressed()) {
                 List<PipelineDefinitionNode> currentNextNodes = null;
 
                 if (selectedNodeWidget.isStartNode()) {
@@ -352,126 +360,39 @@ private void doInsertBranch() {
                 // add new node to selected node's nextNodes
                 currentNextNodes.add(newNode);
 
-                pipelineDefinitionCrud.save(pipeline);
+                pipelineDefinitionCrud.createOrUpdate(pipeline);
                 pipeline.buildPaths();
                 redraw();
             }
         } catch (Throwable e) {
-            log.error("doInsertBranch(User)", e);
-
-            MessageUtil.showError(this, e);
-        }
-    }
-
-    private void showEditDialog(PipelineDefinitionNode pipelineNode) {
-        log.debug("showEditDialog() - start");
-
-        try {
-            PipelineNodeEditDialog inst = ZiggyGuiConsole.newPipelineNodeEditDialog(pipeline,
-                pipelineNode);
-
-            inst.setVisible(true);
-
-            if (inst.wasSavePressed()) {
-                pipelineDefinitionCrud.save(pipeline);
-                redraw();
-            }
-        } catch (Throwable e) {
-            log.error("showEditDialog(User)", e);
-
             MessageUtil.showError(this, e);
         }
-
-        log.debug("showEditDialog() - end");
-    }
-
-    private void enableMenuItemsPerContext(PipelineNodeWidget selectedNodeWidget) {
-        if (pipeline.isLocked()) {
-            insertAfterMenuItem.setEnabled(false);
-            insertBranchMenuItem.setEnabled(false);
-            insertBeforeMenuItem.setEnabled(false);
-            // editMenuItem.setEnabled(false);
-            deleteMenuItem.setEnabled(false);
-        } else if (selectedNodeWidget.isStartNode()) {
-            insertBeforeMenuItem.setEnabled(false);
-            editMenuItem.setEnabled(false);
-            deleteMenuItem.setEnabled(false);
-        } else {
-            insertBeforeMenuItem.setEnabled(true);
-            editMenuItem.setEnabled(true);
-            deleteMenuItem.setEnabled(true);
-        }
-    }
-
-    private void editMenuItemActionPerformed(ActionEvent evt) {
-        log.debug("editMenuItemActionPerformed(ActionEvent) - editMenuItem.actionPerformed, event="
-            + evt);
-
-        doEdit();
-    }
-
-    private void deleteMenuItemActionPerformed(ActionEvent evt) {
-        log.debug(
-            "deleteMenuItemActionPerformed(ActionEvent) - deleteMenuItem.actionPerformed, event="
-                + evt);
-
-        doDelete();
-    }
-
-    private void insertBeforeMenuItemActionPerformed(ActionEvent evt) {
-        log.debug(
-            "insertBeforeMenuItemActionPerformed(ActionEvent) - insertBeforeMenuItem.actionPerformed, event="
-                + evt);
-        doInsertBefore();
-    }
-
-    private void insertAfterMenuItemActionPerformed(ActionEvent evt) {
-        log.debug(
-            "insertAfterMenuItemActionPerformed(ActionEvent) - insertAfterMenuItem.actionPerformed, event="
-                + evt);
-        doInsertAfter();
-    }
-
-    private void insertBranchMenuItemActionPerformed(ActionEvent evt) {
-        log.debug(
-            "insertBranchMenuItemActionPerformed(ActionEvent) - insertBranchMenuItem.actionPerformed, event="
-                + evt);
-        doInsertBranch();
     }
 
     private void canvasPaneMouseClicked(MouseEvent evt) {
-        log.debug("canvasPaneMouseClicked(MouseEvent) - canvasPane.mouseClicked, event=" + evt);
-
         if (evt.getClickCount() == 2) {
-            log.debug(
-                "canvasPaneMouseClicked(MouseEvent) - [DOUBLE-CLICK] table.mouseClicked, event="
-                    + evt);
-
             Component selectedComponent = canvasPane.getComponentAt(evt.getX(), evt.getY());
             log.debug("MP:selectedComponent = " + selectedComponent);
             if (selectedComponent instanceof PipelineNodeWidget) {
                 selectedNodeWidget = (PipelineNodeWidget) selectedComponent;
 
-                doEdit();
+                // TODO Fix or delete command
+                // Command currently throws NullPointerException, so suppress for now.
+                // doEdit();
             }
         }
     }
 
     private JScrollPane getScrollPane() {
-        log.debug("getScrollPane() - start");
-
         if (scrollPane == null) {
             scrollPane = new JScrollPane();
             scrollPane.setViewportView(getCanvasPane());
         }
 
-        log.debug("getScrollPane() - end");
         return scrollPane;
     }
 
     private JPanel getCanvasPane() {
-        log.debug("getCanvasPane() - start");
-
         if (canvasPane == null) {
             canvasPane = new JPanel() {
                 @Override
@@ -493,13 +414,11 @@ public void mouseClicked(MouseEvent evt) {
             redraw();
         }
 
-        log.debug("getCanvasPane() - end");
         return canvasPane;
     }
 
+    @SuppressWarnings("unused")
     private JPopupMenu getCanvasPopupMenu() {
-        log.debug("getCanvasPopupMenu() - start");
-
         if (canvasPopupMenu == null) {
             canvasPopupMenu = new JPopupMenu();
             canvasPopupMenu.add(getInsertBeforeMenuItem());
@@ -509,21 +428,19 @@ private JPopupMenu getCanvasPopupMenu() {
             canvasPopupMenu.add(getDeleteMenuItem());
         }
 
-        log.debug("getCanvasPopupMenu() - end");
         return canvasPopupMenu;
     }
 
     /**
      * Auto-generated method for setting the popup menu for a component
      */
+    @SuppressWarnings("unused")
     private void setComponentPopupMenu(final java.awt.Component parent,
         final javax.swing.JPopupMenu menu) {
-        log.debug("setComponentPopupMenu(java.awt.Component, javax.swing.JPopupMenu) - start");
 
         parent.addMouseListener(new java.awt.event.MouseAdapter() {
             @Override
             public void mousePressed(java.awt.event.MouseEvent e) {
-                log.debug("mousePressed(java.awt.event.MouseEvent) - start");
 
                 if (e.isPopupTrigger()) {
                     Component selectedComponent = canvasPane.getComponentAt(e.getX(), e.getY());
@@ -534,13 +451,10 @@ public void mousePressed(java.awt.event.MouseEvent e) {
                         menu.show(parent, e.getX(), e.getY());
                     }
                 }
-
-                log.debug("mousePressed(java.awt.event.MouseEvent) - end");
             }
 
             @Override
             public void mouseReleased(java.awt.event.MouseEvent e) {
-                log.debug("mouseReleased(java.awt.event.MouseEvent) - start");
 
                 if (e.isPopupTrigger()) {
                     Component selectedComponent = canvasPane.getComponentAt(e.getX(), e.getY());
@@ -551,106 +465,57 @@ public void mouseReleased(java.awt.event.MouseEvent e) {
                         menu.show(parent, e.getX(), e.getY());
                     }
                 }
-
-                log.debug("mouseReleased(java.awt.event.MouseEvent) - end");
             }
         });
-
-        log.debug("setComponentPopupMenu(java.awt.Component, javax.swing.JPopupMenu) - end");
     }
 
     private JMenuItem getEditMenuItem() {
-        log.debug("getEditMenuItem() - start");
-
         if (editMenuItem == null) {
             editMenuItem = new JMenuItem();
             editMenuItem.setText("View/Edit Node...");
-            editMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                editMenuItemActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
+            editMenuItem.addActionListener(this::edit);
         }
 
-        log.debug("getEditMenuItem() - end");
         return editMenuItem;
     }
 
     private JMenuItem getDeleteMenuItem() {
-        log.debug("getDeleteMenuItem() - start");
-
         if (deleteMenuItem == null) {
             deleteMenuItem = new JMenuItem();
             deleteMenuItem.setText("Delete Node...");
-            deleteMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                deleteMenuItemActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
+            deleteMenuItem.addActionListener(this::delete);
         }
 
-        log.debug("getDeleteMenuItem() - end");
         return deleteMenuItem;
     }
 
     private JMenuItem getInsertBranchMenuItem() {
-        log.debug("getInsertBranchMenuItem() - start");
-
         if (insertBranchMenuItem == null) {
             insertBranchMenuItem = new JMenuItem();
             insertBranchMenuItem.setText("Insert branch...");
-            insertBranchMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                insertBranchMenuItemActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
+            insertBranchMenuItem.addActionListener(this::insertBranch);
         }
 
-        log.debug("getInsertBranchMenuItem() - end");
         return insertBranchMenuItem;
     }
 
     private JMenuItem getInsertBeforeMenuItem() {
-        log.debug("getInsertBeforeMenuItem() - start");
-
         if (insertBeforeMenuItem == null) {
             insertBeforeMenuItem = new JMenuItem();
             insertBeforeMenuItem.setText("Insert before...");
-            insertBeforeMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                insertBeforeMenuItemActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
+            insertBeforeMenuItem.addActionListener(this::insertBefore);
         }
 
-        log.debug("getInsertBeforeMenuItem() - end");
         return insertBeforeMenuItem;
     }
 
     private JMenuItem getInsertAfterMenuItem() {
-        log.debug("getInsertAfterMenuItem() - start");
-
         if (insertAfterMenuItem == null) {
             insertAfterMenuItem = new JMenuItem();
             insertAfterMenuItem.setText("Insert after...");
-            insertAfterMenuItem.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                insertAfterMenuItemActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
+            insertAfterMenuItem.addActionListener(this::insertAfter);
         }
 
-        log.debug("getInsertAfterMenuItem() - end");
         return insertAfterMenuItem;
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggerModulesListModel.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineModulesListModel.java
similarity index 65%
rename from src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggerModulesListModel.java
rename to src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineModulesListModel.java
index d9efff8..5794163 100644
--- a/src/main/java/gov/nasa/ziggy/ui/ops/triggers/TriggerModulesListModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineModulesListModel.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.ops.triggers;
+package gov.nasa.ziggy.ui.pipeline;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -10,27 +10,28 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 
 @SuppressWarnings("serial")
-public class TriggerModulesListModel extends AbstractListModel<String>
+public class PipelineModulesListModel extends AbstractListModel<String>
     implements ComboBoxModel<String> {
+
     private final List<String> moduleNames = new LinkedList<>();
     private final List<PipelineDefinitionNode> pipelineNodes = new LinkedList<>();
 
     private String selectedName = null;
-    private final PipelineDefinition trigger;
+    private final PipelineDefinition pipeline;
 
-    public TriggerModulesListModel(PipelineDefinition trigger) {
-        this.trigger = trigger;
+    public PipelineModulesListModel(PipelineDefinition pipeline) {
+        this.pipeline = pipeline;
 
-        loadFromDatabase();
+        update();
     }
 
-    public void loadFromDatabase() {
+    public void update() {
         moduleNames.clear();
         pipelineNodes.clear();
 
-        trigger.buildPaths();
+        pipeline.buildPaths();
 
-        addNodes(trigger, trigger.getRootNodes());
+        addNodes(pipeline, pipeline.getRootNodes());
 
         if (moduleNames.size() > 0) {
             selectedName = moduleNames.get(0);
@@ -39,30 +40,30 @@ public void loadFromDatabase() {
         fireContentsChanged(this, 0, moduleNames.size() - 1);
     }
 
-    private void addNodes(PipelineDefinition trigger, List<PipelineDefinitionNode> nodes) {
+    private void addNodes(PipelineDefinition pipeline, List<PipelineDefinitionNode> nodes) {
         for (PipelineDefinitionNode node : nodes) {
             if (node != null) {
-                moduleNames.add(node.getModuleName().getName() + " (node:" + node.getId() + ")");
+                StringBuilder moduleName = new StringBuilder().append(node.getModuleName())
+                    .append(" (node:")
+                    .append(node.getId())
+                    .append(")");
+                moduleNames.add(moduleName.toString());
                 pipelineNodes.add(node);
             }
-            addNodes(trigger, node.getNextNodes());
+            addNodes(pipeline, node.getNextNodes());
         }
     }
 
-    public PipelineDefinitionNode getPipelineNodeAt(int index) {
-        return pipelineNodes.get(index);
-    }
-
     public PipelineDefinitionNode getSelectedPipelineNode() {
         int selectedIndex = moduleNames.indexOf(selectedName);
 
         if (selectedIndex != -1) {
-            return pipelineNodes.get(selectedIndex);
+            return getPipelineNodeAt(selectedIndex);
         }
         return null;
     }
 
-    public PipelineDefinitionNode getTriggerNodeAt(int index) {
+    public PipelineDefinitionNode getPipelineNodeAt(int index) {
         return pipelineNodes.get(index);
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineNodeWidget.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineNodeWidget.java
similarity index 63%
rename from src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineNodeWidget.java
rename to src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineNodeWidget.java
index 1156fa4..80a8c01 100644
--- a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/PipelineNodeWidget.java
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineNodeWidget.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.config.pipeline;
+package gov.nasa.ziggy.ui.pipeline;
 
 import java.awt.Font;
 import java.awt.GridBagConstraints;
@@ -6,13 +6,12 @@
 import java.awt.Insets;
 
 import javax.swing.BorderFactory;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
-import javax.swing.WindowConstants;
 import javax.swing.border.BevelBorder;
 
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
 
 /**
  * @author Todd Klaus
@@ -25,35 +24,29 @@ public class PipelineNodeWidget extends javax.swing.JPanel {
     private PipelineDefinitionNode pipelineNodeParent = null;
 
     public PipelineNodeWidget() {
-        initGUI();
+        buildComponent();
     }
 
     public PipelineNodeWidget(PipelineDefinitionNode pipelineNode,
         PipelineDefinitionNode pipelineNodeParent) {
         this.pipelineNode = pipelineNode;
         this.pipelineNodeParent = pipelineNodeParent;
-        initGUI();
+        buildComponent();
     }
 
     public PipelineNodeWidget(PipelineDefinition pipeline) {
         this.pipeline = pipeline;
-        initGUI();
+        buildComponent();
     }
 
-    private void initGUI() {
-        try {
-            JLabel nodeLabel = getLabel();
+    private void buildComponent() {
+        JLabel nodeLabel = getLabel();
 
-            GridBagLayout thisLayout = new GridBagLayout();
-            setLayout(thisLayout);
-            // this.setPreferredSize(new java.awt.Dimension(180, 25));
-            setPreferredSize(nodeLabel.getPreferredSize());
-            setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
-            this.add(nodeLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        setLayout(new GridBagLayout());
+        setPreferredSize(nodeLabel.getPreferredSize());
+        setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
+        add(nodeLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+            GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
     }
 
     public boolean isStartNode() {
@@ -91,20 +84,13 @@ private JLabel getLabel() {
                     uowtgShortName = pipelineNode.getUnitOfWorkGenerator().newInstance().toString();
                 } catch (Exception e) {
                 }
-                label.setText(pipelineNode.getModuleName().getName() + " (" + uowtgShortName + ")");
+                label.setText(pipelineNode.getModuleName() + " (" + uowtgShortName + ")");
             }
         }
         return label;
     }
 
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
     public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new PipelineNodeWidget());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
+        ZiggySwingUtils.displayTestDialog(new PipelineNodeWidget());
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineValidationResultsDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineValidationResultsDialog.java
new file mode 100644
index 0000000..0f5643d
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/PipelineValidationResultsDialog.java
@@ -0,0 +1,58 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import gov.nasa.ziggy.pipeline.TriggerValidationResults;
+
+/**
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class PipelineValidationResultsDialog extends javax.swing.JDialog {
+    private final TriggerValidationResults results;
+
+    public PipelineValidationResultsDialog(Window owner, TriggerValidationResults results) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.results = results;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Pipeline validation errors");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(createButton(CLOSE, this::close)),
+            BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private JPanel createDataPanel() {
+        JTextArea reportTextArea = new JTextArea();
+        reportTextArea.setText(results.errorReport());
+        reportTextArea.setEditable(false);
+        JPanel dataPanel = new JPanel(new BorderLayout());
+        dataPanel.add(new JScrollPane(reportTextArea), BorderLayout.CENTER);
+        return dataPanel;
+    }
+
+    public static void showValidationResults(Window owner, TriggerValidationResults results) {
+        new PipelineValidationResultsDialog(owner, results).setVisible(true);
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/RemoteExecutionDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/RemoteExecutionDialog.java
new file mode 100644
index 0000000..bbcabe7
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/RemoteExecutionDialog.java
@@ -0,0 +1,833 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.HtmlBuilder.htmlBuilder;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.ItemEvent;
+import java.text.NumberFormat;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import javax.swing.GroupLayout;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.text.NumberFormatter;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.module.AlgorithmExecutor;
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.module.SubtaskInformation;
+import gov.nasa.ziggy.module.remote.PbsParameters;
+import gov.nasa.ziggy.module.remote.RemoteArchitectureOptimizer;
+import gov.nasa.ziggy.module.remote.RemoteNodeDescriptor;
+import gov.nasa.ziggy.module.remote.RemoteParameters;
+import gov.nasa.ziggy.module.remote.RemoteQueueDescriptor;
+import gov.nasa.ziggy.pipeline.PipelineTaskInformation;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.ui.util.ValidityTestingFormattedTextField;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.LabelType;
+
+/**
+ * Dialog box that allows the user to set values in an instance of {@link RemoteParameters} and
+ * determine the resulting values in a corresponding {@link PbsParameters} instance.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class RemoteExecutionDialog extends JDialog {
+
+    @SuppressWarnings("unused")
+    private static Logger log = LoggerFactory.getLogger(RemoteExecutionDialog.class);
+
+    /** Minimum width to ensure {@code pack()} allows for the initially empty fields. */
+    private static final int PBS_PARAMETERS_MINIMUM_WIDTH = 100;
+
+    private static final long serialVersionUID = 20230927L;
+
+    // Reserved queue name: this name is a static variable so that it's "sticky,"
+    // i.e., once the user sets a reserved queue name it sticks around until the user
+    // changes it to a different value, loads a different value by selecting a pipeline
+    // node that's using a different reserved queue, or stops and restarts the console.
+    private static String reservedQueueName = "";
+
+    // Data model
+    private RemoteParameters originalParameters;
+    private RemoteParameters currentParameters;
+    private PipelineDefinitionNode node;
+    private int subtaskCount;
+    private int maxParallelSubtaskCount;
+    private ParameterSet parameterSet;
+    private int originalSubtaskCount;
+    private int originalMaxParallelSubtaskCount;
+    private List<SubtaskInformation> tasksInformation;
+
+    // Dialog box elements
+    private ValidityTestingFormattedTextField subtasksField;
+    private ValidityTestingFormattedTextField gigsPerSubtaskField;
+    private ValidityTestingFormattedTextField maxWallTimeField;
+    private ValidityTestingFormattedTextField wallTimeRatioField;
+    private JComboBox<RemoteArchitectureOptimizer> optimizerComboBox;
+    private JComboBox<RemoteNodeDescriptor> architectureComboBox;
+    private JComboBox<RemoteQueueDescriptor> queueComboBox;
+    private ValidityTestingFormattedTextField maxNodesField;
+    private ValidityTestingFormattedTextField subtasksPerCoreField;
+    private JButton calculateButton;
+    private JCheckBox nodeSharingCheckBox;
+    private JCheckBox wallTimeScalingCheckBox;
+
+    private JLabel pbsArch;
+    private JLabel pbsQueue;
+    private JLabel pbsWallTime;
+    private JLabel pbsNodeCount;
+    private JLabel pbsActiveCoresPerNode;
+    private JLabel pbsCost;
+
+    private Set<ValidityTestingFormattedTextField> validityTestingFormattedTextFields = new HashSet<>();
+    private Consumer<Boolean> checkFieldsAndEnableButtons = valid -> setButtonState();
+
+    public RemoteExecutionDialog(Window owner, ParameterSet originalParameterSet,
+        PipelineDefinitionNode node, List<SubtaskInformation> tasksInformation) {
+
+        super(owner, DEFAULT_MODALITY_TYPE);
+        parameterSet = originalParameterSet;
+        originalParameters = originalParameterSet.parametersInstance();
+        currentParameters = new RemoteParameters(originalParameters);
+        this.node = node;
+        this.tasksInformation = tasksInformation;
+        for (SubtaskInformation taskInformation : tasksInformation) {
+            subtaskCount += taskInformation.getSubtaskCount();
+            maxParallelSubtaskCount += taskInformation.getMaxParallelSubtasks();
+        }
+        originalSubtaskCount = subtaskCount;
+        originalMaxParallelSubtaskCount = maxParallelSubtaskCount;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Edit remote execution parameters");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(
+            createButton(CLOSE, htmlBuilder("Close this dialog box.").appendBreak()
+                .append(
+                    "Your remote parameter changes won't be saved until you hit Save on the edit pipeline dialog.")
+                .toString(), this::updateRemoteParameters),
+            createButton(CANCEL, "Clear all changes made in this dialog box and close it.",
+                this::cancel)),
+            BorderLayout.SOUTH);
+
+        populateTextFieldsAndComboBoxes();
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        JPanel remoteParametersToolBar = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton("Reset",
+                "Reset RemoteParameters values to the values at the start of this dialog box.",
+                this::resetAction),
+            createButton("Display task info",
+                "Display task and subtask information for this pipeline node.",
+                this::displayTaskInformation));
+        remoteParametersToolBar
+            .setToolTipText("Controls user-settable parameters for remote execution");
+
+        JLabel moduleGroup = boldLabel("Module", LabelType.HEADING1);
+
+        JLabel pipeline = boldLabel("Pipeline");
+        JLabel pipelineText = new JLabel(node.getPipelineName());
+
+        JLabel module = boldLabel("Module");
+        JLabel moduleText = new JLabel(node.getModuleName());
+
+        JLabel nodeSharingGroup = boldLabel("Node sharing", LabelType.HEADING1);
+        nodeSharingGroup.setToolTipText("Controls parallel processing of subtasks on each node.");
+        nodeSharingCheckBox = new JCheckBox("Node sharing");
+        nodeSharingCheckBox
+            .setToolTipText("Enables concurrent processing of multiple subtasks on each node.");
+        nodeSharingCheckBox.addItemListener(this::nodeSharingCheckBoxEvent);
+        wallTimeScalingCheckBox = new JCheckBox("Wall time scaling");
+        wallTimeScalingCheckBox.setToolTipText(
+            htmlBuilder("Scales subtask wall times inversely to the number of cores per node.")
+                .appendBreak()
+                .append("Only enabled when node sharing is disabled.")
+                .toString());
+
+        JLabel requiredRemoteParametersGroup = boldLabel("Required", LabelType.HEADING1);
+        requiredRemoteParametersGroup.setToolTipText("Parameters that must be set.");
+
+        JLabel subtasks = boldLabel("Total subtasks");
+        subtasksField = createSubtasksField();
+        validityTestingFormattedTextFields.add(subtasksField);
+
+        JLabel gigsPerSubtask = boldLabel("Gigs per subtask");
+        gigsPerSubtaskField = createGigsPerSubtaskField();
+        validityTestingFormattedTextFields.add(gigsPerSubtaskField);
+
+        JLabel maxWallTime = boldLabel("Max subtask wall time");
+        maxWallTimeField = createMaxWallTimeField();
+        validityTestingFormattedTextFields.add(maxWallTimeField);
+
+        JLabel typicalWallTime = boldLabel("Typical subtask wall time");
+        wallTimeRatioField = createTypicalWallTimeField();
+        validityTestingFormattedTextFields.add(wallTimeRatioField);
+
+        JLabel optimizer = boldLabel("Optimizer");
+        optimizerComboBox = createOptimizerComboBox();
+
+        JLabel optionalRemoteParametersGroup = boldLabel("Optional", LabelType.HEADING1);
+        optionalRemoteParametersGroup.setToolTipText(
+            htmlBuilder("Parameters that can be calculated if not set.").appendBreak()
+                .append("Values set by users will be included when calculating PBS parameters.")
+                .toString());
+
+        JLabel architecture = boldLabel("Architecture");
+        architectureComboBox = createArchitectureComboBox();
+
+        JLabel queue = boldLabel("Queue");
+        queueComboBox = createQueueComboBox();
+
+        JLabel maxNodesPerTask = boldLabel("Max nodes per task");
+        maxNodesField = createMaxNodesField();
+        validityTestingFormattedTextFields.add(maxNodesField);
+
+        JLabel subtasksPerCore = boldLabel("Subtasks per core");
+        subtasksPerCoreField = createSubtasksPerCoreField();
+        validityTestingFormattedTextFields.add(subtasksPerCoreField);
+
+        JLabel pbsParametersGroup = boldLabel("PBS parameters", LabelType.HEADING1);
+        pbsParametersGroup.setToolTipText("Displays parameters that will be sent to PBS.");
+
+        calculateButton = createButton("Calculate",
+            "Generate PBS parameters from the RemoteParameters values.",
+            this::calculatePbsParameters);
+        JPanel pbsParametersToolBar = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            calculateButton);
+
+        JLabel pbsArchLabel = boldLabel("Architecture:");
+        pbsArch = new JLabel();
+
+        JLabel pbsQueueLabel = boldLabel("Queue:");
+        pbsQueue = new JLabel();
+
+        JLabel pbsWallTimeLabel = boldLabel("Wall time:");
+        pbsWallTime = new JLabel();
+
+        JLabel pbsNodeCountLabel = boldLabel("Node count:");
+        pbsNodeCount = new JLabel();
+
+        JLabel pbsActiveCoresPerNodeLabel = boldLabel("Active cores per node:");
+        pbsActiveCoresPerNode = new JLabel();
+
+        JLabel pbsCostLabel = boldLabel("Cost (SBUs):");
+        pbsCost = new JLabel();
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(remoteParametersToolBar)
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(moduleGroup)
+                    .addGroup(dataPanelLayout.createSequentialGroup()
+                        .addGap(ZiggySwingUtils.INDENT)
+                        .addGroup(dataPanelLayout.createParallelGroup()
+                            .addComponent(pipeline)
+                            .addComponent(pipelineText)
+                            .addComponent(module)
+                            .addComponent(moduleText)))
+                    .addComponent(nodeSharingGroup)
+                    .addGroup(dataPanelLayout.createSequentialGroup()
+                        .addGap(ZiggySwingUtils.INDENT)
+                        .addGroup(dataPanelLayout.createParallelGroup()
+                            .addComponent(nodeSharingCheckBox)
+                            .addComponent(wallTimeScalingCheckBox)))
+                    .addComponent(requiredRemoteParametersGroup)
+                    .addGroup(dataPanelLayout.createSequentialGroup()
+                        .addGap(ZiggySwingUtils.INDENT)
+                        .addGroup(dataPanelLayout.createParallelGroup()
+                            .addComponent(subtasks)
+                            .addComponent(subtasksField, GroupLayout.PREFERRED_SIZE,
+                                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(gigsPerSubtask)
+                            .addComponent(gigsPerSubtaskField, GroupLayout.PREFERRED_SIZE,
+                                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(maxWallTime)
+                            .addComponent(maxWallTimeField, GroupLayout.PREFERRED_SIZE,
+                                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(typicalWallTime)
+                            .addComponent(wallTimeRatioField, GroupLayout.PREFERRED_SIZE,
+                                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(optimizer)
+                            .addComponent(optimizerComboBox, GroupLayout.PREFERRED_SIZE,
+                                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)))
+                    .addComponent(optionalRemoteParametersGroup)
+                    .addGroup(dataPanelLayout.createSequentialGroup()
+                        .addGap(ZiggySwingUtils.INDENT)
+                        .addGroup(dataPanelLayout.createParallelGroup()
+                            .addComponent(architecture)
+                            .addComponent(architectureComboBox, GroupLayout.PREFERRED_SIZE,
+                                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(queue)
+                            .addComponent(queueComboBox, GroupLayout.PREFERRED_SIZE,
+                                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(maxNodesPerTask)
+                            .addComponent(maxNodesField, GroupLayout.PREFERRED_SIZE,
+                                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(subtasksPerCore)
+                            .addComponent(subtasksPerCoreField, GroupLayout.PREFERRED_SIZE,
+                                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))))
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(pbsParametersGroup)
+                    .addGroup(dataPanelLayout.createSequentialGroup()
+                        .addGap(ZiggySwingUtils.INDENT)
+                        .addGroup(dataPanelLayout.createSequentialGroup()
+                            .addGroup(dataPanelLayout.createParallelGroup()
+                                .addComponent(pbsParametersToolBar)
+                                .addComponent(pbsArchLabel)
+                                .addComponent(pbsQueueLabel)
+                                .addComponent(pbsWallTimeLabel)
+                                .addComponent(pbsNodeCountLabel)
+                                .addComponent(pbsActiveCoresPerNodeLabel)
+                                .addComponent(pbsCostLabel))
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addGroup(dataPanelLayout.createParallelGroup()
+                                .addComponent(pbsArch, PBS_PARAMETERS_MINIMUM_WIDTH,
+                                    GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE)
+                                .addComponent(pbsQueue, PBS_PARAMETERS_MINIMUM_WIDTH,
+                                    GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE)
+                                .addComponent(pbsWallTime, PBS_PARAMETERS_MINIMUM_WIDTH,
+                                    GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE)
+                                .addComponent(pbsNodeCount, PBS_PARAMETERS_MINIMUM_WIDTH,
+                                    GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE)
+                                .addComponent(pbsActiveCoresPerNode, PBS_PARAMETERS_MINIMUM_WIDTH,
+                                    GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE)
+                                .addComponent(pbsCost, PBS_PARAMETERS_MINIMUM_WIDTH,
+                                    GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE)))))));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(remoteParametersToolBar, GroupLayout.PREFERRED_SIZE,
+                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addGroup(dataPanelLayout.createSequentialGroup()
+                    .addComponent(moduleGroup)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(pipeline)
+                    .addComponent(pipelineText)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(module)
+                    .addComponent(moduleText)
+                    .addGap(ZiggySwingUtils.GROUP_GAP)
+                    .addComponent(nodeSharingGroup)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(nodeSharingCheckBox)
+                    .addComponent(wallTimeScalingCheckBox)
+                    .addGap(ZiggySwingUtils.GROUP_GAP)
+                    .addComponent(requiredRemoteParametersGroup)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(subtasks)
+                    .addComponent(subtasksField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(gigsPerSubtask)
+                    .addComponent(gigsPerSubtaskField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(maxWallTime)
+                    .addComponent(maxWallTimeField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(typicalWallTime)
+                    .addComponent(wallTimeRatioField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(optimizer)
+                    .addComponent(optimizerComboBox, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addGap(ZiggySwingUtils.GROUP_GAP)
+                    .addComponent(optionalRemoteParametersGroup)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(architecture)
+                    .addComponent(architectureComboBox, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(queue)
+                    .addComponent(queueComboBox, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(maxNodesPerTask)
+                    .addComponent(maxNodesField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(subtasksPerCore)
+                    .addComponent(subtasksPerCoreField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                .addGroup(dataPanelLayout.createSequentialGroup()
+                    .addComponent(pbsParametersGroup)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addComponent(pbsParametersToolBar, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(ComponentPlacement.RELATED)
+                    .addGroup(dataPanelLayout.createParallelGroup()
+                        .addGroup(dataPanelLayout.createSequentialGroup()
+                            .addComponent(pbsArchLabel)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsQueueLabel)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsWallTimeLabel)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsNodeCountLabel)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsActiveCoresPerNodeLabel)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsCostLabel))
+                        .addGroup(dataPanelLayout.createSequentialGroup()
+                            .addComponent(pbsArch)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsQueue)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsWallTime)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsNodeCount)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsActiveCoresPerNode)
+                            .addPreferredGap(ComponentPlacement.RELATED)
+                            .addComponent(pbsCost))))));
+
+        return dataPanel;
+    }
+
+    private void setButtonState() {
+        boolean allFieldsValid = true;
+        for (ValidityTestingFormattedTextField field : validityTestingFormattedTextFields) {
+            allFieldsValid = allFieldsValid && field.isValidState();
+        }
+        calculateButton.setEnabled(allFieldsValid);
+    }
+
+    private ValidityTestingFormattedTextField createSubtasksField() {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        NumberFormatter formatter = new NumberFormatter(numberFormat);
+        formatter.setValueClass(Integer.class);
+        formatter.setMinimum(1);
+        formatter.setMaximum(Integer.MAX_VALUE);
+        ValidityTestingFormattedTextField subtasksField = new ValidityTestingFormattedTextField(
+            formatter);
+        subtasksField.setColumns(6);
+        subtasksField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
+        subtasksField.setToolTipText(
+            "Set the total number of subtasks for the selected module (must be >= 1).");
+
+        return subtasksField;
+    }
+
+    private void nodeSharingCheckBoxEvent(ItemEvent evt) {
+        wallTimeScalingCheckBox.setEnabled(!nodeSharingCheckBox.isSelected());
+        gigsPerSubtaskField.setEnabled(nodeSharingCheckBox.isSelected());
+        updateGigsPerSubtaskToolTip();
+    }
+
+    private ValidityTestingFormattedTextField createGigsPerSubtaskField() {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        NumberFormatter formatter = new NumberFormatter(numberFormat);
+        formatter.setValueClass(Double.class);
+        formatter.setMinimum(Double.MIN_VALUE);
+        formatter.setMaximum(Double.MAX_VALUE);
+        ValidityTestingFormattedTextField gigsPerSubtaskField = new ValidityTestingFormattedTextField(
+            formatter);
+        gigsPerSubtaskField.setColumns(6);
+        gigsPerSubtaskField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
+        return gigsPerSubtaskField;
+    }
+
+    private void updateGigsPerSubtaskToolTip() {
+        String enabledTip = "Enter the number of GB needed for each subtask (>0).";
+        String disabledTip = "Gigs per subtask is disabled when node sharing is disabled.";
+        String tip = gigsPerSubtaskField.isEnabled() ? enabledTip : disabledTip;
+        gigsPerSubtaskField.setToolTipText(tip);
+    }
+
+    private ValidityTestingFormattedTextField createMaxWallTimeField() {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        NumberFormatter formatter = new NumberFormatter(numberFormat);
+        formatter.setValueClass(Double.class);
+        formatter.setMinimum(Double.MIN_VALUE);
+        formatter.setMaximum(Double.MAX_VALUE);
+        ValidityTestingFormattedTextField maxWallTimeField = new ValidityTestingFormattedTextField(
+            formatter);
+        maxWallTimeField.setColumns(6);
+        maxWallTimeField
+            .setToolTipText("Enter the MAXIMUM wall time needed by any subtask, in hours (>0).");
+        maxWallTimeField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
+        maxWallTimeField.addFocusListener(new FocusAdapter() {
+
+            // Here is where we modify the typical field when the max field has been
+            // updated.
+            @Override
+            public void focusLost(FocusEvent e) {
+                if (maxWallTimeField.isValidState()) {
+                    ValidityTestingFormattedTextField typicalField = wallTimeRatioField;
+                    double maxValue = (double) maxWallTimeField.getValue();
+                    double typicalValue = (double) typicalField.getValue();
+                    NumberFormatter formatter = (NumberFormatter) typicalField.getFormatter();
+                    formatter.setMaximum(maxValue);
+                    if (typicalValue > maxValue) {
+                        typicalField.setBorder(ValidityTestingFormattedTextField.INVALID_BORDER);
+                    }
+                }
+            }
+        });
+        return maxWallTimeField;
+    }
+
+    private ValidityTestingFormattedTextField createTypicalWallTimeField() {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        NumberFormatter formatter = new NumberFormatter(numberFormat);
+        formatter.setValueClass(Double.class);
+        formatter.setMinimum(Double.MIN_VALUE);
+        formatter.setMaximum(currentParameters.getSubtaskMaxWallTimeHours());
+        ValidityTestingFormattedTextField wallTimeRatioField = new ValidityTestingFormattedTextField(
+            formatter);
+        wallTimeRatioField.setColumns(6);
+        wallTimeRatioField.setToolTipText(
+            "Enter the TYPICAL wall time needed by subtasks, in hours (>0, <= max wall time)");
+        wallTimeRatioField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
+        return wallTimeRatioField;
+    }
+
+    private JComboBox<RemoteArchitectureOptimizer> createOptimizerComboBox() {
+        JComboBox<RemoteArchitectureOptimizer> optimizerComboBox = new JComboBox<>(
+            RemoteArchitectureOptimizer.values());
+        optimizerComboBox.setToolTipText(
+            htmlBuilder("Select the optimizer used to pick a remote architecture:").appendBreak()
+                .append("&ensp;Cores minimizes the number of idle cores.")
+                .appendBreak()
+                .append("&ensp;Queue depth minimizes the number of hours of queued tasks.")
+                .appendBreak()
+                .append(
+                    "&ensp;Queue time minimizes the estimated total time including time in the queue.")
+                .appendBreak()
+                .append("&ensp;Cost minimizes the number of SBUs.")
+                .toString());
+        return optimizerComboBox;
+    }
+
+    private JComboBox<RemoteNodeDescriptor> createArchitectureComboBox() {
+        JComboBox<RemoteNodeDescriptor> architectureComboBox = new JComboBox<>(
+            RemoteNodeDescriptor.allDescriptors());
+        architectureComboBox.setToolTipText("Select remote node architecture.");
+        return architectureComboBox;
+    }
+
+    private JComboBox<RemoteQueueDescriptor> createQueueComboBox() {
+        JComboBox<RemoteQueueDescriptor> queueComboBox = new JComboBox<>(
+            RemoteQueueDescriptor.allDescriptors());
+        queueComboBox.setToolTipText("Select batch queue for use with these jobs.");
+        queueComboBox.addActionListener(this::validateQueueComboBox);
+        return queueComboBox;
+    }
+
+    /**
+     * Prompts the user to enter a reserved queue name when setting the queue combo box to
+     * "reserved". Note that the input dialog won't allow the user to return to messing around with
+     * the rest of the remote execution dialog until a valid value is entered.
+     */
+    private void validateQueueComboBox(ActionEvent evt) {
+        if (queueComboBox.getSelectedItem() == null
+            || queueComboBox.getSelectedItem() != RemoteQueueDescriptor.RESERVED) {
+            return;
+        }
+        String userReservedQueueName = "";
+        while (!userReservedQueueName.startsWith("R")) {
+            userReservedQueueName = JOptionPane.showInputDialog(
+                "Enter name of Reserved Queue (must start with R)", reservedQueueName);
+        }
+        reservedQueueName = userReservedQueueName;
+    }
+
+    private ValidityTestingFormattedTextField createMaxNodesField() {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        NumberFormatter formatter = new NumberFormatter(numberFormat);
+        formatter.setValueClass(Integer.class);
+        formatter.setMinimum(1);
+        formatter.setMaximum(Integer.MAX_VALUE);
+        ValidityTestingFormattedTextField maxNodesField = new ValidityTestingFormattedTextField(
+            formatter);
+        maxNodesField.setColumns(6);
+        maxNodesField.setToolTipText(
+            htmlBuilder("Enter the maximum number of nodes to request for each task (>=1)")
+                .appendBreak()
+                .append("or leave empty to let the algorithm determine the number.")
+                .toString());
+        maxNodesField.setEmptyIsValid(true);
+        maxNodesField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
+        return maxNodesField;
+    }
+
+    private ValidityTestingFormattedTextField createSubtasksPerCoreField() {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        NumberFormatter formatter = new NumberFormatter(numberFormat);
+        formatter.setValueClass(Double.class);
+        formatter.setMinimum(1.0);
+        formatter.setMaximum(Double.MAX_VALUE);
+        ValidityTestingFormattedTextField subtasksPerCoreField = new ValidityTestingFormattedTextField(
+            formatter);
+        subtasksPerCoreField.setColumns(6);
+        subtasksPerCoreField.setToolTipText(
+            htmlBuilder("Enter the number of subtasks per active core (>=1)").appendBreak()
+                .append("or leave empty to let the algorithm decide the number")
+                .toString());
+        subtasksPerCoreField.setEmptyIsValid(true);
+        subtasksPerCoreField.setExecuteOnValidityCheck(checkFieldsAndEnableButtons);
+        return subtasksPerCoreField;
+    }
+
+    private void populateTextFieldsAndComboBoxes() {
+
+        // Subtask counts.
+        subtasksField.setValue(subtaskCount);
+
+        // Required parameters.
+        if (!StringUtils.isEmpty(currentParameters.getOptimizer())
+            && RemoteArchitectureOptimizer.fromName(currentParameters.getOptimizer()) != null) {
+            optimizerComboBox.setSelectedItem(
+                RemoteArchitectureOptimizer.fromName(currentParameters.getOptimizer()));
+        }
+        wallTimeRatioField.setValue(currentParameters.getSubtaskTypicalWallTimeHours());
+        maxWallTimeField.setValue(currentParameters.getSubtaskMaxWallTimeHours());
+        gigsPerSubtaskField.setValue(currentParameters.getGigsPerSubtask());
+        nodeSharingCheckBox.setSelected(currentParameters.isNodeSharing());
+        wallTimeScalingCheckBox.setSelected(currentParameters.isWallTimeScaling());
+        wallTimeScalingCheckBox.setEnabled(!currentParameters.isNodeSharing());
+        gigsPerSubtaskField.setEnabled(currentParameters.isNodeSharing());
+        updateGigsPerSubtaskToolTip();
+
+        // Optional parameters.
+        if (!StringUtils.isEmpty(currentParameters.getRemoteNodeArchitecture())
+            && RemoteNodeDescriptor
+                .fromName(currentParameters.getRemoteNodeArchitecture()) != null) {
+            architectureComboBox.setSelectedItem(
+                RemoteNodeDescriptor.fromName(currentParameters.getRemoteNodeArchitecture()));
+        } else {
+            architectureComboBox.setSelectedItem(RemoteNodeDescriptor.ANY);
+        }
+
+        if (!StringUtils.isEmpty(currentParameters.getQueueName())
+            && RemoteQueueDescriptor.fromQueueName(currentParameters.getQueueName()) != null) {
+            queueComboBox.setSelectedItem(
+                RemoteQueueDescriptor.fromQueueName(currentParameters.getQueueName()));
+            if (queueComboBox.getSelectedItem() == RemoteQueueDescriptor.RESERVED) {
+                reservedQueueName = currentParameters.getQueueName();
+            }
+        } else {
+            queueComboBox.setSelectedItem(RemoteQueueDescriptor.ANY);
+        }
+
+        if (!StringUtils.isEmpty(currentParameters.getMaxNodes())) {
+            maxNodesField.setValue(Integer.parseInt(currentParameters.getMaxNodes()));
+        }
+        if (!StringUtils.isEmpty(currentParameters.getSubtasksPerCore())) {
+            subtasksPerCoreField
+                .setValue(Double.parseDouble(currentParameters.getSubtasksPerCore()));
+        }
+    }
+
+    private void resetAction(ActionEvent evt) {
+        PipelineTaskInformation.reset(node);
+        currentParameters = new RemoteParameters(originalParameters);
+        subtaskCount = originalSubtaskCount;
+        maxParallelSubtaskCount = originalMaxParallelSubtaskCount;
+        populateTextFieldsAndComboBoxes();
+        displayPbsValues(null);
+    }
+
+    private void displayTaskInformation(ActionEvent evt) {
+        TaskInformationDialog infoTable = new TaskInformationDialog(this, node);
+        infoTable.setVisible(true);
+    }
+
+    private void calculatePbsParameters(ActionEvent evt) {
+
+        try {
+            populateCurrentParameters();
+
+            String currentOptimizer = currentParameters.getOptimizer();
+            if (!currentParameters.isNodeSharing()
+                && currentOptimizer.equals(RemoteArchitectureOptimizer.CORES.toString())) {
+                JOptionPane.showMessageDialog(this,
+                    "Cores optimization disabled when node sharing disabled.\n"
+                        + "Cost optimization will be used instead.");
+                currentParameters.setOptimizer(RemoteArchitectureOptimizer.COST.toString());
+            }
+
+            // If the user has not changed the subtask counts parameter, use the original
+            // subtask counts that were generated for each task.
+            AlgorithmExecutor executor = AlgorithmExecutor.newRemoteInstance(null);
+            PbsParameters pbsParameters = null;
+            if (subtaskCount == originalSubtaskCount) {
+                Set<PbsParameters> perTaskPbsParameters = new HashSet<>();
+                for (SubtaskInformation taskInformation : tasksInformation) {
+                    perTaskPbsParameters.add(executor.generatePbsParameters(currentParameters,
+                        taskInformation.getSubtaskCount()));
+                }
+                pbsParameters = PbsParameters.aggregatePbsParameters(perTaskPbsParameters);
+            } else {
+                pbsParameters = executor.generatePbsParameters(currentParameters, subtaskCount);
+            }
+            displayPbsValues(pbsParameters);
+            currentParameters.setOptimizer(currentOptimizer);
+        } catch (Exception f) {
+            boolean handled = false;
+            if (f instanceof IllegalStateException || f instanceof PipelineException) {
+                handled = handlePbsParametersException(f.getStackTrace());
+            }
+            if (!handled) {
+                throw f;
+            }
+        }
+    }
+
+    private void populateCurrentParameters() {
+
+        // Subtask counts.
+        subtaskCount = (int) subtasksField.getValue();
+
+        // Required parameters.
+        RemoteArchitectureOptimizer optimizerSelection = (RemoteArchitectureOptimizer) optimizerComboBox
+            .getSelectedItem();
+        currentParameters.setOptimizer(optimizerSelection.toString());
+        currentParameters.setSubtaskTypicalWallTimeHours((double) wallTimeRatioField.getValue());
+        currentParameters.setSubtaskMaxWallTimeHours((double) maxWallTimeField.getValue());
+        currentParameters.setGigsPerSubtask((double) gigsPerSubtaskField.getValue());
+        currentParameters.setNodeSharing(nodeSharingCheckBox.isSelected());
+        currentParameters.setWallTimeScaling(wallTimeScalingCheckBox.isSelected());
+
+        // Optional parameters.
+        if (architectureComboBox.getSelectedItem() == null
+            || architectureComboBox.getSelectedItem() == RemoteNodeDescriptor.ANY) {
+            currentParameters.setRemoteNodeArchitecture("");
+        } else {
+            currentParameters.setRemoteNodeArchitecture(
+                ((RemoteNodeDescriptor) architectureComboBox.getSelectedItem()).getNodeName());
+        }
+
+        if (queueComboBox.getSelectedItem() == null
+            || queueComboBox.getSelectedItem() == RemoteQueueDescriptor.ANY) {
+            currentParameters.setQueueName("");
+        } else {
+            RemoteQueueDescriptor queue = (RemoteQueueDescriptor) queueComboBox.getSelectedItem();
+            if (queue == RemoteQueueDescriptor.RESERVED) {
+                currentParameters.setQueueName(reservedQueueName);
+            } else {
+                currentParameters.setQueueName(queue.getQueueName());
+            }
+        }
+
+        Object maxNodesValue = maxNodesField.getValue();
+        if (maxNodesValue != null) {
+            currentParameters.setMaxNodes(Integer.toString((int) maxNodesValue));
+        } else {
+            currentParameters.setMaxNodes("");
+        }
+
+        Object subtasksPerCoreValue = subtasksPerCoreField.getValue();
+        if (subtasksPerCoreValue != null) {
+            currentParameters.setSubtasksPerCore(Double.toString((double) subtasksPerCoreValue));
+        } else {
+            currentParameters.setSubtasksPerCore("");
+        }
+    }
+
+    private void displayPbsValues(PbsParameters pbsParameters) {
+        if (pbsParameters == null) {
+            pbsArch.setText("  ");
+            pbsQueue.setText("  ");
+            pbsWallTime.setText("  ");
+            pbsNodeCount.setText("  ");
+            pbsActiveCoresPerNode.setText("  ");
+            pbsCost.setText("  ");
+        } else {
+            pbsArch.setText(pbsParameters.getArchitecture().toString());
+            pbsQueue.setText(pbsParameters.getQueueName());
+            pbsWallTime.setText(pbsParameters.getRequestedWallTime());
+            pbsNodeCount.setText(Integer.toString(pbsParameters.getRequestedNodeCount()));
+            pbsActiveCoresPerNode.setText(Integer.toString(pbsParameters.getActiveCoresPerNode()));
+            pbsCost.setText(String.format("%.2f", pbsParameters.getEstimatedCost()));
+        }
+    }
+
+    private boolean handlePbsParametersException(StackTraceElement[] stackTrace) {
+        boolean handled = false;
+        String message = null;
+        for (StackTraceElement element : stackTrace) {
+            if (element.getClassName().equals(PbsParameters.class.getName())) {
+                if (element.getMethodName().equals("populateArchitecture")) {
+                    message = "Selected architecture has insufficient RAM";
+                    break;
+                }
+                if (element.getMethodName().equals("selectArchitecture")) {
+                    message = "All architectures lack sufficient RAM";
+                    break;
+                }
+                if (element.getMethodName().equals("computeWallTimeAndQueue")) {
+                    message = "No queue exists with sufficiently high time limit";
+                    break;
+                }
+            }
+        }
+        if (message != null) {
+            handled = true;
+            JOptionPane.showMessageDialog(this, message);
+        }
+        return handled;
+    }
+
+    /**
+     * Updates remote parameters. This means that any parameter changes the user made in this dialog
+     * box are returned to the edit pipeline dialog box. When the Save action for that dialog box
+     * happens, the parameters will be saved to the database; conversely, if the user chooses Cancel
+     * at that point, any changes made here are discarded.
+     */
+    private void updateRemoteParameters(ActionEvent evt) {
+
+        // If the user has made parameter changes that cause the remote parameters instance to be
+        // invalid, don't save them to the edit pipeline dialog box.
+        if (calculateButton.isEnabled()) {
+            parameterSet.setTypedParameters(currentParameters.getParameters());
+        }
+        dispose();
+    }
+
+    private void cancel(ActionEvent evt) {
+        resetAction(null);
+        dispose();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/StartPipelineDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/StartPipelineDialog.java
new file mode 100644
index 0000000..e8ef65d
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/StartPipelineDialog.java
@@ -0,0 +1,379 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.START;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Cursor;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import javax.swing.GroupLayout;
+import javax.swing.GroupLayout.Alignment;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.LayoutStyle.ComponentPlacement;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
+import gov.nasa.ziggy.services.messages.FireTriggerRequest;
+import gov.nasa.ziggy.ui.util.IntTextField;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.LabelType;
+import gov.nasa.ziggy.ui.util.proxy.PipelineOperationsProxy;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+public class StartPipelineDialog extends javax.swing.JDialog {
+    private static final long serialVersionUID = 20230810L;
+
+    private static final Logger log = LoggerFactory.getLogger(StartPipelineDialog.class);
+
+    private enum DelayUnits {
+        MINUTES, HOURS, DAYS;
+
+        @Override
+        public String toString() {
+            return super.toString().toLowerCase();
+        }
+    }
+
+    private PipelineDefinition pipeline;
+
+    private JTextField instanceNameTextField;
+    private JCheckBox unlimitedCheckBox;
+    private JLabel repetitions;
+    private JTextField repetitionsTextField;
+    private JTextField delayTextField;
+    private JComboBox<DelayUnits> delayUnitsComboBox;
+    private JCheckBox overrideStartCheckBox;
+    private JComboBox<String> startNodeComboBox;
+    private PipelineModulesListModel startNodeComboBoxModel;
+    private JCheckBox overrideEndCheckBox;
+    private JComboBox<String> endNodeComboBox;
+    private PipelineModulesListModel endNodeComboBoxModel;
+
+    public StartPipelineDialog(Window owner, PipelineDefinition pipeline) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.pipeline = pipeline;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Start pipeline");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(
+            createButtonPanel(createButton(START, this::start), createButton(CANCEL, this::cancel)),
+            BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+
+        JLabel instanceNameGroup = boldLabel("Pipeline instance name", LabelType.HEADING1);
+        instanceNameTextField = new JTextField();
+
+        JLabel repetitionsGroup = boldLabel("Pipeline instance repetitions", LabelType.HEADING1);
+
+        unlimitedCheckBox = new JCheckBox("Unlimited");
+        unlimitedCheckBox.addActionListener(this::unlimitedReps);
+
+        repetitions = new JLabel("Repetitions");
+        repetitionsTextField = new IntTextField("1");
+        repetitionsTextField.setColumns(6);
+
+        JLabel delay = new JLabel("Delay");
+        delayTextField = new IntTextField();
+        delayTextField.setColumns(6);
+
+        JLabel delayUnits = new JLabel("Units");
+        delayUnitsComboBox = new JComboBox<>(DelayUnits.values());
+        delayUnitsComboBox.setSelectedIndex(0);
+
+        JLabel overrideGroup = boldLabel("Start & end node override", LabelType.HEADING1);
+
+        overrideStartCheckBox = new JCheckBox("Override start");
+        overrideStartCheckBox.addActionListener(this::overrideStart);
+
+        startNodeComboBoxModel = new PipelineModulesListModel(pipeline);
+        startNodeComboBox = new JComboBox<>(startNodeComboBoxModel);
+        startNodeComboBox.setEnabled(false);
+
+        overrideEndCheckBox = new JCheckBox("Override stop");
+        overrideEndCheckBox.addActionListener(this::overrideEnd);
+
+        endNodeComboBoxModel = new PipelineModulesListModel(pipeline);
+        endNodeComboBox = new JComboBox<>(endNodeComboBoxModel);
+        endNodeComboBox.setEnabled(false);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(instanceNameGroup)
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGap(ZiggySwingUtils.INDENT)
+                .addComponent(instanceNameTextField))
+            .addComponent(repetitionsGroup)
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGap(ZiggySwingUtils.INDENT)
+                .addComponent(unlimitedCheckBox)
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(repetitions)
+                    .addComponent(repetitionsTextField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(delay)
+                    .addComponent(delayTextField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addComponent(delayUnits)
+                    .addComponent(delayUnitsComboBox, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)))
+            .addComponent(overrideGroup)
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addGap(ZiggySwingUtils.INDENT)
+                .addGroup(dataPanelLayout.createParallelGroup()
+                    .addGroup(dataPanelLayout.createSequentialGroup()
+                        .addComponent(overrideStartCheckBox)
+                        .addPreferredGap(ComponentPlacement.RELATED)
+                        .addComponent(startNodeComboBox, GroupLayout.PREFERRED_SIZE,
+                            GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                    .addGroup(dataPanelLayout.createSequentialGroup()
+                        .addComponent(overrideEndCheckBox)
+                        .addPreferredGap(ComponentPlacement.RELATED)
+                        .addComponent(endNodeComboBox, GroupLayout.PREFERRED_SIZE,
+                            GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)))));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(instanceNameGroup)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(instanceNameTextField, GroupLayout.PREFERRED_SIZE,
+                GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+            .addGap(ZiggySwingUtils.GROUP_GAP)
+            .addComponent(repetitionsGroup)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(unlimitedCheckBox, Alignment.TRAILING)
+                .addGroup(dataPanelLayout.createSequentialGroup()
+                    .addComponent(repetitions)
+                    .addComponent(repetitionsTextField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                .addGroup(dataPanelLayout.createSequentialGroup()
+                    .addComponent(delay)
+                    .addComponent(delayTextField, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                .addGroup(dataPanelLayout.createSequentialGroup()
+                    .addComponent(delayUnits)
+                    .addComponent(delayUnitsComboBox, GroupLayout.PREFERRED_SIZE,
+                        GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)))
+            .addGap(ZiggySwingUtils.GROUP_GAP)
+            .addComponent(overrideGroup)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(overrideStartCheckBox)
+                .addComponent(startNodeComboBox, GroupLayout.PREFERRED_SIZE,
+                    GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(overrideEndCheckBox)
+                .addComponent(endNodeComboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                    GroupLayout.PREFERRED_SIZE)));
+
+        return dataPanel;
+    }
+
+    private void unlimitedReps(ActionEvent evt) {
+
+        if (unlimitedCheckBox.isSelected()) {
+            repetitions.setEnabled(false);
+            repetitionsTextField.setEnabled(false);
+            repetitionsTextField.setText("");
+        } else {
+            repetitions.setEnabled(true);
+            repetitionsTextField.setEnabled(true);
+            repetitionsTextField.setText("1");
+            delayTextField.setText("");
+        }
+    }
+
+    private void overrideStart(ActionEvent evt) {
+        startNodeComboBox.setEnabled(overrideStartCheckBox.isSelected());
+    }
+
+    private void overrideEnd(ActionEvent evt) {
+        endNodeComboBox.setEnabled(overrideEndCheckBox.isSelected());
+    }
+
+    private void start(ActionEvent evt) {
+
+        try {
+            setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+
+            PipelineDefinitionNode startNode = null;
+            PipelineDefinitionNode endNode = null;
+
+            if (overrideStartCheckBox.isSelected()) {
+                startNode = startNodeComboBoxModel.getSelectedPipelineNode();
+            }
+
+            if (overrideEndCheckBox.isSelected()) {
+                endNode = endNodeComboBoxModel.getSelectedPipelineNode();
+            }
+
+            RepetitionsAndDelay repsAndDelay = getRepetitionAndDelay();
+            int repetitions = repsAndDelay.getRepetitions();
+            int delayMinutes = repsAndDelay.getDelayMinutes();
+            if (repetitions == 1) {
+                log.info("Pipeline started with 1 repetition");
+            } else if (repetitions < 0) {
+                log.info("Pipeline started with unlimited repetitions at " + delayMinutes
+                    + " minutes interval");
+            } else {
+                log.info("Pipeline started with " + repetitions + " repetitions at " + delayMinutes
+                    + " minutes interval");
+            }
+
+            if (startNode == null) {
+                log.info("Pipeline start at pipeline start nodes");
+            } else {
+                log.info("Pipeline start at node: " + startNode.getModuleName());
+            }
+
+            if (endNode == null) {
+                log.info("Pipeline end at pipeline end nodes");
+            } else {
+                log.info("Pipeline end at node: " + endNode.getModuleName());
+            }
+
+            PipelineOperationsProxy pipelineOps = new PipelineOperationsProxy();
+            pipelineOps.sendPipelineMessage(
+                new FireTriggerRequest(pipeline.getName(), instanceNameTextField.getText(),
+                    startNode, endNode, repetitions, delayMinutes * 60));
+
+            setCursor(null);
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+
+        setVisible(false);
+    }
+
+    private RepetitionsAndDelay getRepetitionAndDelay() {
+
+        int repetitions;
+        int delayMinutes;
+
+        if (unlimitedCheckBox.isSelected()) {
+            repetitions = -1;
+        } else {
+            String repsText = repetitionsTextField.getText();
+            if (repsText.isEmpty()) {
+                throw new IllegalStateException("Number of repetitions is empty");
+            }
+            repetitions = Integer.parseInt(repsText);
+            if (repetitions == 0) {
+                throw new IllegalStateException("Number of repetitions is zero");
+            }
+        }
+
+        if (repetitions != 1) {
+            String delayText = delayTextField.getText();
+            if (delayText.isEmpty()) {
+                throw new IllegalStateException("Repetitions delay is empty");
+            }
+            int delay = Integer.parseInt(delayText);
+            if (delay == 0) {
+                throw new IllegalStateException("Delay is set to zero");
+            }
+            DelayUnits delayUnits = (DelayUnits) delayUnitsComboBox.getSelectedItem();
+            delayMinutes = switch (delayUnits) {
+                case MINUTES -> delay;
+                case HOURS -> 60 * delay;
+                case DAYS -> 60 * 24 * delay;
+                default -> throw new IllegalStateException(
+                    "Delay unit " + delayUnits + " not supported");
+            };
+        } else {
+            delayMinutes = 0;
+        }
+
+        return new RepetitionsAndDelay(repetitions, delayMinutes);
+    }
+
+    private void cancel(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    public static void main(String[] args) {
+        PipelineDefinition dummyPipeline = new PipelineDefinition("dummy");
+        PipelineModuleDefinition dummyModule = new PipelineModuleDefinition("dmy");
+        PipelineDefinitionNode dummyNode = new PipelineDefinitionNode(dummyModule.getName(),
+            dummyPipeline.getName());
+        List<PipelineDefinitionNode> rootNode = new ArrayList<>();
+        rootNode.add(dummyNode);
+        dummyPipeline.setRootNodes(rootNode);
+        ZiggySwingUtils.displayTestDialog(new StartPipelineDialog(null, dummyPipeline));
+    }
+
+    private static class RepetitionsAndDelay {
+
+        private final int repetitions;
+        private final int delayMinutes;
+
+        public RepetitionsAndDelay(int repetitions, int delayMinutes) {
+            this.repetitions = repetitions;
+            this.delayMinutes = delayMinutes;
+        }
+
+        public int getRepetitions() {
+            return repetitions;
+        }
+
+        public int getDelayMinutes() {
+            return delayMinutes;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(delayMinutes, repetitions);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+            RepetitionsAndDelay other = (RepetitionsAndDelay) obj;
+            return delayMinutes == other.delayMinutes && repetitions == other.repetitions;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/TaskInformationDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/TaskInformationDialog.java
new file mode 100644
index 0000000..81f049e
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/TaskInformationDialog.java
@@ -0,0 +1,144 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.table.AbstractTableModel;
+
+import gov.nasa.ziggy.module.SubtaskInformation;
+import gov.nasa.ziggy.pipeline.PipelineTaskInformation;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+
+/**
+ * Displays task information for a {@link PipelineDefinitionNode}. Implemented as a modal dialog so
+ * as to block until the user is done with it.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class TaskInformationDialog extends JDialog {
+
+    private static final long serialVersionUID = 20230810L;
+
+    private PipelineDefinitionNode node;
+
+    public TaskInformationDialog(Window owner, PipelineDefinitionNode node) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.node = node;
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    public void buildComponent() {
+        setTitle("Task information");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(createButtonPanel(createButton(CLOSE, this::close)),
+            BorderLayout.SOUTH);
+
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+        pack();
+    }
+
+    public JPanel createDataPanel() {
+        JLabel pipeline = boldLabel("Pipeline");
+        JLabel pipelineText = new JLabel(node.getPipelineName());
+
+        JLabel module = boldLabel("Module");
+        JLabel moduleText = new JLabel(node.getModuleName());
+
+        List<SubtaskInformation> subtaskInfo = PipelineTaskInformation.subtaskInformation(node);
+        JTable table = new JTable(new TaskInformationTableModel(subtaskInfo));
+        table.setAutoCreateRowSorter(true);
+        JScrollPane tablePane = new JScrollPane(table);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(pipeline)
+            .addComponent(pipelineText)
+            .addComponent(module)
+            .addComponent(moduleText)
+            .addComponent(tablePane));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(pipeline)
+            .addComponent(pipelineText)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(module)
+            .addComponent(moduleText)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(tablePane));
+
+        return dataPanel;
+    }
+
+    private void close(ActionEvent evt) {
+        dispose();
+    }
+
+    private static class TaskInformationTableModel extends AbstractTableModel {
+
+        private static final long serialVersionUID = 20230810L;
+
+        private static final String[] COLUMN_NAMES = { "Task number", "UOW", "Subtasks" };
+
+        List<SubtaskInformation> subtaskInfo;
+
+        public TaskInformationTableModel(List<SubtaskInformation> subtaskInfo) {
+            this.subtaskInfo = subtaskInfo;
+        }
+
+        @Override
+        public int getRowCount() {
+            return subtaskInfo.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public String getColumnName(int columnIndex) {
+            return COLUMN_NAMES[columnIndex];
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            SubtaskInformation row = subtaskInfo.get(rowIndex);
+            return switch (columnIndex) {
+                case 0 -> rowIndex + 1;
+                case 1 -> row.getUowBriefState();
+                case 2 -> row.getSubtaskCount();
+                default -> throw new IllegalArgumentException(
+                    "Illegal column number: " + columnIndex);
+            };
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            if (subtaskInfo == null || subtaskInfo.isEmpty()) {
+                return Object.class;
+            }
+            return getValueAt(0, columnIndex).getClass();
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/ViewEditPipelinesPanel.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/ViewEditPipelinesPanel.java
new file mode 100644
index 0000000..60c9939
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/ViewEditPipelinesPanel.java
@@ -0,0 +1,355 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.DIALOG;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.START;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createMenuItem;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.event.ActionEvent;
+import java.util.Date;
+import java.util.Set;
+
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import org.netbeans.swing.outline.RowModel;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.definition.AuditInfo;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
+import gov.nasa.ziggy.services.security.User;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
+import gov.nasa.ziggy.ui.util.models.ZiggyTreeModel;
+import gov.nasa.ziggy.ui.util.proxy.PipelineDefinitionCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.RetrieveLatestVersionsCrudProxy;
+import gov.nasa.ziggy.ui.util.table.AbstractViewEditPanel;
+
+/**
+ * Panel for viewing and editing pipelines.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class ViewEditPipelinesPanel extends AbstractViewEditPanel<PipelineDefinition> {
+
+    private static final long serialVersionUID = 20230810L;
+
+    private PipelineDefinitionCrudProxy crudProxy = new PipelineDefinitionCrudProxy();
+    private ZiggyTreeModel<PipelineDefinition> treeModel;
+
+    public ViewEditPipelinesPanel(PipelineRowModel rowModel,
+        ZiggyTreeModel<PipelineDefinition> treeModel) {
+        super(rowModel, treeModel, "Name");
+        this.treeModel = treeModel;
+        buildComponent();
+    }
+
+    /**
+     * Convenience method that can be used instead of the constructor. Helpful because the row model
+     * for parameter sets needs the tree model in its constructor.
+     */
+    public static ViewEditPipelinesPanel newInstance() {
+        ZiggyTreeModel<PipelineDefinition> treeModel = new ZiggyTreeModel<>(
+            new PipelineDefinitionCrudProxy());
+        PipelineRowModel rowModel = new PipelineRowModel(treeModel);
+        return new ViewEditPipelinesPanel(rowModel, treeModel);
+    }
+
+    @Override
+    protected void buildComponent() {
+        super.buildComponent();
+        ZiggySwingUtils.addButtonsToPanel(getButtonPanel(), createButton(START, this::start));
+        getPopupMenu().add(
+            createMenuItem("New version of selected pipeline (unlock)" + DIALOG, this::newVersion),
+            0);
+    }
+
+    private void start(ActionEvent evt) {
+        checkPrivileges();
+
+        int tableRow = ziggyTable.getSelectedRow();
+        selectedModelRow = ziggyTable.convertRowIndexToModel(tableRow);
+        PipelineDefinition pipeline = ziggyTable.getContentAtViewRow(selectedModelRow);
+        if (pipeline != null) {
+            try {
+                new StartPipelineDialog(SwingUtilities.getWindowAncestor(this), pipeline)
+                    .setVisible(true);
+            } catch (Throwable e) {
+                MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+            }
+        }
+    }
+
+    private void newVersion(ActionEvent evt) {
+        checkPrivileges();
+
+        PipelineDefinition selectedPipeline = ziggyTable.getContentAtViewRow(selectedModelRow);
+
+        try {
+            // Make sure that an unlocked version of the selected pipeline is present in the
+            // database
+            PipelineDefinitionCrudProxy pipelineDefCrud = new PipelineDefinitionCrudProxy();
+            pipelineDefCrud.createOrUpdate(selectedPipeline);
+
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+        }
+    }
+
+    @Override
+    protected RetrieveLatestVersionsCrudProxy<PipelineDefinition> getCrudProxy() {
+        return crudProxy;
+    }
+
+    @Override
+    protected Set<OptionalViewEditFunctions> optionalViewEditFunctions() {
+        return Set.of(
+            /* TODO Implement OptionalViewEditFunctions.NEW, per ZIGGY-284 */ OptionalViewEditFunctions.VIEW,
+            OptionalViewEditFunctions.GROUP, OptionalViewEditFunctions.COPY,
+            OptionalViewEditFunctions.RENAME, OptionalViewEditFunctions.DELETE);
+    }
+
+    @Override
+    protected void refresh() {
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected void create() {
+        checkPrivileges();
+
+        NewPipelineDialog newPipelineDialog = new NewPipelineDialog(
+            SwingUtilities.getWindowAncestor(this));
+        newPipelineDialog.setVisible(true);
+        if (newPipelineDialog.isCancelled()) {
+            return;
+        }
+
+        EditPipelineDialog editDialog = new EditPipelineDialog(
+            SwingUtilities.getWindowAncestor(this),
+            new PipelineDefinition(newPipelineDialog.getPipelineName()), treeModel);
+        editDialog.setVisible(true);
+
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (PipelineException e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected void view(int row) {
+        checkPrivileges();
+
+        PipelineDefinition pipeline = ziggyTable.getContentAtViewRow(row);
+        JDialog dialog = new JDialog(SwingUtilities.getWindowAncestor(this), pipeline.getName(),
+            JDialog.DEFAULT_MODALITY_TYPE);
+        dialog.setLocationRelativeTo(SwingUtilities.getWindowAncestor(this));
+        dialog.add(new PipelineGraphCanvas(pipeline), BorderLayout.CENTER);
+        dialog.add(ZiggySwingUtils.createButtonPanel(createButton(CLOSE, this::close)),
+            BorderLayout.SOUTH);
+        dialog.pack();
+        dialog.setVisible(true);
+    }
+
+    private void close(ActionEvent evt) {
+        Dialog dialog = ZiggySwingUtils.getDialog((Component) evt.getSource());
+        if (dialog != null) {
+            dialog.setVisible(false);
+        }
+    }
+
+    @Override
+    protected void edit(int row) {
+        checkPrivileges();
+
+        PipelineDefinition pipeline = ziggyTable.getContentAtViewRow(row);
+        if (pipeline == null) {
+            return;
+        }
+        EditPipelineDialog editDialog = new EditPipelineDialog(
+            SwingUtilities.getWindowAncestor(this), pipeline, treeModel);
+        editDialog.setVisible(true);
+
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected void copy(int row) {
+        checkPrivileges();
+
+        PipelineDefinition pipeline = ziggyTable.getContentAtViewRow(row);
+        if (pipeline == null) {
+            return;
+        }
+
+        new PipelineDefinitionCrudProxy().createOrUpdate(pipeline.newInstance());
+
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected void rename(int row) {
+        checkPrivileges();
+
+        PipelineDefinition pipeline = ziggyTable.getContentAtViewRow(row);
+        if (pipeline == null) {
+            return;
+        }
+
+        try {
+            String newPipelineName = JOptionPane.showInputDialog(
+                SwingUtilities.getWindowAncestor(this),
+                "Enter the new name for this pipeline definition", "Rename pipeline definition",
+                JOptionPane.PLAIN_MESSAGE);
+
+            if (newPipelineName == null) {
+                return;
+            }
+            if (newPipelineName.isEmpty()) {
+                MessageUtil.showError(this, "Please enter a pipeline name");
+                return;
+            }
+
+            crudProxy.rename(pipeline, newPipelineName);
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected void delete(int row) {
+        checkPrivileges();
+
+        PipelineDefinition pipeline = ziggyTable.getContentAtViewRow(row);
+        if (pipeline == null) {
+            return;
+        }
+
+        if (pipeline.isLocked()) {
+            JOptionPane.showMessageDialog(this,
+                "Can not delete locked pipeline definitions. "
+                    + "Pipelines are locked when referenced by a pipeline instance",
+                "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        int choice = JOptionPane.showConfirmDialog(this,
+            "Are you sure you want to delete pipeline " + pipeline.getName() + "?");
+        if (choice != JOptionPane.YES_OPTION) {
+            return;
+        }
+
+        try {
+            crudProxy.deletePipeline(pipeline);
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private static class PipelineRowModel
+        implements RowModel, TableModelContentClass<PipelineDefinition> {
+
+        private static final String[] COLUMN_NAMES = { "Version", "Locked", "User", "Modified",
+            "Node count" };
+        private static final Class<?>[] COLUMN_CLASSES = { Integer.class, Boolean.class,
+            String.class, Object.class, Integer.class };
+
+        private ZiggyTreeModel<PipelineDefinition> treeModel;
+
+        public PipelineRowModel(ZiggyTreeModel<PipelineDefinition> treeModel) {
+            this.treeModel = treeModel;
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        private void checkColumnArgument(int columnIndex) {
+            checkArgument(columnIndex >= 0 && columnIndex < COLUMN_NAMES.length, "column value of "
+                + columnIndex + " outside of expected range from 0 to " + COLUMN_NAMES.length);
+        }
+
+        @Override
+        public boolean isCellEditable(Object node, int column) {
+            return false;
+        }
+
+        @Override
+        public void setValueFor(Object node, int column, Object value) {
+            // not editable
+        }
+
+        @Override
+        public Object getValueFor(Object treeNode, int columnIndex) {
+            checkColumnArgument(columnIndex);
+            treeModel.validityCheck();
+            Object node = ((DefaultMutableTreeNode) treeNode).getUserObject();
+
+            if (!(node instanceof PipelineDefinition)) {
+                return null;
+            }
+            PipelineDefinition pipeline = (PipelineDefinition) node;
+
+            AuditInfo auditInfo = pipeline.getAuditInfo();
+
+            User lastChangedUser = null;
+            Date lastChangedTime = null;
+
+            if (auditInfo != null) {
+                lastChangedUser = auditInfo.getLastChangedUser();
+                lastChangedTime = auditInfo.getLastChangedTime();
+            }
+
+            return switch (columnIndex) {
+                case 0 -> pipeline.getVersion();
+                case 1 -> pipeline.isLocked();
+                case 2 -> lastChangedUser != null ? lastChangedUser.getLoginName() : "---";
+                case 3 -> lastChangedTime != null ? lastChangedTime : "---";
+                case 4 -> pipeline.getNodes().size();
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            checkColumnArgument(columnIndex);
+            return COLUMN_CLASSES[columnIndex];
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            checkColumnArgument(column);
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public Class<PipelineDefinition> tableModelContentClass() {
+            return PipelineDefinition.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/pipeline/WorkerResourcesDialog.java b/src/main/java/gov/nasa/ziggy/ui/pipeline/WorkerResourcesDialog.java
new file mode 100644
index 0000000..0c5a734
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/pipeline/WorkerResourcesDialog.java
@@ -0,0 +1,237 @@
+package gov.nasa.ziggy.ui.pipeline;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.DIALOG;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.EDIT;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createMenuItem;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createPopupMenu;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.GroupLayout;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.ListSelectionModel;
+
+import org.netbeans.swing.etable.ETable;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.services.messages.WorkerResources;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.AbstractZiggyTableModel;
+import gov.nasa.ziggy.ui.util.table.TableMouseListener;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * Displays the max workers and Java heap size values for each node, and allows the user to edit the
+ * values. The value editing is actually performed by the
+ * {@link PipelineDefinitionNodeResourcesDialog}, which is launched from this dialog box.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class WorkerResourcesDialog extends JDialog implements TableMouseListener {
+
+    private static final long serialVersionUID = 20230810L;
+
+    private ZiggyTable<PipelineDefinitionNode> nodeResourcesTable;
+    private int selectedRow;
+    private String pipelineDefinitionName;
+
+    // Initial values in case the user decides to cancel the edits.
+    private Map<PipelineDefinitionNode, WorkerResources> initialResources = new HashMap<>();
+
+    public WorkerResourcesDialog(Window owner, PipelineDefinition pipelineDefinition) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        pipelineDefinitionName = pipelineDefinition.getName();
+        for (PipelineDefinitionNode node : pipelineDefinition.getNodes()) {
+            initialResources.put(node, node.workerResources());
+        }
+
+        nodeResourcesTable = new ZiggyTable<>(new WorkerResourcesTableModel(pipelineDefinition));
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Worker resources");
+
+        getContentPane().add(createDataPanel(), BorderLayout.CENTER);
+        getContentPane()
+            .add(
+                createButtonPanel(createButton(CANCEL,
+                    "Cancel any changes made here and close dialog box.", this::cancel),
+                    createButton(CLOSE, "Close this dialog box.", this::close)),
+                BorderLayout.SOUTH);
+
+        setMinimumSize(ZiggySwingUtils.MIN_DIALOG_SIZE);
+        pack();
+    }
+
+    private JPanel createDataPanel() {
+        WorkerResources resources = WorkerResources.getDefaultResources();
+
+        JLabel pipeline = boldLabel("Pipeline");
+        JLabel pipelineText = new JLabel(pipelineDefinitionName);
+
+        JLabel defaultWorkerCount = boldLabel("Default worker count");
+        JLabel defaultWorkerCountText = new JLabel(Integer.toString(resources.getMaxWorkerCount()));
+
+        JLabel defaultHeapSize = boldLabel("Default worker heap size");
+        JLabel defaultHeapSizeText = new JLabel(resources.humanReadableHeapSize().toString());
+
+        ETable table = nodeResourcesTable.getTable();
+        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        ZiggySwingUtils.addTableMouseListener(table,
+            createPopupMenu(createMenuItem(EDIT + DIALOG, WorkerResourcesDialog.this::edit)), this);
+        JScrollPane nodeResourcesTableScrollPane = new JScrollPane(table);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(pipeline)
+            .addComponent(pipelineText)
+            .addComponent(defaultWorkerCount)
+            .addComponent(defaultWorkerCountText)
+            .addComponent(defaultHeapSize)
+            .addComponent(defaultHeapSizeText)
+            .addComponent(nodeResourcesTableScrollPane));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(pipeline)
+            .addComponent(pipelineText)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(defaultWorkerCount)
+            .addComponent(defaultWorkerCountText)
+            .addPreferredGap(ComponentPlacement.RELATED)
+            .addComponent(defaultHeapSize)
+            .addComponent(defaultHeapSizeText)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(nodeResourcesTableScrollPane));
+
+        return dataPanel;
+    }
+
+    @Override
+    public void rowSelected(int row) {
+        selectedRow = row;
+    }
+
+    @Override
+    public void rowDoubleClicked(int row) {
+        edit(row);
+    }
+
+    private void edit(ActionEvent evt) {
+        edit(selectedRow);
+    }
+
+    private void edit(int row) {
+        int modelRow = nodeResourcesTable.getTable().convertRowIndexToModel(row);
+        try {
+            new PipelineDefinitionNodeResourcesDialog(this, pipelineDefinitionName,
+                nodeResourcesTable.getContentAtViewRow(modelRow)).setVisible(true);
+            nodeResourcesTable.fireTableDataChanged();
+        } catch (Throwable e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    /**
+     * Closes the dialog box. Changes are kept, but can still be discarded in the edit pipelines
+     * dialog box by selecting cancel.
+     */
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    /**
+     * Resets all the pipeline definition node resource settings to their initial values on entry to
+     * this dialog box and closes the dialog box.
+     */
+    private void cancel(ActionEvent evt) {
+        for (Map.Entry<PipelineDefinitionNode, WorkerResources> entry : initialResources
+            .entrySet()) {
+            entry.getKey().applyWorkerResources(entry.getValue());
+        }
+        setVisible(false);
+    }
+
+    /**
+     * Table model for the worker resources dialog box.
+     *
+     * @author PT
+     */
+    private static class WorkerResourcesTableModel
+        extends AbstractZiggyTableModel<PipelineDefinitionNode> {
+
+        private static final long serialVersionUID = 20230810L;
+
+        private static final String[] COLUMN_NAMES = { "Name", "Max workers", "Heap size" };
+
+        private List<PipelineDefinitionNode> pipelineDefinitionNodes = new ArrayList<>();
+
+        public WorkerResourcesTableModel(PipelineDefinition pipelineDefinition) {
+            pipelineDefinitionNodes = pipelineDefinition.getNodes();
+            fireTableDataChanged();
+        }
+
+        @Override
+        public Class<PipelineDefinitionNode> tableModelContentClass() {
+            return PipelineDefinitionNode.class;
+        }
+
+        @Override
+        public int getRowCount() {
+            return pipelineDefinitionNodes.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public String getColumnName(int columnIndex) {
+            return COLUMN_NAMES[columnIndex];
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            WorkerResources resources = getContentAtRow(rowIndex).workerResources();
+            return switch (columnIndex) {
+                case 0 -> getContentAtRow(rowIndex).getModuleName();
+                case 1 -> resources.maxWorkerCountIsDefault() ? "Default"
+                    : Integer.toString(resources.getMaxWorkerCount());
+                case 2 -> resources.heapSizeIsDefault() ? "Default"
+                    : resources.humanReadableHeapSize().toString();
+                default -> throw new PipelineException(
+                    "Column index " + columnIndex + " not supported");
+            };
+        }
+
+        @Override
+        public PipelineDefinitionNode getContentAtRow(int row) {
+            return pipelineDefinitionNodes.get(row);
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/package.html b/src/main/java/gov/nasa/ziggy/ui/pipeline/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/config/package.html
rename to src/main/java/gov/nasa/ziggy/ui/pipeline/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/ConsoleProxyInvocationHandler.java b/src/main/java/gov/nasa/ziggy/ui/proxy/ConsoleProxyInvocationHandler.java
deleted file mode 100644
index 13968ec..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/ConsoleProxyInvocationHandler.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package gov.nasa.ziggy.ui.proxy;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-
-/**
- * Invoke methods in the database access thread.
- *
- * @author Sean McCauliff
- */
-public class ConsoleProxyInvocationHandler implements InvocationHandler {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(ConsoleProxyInvocationHandler.class);
-
-    /**
-     * @param o The object that will be wrapped.
-     * @return An array of all interfaces that this object implements, including super classes. If
-     * there are none than this returns an array of length 0.
-     */
-    private static Class<?>[] allInterfaces(Object o) {
-        List<Class<?>> rv = new ArrayList<>();
-        for (Class<?> i = o.getClass(); i != null; i = i.getSuperclass()) {
-            Class<?>[] interfaces = i.getInterfaces();
-            Collections.addAll(rv, interfaces);
-        }
-
-        Class<?>[] array = new Class[rv.size()];
-        return rv.toArray(array);
-    }
-
-    public static Object createProxiedObject(Object targetObject) {
-        Class<?>[] interfaces = allInterfaces(targetObject);
-        ConsoleProxyInvocationHandler handler = new ConsoleProxyInvocationHandler(targetObject);
-        return Proxy.newProxyInstance(ConsoleProxyInvocationHandler.class.getClassLoader(),
-            interfaces, handler);
-    }
-
-    private final Object targetObject;
-    private CrudProxyExecutor crudProxyExecutor;
-
-    private ConsoleProxyInvocationHandler(Object targetObject) {
-        this.targetObject = targetObject;
-    }
-
-    @Override
-    public Object invoke(final Object proxy, final Method method, final Object[] args)
-        throws Throwable {
-        return getCrudProxyExecutor()
-            .executeSynchronousDatabaseTransaction(() -> method.invoke(targetObject, args));
-    }
-
-    private CrudProxyExecutor getCrudProxyExecutor() {
-        if (crudProxyExecutor == null) {
-            crudProxyExecutor = ZiggyGuiConsole.crudProxyExecutor;
-        }
-        return crudProxyExecutor;
-    }
-
-    void setCrudProxyExecutor(CrudProxyExecutor crudProxyExecutor) {
-        this.crudProxyExecutor = crudProxyExecutor;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/GroupCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/proxy/GroupCrudProxy.java
deleted file mode 100644
index ed18dfc..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/GroupCrudProxy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package gov.nasa.ziggy.ui.proxy;
-
-import java.util.List;
-
-import gov.nasa.ziggy.pipeline.definition.Group;
-import gov.nasa.ziggy.pipeline.definition.crud.GroupCrud;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-
-public class GroupCrudProxy extends CrudProxy {
-    public GroupCrudProxy() {
-    }
-
-    public void save(final Group group) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            GroupCrud crud = new GroupCrud();
-            crud.create(group);
-            return null;
-        });
-    }
-
-    public void delete(final Group group) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            GroupCrud crud = new GroupCrud();
-            crud.delete(group);
-            return null;
-        });
-    }
-
-    public List<Group> retrieveAll() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            GroupCrud crud = new GroupCrud();
-
-            List<Group> result1 = crud.retrieveAll();
-
-            return result1;
-        });
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/MetricsLogCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/proxy/MetricsLogCrudProxy.java
deleted file mode 100644
index 4194467..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/MetricsLogCrudProxy.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package gov.nasa.ziggy.ui.proxy;
-
-import java.util.Date;
-import java.util.List;
-
-import gov.nasa.ziggy.metrics.MetricType;
-import gov.nasa.ziggy.metrics.MetricValue;
-import gov.nasa.ziggy.metrics.MetricsCrud;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.util.TimeRange;
-
-/**
- * @author Todd Klaus
- */
-public class MetricsLogCrudProxy extends CrudProxy {
-    public MetricsLogCrudProxy() {
-    }
-
-    public List<MetricType> retrieveAllMetricTypes() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            MetricsCrud crud = new MetricsCrud();
-            List<MetricType> r = crud.retrieveAllMetricTypes();
-            return r;
-        });
-    }
-
-    public List<MetricValue> retrieveAllMetricValuesForType(final MetricType metricType,
-        final Date start, final Date end) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            MetricsCrud crud = new MetricsCrud();
-            List<MetricValue> r = crud.retrieveAllMetricValuesForType(metricType, start, end);
-            return r;
-        });
-    }
-
-    public TimeRange getTimestampRange(final MetricType metricType) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            MetricsCrud crud = new MetricsCrud();
-            TimeRange r = crud.getTimestampRange(metricType);
-            return r;
-        });
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineModuleDefinitionCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineModuleDefinitionCrudProxy.java
deleted file mode 100644
index 2d8f399..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineModuleDefinitionCrudProxy.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package gov.nasa.ziggy.ui.proxy;
-
-import java.util.List;
-
-import gov.nasa.ziggy.pipeline.definition.ModuleName;
-import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineModuleDefinitionCrud;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-
-/**
- * @author Todd Klaus
- */
-public class PipelineModuleDefinitionCrudProxy extends CrudProxy {
-    public PipelineModuleDefinitionCrudProxy() {
-    }
-
-    public void save(final PipelineModuleDefinition module) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
-            updateAuditInfo(module.getAuditInfo());
-            crud.create(module);
-            return null;
-        });
-    }
-
-    public void delete(final PipelineModuleDefinition module) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
-            crud.delete(module);
-            return null;
-        });
-    }
-
-    public void rename(final PipelineModuleDefinition moduleDef, final String newName) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
-            crud.rename(moduleDef, newName);
-            return null;
-        });
-    }
-
-    public List<PipelineModuleDefinition> retrieveAll() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
-            List<PipelineModuleDefinition> r = crud.retrieveAll();
-            return r;
-        });
-    }
-
-    public PipelineModuleDefinition retrieveLatestVersionForName(final ModuleName name) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
-            PipelineModuleDefinition r = crud.retrieveLatestVersionForName(name);
-            return r;
-        });
-    }
-
-    public List<PipelineModuleDefinition> retrieveLatestVersions() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
-            List<PipelineModuleDefinition> r = crud.retrieveLatestVersions();
-            return r;
-        });
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineOperationsProxy.java b/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineOperationsProxy.java
deleted file mode 100644
index 1b7f8ab..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineOperationsProxy.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package gov.nasa.ziggy.ui.proxy;
-
-import java.io.File;
-import java.util.Set;
-
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.PipelineOperations;
-import gov.nasa.ziggy.pipeline.TriggerValidationResults;
-import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
-import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.models.DatabaseModelRegistry;
-
-/**
- * @author Todd Klaus
- */
-public class PipelineOperationsProxy extends CrudProxy {
-
-    public PipelineOperationsProxy() {
-    }
-
-    public ParameterSet retrieveLatestParameterSet(final ParameterSetName parameterSetName) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineOperations pipelineOps = new PipelineOperations();
-            return pipelineOps.retrieveLatestParameterSet(parameterSetName);
-        });
-    }
-
-    /**
-     * Returns a {@link Set} containing all {@link Parameters} classes required by the specified
-     * node. This is a union of the Parameters classes required by the PipelineModule itself and the
-     * Parameters classes required by the UnitOfWorkTaskGenerator associated with the node.
-     *
-     * @param pipelineNode
-     * @return
-     */
-    public Set<ClassWrapper<Parameters>> retrieveRequiredParameterClassesForNode(
-        final PipelineDefinitionNode pipelineNode) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineOperations pipelineOps = new PipelineOperations();
-            return pipelineOps.retrieveRequiredParameterClassesForNode(pipelineNode);
-        });
-    }
-
-    /**
-     * @param instance
-     * @return
-     */
-    public String generatePedigreeReport(final PipelineInstance instance) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineOperations pipelineOps = new PipelineOperations();
-            return pipelineOps.generatePedigreeReport(instance);
-        });
-    }
-
-    /**
-     * @param pipelineDefinition
-     * @param destinationDirectory
-     */
-    public void exportPipelineParams(final PipelineDefinition pipelineDefinition,
-        final File destinationDirectory) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineOperations pipelineOps = new PipelineOperations();
-            pipelineOps.exportPipelineParams(pipelineDefinition, destinationDirectory);
-
-            return null;
-        });
-    }
-
-    /**
-     * @param pipelineDefinition
-     * @return
-     */
-    public String generateTriggerReport(final PipelineDefinition pipelineDefinition) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineOperations pipelineOps = new PipelineOperations();
-            return pipelineOps.generateTriggerReport(pipelineDefinition);
-        });
-    }
-
-    /**
-     * Creates a textual report of all ParameterSets in the Parameter Library, including name, type,
-     * keys and values.
-     *
-     * @param csvMode
-     * @return
-     */
-    public String generateParameterLibraryReport(final boolean csvMode) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineOperations pipelineOps = new PipelineOperations();
-            return pipelineOps.generateParameterLibraryReport(csvMode);
-        });
-    }
-
-    public ParameterSet updateParameterSet(final ParameterSet parameterSet,
-        final Parameters newParameters, final String newDescription, final boolean forceSave) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineOperations pipelineOps = new PipelineOperations();
-            return pipelineOps.updateParameterSet(parameterSet, newParameters, newDescription,
-                forceSave);
-        });
-    }
-
-    /**
-     * Sends a fire-trigger request message to the worker.
-     */
-    public void sendTriggerMessage(WorkerFireTriggerRequest triggerRequest) {
-        verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
-        PipelineOperations pipelineOps = new PipelineOperations();
-        pipelineOps.sendTriggerMessage(triggerRequest);
-        // invalidate the models since firing a trigger can change the locked state of versioned
-        // database objects
-        DatabaseModelRegistry.invalidateModels();
-    }
-
-    /**
-     * Sends a message to the worker requesting information on whether any pipelines are running or
-     * queued.
-     */
-    public void sendRunningPipelinesCheckRequestMessage() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        new PipelineOperations().sendRunningPipelinesCheckRequestMessage();
-    }
-
-    /**
-     * Validates that this {@link PipelineDefinition} is valid for firing. Checks that the
-     * associated pipeline definition objects have not changed in an incompatible way and that all
-     * {@link ParameterSetName}s are set.
-     */
-    public TriggerValidationResults validateTrigger(final PipelineDefinition pipelineDefinition) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronous(() -> {
-            PipelineOperations pipelineOps = new PipelineOperations();
-            return pipelineOps.validateTrigger(pipelineDefinition);
-        });
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/ZiggyEventCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/proxy/ZiggyEventCrudProxy.java
deleted file mode 100644
index bbf51bb..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/ZiggyEventCrudProxy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gov.nasa.ziggy.ui.proxy;
-
-import java.util.List;
-
-import gov.nasa.ziggy.services.events.ZiggyEvent;
-import gov.nasa.ziggy.services.events.ZiggyEventCrud;
-import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-
-public class ZiggyEventCrudProxy extends CrudProxy {
-
-    public List<ZiggyEvent> retrieveAllEvents() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor
-            .executeSynchronousDatabaseTransaction(() -> new ZiggyEventCrud().retrieveAllEvents());
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/package.html b/src/main/java/gov/nasa/ziggy/ui/proxy/package.html
deleted file mode 100644
index e86221a..0000000
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/package.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-  <body>
-    <p>
-      The first sentence is used as the brief description of the
-      package and appears at the top of the package documentation.
-      Additional sentences will appear at the bottom in the
-      Description section.
-    </p>
-    <dl>
-      <dt>Author</dt>
-      <dd>Bill Wohler</dd>
-      <dd>PT</dd>
-    </dl>
-    
-    <h2>Headings</h2>
-
-    <p>
-      Additional headings should use h2.
-    </p>
-
-    <h3>Sub-headings</h3>
-    
-    <p>
-      Sub-headings should use h3 and so on.
-    </p>
-
-  </body>
-</html>
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/security/UserEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/security/EditUserPanel.java
similarity index 51%
rename from src/main/java/gov/nasa/ziggy/ui/config/security/UserEditPanel.java
rename to src/main/java/gov/nasa/ziggy/ui/security/EditUserPanel.java
index 2ddd07b..0ea6fec 100644
--- a/src/main/java/gov/nasa/ziggy/ui/config/security/UserEditPanel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/security/EditUserPanel.java
@@ -1,4 +1,6 @@
-package gov.nasa.ziggy.ui.config.security;
+package gov.nasa.ziggy.ui.security;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.EDIT;
 
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -10,14 +12,13 @@
 
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTextField;
-import javax.swing.WindowConstants;
+import javax.swing.SwingUtilities;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,18 +26,19 @@
 import gov.nasa.ziggy.services.security.Privilege;
 import gov.nasa.ziggy.services.security.Role;
 import gov.nasa.ziggy.services.security.User;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.common.DoubleListDialog;
-import gov.nasa.ziggy.ui.common.GenericListModel;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.proxy.UserCrudProxy;
+import gov.nasa.ziggy.ui.util.DoubleListDialog;
+import gov.nasa.ziggy.ui.util.GenericListModel;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.proxy.UserCrudProxy;
 
 /**
  * @author Todd Klaus
  */
 @SuppressWarnings("serial")
-public class UserEditPanel extends javax.swing.JPanel {
-    private static final Logger log = LoggerFactory.getLogger(UserEditPanel.class);
+public class EditUserPanel extends javax.swing.JPanel {
+    @SuppressWarnings("unused")
+    private static final Logger log = LoggerFactory.getLogger(EditUserPanel.class);
 
     private JLabel loginLabel;
     private JTextField loginTextField;
@@ -64,31 +66,20 @@ public class UserEditPanel extends javax.swing.JPanel {
 
     private final UserCrudProxy userCrud;
 
-    public UserEditPanel(User user) {
+    public EditUserPanel(User user) {
         this.user = user;
         userCrud = new UserCrudProxy();
-        initGUI();
-    }
-
-    public UserEditPanel() {
-        user = new User();
-        userCrud = new UserCrudProxy();
-        initGUI();
+        buildComponent();
     }
 
     public void updateUser() {
-        log.debug("updateUser() - start");
-
         user.setLoginName(loginTextField.getText());
         user.setDisplayName(nameText.getText());
         user.setEmail(emailText.getText());
         user.setPhone(phoneText.getText());
-
-        log.debug("updateUser() - end");
     }
 
     private void rolesButtonActionPerformed() {
-        log.debug("rolesButtonActionPerformed(ActionEvent) - start");
         try {
             List<Role> currentRoles = user.getRoles();
             List<Role> allRoles = userCrud.retrieveAllRoles();
@@ -99,9 +90,9 @@ private void rolesButtonActionPerformed() {
                 }
             }
 
-            DoubleListDialog<Role> roleSelectionDialog = ZiggyGuiConsole.newDoubleListDialog(
-                "Roles for " + user.getDisplayName(), "Available Roles", availableRoles,
-                "Selected Roles", currentRoles);
+            DoubleListDialog<Role> roleSelectionDialog = new DoubleListDialog<>(
+                SwingUtilities.getWindowAncestor(this), "Roles for " + user.getDisplayName(),
+                "Available Roles", availableRoles, "Selected Roles", currentRoles);
             roleSelectionDialog.setVisible(true);
 
             if (roleSelectionDialog.wasSavePressed()) {
@@ -110,17 +101,11 @@ private void rolesButtonActionPerformed() {
                 rolesList.setModel(new GenericListModel<>(selectedRoles));
             }
         } catch (Throwable e) {
-            log.warn("rolesButtonActionPerformed(ActionEvent)", e);
-
             MessageUtil.showError(this, e);
         }
-
-        log.debug("rolesButtonActionPerformed(ActionEvent) - end");
     }
 
     private void privsButtonActionPerformed() {
-        log.debug("privsButtonActionPerformed(ActionEvent) - start");
-
         try {
             List<String> currentPrivs = user.getPrivileges();
             List<String> availablePrivs = new LinkedList<>();
@@ -130,9 +115,9 @@ private void privsButtonActionPerformed() {
                 }
             }
 
-            DoubleListDialog<String> privSelectionDialog = ZiggyGuiConsole.newDoubleListDialog(
-                "Privileges for " + user.getDisplayName(), "Available Privileges", availablePrivs,
-                "Selected Privileges", currentPrivs);
+            DoubleListDialog<String> privSelectionDialog = new DoubleListDialog<>(
+                SwingUtilities.getWindowAncestor(this), "Privileges for " + user.getDisplayName(),
+                "Available Privileges", availablePrivs, "Selected Privileges", currentPrivs);
             privSelectionDialog.setVisible(true);
 
             if (privSelectionDialog.wasSavePressed()) {
@@ -143,270 +128,197 @@ private void privsButtonActionPerformed() {
         } catch (Throwable e) {
             MessageUtil.showError(this, e);
         }
-
-        log.debug("privsButtonActionPerformed(ActionEvent) - end");
     }
 
-    private void initGUI() {
-        log.debug("initGUI() - start");
-
-        try {
-            GridBagLayout thisLayout = new GridBagLayout(); // rows
-            thisLayout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
-            thisLayout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7 };
-            thisLayout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
-                0.1 };
-            thisLayout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
-            setLayout(thisLayout);
-            setPreferredSize(new Dimension(600, 400));
-            this.add(getLoginLabel(),
-                new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getLoginTextField(),
-                new GridBagConstraints(1, 1, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getNameLabel(),
-                new GridBagConstraints(4, 1, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getNameText(),
-                new GridBagConstraints(5, 1, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getUserLabel(),
-                new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getUserSep(),
-                new GridBagConstraints(1, 0, 7, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-
-            this.add(getEmailLabel(),
-                new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getEmailText(),
-                new GridBagConstraints(1, 2, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getPhoneLabel(),
-                new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getPhoneText(),
-                new GridBagConstraints(5, 2, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getRolesLabel(),
-                new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getRolesSep(),
-                new GridBagConstraints(1, 3, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getPrivsLabel(),
-                new GridBagConstraints(4, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_END,
-                    GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getPrivsSep(),
-                new GridBagConstraints(5, 3, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
-                    GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getRolesScrollPane(), new GridBagConstraints(1, 4, 3, 4, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getPrivsScollPane(), new GridBagConstraints(5, 4, 3, 4, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getMetaLabel(),
-                new GridBagConstraints(0, 9, 9, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
-                    GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-            this.add(getRolesButton(), new GridBagConstraints(2, 8, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getPrivsButton(), new GridBagConstraints(6, 8, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
-            this.add(getActionButtonPanel(), new GridBagConstraints(2, 8, 5, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-        } catch (Exception e) {
-            log.error("initGUI()", e);
-
-            e.printStackTrace();
-        }
-
-        log.debug("initGUI() - end");
+    private void buildComponent() {
+
+        GridBagLayout layout = new GridBagLayout(); // rows
+        layout.columnWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
+        layout.columnWidths = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7 };
+        layout.rowWeights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 };
+        layout.rowHeights = new int[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
+        setLayout(layout);
+        setPreferredSize(new Dimension(600, 400));
+        add(getLoginLabel(), new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
+            GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+        add(getLoginTextField(),
+            new GridBagConstraints(1, 1, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+                GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        add(getNameLabel(), new GridBagConstraints(4, 1, 1, 1, 0.0, 0.0,
+            GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+        add(getNameText(), new GridBagConstraints(5, 1, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+            GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        add(getUserLabel(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
+            GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+        add(getUserSep(), new GridBagConstraints(1, 0, 7, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+            GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+
+        add(getEmailLabel(), new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
+            GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+        add(getEmailText(), new GridBagConstraints(1, 2, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+            GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        add(getPhoneLabel(), new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0,
+            GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+        add(getPhoneText(), new GridBagConstraints(5, 2, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+            GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        add(getRolesLabel(), new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0,
+            GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+        add(getRolesSep(), new GridBagConstraints(1, 3, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+            GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        add(getPrivsLabel(), new GridBagConstraints(4, 3, 1, 1, 0.0, 0.0,
+            GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+        add(getPrivsSep(), new GridBagConstraints(5, 3, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER,
+            GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
+        add(getRolesScrollPane(), new GridBagConstraints(1, 4, 3, 4, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0));
+        add(getPrivsScollPane(), new GridBagConstraints(5, 4, 3, 4, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0));
+        add(getMetaLabel(), new GridBagConstraints(0, 9, 9, 1, 0.0, 0.0,
+            GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+        add(getRolesButton(), new GridBagConstraints(2, 8, 1, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+        add(getPrivsButton(), new GridBagConstraints(6, 8, 1, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
+        add(getActionButtonPanel(), new GridBagConstraints(2, 8, 5, 1, 0.0, 0.0,
+            GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
     }
 
     private JLabel getLoginLabel() {
-        log.debug("getLoginLabel() - start");
-
         if (loginLabel == null) {
             loginLabel = new JLabel();
             loginLabel.setText("Login");
         }
 
-        log.debug("getLoginLabel() - end");
         return loginLabel;
     }
 
     private JTextField getLoginTextField() {
-        log.debug("getLoginTextField() - start");
-
         if (loginTextField == null) {
             loginTextField = new JTextField();
             loginTextField.setText(user.getLoginName());
         }
 
-        log.debug("getLoginTextField() - end");
         return loginTextField;
     }
 
     private JLabel getNameLabel() {
-        log.debug("getNameLabel() - start");
-
         if (nameLabel == null) {
             nameLabel = new JLabel();
             nameLabel.setText("Full Name");
         }
 
-        log.debug("getNameLabel() - end");
         return nameLabel;
     }
 
     private JTextField getNameText() {
-        log.debug("getNameText() - start");
-
         if (nameText == null) {
             nameText = new JTextField();
             nameText.setText(user.getDisplayName());
         }
 
-        log.debug("getNameText() - end");
         return nameText;
     }
 
     private JLabel getUserLabel() {
-        log.debug("getUserLabel() - start");
-
         if (userLabel == null) {
             userLabel = new JLabel();
             userLabel.setText("User");
             userLabel.setFont(new java.awt.Font("Dialog", 1, 14));
         }
 
-        log.debug("getUserLabel() - end");
         return userLabel;
     }
 
     private JSeparator getUserSep() {
-        log.debug("getUserSep() - start");
-
         if (userSep == null) {
             userSep = new JSeparator();
         }
 
-        log.debug("getUserSep() - end");
         return userSep;
     }
 
     private JLabel getEmailLabel() {
-        log.debug("getEmailLabel() - start");
-
         if (emailLabel == null) {
             emailLabel = new JLabel();
             emailLabel.setText("Email");
         }
 
-        log.debug("getEmailLabel() - end");
         return emailLabel;
     }
 
     private JTextField getEmailText() {
-        log.debug("getEmailText() - start");
-
         if (emailText == null) {
             emailText = new JTextField();
             emailText.setText(user.getEmail());
         }
 
-        log.debug("getEmailText() - end");
         return emailText;
     }
 
     private JLabel getPhoneLabel() {
-        log.debug("getPhoneLabel() - start");
-
         if (phoneLabel == null) {
             phoneLabel = new JLabel();
             phoneLabel.setText("Phone");
         }
 
-        log.debug("getPhoneLabel() - end");
         return phoneLabel;
     }
 
     private JTextField getPhoneText() {
-        log.debug("getPhoneText() - start");
-
         if (phoneText == null) {
             phoneText = new JTextField();
             phoneText.setText(user.getPhone());
         }
 
-        log.debug("getPhoneText() - end");
         return phoneText;
     }
 
     private JLabel getRolesLabel() {
-        log.debug("getRolesLabel() - start");
-
         if (rolesLabel == null) {
             rolesLabel = new JLabel();
             rolesLabel.setText("Roles");
             rolesLabel.setFont(new java.awt.Font("Dialog", 1, 14));
         }
 
-        log.debug("getRolesLabel() - end");
         return rolesLabel;
     }
 
     private JSeparator getRolesSep() {
-        log.debug("getRolesSep() - start");
-
         if (rolesSep == null) {
             rolesSep = new JSeparator();
         }
 
-        log.debug("getRolesSep() - end");
         return rolesSep;
     }
 
     private JLabel getPrivsLabel() {
-        log.debug("getPrivsLabel() - start");
-
         if (privsLabel == null) {
             privsLabel = new JLabel();
             privsLabel.setText("Privileges");
             privsLabel.setFont(new java.awt.Font("Dialog", 1, 14));
         }
 
-        log.debug("getPrivsLabel() - end");
         return privsLabel;
     }
 
     private JSeparator getPrivsSep() {
-        log.debug("getPrivsSep() - start");
-
         if (privsSep == null) {
             privsSep = new JSeparator();
         }
 
-        log.debug("getPrivsSep() - end");
         return privsSep;
     }
 
     private JScrollPane getRolesScrollPane() {
-        log.debug("getRolesScrollPane() - start");
-
         if (rolesScrollPane == null) {
             rolesScrollPane = new JScrollPane();
             rolesScrollPane.setViewportView(getRolesList());
         }
 
-        log.debug("getRolesScrollPane() - end");
         return rolesScrollPane;
     }
 
     private JList<Role> getRolesList() {
-        log.debug("getRolesList() - start");
-
         if (rolesList == null) {
             DefaultListModel<Role> rolesListModel = new DefaultListModel<>();
             for (Role role : user.getRoles()) {
@@ -417,25 +329,19 @@ private JList<Role> getRolesList() {
             rolesList.setVisibleRowCount(3);
         }
 
-        log.debug("getRolesList() - end");
         return rolesList;
     }
 
     private JScrollPane getPrivsScollPane() {
-        log.debug("getPrivsScollPane() - start");
-
         if (privsScollPane == null) {
             privsScollPane = new JScrollPane();
             privsScollPane.setViewportView(getPrivsList());
         }
 
-        log.debug("getPrivsScollPane() - end");
         return privsScollPane;
     }
 
     private JList<String> getPrivsList() {
-        log.debug("getPrivsList() - start");
-
         if (privsList == null) {
             DefaultListModel<String> privsListModel = new DefaultListModel<>();
             for (String privilege : user.getPrivileges()) {
@@ -446,13 +352,10 @@ private JList<String> getPrivsList() {
             privsList.setVisibleRowCount(3);
         }
 
-        log.debug("getPrivsList() - end");
         return privsList;
     }
 
     private JLabel getMetaLabel() {
-        log.debug("getMetaLabel() - start");
-
         if (metaLabel == null) {
             metaLabel = new JLabel();
             metaLabel.setText("Modified: " + user.getCreated() + " by admin");
@@ -460,51 +363,34 @@ private JLabel getMetaLabel() {
             metaLabel.setFont(new java.awt.Font("Dialog", 2, 12));
         }
 
-        log.debug("getMetaLabel() - end");
         return metaLabel;
     }
 
     private JButton getRolesButton() {
-        log.debug("getRolesButton() - start");
-
         if (rolesButton == null) {
             rolesButton = new JButton();
-            rolesButton.setText("edit");
+            rolesButton.setText(EDIT);
             rolesButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
                 rolesButtonActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
             });
         }
 
-        log.debug("getRolesButton() - end");
         return rolesButton;
     }
 
     private JButton getPrivsButton() {
-        log.debug("getPrivsButton() - start");
-
         if (privsButton == null) {
             privsButton = new JButton();
-            privsButton.setText("edit");
+            privsButton.setText(EDIT);
             privsButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
                 privsButtonActionPerformed();
-
-                log.debug("actionPerformed(ActionEvent) - end");
             });
         }
 
-        log.debug("getPrivsButton() - end");
         return privsButton;
     }
 
     private JPanel getActionButtonPanel() {
-        log.debug("getActionButtonPanel() - start");
-
         if (actionButtonPanel == null) {
             actionButtonPanel = new JPanel();
             FlowLayout actionButtonPanelLayout = new FlowLayout();
@@ -512,17 +398,10 @@ private JPanel getActionButtonPanel() {
             actionButtonPanel.setLayout(actionButtonPanelLayout);
         }
 
-        log.debug("getActionButtonPanel() - end");
         return actionButtonPanel;
     }
 
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
     public static void main(String[] args) {
-        log.debug("main(String[]) - start");
-
-        JFrame frame = new JFrame();
         User newUser = new User("user1", "User One", "user1@example.com", "555-0100");
         Role r1 = new Role("role1");
         r1.addPrivilege(Privilege.PIPELINE_OPERATIONS.toString());
@@ -533,11 +412,6 @@ public static void main(String[] args) {
         newUser.addRole(r1);
         newUser.addRole(r2);
 
-        frame.getContentPane().add(new UserEditPanel(newUser));
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
-
-        log.debug("main(String[]) - end");
+        ZiggySwingUtils.displayTestDialog(new EditUserPanel(newUser));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/group/GroupListModel.java b/src/main/java/gov/nasa/ziggy/ui/security/GroupListModel.java
similarity index 84%
rename from src/main/java/gov/nasa/ziggy/ui/config/group/GroupListModel.java
rename to src/main/java/gov/nasa/ziggy/ui/security/GroupListModel.java
index dfc66f1..3889aeb 100644
--- a/src/main/java/gov/nasa/ziggy/ui/config/group/GroupListModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/security/GroupListModel.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.config.group;
+package gov.nasa.ziggy.ui.security;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,8 +6,8 @@
 import javax.swing.ComboBoxModel;
 
 import gov.nasa.ziggy.pipeline.definition.Group;
-import gov.nasa.ziggy.ui.models.AbstractDatabaseListModel;
-import gov.nasa.ziggy.ui.proxy.GroupCrudProxy;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseListModel;
+import gov.nasa.ziggy.ui.util.proxy.GroupCrudProxy;
 
 /**
  * @author Todd Klaus
@@ -24,10 +24,6 @@ public GroupListModel() {
 
     @Override
     public void loadFromDatabase() {
-        if (groups != null) {
-            groupCrud.evictAll(groups);
-        }
-
         groups = groupCrud.retrieveAll();
 
         if (groups.size() > 0) {
diff --git a/src/main/java/gov/nasa/ziggy/ui/security/UserEditDialog.java b/src/main/java/gov/nasa/ziggy/ui/security/UserEditDialog.java
new file mode 100644
index 0000000..02ad464
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/security/UserEditDialog.java
@@ -0,0 +1,123 @@
+package gov.nasa.ziggy.ui.security;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SAVE;
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.Window;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.WindowConstants;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.services.security.User;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.proxy.UserCrudProxy;
+
+/**
+ * @author Todd Klaus
+ */
+@SuppressWarnings("serial")
+public class UserEditDialog extends javax.swing.JDialog {
+    @SuppressWarnings("unused")
+    private static final Logger log = LoggerFactory.getLogger(UserEditDialog.class);
+
+    private EditUserPanel userPanel;
+    private final User user;
+    private JButton cancelButton;
+    private JButton saveButton;
+    private JPanel buttonPanel;
+
+    private final UserCrudProxy userCrud;
+
+    public UserEditDialog(Window owner, User user) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.user = user;
+        userCrud = new UserCrudProxy();
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Edit User " + user.getDisplayName());
+        getContentPane().setLayout(new BorderLayout());
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        getContentPane().add(getUserPanel(), BorderLayout.CENTER);
+        getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
+        setSize(700, 483);
+    }
+
+    private void saveButtonActionPerformed() {
+        try {
+            userPanel.updateUser();
+            userCrud.saveUser(user);
+            setVisible(false);
+        } catch (Exception e) {
+            MessageUtil.showError(this, "Error Saving User", e.getMessage(), e);
+        }
+    }
+
+    private void cancelButtonActionPerformed() {
+        setVisible(false);
+    }
+
+    private EditUserPanel getUserPanel() {
+
+        if (userPanel == null) {
+            userPanel = new EditUserPanel(user);
+        }
+
+        return userPanel;
+    }
+
+    private JPanel getButtonPanel() {
+
+        if (buttonPanel == null) {
+            buttonPanel = new JPanel();
+            FlowLayout buttonPanelLayout = new FlowLayout();
+            buttonPanelLayout.setHgap(40);
+            buttonPanel.setLayout(buttonPanelLayout);
+            buttonPanel.add(getSaveButton());
+            buttonPanel.add(getCancelButton());
+        }
+
+        return buttonPanel;
+    }
+
+    private JButton getSaveButton() {
+
+        if (saveButton == null) {
+            saveButton = new JButton();
+            saveButton.setText(SAVE);
+            saveButton.addActionListener(evt -> {
+
+                saveButtonActionPerformed();
+            });
+        }
+
+        return saveButton;
+    }
+
+    private JButton getCancelButton() {
+
+        if (cancelButton == null) {
+            cancelButton = new JButton();
+            cancelButton.setText(CANCEL);
+            cancelButton.addActionListener(evt -> {
+
+                cancelButtonActionPerformed();
+            });
+        }
+
+        return cancelButton;
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new UserEditDialog(null, new User()));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/security/ViewEditRolesPanel.java b/src/main/java/gov/nasa/ziggy/ui/security/ViewEditRolesPanel.java
new file mode 100644
index 0000000..886066a
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/security/ViewEditRolesPanel.java
@@ -0,0 +1,211 @@
+package gov.nasa.ziggy.ui.security;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+import gov.nasa.ziggy.services.security.Privilege;
+import gov.nasa.ziggy.services.security.Role;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.DoubleListDialog;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseModel;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.UserCrudProxy;
+import gov.nasa.ziggy.ui.util.table.AbstractViewEditPanel;
+
+@SuppressWarnings("serial")
+public class ViewEditRolesPanel extends AbstractViewEditPanel<Role> {
+
+    private final UserCrudProxy userCrud = new UserCrudProxy();
+
+    public ViewEditRolesPanel() {
+        super(new RolesTableModel());
+
+        buildComponent();
+    }
+
+    @Override
+    protected void create() {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        String roleName = (String) JOptionPane.showInputDialog(
+            SwingUtilities.getWindowAncestor(this), "Enter a name for the new Role", "New Role",
+            JOptionPane.QUESTION_MESSAGE, null, null, "");
+
+        if (roleName != null && !roleName.isEmpty()) {
+            showEditDialog(new Role(roleName));
+        }
+    }
+
+    @Override
+    protected void edit(int row) {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        showEditDialog(ziggyTable.getContentAtViewRow(row));
+    }
+
+    @Override
+    protected void delete(int row) {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        Role role = ziggyTable.getContentAtViewRow(row);
+
+        int choice = JOptionPane.showConfirmDialog(this,
+            "Are you sure you want to delete role '" + role.getName() + "'?");
+
+        if (choice == JOptionPane.YES_OPTION) {
+            try {
+                try {
+                    userCrud.deleteRole(role);
+                } catch (ConsoleSecurityException e) {
+                    MessageUtil.showError(this, e);
+                }
+
+                ziggyTable.loadFromDatabase();
+            } catch (Throwable e) {
+                MessageUtil.showError(this, e);
+            }
+        }
+    }
+
+    @Override
+    protected void refresh() {
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Throwable e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void showEditDialog(Role role) {
+        try {
+            List<String> currentPrivs = role.getPrivileges();
+            List<String> availablePrivs = new LinkedList<>();
+            for (Privilege priv : Privilege.values()) {
+                if (!currentPrivs.contains(priv.toString())) {
+                    availablePrivs.add(priv.toString());
+                }
+            }
+
+            DoubleListDialog<String> privSelectionDialog = new DoubleListDialog<>(
+                SwingUtilities.getWindowAncestor(this), "Privileges for Role " + role.getName(),
+                "Available Privileges", availablePrivs, "Selected Privileges", currentPrivs);
+            privSelectionDialog.setVisible(true);
+
+            if (privSelectionDialog.wasSavePressed()) {
+                List<String> selectedPrivs = privSelectionDialog.getSelectedListContents();
+                role.setPrivileges(selectedPrivs);
+                try {
+                    userCrud.saveRole(role);
+                } catch (ConsoleSecurityException e) {
+                    MessageUtil.showError(this, e);
+                }
+                ziggyTable.loadFromDatabase();
+            }
+        } catch (Throwable e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    /**
+     * @author Todd Klaus
+     */
+    private static class RolesTableModel extends AbstractDatabaseModel<Role> {
+
+        private static final String[] COLUMN_NAMES = { "Role", "Privileges" };
+
+        private List<Role> roles = new LinkedList<>();
+        private final UserCrudProxy userCrud;
+
+        public RolesTableModel() {
+            userCrud = new UserCrudProxy();
+        }
+
+        @Override
+        public void loadFromDatabase() {
+            try {
+                roles = userCrud.retrieveAllRoles();
+            } catch (ConsoleSecurityException ignore) {
+            }
+
+            fireTableDataChanged();
+        }
+
+        @Override
+        public int getRowCount() {
+            validityCheck();
+            return roles.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            validityCheck();
+
+            Role role = roles.get(rowIndex);
+
+            return switch (columnIndex) {
+                case 0 -> role.getName();
+                case 1 -> getPrivilegeList(role);
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        private String getPrivilegeList(Role role) {
+            StringBuilder privList = new StringBuilder();
+            boolean first = true;
+
+            for (String privilege : role.getPrivileges()) {
+                if (!first) {
+                    privList.append(", ");
+                }
+                first = false;
+                privList.append(privilege);
+            }
+            return privList.toString();
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            return String.class;
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public Role getContentAtRow(int row) {
+            validityCheck();
+            return roles.get(row);
+        }
+
+        @Override
+        public Class<Role> tableModelContentClass() {
+            return Role.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/security/ViewEditUsersPanel.java b/src/main/java/gov/nasa/ziggy/ui/security/ViewEditUsersPanel.java
new file mode 100644
index 0000000..29b0c86
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/security/ViewEditUsersPanel.java
@@ -0,0 +1,173 @@
+package gov.nasa.ziggy.ui.security;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+import gov.nasa.ziggy.services.security.Privilege;
+import gov.nasa.ziggy.services.security.User;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseModel;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.UserCrudProxy;
+import gov.nasa.ziggy.ui.util.table.AbstractViewEditPanel;
+
+@SuppressWarnings("serial")
+public class ViewEditUsersPanel extends AbstractViewEditPanel<User> {
+
+    private final UserCrudProxy userCrud;
+
+    public ViewEditUsersPanel() {
+        super(new UsersTableModel());
+        userCrud = new UserCrudProxy();
+
+        buildComponent();
+    }
+
+    @Override
+    protected void create() {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        showEditDialog(new User());
+    }
+
+    @Override
+    protected void edit(int row) {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        showEditDialog(ziggyTable.getContentAtViewRow(row));
+    }
+
+    @Override
+    protected void delete(int row) {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        User user = ziggyTable.getContentAtViewRow(row);
+
+        int choice = JOptionPane.showConfirmDialog(this,
+            "Are you sure you want to delete user '" + user.getLoginName() + "'?");
+
+        if (choice == JOptionPane.YES_OPTION) {
+            try {
+                try {
+                    userCrud.deleteUser(user);
+                } catch (ConsoleSecurityException e) {
+                    MessageUtil.showError(this, e);
+                }
+                ziggyTable.loadFromDatabase();
+            } catch (Throwable e) {
+                MessageUtil.showError(this, e);
+            }
+        }
+    }
+
+    @Override
+    protected void refresh() {
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Throwable e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void showEditDialog(User user) {
+        new UserEditDialog(SwingUtilities.getWindowAncestor(this), user).setVisible(true);
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private static class UsersTableModel extends AbstractDatabaseModel<User> {
+
+        private static final String[] COLUMN_NAMES = { "Login", "Name" };
+
+        private List<User> users = new LinkedList<>();
+        private final UserCrudProxy userCrud;
+
+        public UsersTableModel() {
+            userCrud = new UserCrudProxy();
+        }
+
+        @Override
+        public void loadFromDatabase() {
+            try {
+                users = userCrud.retrieveAllUsers();
+            } catch (ConsoleSecurityException ignore) {
+            }
+
+            fireTableDataChanged();
+        }
+
+        // TODO Find a use for getUserAtRow or delete
+        @SuppressWarnings("unused")
+        public User getUserAtRow(int rowIndex) {
+            validityCheck();
+            return users.get(rowIndex);
+        }
+
+        @Override
+        public int getRowCount() {
+            validityCheck();
+            return users.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            validityCheck();
+
+            User user = users.get(rowIndex);
+
+            return switch (columnIndex) {
+                case 0 -> user.getLoginName();
+                case 1 -> user.getDisplayName();
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            return String.class;
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public User getContentAtRow(int row) {
+            validityCheck();
+            return users.get(row);
+        }
+
+        @Override
+        public Class<User> tableModelContentClass() {
+            return User.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/parameters/package.html b/src/main/java/gov/nasa/ziggy/ui/security/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/config/parameters/package.html
rename to src/main/java/gov/nasa/ziggy/ui/security/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/status/AlertsStatusPanel.java b/src/main/java/gov/nasa/ziggy/ui/status/AlertsStatusPanel.java
new file mode 100644
index 0000000..72302e5
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/status/AlertsStatusPanel.java
@@ -0,0 +1,151 @@
+package gov.nasa.ziggy.ui.status;
+
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.event.ActionEvent;
+import java.text.SimpleDateFormat;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.table.AbstractTableModel;
+
+import gov.nasa.ziggy.services.alert.Alert;
+import gov.nasa.ziggy.services.messages.AlertMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+
+/**
+ * Displays a table of recent alerts.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class AlertsStatusPanel extends JPanel {
+    private static final long serialVersionUID = 20230822L;
+
+    private AlertsTableModel alertsTableModel;
+
+    public AlertsStatusPanel() {
+        buildComponent();
+    }
+
+    private void buildComponent() {
+        JPanel toolBar = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            ZiggySwingUtils.createButton("Clear", this::clear),
+            ZiggySwingUtils.createButton("Ack", this::acknowledge));
+        alertsTableModel = new AlertsTableModel();
+        ZiggyTable<AlertMessage> ziggyTable = new ZiggyTable<>(alertsTableModel);
+        ziggyTable.getTable().setShowVerticalLines(false);
+        ziggyTable.getTable().setShowHorizontalLines(false);
+        JScrollPane alertTableScrollPane = new JScrollPane(ziggyTable.getTable());
+
+        GroupLayout layout = new GroupLayout(this);
+        setLayout(layout);
+
+        layout.setHorizontalGroup(
+            layout.createParallelGroup().addComponent(toolBar).addComponent(alertTableScrollPane));
+
+        layout.setVerticalGroup(layout.createSequentialGroup()
+            .addComponent(toolBar, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(alertTableScrollPane));
+    }
+
+    private void clear(ActionEvent evt) {
+        alertsTableModel.clear();
+        StatusPanel.ContentItem.ALERTS.menuItem().setState(Indicator.State.NORMAL);
+    }
+
+    private void acknowledge(ActionEvent evt) {
+        StatusPanel.ContentItem.ALERTS.menuItem().setState(Indicator.State.NORMAL);
+    }
+
+    private static class AlertsTableModel extends AbstractTableModel
+        implements TableModelContentClass<AlertMessage> {
+
+        private static final long serialVersionUID = 20230822L;
+
+        private static final int MAX_ALERTS = 1000;
+        private static final String WARNING_MESSAGE = "WARN level alerts present";
+        private static final String ERROR_MESSAGE = "ERROR/INFRASTRUCTURE level alerts present";
+        private static final String[] COLUMN_NAMES = { "Time", "Source", "Host", "Task", "Severity",
+            "Message" };
+
+        private final List<AlertMessage> alertMessages = new LinkedList<>();
+        private final SimpleDateFormat formatter;
+
+        public AlertsTableModel() {
+            formatter = new SimpleDateFormat("MM/dd/yy HH:mm:ss");
+
+            ZiggyMessenger.subscribe(AlertMessage.class, message -> {
+                addAlertMessage(message);
+            });
+        }
+
+        public void clear() {
+            alertMessages.clear();
+            fireTableDataChanged();
+        }
+
+        public void addAlertMessage(AlertMessage msg) {
+            if (alertMessages.size() >= MAX_ALERTS) {
+                // Remove oldest message from bottom.
+                alertMessages.remove(alertMessages.size() - 1);
+            }
+
+            // Insert new message at top.
+            alertMessages.add(0, msg);
+
+            fireTableRowsInserted(alertMessages.size() - 1, alertMessages.size() - 1);
+
+            String severity = msg.getAlertData().getSeverity();
+            Indicator alertIndicator = StatusPanel.ContentItem.ALERTS.menuItem();
+            if (severity.equals("WARNING")) {
+                alertIndicator.setState(Indicator.State.WARNING, WARNING_MESSAGE);
+            } else if (severity.equals("ERROR") || severity.equals("INFRASTRUCTURE")) {
+                alertIndicator.setState(Indicator.State.ERROR, ERROR_MESSAGE);
+            }
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            Alert alert = alertMessages.get(rowIndex).getAlertData();
+
+            return switch (columnIndex) {
+                case 0 -> formatter.format(alert.getTimestamp());
+                case 1 -> alert.getSourceComponent();
+                case 2 -> alert.getProcessHost();
+                case 3 -> alert.getSourceTaskId();
+                case 4 -> alert.getSeverity();
+                case 5 -> alert.getMessage();
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public int getRowCount() {
+            return alertMessages.size();
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public Class<AlertMessage> tableModelContentClass() {
+            return AlertMessage.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/status/Indicator.java b/src/main/java/gov/nasa/ziggy/ui/status/Indicator.java
new file mode 100644
index 0000000..807175d
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/status/Indicator.java
@@ -0,0 +1,334 @@
+package gov.nasa.ziggy.ui.status;
+
+import static gov.nasa.ziggy.ui.util.HtmlBuilder.htmlBuilder;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.GridLayout;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.BorderFactory;
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.SwingUtilities;
+import javax.swing.border.BevelBorder;
+
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * Represents a status information object that is a subclass of {@link JPanel}. The object can
+ * include text information that provides detailed information, as well as a {@link State} with the
+ * following values and associated colors:
+ * <ol>
+ * <li>{@link State#IDLE}: the current state of the object being reported is inactive (gray).
+ * <li>{@link State#NORMAL}: the current state of the object being reported is good (green).
+ * <li>{@link State#WARNING}: the current state of the object being reported has a non-fatal warning
+ * (amber).
+ * <li>{@link State#ERROR}: the current state of the object being reported has a fatal error (red).
+ * </ol>
+ * The {@link Indicator} also supports user-supplied tool tip text. The text can be manually changed
+ * on its own, or it can be changed when the state is changed. The user may also choose to supply a
+ * static tool tip text {@link String} for each of the {@link State#IDLE} and {@link State#NORMAL}
+ * states. These will be used when the appropriate state is assigned to the {@link Indicator}.
+ * <p>
+ * In addition, each {@link Indicator} may also be paired with an instance of {@link IdiotLight}.
+ * The {@link IdiotLight} class provides a less obtrusive and less informative summary of the object
+ * state that's suitable for use on the pipeline console.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class Indicator extends JPanel {
+
+    private static final long serialVersionUID = 20230822L;
+
+    /** Preferred width of the indicator. */
+    private static final int WIDTH = 200;
+
+    /** Preferred height of the full indicator. */
+    private static final int HEIGHT = 75;
+
+    /**
+     * Preferred height of the single line indicator, which is the height of a JLabel component plus
+     * a little padding to keep the items from running into each other in a list.
+     */
+    private static final int SINGLE_LINE_HEIGHT = ZiggySwingUtils.textHeight(new JLabel()) + 3;
+
+    /** Percentage of the width that the state color bar should take. */
+    private static final double STATE_WIDTH_RATIO = 0.5;
+
+    public enum State {
+        NORMAL(new java.awt.Color(0, 200, 0)),
+        WARNING(new java.awt.Color(250, 250, 0)),
+        ERROR(new java.awt.Color(250, 0, 0)),
+        IDLE(Color.GRAY);
+
+        private Color color;
+
+        State(Color color) {
+            this.color = color;
+        }
+
+        public Color getColor() {
+            return color;
+        }
+    }
+
+    private String displayName;
+    private JLabel name;
+    private State state = State.NORMAL;
+    private JPanel statePanel;
+    private String normalStateToolTipText;
+    private String idleStateToolTipText;
+    private JPanel infoPanel;
+    private IdiotLight idiotLight;
+
+    private GroupLayout dataPanelLayout;
+    private Set<IndicatorListener> listeners = new HashSet<>();
+
+    public Indicator(String displayName) {
+        this.displayName = displayName;
+        buildComponent();
+    }
+
+    public void addIndicatorListener(IndicatorListener listener) {
+        listeners.add(listener);
+    }
+
+    private void buildComponent() {
+        setPreferredSize(new java.awt.Dimension(WIDTH, HEIGHT));
+        setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
+        setVerifyInputWhenFocusTarget(false);
+
+        createDataPanel(displayName);
+
+        setState(state);
+    }
+
+    /** Make the indicator short and not bold for inclusion in a list. */
+    public void singleLine() {
+        JLabel oldName = name;
+        name = new JLabel(displayName);
+        dataPanelLayout.replace(oldName, name);
+        setPreferredSize(new Dimension(WIDTH, SINGLE_LINE_HEIGHT));
+        setBorder(BorderFactory.createEmptyBorder());
+    }
+
+    private void createDataPanel(String displayName) {
+        name = new JLabel(htmlBuilder().appendBold(displayName).toString());
+
+        // Setting the height to 90% of the line height keeps the state bars in lists from bleeding
+        // together.
+        statePanel = new JPanel();
+        statePanel.setPreferredSize(
+            new Dimension((int) (WIDTH * STATE_WIDTH_RATIO), (int) (SINGLE_LINE_HEIGHT * 0.90)));
+        statePanel.setBackground(new java.awt.Color(0, 167, 0));
+        statePanel.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
+
+        infoPanel = new JPanel();
+        infoPanel.setLayout(new GridLayout(3, 2));
+        infoPanel.setBackground(new java.awt.Color(255, 255, 255));
+
+        dataPanelLayout = new GroupLayout(this);
+        setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addGroup(dataPanelLayout.createSequentialGroup()
+                .addComponent(name)
+                .addPreferredGap(ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE,
+                    Short.MAX_VALUE)
+                .addComponent(statePanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                    GroupLayout.PREFERRED_SIZE))
+            .addComponent(infoPanel));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addGroup(dataPanelLayout.createParallelGroup()
+                .addComponent(name)
+                .addComponent(statePanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                    GroupLayout.PREFERRED_SIZE))
+            .addComponent(infoPanel));
+    }
+
+    public static State summaryState(Indicator... indicators) {
+        State sumState = State.IDLE;
+        for (Indicator indicator : indicators) {
+            if (indicator == null) {
+                continue;
+            }
+            if (indicator.getState() == State.NORMAL && sumState == State.IDLE) {
+                sumState = State.NORMAL;
+            }
+            if (indicator.getState() == State.WARNING
+                && (sumState == State.IDLE || sumState == State.NORMAL)) {
+                sumState = State.WARNING;
+            }
+            if (indicator.getState() == State.ERROR) {
+                sumState = State.ERROR;
+            }
+        }
+        return sumState;
+    }
+
+    public static String summaryToolTipText(Indicator... indicators) {
+        List<String> stateStrings = new ArrayList<>();
+        for (Indicator indicator : indicators) {
+            if (indicator == null) {
+                continue;
+            }
+            if (indicator.getState() == State.WARNING || indicator.getState() == State.ERROR) {
+                stateStrings.add(indicator.getToolTipText());
+            }
+        }
+        if (stateStrings.size() == 0) {
+            return null;
+        }
+        String summaryString = null;
+        for (int i = 0; i < stateStrings.size(); i++) {
+            summaryString += stateStrings.get(i);
+            if (i < stateStrings.size() - 1) {
+                summaryString += System.lineSeparator();
+            }
+        }
+        return summaryString;
+    }
+
+    /**
+     * Sets the state of the {@link Indicator} to a specified value. If the state is
+     * {@link State#NORMAL} or {@link State#IDLE}, the appropriate tooltip text is also applied. The
+     * color and tooltip text are applied to the {@link Indicator} and its {@link IdiotLight}, if
+     * any.
+     */
+    public void setState(State state) {
+        if (!SwingUtilities.isEventDispatchThread()) {
+            SwingUtilities.invokeLater(() -> setState(state));
+            return;
+        }
+
+        this.state = state;
+        statePanel.setBackground(state.getColor());
+
+        if (state == State.NORMAL && normalStateToolTipText != null) {
+            setToolTipText(normalStateToolTipText);
+        }
+        if (state == State.IDLE && idleStateToolTipText != null) {
+            setToolTipText(idleStateToolTipText);
+        }
+
+        if (idiotLight != null) {
+            idiotLight.setState(state, getToolTipText());
+        }
+
+        for (IndicatorListener listener : listeners) {
+            listener.stateChanged();
+        }
+    }
+
+    /**
+     * Sets the state of the {@link Indicator} to a specified value, and sets the tooltip text to a
+     * specified {@link String}. If the state is {@link State#NORMAL} or {@link State#IDLE}, and the
+     * tooltip text for these states is set, then the tooltip text argument to this method will be
+     * ignored. The color and tooltip text are applied to the {@link Indicator} and its
+     * {@link IdiotLight}, if any.
+     */
+    public void setState(State state, String toolTipText) {
+        setToolTipText(toolTipText);
+        setState(state);
+    }
+
+    public State getState() {
+        return state;
+    }
+
+    public void addDataComponent(Component component) {
+        infoPanel.add(component);
+    }
+
+    public IdiotLight getIdiotLight() {
+        return idiotLight;
+    }
+
+    public void setIdiotLight(IdiotLight idiotLight) {
+        this.idiotLight = idiotLight;
+    }
+
+    @Override
+    public void setToolTipText(String toolTipText) {
+        super.setToolTipText(toolTipText);
+        if (idiotLight != null) {
+            idiotLight.setToolTipText(toolTipText);
+        }
+    }
+
+    public void setNormalStateToolTipText(String normalStateToolTipText) {
+        this.normalStateToolTipText = normalStateToolTipText;
+    }
+
+    public void setIdleStateToolTipText(String idleStateToolTipText) {
+        this.idleStateToolTipText = idleStateToolTipText;
+    }
+
+    /**
+     * Visual representation of one of the status summary panel idiot lights, in this case a filled
+     * circle of one of the standard solid colors.
+     *
+     * @author PT
+     */
+    public static class IdiotLight extends JPanel {
+
+        private static final long serialVersionUID = 20230511L;
+        private static final int LIGHT_SIZE = 12;
+        private State state = State.NORMAL;
+
+        public IdiotLight() {
+            Dimension size = new Dimension(LIGHT_SIZE, LIGHT_SIZE + 10);
+            setPreferredSize(size);
+            setMinimumSize(size);
+            setMaximumSize(size);
+            setSize(size);
+            setLayout(null);
+        }
+
+        public void setState(State state, String toolTipText) {
+            if (this.state != state) {
+                this.state = state;
+                repaint();
+            }
+            setToolTipText(toolTipText);
+        }
+
+        public State getState() {
+            return state;
+        }
+
+        @Override
+        public void paintComponent(Graphics g) {
+            super.paintComponent(g);
+            g.setColor(state.getColor());
+            g.fillOval(0, 5, LIGHT_SIZE - 1, LIGHT_SIZE - 1);
+        }
+    }
+
+    /**
+     * The listener interface for receiving "interesting" changes to an indicator (state change).
+     * <p>
+     * The listener object is registered with an indicator using the {@code addMouseListener}
+     * method. When a change in the indicator occurs, the relevant method in the listener object is
+     * invoked.
+     */
+    interface IndicatorListener {
+        /**
+         * Invoked when this indicator's state changes.
+         * <p>
+         * If it is needed in the future, an {@code IndicatorEvent} parameter can be added that
+         * would include the source {@code Indicator} and the old and new state.
+         */
+        void stateChanged();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/status/LabelValue.java b/src/main/java/gov/nasa/ziggy/ui/status/LabelValue.java
new file mode 100644
index 0000000..f4b93e0
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/status/LabelValue.java
@@ -0,0 +1,27 @@
+package gov.nasa.ziggy.ui.status;
+
+import static gov.nasa.ziggy.ui.util.HtmlBuilder.htmlBuilder;
+
+import javax.swing.JLabel;
+
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * Displays a name: value JLabel.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class LabelValue extends JLabel {
+    private static final long serialVersionUID = 20230822L;
+
+    public LabelValue(String name, String value) {
+        setBackground(new java.awt.Color(255, 255, 255));
+        setText(htmlBuilder().appendBold(name).appendBold(": ").append(value).toString());
+        setFont(new java.awt.Font("Dialog", 0, 10));
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new LabelValue("name", "value"));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/status/PipelinesStatusPanel.java b/src/main/java/gov/nasa/ziggy/ui/status/PipelinesStatusPanel.java
new file mode 100644
index 0000000..8515f74
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/status/PipelinesStatusPanel.java
@@ -0,0 +1,81 @@
+package gov.nasa.ziggy.ui.status;
+
+import static gov.nasa.ziggy.ui.instances.InstancesTasksPanelAutoRefresh.REFRESH_INTERVAL_MILLIS;
+
+import java.awt.BorderLayout;
+import java.awt.event.HierarchyEvent;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.JComponent;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceFilter;
+import gov.nasa.ziggy.ui.instances.InstancesTable;
+
+/**
+ * Contains a list of recent pipelines that have errored out.
+ *
+ * @author Bill Wohler
+ */
+public class PipelinesStatusPanel extends javax.swing.JPanel implements Runnable {
+    private static final long serialVersionUID = 20230822L;
+
+    private InstancesTable instancesTable;
+    private JScrollBar verticalScrollBar;
+    private ScheduledFuture<?> scheduledFuture;
+    private boolean atBottom;
+
+    public PipelinesStatusPanel() {
+        buildComponent();
+        addHierarchyListener(this::hierarchyListener);
+    }
+
+    // Only run the time when this panel is visible.
+    // TODO Replace the timer with a PipelineStateChangedMessage
+    private void hierarchyListener(HierarchyEvent evt) {
+        JComponent component = (JComponent) evt.getSource();
+        if ((HierarchyEvent.SHOWING_CHANGED & evt.getChangeFlags()) != 0) {
+            if (component.isShowing()) {
+                scheduledFuture = new ScheduledThreadPoolExecutor(1).scheduleWithFixedDelay(this,
+                    0L, REFRESH_INTERVAL_MILLIS, TimeUnit.MILLISECONDS);
+            } else if (scheduledFuture != null) {
+                scheduledFuture.cancel(true);
+                scheduledFuture = null;
+            }
+        }
+    }
+
+    private void buildComponent() {
+        setLayout(new BorderLayout());
+
+        // Display all instances. Can't scroll to the bottom until the dialog has been packed.
+        instancesTable = new InstancesTable(new PipelineInstanceFilter(null, null, 0));
+        instancesTable.loadFromDatabase();
+        JScrollPane instancesTableScrollPane = new JScrollPane(instancesTable.getTable());
+        verticalScrollBar = instancesTableScrollPane.getVerticalScrollBar();
+        add(instancesTableScrollPane, BorderLayout.CENTER);
+    }
+
+    public void scrollToBottom() {
+        // Table has not yet been rendered.
+        if (instancesTable.getTable().getWidth() < 10) {
+            return;
+        }
+        SwingUtilities.invokeLater(() -> {
+            verticalScrollBar.setValue(verticalScrollBar.getMaximum());
+        });
+        atBottom = true;
+    }
+
+    @Override
+    public void run() {
+        instancesTable.loadFromDatabase();
+        if (!atBottom) {
+            scrollToBottom();
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/status/ProcessesStatusPanel.java b/src/main/java/gov/nasa/ziggy/ui/status/ProcessesStatusPanel.java
new file mode 100644
index 0000000..d1f9047
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/status/ProcessesStatusPanel.java
@@ -0,0 +1,127 @@
+package gov.nasa.ziggy.ui.status;
+
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+
+import org.apache.commons.configuration2.ImmutableConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.services.messages.WorkerResources;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiServer;
+
+/**
+ * Displays the status of the Ziggy processes.
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class ProcessesStatusPanel extends JPanel {
+
+    private static final long serialVersionUID = 20230822L;
+    private static Logger log = LoggerFactory.getLogger(ProcessesStatusPanel.class);
+
+    private static ProcessesStatusPanel instance;
+
+    private Indicator supervisorIndicator;
+    private Indicator databaseIndicator;
+    private Indicator messagingIndicator;
+
+    public ProcessesStatusPanel() {
+        buildComponent();
+
+        ZiggyMessenger.subscribe(WorkerResources.class, this::addWorkerDataComponents);
+    }
+
+    private void buildComponent() {
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+
+        supervisorIndicator = createIndicator("Supervisor", "Supervisor is running", null);
+
+        messagingIndicator = createIndicator("Messaging", "Messaging status: good", null);
+        messagingIndicator.addDataComponent(new LabelValue("Type", "RMI"));
+        messagingIndicator.addDataComponent(new LabelValue("Port", Integer.toString(config
+            .getInt(PropertyName.SUPERVISOR_PORT.property(), ZiggyRmiServer.RMI_PORT_DEFAULT))));
+
+        databaseIndicator = createIndicator("Database", "Database is running", null);
+        if (monitoringDatabase()) {
+            databaseIndicator.addDataComponent(
+                new LabelValue("Name", config.getString(PropertyName.DATABASE_NAME.property())));
+            databaseIndicator.addDataComponent(new LabelValue("Type",
+                config.getString(PropertyName.DATABASE_SOFTWARE.property())));
+            databaseIndicator.addDataComponent(
+                new LabelValue("Host", config.getString(PropertyName.DATABASE_HOST.property())));
+            databaseIndicator.addDataComponent(
+                new LabelValue("Port", config.getString(PropertyName.DATABASE_PORT.property())));
+            databaseIndicator.addDataComponent(new LabelValue("Connections",
+                config.getString(PropertyName.DATABASE_CONNECTIONS.property())));
+        } else {
+            databaseIndicator.setVisible(false);
+        }
+
+        GroupLayout layout = new GroupLayout(this);
+        layout.setAutoCreateGaps(true);
+        setLayout(layout);
+
+        layout.setHorizontalGroup(layout.createParallelGroup()
+            .addComponent(supervisorIndicator, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(messagingIndicator, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(databaseIndicator, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE));
+
+        layout.setVerticalGroup(layout.createSequentialGroup()
+            .addComponent(supervisorIndicator, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(messagingIndicator, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(databaseIndicator, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE));
+    }
+
+    private Indicator createIndicator(String name, String normalStateToolTipText,
+        String idleStateToolTipText) {
+        Indicator indicator = new Indicator(name);
+        indicator.setNormalStateToolTipText(normalStateToolTipText);
+        indicator.setIdleStateToolTipText(idleStateToolTipText);
+        indicator.setState(Indicator.State.NORMAL);
+        return indicator;
+    }
+
+    private static boolean monitoringDatabase() {
+        return ZiggyConfiguration.getInstance()
+            .getString(PropertyName.DATABASE_SOFTWARE.property(), null) != null;
+    }
+
+    public void addWorkerDataComponents(WorkerResources workerResources) {
+        log.info("Resource values returned: threads {}, heap size {} MB",
+            workerResources.getMaxWorkerCount(), workerResources.getHeapSizeMb());
+        supervisorIndicator().addDataComponent(
+            new LabelValue("Workers", Integer.toString(workerResources.getMaxWorkerCount())));
+        supervisorIndicator().addDataComponent(
+            new LabelValue("Worker Heap Size", workerResources.humanReadableHeapSize().toString()));
+    }
+
+    public static Indicator supervisorIndicator() {
+        return getInstance().supervisorIndicator;
+    }
+
+    public static Indicator databaseIndicator() {
+        return monitoringDatabase() ? getInstance().databaseIndicator : null;
+    }
+
+    public static Indicator messagingIndicator() {
+        return getInstance().messagingIndicator;
+    }
+
+    public static synchronized ProcessesStatusPanel getInstance() {
+        if (instance == null) {
+            instance = new ProcessesStatusPanel();
+        }
+        return instance;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/status/StatusPanel.java b/src/main/java/gov/nasa/ziggy/ui/status/StatusPanel.java
new file mode 100644
index 0000000..c71549a
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/status/StatusPanel.java
@@ -0,0 +1,225 @@
+package gov.nasa.ziggy.ui.status;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CONTAINER_GAP;
+
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.util.function.Supplier;
+
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.ListModel;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.ui.status.Indicator.IdiotLight;
+import gov.nasa.ziggy.ui.status.Indicator.IndicatorListener;
+import gov.nasa.ziggy.ui.status.Indicator.State;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * This class provides a color-coded display that provides real-time status of pipeline elements,
+ * including active pipelines, pipeline processes, worker threads, metrics, and alerts.
+ *
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+public class StatusPanel extends javax.swing.JPanel {
+
+    private static final long serialVersionUID = 20230822L;
+    @SuppressWarnings("unused")
+    private static final Logger log = LoggerFactory.getLogger(StatusPanel.class);
+
+    // To add new panels:
+    // 1. Add the item to this enum in the order that it should appear. The text is used in
+    // navigation. Provide a couple of method references that create the menu item and content panel
+    // respectively.
+    public enum ContentItem {
+        PIPELINES("Pipelines", ContentMenu::createPipelinesIndicator, PipelinesStatusPanel::new),
+        WORKERS("Workers", ContentMenu::createWorkersIndicator, WorkerStatusPanel::new),
+        PROCESSES("Processes", ContentMenu::createProcessesIndicator,
+            ProcessesStatusPanel::getInstance),
+        ALERTS("Alerts", ContentMenu::createAlertsIndicator, AlertsStatusPanel::new);
+
+        private String label;
+        private Indicator menuItem;
+        private Component panel;
+
+        ContentItem(String label, Supplier<Indicator> createMenuItem,
+            Supplier<Component> createPanel) {
+            this.label = label;
+            menuItem = createMenuItem.get();
+            panel = createPanel.get();
+        }
+
+        @Override
+        public String toString() {
+            return label;
+        }
+
+        public Indicator menuItem() {
+            return menuItem;
+        }
+
+        public Component panel() {
+            return panel;
+        }
+    }
+
+    private ContentMenu contentMenu;
+
+    public StatusPanel() {
+        buildComponent();
+    }
+
+    private void buildComponent() {
+        ContentPanel contentPanel = new ContentPanel();
+        contentMenu = new ContentMenu(contentPanel);
+        for (ContentItem contentItem : ContentItem.values()) {
+            contentItem.menuItem.addIndicatorListener(contentMenu);
+        }
+        JScrollPane contentMenuScrollPane = new JScrollPane(contentMenu);
+
+        // Add breathing room.
+        contentMenuScrollPane.setViewportBorder(
+            BorderFactory.createLineBorder(contentMenu.getBackground(), CONTAINER_GAP));
+
+        setLayout(new BorderLayout());
+        add(contentMenuScrollPane, BorderLayout.WEST);
+        add(contentPanel, BorderLayout.CENTER);
+    }
+
+    /**
+     * The navigation menu for the status display.
+     *
+     * @author Bill Wohler
+     */
+    private static class ContentMenu extends JList<ContentItem>
+        implements ListSelectionListener, ListCellRenderer<ContentItem>, IndicatorListener {
+
+        private static final long serialVersionUID = 20230821L;
+
+        @SuppressWarnings("unused")
+        private static final Logger log = LoggerFactory.getLogger(ContentMenu.class);
+
+        private ContentPanel contentPanel;
+
+        public ContentMenu(ContentPanel contentPanel) {
+            super(createModel());
+            this.contentPanel = contentPanel;
+            getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+            setVisibleRowCount(-1);
+            addListSelectionListener(this);
+            setCellRenderer(this);
+        }
+
+        private static ListModel<ContentItem> createModel() {
+            DefaultListModel<ContentItem> model = new DefaultListModel<>();
+            for (ContentItem value : ContentItem.values()) {
+                model.addElement(value);
+            }
+            return model;
+        }
+
+        @Override
+        public void valueChanged(ListSelectionEvent evt) {
+            if (evt.getValueIsAdjusting() || getSelectedValue() == null) {
+                return;
+            }
+            setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+            contentPanel.select(getSelectedValue());
+            setCursor(null);
+        }
+
+        @Override
+        public void stateChanged() {
+            repaint();
+        }
+
+        private static Indicator createPipelinesIndicator() {
+            return createIndicator("Pipelines", "Pipeline instance(s) executing normally",
+                "No pipeline instances executing", Indicator.State.IDLE);
+        }
+
+        private static Indicator createWorkersIndicator() {
+            return createIndicator("Workers", "Worker threads active", "All worker threads idle",
+                Indicator.State.IDLE);
+        }
+
+        private static Indicator createProcessesIndicator() {
+            return createIndicator("Processes", "All processes running normally", null,
+                Indicator.State.NORMAL);
+        }
+
+        private static Indicator createAlertsIndicator() {
+            return createIndicator("Alerts", "No unacknowledged alerts present", null,
+                Indicator.State.NORMAL);
+        }
+
+        private static Indicator createIndicator(String name, String normalStateToolTipText,
+            String idleStateToolTipText, State state) {
+            Indicator indicator = new Indicator(name);
+            indicator.singleLine();
+            indicator.setIdiotLight(new IdiotLight());
+            indicator.setNormalStateToolTipText(normalStateToolTipText);
+            indicator.setIdleStateToolTipText(idleStateToolTipText);
+            indicator.setState(state);
+            return indicator;
+        }
+
+        @Override
+        public Component getListCellRendererComponent(JList<? extends ContentItem> list,
+            ContentItem value, int index, boolean isSelected, boolean cellHasFocus) {
+            Component menuItem = value.menuItem();
+            if (isSelected) {
+                menuItem.setBackground(list.getSelectionBackground());
+                menuItem.setForeground(list.getSelectionForeground());
+            } else {
+                menuItem.setBackground(list.getBackground());
+                menuItem.setForeground(list.getForeground());
+            }
+            return menuItem;
+        }
+    }
+
+    /**
+     * The status content panel.
+     *
+     * @author Bill Wohler
+     */
+    private static class ContentPanel extends javax.swing.JPanel {
+        private static final long serialVersionUID = 20230821L;
+        private static final Logger log = LoggerFactory.getLogger(ContentPanel.class);
+
+        public ContentPanel() {
+            buildComponent();
+        }
+
+        private void buildComponent() {
+            setLayout(new CardLayout());
+
+            for (ContentItem value : ContentItem.values()) {
+                add(value.panel(), value.toString());
+            }
+        }
+
+        public void select(Object selection) {
+            log.debug("selection={}", selection);
+            ContentItem item = (ContentItem) selection;
+            ((CardLayout) getLayout()).show(this, item.toString());
+        }
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new StatusPanel());
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/status/StatusSummaryPanel.java b/src/main/java/gov/nasa/ziggy/ui/status/StatusSummaryPanel.java
new file mode 100644
index 0000000..22f7176
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/status/StatusSummaryPanel.java
@@ -0,0 +1,48 @@
+package gov.nasa.ziggy.ui.status;
+
+import static gov.nasa.ziggy.ui.status.StatusPanel.ContentItem.ALERTS;
+import static gov.nasa.ziggy.ui.status.StatusPanel.ContentItem.PIPELINES;
+import static gov.nasa.ziggy.ui.status.StatusPanel.ContentItem.PROCESSES;
+import static gov.nasa.ziggy.ui.status.StatusPanel.ContentItem.WORKERS;
+
+import java.awt.Dimension;
+
+import javax.swing.JLabel;
+
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * Displays a set of summary indicators ("idiot lights") for the status of several pipeline systems:
+ * pipelines, the worker, processes, alerts, and metrics. The indicators can be green, yellow, or
+ * red for various status, or gray if not applicable ("light is out").
+ *
+ * @author PT
+ * @author Bill Wohler
+ */
+public class StatusSummaryPanel extends javax.swing.JPanel {
+    private static final long serialVersionUID = 20230822L;
+
+    public StatusSummaryPanel() {
+        buildComponent();
+    }
+
+    private void buildComponent() {
+        addIdiotLight(PIPELINES.menuItem(), "Pi", "Pipeline instances");
+        addIdiotLight(WORKERS.menuItem(), "W", "Workers");
+        addIdiotLight(PROCESSES.menuItem(), "Pr", "Processes");
+        addIdiotLight(ALERTS.menuItem(), "A", "Alerts");
+    }
+
+    private void addIdiotLight(Indicator indicator, String label, String tooltip) {
+        JLabel lightLabel = new JLabel(label);
+        lightLabel.setToolTipText(tooltip);
+        add(lightLabel);
+        lightLabel.setMinimumSize(new Dimension(0, 35));
+        lightLabel.setMaximumSize(new Dimension(Integer.MAX_VALUE, 35));
+        add(indicator.getIdiotLight());
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new StatusSummaryPanel());
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/status/WorkerStatusPanel.java b/src/main/java/gov/nasa/ziggy/ui/status/WorkerStatusPanel.java
new file mode 100644
index 0000000..806e90b
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/status/WorkerStatusPanel.java
@@ -0,0 +1,249 @@
+package gov.nasa.ziggy.ui.status;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.SwingUtilities;
+
+import org.netbeans.swing.outline.Outline;
+
+import gov.nasa.ziggy.services.messages.HeartbeatMessage;
+import gov.nasa.ziggy.services.messages.WorkerResources;
+import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.process.StatusMessage;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.AbstractZiggyTableModel;
+import gov.nasa.ziggy.ui.util.table.ZiggyTable;
+import gov.nasa.ziggy.util.StringUtils;
+
+/**
+ * A status panel for worker processes. Status information is displayed using {@link Outline}.
+ *
+ * @author Todd Klaus
+ * @author PT
+ * @author Bill Wohler
+ */
+public class WorkerStatusPanel extends JPanel {
+
+    private static final long serialVersionUID = 20230822L;
+
+    private WorkerStatusTableModel model = new WorkerStatusTableModel();
+    private ZiggyTable<WorkerStatusMessage> table = new ZiggyTable<>(model);
+    private JLabel countTextField;
+    private JLabel heapTextField;
+
+    public WorkerStatusPanel() {
+        buildComponent();
+
+        ZiggyMessenger.subscribe(HeartbeatMessage.class, message -> {
+            update((StatusMessage) null);
+        });
+
+        ZiggyMessenger.subscribe(WorkerStatusMessage.class, this::update);
+
+        ZiggyMessenger.subscribe(WorkerResources.class, this::updateWorkerResources);
+    }
+
+    private void buildComponent() {
+
+        JLabel count = new JLabel("Max worker count:");
+        countTextField = new JLabel();
+
+        JLabel heap = new JLabel("Max worker heap size:");
+        heapTextField = new JLabel();
+
+        JScrollPane workers = new JScrollPane(table.getTable());
+
+        GroupLayout layout = new GroupLayout(this);
+        layout.setAutoCreateGaps(true);
+        setLayout(layout);
+
+        layout.setHorizontalGroup(layout.createParallelGroup()
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(count)
+                .addComponent(countTextField)
+                .addPreferredGap(ComponentPlacement.RELATED)
+                .addComponent(heap)
+                .addComponent(heapTextField))
+            .addComponent(workers));
+
+        layout.setVerticalGroup(layout.createSequentialGroup()
+            .addGroup(layout.createParallelGroup()
+                .addComponent(count)
+                .addComponent(countTextField)
+                .addComponent(heap)
+                .addComponent(heapTextField))
+            .addComponent(workers));
+    }
+
+    public void update(StatusMessage statusMessage) {
+        SwingUtilities.invokeLater(() -> {
+            if (statusMessage != null) {
+                model.updateModel((WorkerStatusMessage) statusMessage);
+            } else {
+                model.removeOutdatedMessages();
+            }
+            Indicator.State workerState = model.getRowCount() == 0 ? Indicator.State.IDLE
+                : Indicator.State.NORMAL;
+            StatusPanel.ContentItem.WORKERS.menuItem().setState(workerState);
+        });
+    }
+
+    public void updateWorkerResources(WorkerResources resources) {
+        countTextField.setText(Integer.toString(resources.getMaxWorkerCount()));
+        heapTextField.setText(resources.humanReadableHeapSize().toString());
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new WorkerStatusPanel());
+    }
+
+    /**
+     * Table model for display of worker status.
+     * <p>
+     * The model contains two {@link Map}s of the {@link WorkerStatusMessage} instances, where the
+     * map keys are the task IDs: the current map, which is used in the current display; and the new
+     * map, which is populated as instances of {@link WorkerStatusMessage} are received. Once all
+     * the workers are believed to have reported in, the current map is replaced by the new map and
+     * the table is updated.
+     * <p>
+     * Note that all methods must be synchronized. This ensures that no thread can attempt to use
+     * the class get methods during the time when the new map replaces the current one, and
+     * vice-versa.
+     *
+     * @author PT
+     */
+    static class WorkerStatusTableModel extends AbstractZiggyTableModel<WorkerStatusMessage> {
+
+        private static final long serialVersionUID = 20230511L;
+
+        private static final String[] COLUMN_NAMES = { "Worker", "State", "Age", "Instance", "Task",
+            "Module", "UOW" };
+
+        /**
+         * Status messages in the model. The {@link Boolean} component of the {@link Map} indicates
+         * whether the message is up-to-date, which is defined as a message that has arrived since
+         * the previous heartbeat message from the supervisor. Messages that are not up-to-date are
+         * removed when the next heartbeat message is detected. This is necessary to ensure that
+         * workers that fail without sending a status message marked as a final message do not
+         * remain in the model indefinitely.
+         */
+        private Map<WorkerStatusMessage, Boolean> statusMessages = new TreeMap<>();
+        private Set<WorkerStatusMessage> messageSet = statusMessages.keySet();
+
+        @Override
+        public Class<WorkerStatusMessage> tableModelContentClass() {
+            return WorkerStatusMessage.class;
+        }
+
+        @Override
+        public synchronized int getRowCount() {
+            return statusMessages.size();
+        }
+
+        @Override
+        public synchronized int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public synchronized String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        /**
+         * Updates the model with a new {@link WorkerStatusMessage}.
+         */
+        public synchronized void updateModel(WorkerStatusMessage message) {
+
+            // Remove any existing messages for that task.
+            statusMessages.remove(message);
+
+            // Put the new message into the Map, unless it's a final message.
+            if (!message.isLastMessageFromWorker()) {
+                statusMessages.put(message, true);
+            } else {
+            }
+            redrawTable();
+        }
+
+        /**
+         * Removes out-of-date messages from the {@link Map} and marks all remaining messages as
+         * out-of-date.
+         */
+        public synchronized void removeOutdatedMessages() {
+
+            // Remove any messages that are not marked as up to date; these are from workers that
+            // failed in some way that prevented them from sending a last message.
+            Set<WorkerStatusMessage> obsoleteMessages = new HashSet<>();
+            for (Map.Entry<WorkerStatusMessage, Boolean> entry : statusMessages.entrySet()) {
+                if (!entry.getValue()) {
+                    obsoleteMessages.add(entry.getKey());
+                }
+            }
+
+            // Java Map doesn't have a removeAll() method? Shocking!
+            if (!obsoleteMessages.isEmpty()) {
+                for (WorkerStatusMessage message : obsoleteMessages) {
+                    statusMessages.remove(message);
+                }
+                redrawTable();
+            }
+
+            // Mark all the remaining messages as out of date; these messages will either be
+            // replaced by up to date messages, removed when a last message from a worker comes in,
+            // or will be removed at the next call to this method.
+            for (Map.Entry<WorkerStatusMessage, Boolean> entry : statusMessages.entrySet()) {
+                entry.setValue(false);
+            }
+        }
+
+        @Override
+        public synchronized Object getValueAt(int rowIndex, int columnIndex) {
+            WorkerStatusMessage message = getContentAtRow(rowIndex);
+            return switch (columnIndex) {
+                case 0 -> message.getSourceProcess().getKey();
+                case 1 -> message.getState();
+                case 2 -> StringUtils.elapsedTime(message.getProcessingStartTime(),
+                    System.currentTimeMillis());
+                case 3 -> message.getInstanceId();
+                case 4 -> message.getTaskId();
+                case 5 -> message.getModule();
+                case 6 -> message.getModuleUow();
+                default -> new String();
+            };
+        }
+
+        @Override
+        public synchronized WorkerStatusMessage getContentAtRow(int row) {
+            return new ArrayList<>(messageSet).get(row);
+        }
+
+        /**
+         * Executes the fireTableDataChanged() method. Abstracted to a package-private method so
+         * that unit tests can override it.
+         */
+        void redrawTable() {
+            fireTableDataChanged();
+        }
+
+        /** For testing only. */
+        Map<WorkerStatusMessage, Boolean> statusMessages() {
+            return statusMessages;
+        }
+
+        /** For testing only. */
+        Set<WorkerStatusMessage> messageSet() {
+            return messageSet;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/package.html b/src/main/java/gov/nasa/ziggy/ui/status/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/mon/package.html
rename to src/main/java/gov/nasa/ziggy/ui/status/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/ClasspathUtils.java b/src/main/java/gov/nasa/ziggy/ui/util/ClasspathUtils.java
new file mode 100644
index 0000000..38186c7
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/ClasspathUtils.java
@@ -0,0 +1,115 @@
+package gov.nasa.ziggy.ui.util;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.ClasspathScanner;
+
+/**
+ * Classpath access utilities.
+ *
+ * @author Unknown Hero
+ * @author Bill Wohler
+ */
+public class ClasspathUtils {
+    private static final Logger log = LoggerFactory.getLogger(ClasspathUtils.class);
+
+    private static final String PACKAGE_FILTER = "^gov\\.nasa\\..*";
+    private static final String JAR_FILE_FILTER = "^.*-test-.*\\.jar";
+    // module-info
+    // org.glassfish.jaxb.runtime.v2.runtime.output.FastInfosetStreamWriterOutput
+
+    private ClasspathUtils() {
+    }
+
+    /**
+     * Scan for classes on the classpath that are Class.isAssignableFrom() the specified superclass.
+     * This requires loading the Class objects for all classes found on the classpath that match the
+     * package filters.
+     * <p>
+     * TODO Load the ClassFile objects into a Map, keyed by classname
+     * <p>
+     * Then use ClassFile.getSuperclass() and .getInterfaces() to provide the same functionality as
+     * Class.isAssignableFrom without the overhead and unintended consequences of class-loading
+     * every class on the classpath.
+     */
+    public static <E> Set<Class<? extends E>> scanFully(final Class<? extends E> superclass)
+        throws Exception {
+        final Set<Class<? extends E>> detectedClasses = new HashSet<>();
+
+        ClasspathScanner classpathScanner = new ClasspathScanner();
+        classpathScanner.addListener(classFile -> {
+            // Ignore abstract and inner classes.
+            if (classFile.isAbstract() || classFile.getName().contains("$")) {
+                return;
+            }
+            try {
+                @SuppressWarnings("unchecked")
+                Class<? extends E> clazz = (Class<? extends E>) Class.forName(classFile.getName());
+
+                if (superclass.isAssignableFrom(clazz)) {
+                    log.debug("Found {}", clazz.getName());
+                    detectedClasses.add(clazz);
+                }
+            } catch (Throwable ignore) {
+                // There are a surprising number of classes on the classpath that you can't call
+                // forName() on.
+                log.debug("Class.forName failed: classFile={}", classFile.getName());
+            }
+        });
+        classpathScanner.getIncludePackageFilters().add(PACKAGE_FILTER);
+        classpathScanner.getExcludeJarFilters().add(JAR_FILE_FILTER);
+        classpathScanner.scanForClasses();
+
+        return detectedClasses;
+    }
+
+    /**
+     * Scan for classes on the classpath that implement the specified interface. This method only
+     * loads the Class objects if they implement the specified interface
+     *
+     * @param interfaceClass
+     * @return
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    public static <E> Set<Class<? extends E>> scanForInterfaceImpl(
+        final Class<? extends E> interfaceClass) throws Exception {
+        final Set<Class<? extends E>> detectedClasses = new HashSet<>();
+
+        ClasspathScanner classpathScanner = new ClasspathScanner();
+        classpathScanner.addListener(classFile -> {
+            // Ignore abstract and inner classes.
+            if (classFile.isAbstract() || classFile.getName().contains("$")) {
+                return;
+            }
+
+            String[] interfaces = classFile.getInterfaces();
+            for (String interfaceName : interfaces) {
+                if (interfaceName.equals(interfaceClass.getName())) {
+                    try {
+                        Class<? extends E> clazz = (Class<? extends E>) Class
+                            .forName(classFile.getName());
+                        log.debug("Found {}", clazz);
+                        detectedClasses.add(clazz);
+                    } catch (ClassNotFoundException e) {
+                        // This can never occur. The class was found on the classpath, hence it
+                        // cannot be "not found."
+                        throw new AssertionError(e);
+                    }
+                }
+            }
+        });
+        classpathScanner.getIncludePackageFilters().add(PACKAGE_FILTER);
+        classpathScanner.getExcludeJarFilters().add(JAR_FILE_FILTER);
+        classpathScanner.scanForClasses();
+
+        return detectedClasses;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/DateTextField.java b/src/main/java/gov/nasa/ziggy/ui/util/DateTextField.java
similarity index 68%
rename from src/main/java/gov/nasa/ziggy/ui/common/DateTextField.java
rename to src/main/java/gov/nasa/ziggy/ui/util/DateTextField.java
index 4831c53..d1244df 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/DateTextField.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/DateTextField.java
@@ -1,12 +1,10 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.swing.JFrame;
 import javax.swing.JTextField;
-import javax.swing.WindowConstants;
 
 @SuppressWarnings("serial")
 public class DateTextField extends javax.swing.JPanel {
@@ -15,20 +13,16 @@ public class DateTextField extends javax.swing.JPanel {
     private static final SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yy HH:mm:ss");
 
     public DateTextField() {
-        initGUI();
+        buildComponent();
     }
 
     public DateTextField(Date date) {
         this.date = date;
-        initGUI();
+        buildComponent();
     }
 
-    private void initGUI() {
-        try {
-            this.add(getTextField());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    private void buildComponent() {
+        add(getTextField());
     }
 
     private JTextField getTextField() {
@@ -60,14 +54,7 @@ public void setDate(Date date) {
         textField.setText(dateFormat.format(date));
     }
 
-    /**
-     * Auto-generated main method to display this JPanel inside a new JFrame.
-     */
     public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        frame.getContentPane().add(new DateTextField());
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.pack();
-        frame.setVisible(true);
+        ZiggySwingUtils.displayTestDialog(new DateTextField());
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/DoubleListDialog.java b/src/main/java/gov/nasa/ziggy/ui/util/DoubleListDialog.java
similarity index 78%
rename from src/main/java/gov/nasa/ziggy/ui/common/DoubleListDialog.java
rename to src/main/java/gov/nasa/ziggy/ui/util/DoubleListDialog.java
index 2de9132..b1adea3 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/DoubleListDialog.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/DoubleListDialog.java
@@ -1,15 +1,19 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SAVE;
 
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
 import java.util.LinkedList;
 import java.util.List;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -40,31 +44,23 @@ public class DoubleListDialog<T> extends javax.swing.JDialog {
     private String selectedListTitle = "Selected";
     private GenericListModel<T> selectedListModel = new GenericListModel<>();
 
-    public DoubleListDialog(JFrame frame) {
-        super(frame, "Select", true);
-        initGUI();
-    }
-
-    public DoubleListDialog(JFrame frame, String title, String availableListTitle,
+    public DoubleListDialog(Window owner, String title, String availableListTitle,
         List<T> availableListContents, String selectedListTitle, List<T> selectedListContents) {
-        super(frame, title, true);
+
+        super(owner, title, DEFAULT_MODALITY_TYPE);
         this.availableListTitle = availableListTitle;
-        this.availableListModel = new GenericListModel<>(availableListContents);
+        availableListModel = new GenericListModel<>(availableListContents);
         this.selectedListTitle = selectedListTitle;
-        this.selectedListModel = new GenericListModel<>(selectedListContents);
-        initGUI();
+        selectedListModel = new GenericListModel<>(selectedListContents);
+        buildComponent();
+        setLocationRelativeTo(owner);
     }
 
-    private void initGUI() {
-        try {
-            BorderLayout thisLayout = new BorderLayout();
-            getContentPane().setLayout(thisLayout);
-            getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
-            getContentPane().add(getDataPanel(), BorderLayout.CENTER);
-            setSize(400, 300);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    private void buildComponent() {
+        getContentPane().setLayout(new BorderLayout());
+        getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
+        getContentPane().add(getDataPanel(), BorderLayout.CENTER);
+        setSize(400, 300);
     }
 
     private JPanel getDataPanel() {
@@ -112,8 +108,8 @@ private JPanel getButtonPanel() {
     private JButton getSaveButton() {
         if (saveButton == null) {
             saveButton = new JButton();
-            saveButton.setText("Save Changes");
-            saveButton.addActionListener(evt -> saveButtonActionPerformed());
+            saveButton.setText(SAVE);
+            saveButton.addActionListener(this::save);
         }
         return saveButton;
     }
@@ -121,18 +117,18 @@ private JButton getSaveButton() {
     private JButton getCancelButton() {
         if (cancelButton == null) {
             cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(evt -> cancelButtonActionPerformed());
+            cancelButton.setText(CANCEL);
+            cancelButton.addActionListener(this::cancel);
         }
         return cancelButton;
     }
 
-    private void saveButtonActionPerformed() {
+    private void save(ActionEvent evt) {
         savePressed = true;
         setVisible(false);
     }
 
-    private void cancelButtonActionPerformed() {
+    private void cancel(ActionEvent evt) {
         cancelPressed = true;
         setVisible(false);
     }
@@ -203,7 +199,7 @@ private JButton getAddButton() {
         if (addButton == null) {
             addButton = new JButton();
             addButton.setText("->");
-            addButton.addActionListener(evt -> addButtonActionPerformed());
+            addButton.addActionListener(this::add);
         }
         return addButton;
     }
@@ -212,12 +208,12 @@ private JButton getRemoveButton() {
         if (removeButton == null) {
             removeButton = new JButton();
             removeButton.setText("<-");
-            removeButton.addActionListener(evt -> removeButtonActionPerformed());
+            removeButton.addActionListener(this::remove);
         }
         return removeButton;
     }
 
-    private void addButtonActionPerformed() {
+    private void add(ActionEvent evt) {
         int availIndex = availList.getSelectedIndex();
 
         if (availIndex == -1) {
@@ -227,7 +223,7 @@ private void addButtonActionPerformed() {
         selectedListModel.add(availableListModel.remove(availIndex));
     }
 
-    private void removeButtonActionPerformed() {
+    private void remove(ActionEvent evt) {
         int selectedIndex = selectedList.getSelectedIndex();
 
         if (selectedIndex == -1) {
@@ -251,19 +247,8 @@ public List<T> getSelectedListContents() {
         return selectedListModel.getList();
     }
 
-    /**
-     * Auto-generated main method to display this JDialog
-     */
     public static void main(String[] args) {
-        JFrame frame = new JFrame();
-        List<String> a = new LinkedList<>();
-        a.add("A");
-        a.add("B");
-        a.add("C");
-        List<String> s = new LinkedList<>();
-
-        DoubleListDialog<String> inst = new DoubleListDialog<>(frame, "Select some letters",
-            "Available letters", a, "Selected letters", s);
-        inst.setVisible(true);
+        ZiggySwingUtils.displayTestDialog(new DoubleListDialog<>(null, "Select some letters",
+            "Available letters", List.of("A", "B", "C"), "Selected letters", new LinkedList<>()));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/general/KeyValuePairEditDialog.java b/src/main/java/gov/nasa/ziggy/ui/util/EditKeyValuePairDialog.java
similarity index 60%
rename from src/main/java/gov/nasa/ziggy/ui/config/general/KeyValuePairEditDialog.java
rename to src/main/java/gov/nasa/ziggy/ui/util/EditKeyValuePairDialog.java
index f3b930e..fe38734 100644
--- a/src/main/java/gov/nasa/ziggy/ui/config/general/KeyValuePairEditDialog.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/EditKeyValuePairDialog.java
@@ -1,14 +1,17 @@
-package gov.nasa.ziggy.ui.config.general;
+package gov.nasa.ziggy.ui.util;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SAVE;
 
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 
 import javax.swing.JButton;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
@@ -17,12 +20,11 @@
 import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.services.config.KeyValuePair;
-import gov.nasa.ziggy.ui.common.MessageUtil;
-import gov.nasa.ziggy.ui.proxy.KeyValuePairCrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.KeyValuePairCrudProxy;
 
 @SuppressWarnings("serial")
-public class KeyValuePairEditDialog extends javax.swing.JDialog {
-    private static final Logger log = LoggerFactory.getLogger(KeyValuePairEditDialog.class);
+public class EditKeyValuePairDialog extends javax.swing.JDialog {
+    private static final Logger log = LoggerFactory.getLogger(EditKeyValuePairDialog.class);
 
     private KeyValuePair keyValuePair;
     private JPanel dataPanel;
@@ -34,33 +36,14 @@ public class KeyValuePairEditDialog extends javax.swing.JDialog {
     private JButton cancelButton;
     private JButton saveButton;
 
-    /**
-     * Auto-generated main method to display this JDialog
-     */
-    public static void main(String[] args) {
-        log.debug("main(String[]) - start");
-
-        JFrame frame = new JFrame();
-        KeyValuePairEditDialog inst = new KeyValuePairEditDialog(frame);
-        inst.setVisible(true);
-
-        log.debug("main(String[]) - end");
-    }
-
-    public KeyValuePairEditDialog(JFrame frame) {
-        super(frame, "New Key/Value Pair", true);
-        initGUI();
-    }
-
-    public KeyValuePairEditDialog(JFrame parent, KeyValuePair keyValuePair) {
-        super(parent, "Edit Key/Value Pair");
+    public EditKeyValuePairDialog(Window owner, KeyValuePair keyValuePair) {
+        super(owner, "Edit Key/Value Pair");
         this.keyValuePair = keyValuePair;
-        initGUI();
+        buildComponent();
+        setLocationRelativeTo(owner);
     }
 
-    private void initGUI() {
-        log.debug("initGUI() - start");
-
+    private void buildComponent() {
         try {
             BorderLayout thisLayout = new BorderLayout();
             getContentPane().setLayout(thisLayout);
@@ -68,14 +51,11 @@ private void initGUI() {
             getContentPane().add(getButtonPanel(), BorderLayout.SOUTH);
             setSize(400, 200);
         } catch (Exception e) {
-            log.error("initGUI()", e);
+            log.error("buildComponent()", e);
         }
-
-        log.debug("initGUI() - end");
     }
 
     private JPanel getDataPanel() {
-        log.debug("getDataPanel() - start");
 
         if (dataPanel == null) {
             dataPanel = new JPanel();
@@ -99,13 +79,10 @@ private JPanel getDataPanel() {
                     GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));
         }
 
-        log.debug("getDataPanel() - end");
         return dataPanel;
     }
 
     private JPanel getButtonPanel() {
-        log.debug("getButtonPanel() - start");
-
         if (buttonPanel == null) {
             buttonPanel = new JPanel();
             FlowLayout buttonPanelLayout = new FlowLayout();
@@ -115,103 +92,67 @@ private JPanel getButtonPanel() {
             buttonPanel.add(getCancelButton());
         }
 
-        log.debug("getButtonPanel() - end");
         return buttonPanel;
     }
 
     private JButton getSaveButton() {
-        log.debug("getSaveButton() - start");
-
         if (saveButton == null) {
             saveButton = new JButton();
-            saveButton.setText("Save Changes");
-            saveButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                saveButtonActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
+            saveButton.setText(SAVE);
+            saveButton.addActionListener(this::save);
         }
 
-        log.debug("getSaveButton() - end");
         return saveButton;
     }
 
     private JButton getCancelButton() {
-        log.debug("getCancelButton() - start");
-
         if (cancelButton == null) {
             cancelButton = new JButton();
-            cancelButton.setText("Cancel");
-            cancelButton.addActionListener(evt -> {
-                log.debug("actionPerformed(ActionEvent) - start");
-
-                cancelButtonActionPerformed(evt);
-
-                log.debug("actionPerformed(ActionEvent) - end");
-            });
+            cancelButton.setText(CANCEL);
+            cancelButton.addActionListener(this::cancel);
         }
 
-        log.debug("getCancelButton() - end");
         return cancelButton;
     }
 
     private JLabel getKeyLabel() {
-        log.debug("getKeyLabel() - start");
-
         if (keyLabel == null) {
             keyLabel = new JLabel();
             keyLabel.setText("Key");
         }
 
-        log.debug("getKeyLabel() - end");
         return keyLabel;
     }
 
     private JLabel getValueLabel() {
-        log.debug("getValueLabel() - start");
-
         if (valueLabel == null) {
             valueLabel = new JLabel();
             valueLabel.setText("Value");
         }
 
-        log.debug("getValueLabel() - end");
         return valueLabel;
     }
 
     private JTextField getKeyText() {
-        log.debug("getKeyText() - start");
-
         if (keyText == null) {
             keyText = new JTextField();
             keyText.setEditable(false);
             keyText.setText(keyValuePair.getKey());
         }
 
-        log.debug("getKeyText() - end");
         return keyText;
     }
 
     private JTextField getValueText() {
-        log.debug("getValueText() - start");
-
         if (valueText == null) {
             valueText = new JTextField();
             valueText.setText(keyValuePair.getValue());
         }
 
-        log.debug("getValueText() - end");
         return valueText;
     }
 
-    private void saveButtonActionPerformed(ActionEvent evt) {
-        log.debug("saveButtonActionPerformed(ActionEvent) - start");
-
-        log.debug(
-            "saveButtonActionPerformed(ActionEvent) - saveButton.actionPerformed, event=" + evt);
-
+    private void save(ActionEvent evt) {
         try {
             keyValuePair.setValue(valueText.getText());
 
@@ -222,17 +163,14 @@ private void saveButtonActionPerformed(ActionEvent evt) {
         } catch (Exception e) {
             MessageUtil.showError(this, e);
         }
-
-        log.debug("saveButtonActionPerformed(ActionEvent) - end");
     }
 
-    private void cancelButtonActionPerformed(ActionEvent evt) {
-        log.debug("cancelButtonActionPerformed(ActionEvent) - start");
-
-        log.debug("cancelButtonActionPerformed(ActionEvent) - cancelButton.actionPerformed, event="
-            + evt);
+    private void cancel(ActionEvent evt) {
         setVisible(false);
+    }
 
-        log.debug("cancelButtonActionPerformed(ActionEvent) - end");
+    public static void main(String[] args) {
+        ZiggySwingUtils
+            .displayTestDialog(new EditKeyValuePairDialog(null, new KeyValuePair("key", "value")));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/FilteredTextField.java b/src/main/java/gov/nasa/ziggy/ui/util/FilteredTextField.java
similarity index 91%
rename from src/main/java/gov/nasa/ziggy/ui/common/FilteredTextField.java
rename to src/main/java/gov/nasa/ziggy/ui/util/FilteredTextField.java
index 238ea68..b7552ab 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/FilteredTextField.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/FilteredTextField.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
 
 import javax.swing.JTextField;
 import javax.swing.text.Document;
@@ -13,7 +13,7 @@
  */
 public abstract class FilteredTextField extends JTextField {
 
-    private static final long serialVersionUID = 20210811L;
+    private static final long serialVersionUID = 20230511L;
 
     public FilteredTextField() {
     }
@@ -44,5 +44,4 @@ private void setFilter() {
     }
 
     protected abstract DocumentFilter filter();
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/FloatingPointTableCellRenderer.java b/src/main/java/gov/nasa/ziggy/ui/util/FloatingPointTableCellRenderer.java
similarity index 95%
rename from src/main/java/gov/nasa/ziggy/ui/common/FloatingPointTableCellRenderer.java
rename to src/main/java/gov/nasa/ziggy/ui/util/FloatingPointTableCellRenderer.java
index c10e5bc..59be1db 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/FloatingPointTableCellRenderer.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/FloatingPointTableCellRenderer.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
 
 import java.text.NumberFormat;
 
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/GenericListModel.java b/src/main/java/gov/nasa/ziggy/ui/util/GenericListModel.java
similarity index 95%
rename from src/main/java/gov/nasa/ziggy/ui/common/GenericListModel.java
rename to src/main/java/gov/nasa/ziggy/ui/util/GenericListModel.java
index e2e7a9f..e1a0f89 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/GenericListModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/GenericListModel.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -53,7 +53,7 @@ public void clear() {
     public void setList(List<T> newList) {
         clear();
 
-        this.list = newList;
+        list = newList;
         fireIntervalAdded(this, 0, list.size());
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/GroupsDialog.java b/src/main/java/gov/nasa/ziggy/ui/util/GroupsDialog.java
new file mode 100644
index 0000000..2cfe767
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/GroupsDialog.java
@@ -0,0 +1,199 @@
+package gov.nasa.ziggy.ui.util;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.ADD_SYMBOL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.OK;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REMOVE_SYMBOL;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.boldLabel;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+
+import gov.nasa.ziggy.pipeline.definition.Group;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.proxy.GroupCrudProxy;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class GroupsDialog extends javax.swing.JDialog {
+    private JCheckBox defaultCheckBox;
+    private JTextField newGroupTextField;
+    private JList<Group> groupsList;
+    private GenericListModel<Group> groupsListModel;
+    private GroupCrudProxy groupCrud = new GroupCrudProxy();
+    private boolean isCancelled;
+
+    public GroupsDialog(Window owner) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        buildComponent();
+        setLocationRelativeTo(owner);
+
+        loadFromDatabase();
+    }
+
+    private void buildComponent() {
+        setTitle("Select group");
+
+        getContentPane().add(getDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(
+            createButtonPanel(createButton(OK, this::ok), createButton(CANCEL, this::cancel)),
+            BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private JPanel getDataPanel() {
+        defaultCheckBox = new JCheckBox();
+        defaultCheckBox.setText("Default group");
+        defaultCheckBox.addActionListener(this::useDefaultGroup);
+
+        groupsListModel = new GenericListModel<>();
+        groupsList = new JList<>(groupsListModel);
+        groupsList.addListSelectionListener(this::groupsListValueChanged);
+        JScrollPane groupsListScrollPane = new JScrollPane(groupsList);
+
+        JLabel addRemoveGroup = boldLabel("Add/remove group");
+        JPanel addRemoveButtons = createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton(ADD_SYMBOL, this::addGroup), createButton(REMOVE_SYMBOL, this::remove));
+
+        newGroupTextField = new JTextField();
+        newGroupTextField.addActionListener(this::addGroup);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(defaultCheckBox)
+            .addComponent(groupsListScrollPane)
+            .addComponent(addRemoveGroup)
+            .addComponent(addRemoveButtons)
+            .addComponent(newGroupTextField));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(defaultCheckBox)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(groupsListScrollPane)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(addRemoveGroup)
+            .addComponent(addRemoveButtons, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(newGroupTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE));
+
+        return dataPanel;
+    }
+
+    private void useDefaultGroup(ActionEvent evt) {
+        groupsList.clearSelection();
+    }
+
+    private void groupsListValueChanged(ListSelectionEvent evt) {
+        defaultCheckBox.setSelected(groupsList.getSelectedIndex() == -1);
+    }
+
+    private void addGroup(ActionEvent evt) {
+        try {
+            String groupName = newGroupTextField.getText();
+            if (groupName != null && groupName.length() > 0) {
+                List<Group> currentList = groupsListModel.getList();
+                Group newGroup = new Group(groupName);
+                if (currentList.contains(newGroup)) {
+                    MessageUtil.showError(this, "A group by that name already exists");
+                } else {
+                    groupCrud.save(newGroup);
+
+                    loadFromDatabase(groupName);
+                }
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void remove(ActionEvent evt) {
+        try {
+            Group group = getSelectedGroup();
+            if (group != null) {
+                groupCrud.delete(group);
+                loadFromDatabase();
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void ok(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void cancel(ActionEvent evt) {
+        isCancelled = true;
+        setVisible(false);
+    }
+
+    private Group getSelectedGroup() {
+        int selectedIndex = groupsList.getSelectedIndex();
+        if (selectedIndex >= 0) {
+            return groupsListModel.get(selectedIndex);
+        }
+        return null;
+    }
+
+    private void loadFromDatabase() {
+        List<Group> groups = groupCrud.retrieveAll();
+        groupsListModel.setList(groups);
+    }
+
+    private void loadFromDatabase(String selectedName) {
+        loadFromDatabase();
+
+        List<Group> groups = groupsListModel.getList();
+        int index = 0;
+
+        for (Group group : groups) {
+            if (group.getName().equals(selectedName)) {
+                groupsList.setSelectedIndex(index);
+            }
+            index++;
+        }
+    }
+
+    public static Group selectGroup(Component owner) {
+        GroupsDialog editor = new GroupsDialog(SwingUtilities.getWindowAncestor(owner));
+        editor.setVisible(true);
+
+        if (editor.isCancelled) {
+            return null;
+        }
+        if (editor.defaultCheckBox.isSelected()) {
+            return Group.DEFAULT;
+        }
+        return editor.getSelectedGroup();
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(new GroupsDialog((JFrame) null));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/HtmlBuilder.java b/src/main/java/gov/nasa/ziggy/ui/util/HtmlBuilder.java
new file mode 100644
index 0000000..6b599c2
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/HtmlBuilder.java
@@ -0,0 +1,90 @@
+package gov.nasa.ziggy.ui.util;
+
+import javax.swing.JLabel;
+
+/**
+ * Convenience class for building HTML strings used for setting the text on {@link JLabel}s or other
+ * Swing components that support HTML text.
+ *
+ * @author Todd Klaus
+ */
+public class HtmlBuilder {
+    StringBuilder html = new StringBuilder();
+
+    public HtmlBuilder() {
+    }
+
+    public HtmlBuilder(String text) {
+        append(text);
+    }
+
+    public static HtmlBuilder htmlBuilder() {
+        return new HtmlBuilder();
+    }
+
+    public static HtmlBuilder htmlBuilder(String text) {
+        return new HtmlBuilder(text);
+    }
+
+    /**
+     * Wraps the given strings or other objects in {@code <html>}. This method is useful if the
+     * {@code append()} methods aren't needed.
+     */
+    public static String toHtml(Object... strings) {
+        StringBuilder htmlString = new StringBuilder("<html>");
+        for (Object s : strings) {
+            htmlString.append(s);
+        }
+        htmlString.append("</html>");
+        return htmlString.toString();
+    }
+
+    public HtmlBuilder append(Object text) {
+        html.append(text);
+        return this;
+    }
+
+    public HtmlBuilder appendBold(String text) {
+        html.append("<b>").append(text).append("</b>");
+        return this;
+    }
+
+    public HtmlBuilder appendItalic(String text) {
+        html.append("<i>").append(text).append("</i>");
+        return this;
+    }
+
+    public HtmlBuilder appendColor(String text, String color) {
+        html.append("<font color=").append(color).append(">").append(text).append("</font>");
+        return this;
+    }
+
+    public HtmlBuilder appendBoldColor(String text, String color) {
+        html.append("<b>");
+        appendColor(text, color);
+        html.append("</b>");
+        return this;
+    }
+
+    public HtmlBuilder appendSize(String text, int size) {
+        html.append("<font size=").append(size).append(">").append(text).append("</font>");
+        return this;
+    }
+
+    public HtmlBuilder appendBreak() {
+        html.append("<br/>");
+        return this;
+    }
+
+    public HtmlBuilder appendCustomHtml(String htmlPrefix, String text, String htmlSuffix) {
+        html.append(htmlPrefix);
+        html.append(text);
+        html.append(htmlSuffix);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return HtmlBuilder.toHtml(html.toString());
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/HumanReadableHeapSize.java b/src/main/java/gov/nasa/ziggy/ui/util/HumanReadableHeapSize.java
new file mode 100644
index 0000000..830f6ee
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/HumanReadableHeapSize.java
@@ -0,0 +1,73 @@
+package gov.nasa.ziggy.ui.util;
+
+/**
+ * Support for human-readable heap sizes, and conversions between human-readable and heap sizes in
+ * MB.
+ *
+ * @author PT
+ */
+public class HumanReadableHeapSize {
+
+    public enum HeapSizeUnit {
+        MB {
+            @Override
+            public int heapSizeMb(float humanReadableHeapSize) {
+                return (int) humanReadableHeapSize;
+            }
+        },
+        GB {
+            @Override
+            public int heapSizeMb(float humanReadableHeapSize) {
+                return (int) (humanReadableHeapSize * 1000);
+            }
+        },
+        TB {
+            @Override
+            public int heapSizeMb(float humanReadableHeapSize) {
+                return (int) (humanReadableHeapSize * 1000000);
+            }
+        };
+
+        public abstract int heapSizeMb(float humanReadableHeapSize);
+    }
+
+    private final float humanReadableHeapSize;
+    private final HeapSizeUnit heapSizeUnit;
+
+    public HumanReadableHeapSize(float humanReadableHeapSize, HeapSizeUnit heapSizeUnit) {
+        this.humanReadableHeapSize = humanReadableHeapSize;
+        this.heapSizeUnit = heapSizeUnit;
+    }
+
+    public HumanReadableHeapSize(int heapSizeMb) {
+        if (heapSizeMb < 1000) {
+            humanReadableHeapSize = heapSizeMb;
+            heapSizeUnit = HeapSizeUnit.MB;
+            return;
+        }
+        if (heapSizeMb > 1000000) {
+            humanReadableHeapSize = (float) heapSizeMb / 1000000;
+            heapSizeUnit = HeapSizeUnit.TB;
+            return;
+        }
+        humanReadableHeapSize = (float) heapSizeMb / 1000;
+        heapSizeUnit = HeapSizeUnit.GB;
+    }
+
+    public float getHumanReadableHeapSize() {
+        return humanReadableHeapSize;
+    }
+
+    public HeapSizeUnit getHeapSizeUnit() {
+        return heapSizeUnit;
+    }
+
+    public int heapSizeMb() {
+        return heapSizeUnit.heapSizeMb(humanReadableHeapSize);
+    }
+
+    @Override
+    public String toString() {
+        return Float.toString(humanReadableHeapSize) + " " + heapSizeUnit.name();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/IntTextField.java b/src/main/java/gov/nasa/ziggy/ui/util/IntTextField.java
similarity index 51%
rename from src/main/java/gov/nasa/ziggy/ui/common/IntTextField.java
rename to src/main/java/gov/nasa/ziggy/ui/util/IntTextField.java
index 4fdcedc..2784f58 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/IntTextField.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/IntTextField.java
@@ -1,4 +1,6 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
+
+import java.util.regex.Pattern;
 
 import javax.swing.JTextField;
 import javax.swing.text.Document;
@@ -11,7 +13,7 @@
  */
 public class IntTextField extends FilteredTextField {
 
-    private static final long serialVersionUID = 20210811L;
+    private static final long serialVersionUID = 20230511L;
 
     public IntTextField() {
     }
@@ -37,4 +39,21 @@ protected DocumentFilter filter() {
         return new IntFilter();
     }
 
+    /**
+     * Text field filter class that accepts only positive integer values.
+     *
+     * @author PT
+     */
+    private static class IntFilter extends NumericFilter {
+
+        // Pattern matcher for a non-negative integer -- contains only digits, no
+        // decimal point or minus sign needed.
+        private static final Pattern POSITIVE_INT_PATTERN = Pattern.compile("\\d*");
+        private static final Pattern[] PATTERNS = { POSITIVE_INT_PATTERN };
+
+        @Override
+        protected Pattern[] patterns() {
+            return PATTERNS;
+        }
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/MessageUtil.java b/src/main/java/gov/nasa/ziggy/ui/util/MessageUtil.java
similarity index 50%
rename from src/main/java/gov/nasa/ziggy/ui/common/MessageUtil.java
rename to src/main/java/gov/nasa/ziggy/ui/util/MessageUtil.java
index 5c9699d..8c392fa 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/MessageUtil.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/MessageUtil.java
@@ -1,4 +1,6 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
+
+import static gov.nasa.ziggy.ui.util.HtmlBuilder.htmlBuilder;
 
 import java.awt.Component;
 
@@ -24,14 +26,7 @@ public class MessageUtil {
      * @param msg the error message to display
      */
     public static void showError(Component parent, String msg) {
-        // If the message is long, enclose it in some HTML that will use word-wrap.
-        // Also increase the line height for readability.
-        if (msg.length() >= 65) {
-            msg = "<html><p style='width: 400px; line-height: 140%;'>"
-                + StringEscapeUtils.escapeHtml4(msg) + "</p></html>";
-        }
-
-        JOptionPane.showMessageDialog(parent, msg, "Error", JOptionPane.ERROR_MESSAGE);
+        showError(parent, null, msg, null);
     }
 
     /**
@@ -41,8 +36,35 @@ public static void showError(Component parent, String msg) {
      * @param e the exception to display
      */
     public static void showError(Component parent, Throwable e) {
-        log.warn("Unexpected exception", e);
-        showError(parent, e.toString());
+        showError(parent, null, e.toString(), e);
     }
 
+    /**
+     * Displays an error message in a dialog. Wraps the message using HTML if the message is long.
+     *
+     * @param parent the parent component for the message dialog
+     * @param title the title for the message dialog
+     * @param msg the error message to display
+     * @param e the exception to log
+     */
+    public static void showError(Component parent, String title, String msg, Throwable e) {
+        String logFormat = "title={}, msg={}";
+        if (e == null) {
+            log.warn(logFormat, title, msg);
+        } else {
+            log.warn(logFormat, title, msg, e);
+        }
+
+        // If the message is long, enclose it in some HTML that will use word-wrap.
+        // Also increase the line height for readability.
+        if (msg.length() >= 65) {
+            msg = htmlBuilder()
+                .appendCustomHtml("<p style='width: 400px; line-height: 140%;'>",
+                    StringEscapeUtils.escapeHtml4(msg), "</p>")
+                .toString();
+        }
+
+        JOptionPane.showMessageDialog(parent, msg, title != null ? title : "Error",
+            JOptionPane.ERROR_MESSAGE);
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/NumericFilter.java b/src/main/java/gov/nasa/ziggy/ui/util/NumericFilter.java
similarity index 98%
rename from src/main/java/gov/nasa/ziggy/ui/common/NumericFilter.java
rename to src/main/java/gov/nasa/ziggy/ui/util/NumericFilter.java
index 08c0a0d..c35a18f 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/NumericFilter.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/NumericFilter.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -81,5 +81,4 @@ public void remove(FilterBypass fb, int offset, int length) throws BadLocationEx
             super.remove(fb, offset, length);
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/PropertySheetHelper.java b/src/main/java/gov/nasa/ziggy/ui/util/PropertySheetHelper.java
new file mode 100644
index 0000000..bdda0c0
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/PropertySheetHelper.java
@@ -0,0 +1,34 @@
+package gov.nasa.ziggy.ui.util;
+
+import java.beans.PropertyEditor;
+
+import com.l2fprod.common.propertysheet.PropertySheetPanel;
+
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.definition.TypedParameter;
+import gov.nasa.ziggy.ui.util.collections.ArrayPropertyEditor;
+import gov.nasa.ziggy.ui.util.collections.ArrayTableCellRenderer;
+
+/**
+ * Helper methods for working with L2fprod's {@link PropertySheetPanel}
+ *
+ * @author Todd Klaus
+ */
+public class PropertySheetHelper {
+
+    private PropertySheetHelper() {
+    }
+
+    /**
+     * Helper method that populates a {@link PropertySheetPanel} with the contents of a Parameters
+     * object. Automatically adds an {@link ArrayPropertyEditor} and an
+     * {@link ArrayTableCellRenderer} for array fields that do not already have a custom
+     * {@link PropertyEditor}.
+     */
+    public static void populatePropertySheet(ParametersInterface parameters,
+        PropertySheetPanel propertySheetPanel) throws Exception {
+        propertySheetPanel.setProperties(parameters.getParameters().toArray(new TypedParameter[0]));
+        propertySheetPanel.setRendererFactory(new TypedParameterRendererFactory());
+        propertySheetPanel.setEditorFactory(new TypedParameterEditorFactory());
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/RealTextField.java b/src/main/java/gov/nasa/ziggy/ui/util/RealTextField.java
new file mode 100644
index 0000000..3a34125
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/RealTextField.java
@@ -0,0 +1,64 @@
+package gov.nasa.ziggy.ui.util;
+
+import java.util.regex.Pattern;
+
+import javax.swing.JTextField;
+import javax.swing.text.Document;
+import javax.swing.text.DocumentFilter;
+
+/**
+ * Version of {@link JTextField} that accepts only non-negative real values.
+ *
+ * @author PT
+ */
+public class RealTextField extends FilteredTextField {
+
+    private static final long serialVersionUID = 20230511L;
+
+    public RealTextField() {
+    }
+
+    public RealTextField(Document doc, String text, int columns) {
+        super(doc, text, columns);
+    }
+
+    public RealTextField(int columns) {
+        super(columns);
+    }
+
+    public RealTextField(String text) {
+        super(text);
+    }
+
+    public RealTextField(String text, int columns) {
+        super(text, columns);
+    }
+
+    @Override
+    protected DocumentFilter filter() {
+        return new RealFilter();
+    }
+
+    /**
+     * Text field filter class that accepts only positive real values.
+     *
+     * @author PT
+     */
+    private static class RealFilter extends NumericFilter {
+
+        // Pattern matcher for a non-negative real, based on a design pattern in
+        // Stack Overflow:
+        // https://stackoverflow.com/a/51994332
+        private static final Pattern POSITIVE_REAL_PATTERN = Pattern
+            .compile("[+]?(\\d+|\\d+\\.\\d+|\\.\\d+|\\d+\\.)([eE]\\d+)?");
+        private static final Pattern WHITESPACE_PATTERN = Pattern.compile("\\s+");
+        private static final Pattern EMPTY_PATTERN = Pattern.compile("");
+        private static final Pattern[] PATTERNS = { POSITIVE_REAL_PATTERN, WHITESPACE_PATTERN,
+            EMPTY_PATTERN };
+
+        @Override
+        protected Pattern[] patterns() {
+            return PATTERNS;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/TextualReportDialog.java b/src/main/java/gov/nasa/ziggy/ui/util/TextualReportDialog.java
new file mode 100644
index 0000000..d4aa7dc
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/TextualReportDialog.java
@@ -0,0 +1,119 @@
+package gov.nasa.ziggy.ui.util;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CLOSE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.SAVE;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButtonPanel;
+
+import java.awt.BorderLayout;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import gov.nasa.ziggy.util.io.FileUtil;
+
+/**
+ * @author Todd Klaus
+ */
+@SuppressWarnings("serial")
+public class TextualReportDialog extends javax.swing.JDialog {
+
+    private String report;
+    private String title;
+    private Path reportSavePath;
+
+    public TextualReportDialog(Window owner, String report, String title, Path reportSavePath) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.report = report;
+        this.title = title;
+        this.reportSavePath = reportSavePath;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    public static TextualReportDialog showReport(Window owner, String report, String title) {
+        return showReport(owner, report, title, null);
+    }
+
+    public static TextualReportDialog showReport(Window owner, String report, String title,
+        Path savePath) {
+        TextualReportDialog dialog = new TextualReportDialog(owner, report, title, savePath);
+        dialog.setVisible(true);
+        return dialog;
+    }
+
+    private void buildComponent() {
+        setTitle(title);
+
+        getContentPane().add(new JScrollPane(getReportTextArea()), BorderLayout.CENTER);
+        getContentPane().add(
+            createButtonPanel(createButton(SAVE, this::save), createButton(CLOSE, this::close)),
+            BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private JTextArea getReportTextArea() {
+        JTextArea reportTextArea = new JTextArea();
+        reportTextArea.setText(report);
+        reportTextArea.setFont(new java.awt.Font("Monospaced", 0, 12));
+
+        return reportTextArea;
+    }
+
+    private void save(ActionEvent evt) {
+
+        Path savePath = reportSavePath != null ? reportSavePath : savePathFromChooser();
+        if (savePath != null) {
+            try {
+                Files.createDirectories(savePath.getParent());
+            } catch (Exception e) {
+                MessageUtil.showError(this, e);
+                return;
+            }
+            File file = savePath.toFile();
+            try (BufferedWriter writer = new BufferedWriter(
+                new OutputStreamWriter(new FileOutputStream(file), FileUtil.ZIGGY_CHARSET))) {
+                writer.write(report);
+                setTitle(savePath.getFileName().toString());
+            } catch (Exception e) {
+                MessageUtil.showError(this, e);
+            }
+        }
+    }
+
+    private Path savePathFromChooser() {
+        Path selectedPath = null;
+        try {
+            JFileChooser fc = new JFileChooser();
+            int returnVal = fc.showSaveDialog(this);
+
+            if (returnVal == JFileChooser.APPROVE_OPTION) {
+                selectedPath = fc.getSelectedFile().toPath();
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+        return selectedPath;
+    }
+
+    private void close(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    public static void main(String[] args) {
+        ZiggySwingUtils.displayTestDialog(
+            new TextualReportDialog((JFrame) null, "hello!", "Report title", null));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/TypedParameterEditorFactory.java b/src/main/java/gov/nasa/ziggy/ui/util/TypedParameterEditorFactory.java
similarity index 85%
rename from src/main/java/gov/nasa/ziggy/ui/common/TypedParameterEditorFactory.java
rename to src/main/java/gov/nasa/ziggy/ui/util/TypedParameterEditorFactory.java
index 767adb1..143ae21 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/TypedParameterEditorFactory.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/TypedParameterEditorFactory.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
 
 import java.beans.PropertyEditor;
 
@@ -7,7 +7,7 @@
 import com.l2fprod.common.propertysheet.PropertyEditorRegistry;
 
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
-import gov.nasa.ziggy.ui.collections.ArrayPropertyEditor;
+import gov.nasa.ziggy.ui.util.collections.ArrayPropertyEditor;
 
 /**
  * Creates new editors for {@link TypedParameter} instances based on their contents.
@@ -23,7 +23,7 @@ public PropertyEditor createPropertyEditor(Property property) {
         }
         TypedParameter typedProperty = (TypedParameter) property;
         if (!typedProperty.isScalar()) {
-            return new ArrayPropertyEditor();
+            return new ArrayPropertyEditor(true);
         }
         return PropertyEditorRegistry.INSTANCE.getEditor(typedProperty.getType());
     }
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/TypedParameterRendererFactory.java b/src/main/java/gov/nasa/ziggy/ui/util/TypedParameterRendererFactory.java
similarity index 93%
rename from src/main/java/gov/nasa/ziggy/ui/common/TypedParameterRendererFactory.java
rename to src/main/java/gov/nasa/ziggy/ui/util/TypedParameterRendererFactory.java
index c7bd589..4b4e7c2 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/TypedParameterRendererFactory.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/TypedParameterRendererFactory.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
 
 import javax.swing.table.TableCellRenderer;
 
@@ -7,7 +7,7 @@
 import com.l2fprod.common.propertysheet.PropertyRendererRegistry;
 
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
-import gov.nasa.ziggy.ui.collections.ArrayTableCellRenderer;
+import gov.nasa.ziggy.ui.util.collections.ArrayTableCellRenderer;
 
 /**
  * Generates new renderers for {@link TypedParameter} instances based on their contents.
diff --git a/src/main/java/gov/nasa/ziggy/ui/common/ValidityTestingFormattedTextField.java b/src/main/java/gov/nasa/ziggy/ui/util/ValidityTestingFormattedTextField.java
similarity index 73%
rename from src/main/java/gov/nasa/ziggy/ui/common/ValidityTestingFormattedTextField.java
rename to src/main/java/gov/nasa/ziggy/ui/util/ValidityTestingFormattedTextField.java
index 044536a..1cbdbe9 100644
--- a/src/main/java/gov/nasa/ziggy/ui/common/ValidityTestingFormattedTextField.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/ValidityTestingFormattedTextField.java
@@ -1,10 +1,11 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.ui.util;
 
 import java.awt.Color;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.text.Format;
 import java.text.ParseException;
+import java.util.function.Consumer;
 
 import javax.swing.JFormattedTextField;
 import javax.swing.UIManager;
@@ -28,6 +29,7 @@
  * <li>Each instance can be provided with an instance of the {@link ExecuteOnValidityCheck}
  * functional interface, which can perform actions as part of the validity check depending on
  * whether the check indicates that the instance is currently valid or invalid.
+ * <li>Disabled instances are automatically cleared of any values and are treated as valid.
  * </ol>
  * The user is also able to select whether an empty text box constitutes a valid or invalid state.
  *
@@ -35,48 +37,47 @@
  */
 public class ValidityTestingFormattedTextField extends JFormattedTextField {
 
-    private static final long serialVersionUID = 20210817L;
+    private static final long serialVersionUID = 20230511L;
 
     public static final Border INVALID_BORDER = new LineBorder(Color.RED, 2);
 
     private boolean validState;
-    private ExecuteOnValidityCheck executeOnValidityCheck;
-    private boolean emptyIsValid = false;
+    private Consumer<Boolean> executeOnValidityCheck;
+    private boolean emptyIsValid;
 
     public ValidityTestingFormattedTextField() {
-        initGUI();
+        buildComponent();
     }
 
     public ValidityTestingFormattedTextField(Format format) {
         super(format);
-        initGUI();
+        buildComponent();
     }
 
     public ValidityTestingFormattedTextField(JFormattedTextField.AbstractFormatter formatter) {
         super(formatter);
-        initGUI();
+        buildComponent();
     }
 
     public ValidityTestingFormattedTextField(JFormattedTextField.AbstractFormatterFactory factory) {
         super(factory);
-        initGUI();
+        buildComponent();
     }
 
     public ValidityTestingFormattedTextField(JFormattedTextField.AbstractFormatterFactory factory,
         Object currentValue) {
         super(factory, currentValue);
-        initGUI();
+        buildComponent();
     }
 
     public ValidityTestingFormattedTextField(Object value) {
         super(value);
-        initGUI();
+        buildComponent();
     }
 
-    private void initGUI() {
+    private void buildComponent() {
         setFocusLostBehavior(JFormattedTextField.PERSIST);
         validState = false;
-        ValidityTestingFormattedTextField thisTextField = this;
         getDocument().addDocumentListener(new DocumentListener() {
 
             @Override
@@ -93,47 +94,48 @@ public void removeUpdate(DocumentEvent e) {
             public void changedUpdate(DocumentEvent e) {
                 checkForValidState();
             }
-
         });
         addFocusListener(new FocusListener() {
 
             @Override
             public void focusGained(FocusEvent e) {
-                thisTextField.setBorder(
-                    UIManager.getLookAndFeel().getDefaults().getBorder("TextField.border"));
+                setBorder(UIManager.getLookAndFeel().getDefaults().getBorder("TextField.border"));
             }
 
             @Override
             public void focusLost(FocusEvent e) {
-                if (!thisTextField.isValidState()) {
-                    thisTextField.setBorder(INVALID_BORDER);
+                if (!isEnabled()) {
+                    validState = true;
+                    setValue(null);
+                }
+                if (!isValidState()) {
+                    setBorder(INVALID_BORDER);
                 }
             }
-
         });
-
     }
 
     private void checkForValidState() {
         try {
             commitEdit();
             validState = true;
-            if (StringUtils.isEmpty(getText()) && !emptyIsValid) {
+            if (StringUtils.isEmpty(getText()) && !emptyIsValid && isEnabled()) {
                 validState = false;
             }
         } catch (ParseException e) {
-            if (StringUtils.isEmpty(getText()) && emptyIsValid) {
+            if (StringUtils.isEmpty(getText()) && emptyIsValid || !isEnabled()) {
                 validState = true;
                 setValue(null);
             } else {
                 validState = false;
             }
-        }
-        if (validState) {
-            setBorder(UIManager.getLookAndFeel().getDefaults().getBorder("TextField.border"));
-        }
-        if (executeOnValidityCheck != null) {
-            executeOnValidityCheck.execute(validState);
+        } finally {
+            if (validState) {
+                setBorder(UIManager.getLookAndFeel().getDefaults().getBorder("TextField.border"));
+            }
+            if (executeOnValidityCheck != null) {
+                executeOnValidityCheck.accept(validState);
+            }
         }
     }
 
@@ -141,9 +143,8 @@ public boolean isValidState() {
         return validState;
     }
 
-    public void setExecuteOnValidityCheck(ExecuteOnValidityCheck executeOnValidityCheck) {
+    public void setExecuteOnValidityCheck(Consumer<Boolean> executeOnValidityCheck) {
         this.executeOnValidityCheck = executeOnValidityCheck;
-        executeOnValidityCheck.execute(validState);
     }
 
     public void setEmptyIsValid(boolean emptyIsValid) {
@@ -155,8 +156,7 @@ public void setEmptyIsValid(boolean emptyIsValid) {
             validState = false;
         }
         if (executeOnValidityCheck != null) {
-            executeOnValidityCheck.execute(validState);
+            executeOnValidityCheck.accept(validState);
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/ViewEditKeyValuePairPanel.java b/src/main/java/gov/nasa/ziggy/ui/util/ViewEditKeyValuePairPanel.java
new file mode 100644
index 0000000..b903cd6
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/ViewEditKeyValuePairPanel.java
@@ -0,0 +1,176 @@
+package gov.nasa.ziggy.ui.util;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+import gov.nasa.ziggy.services.config.KeyValuePair;
+import gov.nasa.ziggy.services.config.KeyValuePairCrud;
+import gov.nasa.ziggy.services.security.Privilege;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseModel;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.KeyValuePairCrudProxy;
+import gov.nasa.ziggy.ui.util.table.AbstractViewEditPanel;
+
+/**
+ * @author Todd Klaus
+ */
+@SuppressWarnings("serial")
+public class ViewEditKeyValuePairPanel extends AbstractViewEditPanel<KeyValuePair> {
+
+    public ViewEditKeyValuePairPanel() {
+        super(new KeyValuePairTableModel());
+        buildComponent();
+    }
+
+    @Override
+    protected void create() {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        showEditDialog(new KeyValuePair());
+    }
+
+    @Override
+    protected void edit(int row) {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        showEditDialog(ziggyTable.getContentAtViewRow(row));
+    }
+
+    private void showEditDialog(KeyValuePair keyValuePair) {
+
+        EditKeyValuePairDialog dialog = new EditKeyValuePairDialog(
+            SwingUtilities.getWindowAncestor(this), keyValuePair);
+        dialog.setVisible(true);
+
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    @Override
+    protected void delete(int row) {
+
+        try {
+            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(this, e);
+            return;
+        }
+
+        KeyValuePair keyValuePair = ziggyTable.getContentAtViewRow(row);
+
+        int choice = JOptionPane.showConfirmDialog(this,
+            "Are you sure you want to delete key '" + keyValuePair.getKey() + "'?");
+
+        if (choice == JOptionPane.YES_OPTION) {
+            try {
+                // TODO: Need transaction/conversation context
+                // TODO: only call create for new
+                KeyValuePairCrud keyValuePairCrud = new KeyValuePairCrud();
+                keyValuePairCrud.delete(keyValuePair);
+
+                ziggyTable.loadFromDatabase();
+            } catch (Exception e) {
+                MessageUtil.showError(this, e);
+            }
+        }
+    }
+
+    @Override
+    protected void refresh() {
+        try {
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private static class KeyValuePairTableModel extends AbstractDatabaseModel<KeyValuePair> {
+        private final KeyValuePairCrudProxy keyValuePairCrud;
+        private List<KeyValuePair> keyValuePairs = new LinkedList<>();
+
+        private static final String[] COLUMN_NAMES = { "Key", "Value" };
+
+        public KeyValuePairTableModel() {
+            keyValuePairCrud = new KeyValuePairCrudProxy();
+        }
+
+        @Override
+        public void loadFromDatabase() {
+            try {
+                keyValuePairs = keyValuePairCrud.retrieveAll();
+            } catch (ConsoleSecurityException ignore) {
+            }
+
+            fireTableDataChanged();
+        }
+
+        // TODO Either find a use for getKeyValuePairAtRow or delete
+        @SuppressWarnings("unused")
+        public KeyValuePair getKeyValuePairAtRow(int rowIndex) {
+            validityCheck();
+            return keyValuePairs.get(rowIndex);
+        }
+
+        @Override
+        public int getRowCount() {
+            validityCheck();
+            return keyValuePairs.size();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return COLUMN_NAMES.length;
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            validityCheck();
+
+            KeyValuePair keyValuePair = keyValuePairs.get(rowIndex);
+
+            return switch (columnIndex) {
+                case 0 -> keyValuePair.getKey();
+                case 1 -> keyValuePair.getValue();
+                default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+            };
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            return String.class;
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return COLUMN_NAMES[column];
+        }
+
+        @Override
+        public KeyValuePair getContentAtRow(int row) {
+            validityCheck();
+            return keyValuePairs.get(row);
+        }
+
+        @Override
+        public Class<KeyValuePair> tableModelContentClass() {
+            return KeyValuePair.class;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/ZiggySwingUtils.java b/src/main/java/gov/nasa/ziggy/ui/util/ZiggySwingUtils.java
new file mode 100644
index 0000000..6308a50
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/ZiggySwingUtils.java
@@ -0,0 +1,470 @@
+package gov.nasa.ziggy.ui.util;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.GridLayout;
+import java.awt.Window;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.swing.GroupLayout;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+
+import com.jgoodies.looks.plastic.theme.SkyBluer;
+
+import gov.nasa.ziggy.ui.util.table.TableMouseListener;
+
+/**
+ * A handful of Swing-related utilities.
+ *
+ * @see SwingUtilities
+ * @author Bill Wohler
+ */
+public class ZiggySwingUtils {
+
+    public enum ButtonPanelContext {
+        /**
+         * Tool bar buttons have leading alignment and maintain their order on all platforms.
+         * Leading alignment is left-justified in English, for example.
+         */
+        TOOL_BAR,
+
+        /**
+         * Buttons at the bottom of dialog have trailing alignment and are sorted per the platform.
+         * Trailing alignment is right-justified in English, for example.
+         */
+        // TODO Make the primary button the default and bind the secondary button to escape
+        // The default button is run when Enter is pressed.
+        DIALOG;
+    }
+
+    public enum LabelType {
+        /** A regular label, emboldened at the default font size. */
+        DEFAULT,
+
+        /**
+         * A heading for a group of fields, emboldened and a couple of points larger and the same
+         * color as a titled border title so that it stands out more.
+         */
+        HEADING1,
+
+        /**
+         * A heading for a group of fields, emboldened and a single point larger and the same color
+         * as a titled border title so that it stands out more.
+         */
+        HEADING2,
+
+        /**
+         * A heading for a group of fields, emboldened and the same color as a titled border title
+         * so that it stands out more.
+         */
+        HEADING;
+    }
+
+    /** A menu item that results in a menu separator. */
+    public static final JMenuItem MENU_SEPARATOR = new JMenuItem(
+        JPopupMenu.Separator.class.toString());
+
+    /** The gap between dialog groups. Use in the {@link GroupLayout} {@code addGap()} method. */
+    public static final int GROUP_GAP = 20;
+
+    /**
+     * The indent of a group under its heading. Use in the {@link GroupLayout} {@code addGap()}
+     * method.
+     */
+    public static final int INDENT = 30;
+
+    /**
+     * Minimum size for all dialogs.
+     */
+    public static final Dimension MIN_DIALOG_SIZE = new Dimension(500, 375);
+
+    static {
+        setLookAndFeel();
+    }
+
+    public static void setLookAndFeel() {
+        try {
+            MetalLookAndFeel.setCurrentTheme(new SkyBluer());
+            UIManager.setLookAndFeel("com.jgoodies.looks.plastic.Plastic3DLookAndFeel");
+        } catch (Exception e) {
+            MessageUtil.showError(null, e);
+        }
+    }
+
+    /** Returns a bold label for the given string. */
+    public static JLabel boldLabel(String s) {
+        return boldLabel(s, LabelType.DEFAULT);
+    }
+
+    /** Returns a bold label for the given string of the given type. */
+    public static JLabel boldLabel(String s, LabelType type) {
+        checkNotNull(s, "s");
+        checkNotNull(type, "type");
+
+        // If we ever want to embolden the existing style, use
+        // label.getFont().getStyle() | Font.BOLD.
+        JLabel label = new JLabel(s);
+        switch (type) {
+            case DEFAULT:
+                label.setFont(label.getFont().deriveFont(Font.BOLD));
+                break;
+            case HEADING:
+            case HEADING1:
+            case HEADING2:
+                int size = label.getFont().getSize();
+                label.setFont(label.getFont()
+                    .deriveFont(Font.BOLD, size
+                        + (type == LabelType.HEADING1 ? 2 : type == LabelType.HEADING2 ? 1 : 0)));
+                label.setForeground(UIManager.getColor("TitledBorder.titleColor"));
+                break;
+        }
+        return label;
+    }
+
+    public static JMenuItem createMenuItem(String text, ActionListener listener) {
+        JMenuItem menuItem = new JMenuItem(text);
+        menuItem.addActionListener(listener);
+        return menuItem;
+    }
+
+    /**
+     * Creates a menu with the given items.
+     * <p>
+     * A menu item can be null to allow optional items. For example:
+     *
+     * <pre>
+     * createMenu(option == true ? createMenuItem() : null)
+     * </pre>
+     *
+     * A separator can be added by specifying the {@link #MENU_SEPARATOR} menu item.
+     */
+    public static JMenu createMenu(String text, JMenuItem... menuItems) {
+        JMenu menu = new JMenu(text);
+        for (JMenuItem menuItem : menuItems) {
+            if (menuItem != null) {
+                if (menuItem == MENU_SEPARATOR) {
+                    menu.addSeparator();
+                } else {
+                    menu.add(menuItem);
+                }
+            }
+        }
+        return menu;
+    }
+
+    /**
+     * Creates a menu with the given items.
+     * <p>
+     * A menu item can be null to allow optional items. For example:
+     *
+     * <pre>
+     * createMenu(option == true ? createMenuItem() : null)
+     * </pre>
+     *
+     * A separator can be added by specifying the {@link #MENU_SEPARATOR} menu item.
+     */
+    public static JPopupMenu createPopupMenu(JMenuItem... menuItems) {
+        JPopupMenu menu = new JPopupMenu();
+        for (JMenuItem menuItem : menuItems) {
+            if (menuItem != null) {
+                if (menuItem == MENU_SEPARATOR) {
+                    menu.addSeparator();
+                } else {
+                    menu.add(menuItem);
+                }
+            }
+        }
+        return menu;
+    }
+
+    /**
+     * Adds the specified table mouse listener to receive mouse events from the given table. If
+     * {@code table} or {@code tableMouseListener} are null, no exception is thrown and no action is
+     * performed.
+     *
+     * @param menu if non-null, displayed if a context menu is requested
+     */
+
+    public static void addTableMouseListener(JTable table, JPopupMenu menu,
+        TableMouseListener tableMouseListener) {
+
+        if (table == null || tableMouseListener == null) {
+            return;
+        }
+
+        table.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent evt) {
+                try {
+                    tableMouseListener.rowSelected(table.rowAtPoint(evt.getPoint()));
+                    if (evt.isPopupTrigger()) {
+                        if (menu != null) {
+                            menu.show(table, evt.getX(), evt.getY());
+                        }
+                    } else if (evt.getClickCount() == 2) {
+                        tableMouseListener.rowDoubleClicked(table.rowAtPoint(evt.getPoint()));
+                    }
+                } catch (Exception e) {
+                    MessageUtil.showError(SwingUtilities.getWindowAncestor(table), e);
+                }
+            }
+        });
+    }
+
+    public static JButton createButton(String text, ActionListener listener) {
+        return createButton(text, null, listener);
+    }
+
+    public static JButton createButton(String text, String toolTipText,
+        ActionListener actionListener) {
+
+        checkNotNull(text, "text");
+        // toolTipText is ignored if null.
+        checkNotNull(actionListener, "actionListener");
+        JButton button = new JButton(text);
+        if (toolTipText != null) {
+            button.setToolTipText(toolTipText);
+        }
+        button.addActionListener(actionListener);
+        return button;
+    }
+
+    /**
+     * Creates a standard right-aligned button panel with the given buttons. A button can be null to
+     * allow optional buttons. For example:
+     *
+     * <pre>
+     * createButtonPanel(option == true ? createButton() : null)
+     * </pre>
+     *
+     * Primary buttons that initiates the dialog's action should be listed first followed by
+     * secondary buttons such as Close or Cancel. The buttons will actually be laid out per the
+     * platform-specified order. For example, for the statement
+     * {@code createButtonPanel(OK, CANCEL)}, the button order will be Cancel/OK on the Mac and
+     * Linux and Android and OK/Cancel on Windows.
+     */
+    public static JPanel createButtonPanel(JButton... buttons) {
+        checkNotNull(buttons, "buttons");
+
+        return createButtonPanel(ButtonPanelContext.DIALOG, buttons);
+    }
+
+    /**
+     * Creates a standard button panel with the given buttons. The button layout is controlled by
+     * the context. The context should be {@link ButtonPanelContext#TOOL_BAR} for buttons at the top
+     * of a panel and {@link ButtonPanelContext#DIALOG} for buttons at the bottom of the panel, or
+     * just use {@link #createButtonPanel(JButton...)}.
+     * <p>
+     * A button can be null to allow optional buttons. For example:
+     *
+     * <pre>
+     * createButtonPanel(ButtonPanelContext.TOOL_BAR, option == true ? createButton() : null)
+     * </pre>
+     *
+     * Primary buttons that initiates the dialog's action should be listed first followed by
+     * secondary buttons such as Close or Cancel. The buttons will actually be laid out per the
+     * platform-specified order. For example, for the statement
+     * {@code createButtonPanel(OK, CANCEL)}, the button order will be Cancel/OK on the Mac and
+     * Linux and Android and OK/Cancel on Windows.
+     *
+     * @see ButtonPanelContext
+     */
+    public static JPanel createButtonPanel(ButtonPanelContext context, JButton... buttons) {
+        checkNotNull(context, "context");
+        checkNotNull(buttons, "buttons");
+
+        JButton[] platformOrderedButtons = buttons;
+        if (context == ButtonPanelContext.DIALOG
+            && UIManager.getDefaults().getBoolean("OptionPane.isYesLast")) {
+            Collections.reverse(Arrays.asList(platformOrderedButtons));
+        }
+
+        // Lay out one row of equally-sized buttons with a horizontal gap of 5 pixels.
+        JPanel buttonGrid = new JPanel(new GridLayout(1, 0, 5, 0));
+        for (JButton button : platformOrderedButtons) {
+            if (button != null) {
+                buttonGrid.add(button);
+            }
+        }
+
+        JPanel buttonPanel = new JPanel();
+        buttonPanel.setLayout(new FlowLayout(
+            context == ButtonPanelContext.DIALOG ? FlowLayout.TRAILING : FlowLayout.LEADING));
+        buttonPanel.add(buttonGrid);
+
+        return buttonPanel;
+    }
+
+    /**
+     * Adds buttons to a button panel created with {@link #createButtonPanel()}. Do not use this
+     * method to add buttons at the bottom of the dialog as the results are undefined.
+     */
+    public static void addButtonsToPanel(JPanel panel, JButton... buttons) {
+        JPanel buttonGrid = (JPanel) panel.getComponent(0);
+        for (JButton button : buttons) {
+            if (button != null) {
+                buttonGrid.add(button);
+            }
+        }
+    }
+
+    /**
+     * Prepends buttons to a button panel created with {@link #createButtonPanel()}. Do not use this
+     * method to add buttons at the bottom of the dialog as the results are undefined.
+     */
+    public static void prependButtonsToPanel(JPanel panel, JButton... buttons) {
+        JPanel buttonGrid = (JPanel) panel.getComponent(0);
+        int i = 0;
+        for (JButton button : buttons) {
+            if (button != null) {
+                buttonGrid.add(button, i++);
+            }
+        }
+    }
+
+    /**
+     * Returns the dialog for the given component
+     *
+     * @param component the component
+     * @return the component's dialog, or null if the component isn't a descendent of a dialog
+     */
+    public static Dialog getDialog(Component component) {
+        for (Container c = component.getParent(); c != null; c = c.getParent()) {
+            if (c instanceof JDialog) {
+                return (JDialog) c;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Determines the width of the given string for the given component in pixels.
+     *
+     * @param component a {@link JComponent}
+     * @param s the string
+     * @return the width of the string, in pixels, or 0 if {@code component} or {@code s} is null or
+     * empty
+     */
+    public static int textWidth(JComponent component, String s) {
+        if (component == null || s == null || s.length() == 0) {
+            return 0;
+        }
+
+        FontMetrics metrics = component.getFontMetrics(component.getFont());
+
+        return metrics.stringWidth(s);
+    }
+
+    /**
+     * Determines the height of the given string for the given component in pixels.
+     *
+     * @param component a {@link JComponent}
+     * @return the height of the string, in pixels, or 0 if {@code component} is null or empty
+     */
+    public static int textHeight(JComponent component) {
+        if (component == null) {
+            return 0;
+        }
+
+        FontMetrics metrics = component.getFontMetrics(component.getFont());
+
+        return metrics.getHeight();
+    }
+
+    /**
+     * Displays any non-null component. JFrames and JDialogs are displayed as-is. JPanels and other
+     * Containers are displayed within a JFrame.
+     * <p>
+     * N.B. This is intended to be called by a temporary main() during development as it calls
+     * System.exit(0) when the window is closed or even hidden to avoid a slew of orphaned Java
+     * processes
+     */
+    public static void displayTestDialog(Component component) {
+        checkNotNull(component, "component");
+
+        SwingUtilities.invokeLater(() -> {
+            Window window = component instanceof Window ? (Window) component
+                : SwingUtilities.getWindowAncestor(component);
+
+            // Enclose panel in a JFrame.
+            if (window == null) {
+                JFrame frame = new JFrame();
+                frame.getContentPane().add(component);
+                window = frame;
+            }
+
+            // Ensure JVM exits when we're done.
+            window.addWindowListener(new WindowAdapter() {
+                // Called when the window is closed with an X button.
+                @Override
+                public void windowClosing(WindowEvent e) {
+                    System.exit(0);
+                }
+
+                // Called when the window is no longer visible. This can be explicit when calling
+                // setVisible(false) upon an OK or Cancel button press, or implicit when the window
+                // is covered by another. This is fine for development.
+                @Override
+                public void windowDeactivated(WindowEvent e) {
+                    System.exit(0);
+                }
+            });
+
+            // Display window.
+            window.pack();
+            window.setLocationRelativeTo(component);
+            window.setVisible(true);
+        });
+    }
+
+    /**
+     * Display the current UI defaults and their current value. Use {@link UIManager} to get these
+     * values. For example:
+     *
+     * <pre>
+     * UIManager.getBorder("TextField.border")
+     * </pre>
+     * <p>
+     * Thanks to https://www.logicbig.com/tutorials/java-swing/ui-default.html.
+     */
+    public static void main(String[] args) throws Exception {
+        List<Map.Entry<Object, Object>> entries = new ArrayList<>(
+            UIManager.getDefaults().entrySet());
+        Collections.sort(entries, Comparator.comparing(e -> Objects.toString(e.getKey())));
+        entries.forEach(ZiggySwingUtils::printUiDefaultsEntry);
+    }
+
+    private static void printUiDefaultsEntry(Map.Entry<Object, Object> e) {
+        System.out.printf("%-53s= %s%n", e.getKey(), e.getValue()); // .getClass().getTypeName()
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayEditorDialog.java b/src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayEditorDialog.java
new file mode 100644
index 0000000..c0b0a23
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayEditorDialog.java
@@ -0,0 +1,312 @@
+package gov.nasa.ziggy.ui.util.collections;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.ADD_SYMBOL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.CANCEL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.EXPORT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.IMPORT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.OK;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REMOVE_SYMBOL;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.lang.reflect.Array;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.GroupLayout;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.table.AbstractTableModel;
+
+import gov.nasa.ziggy.collections.ZiggyArrayUtils;
+import gov.nasa.ziggy.collections.ZiggyDataType;
+import gov.nasa.ziggy.ui.util.FloatingPointTableCellRenderer;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+
+/**
+ * Dialog for editing the contents of a Java array.
+ *
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+@SuppressWarnings("serial")
+public class ArrayEditorDialog extends javax.swing.JDialog {
+    private JTable elementsTable;
+    private JTextField addTextField;
+    private ArrayEditorTableModel arrayEditorTableModel;
+    private boolean cancelled;
+
+    private Object array;
+
+    public ArrayEditorDialog(Window owner, Object array) {
+        super(owner, DEFAULT_MODALITY_TYPE);
+        this.array = array;
+
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        setTitle("Array editor");
+
+        getContentPane().add(getDataPanel(), BorderLayout.CENTER);
+        getContentPane().add(ZiggySwingUtils.createButtonPanel(createButton(OK, this::ok),
+            createButton(CANCEL, this::cancel)), BorderLayout.SOUTH);
+
+        pack();
+    }
+
+    private JPanel getDataPanel() {
+        arrayEditorTableModel = new ArrayEditorTableModel(array);
+        elementsTable = new JTable(arrayEditorTableModel);
+        elementsTable.getColumnModel().getColumn(1).setPreferredWidth(300);
+        elementsTable.setDefaultRenderer(Float.class, new FloatingPointTableCellRenderer());
+        elementsTable.setDefaultRenderer(Double.class, new FloatingPointTableCellRenderer());
+
+        // Display the number of array elements, but no fewer than 8 rows and no more than 50 rows.
+        int displayRows = Math.min(Math.max(Array.getLength(array), 8), 50);
+        elementsTable.setPreferredScrollableViewportSize(
+            new Dimension(350, displayRows * elementsTable.getRowHeight()));
+        JScrollPane elementsScrollPane = new JScrollPane(elementsTable);
+
+        JLabel addRemoveElement = ZiggySwingUtils.boldLabel("Add/remove element");
+        JPanel addRemoveButtons = ZiggySwingUtils.createButtonPanel(ButtonPanelContext.TOOL_BAR,
+            createButton(ADD_SYMBOL,
+                "Insert the specified element before the selected row (or at the end if no row is selected)",
+                this::addElement),
+            createButton(REMOVE_SYMBOL, "Remove the element at the selected row", this::remove),
+            createButton(IMPORT, this::importArray), createButton(EXPORT, this::exportArray));
+
+        addTextField = new JTextField();
+        addTextField.addActionListener(this::addElement);
+
+        JPanel dataPanel = new JPanel();
+        GroupLayout dataPanelLayout = new GroupLayout(dataPanel);
+        dataPanelLayout.setAutoCreateContainerGaps(true);
+        dataPanel.setLayout(dataPanelLayout);
+
+        dataPanelLayout.setHorizontalGroup(dataPanelLayout.createParallelGroup()
+            .addComponent(elementsScrollPane)
+            .addComponent(addRemoveElement)
+            .addComponent(addRemoveButtons)
+            .addComponent(addTextField));
+
+        dataPanelLayout.setVerticalGroup(dataPanelLayout.createSequentialGroup()
+            .addComponent(elementsScrollPane)
+            .addPreferredGap(ComponentPlacement.UNRELATED)
+            .addComponent(addRemoveElement)
+            .addComponent(addRemoveButtons, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE)
+            .addComponent(addTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
+                GroupLayout.PREFERRED_SIZE));
+
+        return dataPanel;
+    }
+
+    private void addElement(ActionEvent evt) {
+        int selectedIndex = elementsTable.getSelectedRow();
+
+        if (selectedIndex == -1) {
+            arrayEditorTableModel.insertElementAtEnd(addTextField.getText());
+        } else {
+            arrayEditorTableModel.insertElementAt(selectedIndex, addTextField.getText());
+            elementsTable.getSelectionModel()
+                .setSelectionInterval(selectedIndex + 1, selectedIndex + 1);
+        }
+
+        addTextField.setText("");
+    }
+
+    private void remove(ActionEvent evt) {
+        int selectedIndex = elementsTable.getSelectedRow();
+
+        if (selectedIndex != -1) {
+            arrayEditorTableModel.removeElementAt(selectedIndex);
+
+            int newSize = arrayEditorTableModel.getRowCount();
+            if (selectedIndex < newSize) {
+                elementsTable.getSelectionModel()
+                    .setSelectionInterval(selectedIndex, selectedIndex);
+            }
+        }
+    }
+
+    private void importArray(ActionEvent evt) {
+        try {
+            JFileChooser fileChooser = new JFileChooser();
+            int returnVal = fileChooser.showOpenDialog(this);
+
+            if (returnVal == JFileChooser.APPROVE_OPTION) {
+                File file = fileChooser.getSelectedFile();
+
+                List<String> newArray = ArrayImportExportUtils.importArray(file);
+                arrayEditorTableModel.replaceWith(newArray);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void exportArray(ActionEvent evt) {
+        try {
+            JFileChooser fileChooser = new JFileChooser();
+            int returnVal = fileChooser.showSaveDialog(this);
+
+            if (returnVal == JFileChooser.APPROVE_OPTION) {
+                File file = fileChooser.getSelectedFile();
+
+                List<String> values = arrayEditorTableModel.asStringList();
+                ArrayImportExportUtils.exportArray(file, values);
+            }
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    private void ok(ActionEvent evt) {
+        setVisible(false);
+    }
+
+    private void cancel(ActionEvent evt) {
+        cancelled = true;
+        setVisible(false);
+    }
+
+    public Object editedArray() {
+        return arrayEditorTableModel.asArray();
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public static void main(String[] args) {
+        int size = 100;
+        Integer[] array = new Integer[size];
+        for (int i = 0; i < size; i++) {
+            array[i] = i;
+        }
+        ZiggySwingUtils.displayTestDialog(new ArrayEditorDialog(null, array));
+    }
+
+    private static class ArrayEditorTableModel extends AbstractTableModel {
+
+        private List<Object> elements = new LinkedList<>();
+
+        private ZiggyDataType componentType;
+
+        public ArrayEditorTableModel(Object array) {
+            int length = Array.getLength(array);
+            for (int i = 0; i < length; i++) {
+                elements.add(Array.get(array, i));
+            }
+
+            componentType = ZiggyDataType.getDataType(array);
+        }
+
+        public Object asArray() {
+            Object newArray = ZiggyArrayUtils.constructFullArray(new long[] { elements.size() },
+                componentType, false);
+
+            for (int index = 0; index < elements.size(); index++) {
+                Array.set(newArray, index, elements.get(index));
+            }
+
+            return newArray;
+        }
+
+        public List<String> asStringList() {
+            List<String> newList = new LinkedList<>();
+            for (Object element : elements) {
+                newList.add(ZiggyDataType.objectToString(element));
+            }
+            return newList;
+        }
+
+        public void replaceWith(List<String> newValues) {
+            elements = new LinkedList<>();
+            for (String newValue : newValues) {
+                elements.add(componentType.typedValue(newValue));
+            }
+
+            fireTableDataChanged();
+        }
+
+        public void insertElementAt(int index, String text) {
+            elements.add(index, componentType.typedValue(text));
+            fireTableDataChanged();
+        }
+
+        public void insertElementAtEnd(String text) {
+            insertElementAt(elements.size(), text);
+        }
+
+        public void removeElementAt(int selectedIndex) {
+            elements.remove(selectedIndex);
+            fireTableDataChanged();
+        }
+
+        @Override
+        public int getColumnCount() {
+            return 2;
+        }
+
+        @Override
+        public int getRowCount() {
+            return elements.size();
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            return switch (columnIndex) {
+                case 0 -> rowIndex;
+                case 1 -> elements.get(rowIndex);
+                default -> throw new IllegalArgumentException(
+                    "invalid columnIndex = " + columnIndex);
+            };
+        }
+
+        @Override
+        public void setValueAt(Object value, int rowIndex, int columnIndex) {
+            if (columnIndex == 1) {
+                elements.set(rowIndex, value);
+            }
+        }
+
+        @Override
+        public String getColumnName(int columnIndex) {
+            return switch (columnIndex) {
+                case 0 -> "Element";
+                case 1 -> "Value";
+                default -> throw new IllegalArgumentException(
+                    "invalid columnIndex = " + columnIndex);
+            };
+        }
+
+        @Override
+        public boolean isCellEditable(int rowIndex, int columnIndex) {
+            return columnIndex == 1;
+        }
+
+        @Override
+        public Class<?> getColumnClass(int columnIndex) {
+            return switch (columnIndex) {
+                case 0 -> Integer.class;
+                case 1 -> componentType.getJavaBoxedClass();
+                default -> throw new IllegalArgumentException(
+                    "invalid columnIndex = " + columnIndex);
+            };
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayImportExportUtils.java b/src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayImportExportUtils.java
similarity index 98%
rename from src/main/java/gov/nasa/ziggy/ui/collections/ArrayImportExportUtils.java
rename to src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayImportExportUtils.java
index e3f8bc5..58ed77f 100644
--- a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayImportExportUtils.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayImportExportUtils.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.collections;
+package gov.nasa.ziggy.ui.util.collections;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayPropertyEditor.java b/src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayPropertyEditor.java
similarity index 75%
rename from src/main/java/gov/nasa/ziggy/ui/collections/ArrayPropertyEditor.java
rename to src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayPropertyEditor.java
index 9ddf099..6346480 100644
--- a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayPropertyEditor.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayPropertyEditor.java
@@ -1,8 +1,10 @@
-package gov.nasa.ziggy.ui.collections;
+package gov.nasa.ziggy.ui.util.collections;
 
 import java.awt.event.ActionListener;
 import java.lang.reflect.Array;
 
+import javax.swing.SwingUtilities;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,6 +13,7 @@
 
 import gov.nasa.ziggy.collections.ZiggyArrayUtils;
 import gov.nasa.ziggy.collections.ZiggyDataType;
+import gov.nasa.ziggy.ui.util.MessageUtil;
 
 /**
  * Custom property editor for Java arrays
@@ -39,8 +42,6 @@ public ArrayPropertyEditor(boolean asTableEditor) {
 
     @Override
     public Object getValue() {
-        log.debug("getValue() called");
-
         Object newArray = null;
         String text = tableUi.getText();
 
@@ -54,8 +55,8 @@ public Object getValue() {
     @Override
     public void setValue(Object value) {
         if (value != null) {
-            log.debug("setValue() called with value = " + ReflectionToStringBuilder.toString(value)
-                + ", class = " + value.getClass().getSimpleName());
+            log.debug("value = {}, class={}", ReflectionToStringBuilder.toString(value),
+                value.getClass().getSimpleName());
         }
 
         array = value;
@@ -63,25 +64,26 @@ public void setValue(Object value) {
     }
 
     protected void editArray() {
-        log.debug("editArray() called");
-
-        Object newArray = ZiggyArrayUtils.copyArray(array, array.getClass().getComponentType());
-        ArrayEditorDialog dialog = ArrayEditorDialog.newDialog(editor, newArray);
+        ArrayEditorDialog dialog = null;
         try {
+            Object newArray = ZiggyArrayUtils.copyArray(array, array.getClass().getComponentType());
+            dialog = new ArrayEditorDialog(SwingUtilities.getWindowAncestor(editor), newArray);
             dialog.setVisible(true);
-            if (!dialog.wasCancelled()) {
+            if (!dialog.isCancelled()) {
                 newArray = dialog.editedArray();
                 tableUi.setText(ZiggyDataType.objectToString(newArray));
                 firePropertyChange(array, newArray);
             }
+        } catch (Exception e) {
+            MessageUtil.showError(null, e);
         } finally {
-            dialog.dispose();
+            if (dialog != null) {
+                dialog.dispose();
+            }
         }
     }
 
     protected void selectNull() {
-        log.debug("selectNull() called");
-
         Object originalArray = array;
         tableUi.setText("");
 
diff --git a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayTableCellRenderer.java b/src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayTableCellRenderer.java
similarity index 90%
rename from src/main/java/gov/nasa/ziggy/ui/collections/ArrayTableCellRenderer.java
rename to src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayTableCellRenderer.java
index c3d7c29..664d4aa 100644
--- a/src/main/java/gov/nasa/ziggy/ui/collections/ArrayTableCellRenderer.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/collections/ArrayTableCellRenderer.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.collections;
+package gov.nasa.ziggy.ui.util.collections;
 
 import com.l2fprod.common.swing.renderer.DefaultCellRenderer;
 
diff --git a/src/main/java/gov/nasa/ziggy/ui/collections/InTableButtonsPanel.java b/src/main/java/gov/nasa/ziggy/ui/util/collections/InTableButtonsPanel.java
similarity index 81%
rename from src/main/java/gov/nasa/ziggy/ui/collections/InTableButtonsPanel.java
rename to src/main/java/gov/nasa/ziggy/ui/util/collections/InTableButtonsPanel.java
index bfd8fd8..d8abefe 100644
--- a/src/main/java/gov/nasa/ziggy/ui/collections/InTableButtonsPanel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/collections/InTableButtonsPanel.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.collections;
+package gov.nasa.ziggy.ui.util.collections;
 
 import java.awt.event.ActionListener;
 
@@ -24,23 +24,22 @@ class InTableButtonsPanel extends JPanel {
 
     public InTableButtonsPanel(boolean asTableEditor, ActionListener editActionListener,
         ActionListener cancelActionListener) {
-        super(new PercentLayout(PercentLayout.HORIZONTAL, 0));
+        super(new PercentLayout(PercentLayout.HORIZONTAL, 3));
 
         textField = new JTextField();
-
-        add("*", textField);
-        add(editButton = ComponentFactory.Helper.getFactory().createMiniButton());
-
         if (asTableEditor) {
             textField.setBorder(LookAndFeelTweaks.EMPTY_BORDER);
         }
+        add(textField, "*");
 
+        editButton = ComponentFactory.Helper.getFactory().createMiniButton();
         editButton.addActionListener(editActionListener);
+        add(editButton);
 
-        add(cancelButton = ComponentFactory.Helper.getFactory().createMiniButton());
-
+        cancelButton = ComponentFactory.Helper.getFactory().createMiniButton();
         cancelButton.setText("X");
         cancelButton.addActionListener(cancelActionListener);
+        add(cancelButton);
     }
 
     @Override
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/collections/ListEditorDialog.java b/src/main/java/gov/nasa/ziggy/ui/util/collections/ListEditorDialog.java
new file mode 100644
index 0000000..a40cb67
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/collections/ListEditorDialog.java
@@ -0,0 +1,57 @@
+package gov.nasa.ziggy.ui.util.collections;
+
+import java.awt.Component;
+import java.awt.Window;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JDialog;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionListener;
+
+/**
+ * @author Sean McCauliff
+ */
+@SuppressWarnings("serial")
+class ListEditorDialog extends JDialog {
+    private JList<Object> jList;
+
+    public ListEditorDialog(Window owner) {
+        super(owner);
+        buildComponent();
+        setLocationRelativeTo(owner);
+    }
+
+    private void buildComponent() {
+        jList = new JList<>();
+        jList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        JScrollPane scrollPane = new JScrollPane(jList);
+        add(scrollPane);
+    }
+
+    public void addListSelectionListener(ListSelectionListener listener) {
+        jList.getSelectionModel().addListSelectionListener(listener);
+    }
+
+    public Object[] getSelectedValues() {
+        return jList.getSelectedValuesList().toArray();
+    }
+
+    public void setSelectedIndices(int[] selectedIndices) {
+        jList.setSelectedIndices(selectedIndices);
+    }
+
+    public void setAvailableValues(Object[] values) {
+        DefaultListModel<Object> data = new DefaultListModel<>();
+        for (Object value : values) {
+            data.addElement(value);
+        }
+        jList.setModel(data);
+    }
+
+    public static ListEditorDialog newDialog(Component owner) {
+        return new ListEditorDialog(SwingUtilities.getWindowAncestor(owner));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/pipeline/package.html b/src/main/java/gov/nasa/ziggy/ui/util/collections/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/config/pipeline/package.html
rename to src/main/java/gov/nasa/ziggy/ui/util/collections/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/models/AbstractDatabaseListModel.java b/src/main/java/gov/nasa/ziggy/ui/util/models/AbstractDatabaseListModel.java
similarity index 96%
rename from src/main/java/gov/nasa/ziggy/ui/models/AbstractDatabaseListModel.java
rename to src/main/java/gov/nasa/ziggy/ui/util/models/AbstractDatabaseListModel.java
index 3d35e0b..fd3f95c 100644
--- a/src/main/java/gov/nasa/ziggy/ui/models/AbstractDatabaseListModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/models/AbstractDatabaseListModel.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.models;
+package gov.nasa.ziggy.ui.util.models;
 
 import javax.swing.AbstractListModel;
 import javax.swing.ListModel;
diff --git a/src/main/java/gov/nasa/ziggy/ui/models/AbstractDatabaseModel.java b/src/main/java/gov/nasa/ziggy/ui/util/models/AbstractDatabaseModel.java
similarity index 75%
rename from src/main/java/gov/nasa/ziggy/ui/models/AbstractDatabaseModel.java
rename to src/main/java/gov/nasa/ziggy/ui/util/models/AbstractDatabaseModel.java
index f2678f6..2d2b4fd 100644
--- a/src/main/java/gov/nasa/ziggy/ui/models/AbstractDatabaseModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/models/AbstractDatabaseModel.java
@@ -1,6 +1,5 @@
-package gov.nasa.ziggy.ui.models;
+package gov.nasa.ziggy.ui.util.models;
 
-import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableModel;
 
 import org.hibernate.Session;
@@ -15,12 +14,12 @@
  * @author Todd Klaus
  */
 @SuppressWarnings("serial")
-public abstract class AbstractDatabaseModel extends AbstractTableModel
+public abstract class AbstractDatabaseModel<T> extends AbstractZiggyTableModel<T>
     implements ConsoleDatabaseModel {
     private static final Logger log = LoggerFactory.getLogger(AbstractDatabaseModel.class);
 
-    private boolean modelValid = false;
-    private boolean performingValidation = false;
+    private volatile boolean modelValid;
+    private volatile boolean performingValidation;
 
     public AbstractDatabaseModel() {
     }
@@ -42,8 +41,8 @@ protected void validityCheck() {
         }
         if (!modelValid) {
             performingValidation = true;
-            log.debug("Model invalid for " + this.getClass().getSimpleName()
-                + ", loading data from database...");
+            log.debug("Model invalid for {}, loading data from database...",
+                getClass().getSimpleName());
             loadFromDatabase();
             modelValid = true;
             performingValidation = false;
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/models/AbstractZiggyTableModel.java b/src/main/java/gov/nasa/ziggy/ui/util/models/AbstractZiggyTableModel.java
new file mode 100644
index 0000000..1bcd6bc
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/models/AbstractZiggyTableModel.java
@@ -0,0 +1,23 @@
+package gov.nasa.ziggy.ui.util.models;
+
+import javax.swing.table.AbstractTableModel;
+
+/**
+ * Extension of the {@link AbstractTableModel} for Ziggy. This class adds the following features to
+ * its superclass:
+ * <ol>
+ * <li>A method, {@link #getContentAtRow(int)}, that returns the object at a given row in the table.
+ * <li>The {@link TableModelContentClass} interface, which returns the class of objects managed by
+ * the table model (i.e., the actual value of parameter T).
+ * </ol>
+ *
+ * @author PT
+ * @param <T> Class of objects managed by the model.
+ */
+public abstract class AbstractZiggyTableModel<T> extends AbstractTableModel
+    implements TableModelContentClass<T> {
+
+    private static final long serialVersionUID = 20230511L;
+
+    public abstract T getContentAtRow(int row);
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/models/ConsoleDatabaseModel.java b/src/main/java/gov/nasa/ziggy/ui/util/models/ConsoleDatabaseModel.java
similarity index 95%
rename from src/main/java/gov/nasa/ziggy/ui/models/ConsoleDatabaseModel.java
rename to src/main/java/gov/nasa/ziggy/ui/util/models/ConsoleDatabaseModel.java
index 1201d69..3613c65 100644
--- a/src/main/java/gov/nasa/ziggy/ui/models/ConsoleDatabaseModel.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/models/ConsoleDatabaseModel.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.models;
+package gov.nasa.ziggy.ui.util.models;
 
 import org.hibernate.Session;
 
diff --git a/src/main/java/gov/nasa/ziggy/ui/models/DatabaseModelRegistry.java b/src/main/java/gov/nasa/ziggy/ui/util/models/DatabaseModelRegistry.java
similarity index 95%
rename from src/main/java/gov/nasa/ziggy/ui/models/DatabaseModelRegistry.java
rename to src/main/java/gov/nasa/ziggy/ui/util/models/DatabaseModelRegistry.java
index 230125c..d7cef52 100644
--- a/src/main/java/gov/nasa/ziggy/ui/models/DatabaseModelRegistry.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/models/DatabaseModelRegistry.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.models;
+package gov.nasa.ziggy.ui.util.models;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/models/TableModelContentClass.java b/src/main/java/gov/nasa/ziggy/ui/util/models/TableModelContentClass.java
new file mode 100644
index 0000000..9d6f1b0
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/models/TableModelContentClass.java
@@ -0,0 +1,13 @@
+package gov.nasa.ziggy.ui.util.models;
+
+/**
+ * Interface that provides the ability for table models to report the Java class for their content
+ * objects. All Ziggy table models must implement this interface.
+ *
+ * @author PT
+ * @param <T> Class of objects managed by the table model.
+ */
+public interface TableModelContentClass<T> {
+
+    Class<T> tableModelContentClass();
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/models/ZiggyTreeModel.java b/src/main/java/gov/nasa/ziggy/ui/util/models/ZiggyTreeModel.java
new file mode 100644
index 0000000..4ee52cd
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/models/ZiggyTreeModel.java
@@ -0,0 +1,185 @@
+package gov.nasa.ziggy.ui.util.models;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+
+import org.netbeans.swing.outline.Outline;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.definition.Group;
+import gov.nasa.ziggy.pipeline.definition.HasGroup;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.proxy.RetrieveLatestVersionsCrudProxy;
+
+/**
+ * Implements a generic tree model for use with {@link Outline} for display of hierarchical tables.
+ * <p>
+ * This class organizes a set of database objects by the value of their {@link Group} field. All
+ * objects are initially assigned to the default group. The user may reassign objects to other
+ * groups. The table display will show the tree of defined groups, and allow the user to expand or
+ * collapse groups. In this way, it is possible to display a large number of objects in a table
+ * while preventing the display from becoming unwieldy.
+ *
+ * @author Todd Klaus
+ * @author PT
+ * @param <T>
+ */
+public class ZiggyTreeModel<T extends HasGroup> extends DefaultTreeModel
+    implements ConsoleDatabaseModel {
+
+    private static final long serialVersionUID = 20230511L;
+
+    private static final Logger log = LoggerFactory.getLogger(ZiggyTreeModel.class);
+
+    private List<T> defaultGroup = new LinkedList<>();
+    private Map<Group, List<T>> groups = new HashMap<>();
+    private Map<String, T> objectsByGroupName = new HashMap<>();
+
+    private final RetrieveLatestVersionsCrudProxy<T> crudProxy;
+
+    private final DefaultMutableTreeNode rootNode;
+    private DefaultMutableTreeNode defaultGroupNode;
+    private Map<String, DefaultMutableTreeNode> groupNodes;
+
+    private boolean modelValid = false;
+
+    public ZiggyTreeModel(RetrieveLatestVersionsCrudProxy<T> crudProxy) {
+        super(new DefaultMutableTreeNode(""));
+        rootNode = (DefaultMutableTreeNode) getRoot();
+        this.crudProxy = crudProxy;
+        DatabaseModelRegistry.registerModel(this);
+    }
+
+    public void loadFromDatabase() throws PipelineException {
+        List<T> allObjects = null;
+
+        try {
+            if (groups != null) {
+                log.debug("Clearing the Hibernate cache of all loaded pipelines");
+                for (List<T> objects : groups.values()) {
+                    crudProxy.evictAll(objects); // clear the cache
+                }
+            }
+
+            if (defaultGroup != null) {
+                crudProxy.evictAll(defaultGroup); // clear the cache
+            }
+
+            defaultGroup = new LinkedList<>();
+            groups = new HashMap<>();
+            objectsByGroupName = new HashMap<>();
+            groupNodes = new HashMap<>();
+
+            allObjects = crudProxy.retrieveLatestVersions();
+        } catch (ConsoleSecurityException ignore) {
+            return;
+        }
+
+        for (T object : allObjects) {
+            objectsByGroupName.put(object.groupName(), object);
+
+            Group group = object.group();
+
+            if (group == null) {
+                // default group
+                defaultGroup.add(object);
+            } else {
+                List<T> groupList = groups.get(group);
+
+                if (groupList == null) {
+                    groupList = new LinkedList<>();
+                    groups.put(group, groupList);
+                }
+
+                groupList.add(object);
+            }
+        }
+
+        // create the tree
+        rootNode.removeAllChildren();
+        defaultGroupNode = new DefaultMutableTreeNode("<Default Group>");
+        insertNodeInto(defaultGroupNode, rootNode, rootNode.getChildCount());
+
+        for (T object : defaultGroup) {
+            DefaultMutableTreeNode pipelineNode = new DefaultMutableTreeNode(object);
+            insertNodeInto(pipelineNode, defaultGroupNode, defaultGroupNode.getChildCount());
+        }
+
+        // sort groups alphabetically
+
+        Set<Group> groupsSet = groups.keySet();
+        List<Group> groupsList = new ArrayList<>(groupsSet);
+        Collections.sort(groupsList, Comparator.comparing(Group::getName));
+
+        for (Group group : groupsList) {
+            DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group.getName());
+            insertNodeInto(groupNode, rootNode, rootNode.getChildCount());
+            groupNodes.put(group.getName(), groupNode);
+
+            List<T> objects = groups.get(group);
+
+            for (T object : objects) {
+                DefaultMutableTreeNode pipelineNode = new DefaultMutableTreeNode(object);
+                insertNodeInto(pipelineNode, groupNode, groupNode.getChildCount());
+            }
+        }
+
+        reload();
+        modelValid = true;
+        log.debug("Done loading");
+    }
+
+    public DefaultMutableTreeNode groupNode(String groupName) {
+        return groupNodes.get(groupName);
+    }
+
+    public Map<String, DefaultMutableTreeNode> getGroupNodes() {
+        return groupNodes;
+    }
+
+    /**
+     * Returns true if an object already exists with the specified name. checked when the operator
+     * changes the pipeline name so we can warn them before we get a database constraint violation.
+     *
+     * @param name
+     * @return
+     */
+    public T pipelineByName(String name) {
+        return objectsByGroupName.get(name);
+    }
+
+    @Override
+    public void invalidateModel() {
+        modelValid = false;
+    }
+
+    /**
+     * Reload the model if it has been marked invalid Should only be called by a RowModel
+     */
+    public void validityCheck() {
+        if (!modelValid) {
+            log.info("Model invalid for " + this.getClass().getSimpleName()
+                + ", loading data from database...");
+            loadFromDatabase();
+        }
+    }
+
+    public DefaultMutableTreeNode getDefaultGroupNode() {
+        return defaultGroupNode;
+    }
+
+    public DefaultMutableTreeNode getRootNode() {
+        return rootNode;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/config/security/package.html b/src/main/java/gov/nasa/ziggy/ui/util/models/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/config/security/package.html
rename to src/main/java/gov/nasa/ziggy/ui/util/models/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/messaging/package.html b/src/main/java/gov/nasa/ziggy/ui/util/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/messaging/package.html
rename to src/main/java/gov/nasa/ziggy/ui/util/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/AlertLogCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/AlertLogCrudProxy.java
similarity index 50%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/AlertLogCrudProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/AlertLogCrudProxy.java
index 0d943b3..6b9eb22 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/AlertLogCrudProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/AlertLogCrudProxy.java
@@ -1,26 +1,24 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.List;
 
 import gov.nasa.ziggy.services.alert.AlertLog;
 import gov.nasa.ziggy.services.alert.AlertLogCrud;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * @author Todd Klaus
  */
-public class AlertLogCrudProxy extends CrudProxy {
+public class AlertLogCrudProxy {
 
     public AlertLogCrudProxy() {
     }
 
     public List<AlertLog> retrieveForPipelineInstance(final long pipelineInstanceId) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             AlertLogCrud crud = new AlertLogCrud();
-            List<AlertLog> result1 = crud.retrieveForPipelineInstance(pipelineInstanceId);
-            return result1;
+            return crud.retrieveForPipelineInstance(pipelineInstanceId);
         });
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/CrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/CrudProxy.java
similarity index 55%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/CrudProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/CrudProxy.java
index 3d941fd..a0fa1ab 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/CrudProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/CrudProxy.java
@@ -1,9 +1,8 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.Collection;
 import java.util.Date;
 
-import org.hibernate.FlushMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,45 +19,12 @@
  *
  * @author Todd Klaus
  */
-public abstract class CrudProxy {
+public abstract class CrudProxy<T> {
     private static final Logger log = LoggerFactory.getLogger(CrudProxy.class);
 
     public CrudProxy() {
     }
 
-    /**
-     * Called once at startup. Ensures that the database and messaging services used by the executor
-     * thread never use XA in the console.
-     */
-    public static final void initialize() {
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronous(() -> {
-            log.info("Setting messaging and database services to NOT use XA");
-
-            DatabaseService databaseService = DatabaseService.getInstance();
-            databaseService.getSession().setFlushMode(FlushMode.MANUAL);
-        });
-    }
-
-    /**
-     * Update the specified AuditInfo object with the currently logged in user and the current time.
-     * Should be called by subclasses when creating/updating entities that have AuditInfo.
-     *
-     * @param auditInfo
-     */
-    protected void updateAuditInfo(AuditInfo auditInfo) {
-        if (auditInfo == null) {
-            log.warn("AuditInfo is null, not updating");
-            return;
-        }
-
-        User user = ZiggyGuiConsole.currentUser;
-
-        if (user != null) {
-            auditInfo.setLastChangedUser(user);
-            auditInfo.setLastChangedTime(new Date());
-        }
-    }
-
     /**
      * Verify that the currently-logged in User has the proper Privilege to perform the requested
      * operation. Always returns true if there is no logged in user (dev mode)
@@ -74,46 +40,46 @@ public static void verifyPrivileges(Privilege requestedOperation) {
     }
 
     /**
-     * Persist any dirty objects Protected so that sub-classes van verify the correct privileges
+     * Proxy method for DatabaseService.evictAll() Uses {@link CrudProxyExecutor} to invoke the
+     * {@link DatabaseService} method from the dedicated database thread
      *
+     * @param collection
      * @throws PipelineException
      */
-    protected void saveChanges() {
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronous(() -> {
-            DatabaseService databaseService = DatabaseService.getInstance();
-
-            databaseService.beginTransaction();
-
-            databaseService.flush();
-            databaseService.commitTransaction();
+    public void evictAll(final Collection<?> collection) throws PipelineException {
+        CrudProxyExecutor.executeSynchronous(() -> {
+            DatabaseService.getInstance().evictAll(collection);
         });
     }
 
     /**
-     * Proxy method for DatabaseService.evictAll() Uses {@link CrudProxyExecutor} to invoke the
-     * {@link DatabaseService} method from the dedicated database thread
+     * Default implementation of an update method. Most {@link CrudProxy} subclasses don't need an
+     * update method, hence the default is to throw an exception. Subclasses that do require an
+     * update method should override this.
      *
-     * @param collection
-     * @throws PipelineException
+     * @return a merged instance of the parameter that should be used on subsequent operations
      */
-    public void evictAll(final Collection<?> collection) throws PipelineException {
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronous(() -> {
-            DatabaseService databaseService = DatabaseService.getInstance();
-            databaseService.evictAll(collection);
-            return null;
-        });
+    public T update(T entity) {
+        throw new UnsupportedOperationException("update method not supported");
     }
 
     /**
-     * Proxy method for DatabaseService.evict() Uses {@link CrudProxyExecutor} to invoke the
-     * {@link DatabaseService} method from the dedicated database thread
+     * Update the specified AuditInfo object with the currently logged in user and the current time.
+     * Should be called by subclasses when creating/updating entities that have AuditInfo.
      *
-     * @param object
+     * @param auditInfo
      */
-    public void evict(final Object object) {
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronous(() -> {
-            DatabaseService databaseService = DatabaseService.getInstance();
-            databaseService.evict(object);
-        });
+    protected void updateAuditInfo(AuditInfo auditInfo) {
+        if (auditInfo == null) {
+            log.warn("AuditInfo is null, not updating");
+            return;
+        }
+
+        User user = ZiggyGuiConsole.currentUser;
+
+        if (user != null) {
+            auditInfo.setLastChangedUser(user);
+            auditInfo.setLastChangedTime(new Date());
+        }
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/CrudProxyExecutor.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/CrudProxyExecutor.java
similarity index 63%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/CrudProxyExecutor.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/CrudProxyExecutor.java
index cedfe75..62e634e 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/CrudProxyExecutor.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/CrudProxyExecutor.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -12,18 +12,19 @@
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 import gov.nasa.ziggy.services.database.SingleThreadExecutor;
 import gov.nasa.ziggy.ui.UiDatabaseException;
-import gov.nasa.ziggy.ui.models.DatabaseModelRegistry;
+import gov.nasa.ziggy.ui.util.models.DatabaseModelRegistry;
 
 /**
  * Contains a single-thread {@link ExecutorService} used by the UI code to invoke the CrudProxy
- * classes. This ensures that all hibernate calls are made from the same thread, and therefore the
- * same hibernate Session
+ * classes. This ensures that all Hibernate calls are made from the same thread, and therefore the
+ * same Hibernate Session
  *
  * @author Todd Klaus
  */
 public class CrudProxyExecutor {
     private static final Logger log = LoggerFactory.getLogger(CrudProxyExecutor.class);
 
+    private static final CrudProxyExecutor instance = new CrudProxyExecutor();
     private final ExecutorService executor = SingleThreadExecutor.newInstance();
 
     public CrudProxyExecutor() {
@@ -36,13 +37,13 @@ public CrudProxyExecutor() {
      * @param task
      * @return
      */
-    public <T> T executeSynchronous(Callable<T> task) {
-        Future<T> result = executor.submit(task);
+    public static <T> T executeSynchronous(Callable<T> task) {
+        Future<T> result = instance.executor.submit(task);
 
         try {
             return result.get();
         } catch (Exception e) {
-            handleErrorSynchronous();
+            instance.handleErrorSynchronous();
             throw new UiDatabaseException(e.getCause());
         }
     }
@@ -52,40 +53,30 @@ public <T> T executeSynchronous(Callable<T> task) {
      *
      * @param task
      */
-    public void executeSynchronous(Runnable task) {
-        Future<?> result = executor.submit(task);
+    public static void executeSynchronous(Runnable task) {
+        Future<?> result = instance.executor.submit(task);
 
         try {
             result.get();
         } catch (Exception e) {
-            handleErrorSynchronous();
+            instance.handleErrorSynchronous();
             throw new UiDatabaseException(e.getCause());
         }
     }
 
-    public <T> T executeSynchronousDatabaseTransaction(Callable<T> task) {
-        return executeSynchronousDatabaseTransaction(task, false);
-    }
-
     @SuppressWarnings("unchecked")
-    public <T> T executeSynchronousDatabaseTransaction(Callable<T> task, boolean silent) {
-        return (T) DatabaseTransactionFactory
-            .performTransactionInThread(new DatabaseTransaction<T>() {
-                @Override
-                public boolean silent() {
-                    return silent;
-                }
-
-                @Override
-                public void catchBlock(Throwable e) {
-                    DatabaseModelRegistry.invalidateModels();
-                }
-
-                @Override
-                public T transaction() throws Exception {
-                    return task.call();
-                }
-            });
+    public static <T> T executeSynchronousDatabaseTransaction(Callable<T> task) {
+        return (T) DatabaseTransactionFactory.performTransaction(new DatabaseTransaction<T>() {
+            @Override
+            public void catchBlock(Throwable e) {
+                DatabaseModelRegistry.invalidateModels();
+            }
+
+            @Override
+            public T transaction() throws Exception {
+                return task.call();
+            }
+        });
     }
 
     /**
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/DataReceiptOperationsProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/DataReceiptOperationsProxy.java
similarity index 57%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/DataReceiptOperationsProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/DataReceiptOperationsProxy.java
index 3a0eeaa..0758982 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/DataReceiptOperationsProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/DataReceiptOperationsProxy.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.List;
 
@@ -6,7 +6,6 @@
 import gov.nasa.ziggy.data.management.DataReceiptInstance;
 import gov.nasa.ziggy.data.management.DataReceiptOperations;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * Proxy class for {@link DataReceiptOperations}, used to perform operations of same in the context
@@ -14,17 +13,17 @@
  *
  * @author PT
  */
-public class DataReceiptOperationsProxy extends CrudProxy {
+public class DataReceiptOperationsProxy {
 
-    public List<DataReceiptInstance> DataReceiptInstances() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(
+    public List<DataReceiptInstance> dataReceiptInstances() {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(
             () -> new DataReceiptOperations().dataReceiptInstances());
     }
 
     public List<DataReceiptFile> dataReceiptFilesForInstance(long instanceId) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(
             () -> new DataReceiptOperations().dataReceiptFilesForInstance(instanceId));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/proxy/GroupCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/GroupCrudProxy.java
new file mode 100644
index 0000000..2d2bdfe
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/GroupCrudProxy.java
@@ -0,0 +1,39 @@
+package gov.nasa.ziggy.ui.util.proxy;
+
+import java.util.List;
+
+import gov.nasa.ziggy.pipeline.definition.Group;
+import gov.nasa.ziggy.pipeline.definition.crud.GroupCrud;
+import gov.nasa.ziggy.services.security.Privilege;
+
+public class GroupCrudProxy {
+    public GroupCrudProxy() {
+    }
+
+    public void save(final Group group) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            GroupCrud crud = new GroupCrud();
+            crud.persist(group);
+            return null;
+        });
+    }
+
+    public void delete(final Group group) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            GroupCrud crud = new GroupCrud();
+            crud.remove(group);
+            return null;
+        });
+    }
+
+    public List<Group> retrieveAll() {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            GroupCrud crud = new GroupCrud();
+
+            return crud.retrieveAll();
+        });
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/KeyValuePairCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/KeyValuePairCrudProxy.java
similarity index 51%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/KeyValuePairCrudProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/KeyValuePairCrudProxy.java
index e85ae4d..ab69366 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/KeyValuePairCrudProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/KeyValuePairCrudProxy.java
@@ -1,23 +1,22 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.List;
 
 import gov.nasa.ziggy.services.config.KeyValuePair;
 import gov.nasa.ziggy.services.config.KeyValuePairCrud;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * @author Todd Klaus
  */
-public class KeyValuePairCrudProxy extends CrudProxy {
+public class KeyValuePairCrudProxy {
 
     public KeyValuePairCrudProxy() {
     }
 
     public void save(final KeyValuePair keyValuePair) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             KeyValuePairCrud crud = new KeyValuePairCrud();
             crud.create(keyValuePair);
             return null;
@@ -25,8 +24,8 @@ public void save(final KeyValuePair keyValuePair) {
     }
 
     public void delete(final KeyValuePair keyValuePair) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             KeyValuePairCrud crud = new KeyValuePairCrud();
             crud.delete(keyValuePair);
             return null;
@@ -34,20 +33,18 @@ public void delete(final KeyValuePair keyValuePair) {
     }
 
     public KeyValuePair retrieve(final String key) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             KeyValuePairCrud crud = new KeyValuePairCrud();
-            KeyValuePair result1 = crud.retrieve(key);
-            return result1;
+            return crud.retrieve(key);
         });
     }
 
     public List<KeyValuePair> retrieveAll() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             KeyValuePairCrud crud = new KeyValuePairCrud();
-            List<KeyValuePair> r = crud.retrieveAll();
-            return r;
+            return crud.retrieveAll();
         });
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/proxy/MetricsLogCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/MetricsLogCrudProxy.java
new file mode 100644
index 0000000..af94fba
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/MetricsLogCrudProxy.java
@@ -0,0 +1,43 @@
+package gov.nasa.ziggy.ui.util.proxy;
+
+import java.util.Date;
+import java.util.List;
+
+import gov.nasa.ziggy.metrics.MetricType;
+import gov.nasa.ziggy.metrics.MetricValue;
+import gov.nasa.ziggy.metrics.MetricsCrud;
+import gov.nasa.ziggy.services.security.Privilege;
+import gov.nasa.ziggy.util.TimeRange;
+
+/**
+ * @author Todd Klaus
+ */
+public class MetricsLogCrudProxy {
+    public MetricsLogCrudProxy() {
+    }
+
+    public List<MetricType> retrieveAllMetricTypes() {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            MetricsCrud crud = new MetricsCrud();
+            return crud.retrieveAllMetricTypes();
+        });
+    }
+
+    public List<MetricValue> retrieveAllMetricValuesForType(final MetricType metricType,
+        final Date start, final Date end) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            MetricsCrud crud = new MetricsCrud();
+            return crud.retrieveAllMetricValuesForType(metricType, start, end);
+        });
+    }
+
+    public TimeRange getTimestampRange(final MetricType metricType) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            MetricsCrud crud = new MetricsCrud();
+            return crud.getTimestampRange(metricType);
+        });
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/ParameterSetCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/ParameterSetCrudProxy.java
similarity index 50%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/ParameterSetCrudProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/ParameterSetCrudProxy.java
index 38e3dcb..c244b0c 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/ParameterSetCrudProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/ParameterSetCrudProxy.java
@@ -1,83 +1,89 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
+
+import static com.google.common.base.Preconditions.checkArgument;
 
 import java.util.List;
 
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
 import gov.nasa.ziggy.pipeline.definition.crud.ParameterSetCrud;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * @author Todd Klaus
  */
-public class ParameterSetCrudProxy extends CrudProxy {
+public class ParameterSetCrudProxy extends RetrieveLatestVersionsCrudProxy<ParameterSet> {
 
     public ParameterSetCrudProxy() {
     }
 
     public void save(final ParameterSet moduleParameterSet) {
         verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             ParameterSetCrud crud = new ParameterSetCrud();
             updateAuditInfo(moduleParameterSet.getAuditInfo());
-            crud.create(moduleParameterSet);
+            crud.persist(moduleParameterSet);
             return null;
         });
     }
 
-    public void rename(final ParameterSet parameterSet, final String newName) {
+    public ParameterSet rename(final ParameterSet parameterSet, final String newName) {
         verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             ParameterSetCrud crud = new ParameterSetCrud();
             updateAuditInfo(parameterSet.getAuditInfo());
-            crud.rename(parameterSet, newName);
-            return null;
+            return crud.rename(parameterSet, newName);
         });
     }
 
     public List<ParameterSet> retrieveAll() {
         verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             ParameterSetCrud crud = new ParameterSetCrud();
-            List<ParameterSet> r = crud.retrieveAll();
-            return r;
+            return crud.retrieveAll();
         });
     }
 
     public List<ParameterSet> retrieveAllVersionsForName(final String name) {
         verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             ParameterSetCrud crud = new ParameterSetCrud();
-            List<ParameterSet> r = crud.retrieveAllVersionsForName(name);
-            return r;
+            return crud.retrieveAllVersionsForName(name);
         });
     }
 
-    public ParameterSet retrieveLatestVersionForName(final ParameterSetName name) {
+    public ParameterSet retrieveLatestVersionForName(final String name) {
         verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             ParameterSetCrud crud = new ParameterSetCrud();
-            ParameterSet r = crud.retrieveLatestVersionForName(name);
-            return r;
+            return crud.retrieveLatestVersionForName(name);
         });
     }
 
+    @Override
     public List<ParameterSet> retrieveLatestVersions() {
         verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             ParameterSetCrud crud = new ParameterSetCrud();
-            List<ParameterSet> r = crud.retrieveLatestVersions();
-            return r;
+            return crud.retrieveLatestVersions();
         });
     }
 
     public void delete(final ParameterSet moduleParameterSet) {
         verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             ParameterSetCrud crud = new ParameterSetCrud();
-            crud.delete(moduleParameterSet);
+            crud.remove(moduleParameterSet);
             return null;
         });
     }
+
+    @Override
+    public ParameterSet update(ParameterSet entity) {
+        checkArgument(entity instanceof ParameterSet, "entity must be ParameterSet");
+        verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            ParameterSetCrud crud = new ParameterSetCrud();
+            return crud.merge(entity);
+        });
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/ParametersOperationsProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/ParametersOperationsProxy.java
similarity index 56%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/ParametersOperationsProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/ParametersOperationsProxy.java
index b841361..32e10b4 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/ParametersOperationsProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/ParametersOperationsProxy.java
@@ -1,43 +1,36 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli.ParamIoMode;
 import gov.nasa.ziggy.parameters.ParameterSetDescriptor;
 import gov.nasa.ziggy.parameters.ParametersOperations;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * GUI Proxy class for {@link ParametersOperations}
  *
  * @author Todd Klaus
  */
-public class ParametersOperationsProxy extends CrudProxy {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(ParametersOperationsProxy.class);
+public class ParametersOperationsProxy {
 
     public ParametersOperationsProxy() {
     }
 
     public List<ParameterSetDescriptor> importParameterLibrary(final String sourcePath,
         final List<String> excludeList, final boolean dryRun) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             ParametersOperations paramsOps = new ParametersOperations();
-            List<ParameterSetDescriptor> results = paramsOps.importParameterLibrary(sourcePath,
-                excludeList, dryRun ? ParamIoMode.DRYRUN : ParamIoMode.STANDARD);
-            return results;
+            return paramsOps.importParameterLibrary(sourcePath, excludeList,
+                dryRun ? ParamIoMode.DRYRUN : ParamIoMode.STANDARD);
         });
     }
 
     public void exportParameterLibrary(final String destinationPath, final List<String> excludeList,
         final boolean dryRun) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             ParametersOperations paramsOps = new ParametersOperations();
             paramsOps.exportParameterLibrary(destinationPath, excludeList,
                 dryRun ? ParamIoMode.DRYRUN : ParamIoMode.STANDARD);
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineDefinitionCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineDefinitionCrudProxy.java
similarity index 52%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/PipelineDefinitionCrudProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineDefinitionCrudProxy.java
index 6b0ad33..4377dab 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineDefinitionCrudProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineDefinitionCrudProxy.java
@@ -1,43 +1,32 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.List;
 
 import org.hibernate.Hibernate;
 
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
-public class PipelineDefinitionCrudProxy extends CrudProxy {
-    public PipelineDefinitionCrudProxy() {
-    }
+public class PipelineDefinitionCrudProxy
+    extends RetrieveLatestVersionsCrudProxy<PipelineDefinition> {
 
-    public void save(final PipelineDefinition pipeline) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
-            updateAuditInfo(pipeline.getAuditInfo());
-            crud.create(pipeline);
-            return null;
-        });
+    public PipelineDefinitionCrudProxy() {
     }
 
-    public void rename(final PipelineDefinition pipeline, final String newName) {
+    public PipelineDefinition rename(final PipelineDefinition pipeline, final String newName) {
         verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
             updateAuditInfo(pipeline.getAuditInfo());
-            crud.rename(pipeline, newName);
-            return null;
+            return crud.rename(pipeline, newName);
         });
     }
 
     public void deletePipeline(final PipelineDefinition pipeline) {
         verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
             crud.deletePipeline(pipeline);
             return null;
@@ -46,27 +35,16 @@ public void deletePipeline(final PipelineDefinition pipeline) {
 
     public void deletePipelineNode(final PipelineDefinitionNode pipelineNode) {
         verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
-            crud.delete(pipelineNode);
+            crud.remove(pipelineNode);
             return null;
         });
     }
 
     public PipelineDefinition retrieveLatestVersionForName(final String name) {
         verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
-            PipelineDefinition result1 = crud.retrieveLatestVersionForName(name);
-            result1.buildPaths();
-            initializePipelineDefinitionNodes(result1);
-            return result1;
-        });
-    }
-
-    public PipelineDefinition retrieveLatestVersionForName(final PipelineDefinitionName name) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
             PipelineDefinition result1 = crud.retrieveLatestVersionForName(name);
             result1.buildPaths();
@@ -75,9 +53,10 @@ public PipelineDefinition retrieveLatestVersionForName(final PipelineDefinitionN
         });
     }
 
+    @Override
     public List<PipelineDefinition> retrieveLatestVersions() {
         verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
 
             List<PipelineDefinition> result1 = crud.retrieveLatestVersions();
@@ -93,7 +72,7 @@ public List<PipelineDefinition> retrieveLatestVersions() {
 
     public List<PipelineDefinition> retrieveAll() {
         verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
 
             List<PipelineDefinition> result1 = crud.retrieveAll();
@@ -107,34 +86,16 @@ public List<PipelineDefinition> retrieveAll() {
         });
     }
 
-    public void saveChanges(PipelineDefinition pipelineDefinition) {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        updateAuditInfo(pipelineDefinition.getAuditInfo());
-        super.saveChanges();
-    }
-
     @Override
-    public void saveChanges() {
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        super.saveChanges();
+    public PipelineDefinition update(PipelineDefinition entity) {
+        return createOrUpdate(entity);
     }
 
-    public void delete(final PipelineDefinition pipeline) {
+    public PipelineDefinition createOrUpdate(PipelineDefinition entity) {
         verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
-            crud.delete(pipeline);
-            return null;
-        });
-    }
-
-    public void update(PipelineDefinition pipelineDefinition) {
-        // TODO Auto-generated method stub
-        verifyPrivileges(Privilege.PIPELINE_CONFIG);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
-            PipelineDefinitionCrud crud = new PipelineDefinitionCrud();
-            crud.update(pipelineDefinition);
-            return null;
+            return crud.merge(entity);
         });
     }
 
@@ -146,5 +107,4 @@ private void initializePipelineDefinitionNodes(PipelineDefinition pipelineDefini
             Hibernate.initialize(node.getModelTypes());
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineExecutorProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineExecutorProxy.java
similarity index 56%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/PipelineExecutorProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineExecutorProxy.java
index ff363d1..5ff026d 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineExecutorProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineExecutorProxy.java
@@ -1,29 +1,25 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import gov.nasa.ziggy.pipeline.PipelineExecutor;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.services.database.DatabaseService;
 import gov.nasa.ziggy.services.messages.StartMemdroneRequest;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-import gov.nasa.ziggy.services.messaging.UiCommunicator;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
-import gov.nasa.ziggy.ui.models.DatabaseModelRegistry;
+import gov.nasa.ziggy.ui.util.models.DatabaseModelRegistry;
 
 /**
  * @author Todd Klaus
  */
-public class PipelineExecutorProxy extends CrudProxy {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(PipelineExecutorProxy.class);
+public class PipelineExecutorProxy {
 
     public PipelineExecutorProxy() {
     }
@@ -36,7 +32,7 @@ public PipelineExecutorProxy() {
      * @throws Exception
      */
     public void restartTask(final PipelineTask task, RunMode restartMode) throws Exception {
-        verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
         List<PipelineTask> taskList = new ArrayList<>();
         taskList.add(task);
 
@@ -53,26 +49,22 @@ public void restartTask(final PipelineTask task, RunMode restartMode) throws Exc
      */
     public void restartTasks(final List<PipelineTask> failedTasks, final RunMode restartMode)
         throws Exception {
-        verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        checkNotNull(failedTasks, "failedTasks");
+        checkArgument(failedTasks.size() > 0, "failedTasks must not be empty");
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
 
-            PipelineExecutor pipelineExecutor = new PipelineExecutor();
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+
+            List<PipelineTask> databaseTasks = new ArrayList<>();
             PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-            for (PipelineTask failedTask1 : failedTasks) {
-                PipelineTask dbTask = pipelineTaskCrud.retrieve(failedTask1.getId());
+            for (PipelineTask failedTask : failedTasks) {
+                PipelineTask dbTask = pipelineTaskCrud.retrieve(failedTask.getId());
                 dbTask.resetAutoResubmitCount();
-                pipelineTaskCrud.update(dbTask);
-                pipelineExecutor.restartFailedTask(failedTask1, false);
+                databaseTasks.add(dbTask);
             }
+            new PipelineExecutor().restartFailedTasks(databaseTasks, false, restartMode);
             DatabaseService.getInstance().flush();
-            for (PipelineTask failedTask2 : failedTasks) {
-                WorkerTaskRequest workerTaskRequest = new WorkerTaskRequest(
-                    failedTask2.getPipelineInstance().getId(),
-                    failedTask2.getPipelineInstanceNode().getId(), failedTask2.getId(), 0, false,
-                    restartMode);
-                UiCommunicator.send(workerTaskRequest);
-            }
-            UiCommunicator.send(new StartMemdroneRequest(failedTasks.get(0).getModuleName(),
+            ZiggyMessenger.publish(new StartMemdroneRequest(failedTasks.get(0).getModuleName(),
                 failedTasks.get(0).getPipelineInstance().getId()));
             return null;
         });
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineInstanceCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineInstanceCrudProxy.java
similarity index 51%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/PipelineInstanceCrudProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineInstanceCrudProxy.java
index 45176ee..9f2919c 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineInstanceCrudProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineInstanceCrudProxy.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.List;
 
@@ -6,21 +6,20 @@
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceFilter;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * @author Todd Klaus
  */
-public class PipelineInstanceCrudProxy extends CrudProxy {
+public class PipelineInstanceCrudProxy {
 
     public PipelineInstanceCrudProxy() {
     }
 
     public void save(final PipelineInstance instance) {
-        verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineInstanceCrud crud = new PipelineInstanceCrud();
-            crud.create(instance);
+            crud.persist(instance);
             return null;
         });
     }
@@ -34,8 +33,8 @@ public void save(final PipelineInstance instance) {
      * @param newName
      */
     public void updateName(final long id, final String newName) {
-        verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineInstanceCrud crud = new PipelineInstanceCrud();
             crud.updateName(id, newName);
             return null;
@@ -43,51 +42,43 @@ public void updateName(final long id, final String newName) {
     }
 
     public void delete(final PipelineInstance instance) {
-        verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineInstanceCrud crud = new PipelineInstanceCrud();
-            crud.delete(instance);
+            crud.remove(instance);
             return null;
         });
     }
 
     public PipelineInstance retrieve(final long id) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineInstanceCrud crud = new PipelineInstanceCrud();
-            PipelineInstance r = crud.retrieve(id);
-            return r;
+            return crud.retrieve(id);
         });
     }
 
     public List<PipelineInstance> retrieve() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineInstanceCrud crud = new PipelineInstanceCrud();
-            List<PipelineInstance> r = crud.retrieveAll();
-            return r;
+            return crud.retrieveAll();
         });
     }
 
     public List<PipelineInstance> retrieve(final PipelineInstanceFilter filter) {
-        return retrieve(filter, false);
-    }
-
-    public List<PipelineInstance> retrieve(final PipelineInstanceFilter filter, boolean silent) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineInstanceCrud crud = new PipelineInstanceCrud();
-            List<PipelineInstance> r = crud.retrieve(filter);
-            return r;
-        }, silent);
+            return crud.retrieve(filter);
+        });
     }
 
     public List<PipelineInstance> retrieveAllActive() {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineInstanceCrud crud = new PipelineInstanceCrud();
-            List<PipelineInstance> r = crud.retrieveAllActive();
-            return r;
+            return crud.retrieveAllActive();
         });
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineInstanceNodeCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineInstanceNodeCrudProxy.java
similarity index 53%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/PipelineInstanceNodeCrudProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineInstanceNodeCrudProxy.java
index 16c9838..8d9fa5b 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineInstanceNodeCrudProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineInstanceNodeCrudProxy.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.List;
 
@@ -6,31 +6,28 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceNodeCrud;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * @author Todd Klaus
  */
-public class PipelineInstanceNodeCrudProxy extends CrudProxy {
+public class PipelineInstanceNodeCrudProxy {
 
     public PipelineInstanceNodeCrudProxy() {
     }
 
     public PipelineInstanceNode retrieve(final long id) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineInstanceNodeCrud crud = new PipelineInstanceNodeCrud();
-            PipelineInstanceNode r = crud.retrieve(id);
-            return r;
+            return crud.retrieve(id);
         });
     }
 
     public List<PipelineInstanceNode> retrieveAll(final PipelineInstance pipelineInstance) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineInstanceNodeCrud crud = new PipelineInstanceNodeCrud();
-            List<PipelineInstanceNode> r = crud.retrieveAll(pipelineInstance);
-            return r;
+            return crud.retrieveAll(pipelineInstance);
         });
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineModuleDefinitionCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineModuleDefinitionCrudProxy.java
new file mode 100644
index 0000000..be90917
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineModuleDefinitionCrudProxy.java
@@ -0,0 +1,67 @@
+package gov.nasa.ziggy.ui.util.proxy;
+
+import java.util.List;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineModuleDefinitionCrud;
+import gov.nasa.ziggy.services.security.Privilege;
+
+/**
+ * @author Todd Klaus
+ */
+public class PipelineModuleDefinitionCrudProxy {
+    public PipelineModuleDefinitionCrudProxy() {
+    }
+
+    public void delete(final PipelineModuleDefinition module) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
+            crud.remove(module);
+            return null;
+        });
+    }
+
+    public PipelineModuleDefinition rename(final PipelineModuleDefinition moduleDef,
+        final String newName) {
+
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
+            return crud.rename(moduleDef, newName);
+        });
+    }
+
+    public List<PipelineModuleDefinition> retrieveAll() {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
+            return crud.retrieveAll();
+        });
+    }
+
+    public PipelineModuleDefinition retrieveLatestVersionForName(final String name) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
+            return crud.retrieveLatestVersionForName(name);
+        });
+    }
+
+    public List<PipelineModuleDefinition> retrieveLatestVersions() {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
+            return crud.retrieveLatestVersions();
+        });
+    }
+
+    public void createOrUpdate(PipelineModuleDefinition module) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
+            crud.merge(module);
+            return null;
+        });
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineOperationsProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineOperationsProxy.java
new file mode 100644
index 0000000..6483f41
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineOperationsProxy.java
@@ -0,0 +1,180 @@
+package gov.nasa.ziggy.ui.util.proxy;
+
+import java.io.File;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.pipeline.PipelineOperations;
+import gov.nasa.ziggy.pipeline.TriggerValidationResults;
+import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
+import gov.nasa.ziggy.pipeline.definition.TaskCounts;
+import gov.nasa.ziggy.services.messages.FireTriggerRequest;
+import gov.nasa.ziggy.services.messages.InvalidateConsoleModelsMessage;
+import gov.nasa.ziggy.services.messages.RunningPipelinesCheckRequest;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.security.Privilege;
+
+/**
+ * @author Todd Klaus
+ */
+public class PipelineOperationsProxy {
+    private static final Logger log = LoggerFactory.getLogger(PipelineOperationsProxy.class);
+
+    public PipelineOperationsProxy() {
+    }
+
+    public ParameterSet retrieveLatestParameterSet(final String parameterSetName) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineOperations pipelineOps = new PipelineOperations();
+            return pipelineOps.retrieveLatestParameterSet(parameterSetName);
+        });
+    }
+
+    /**
+     * Returns a {@link Set} containing all {@link Parameters} classes required by the specified
+     * node. This is a union of the Parameters classes required by the PipelineModule itself and the
+     * Parameters classes required by the UnitOfWorkTaskGenerator associated with the node.
+     *
+     * @param pipelineNode
+     * @return
+     */
+    public Set<ClassWrapper<ParametersInterface>> retrieveRequiredParameterClassesForNode(
+        final PipelineDefinitionNode pipelineNode) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineOperations pipelineOps = new PipelineOperations();
+            return pipelineOps.retrieveRequiredParameterClassesForNode(pipelineNode);
+        });
+    }
+
+    /**
+     * @param instance
+     * @return
+     */
+    public String generatePedigreeReport(final PipelineInstance instance) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineOperations pipelineOps = new PipelineOperations();
+            return pipelineOps.generatePedigreeReport(instance);
+        });
+    }
+
+    /**
+     * @param pipelineDefinition
+     * @param destinationDirectory
+     */
+    public void exportPipelineParams(final PipelineDefinition pipelineDefinition,
+        final File destinationDirectory) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineOperations pipelineOps = new PipelineOperations();
+            pipelineOps.exportPipelineParams(pipelineDefinition, destinationDirectory);
+
+            return null;
+        });
+    }
+
+    /**
+     * @param pipelineDefinition
+     * @return
+     */
+    public String generatePipelineReport(final PipelineDefinition pipelineDefinition) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineOperations pipelineOps = new PipelineOperations();
+            return pipelineOps.generatePipelineReport(pipelineDefinition);
+        });
+    }
+
+    /**
+     * Creates a textual report of all ParameterSets in the Parameter Library, including name, type,
+     * keys and values.
+     *
+     * @param csvMode
+     * @return
+     */
+    public String generateParameterLibraryReport(final boolean csvMode) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineOperations pipelineOps = new PipelineOperations();
+            return pipelineOps.generateParameterLibraryReport(csvMode);
+        });
+    }
+
+    public ParameterSet updateParameterSet(final ParameterSet parameterSet,
+        final Parameters newParameters, final String newDescription, final boolean forceSave) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineOperations pipelineOps = new PipelineOperations();
+            return pipelineOps.updateParameterSet(parameterSet, newParameters, newDescription,
+                forceSave);
+        });
+    }
+
+    // N.B.: there are two database transactions in the following method. This is because we
+    // retrieve the latest version of the parameter set here, modify it so that it's got the updated
+    // parameters, and then in UniqueNameVersionPipelineComponentCrud we compare the resulting
+    // parameter set to the database version. If the two retrievals are in the same transaction, the
+    // second retrieval gets the one from the Hibernate cache ... which is the first one ... which
+    // is modified ... so when the comparison occurs, the two parameter sets are identical, which is
+    // -- not what we wanted to know (we want to compare to the version actually in the database).
+    // Hence, retrieve the parameter set in one transaction and merge in another.
+    public ParameterSet updateParameterSet(String parameterSetName,
+        ParametersInterface newParameters) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        ParameterSet databaseParameterSet = CrudProxyExecutor.executeSynchronousDatabaseTransaction(
+            () -> new PipelineOperations().retrieveLatestParameterSet(parameterSetName));
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+            PipelineOperations pipelineOps = new PipelineOperations();
+            return pipelineOps.updateParameterSet(databaseParameterSet, newParameters, false);
+        });
+    }
+
+    /**
+     * Sends a start pipeline request message to the supervisor.
+     */
+    public void sendPipelineMessage(FireTriggerRequest pipelineRequest) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
+        ZiggyMessenger.publish(pipelineRequest);
+        // invalidate the models since starting a pipeline can change the locked state of versioned
+        // database objects
+        ZiggyMessenger.publish(new InvalidateConsoleModelsMessage());
+    }
+
+    /**
+     * Sends a message to the supervisor requesting information on whether any pipelines are running
+     * or queued.
+     */
+    public void sendRunningPipelinesCheckRequestMessage() {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        log.info("Sending message to request status of running instances");
+        ZiggyMessenger.publish(new RunningPipelinesCheckRequest());
+    }
+
+    /**
+     * Validates that this {@link PipelineDefinition} is valid for starting. Checks that the
+     * associated pipeline definition objects have not changed in an incompatible way and that all
+     * {@link ParameterSetName}s are set.
+     */
+    public TriggerValidationResults validatePipeline(final PipelineDefinition pipelineDefinition) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor
+            .executeSynchronous(() -> new PipelineOperations().validateTrigger(pipelineDefinition));
+    }
+
+    public TaskCounts taskCounts(PipelineInstanceNode node) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor
+            .executeSynchronousDatabaseTransaction(() -> new PipelineOperations().taskCounts(node));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineTaskCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineTaskCrudProxy.java
similarity index 53%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/PipelineTaskCrudProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineTaskCrudProxy.java
index 00edf35..5c8c715 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineTaskCrudProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineTaskCrudProxy.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.Collection;
 import java.util.List;
@@ -9,41 +9,35 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * @author Todd Klaus
  */
-public class PipelineTaskCrudProxy extends CrudProxy {
+public class PipelineTaskCrudProxy {
 
     public PipelineTaskCrudProxy() {
     }
 
     public void save(final PipelineTask task) {
-        verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_OPERATIONS);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineTaskCrud crud = new PipelineTaskCrud();
-            crud.create(task);
+            crud.persist(task);
             return null;
         });
     }
 
     public PipelineTask retrieve(final long id) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineTaskCrud crud = new PipelineTaskCrud();
-            PipelineTask r = crud.retrieve(id);
-            return r;
+            return crud.retrieve(id);
         });
     }
 
     public List<PipelineTask> retrieveAll(final PipelineInstance instance) {
-        return retrieveAll(instance, false);
-    }
-
-    public List<PipelineTask> retrieveAll(final PipelineInstance instance, boolean silent) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineTaskCrud crud = new PipelineTaskCrud();
             List<PipelineTask> r = crud.retrieveTasksForInstance(instance);
             for (PipelineTask task : r) {
@@ -52,26 +46,23 @@ public List<PipelineTask> retrieveAll(final PipelineInstance instance, boolean s
                 Hibernate.initialize(task.getProducerTaskIds());
             }
             return r;
-        }, silent);
+        });
     }
 
     public List<PipelineTask> retrieveAll(final PipelineInstance instance,
         final PipelineTask.State state) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineTaskCrud crud = new PipelineTaskCrud();
-            List<PipelineTask> r = crud.retrieveAll(instance, state);
-            return r;
+            return crud.retrieveAll(instance, state);
         });
     }
 
     public List<PipelineTask> retrieveAll(final Collection<Long> taskIds) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             PipelineTaskCrud crud = new PipelineTaskCrud();
-            List<PipelineTask> r = crud.retrieveAll(taskIds);
-            return r;
+            return crud.retrieveAll(taskIds);
         });
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineTaskOperationsProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineTaskOperationsProxy.java
similarity index 61%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/PipelineTaskOperationsProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineTaskOperationsProxy.java
index 7c42a27..32f3af4 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/PipelineTaskOperationsProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/PipelineTaskOperationsProxy.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.List;
 
@@ -6,14 +6,12 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskOperations;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
-public class PipelineTaskOperationsProxy extends CrudProxy {
+public class PipelineTaskOperationsProxy {
 
     public List<PipelineTask> updateAndRetrieveTasks(PipelineInstance pipelineInstance) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(
             () -> new PipelineTaskOperations().updateJobs(pipelineInstance));
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/ProcessingSummaryOpsProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/ProcessingSummaryOpsProxy.java
similarity index 55%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/ProcessingSummaryOpsProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/ProcessingSummaryOpsProxy.java
index 63eabf1..eb46676 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/ProcessingSummaryOpsProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/ProcessingSummaryOpsProxy.java
@@ -1,35 +1,28 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.Map;
 
 import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
 import gov.nasa.ziggy.pipeline.definition.crud.ProcessingSummaryOperations;
 import gov.nasa.ziggy.services.security.Privilege;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * @author Todd Klaus
  */
-public class ProcessingSummaryOpsProxy extends CrudProxy {
+public class ProcessingSummaryOpsProxy {
     public ProcessingSummaryOpsProxy() {
     }
 
     public ProcessingSummary retrieveByTaskId(final long taskId) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(
             () -> new ProcessingSummaryOperations().processingSummaryInternal(taskId));
     }
 
     public Map<Long, ProcessingSummary> retrieveByInstanceId(final long instanceId) {
-        return retrieveByInstanceId(instanceId, false);
-    }
-
-    public Map<Long, ProcessingSummary> retrieveByInstanceId(final long instanceId,
-        boolean silent) {
-        verifyPrivileges(Privilege.PIPELINE_MONITOR);
-        return ZiggyGuiConsole.crudProxyExecutor
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor
             .executeSynchronousDatabaseTransaction(() -> new ProcessingSummaryOperations()
-                .processingSummariesForInstanceInternal(instanceId), silent);
+                .processingSummariesForInstanceInternal(instanceId));
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/proxy/RetrieveLatestVersionsCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/RetrieveLatestVersionsCrudProxy.java
new file mode 100644
index 0000000..7b7a2f9
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/RetrieveLatestVersionsCrudProxy.java
@@ -0,0 +1,12 @@
+package gov.nasa.ziggy.ui.util.proxy;
+
+import java.util.List;
+
+/**
+ * Abstract class for CRUD proxies that have a {@link #retrieveLatestVersions()} method.
+ *
+ * @author PT
+ */
+public abstract class RetrieveLatestVersionsCrudProxy<T> extends CrudProxy<T> {
+    public abstract List<T> retrieveLatestVersions();
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/proxy/UserCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/UserCrudProxy.java
similarity index 55%
rename from src/main/java/gov/nasa/ziggy/ui/proxy/UserCrudProxy.java
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/UserCrudProxy.java
index 8129ff5..c1558cd 100644
--- a/src/main/java/gov/nasa/ziggy/ui/proxy/UserCrudProxy.java
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/UserCrudProxy.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.ui.proxy;
+package gov.nasa.ziggy.ui.util.proxy;
 
 import java.util.List;
 
@@ -6,7 +6,6 @@
 import gov.nasa.ziggy.services.security.Role;
 import gov.nasa.ziggy.services.security.User;
 import gov.nasa.ziggy.services.security.UserCrud;
-import gov.nasa.ziggy.ui.ZiggyGuiConsole;
 
 /**
  * This proxy class provides wrappers for the CRUD methods in {@link UserCrud} to support 'off-line'
@@ -26,13 +25,13 @@
  *
  * @author Todd Klaus
  */
-public class UserCrudProxy extends CrudProxy {
+public class UserCrudProxy {
     public UserCrudProxy() {
     }
 
     public void saveRole(final Role role) {
-        verifyPrivileges(Privilege.USER_ADMIN);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             UserCrud crud = new UserCrud();
             crud.createRole(role);
             return null;
@@ -40,26 +39,24 @@ public void saveRole(final Role role) {
     }
 
     public Role retrieveRole(final String roleName) {
-        verifyPrivileges(Privilege.USER_ADMIN);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             UserCrud crud = new UserCrud();
-            Role r = crud.retrieveRole(roleName);
-            return r;
+            return crud.retrieveRole(roleName);
         });
     }
 
     public List<Role> retrieveAllRoles() {
-        verifyPrivileges(Privilege.USER_ADMIN);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             UserCrud crud = new UserCrud();
-            List<Role> r = crud.retrieveAllRoles();
-            return r;
+            return crud.retrieveAllRoles();
         });
     }
 
     public void deleteRole(final Role role) {
-        verifyPrivileges(Privilege.USER_ADMIN);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             UserCrud crud = new UserCrud();
             crud.deleteRole(role);
             return null;
@@ -67,8 +64,8 @@ public void deleteRole(final Role role) {
     }
 
     public void saveUser(final User user) {
-        verifyPrivileges(Privilege.USER_ADMIN);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             UserCrud crud = new UserCrud();
             crud.createUser(user);
             return null;
@@ -76,26 +73,24 @@ public void saveUser(final User user) {
     }
 
     public User retrieveUser(final String loginName) {
-        verifyPrivileges(Privilege.USER_ADMIN);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             UserCrud crud = new UserCrud();
-            User r = crud.retrieveUser(loginName);
-            return r;
+            return crud.retrieveUser(loginName);
         });
     }
 
     public List<User> retrieveAllUsers() {
-        verifyPrivileges(Privilege.USER_ADMIN);
-        return ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        return CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             UserCrud crud = new UserCrud();
-            List<User> r = crud.retrieveAllUsers();
-            return r;
+            return crud.retrieveAllUsers();
         });
     }
 
     public void deleteUser(final User user) {
-        verifyPrivileges(Privilege.USER_ADMIN);
-        ZiggyGuiConsole.crudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
+        CrudProxy.verifyPrivileges(Privilege.USER_ADMIN);
+        CrudProxyExecutor.executeSynchronousDatabaseTransaction(() -> {
             UserCrud crud = new UserCrud();
             crud.deleteUser(user);
             return null;
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/proxy/ZiggyEventCrudProxy.java b/src/main/java/gov/nasa/ziggy/ui/util/proxy/ZiggyEventCrudProxy.java
new file mode 100644
index 0000000..61bcd3d
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/proxy/ZiggyEventCrudProxy.java
@@ -0,0 +1,24 @@
+package gov.nasa.ziggy.ui.util.proxy;
+
+import java.util.Collection;
+import java.util.List;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.services.events.ZiggyEvent;
+import gov.nasa.ziggy.services.events.ZiggyEventCrud;
+import gov.nasa.ziggy.services.security.Privilege;
+
+public class ZiggyEventCrudProxy {
+
+    public List<ZiggyEvent> retrieveAllEvents() {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor
+            .executeSynchronousDatabaseTransaction(() -> new ZiggyEventCrud().retrieveAllEvents());
+    }
+
+    public List<ZiggyEvent> retrieve(Collection<PipelineInstance> instances) {
+        CrudProxy.verifyPrivileges(Privilege.PIPELINE_MONITOR);
+        return CrudProxyExecutor
+            .executeSynchronousDatabaseTransaction(() -> new ZiggyEventCrud().retrieve(instances));
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/models/package.html b/src/main/java/gov/nasa/ziggy/ui/util/proxy/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/models/package.html
rename to src/main/java/gov/nasa/ziggy/ui/util/proxy/package.html
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/table/AbstractViewEditPanel.java b/src/main/java/gov/nasa/ziggy/ui/util/table/AbstractViewEditPanel.java
new file mode 100644
index 0000000..0db6f04
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/table/AbstractViewEditPanel.java
@@ -0,0 +1,393 @@
+package gov.nasa.ziggy.ui.util.table;
+
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.ASSIGN_GROUP;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.COLLAPSE_ALL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.COPY;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.DELETE;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.DIALOG;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.EDIT;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.EXPAND_ALL;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.NEW;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.REFRESH;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.RENAME;
+import static gov.nasa.ziggy.ui.ZiggyGuiConstants.VIEW;
+import static gov.nasa.ziggy.ui.util.ZiggySwingUtils.createButton;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.AbstractAction;
+import javax.swing.Icon;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+import javax.swing.table.TableModel;
+
+import org.netbeans.swing.etable.ETable;
+import org.netbeans.swing.outline.RowModel;
+
+import gov.nasa.ziggy.pipeline.definition.Group;
+import gov.nasa.ziggy.pipeline.definition.HasGroup;
+import gov.nasa.ziggy.services.security.Privilege;
+import gov.nasa.ziggy.ui.ConsoleSecurityException;
+import gov.nasa.ziggy.ui.util.GroupsDialog;
+import gov.nasa.ziggy.ui.util.MessageUtil;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils.ButtonPanelContext;
+import gov.nasa.ziggy.ui.util.models.ZiggyTreeModel;
+import gov.nasa.ziggy.ui.util.proxy.CrudProxy;
+import gov.nasa.ziggy.ui.util.proxy.RetrieveLatestVersionsCrudProxy;
+
+/**
+ * Provides a framework for a Swing panel that includes a table and a button panel. The panel allows
+ * the user to edit the objects that are displayed in the table, create new objects, delete objects
+ * (unless they are locked), and to refresh the table contents.
+ * <p>
+ * Subclasses of {@link AbstractViewEditPanel} provide a context menu that includes options to
+ * create a new object, edit an object, or delete an object. They also all include buttons to
+ * refresh the display and to create a new object. In addition, there are three optional actions
+ * that the panel can provide: copying an object, renaming an object, and assigning an object to a
+ * group. The selection of optional functions is controlled by the
+ * {@link #optionalViewEditFunctions()} method, which returns a {@link Set} of instances of
+ * {@link OptionalViewEditFunctions}:
+ * <ol>
+ * <li>A subclass will support copying table objects if the {@link #optionalViewEditFunctions()}
+ * returns a {@link Set} that includes {@link OptionalViewEditFunctions#COPY}. In addition, the
+ * {@link #copy(int)} method must be overridden. A copy option will be added to the context menu.
+ * <li>A subclass will support renaming table objects if the {@link #optionalViewEditFunctions()}
+ * returns a {@link Set} that includes {@link OptionalViewEditFunctions#RENAME}. In addition, the
+ * {@link #rename(int)} method must be overridden. A rename option will be added to the context
+ * menu.
+ * <li>A subclass will support assigning table objects to groups if the
+ * {@link #optionalViewEditFunctions()} returns a {@link Set} that includes
+ * {@link OptionalViewEditFunctions#GROUP}. A group option will be added to the context menu, and
+ * expand all and collapse all buttons will be added to the button panel. Finally, the class of
+ * objects that are handled by the table must implement the {@link HasGroup} interface.
+ * </ol>
+ *
+ * @author Todd Klaus
+ * @author PT
+ */
+@SuppressWarnings("serial")
+public abstract class AbstractViewEditPanel<T> extends JPanel {
+
+    public enum OptionalViewEditFunctions {
+        NEW, VIEW, GROUP, COPY, RENAME, DELETE;
+    }
+
+    protected ZiggyTable<T> ziggyTable;
+    private ETable table;
+    protected int selectedModelRow = -1;
+    private JScrollPane scrollPane;
+    private JPopupMenu popupMenu;
+    private JPanel buttonPanel;
+
+    public AbstractViewEditPanel(TableModel tableModel) {
+        ziggyTable = new ZiggyTable<>(tableModel);
+        table = ziggyTable.getTable();
+    }
+
+    public AbstractViewEditPanel(RowModel rowModel, ZiggyTreeModel<?> treeModel,
+        String nodesColumnLabel) {
+        ziggyTable = new ZiggyTable<>(rowModel, treeModel, nodesColumnLabel);
+        table = ziggyTable.getTable();
+    }
+
+    protected void buildComponent() {
+        setLayout(new BorderLayout());
+        setPreferredSize(new Dimension(400, 300));
+        add(getButtonPanel(), BorderLayout.NORTH);
+        add(getScrollPane(), BorderLayout.CENTER);
+    }
+
+    protected JPanel getButtonPanel() {
+        if (buttonPanel == null) {
+            buttonPanel = ZiggySwingUtils.createButtonPanel(ButtonPanelContext.TOOL_BAR, null,
+                createButton(REFRESH, this::refresh),
+                optionalViewEditFunctions().contains(OptionalViewEditFunctions.NEW)
+                    ? createButton(NEW, this::newItem)
+                    : null,
+                optionalViewEditFunctions().contains(OptionalViewEditFunctions.GROUP)
+                    ? createButton(EXPAND_ALL, this::expandAll)
+                    : null,
+                optionalViewEditFunctions().contains(OptionalViewEditFunctions.GROUP)
+                    ? createButton(COLLAPSE_ALL, this::collapseAll)
+                    : null);
+        }
+        return buttonPanel;
+    }
+
+    private void newItem(ActionEvent evt) {
+        try {
+            create();
+        } catch (Throwable e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+        }
+    }
+
+    private void refresh(ActionEvent evt) {
+        refresh();
+    }
+
+    private void expandAll(ActionEvent evt) {
+        ziggyTable.expandAll();
+    }
+
+    private void collapseAll(ActionEvent evt) {
+        ziggyTable.collapseAll();
+    }
+
+    protected JScrollPane getScrollPane() {
+        if (scrollPane == null) {
+            scrollPane = new JScrollPane(table);
+            table.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseClicked(MouseEvent evt) {
+                    tableMouseClicked(evt);
+                }
+            });
+            setComponentPopupMenu(table, getPopupMenu());
+        }
+        return scrollPane;
+    }
+
+    private void tableMouseClicked(MouseEvent evt) {
+        int tableRow = table.rowAtPoint(evt.getPoint());
+        selectedModelRow = table.convertRowIndexToModel(tableRow);
+        if (evt.getClickCount() == 2) {
+            try {
+                edit(selectedModelRow);
+            } catch (Exception e) {
+                MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+            }
+        }
+    }
+
+    /**
+     * Auto-generated method for setting the popup menu for a component
+     */
+    private void setComponentPopupMenu(final Component parent, final JPopupMenu menu) {
+
+        parent.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
+            public void mousePressed(java.awt.event.MouseEvent e) {
+                if (e.isPopupTrigger()) {
+                    menu.show(parent, e.getX(), e.getY());
+                    int tableRow = table.rowAtPoint(e.getPoint());
+                    // windows bug? works ok on Linux/gtk. Here's a workaround:
+                    if (tableRow == -1) {
+                        tableRow = table.getSelectedRow();
+                    }
+                    selectedModelRow = table.convertRowIndexToModel(tableRow);
+                }
+            }
+
+            @Override
+            public void mouseReleased(java.awt.event.MouseEvent e) {
+                if (e.isPopupTrigger()) {
+                    menu.show(parent, e.getX(), e.getY());
+                }
+            }
+        });
+    }
+
+    protected JPopupMenu getPopupMenu() {
+        if (popupMenu == null) {
+            popupMenu = new JPopupMenu();
+            addMenuItem(popupMenu, OptionalViewEditFunctions.NEW, getNewMenuItem());
+            addMenuItem(popupMenu, OptionalViewEditFunctions.VIEW, getViewMenuItem());
+            popupMenu.add(getEditMenuItem());
+            addMenuItem(popupMenu, OptionalViewEditFunctions.GROUP, getGroupMenuItem());
+            addMenuItem(popupMenu, OptionalViewEditFunctions.COPY, getCopyMenuItem());
+            addMenuItem(popupMenu, OptionalViewEditFunctions.RENAME, getRenameMenuItem());
+            addMenuItem(popupMenu, OptionalViewEditFunctions.DELETE, getDeleteMenuItem());
+        }
+
+        return popupMenu;
+    }
+
+    private void addMenuItem(JPopupMenu popupMenu, OptionalViewEditFunctions function,
+        JMenuItem menuItem) {
+        if (optionalViewEditFunctions().contains(function)) {
+            popupMenu.add(menuItem);
+        }
+    }
+
+    protected Set<OptionalViewEditFunctions> optionalViewEditFunctions() {
+        return Set.of(OptionalViewEditFunctions.DELETE, OptionalViewEditFunctions.NEW);
+    }
+
+    private JMenuItem getNewMenuItem() {
+        return new JMenuItem(new ViewEditPanelAction(NEW + DIALOG, null) {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                try {
+                    create();
+                } catch (Exception e) {
+                    MessageUtil.showError(SwingUtilities.getWindowAncestor(panel), e);
+                }
+            }
+        });
+    }
+
+    private JMenuItem getViewMenuItem() {
+        return new JMenuItem(new ViewEditPanelAction(VIEW + DIALOG, null) {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                try {
+                    view(selectedModelRow);
+                } catch (Exception e) {
+                    MessageUtil.showError(SwingUtilities.getWindowAncestor(panel), e);
+                }
+            }
+        });
+    }
+
+    private JMenuItem getEditMenuItem() {
+        return new JMenuItem(new ViewEditPanelAction(EDIT + DIALOG, null) {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                try {
+                    edit(selectedModelRow);
+                } catch (Exception e) {
+                    MessageUtil.showError(SwingUtilities.getWindowAncestor(panel), e);
+                }
+            }
+        });
+    }
+
+    private JMenuItem getGroupMenuItem() {
+        return new JMenuItem(new ViewEditPanelAction(ASSIGN_GROUP + DIALOG, null) {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                try {
+                    group();
+                } catch (Exception e) {
+                    MessageUtil.showError(SwingUtilities.getWindowAncestor(panel), e);
+                }
+            }
+        });
+    }
+
+    private JMenuItem getCopyMenuItem() {
+        return new JMenuItem(new ViewEditPanelAction(COPY + DIALOG, null) {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                try {
+                    copy(selectedModelRow);
+                } catch (Exception e) {
+                    MessageUtil.showError(SwingUtilities.getWindowAncestor(panel), e);
+                }
+            }
+        });
+    }
+
+    private JMenuItem getRenameMenuItem() {
+        return new JMenuItem(new ViewEditPanelAction(RENAME + DIALOG, null) {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                try {
+                    rename(selectedModelRow);
+                } catch (Exception e) {
+                    MessageUtil.showError(SwingUtilities.getWindowAncestor(panel), e);
+                }
+            }
+        });
+    }
+
+    private JMenuItem getDeleteMenuItem() {
+        return new JMenuItem(new ViewEditPanelAction(DELETE + DIALOG, null) {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                try {
+                    delete(selectedModelRow);
+                } catch (Exception e) {
+                    MessageUtil.showError(SwingUtilities.getWindowAncestor(panel), e);
+                }
+            }
+        });
+    }
+
+    protected abstract void refresh();
+
+    protected abstract void create();
+
+    protected void view(int row) {
+    }
+
+    protected abstract void edit(int row);
+
+    /**
+     * Assign objects in the table to a selected {@link Group}.
+     */
+    protected void group() {
+        checkPrivileges();
+        try {
+            Group group = GroupsDialog.selectGroup(this);
+            if (group == null) {
+                return;
+            }
+            List<T> selectedObjects = ziggyTable.getContentAtSelectedRows();
+            if (!selectedObjects.isEmpty() && !(selectedObjects.get(0) instanceof HasGroup)) {
+                throw new UnsupportedOperationException("Grouping not permitted");
+            }
+            for (T object : selectedObjects) {
+                HasGroup groupableObject = (HasGroup) object;
+                if (group == Group.DEFAULT) {
+                    groupableObject.setGroup(null);
+                } else {
+                    groupableObject.setGroup(group);
+                }
+                getCrudProxy().update(object);
+            }
+            ziggyTable.loadFromDatabase();
+        } catch (Exception e) {
+            MessageUtil.showError(this, e);
+        }
+    }
+
+    protected void copy(int row) {
+    }
+
+    protected void rename(int row) {
+    }
+
+    protected abstract void delete(int row);
+
+    protected RetrieveLatestVersionsCrudProxy<T> getCrudProxy() {
+        return null;
+    }
+
+    protected void checkPrivileges() {
+        try {
+            CrudProxy.verifyPrivileges(Privilege.PIPELINE_CONFIG);
+        } catch (ConsoleSecurityException e) {
+            MessageUtil.showError(SwingUtilities.getWindowAncestor(this), e);
+            return;
+        }
+    }
+
+    /**
+     * Extension of {@link AbstractAction} that allows a reference to the parent panel to be passed
+     * to the {@link AbstractAction#actionPerformed(ActionEvent)} method.
+     *
+     * @author PT
+     */
+    private abstract class ViewEditPanelAction extends AbstractAction {
+
+        protected Component panel;
+
+        public ViewEditPanelAction(String name, Icon icon) {
+            super(name, icon);
+            panel = AbstractViewEditPanel.this;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/table/TableMouseListener.java b/src/main/java/gov/nasa/ziggy/ui/util/table/TableMouseListener.java
new file mode 100644
index 0000000..5718d2e
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/table/TableMouseListener.java
@@ -0,0 +1,31 @@
+package gov.nasa.ziggy.ui.util.table;
+
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+
+/**
+ * The listener interface for receiving "interesting" mouse events on a table.
+ * <p>
+ * The class that is interested in processing a table event implements this interface. The listener
+ * object created from that class is then registered with a table by using the
+ * {@link ZiggySwingUtils#addTableMouseListener(javax.swing.JTable, javax.swing.JPopupMenu, TableMouseListener)}
+ * method. An event is generated when the mouse is pressed. When a mouse event occurs, the relevant
+ * method in the listener object is invoked, and the row associated with the mouse's location is
+ * passed to it.
+ */
+public interface TableMouseListener {
+
+    /**
+     * Invoked when a mouse button has been pressed. Clients can save the selected row and use it
+     * when a menu command is run, for example.
+     *
+     * @param row the row under the mouse
+     */
+    void rowSelected(int row);
+
+    /**
+     * Invoked when the mouse button has been double-clicked on a table.
+     *
+     * @param row the row under the mouse
+     */
+    void rowDoubleClicked(int row);
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/table/WrappingCellRenderer.java b/src/main/java/gov/nasa/ziggy/ui/util/table/WrappingCellRenderer.java
new file mode 100644
index 0000000..0f05f7d
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/table/WrappingCellRenderer.java
@@ -0,0 +1,70 @@
+package gov.nasa.ziggy.ui.util.table;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.util.Date;
+
+import javax.swing.JEditorPane;
+import javax.swing.JTable;
+import javax.swing.UIManager;
+import javax.swing.table.TableCellRenderer;
+
+import gov.nasa.ziggy.util.Iso8601Formatter;
+
+/**
+ * Implementation of {@link TableCellRenderer} that extends {@link JEditorPane} in order to manage
+ * word wrapping when column resizing occurs.
+ *
+ * @author PT
+ */
+public class WrappingCellRenderer extends JEditorPane implements TableCellRenderer {
+
+    private static final long serialVersionUID = 20230511L;
+
+    private Color unselectedForeground;
+    private Color unselectedBackground;
+
+    public WrappingCellRenderer() {
+        setContentType("text/html");
+        setEditable(false);
+
+        // The following is necessary for the setFont() method to work as expected.
+        putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
+        setFont(UIManager.getFont("TextField.font"));
+    }
+
+    @Override
+    public void setForeground(Color c) {
+        super.setForeground(c);
+        unselectedForeground = c;
+    }
+
+    @Override
+    public void setBackground(Color c) {
+        super.setBackground(c);
+        unselectedBackground = c;
+    }
+
+    @Override
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
+        boolean hasFocus, int row, int column) {
+
+        if (isSelected) {
+            super.setForeground(table.getSelectionForeground());
+            super.setBackground(table.getSelectionBackground());
+        } else {
+            super.setForeground(
+                unselectedForeground != null ? unselectedForeground : table.getForeground());
+            super.setBackground(
+                unselectedBackground != null ? unselectedBackground : table.getBackground());
+        }
+
+        if (value instanceof Date) {
+            setText(Iso8601Formatter.javaDateTimeSansMillisLocalFormatter().format(value));
+        } else {
+            setText(value.toString());
+        }
+
+        return this;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/util/table/ZiggyTable.java b/src/main/java/gov/nasa/ziggy/ui/util/table/ZiggyTable.java
new file mode 100644
index 0000000..ee39270
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/ui/util/table/ZiggyTable.java
@@ -0,0 +1,678 @@
+package gov.nasa.ziggy.ui.util.table;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.event.MouseListener;
+import java.awt.font.FontRenderContext;
+import java.awt.font.LineBreakMeasurer;
+import java.awt.font.TextLayout;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.text.BreakIterator;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
+import javax.swing.table.TableModel;
+import javax.swing.tree.AbstractLayoutCache;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jsoup.Jsoup;
+import org.netbeans.swing.etable.ETable;
+import org.netbeans.swing.outline.DefaultOutlineModel;
+import org.netbeans.swing.outline.Outline;
+import org.netbeans.swing.outline.OutlineModel;
+import org.netbeans.swing.outline.RowModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.pipeline.definition.HasGroup;
+import gov.nasa.ziggy.ui.util.ZiggySwingUtils;
+import gov.nasa.ziggy.ui.util.models.AbstractDatabaseModel;
+import gov.nasa.ziggy.ui.util.models.AbstractZiggyTableModel;
+import gov.nasa.ziggy.ui.util.models.ConsoleDatabaseModel;
+import gov.nasa.ziggy.ui.util.models.DatabaseModelRegistry;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
+import gov.nasa.ziggy.ui.util.models.ZiggyTreeModel;
+import gov.nasa.ziggy.util.Iso8601Formatter;
+
+/**
+ * The {@link ZiggyTable} provides a combination of a two-dimensional table of cells and the data
+ * model(s) that support the table.
+ * <p>
+ * The underlying table representation is the {@link ETable}, an extension of {@link JTable}. The
+ * {@link #table} field will be one of two concrete classes:
+ * <ol>
+ * <li>An {@link ETable}, which has a look and feel similar to {@link JTable} with some extensions.
+ * <li>An {@link Outline}, which can represent its contents as a tree (i.e., there is an organizing
+ * hierarchy).
+ * </ol>
+ * The selection of the {@link #table} representation is performed automatically: if the
+ * {@link ZiggyTable} is constructed with a {@link TableModel}, then an {@link ETable} will be used;
+ * if constructed with a {@link RowModel} and a {@link TreeModel}, then an {@link Outline} will be
+ * used.
+ * <p>
+ * In addition to the typical table functionality, {@link ZiggyTable} provides the following
+ * features:
+ * <ol>
+ * <li>Users can optionally display the table with alternating rows switching from white to light
+ * grey backgrounds.
+ * <li>Users can optionally configure tables such that text cells will wrap content to more than one
+ * line and row heights will be adjusted automatically (note that this is not supported for
+ * {@link Outline}-based instances).
+ * <li>Users can trigger a reload of the underlying model from the database.
+ * <li>Users can obtain the content of one or more rows from the underlying model.
+ * </ol>
+ *
+ * @author PT
+ * @param <T> Class of objects stored in the table model. The table is a table of instances of T.
+ */
+public class ZiggyTable<T> {
+
+    private static final Logger log = LoggerFactory.getLogger(ZiggyTable.class);
+
+    static private final int SHADED_ROW_INTERVAL = 2;
+    static private final Color LIGHTER_GREY = new Color(240, 240, 240);
+
+    /**
+     * A regular expression for matching on whitespace and punctuation. This is used by
+     * {@link #cellHeight(int, int)} to determine word boundaries. The punctuation portion of the
+     * regexp should match the one that the {@link JEditorPane} uses to initiate line breaks,
+     * whatever that is. It's not the Java Punct pattern, since that pattern contains / and - and we
+     * see that the {@link JEditorPane} does not break on these characters. Thus, consider amending
+     * the set of punctuation characters if {@link #cellHeight(int, int)} behaves strangely on
+     * certain characters.
+     */
+    static private final Pattern WHITESPACE_PUNCTUATION = Pattern.compile("(\\s|[,.]|$)");
+
+    private ETable table;
+    private boolean wrapText;
+    private boolean shadeRows = true;
+    private boolean resizing;
+    private WrappingCellRenderer wrappingCellRenderer = new WrappingCellRenderer();
+    private DateCellRenderer dateCellRenderer = new DateCellRenderer();
+    private HashMap<String, Boolean> expansionState;
+    private boolean defaultGroupExpansionState;
+    private TableModel tableModel;
+    private ZiggyTreeModel<?> treeModel;
+    private final Class<T> modelContentsClass;
+    private OutlineModel outlineModel;
+
+    /**
+     * Constructor for use when an {@link ETable} is desired. An {@link ETable} supports table cells
+     * that wrap text, but doesn't support a tree organization for the table contents.
+     */
+    @SuppressWarnings("unchecked")
+    public ZiggyTable(TableModel tableModel) {
+        checkArgument(tableModel instanceof TableModelContentClass,
+            "ZiggyTable model must implement TableModelContentClass");
+        modelContentsClass = ((TableModelContentClass<T>) tableModel).tableModelContentClass();
+        this.tableModel = tableModel;
+        table = new ZiggyETable();
+        table.setModel(tableModel);
+        wrapText = true;
+        setPreferredViewportSizeFromModel();
+    }
+
+    /**
+     * Constructor for use when an {@link Outline} is desired. An {@link Outline} supports a tree
+     * organization for the table contents, but doesn't support table cells that wrap text.
+     */
+    @SuppressWarnings("unchecked")
+    public ZiggyTable(RowModel rowModel, ZiggyTreeModel<?> treeModel, String nodesColumnLabel) {
+        checkArgument(rowModel instanceof TableModelContentClass,
+            "ZiggyTable rowModel must implement TableModelContentClass");
+        modelContentsClass = ((TableModelContentClass<T>) rowModel).tableModelContentClass();
+        checkArgument(HasGroup.class.isAssignableFrom(modelContentsClass),
+            "ZiggyTable model content class must implement HasGroup");
+        this.treeModel = treeModel;
+        table = new ZiggyOutline();
+        outlineModel = DefaultOutlineModel.createOutlineModel(treeModel, rowModel, false,
+            nodesColumnLabel);
+        ((Outline) table).setModel(outlineModel);
+        DefaultMutableTreeNode defaultGroupNode = treeModel.getDefaultGroupNode();
+        if (defaultGroupNode != null) {
+            ((Outline) table).expandPath(new TreePath(defaultGroupNode.getPath()));
+        }
+        wrapText = false;
+    }
+
+    /**
+     * Enables or disables row shading.
+     */
+    public void setShadeRows(boolean shadeRows) {
+        this.shadeRows = shadeRows;
+    }
+
+    /**
+     * Enables or disables cell text wrapping. Cell text wrapping is not supported for
+     * {@link ZiggyTable} instances that contain an {@link Outline}, so those instances will issue a
+     * warning if the caller attempts to enable cell text wrapping.
+     */
+    public void setWrapText(boolean wrapText) {
+        if (table instanceof Outline || wrapText) {
+            log.warn("Text wrapping not supported for ZiggyTables in Outline mode");
+            return;
+        }
+        this.wrapText = wrapText;
+    }
+
+    /**
+     * Returns the actual {@link ETable} field. Used when a Swing element takes an argument that is
+     * a Swing component (which {@link ZiggyTable} is not).
+     *
+     * @return
+     */
+    public ETable getTable() {
+        return table;
+    }
+
+    public void registerModel() {
+        checkState(tableModel instanceof ConsoleDatabaseModel,
+            "table model must implement ConsoleDatabaseModel");
+        DatabaseModelRegistry.registerModel((ConsoleDatabaseModel) tableModel);
+    }
+
+    /**
+     * Loads the model contents from the database.
+     */
+    @SuppressWarnings("unchecked")
+    public void loadFromDatabase() {
+        if (table instanceof Outline) {
+            recordExpansionState(treeModel.getGroupNodes(), treeModel.getDefaultGroupNode());
+            treeModel.loadFromDatabase();
+            applyExpansionState(treeModel.getGroupNodes(), treeModel.getDefaultGroupNode());
+        } else {
+            checkState(tableModel instanceof AbstractDatabaseModel,
+                "table model must be AbstractDatabaseModel");
+            ((AbstractDatabaseModel<T>) tableModel).loadFromDatabase();
+        }
+    }
+
+    /**
+     * Captures the current expansion state of the node tree that supports an {@link Outline}
+     * instance in the table field.
+     */
+    private void recordExpansionState(Map<String, DefaultMutableTreeNode> groupNodes,
+        DefaultMutableTreeNode defaultGroupNode) {
+        checkState(table instanceof Outline, "table must be an Outline");
+        expansionState = new HashMap<>();
+        Outline outline = (Outline) table;
+        AbstractLayoutCache layoutCache = outline.getLayoutCache();
+
+        for (String groupName : groupNodes.keySet()) {
+            DefaultMutableTreeNode node = groupNodes.get(groupName);
+            boolean isExpanded = layoutCache.isExpanded(new TreePath(node.getPath()));
+
+            expansionState.put(groupName, isExpanded);
+        }
+
+        defaultGroupExpansionState = layoutCache
+            .isExpanded(new TreePath(defaultGroupNode.getPath()));
+    }
+
+    /**
+     * Applies a cached expansion state to the node tree that supports an {@link Outline} instance
+     * in the table field.
+     */
+    private void applyExpansionState(Map<String, DefaultMutableTreeNode> groupNodes,
+        DefaultMutableTreeNode defaultGroupNode) {
+        checkState(table instanceof Outline, "table must be an Outline");
+        Outline outline = (Outline) table;
+
+        for (String groupName : expansionState.keySet()) {
+            DefaultMutableTreeNode node = groupNodes.get(groupName);
+            if (node != null) {
+                boolean shouldExpand = expansionState.get(groupName);
+                if (shouldExpand) {
+                    outline.expandPath(new TreePath(node.getPath()));
+                } else {
+                    outline.collapsePath(new TreePath(node.getPath()));
+                }
+            }
+        }
+
+        if (defaultGroupExpansionState) {
+            outline.expandPath(new TreePath(defaultGroupNode.getPath()));
+        } else {
+            outline.collapsePath(new TreePath(defaultGroupNode.getPath()));
+        }
+    }
+
+    /**
+     * Expands all the levels of the {@link Outline} tree.
+     */
+    public void expandAll() {
+        checkState(table instanceof Outline, "table must be an Outline");
+        DefaultMutableTreeNode rootNode = treeModel.getRootNode();
+        int numKids = rootNode.getChildCount();
+        for (int kidIndex = 0; kidIndex < numKids; kidIndex++) {
+            DefaultMutableTreeNode kid = (DefaultMutableTreeNode) rootNode.getChildAt(kidIndex);
+            ((Outline) table).expandPath(new TreePath(kid.getPath()));
+        }
+    }
+
+    /**
+     * Collapses all the levels of the {@link Outline} tree.
+     */
+    public void collapseAll() {
+        checkState(table instanceof Outline, "table must be an Outline");
+        DefaultMutableTreeNode rootNode = treeModel.getRootNode();
+        int numKids = rootNode.getChildCount();
+        for (int kidIndex = 0; kidIndex < numKids; kidIndex++) {
+            DefaultMutableTreeNode kid = (DefaultMutableTreeNode) rootNode.getChildAt(kidIndex);
+            ((Outline) table).collapsePath(new TreePath(kid.getPath()));
+        }
+    }
+
+    /**
+     * Sets the preferred width of a column.
+     */
+    public void setPreferredColumnWidth(int columnIndex, int width) {
+        TableColumnModel columnModel = table.getColumnModel();
+        checkArgument(columnIndex < columnModel.getColumnCount(), "index value of " + columnIndex
+            + " not valid for table with " + columnModel.getColumnCount() + " columns");
+        columnModel.getColumn(columnIndex).setPreferredWidth(width);
+
+        // Update the preferred viewport size with this new information.
+        setPreferredViewportSizeFromModel();
+    }
+
+    private void setPreferredViewportSizeFromModel() {
+        // The default column width is sized to fit the data. This code ensures that the heading,
+        // with 5 pixels of padding on either side, fits as well.
+        JLabel component = new JLabel();
+        TableColumnModel columnModel = table.getColumnModel();
+        int headerPadding = 10;
+        for (int column = 0; column < columnModel.getColumnCount(); column++) {
+            TableColumn tableColumn = columnModel.getColumn(column);
+            if (tableColumn.getHeaderValue() instanceof String) {
+                tableColumn.setMinWidth(
+                    ZiggySwingUtils.textWidth(component, (String) tableColumn.getHeaderValue())
+                        + headerPadding);
+            }
+        }
+
+        // Set the preferred viewport size to the preferred size, which is based upon the preferred
+        // height and width of the table content. Otherwise, an enclosing scroll pane will put the
+        // table in a small square.
+        int additionalPixelsPerRowToHideScrollbar = 4;
+        Dimension preferredSize = getTable().getPreferredSize();
+        getTable().setPreferredScrollableViewportSize(new Dimension(preferredSize.width,
+            preferredSize.height + additionalPixelsPerRowToHideScrollbar * table.getRowCount()));
+    }
+
+    /**
+     * Adds a {@link MouseListener} to the table.
+     */
+    public void addMouseListener(MouseListener listener) {
+        table.addMouseListener(listener);
+    }
+
+    /**
+     * Returns the table row at a given {@link Point}.
+     */
+    public int rowAtPoint(Point point) {
+        return table.rowAtPoint(point);
+    }
+
+    /**
+     * Returns the table column at a given {@link Point}.
+     */
+    public int columnAtPoint(Point point) {
+        return table.columnAtPoint(point);
+    }
+
+    /**
+     * Returns the contents of the {@link ZiggyTable}'s model for a given view row. This operation
+     * is valid for all {link ZiggyTable} instances with an {@link Outline}, and all {@link ETable}
+     * based instances for which the table model is a subclass of {@link AbstractDatabaseModel}.
+     * <p>
+     * Note that the argument is assumed to be the view index, i.e., the index into the table based
+     * on its current sorting. This is converted to the index into the table model which is then
+     * used to obtain the model content. The key thing to remember is that when the view is sorted,
+     * the model is not.
+     */
+    public T getContentAtViewRow(int viewIndex) {
+        int modelIndex = table.convertRowIndexToModel(viewIndex);
+        if (modelIndex == -1) {
+            return null;
+        }
+        return table instanceof Outline ? getOutlineContentAtModelRow(viewIndex)
+            : getTableContentAtModelRow(modelIndex);
+    }
+
+    public void fireTableDataChanged() {
+        if (tableModel instanceof AbstractTableModel) {
+            ((AbstractTableModel) tableModel).fireTableDataChanged();
+        }
+    }
+
+    /**
+     * Returns row content from an instance of {@link Outline}.
+     */
+    private T getOutlineContentAtModelRow(int modelIndex) {
+        DefaultMutableTreeNode node = (DefaultMutableTreeNode) outlineModel.getValueAt(modelIndex,
+            0);
+        Object userObject = node.getUserObject();
+        if (modelContentsClass.isInstance(userObject)) {
+            return modelContentsClass.cast(userObject);
+        }
+        return null;
+    }
+
+    /**
+     * Returns row content from an instance of {@link ETable} if the underlying model is a subclass
+     * of {@link AbstractDatabaseModel}.
+     */
+    private T getTableContentAtModelRow(int viewIndex) {
+        checkState(tableModel instanceof AbstractZiggyTableModel,
+            "Table model must extend AbstractZiggyTableModel");
+        @SuppressWarnings("unchecked")
+        AbstractZiggyTableModel<T> abstractModel = (AbstractZiggyTableModel<T>) tableModel;
+        return modelContentsClass.cast(abstractModel.getContentAtRow(viewIndex));
+    }
+
+    /**
+     * Returns row content from multiple rows of the table.
+     */
+    public List<T> getContentAtSelectedRows() {
+        List<T> selectedContent = new LinkedList<>();
+        int[] selectedRows = table.getSelectedRows();
+        for (int selectedRow : selectedRows) {
+            if (selectedRow >= 0) {
+                T content = getContentAtViewRow(table.convertRowIndexToModel(selectedRow));
+                if (content != null) {
+                    selectedContent.add(content);
+                }
+            }
+        }
+        return selectedContent;
+    }
+
+    public int getSelectedRow() {
+        return table.getSelectedRow();
+    }
+
+    public int convertRowIndexToModel(int row) {
+        return table.convertRowIndexToModel(row);
+    }
+
+    /**
+     * Implements the {@link JTable#prepareRenderer(TableCellRenderer, int, int)} for use with row
+     * shading and cell wrapping.
+     *
+     * @param jTableRenderer {@link TableCellRenderer} component produced by the superclass
+     * ({@link JTable}) version of {@link JTable#prepareRenderer(TableCellRenderer, int, int)}.
+     */
+    private Component prepareRenderer(int row, int column, Component jTableRenderer) {
+
+        // let ETable handle the shading of the selected row(s)
+        if (!table.isCellSelected(row, column) && shadeRows) {
+            if (row % SHADED_ROW_INTERVAL == 0) {
+                jTableRenderer.setBackground(LIGHTER_GREY);
+            } else {
+                jTableRenderer.setBackground(Color.white);
+            }
+        }
+
+        // If the wrapping changes, the row heights may need to be adjusted. However, when
+        // setRowHeight() is called, it apparently also calls prepareRenderer(). To prevent an
+        // infinite loop, don't call setRowHeight() again if we're already in the midst of
+        // setting the row height.
+        if (wrapText) {
+            int optimalRowHeight = rowHeight(row);
+            if (optimalRowHeight != table.getRowHeight(row) && !resizing) {
+                resizing = true;
+                table.setRowHeight(row, optimalRowHeight);
+                resizing = false;
+            }
+        }
+        return jTableRenderer;
+    }
+
+    /**
+     * Calculates the height of a row by finding the maximum height of cells within the row.
+     */
+    private int rowHeight(int row) {
+        int height = 0;
+        for (int column = 0; column < table.getModel().getColumnCount(); column++) {
+            int cellHeight = isCellContentWrappable(row, column) ? cellHeight(row, column) : 0;
+            height = Math.max(height, cellHeight);
+        }
+        return height != 0 ? height : table.getRowHeight(row);
+    }
+
+    /**
+     * Calculates the height of a table cell.
+     * <p>
+     * There appeared to be some sort of mismatch between the way that the {@link JTextArea} or
+     * {@link JEditorPane} wraps text and the way that {@link LineBreakMeasurer} does, with the
+     * result that as the width of a column decreases, the text wants to wrap before the row height
+     * wants to increase. This results in an interval in which the line is wrapped but the latter
+     * part of the line is unreadable because the row height remains unchanged. To address this, the
+     * {@link LineBreakMeasurer} was given a wrapping width that was only 98\% as large as the
+     * column width.
+     * <p>
+     * There is also some problem with the way that the fonts are retrieved in this code, in that
+     * the fonts always have a landing of 0, resulting in the combination of ascent + descent +
+     * leading being too small. Empirically, it seems that each line of text wants a leading that's
+     * about equal to the descent, plus the cell wants an additional descent worth of height.
+     */
+    private int cellHeight(int row, int column) {
+        FontRenderContext fontRendererContext = table.getFontMetrics(table.getFont())
+            .getFontRenderContext();
+        Object tableValue = table.getValueAt(row, column);
+        String text = tableValue != null && !StringUtils.isEmpty(tableValue.toString())
+            ? tableValue.toString()
+            : "Default"; // provide some reasonable string to operate upon
+        text = Jsoup.parse(text).text(); // strip HTML as it doesn't contribute to length
+
+        // Since JEditorPane doesn't support CSS3's {word-wrap: break-word}, long words (like
+        // filenames) do not break. Therefore, the truncated portion of the word should not
+        // contribute to the cell height. To solve this, create a list of word boundary indices and
+        // only increase the height of the cell as long as the new position is greater than the last
+        // word boundary.
+        List<Integer> boundaries = wordBoundaries(text);
+        int boundaryIndex = 0;
+
+        AttributedCharacterIterator characterIterator = new AttributedString(text).getIterator();
+        LineBreakMeasurer lineMeasurer = new LineBreakMeasurer(characterIterator,
+            BreakIterator.getWordInstance(), fontRendererContext);
+        lineMeasurer.setPosition(characterIterator.getBeginIndex());
+
+        float formatWidth = table.getColumnModel().getColumn(column).getWidth();
+        float height = 0;
+        float descent = 0;
+        int position = 0;
+        while (position < text.length()) {
+            TextLayout layout = lineMeasurer.nextLayout(0.98F * formatWidth);
+            if (layout == null) {
+                // nextLayout() should not return null, but it does sometimes.
+                log.warn(
+                    "LineBreakMeasurer.nextLayout returned null going from position {} to {} for {} (length={})",
+                    position, lineMeasurer.getPosition(), text, text.length());
+                break;
+            }
+            position = lineMeasurer.getPosition();
+            log.debug("formatWidth={}, boundaries={}, position={}, length={}, text={}", formatWidth,
+                boundaries, position, text.length(), text);
+
+            height += layout.getAscent() + 2 * layout.getDescent();
+            descent = layout.getDescent();
+
+            if (position > boundaries.get(boundaryIndex)) {
+                // Read one or more words.
+                while (boundaryIndex < boundaries.size() - 1
+                    && position > boundaries.get(boundaryIndex)) {
+                    lineMeasurer.setPosition(boundaries.get(boundaryIndex));
+                    boundaryIndex++;
+                }
+            } else if (position < boundaries.get(boundaryIndex)) {
+                // Skip long word.
+                lineMeasurer.setPosition(boundaries.get(boundaryIndex));
+            }
+        }
+        return (int) (height + descent);
+    }
+
+    private List<Integer> wordBoundaries(String text) {
+        List<Integer> wordBoundaries = new ArrayList<>();
+        Matcher matcher = WHITESPACE_PUNCTUATION.matcher(text);
+        while (matcher.find()) {
+            wordBoundaries.add(matcher.start());
+        }
+        return wordBoundaries;
+    }
+
+    /**
+     * Determines whether the content of a table cell is "wrappable." What this means is that the
+     * table is configured for text wrapping and that the content is not a boolean, is not null and
+     * is not a subclass of {@link TreeNode},
+     */
+    private boolean isCellContentWrappable(int row, int column) {
+        Object tableContent = table.getValueAt(row, column);
+        return wrapText && table.getColumnClass(column) != Boolean.class && tableContent != null
+            && !(tableContent instanceof TreeNode);
+    }
+
+    /**
+     * Implements the {@link JTable#getCellRenderer(int, int)} for use with row shading and cell
+     * wrapping.
+     *
+     * @param jTableRenderer {@link TableCellRenderer} component produced by the superclass
+     * ({@link JTable}) version of {@link JTable#getCellRenderer(int, int)}.
+     */
+    private TableCellRenderer getCellRenderer(int row, int column,
+        TableCellRenderer jTableRenderer) {
+        return isCellContentWrappable(row, column) ? wrappingCellRenderer
+            : table.getValueAt(row, column) instanceof Date ? dateCellRenderer : jTableRenderer;
+    }
+
+    /**
+     * Subclass of {@link ETable} that supports the additional features in {@link ZiggyTable}.
+     * Implemented as a subclass so that the methods and fields of the {@link ZiggyTable} instance
+     * can be used.
+     *
+     * @author PT
+     */
+    class ZiggyETable extends ETable {
+
+        private static final long serialVersionUID = 20230511L;
+
+        @Override
+        public Component prepareRenderer(TableCellRenderer renderer, int row, int column) {
+            return ZiggyTable.this.prepareRenderer(row, column,
+                super.prepareRenderer(renderer, row, column));
+        }
+
+        @Override
+        public TableCellRenderer getCellRenderer(int row, int column) {
+            return ZiggyTable.this.getCellRenderer(row, column, super.getCellRenderer(row, column));
+        }
+    }
+
+    /**
+     * Subclass of {@link Outline} that supports the additional features in {@link ZiggyTable}.
+     * Implemented as a subclass so that the methods and fields of the {@link ZiggyTable} instance
+     * can be used.
+     *
+     * @author PT
+     */
+    class ZiggyOutline extends Outline {
+
+        private static final long serialVersionUID = 20230511L;
+
+        @Override
+        public Component prepareRenderer(TableCellRenderer renderer, int row, int column) {
+            return ZiggyTable.this.prepareRenderer(row, column,
+                super.prepareRenderer(renderer, row, column));
+        }
+
+        @Override
+        public TableCellRenderer getCellRenderer(int row, int column) {
+            return ZiggyTable.this.getCellRenderer(row, column,
+                superclassOrDefaultRenderer(row, column));
+        }
+
+        // This is necessary because the Outline renderer has to render both the normal
+        // table cells (as defined by the user) and also the cells in the column for the
+        // tree nodes and the rows that contain a tree node. Meanwhile, the superclass
+        // getCellRenderer() doesn't know what to do in those cases.
+        private TableCellRenderer superclassOrDefaultRenderer(int row, int column) {
+            return getValueAt(row, column) != null ? super.getCellRenderer(row, column)
+                : getDefaultRenderer(String.class);
+        }
+    }
+
+    /**
+     * Implementation of {@link TableCellRenderer} that displays dates in a YYYY-MM-DD hh:mm:ss
+     * format.
+     *
+     * @see WrappingCellRenderer
+     * @author Bill Wohler
+     */
+    public class DateCellRenderer extends DefaultTableCellRenderer {
+
+        private static final long serialVersionUID = 20230927L;
+        private Color unselectedForeground;
+        private Color unselectedBackground;
+
+        @Override
+        public void setForeground(Color c) {
+            super.setForeground(c);
+            unselectedForeground = c;
+        }
+
+        @Override
+        public void setBackground(Color c) {
+            super.setBackground(c);
+            unselectedBackground = c;
+        }
+
+        @Override
+        public Component getTableCellRendererComponent(JTable table, Object value,
+            boolean isSelected, boolean hasFocus, int row, int column) {
+
+            checkArgument(value instanceof Date,
+                "DateCellRenderer can only render Date, not " + value.getClass().getSimpleName());
+
+            if (isSelected) {
+                super.setForeground(table.getSelectionForeground());
+                super.setBackground(table.getSelectionBackground());
+            } else {
+                super.setForeground(
+                    unselectedForeground != null ? unselectedForeground : table.getForeground());
+                super.setBackground(
+                    unselectedBackground != null ? unselectedBackground : table.getBackground());
+            }
+
+            setText(Iso8601Formatter.javaDateTimeSansMillisLocalFormatter().format(value));
+
+            return this;
+        }
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/ui/mon/alerts/package.html b/src/main/java/gov/nasa/ziggy/ui/util/table/package.html
similarity index 100%
rename from src/main/java/gov/nasa/ziggy/ui/mon/alerts/package.html
rename to src/main/java/gov/nasa/ziggy/ui/util/table/package.html
diff --git a/src/main/java/gov/nasa/ziggy/uow/DataReceiptUnitOfWorkGenerator.java b/src/main/java/gov/nasa/ziggy/uow/DataReceiptUnitOfWorkGenerator.java
index 8410998..d3775c4 100644
--- a/src/main/java/gov/nasa/ziggy/uow/DataReceiptUnitOfWorkGenerator.java
+++ b/src/main/java/gov/nasa/ziggy/uow/DataReceiptUnitOfWorkGenerator.java
@@ -9,8 +9,8 @@
 
 import com.google.common.collect.Sets;
 
-import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.events.ZiggyEventLabels;
 
@@ -20,12 +20,12 @@
  *
  * @author PT
  */
-public class DataReceiptUnitOfWorkGenerator extends DirectoryUnitOfWorkGenerator {
+public class DataReceiptUnitOfWorkGenerator extends DatastoreDirectoryUnitOfWorkGenerator {
 
     @Override
     protected Path rootDirectory() {
         return Paths.get(
-            ZiggyConfiguration.getInstance().getString(PropertyNames.DATA_RECEIPT_DIR_PROP_NAME));
+            ZiggyConfiguration.getInstance().getString(PropertyName.DATA_RECEIPT_DIR.property()));
     }
 
     /**
@@ -33,7 +33,8 @@ protected Path rootDirectory() {
      * directory of ".manifests".
      */
     @Override
-    public List<UnitOfWork> generateTasks(Map<Class<? extends Parameters>, Parameters> parameters) {
+    public List<UnitOfWork> generateTasks(
+        Map<Class<? extends ParametersInterface>, ParametersInterface> parameters) {
         List<UnitOfWork> unitsOfWork = super.generateTasks(parameters);
 
         // If the pipeline that's going to execute data receipt was launched by an event handler,
@@ -54,7 +55,5 @@ public List<UnitOfWork> generateTasks(Map<Class<? extends Parameters>, Parameter
                 .collect(Collectors.toList());
         }
         return unitsOfWork;
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/uow/DatastoreDirectoryUnitOfWorkGenerator.java b/src/main/java/gov/nasa/ziggy/uow/DatastoreDirectoryUnitOfWorkGenerator.java
index dd6d9e9..64206a1 100644
--- a/src/main/java/gov/nasa/ziggy/uow/DatastoreDirectoryUnitOfWorkGenerator.java
+++ b/src/main/java/gov/nasa/ziggy/uow/DatastoreDirectoryUnitOfWorkGenerator.java
@@ -7,7 +7,7 @@
 import gov.nasa.ziggy.collections.ZiggyDataType;
 import gov.nasa.ziggy.module.ExternalProcessPipelineModule;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 
@@ -39,7 +39,6 @@ public static boolean singleSubtask(UnitOfWork uow) {
         } catch (ClassNotFoundException e) {
             throw new PipelineException("Generator class " + clazz + " not found", e);
         }
-
     }
 
     @Override
@@ -54,7 +53,8 @@ protected Path rootDirectory() {
      * {@link TaskConfigurationParameters#isSingleSubtask()}.
      */
     @Override
-    public List<UnitOfWork> generateTasks(Map<Class<? extends Parameters>, Parameters> parameters) {
+    public List<UnitOfWork> generateTasks(
+        Map<Class<? extends ParametersInterface>, ParametersInterface> parameters) {
         List<UnitOfWork> tasks = super.generateTasks(parameters);
         TaskConfigurationParameters taskConfigurationParameters = (TaskConfigurationParameters) parameters
             .get(TaskConfigurationParameters.class);
@@ -83,5 +83,4 @@ public boolean isSingleSubtask() {
     public void setSingleSubtask(boolean singleSubtask) {
         this.singleSubtask = singleSubtask;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/uow/DirectoryUnitOfWorkGenerator.java b/src/main/java/gov/nasa/ziggy/uow/DirectoryUnitOfWorkGenerator.java
index 0124a2b..5b14c8d 100644
--- a/src/main/java/gov/nasa/ziggy/uow/DirectoryUnitOfWorkGenerator.java
+++ b/src/main/java/gov/nasa/ziggy/uow/DirectoryUnitOfWorkGenerator.java
@@ -16,7 +16,7 @@
 
 import gov.nasa.ziggy.collections.ZiggyDataType;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 import gov.nasa.ziggy.util.RegexBackslashManager;
 
@@ -37,8 +37,8 @@ public abstract class DirectoryUnitOfWorkGenerator implements UnitOfWorkGenerato
     public static final String REGEX_PROPERTY_NAME = "taskDirectoryRegex";
 
     @Override
-    public List<Class<? extends Parameters>> requiredParameterClasses() {
-        List<Class<? extends Parameters>> requiredParameterClasses = new ArrayList<>();
+    public List<Class<? extends ParametersInterface>> requiredParameterClasses() {
+        List<Class<? extends ParametersInterface>> requiredParameterClasses = new ArrayList<>();
         requiredParameterClasses.add(TaskConfigurationParameters.class);
         return requiredParameterClasses;
     }
@@ -72,7 +72,8 @@ public static String directory(UnitOfWork uow) {
     protected abstract Path rootDirectory();
 
     @Override
-    public List<UnitOfWork> generateTasks(Map<Class<? extends Parameters>, Parameters> parameters) {
+    public List<UnitOfWork> generateTasks(
+        Map<Class<? extends ParametersInterface>, ParametersInterface> parameters) {
         String taskDirectoryRegex = taskDirectoryRegex(parameters);
         List<UnitOfWork> unitsOfWork = new ArrayList<>();
 
@@ -124,7 +125,8 @@ public List<UnitOfWork> generateTasks(Map<Class<? extends Parameters>, Parameter
      * Returns the regular expression that defines the directory names that are allowed to become
      * units of work. Broken out as a separate method to allow overriding.
      */
-    protected String taskDirectoryRegex(Map<Class<? extends Parameters>, Parameters> parameters) {
+    protected String taskDirectoryRegex(
+        Map<Class<? extends ParametersInterface>, ParametersInterface> parameters) {
         TaskConfigurationParameters taskConfigurationParameters = (TaskConfigurationParameters) parameters
             .get(TaskConfigurationParameters.class);
         if (taskConfigurationParameters == null) {
@@ -164,7 +166,5 @@ public String briefState(UnitOfWork uow) {
             briefStateBuilder.append(matcher.group(0));
         }
         return briefStateBuilder.toString();
-
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/uow/SingleUnitOfWorkGenerator.java b/src/main/java/gov/nasa/ziggy/uow/SingleUnitOfWorkGenerator.java
index 16f006a..848e586 100644
--- a/src/main/java/gov/nasa/ziggy/uow/SingleUnitOfWorkGenerator.java
+++ b/src/main/java/gov/nasa/ziggy/uow/SingleUnitOfWorkGenerator.java
@@ -7,7 +7,7 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 
 public class SingleUnitOfWorkGenerator implements UnitOfWorkGenerator {
 
@@ -25,17 +25,17 @@ public String briefState(UnitOfWork uow) {
     }
 
     @Override
-    public List<Class<? extends Parameters>> requiredParameterClasses() {
+    public List<Class<? extends ParametersInterface>> requiredParameterClasses() {
         return Collections.emptyList();
     }
 
     @Override
-    public List<UnitOfWork> generateTasks(Map<Class<? extends Parameters>, Parameters> parameters) {
+    public List<UnitOfWork> generateTasks(
+        Map<Class<? extends ParametersInterface>, ParametersInterface> parameters) {
         List<UnitOfWork> tasks = new LinkedList<>();
         UnitOfWork prototypeTask = new UnitOfWork();
         tasks.add(prototypeTask);
 
         return tasks;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/uow/TaskConfigurationParameters.java b/src/main/java/gov/nasa/ziggy/uow/TaskConfigurationParameters.java
index 126da41..c4e96fb 100644
--- a/src/main/java/gov/nasa/ziggy/uow/TaskConfigurationParameters.java
+++ b/src/main/java/gov/nasa/ziggy/uow/TaskConfigurationParameters.java
@@ -15,7 +15,7 @@
  *
  * @author PT
  */
-public class TaskConfigurationParameters implements Parameters {
+public class TaskConfigurationParameters extends Parameters {
 
     private String taskDirectoryRegex;
     private boolean singleSubtask;
@@ -73,5 +73,4 @@ public int getMaxAutoResubmits() {
     public void setMaxAutoResubmits(int maxAutoResubmits) {
         this.maxAutoResubmits = maxAutoResubmits;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/uow/UnitOfWork.java b/src/main/java/gov/nasa/ziggy/uow/UnitOfWork.java
index 26c167c..5b247b2 100644
--- a/src/main/java/gov/nasa/ziggy/uow/UnitOfWork.java
+++ b/src/main/java/gov/nasa/ziggy/uow/UnitOfWork.java
@@ -24,13 +24,22 @@
  *
  * @author PT
  */
-public class UnitOfWork extends TypedParameterCollection implements Serializable {
+public class UnitOfWork extends TypedParameterCollection
+    implements Serializable, Comparable<UnitOfWork> {
 
-    private static final long serialVersionUID = 20220819L;
+    private static final long serialVersionUID = 20230511L;
 
     public static final String BRIEF_STATE_PARAMETER_NAME = "briefState";
 
     public String briefState() {
         return getParameter(BRIEF_STATE_PARAMETER_NAME).getString();
     }
+
+    /**
+     * Allow the UOWs to sort by brief state.
+     */
+    @Override
+    public int compareTo(UnitOfWork o) {
+        return briefState().compareTo(o.briefState());
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/uow/UnitOfWorkGenerator.java b/src/main/java/gov/nasa/ziggy/uow/UnitOfWorkGenerator.java
index 64ceac8..63192eb 100644
--- a/src/main/java/gov/nasa/ziggy/uow/UnitOfWorkGenerator.java
+++ b/src/main/java/gov/nasa/ziggy/uow/UnitOfWorkGenerator.java
@@ -3,6 +3,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.google.common.collect.ImmutableMap;
 
@@ -11,15 +12,15 @@
 import gov.nasa.ziggy.module.ExternalProcessPipelineModule;
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule;
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineModuleDefinitionCrud;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 
 /**
  * Interface for all unit of work generators. A unit of work generator constructs instances of the
@@ -59,14 +60,15 @@ static Map<Class<? extends PipelineModule>, Class<? extends UnitOfWorkGenerator>
      * <p>
      * Used by the console to prevent misconfigurations.
      */
-    List<Class<? extends Parameters>> requiredParameterClasses();
+    List<Class<? extends ParametersInterface>> requiredParameterClasses();
 
     /**
      * Generate the task objects for this unit of work. This method must be supplied by the
      * implementing class. It is used in conjunction with {@link #briefState(UnitOfWork)} to
      * generate all UOWs for all tasks.
      */
-    List<UnitOfWork> generateTasks(Map<Class<? extends Parameters>, Parameters> parameters);
+    List<UnitOfWork> generateTasks(
+        Map<Class<? extends ParametersInterface>, ParametersInterface> parameters);
 
     /**
      * Generates the content of the briefState property based on the other properties in a UOW. It
@@ -81,15 +83,22 @@ static Map<Class<? extends PipelineModule>, Class<? extends UnitOfWorkGenerator>
      * generator.
      */
     default List<UnitOfWork> generateUnitsOfWork(
-        Map<Class<? extends Parameters>, Parameters> parameters) {
+        Map<Class<? extends ParametersInterface>, ParametersInterface> parameters) {
+
+        // Produce the tasks and sort by brief state
         List<UnitOfWork> uows = generateTasks(parameters);
+
+        // Add some metadata parameters to all the instances.
         for (UnitOfWork uow : uows) {
             uow.addParameter(new TypedParameter(UnitOfWork.BRIEF_STATE_PARAMETER_NAME,
                 briefState(uow), ZiggyDataType.ZIGGY_STRING));
             uow.addParameter(new TypedParameter(UnitOfWorkGenerator.GENERATOR_CLASS_PARAMETER_NAME,
                 getClass().getCanonicalName(), ZiggyDataType.ZIGGY_STRING));
         }
-        return uows;
+
+        // Now that the UOWs have their brief states properly assigned, sort them by brief state
+        // and return.
+        return uows.stream().sorted().collect(Collectors.toList());
     }
 
     /**
@@ -103,9 +112,8 @@ static ClassWrapper<UnitOfWorkGenerator> unitOfWorkGenerator(PipelineDefinitionN
         if (unitOfWorkGenerator == null) {
 
             // Get the current definition of the pipeline module
-            PipelineModuleDefinition module = (PipelineModuleDefinition) DatabaseTransactionFactory
-                .performTransactionInThread(() -> new PipelineModuleDefinitionCrud()
-                    .retrieveLatestVersionForName(node.getModuleName()));
+            PipelineModuleDefinition module = new PipelineModuleDefinitionCrud()
+                .retrieveLatestVersionForName(node.getModuleName());
             Class<? extends PipelineModule> moduleClass = module.getPipelineModuleClass()
                 .getClazz();
             Class<? extends UnitOfWorkGenerator> uowClass = defaultUnitOfWorkGenerator(moduleClass);
@@ -128,7 +136,7 @@ static Class<? extends UnitOfWorkGenerator> defaultUnitOfWorkGenerator(
 
         // Start by using the pipeline-side manager for default UOWs, if any is specified
         String pipelineUowManagerClassName = ZiggyConfiguration.getInstance()
-            .getString(PropertyNames.PIPELINE_DEFAULT_UOW_IDENTIFIER_CLASS_PROP_NAME, null);
+            .getString(PropertyName.PIPELINE_DEFAULT_UOW_IDENTIFIER_CLASS.property(), null);
         if (pipelineUowManagerClassName != null) {
 
             // Try to instantiate the Pipeline-side default UOW generator, and throw an exception
@@ -161,5 +169,4 @@ static Class<? extends UnitOfWorkGenerator> defaultUnitOfWorkGenerator(
         }
         return defaultUnitOfWork;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/AcceptableCatchBlock.java b/src/main/java/gov/nasa/ziggy/util/AcceptableCatchBlock.java
new file mode 100644
index 0000000..c4cada8
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/util/AcceptableCatchBlock.java
@@ -0,0 +1,72 @@
+package gov.nasa.ziggy.util;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.METHOD;
+
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a method that has a catch block that has been reviewed and deemed acceptable.
+ * <p>
+ * As a general matter, Ziggy code should be free of catch blocks. In some cases, this is either
+ * impossible or impractical, in which case the method with the catch block should be annotated with
+ * {@link AcceptableCatchBlock}. This annotation takes a {@code rationale} parameter whose value is
+ * of type {@link Rationale} that indicates why the catch block is acceptable.
+ * <p>
+ * A method that has multiple catch blocks should have multiple annotations, one annotation per
+ * catch block, with the annotation ordering matched to the catch block ordering.
+ *
+ * @author PT
+ */
+@Target({ METHOD, CONSTRUCTOR })
+@Repeatable(AcceptableCatchBlock.List.class)
+public @interface AcceptableCatchBlock {
+    public enum Rationale {
+
+        /** The caught exception must not be permitted to halt execution prematurely. */
+        MUST_NOT_CRASH,
+
+        /**
+         * The caught exception is thought to be impossible by construction. In this case, the catch
+         * block should throw {@link AssertionError} so that if the impossible ever happens, we'll
+         * find out about it sooner rather than later.
+         */
+        CAN_NEVER_OCCUR,
+
+        /**
+         * The caught exception occurs in the {@link Runnable#run()} block of a {@link Runnable}.
+         */
+        EXCEPTION_IN_RUNNABLE,
+
+        /**
+         * The caught exception is translated to a runtime exception that is more appropriate for
+         * the abstraction.
+         */
+        EXCEPTION_CHAIN,
+
+        /**
+         * The caught exception must not prevent some necessary cleanup that occurs before the
+         * exception passes control back to the caller.
+         */
+        CLEANUP_BEFORE_EXIT,
+
+        /**
+         * The caught exception triggers a call to {@link System#exit(int)}.
+         */
+        SYSTEM_EXIT,
+
+        /**
+         * The caught exception triggers a call to a usage display, followed by
+         * {@link System#exit(int)}.
+         */
+        USAGE
+    }
+
+    public Rationale rationale();
+
+    @Target({ METHOD, CONSTRUCTOR })
+    @interface List {
+        AcceptableCatchBlock[] value();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/util/ClasspathScanner.java b/src/main/java/gov/nasa/ziggy/util/ClasspathScanner.java
index aadbcf7..e5eb4a2 100644
--- a/src/main/java/gov/nasa/ziggy/util/ClasspathScanner.java
+++ b/src/main/java/gov/nasa/ziggy/util/ClasspathScanner.java
@@ -1,11 +1,15 @@
 package gov.nasa.ziggy.util;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Enumeration;
@@ -19,10 +23,12 @@
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
-import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import javassist.bytecode.ClassFile;
 
 /**
@@ -35,8 +41,10 @@
 public class ClasspathScanner {
     private static final Logger log = LoggerFactory.getLogger(ClasspathScanner.class);
 
-    private Set<String> jarFilters = new HashSet<>();
-    private Set<String> packageFilters = new HashSet<>();
+    private Set<String> includeJarFilters = new HashSet<>();
+    private Set<String> excludeJarFilters = new HashSet<>();
+    private Set<String> includePackageFilters = new HashSet<>();
+    private Set<String> excludePackageFilters = new HashSet<>();
     private Set<String> classPathToScan = new HashSet<>();
     private Set<String> visitedClassPathElements = new HashSet<>();
 
@@ -53,7 +61,7 @@ public boolean removeListener(ClasspathScannerListener listener) {
         return listeners.remove(listener);
     }
 
-    private void notifyListeners(ClassFile classFile) throws Exception {
+    private void notifyListeners(ClassFile classFile) {
         for (ClasspathScannerListener listener : listeners) {
             listener.processClass(classFile);
         }
@@ -62,18 +70,15 @@ private void notifyListeners(ClassFile classFile) throws Exception {
     /**
      * For each element in the classpath, scan the contents (either a recursive directory search or
      * a JAR scan) for annotated classes.
-     *
-     * @throws Exception
      */
-    public void scanForClasses() throws Exception {
+    public void scanForClasses() {
         log.debug("ClasspathScanner: Scanning class path for matching classes");
 
         visitedClassPathElements = new HashSet<>();
         Set<String> classPath = classPathToScan;
 
         if (classPath == null || classPath.isEmpty()) {
-            // no user-specified classpath provided, so parse the actual
-            // classpath
+            // No user-specified classpath provided, so parse the actual classpath.
             classPath = parseClassPath();
         }
 
@@ -81,14 +86,9 @@ public void scanForClasses() throws Exception {
     }
 
     /**
-     * Scan the specified class path for annotated classes
-     *
-     * @param classPath
-     * @param detectedClasses
-     * @return
-     * @throws Exception
+     * Scan the specified class path for annotated classes.
      */
-    private void scanClassPath(Set<String> classPath) throws Exception {
+    private void scanClassPath(Set<String> classPath) {
         for (String classPathElement : classPath) {
             if (!visitedClassPathElements.contains(classPathElement)) {
                 visitedClassPathElements.add(classPathElement);
@@ -96,15 +96,15 @@ private void scanClassPath(Set<String> classPath) throws Exception {
                 File classPathElementFile = new File(classPathElement);
                 if (classPathElementFile.exists()) {
                     if (classPathElementFile.isDirectory()) {
-                        log.debug("scanning directory: " + classPathElementFile);
+                        log.debug("Scanning directory {}" + classPathElementFile);
                         scanDirectory(classPathElementFile, classPathElementFile);
                     } else if (classPathElementFile.getName().endsWith(".jar")) {
                         if (matchesJarFilter(classPathElementFile.getName())) {
-                            log.debug("scanning JAR file: " + classPathElementFile);
+                            log.debug("Scanning JAR file {}", classPathElementFile);
                             scanJar(classPathElementFile);
                         } else {
-                            log.debug("skipping JAR file because it does not match filters: "
-                                + classPathElementFile);
+                            log.debug("Skipping JAR file {} because it does not match filters",
+                                classPathElementFile);
                         }
                     }
                 }
@@ -113,13 +113,10 @@ private void scanClassPath(Set<String> classPath) throws Exception {
     }
 
     /**
-     * Recursively scan a directory for classes
-     *
-     * @param classPathElementFile
-     * @param detectedClasses
-     * @throws Exception
+     * Recursively scan a directory for classes.
      */
-    private void scanDirectory(File rootDirectory, File directory) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.CAN_NEVER_OCCUR)
+    private void scanDirectory(File rootDirectory, File directory) {
         String directoryName = rootDirectory.getAbsolutePath();
         File[] files = directory.listFiles();
         if (files != null) {
@@ -132,9 +129,16 @@ private void scanDirectory(File rootDirectory, File directory) throws Exception
                     String fullyQualifiedName = convertPathToPackageName(relativePath);
                     if (matchesPackageFilter(fullyQualifiedName)
                         && fullyQualifiedName.endsWith(".class")) {
-                        log.debug("processing file: " + file.getName());
-                        FileInputStream fis = new FileInputStream(file);
-                        processFile(fis);
+                        log.debug("Processing file={}", file.getName());
+                        FileInputStream fis;
+                        try {
+                            fis = new FileInputStream(file);
+                            processFile(fis);
+                        } catch (FileNotFoundException e) {
+                            // Can never occur. The FileInputStream opens on a file that
+                            // was obtained from listing files in a directory.
+                            throw new AssertionError(e);
+                        }
                     }
                 }
             }
@@ -142,25 +146,22 @@ private void scanDirectory(File rootDirectory, File directory) throws Exception
     }
 
     /**
-     * Scan the contents of a jar file for classes
-     *
-     * @param classPathElementFile
-     * @param detectedClasses
-     * @throws Exception
+     * Scan the contents of a jar file for classes.
      */
-    private void scanJar(File jarFile) throws Exception {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void scanJar(File jarFile) {
         try (JarFile jar = new JarFile(jarFile)) {
             Enumeration<JarEntry> entries = jar.entries();
 
-            // first check to see if the MANIFEST has a Class-Path entry
+            // First, check to see if the MANIFEST has a Class-Path entry.
             Manifest manifest = jar.getManifest();
             if (manifest != null) {
-                log.debug("scanning MANIFEST for: " + jarFile.getName());
+                log.debug("Scanning MANIFEST for {}", jarFile.getName());
                 Attributes mainAttrs = manifest.getMainAttributes();
                 if (mainAttrs != null) {
                     String manifestClassPath = mainAttrs.getValue(Attributes.Name.CLASS_PATH);
                     if (manifestClassPath != null) {
-                        log.debug("Found MANIFEST Class-Path");
+                        log.debug("Found MANIFEST ClassPath={}", manifestClassPath);
 
                         String classPathRelativeDir = jarFile.getParentFile().getAbsolutePath();
                         String[] classPathEntries = manifestClassPath.split("\\s+");
@@ -183,22 +184,19 @@ private void scanJar(File jarFile) throws Exception {
                 String fullyQualifiedName = convertPathToPackageName(entry.getName());
                 if (matchesPackageFilter(fullyQualifiedName)
                     && fullyQualifiedName.endsWith(".class")) {
-                    log.debug("processing jar entry: " + entry);
-                    InputStream is = jar.getInputStream(entry);
-                    processFile(is);
+                    log.debug("Processing entry={}", entry);
+                    processFile(jar.getInputStream(entry));
                 }
             }
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to scan file " + jarFile.toString(), e);
         }
     }
 
     /**
      * Load a .class file (from a file or jar) and notify the listeners
-     *
-     * @param is
-     * @param detectedClasses
-     * @throws Exception
      */
-    private void processFile(InputStream is) throws Exception {
+    private void processFile(InputStream is) {
         ClassFile classFile = createClassFile(is);
 
         notifyListeners(classFile);
@@ -206,9 +204,6 @@ private void processFile(InputStream is) throws Exception {
 
     /**
      * Use the javassist library to read the contents of the .class file
-     *
-     * @param is
-     * @return
      */
     private ClassFile createClassFile(InputStream is) {
         ClassFile cf = null;
@@ -223,28 +218,27 @@ private ClassFile createClassFile(InputStream is) {
 
     /**
      * Parse the contents of the classpath
-     *
-     * @return
      */
     private Set<String> parseClassPath() {
         Set<String> classPath = new HashSet<>();
         ClassLoader classLoader = getClass().getClassLoader();
 
         if (classLoader instanceof URLClassLoader) {
-            log.debug("classLoader instanceof URLClassLoader");
+            log.debug("classLoader={} instanceof URLClassLoader", classLoader);
             URL[] urls = ((URLClassLoader) classLoader).getURLs();
             for (URL url : urls) {
                 String filename = url.getFile();
-                log.debug("adding url:" + filename);
+                log.debug("Adding url={}", filename);
                 classPath.add(filename);
             }
         } else {
-            log.debug("parsing java.class.path");
-            StringTokenizer st = new StringTokenizer(SystemUtils.JAVA_CLASS_PATH,
+            log.debug("Parsing {}", PropertyName.JAVA_CLASS_PATH);
+            StringTokenizer st = new StringTokenizer(
+                ZiggyConfiguration.getInstance().getString(PropertyName.JAVA_CLASS_PATH.property()),
                 File.pathSeparator);
             while (st.hasMoreTokens()) {
                 String filename = st.nextToken();
-                log.debug("adding file:" + filename);
+                log.debug("Adding file={}", filename);
                 classPath.add(filename);
             }
         }
@@ -256,85 +250,99 @@ private String convertPathToPackageName(String path) {
     }
 
     /**
-     * Check whether the className matches the jarFilters
-     *
-     * @param className
-     * @return
+     * Check whether the className matches the jarFilters.
      */
     private boolean matchesJarFilter(String jarFileName) {
-        if (jarFilters == null || jarFilters.isEmpty()) {
-            return true;
-        }
-
-        for (String filter : jarFilters) {
-            if (jarFileName.startsWith(filter)) {
-                return true;
-            }
-        }
-
-        // log.debug("skipping jar: " + jarFileName);
-        return false;
+        return matchesFilters(jarFileName, includeJarFilters, excludeJarFilters);
     }
 
     /**
-     * Check whether the className matches the packageFilters
-     *
-     * @param className
-     * @return
+     * Check whether the className matches the packageFilters.
      */
     private boolean matchesPackageFilter(String className) {
-        if (packageFilters == null || packageFilters.isEmpty()) {
-            return true;
-        }
+        return matchesFilters(className, includePackageFilters, excludePackageFilters);
+    }
 
-        for (String filter : packageFilters) {
-            if (className.startsWith(filter)) {
-                return true;
+    private boolean matchesFilters(String s, Set<String> includeFilters,
+        Set<String> excludeFilters) {
+        boolean matches = false;
+        if (includeFilters.isEmpty()) {
+            matches = true;
+        } else {
+            for (String filter : includeFilters) {
+                if (s.matches(filter)) {
+                    matches = true;
+                    break;
+                }
+            }
+        }
+        if (matches) {
+            for (String filter : excludeFilters) {
+                if (s.matches(filter)) {
+                    return false;
+                }
             }
         }
 
-        // log.debug("skipping package: " + className);
-        return false;
+        return matches;
     }
 
-    /**
-     * @return the jarFilters
-     */
-    public Set<String> getJarFilters() {
-        return jarFilters;
+    public Set<String> getIncludeJarFilters() {
+        return includeJarFilters;
     }
 
     /**
-     * @param jarFilters the jarFilters to set
+     * Only jars that match the given non-null set of regular expressions will be processed. If this
+     * is not set, all jar files will be processed. Use {@link #setExcludeJarFilters(Set)} to reduce
+     * this set.
      */
-    public void setJarFilters(Set<String> jarFilters) {
-        this.jarFilters = jarFilters;
+    public void setIncludeJarFilters(Set<String> includeJarFilters) {
+        checkNotNull(includeJarFilters, "includeJarFilters");
+        this.includeJarFilters = includeJarFilters;
+    }
+
+    public Set<String> getExcludeJarFilters() {
+        return excludeJarFilters;
     }
 
     /**
-     * @return the packageFilters
+     * Jars that match the given non-null set of regular expressions will not be processed.
      */
-    public Set<String> getPackageFilters() {
-        return packageFilters;
+    public void setExcludeJarFilters(Set<String> excludeJarFilters) {
+        checkNotNull(excludeJarFilters, "excludeJarFilters");
+        this.excludeJarFilters = excludeJarFilters;
+    }
+
+    public Set<String> getIncludePackageFilters() {
+        return includePackageFilters;
     }
 
     /**
-     * @param packageFilters the packageFilters to set
+     * Only packages that match the given non-null set of regular expressions will be processed. If
+     * this is not set, all packages will be processed. Use {@link #setExcludePackageFilters(Set)}
+     * to reduce this set.
      */
-    public void setPackageFilters(Set<String> packageFilters) {
-        this.packageFilters = packageFilters;
+    public void setIncludePackageFilters(Set<String> includePackageFilters) {
+        checkNotNull(includePackageFilters, "includePackageFilters");
+        this.includePackageFilters = includePackageFilters;
+    }
+
+    public Set<String> getExcludePackageFilters() {
+        return excludePackageFilters;
     }
 
     /**
-     * @return the classPathToScan
+     * Packages that match the given non-null set of regular expressions will not be processed.
      */
+    public void setExcludePackageFilters(Set<String> excludePackageFilters) {
+        checkNotNull(includePackageFilters, "includePackageFilters");
+        this.excludePackageFilters = excludePackageFilters;
+    }
+
     public Set<String> getClassPathToScan() {
         return classPathToScan;
     }
 
-    /**
-     * @param classPathToScan the classPathToScan to set
-     */
     public void setClassPathToScan(Set<String> classPathToScan) {
         this.classPathToScan = classPathToScan;
     }
diff --git a/src/main/java/gov/nasa/ziggy/util/ClasspathScannerListener.java b/src/main/java/gov/nasa/ziggy/util/ClasspathScannerListener.java
index c06d285..efa477d 100644
--- a/src/main/java/gov/nasa/ziggy/util/ClasspathScannerListener.java
+++ b/src/main/java/gov/nasa/ziggy/util/ClasspathScannerListener.java
@@ -8,5 +8,5 @@
  * @author Todd Klaus
  */
 public interface ClasspathScannerListener {
-    void processClass(ClassFile classFile) throws Exception;
+    void processClass(ClassFile classFile);
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/HostNameUtils.java b/src/main/java/gov/nasa/ziggy/util/HostNameUtils.java
index 5a439c8..427b829 100644
--- a/src/main/java/gov/nasa/ziggy/util/HostNameUtils.java
+++ b/src/main/java/gov/nasa/ziggy/util/HostNameUtils.java
@@ -2,9 +2,11 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+
 /**
  * Utilities related to host names.
  *
@@ -14,36 +16,32 @@ public class HostNameUtils {
 
     /**
      * The full host name including domain.
-     *
-     * @throws UnknownHostException
      */
-    public static String hostName() throws UnknownHostException {
-        return InetAddress.getLocalHost().getHostName();
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static String hostName() {
+        return ExternalProcess.commandOutput("hostname", (String[]) null).get(0);
     }
 
     /**
      * The host name, truncated to remove the domain.
-     *
-     * @throws UnknownHostException
      */
-    public static String truncatedHostName() throws UnknownHostException {
-        String hostName = hostName();
-        int dotIdx = hostName.indexOf(".");
-        return dotIdx != -1 ? hostName.substring(0, dotIdx) : hostName;
+    public static String shortHostName() {
+        return ExternalProcess.commandOutput("hostname -s", (String[]) null).get(0);
+    }
+
+    public static String shortHostNameFromHostName(String fullHostName) {
+        return fullHostName.split("\\.")[0];
     }
 
     /**
-     * Compares a {@link String} containing a truncated host name with the truncated host name of
-     * the current system. If they match, "localhost" is returned, otherwise the caller-supplied
-     * host name is returned. If the system's host name cannot be determined, resulting in an
-     * {@link UnknownHostException}, the caller-supplied host name is returned.
+     * Compares a {@link String} containing a host name with the host name of the current system. If
+     * they match, "localhost" is returned, otherwise the short version of the caller-supplied host
+     * name is returned. If the system's host name cannot be determined, resulting in an
+     * {@link UnknownHostException}, the short version of the caller-supplied host name is returned.
      */
     public static String callerHostNameOrLocalhost(String callerHostName) {
         checkNotNull(callerHostName, "caller host name");
-        try {
-            return callerHostName.equals(truncatedHostName()) ? "localhost" : callerHostName;
-        } catch (UnknownHostException e) {
-            return callerHostName;
-        }
+        return callerHostName.equals(hostName()) ? "localhost"
+            : shortHostNameFromHostName(callerHostName);
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/IntegerFormatter.java b/src/main/java/gov/nasa/ziggy/util/IntegerFormatter.java
index 6d75f59..f2c744f 100644
--- a/src/main/java/gov/nasa/ziggy/util/IntegerFormatter.java
+++ b/src/main/java/gov/nasa/ziggy/util/IntegerFormatter.java
@@ -46,5 +46,4 @@ public static String engineeringNotation(long value) {
         }
         return valueInEngineeringNotation;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/Iso8601Formatter.java b/src/main/java/gov/nasa/ziggy/util/Iso8601Formatter.java
index 2260a67..e7a82f1 100644
--- a/src/main/java/gov/nasa/ziggy/util/Iso8601Formatter.java
+++ b/src/main/java/gov/nasa/ziggy/util/Iso8601Formatter.java
@@ -28,6 +28,13 @@ public final class Iso8601Formatter {
     /** The {@link SimpleDateFormat} format string for a date-only formatter. */
     private static final String DATE_FORMAT_STRING = "yyyy-MM-dd";
 
+    /**
+     * The {@link SimpleDateFormat} format string for a combined date/time formatter with a space
+     * separator. This is similar to {@link Date#toString()}, but without the milliseconds. The
+     * space separator is not permitted in ISO 8601, but it is tolerated in RFC 3339.
+     */
+    private static final String JAVA_DATE_SANS_MILLIS_FORMAT_STRING = "yyyy-MM-dd HH:mm:ss";
+
     /**
      * The {@link SimpleDateFormat} format string for a combined date/time formatter.
      */
@@ -75,7 +82,6 @@ private static DateFormat createDateFormatter(String format, TimeZone timeZone)
         dateFormatter.setTimeZone(timeZone);
         formatters.put(format, dateFormatter);
         return dateFormatter;
-
     }
 
     /**
@@ -118,4 +124,14 @@ public static DateFormat dateTimeLocalFormatter() {
         return createLocalDateFormatter(DATE_TIME_LOCAL_NOSEP_STRING);
     }
 
+    /**
+     * Returns a new instance of a Java Date-like combined date/time formatter that displays time in
+     * the local time zone without milliseconds. The returned formatter should only be used in a
+     * single thread.
+     *
+     * @return a date/time formatter.
+     */
+    public static DateFormat javaDateTimeSansMillisLocalFormatter() {
+        return createLocalDateFormatter(JAVA_DATE_SANS_MILLIS_FORMAT_STRING);
+    }
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/RegexBackslashManager.java b/src/main/java/gov/nasa/ziggy/util/RegexBackslashManager.java
index 8d3c67d..89522cc 100644
--- a/src/main/java/gov/nasa/ziggy/util/RegexBackslashManager.java
+++ b/src/main/java/gov/nasa/ziggy/util/RegexBackslashManager.java
@@ -36,14 +36,13 @@ public static String toDoubleBackslash(String stringWithSingleBackslash) {
     public static class XmlRegexAdapter extends XmlAdapter<String, String> {
 
         @Override
-        public String unmarshal(String xmlString) throws Exception {
+        public String unmarshal(String xmlString) {
             return toSingleBackslash(xmlString);
         }
 
         @Override
-        public String marshal(String javaString) throws Exception {
+        public String marshal(String javaString) {
             return toDoubleBackslash(javaString);
         }
-
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/RegexEditor.java b/src/main/java/gov/nasa/ziggy/util/RegexEditor.java
index b9ddd51..f479f84 100644
--- a/src/main/java/gov/nasa/ziggy/util/RegexEditor.java
+++ b/src/main/java/gov/nasa/ziggy/util/RegexEditor.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -15,6 +16,7 @@
 import org.apache.commons.io.filefilter.IOFileFilter;
 
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Regular expression processing of text and text files.
@@ -75,85 +77,100 @@ public static String findAndReplaceText(String input, Pattern pattern, FindActio
         return output;
     }
 
-    public static File findAndReplace(File file, Pattern pattern) throws IOException {
+    public static File findAndReplace(File file, Pattern pattern) {
         return findAndReplace(file, pattern, null);
     }
 
-    public static File findAndReplace(File file, Pattern pattern, File directory)
-        throws IOException {
+    public static File findAndReplace(File file, Pattern pattern, File directory) {
         return findAndReplace(file, pattern, new ExtractCaptureGroups(), directory);
     }
 
-    public static File findAndReplace(File file, Pattern pattern, FindAction action, File directory)
-        throws IOException {
-        File tmpFile = File.createTempFile(FilenameUtils.getBaseName(file.toString()),
-            FilenameUtils.getExtension(file.toString()), directory);
-        if (pattern != null) {
-            LineIterator lines = FileUtils.lineIterator(file);
-            List<String> output = new ArrayList<>();
-            if (lines != null) {
-                while (lines.hasNext()) {
-                    String line = lines.nextLine();
-                    Matcher matcher = pattern.matcher(line);
-                    if (matcher.find()) {
-                        line = action.update(matcher);
-                    }
-                    if (line != null) {
-                        output.add(line);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static File findAndReplace(File file, Pattern pattern, FindAction action,
+        File directory) {
+        try {
+            File tmpFile = File.createTempFile(FilenameUtils.getBaseName(file.toString()),
+                FilenameUtils.getExtension(file.toString()), directory);
+            if (pattern != null) {
+                LineIterator lines = FileUtils.lineIterator(file);
+                List<String> output = new ArrayList<>();
+                if (lines != null) {
+                    while (lines.hasNext()) {
+                        String line = lines.nextLine();
+                        Matcher matcher = pattern.matcher(line);
+                        if (matcher.find()) {
+                            line = action.update(matcher);
+                        }
+                        if (line != null) {
+                            output.add(line);
+                        }
                     }
                 }
+                FileUtils.writeLines(tmpFile, output);
+            } else {
+                FileUtils.copyFile(file, tmpFile, true);
             }
-            FileUtils.writeLines(tmpFile, output);
-        } else {
-            FileUtils.copyFile(file, tmpFile, true);
+            return tmpFile;
+        } catch (IOException e) {
+            throw new UncheckedIOException("Find and replace failed in file " + file.toString(), e);
         }
-        return tmpFile;
     }
 
-    public static File findAndReplaceAll(File sourceDir, Pattern pattern, FindAction action)
-        throws IOException {
-        File output = null;
-        if (pattern != null) {
-            Collection<File> files = FileUtils.listFiles(sourceDir, null, false);
-            if (files != null) {
-                for (File file : files) {
-                    output = findAndReplace(file, pattern, action, null);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static File findAndReplaceAll(File sourceDir, Pattern pattern, FindAction action) {
+        try {
+            File output = null;
+            if (pattern != null) {
+                Collection<File> files = FileUtils.listFiles(sourceDir, null, false);
+                if (files != null) {
+                    for (File file : files) {
+                        output = findAndReplace(file, pattern, action, null);
+                    }
                 }
+            } else {
+                output = File.createTempFile(FilenameUtils.getBaseName(sourceDir.toString()), null);
+                FileUtils.forceMkdir(output);
+                FileUtils.copyDirectory(sourceDir, output);
             }
-        } else {
-            output = File.createTempFile(FilenameUtils.getBaseName(sourceDir.toString()), null);
-            FileUtils.forceMkdir(output);
-            FileUtils.copyDirectory(sourceDir, output);
+            return output;
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Find and replace all failed in dir " + sourceDir.toString(), e);
         }
-        return output;
     }
 
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public static File findAndReplace(File sourceDir, IOFileFilter[] filters, Pattern pattern,
-        FindAction action) throws IOException {
-        File output = null;
-        if (filters != null) {
-            output = new File(DirectoryProperties.tmpDir().toFile(),
-                FilenameUtils.getBaseName(sourceDir.toString()));
-            if (output.exists()) {
-                FileUtils.forceDelete(output);
-            }
-            FileUtils.forceMkdir(output);
-            for (IOFileFilter filter : filters) {
-                Collection<File> files = FileUtils.listFiles(sourceDir, filter,
-                    FileFilterUtils.directoryFileFilter());
-                if (files != null) {
-                    File outputFile = null;
-                    File buildTmp = DirectoryProperties.tmpDir().toFile();
-                    for (File file : files) {
-                        outputFile = findAndReplace(file, pattern, action, buildTmp);
-                        FileUtils.copyFile(outputFile, new File(output, file.getName()));
+        FindAction action) {
+        try {
+            File output = null;
+            if (filters != null) {
+                output = new File(DirectoryProperties.tmpDir().toFile(),
+                    FilenameUtils.getBaseName(sourceDir.toString()));
+                if (output.exists()) {
+                    FileUtils.forceDelete(output);
+                }
+                FileUtils.forceMkdir(output);
+                for (IOFileFilter filter : filters) {
+                    Collection<File> files = FileUtils.listFiles(sourceDir, filter,
+                        FileFilterUtils.directoryFileFilter());
+                    if (files != null) {
+                        File outputFile = null;
+                        File buildTmp = DirectoryProperties.tmpDir().toFile();
+                        for (File file : files) {
+                            outputFile = findAndReplace(file, pattern, action, buildTmp);
+                            FileUtils.copyFile(outputFile, new File(output, file.getName()));
+                        }
                     }
                 }
+            } else {
+                output = findAndReplaceAll(sourceDir, pattern, action);
             }
-        } else {
-            output = findAndReplaceAll(sourceDir, pattern, action);
+            return output;
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Find and replace failed in directory " + sourceDir.toString(), e);
         }
-        return output;
     }
 
     public static boolean stringEquals(String expectedInput, String actualInput, Pattern[] ignore) {
diff --git a/src/main/java/gov/nasa/ziggy/util/Requestor.java b/src/main/java/gov/nasa/ziggy/util/Requestor.java
new file mode 100644
index 0000000..f9eb38f
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/util/Requestor.java
@@ -0,0 +1,28 @@
+package gov.nasa.ziggy.util;
+
+import java.util.UUID;
+
+/**
+ * An object that makes a request and needs to identify the response (i.e., it needs to see whether
+ * the response was intended for it or for another {@link Requestor} instance. This is accomplished
+ * by providing a unique identifier, which is obtained by the {@link #requestorIdentifier()} method.
+ * The response will be another instance of {@link Requestor} that has the same identifier. This
+ * allows the {@link #isDestination(Requestor)} method to determine, er, whether this object is the
+ * intended destination.
+ * <p>
+ * Note that while the requestor identifier can be any {@link Object} of any class, each
+ * {@link Requestor} must have one. In use cases wherein the identifier is required to be unique, it
+ * is recommended that users implement {@link #requestorIdentifier()} with classes that are
+ * inherently and automatically unique, such as {@link UUID#randomUuid()}.
+ *
+ * @author PT
+ */
+public interface Requestor {
+
+    Object requestorIdentifier();
+
+    default boolean isDestination(Requestor requestor) {
+        return requestor == null || requestorIdentifier() == null ? false
+            : requestorIdentifier().equals(requestor.requestorIdentifier());
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/util/Retry.java b/src/main/java/gov/nasa/ziggy/util/Retry.java
deleted file mode 100644
index 7211f4e..0000000
--- a/src/main/java/gov/nasa/ziggy/util/Retry.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package gov.nasa.ziggy.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.metrics.CounterMetric;
-import gov.nasa.ziggy.metrics.IntervalMetric;
-import gov.nasa.ziggy.metrics.IntervalMetricKey;
-
-/**
- * This class provides retry logic for a specified {@link Retryable} object.
- * <p>
- * Assumes that the call method of the provided {@link Retryable} throws an {@link Exception} in the
- * case of a failure.
- *
- * @author Todd Klaus
- */
-public class Retry<V> {
-    private static final Logger log = LoggerFactory.getLogger(Retry.class);
-
-    private int maxRetries = -1; // default infinite
-    private long retryIntervalMillis = 5000;
-    private String metricPrefix = "Retry.";
-
-    public Retry() {
-    }
-
-    public Retry(int maxRetries) {
-        this.maxRetries = maxRetries;
-    }
-
-    public Retry(int maxRetries, long retryIntervalMillis) {
-        this.maxRetries = maxRetries;
-        this.retryIntervalMillis = retryIntervalMillis;
-    }
-
-    /**
-     * Execute up to maxRetries times
-     *
-     * @param r
-     */
-    public V execute(Retryable<V> r) throws Exception {
-        int currentRetry = 0;
-        Exception exception = null;
-
-        while (maxRetries == -1 || currentRetry <= maxRetries) {
-            log.info("retries: " + currentRetry + "/" + maxRetries);
-
-            CounterMetric.increment(metricPrefix + "execute.attemptCount");
-            exception = null;
-            IntervalMetricKey key = IntervalMetric.start();
-            try {
-                V result = r.call(currentRetry);
-                CounterMetric.increment(metricPrefix + "execute.successCount");
-                return result;
-            } catch (Exception e) {
-                log.warn("currentRetry=" + currentRetry + ", caught e=" + e);
-                CounterMetric.increment(metricPrefix + "execute.failureCount");
-
-                currentRetry++;
-                exception = e;
-                try {
-                    Thread.sleep(retryIntervalMillis);
-                } catch (InterruptedException ignore) {
-                }
-            } finally {
-                IntervalMetric.stop(metricPrefix + "execute.execTimeMillis", key);
-            }
-        }
-
-        if (exception != null) {
-            throw exception;
-        }
-        return null;
-    }
-
-    public String getMetricPrefix() {
-        return metricPrefix;
-    }
-
-    public void setMetricPrefix(String metricPrefix) {
-        this.metricPrefix = metricPrefix;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/util/Retryable.java b/src/main/java/gov/nasa/ziggy/util/Retryable.java
deleted file mode 100644
index 561f2cd..0000000
--- a/src/main/java/gov/nasa/ziggy/util/Retryable.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gov.nasa.ziggy.util;
-
-/**
- * @author Todd Klaus
- */
-public interface Retryable<V> {
-    /**
-     * Computes a result, or throws an exception if unable to do so.
-     *
-     * @return computed result
-     * @throws Exception if unable to compute a result
-     */
-    V call(int retryNumber) throws Exception;
-}
diff --git a/src/main/java/gov/nasa/ziggy/util/StringUtils.java b/src/main/java/gov/nasa/ziggy/util/StringUtils.java
index 2cfa807..97f6957 100644
--- a/src/main/java/gov/nasa/ziggy/util/StringUtils.java
+++ b/src/main/java/gov/nasa/ziggy/util/StringUtils.java
@@ -1,5 +1,8 @@
 package gov.nasa.ziggy.util;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -40,9 +43,7 @@ public class StringUtils {
      * @return
      */
     public static String[] convertStringArray(String input) {
-        if (input == null) {
-            throw new IllegalArgumentException("input cannot be null.");
-        }
+        checkNotNull(input, "input");
 
         log.debug("convertStringArray got " + input);
         StringTokenizer st = new StringTokenizer(input, ",");
@@ -61,9 +62,7 @@ public static String[] convertStringArray(String input) {
      * @return representation of input value in camel case
      */
     public static String constantToAcronym(String value) {
-        if (value == null) {
-            throw new IllegalArgumentException("value cannot be null.");
-        }
+        checkNotNull(value, "value");
 
         StringBuilder builder = new StringBuilder();
         int index = 0;
@@ -88,9 +87,7 @@ public static String constantToAcronym(String value) {
      * @return representation of input value in camel case
      */
     public static String constantToCamel(String value) {
-        if (value == null) {
-            throw new IllegalArgumentException("value cannot be null.");
-        }
+        checkNotNull(value, "value");
 
         Matcher matcher = CONSTANT_PART.matcher(value);
         StringBuffer buf = new StringBuffer();
@@ -121,9 +118,7 @@ public static String constantToCamel(String value) {
      * @return representation of input value in camel case with spaces.
      */
     public static String constantToCamelWithSpaces(String value) {
-        if (value == null) {
-            throw new IllegalArgumentException("value cannot be null.");
-        }
+        checkNotNull(value, "value");
 
         Matcher matcher = CONSTANT_PART.matcher(value);
         StringBuffer buf = new StringBuffer();
@@ -143,6 +138,34 @@ public static String constantToCamelWithSpaces(String value) {
         return buf.toString();
     }
 
+    /**
+     * Translate a constant field name to sentence case with spaces. For example, FOO_BAR becomes
+     * Foo bar.
+     *
+     * @param value the name of the constant field (uppercase and underscores)
+     * @return representation of input value in sentence case with spaces.
+     */
+    public static String constantToSentenceWithSpaces(String value) {
+        checkNotNull(value, "value");
+
+        Matcher matcher = CONSTANT_PART.matcher(value);
+        StringBuffer buf = new StringBuffer();
+        while (matcher.find()) {
+            if (buf.length() > 0) {
+                // All but the first are preceded by a space.
+                matcher.appendReplacement(buf,
+                    " " + matcher.group(1).toLowerCase() + matcher.group(2).toLowerCase());
+            } else {
+                // The first has no preceding space, but is otherwise the same.
+                matcher.appendReplacement(buf,
+                    matcher.group(1).toUpperCase() + matcher.group(2).toLowerCase());
+            }
+        }
+        matcher.appendTail(buf);
+
+        return buf.toString();
+    }
+
     /**
      * Translate a constant field name to a lowercase, hyphen-separated string (for example, FOO_BAR
      * -&#62; foo-bar). This is useful when converting enums values to command-line commands.
@@ -184,13 +207,8 @@ public static String elapsedTime(long startTime, long endTime) {
     }
 
     public static String elapsedTime(Date startTime, Date endTime) {
-        if (startTime == null) {
-            throw new IllegalArgumentException("startTime cannot be null.");
-        }
-
-        if (endTime == null) {
-            throw new IllegalArgumentException("endTime cannot be null.");
-        }
+        checkNotNull(startTime, "startTime");
+        checkNotNull(endTime, "startTime");
 
         return elapsedTime(startTime.getTime(), endTime.getTime());
     }
@@ -215,17 +233,12 @@ public static String pad(String s, int desiredLength) {
      * @return A string of length zero of more.
      */
     public static String toHexString(byte[] buf, int off, int len) {
-        if (buf == null) {
-            throw new NullPointerException("buf may not be null.");
-        }
-        if (off < 0) {
-            throw new IllegalArgumentException("off must be non-negative.");
-        }
-        if (len < 0) {
-            throw new IllegalArgumentException("len must be non-negative");
-        }
+        checkNotNull(buf, "buf");
+        checkArgument(off >= 0, "off must be non-negative");
+        checkArgument(len >= 0, "len must be non-negative");
+
         final int nbytes = buf.length - off;
-        if ((off > buf.length - 1) && (off == buf.length && nbytes != 0)) {
+        if (off > buf.length - 1 && off == buf.length && nbytes != 0) {
             throw new IllegalArgumentException("Offset is larger than array.");
         }
 
@@ -250,9 +263,8 @@ public static String toHexString(byte[] buf, int off, int len) {
      * @return If s null then the return value will be null.
      */
     public static String truncate(String s, int len) {
-        if (len < 0) {
-            throw new IllegalArgumentException("len must be non-negative");
-        }
+        checkArgument(len >= 0, "len must be non-negative");
+
         if (s == null) {
             return null;
         }
@@ -329,5 +341,4 @@ public static List<String> breakStringAtLineTerminations(String string) {
         String[] splitString = string.split(System.lineSeparator());
         return Arrays.asList(splitString);
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/TasksStates.java b/src/main/java/gov/nasa/ziggy/util/TasksStates.java
index 0a0c8a2..9f0e394 100644
--- a/src/main/java/gov/nasa/ziggy/util/TasksStates.java
+++ b/src/main/java/gov/nasa/ziggy/util/TasksStates.java
@@ -76,7 +76,6 @@ public void update(List<PipelineTask> tasks, Map<Long, ProcessingSummary> taskAt
         for (PipelineTask task : tasks) {
             String moduleName = task.getPipelineInstanceNode()
                 .getPipelineModuleDefinition()
-                .getName()
                 .getName();
 
             Summary s = moduleStates.get(moduleName);
diff --git a/src/main/java/gov/nasa/ziggy/util/TimeFormatter.java b/src/main/java/gov/nasa/ziggy/util/TimeFormatter.java
index 83fb31e..58806ce 100644
--- a/src/main/java/gov/nasa/ziggy/util/TimeFormatter.java
+++ b/src/main/java/gov/nasa/ziggy/util/TimeFormatter.java
@@ -50,5 +50,4 @@ public static String timeInSecondsToStringHhMmSs(int timeSeconds) {
     private static String twoDigitString(double value) {
         return String.format("%02d", (int) value);
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/TimeRange.java b/src/main/java/gov/nasa/ziggy/util/TimeRange.java
index 99c9554..bb5ff6e 100644
--- a/src/main/java/gov/nasa/ziggy/util/TimeRange.java
+++ b/src/main/java/gov/nasa/ziggy/util/TimeRange.java
@@ -36,12 +36,11 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         TimeRange other = (TimeRange) obj;
         return Objects.equals(endTimestamp, other.endTimestamp)
             && Objects.equals(startTimestamp, other.startTimestamp);
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/WrapperUtils.java b/src/main/java/gov/nasa/ziggy/util/WrapperUtils.java
new file mode 100644
index 0000000..72e6962
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/util/WrapperUtils.java
@@ -0,0 +1,45 @@
+package gov.nasa.ziggy.util;
+
+public class WrapperUtils {
+
+    public static final String WRAPPER_LIBRARY_PATH_PROP_NAME_PREFIX = "wrapper.java.library.path.";
+    public static final String WRAPPER_JAVA_ADDITIONAL_PROP_NAME_PREFIX = "wrapper.java.additional.";
+    public static final String WRAPPER_APP_PARAMETER_PROP_NAME_PREFIX = "wrapper.app.parameter.";
+    public static final String WRAPPER_CLASSPATH_PROP_NAME_PREFIX = "wrapper.java.classpath.";
+    public static final String WRAPPER_LOG_FILE_PROP_NAME = "wrapper.logfile";
+
+    /** Commands that the wrapper command accepts. */
+    public enum WrapperCommand {
+        START, STOP, STATUS;
+
+        @Override
+        public String toString() {
+            return name().toLowerCase();
+        }
+    }
+
+    /**
+     * Returns a wrapper parameter string such as wrapper.app.parameter=-Dfoo.
+     *
+     * @param wrapperPropName wrapper parameter
+     * @param value the value of the parameter
+     */
+    public static String wrapperParameter(String wrapperPropName, String value) {
+        StringBuilder s = new StringBuilder();
+        s.append(wrapperPropName).append("=").append(value);
+        return s.toString();
+    }
+
+    /**
+     * Returns a wrapper parameter string such as wrapper.app.parameter.1=-Dfoo.
+     *
+     * @param wrapperPropNamePrefix wrapper parameter prefix
+     * @param index counter to append to parameter prefix
+     * @param value the value of the parameter
+     */
+    public static String wrapperParameter(String wrapperPropNamePrefix, int index, String value) {
+        StringBuilder s = new StringBuilder();
+        s.append(wrapperPropNamePrefix).append(index).append("=").append(value);
+        return s.toString();
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/util/ZiggyBuild.java b/src/main/java/gov/nasa/ziggy/util/ZiggyBuild.java
deleted file mode 100644
index 206725a..0000000
--- a/src/main/java/gov/nasa/ziggy/util/ZiggyBuild.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package gov.nasa.ziggy.util;
-
-import java.text.SimpleDateFormat;
-
-import org.slf4j.Logger;
-
-/**
- * Provides information gathered from the build environment.
- *
- * @author Miles Cote
- */
-public class ZiggyBuild {
-    private static final SimpleDateFormat READABLE_LOCAL_FORMAT = new SimpleDateFormat(
-        "yyyy-MM-dd--HH.mm.ss");
-
-    public static final String getId() {
-        synchronized (READABLE_LOCAL_FORMAT) {
-            return ZiggyVersion.getSoftwareVersion() + "--"
-                + READABLE_LOCAL_FORMAT.format(ZiggyVersion.getBuildDate());
-        }
-    }
-
-    public static void logVersionInfo(Logger log) {
-        log.info("Software Version: " + ZiggyVersion.getSoftwareVersion());
-        log.info("  Branch: " + ZiggyVersion.getBranch());
-        log.info("  Revision: " + ZiggyVersion.getRevision());
-        log.info("  Build Date: " + ZiggyVersion.getBuildDate());
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/util/ZiggyShutdownHook.java b/src/main/java/gov/nasa/ziggy/util/ZiggyShutdownHook.java
index 4ca3b76..d58be53 100644
--- a/src/main/java/gov/nasa/ziggy/util/ZiggyShutdownHook.java
+++ b/src/main/java/gov/nasa/ziggy/util/ZiggyShutdownHook.java
@@ -52,9 +52,7 @@ public static void addShutdownHook(Runnable shutdownHookRunnable) {
     public static void blockIfShuttingDown() {
         if (shutdownInProgress()) {
             while (true) {
-
             }
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/ZiggyVersionCli.java b/src/main/java/gov/nasa/ziggy/util/ZiggyVersionCli.java
deleted file mode 100644
index aabd7af..0000000
--- a/src/main/java/gov/nasa/ziggy/util/ZiggyVersionCli.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the National
- * Aeronautics and Space Administration. All Rights Reserved.
- *
- * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
- * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
- * 80NSSC18M0068 & 80NSSC21M0079.
- *
- * This file is available under the terms of the NASA Open Source Agreement (NOSA). You should have
- * received a copy of this agreement with the Ziggy source code; see the file LICENSE.pdf.
- *
- * Disclaimers
- *
- * No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY KIND, EITHER
- * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SUBJECT
- * SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL BE
- * ERROR FREE, OR ANY WARRANTY THAT DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT
- * SOFTWARE. THIS AGREEMENT DOES NOT, IN ANY MANNER, CONSTITUTE AN ENDORSEMENT BY GOVERNMENT AGENCY
- * OR ANY PRIOR RECIPIENT OF ANY RESULTS, RESULTING DESIGNS, HARDWARE, SOFTWARE PRODUCTS OR ANY
- * OTHER APPLICATIONS RESULTING FROM USE OF THE SUBJECT SOFTWARE. FURTHER, GOVERNMENT AGENCY
- * DISCLAIMS ALL WARRANTIES AND LIABILITIES REGARDING THIRD-PARTY SOFTWARE, IF PRESENT IN THE
- * ORIGINAL SOFTWARE, AND DISTRIBUTES IT "AS IS."
- *
- * Waiver and Indemnity: RECIPIENT AGREES TO WAIVE ANY AND ALL CLAIMS AGAINST THE UNITED STATES
- * GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT. IF RECIPIENT'S
- * USE OF THE SUBJECT SOFTWARE RESULTS IN ANY LIABILITIES, DEMANDS, DAMAGES, EXPENSES OR LOSSES
- * ARISING FROM SUCH USE, INCLUDING ANY DAMAGES FROM PRODUCTS BASED ON, OR RESULTING FROM,
- * RECIPIENT'S USE OF THE SUBJECT SOFTWARE, RECIPIENT SHALL INDEMNIFY AND HOLD HARMLESS THE UNITED
- * STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT, TO THE
- * EXTENT PERMITTED BY LAW. RECIPIENT'S SOLE REMEDY FOR ANY SUCH MATTER SHALL BE THE IMMEDIATE,
- * UNILATERAL TERMINATION OF THIS AGREEMENT.
- */
-
-package gov.nasa.ziggy.util;
-
-public class ZiggyVersionCli {
-
-    public static void main(String[] args) {
-        System.out.println("   Version: " + ZiggyVersion.getSoftwareVersion());
-        System.out.println("    Branch: " + ZiggyVersion.getBranch());
-        System.out.println("  Revision: " + ZiggyVersion.getRevision());
-        System.out.println("Build Date: " + ZiggyVersion.getBuildDate());
-
-        if (ZiggyVersion.isRelease()) {
-            System.out.println("This is a release build.");
-        } else {
-            System.out.println("This is not a release build.");
-        }
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/util/dispmod/AlertLogDisplayModel.java b/src/main/java/gov/nasa/ziggy/util/dispmod/AlertLogDisplayModel.java
index ccb9839..6f1cf6c 100644
--- a/src/main/java/gov/nasa/ziggy/util/dispmod/AlertLogDisplayModel.java
+++ b/src/main/java/gov/nasa/ziggy/util/dispmod/AlertLogDisplayModel.java
@@ -30,18 +30,13 @@ public void update(List<AlertLog> alerts) {
     public Object getValueAt(int rowIndex, int columnIndex) {
         Alert alert = alerts.get(rowIndex).getAlertData();
 
-        switch (columnIndex) {
-            case 0:
-                return alert.getSourceComponent();
-            case 1:
-                return alert.getSourceTaskId();
-            case 2:
-                return alert.getSeverity();
-            case 3:
-                return alert.getMessage();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
+        return switch (columnIndex) {
+            case 0 -> alert.getSourceComponent();
+            case 1 -> alert.getSourceTaskId();
+            case 2 -> alert.getSeverity();
+            case 3 -> alert.getMessage();
+            default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+        };
     }
 
     @Override
@@ -56,17 +51,12 @@ public int getRowCount() {
 
     @Override
     public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Source";
-            case 1:
-                return "Task";
-            case 2:
-                return "Severity";
-            case 3:
-                return "Message";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
+        return switch (column) {
+            case 0 -> "Source";
+            case 1 -> "Task";
+            case 2 -> "Severity";
+            case 3 -> "Message";
+            default -> throw new IllegalArgumentException("Unexpected value: " + column);
+        };
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/dispmod/InstanceModulesDisplayModel.java b/src/main/java/gov/nasa/ziggy/util/dispmod/InstanceModulesDisplayModel.java
deleted file mode 100644
index 74dccfb..0000000
--- a/src/main/java/gov/nasa/ziggy/util/dispmod/InstanceModulesDisplayModel.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package gov.nasa.ziggy.util.dispmod;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
-
-/**
- * @author Todd Klaus
- */
-public class InstanceModulesDisplayModel extends DisplayModel {
-    private List<PipelineInstanceNode> pipelineInstanceNodes = new LinkedList<>();
-
-    public InstanceModulesDisplayModel(List<PipelineInstanceNode> pipelineInstanceNodes) {
-        this.pipelineInstanceNodes = pipelineInstanceNodes;
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 5; // name, nTasks, nSub, nComp, nFailed
-    }
-
-    @Override
-    public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Name";
-            case 1:
-                return "nTasks";
-            case 2:
-                return "nSubmit";
-            case 3:
-                return "nComplt";
-            case 4:
-                return "nFailed";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
-    }
-
-    @Override
-    public int getRowCount() {
-        return pipelineInstanceNodes.size();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        PipelineInstanceNode node = pipelineInstanceNodes.get(rowIndex);
-
-        switch (columnIndex) {
-            case 0:
-                return node.getPipelineDefinitionNode().getModuleName();
-            case 1:
-                return node.getNumTasks();
-            case 2:
-                return node.getNumSubmittedTasks();
-            case 3:
-                return node.getNumCompletedTasks();
-            case 4:
-                return node.getNumFailedTasks();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/util/dispmod/InstancesDisplayModel.java b/src/main/java/gov/nasa/ziggy/util/dispmod/InstancesDisplayModel.java
index d7da1b7..a634675 100644
--- a/src/main/java/gov/nasa/ziggy/util/dispmod/InstancesDisplayModel.java
+++ b/src/main/java/gov/nasa/ziggy/util/dispmod/InstancesDisplayModel.java
@@ -48,34 +48,24 @@ public PipelineInstance getInstanceAt(int rowIndex) {
     public Object getValueAt(int rowIndex, int columnIndex) {
         PipelineInstance instance = instances.get(rowIndex);
 
-        switch (columnIndex) {
-            case 0:
-                return instance.getId();
-            case 1:
-                return instance.getPipelineDefinition().getName() + ": " + instance.getName();
-            case 2:
-                return getStateString(instance.getState());
-            case 3:
-                return instance.elapsedTime();
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
+        return switch (columnIndex) {
+            case 0 -> instance.getId();
+            case 1 -> instance.getPipelineDefinition().getName() + ": " + instance.getName();
+            case 2 -> getStateString(instance.getState());
+            case 3 -> instance.elapsedTime();
+            default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+        };
     }
 
     @Override
     public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "ID";
-            case 1:
-                return "Pipeline Name";
-            case 2:
-                return "State";
-            case 3:
-                return "P-time";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
+        return switch (column) {
+            case 0 -> "ID";
+            case 1 -> "Pipeline Name";
+            case 2 -> "State";
+            case 3 -> "P-time";
+            default -> throw new IllegalArgumentException("Unexpected value: " + column);
+        };
     }
 
     private String getStateString(PipelineInstance.State state) {
diff --git a/src/main/java/gov/nasa/ziggy/util/dispmod/PipelineStatsDisplayModel.java b/src/main/java/gov/nasa/ziggy/util/dispmod/PipelineStatsDisplayModel.java
index 5b0bb14..e08b02c 100644
--- a/src/main/java/gov/nasa/ziggy/util/dispmod/PipelineStatsDisplayModel.java
+++ b/src/main/java/gov/nasa/ziggy/util/dispmod/PipelineStatsDisplayModel.java
@@ -9,7 +9,9 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask.State;
+import gov.nasa.ziggy.ui.util.models.TableModelContentClass;
 import gov.nasa.ziggy.util.TaskProcessingTimeStats;
+import gov.nasa.ziggy.util.dispmod.PipelineStatsDisplayModel.ProcessingStatistics;
 
 /**
  * Aggregates and displays stats for processing times for the {@link PipelineTask}s that make up the
@@ -19,7 +21,12 @@
  *
  * @author Todd Klaus
  */
-public class PipelineStatsDisplayModel extends DisplayModel {
+public class PipelineStatsDisplayModel extends DisplayModel
+    implements TableModelContentClass<ProcessingStatistics> {
+
+    private static final String[] COLUMN_NAMES = { "Module", "State", "Count", "Sum (hrs)",
+        "Min (hrs)", "Max (hrs)", "Mean (hrs)", "Std (hrs)", "Start", "End", "Elapsed (hrs)" };
+
     private List<ProcessingStatistics> stats = new LinkedList<>();
 
     public PipelineStatsDisplayModel(List<PipelineTask> tasks, List<String> orderedModuleNames) {
@@ -77,7 +84,7 @@ public int getRowCount() {
 
     @Override
     public int getColumnCount() {
-        return 11;
+        return COLUMN_NAMES.length;
     }
 
     @Override
@@ -85,65 +92,33 @@ public Object getValueAt(int rowIndex, int columnIndex) {
         ProcessingStatistics statsForTaskType = stats.get(rowIndex);
         TaskProcessingTimeStats s = statsForTaskType.getProcessingStats();
 
-        switch (columnIndex) {
-            case 0:
-                return statsForTaskType.getModuleName();
-            case 1:
-                return statsForTaskType.getState();
-            case 2:
-                return s.getCount();
-            case 3:
-                return formatDouble(s.getSum());
-            case 4:
-                return formatDouble(s.getMin());
-            case 5:
-                return formatDouble(s.getMax());
-            case 6:
-                return formatDouble(s.getMean());
-            case 7:
-                return formatDouble(s.getStddev());
-            case 8:
-                return formatDate(s.getMinStart());
-            case 9:
-                return formatDate(s.getMaxEnd());
-            case 10:
-                return formatDouble(s.getTotalElapsed());
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + columnIndex);
-        }
+        return switch (columnIndex) {
+            case 0 -> statsForTaskType.getModuleName();
+            case 1 -> statsForTaskType.getState();
+            case 2 -> s.getCount();
+            case 3 -> formatDouble(s.getSum());
+            case 4 -> formatDouble(s.getMin());
+            case 5 -> formatDouble(s.getMax());
+            case 6 -> formatDouble(s.getMean());
+            case 7 -> formatDouble(s.getStddev());
+            case 8 -> formatDate(s.getMinStart());
+            case 9 -> formatDate(s.getMaxEnd());
+            case 10 -> formatDouble(s.getTotalElapsed());
+            default -> throw new IllegalArgumentException("Unexpected value: " + columnIndex);
+        };
     }
 
     @Override
     public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Module";
-            case 1:
-                return "State";
-            case 2:
-                return "Count";
-            case 3:
-                return "Sum (hrs)";
-            case 4:
-                return "Min (hrs)";
-            case 5:
-                return "Max (hrs)";
-            case 6:
-                return "Mean (hrs)";
-            case 7:
-                return "Std (hrs)";
-            case 8:
-                return "Start";
-            case 9:
-                return "End";
-            case 10:
-                return "Elapsed (hrs)";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
+        return COLUMN_NAMES[column];
+    }
+
+    @Override
+    public Class<ProcessingStatistics> tableModelContentClass() {
+        return ProcessingStatistics.class;
     }
 
-    private static class ProcessingStatistics {
+    public static class ProcessingStatistics {
 
         private final String moduleName;
         private final State state;
@@ -178,7 +153,7 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if ((obj == null) || (getClass() != obj.getClass())) {
+            if (obj == null || getClass() != obj.getClass()) {
                 return false;
             }
             ProcessingStatistics other = (ProcessingStatistics) obj;
diff --git a/src/main/java/gov/nasa/ziggy/util/dispmod/TaskMetricsDisplayModel.java b/src/main/java/gov/nasa/ziggy/util/dispmod/TaskMetricsDisplayModel.java
index c23b922..79a874c 100644
--- a/src/main/java/gov/nasa/ziggy/util/dispmod/TaskMetricsDisplayModel.java
+++ b/src/main/java/gov/nasa/ziggy/util/dispmod/TaskMetricsDisplayModel.java
@@ -9,8 +9,6 @@
 import java.util.Set;
 
 import org.apache.commons.lang3.time.DurationFormatUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import gov.nasa.ziggy.metrics.TaskMetrics;
 import gov.nasa.ziggy.metrics.TimeAndPercentile;
@@ -26,10 +24,7 @@
  * @author Todd Klaus
  */
 public class TaskMetricsDisplayModel extends DisplayModel {
-    @SuppressWarnings("unused")
-    private static final Logger log = LoggerFactory.getLogger(TaskMetricsDisplayModel.class);
 
-    /* List<Pair<moduleName,taskMetrics>> */
     private List<ModuleTaskMetrics> categorySummariesByModule = new LinkedList<>();
     private List<String> seenCategories = new ArrayList<>();
     private int numColumns = 0;
@@ -99,11 +94,11 @@ public String getColumnName(int column) {
         }
         if (column == 1) {
             return "Total";
-        } else if (column == numColumns - 1) {
+        }
+        if (column == numColumns - 1) {
             return "Other";
-        } else {
-            return seenCategories.get(column - 2);
         }
+        return seenCategories.get(column - 2);
     }
 
     @Override
@@ -120,15 +115,13 @@ public Object getValueAt(int rowIndex, int columnIndex) {
         }
         if (columnIndex == 1) {
             return formatDuration(row.getTaskMetrics().getTotalProcessingTimeMillis()); // total
-        } else if (columnIndex == numColumns - 1) {
+        }
+        if (columnIndex == numColumns - 1) {
             return categoryValuesString(row.getTaskMetrics().getUnallocatedTime());
-        } else {
-            String category = seenCategories.get(columnIndex - 2);
-            TimeAndPercentile categoryValues = row.getTaskMetrics()
-                .getCategoryMetrics()
-                .get(category);
-            return categoryValuesString(categoryValues);
         }
+        String category = seenCategories.get(columnIndex - 2);
+        TimeAndPercentile categoryValues = row.getTaskMetrics().getCategoryMetrics().get(category);
+        return categoryValuesString(categoryValues);
     }
 
     private String categoryValuesString(TimeAndPercentile categoryValues) {
@@ -146,7 +139,7 @@ private String formatDuration(long durationMillis) {
             : Long.toString(durationMillis / 1000);
     }
 
-    private static class ModuleTaskMetrics {
+    public static class ModuleTaskMetrics {
 
         private final String moduleName;
         private final TaskMetrics taskMetrics;
@@ -174,7 +167,7 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if ((obj == null) || (getClass() != obj.getClass())) {
+            if (obj == null || getClass() != obj.getClass()) {
                 return false;
             }
             ModuleTaskMetrics other = (ModuleTaskMetrics) obj;
diff --git a/src/main/java/gov/nasa/ziggy/util/dispmod/TaskSummaryDisplayModel.java b/src/main/java/gov/nasa/ziggy/util/dispmod/TaskSummaryDisplayModel.java
index 12a05db..9d35ad6 100644
--- a/src/main/java/gov/nasa/ziggy/util/dispmod/TaskSummaryDisplayModel.java
+++ b/src/main/java/gov/nasa/ziggy/util/dispmod/TaskSummaryDisplayModel.java
@@ -1,6 +1,7 @@
 package gov.nasa.ziggy.util.dispmod;
 
 import gov.nasa.ziggy.util.TasksStates;
+import gov.nasa.ziggy.util.TasksStates.Summary;
 
 /**
  * {@link DisplayModel} for the pipeline task summary. This class is used to format the pipeline
@@ -9,7 +10,10 @@
  * @author Todd Klaus
  */
 public class TaskSummaryDisplayModel extends DisplayModel {
-    private static final int NUM_COLUMNS = 6;
+
+    private static final String[] COLUMN_NAMES = { "Module", "Submitted", "Processing", "Completed",
+        "Failed", "Subtasks" };
+
     private TasksStates taskStates = new TasksStates();
 
     public TaskSummaryDisplayModel() {
@@ -79,27 +83,16 @@ public Object getValueAt(int rowIndex, int columnIndex) {
 
     @Override
     public int getColumnCount() {
-        return NUM_COLUMNS;
+        return COLUMN_NAMES.length;
+    }
+
+    public Summary getContentAtRow(int row) {
+        return taskStates.getModuleStates().get(taskStates.getModuleNames().get(row));
     }
 
     @Override
     public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "Module";
-            case 1:
-                return "Submitted";
-            case 2:
-                return "Processing";
-            case 3:
-                return "Completed";
-            case 4:
-                return "Failed";
-            case 5:
-                return "SubTasks";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
+        return COLUMN_NAMES[column];
     }
 
     @Override
diff --git a/src/main/java/gov/nasa/ziggy/util/dispmod/TasksDisplayModel.java b/src/main/java/gov/nasa/ziggy/util/dispmod/TasksDisplayModel.java
index ac7533e..6d6fa1b 100644
--- a/src/main/java/gov/nasa/ziggy/util/dispmod/TasksDisplayModel.java
+++ b/src/main/java/gov/nasa/ziggy/util/dispmod/TasksDisplayModel.java
@@ -6,9 +6,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask.ProcessingSummary;
 import gov.nasa.ziggy.util.TasksStates;
@@ -20,7 +17,6 @@
  * @author Todd Klaus
  */
 public class TasksDisplayModel extends DisplayModel {
-    private static final Logger log = LoggerFactory.getLogger(TasksDisplayModel.class);
     private static final int NUM_COLUMNS = 7;
 
     private List<PipelineTask> tasks = new LinkedList<>();
@@ -75,14 +71,9 @@ public Object getValueAt(int rowIndex, int columnIndex) {
             case 0:
                 return task.getId();
             case 1:
-                return task.getPipelineInstanceNode().getPipelineModuleDefinition().toString();
+                return task.getPipelineInstanceNode().getPipelineModuleDefinition().getName();
             case 2:
-                try {
-                    return task.uowTaskInstance().briefState();
-                } catch (Exception e) {
-                    log.error("Exception while getting unit of work", e);
-                    return "Excepton.";
-                }
+                return task.uowTaskInstance().briefState();
             case 3:
                 return task.getState();
             case 4:
@@ -103,24 +94,16 @@ public Object getValueAt(int rowIndex, int columnIndex) {
 
     @Override
     public String getColumnName(int column) {
-        switch (column) {
-            case 0:
-                return "ID";
-            case 1:
-                return "Module";
-            case 2:
-                return "UOW";
-            case 3:
-                return "State";
-            case 4:
-                return "Worker";
-            case 5:
-                return "P-time";
-            case 6:
-                return "P-state";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + column);
-        }
+        return switch (column) {
+            case 0 -> "ID";
+            case 1 -> "Module";
+            case 2 -> "UOW";
+            case 3 -> "State";
+            case 4 -> "Worker";
+            case 5 -> "P-time";
+            case 6 -> "P-state";
+            default -> throw new IllegalArgumentException("Unexpected value: " + column);
+        };
     }
 
     public TasksStates getTaskStates() {
diff --git a/src/main/java/gov/nasa/ziggy/util/io/FileUtil.java b/src/main/java/gov/nasa/ziggy/util/io/FileUtil.java
index b8af79c..f594936 100644
--- a/src/main/java/gov/nasa/ziggy/util/io/FileUtil.java
+++ b/src/main/java/gov/nasa/ziggy/util/io/FileUtil.java
@@ -3,6 +3,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.DirectoryStream;
@@ -26,6 +27,8 @@
 import com.google.common.collect.ImmutableSet;
 
 import gov.nasa.ziggy.data.management.DataFileManager;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 
 /**
  * Some handy methods for dealing with files or groups of files.
@@ -53,9 +56,8 @@ public class FileUtil {
      * {@link #FILE_READONLY_PERMISSIONS}.
      *
      * @param top root of directory tree.
-     * @throws IOException
      */
-    public static void writeProtectDirectoryTree(Path top) throws IOException {
+    public static void writeProtectDirectoryTree(Path top) {
         setPosixPermissionsRecursively(top, FILE_READONLY_PERMISSIONS, DIR_READONLY_PERMISSIONS);
     }
 
@@ -65,9 +67,8 @@ public static void writeProtectDirectoryTree(Path top) throws IOException {
      * {@link #FILE_OVERWRITE_PERMISSIONS}.
      *
      * @param top root of directory tree.
-     * @throws IOException
      */
-    public static void prepareDirectoryTreeForOverwrites(Path top) throws IOException {
+    public static void prepareDirectoryTreeForOverwrites(Path top) {
         setPosixPermissionsRecursively(top, FILE_OVERWRITE_PERMISSIONS, DIR_OVERWRITE_PERMISSIONS);
     }
 
@@ -81,32 +82,49 @@ public static void prepareDirectoryTreeForOverwrites(Path top) throws IOExceptio
      * @param dirPermissions POSIX-style string of permissions for regular files (i.e.,
      * "rwxr-xr-x").
      */
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public static void setPosixPermissionsRecursively(Path top, String filePermissions,
-        String dirPermissions) throws IOException {
-        if (!Files.isDirectory(top)) {
-            Files.setPosixFilePermissions(top, PosixFilePermissions.fromString(filePermissions));
-        } else {
-            Files.setPosixFilePermissions(top, PosixFilePermissions.fromString(dirPermissions));
-            Files.walkFileTree(top, new SimpleFileVisitor<Path>() {
-                @Override
-                public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-                    throws IOException {
-                    Files.setPosixFilePermissions(dir,
-                        PosixFilePermissions.fromString(dirPermissions));
-                    return FileVisitResult.CONTINUE;
-                }
+        String dirPermissions) {
+        try {
+            if (!Files.isDirectory(top)) {
+                Files.setPosixFilePermissions(top,
+                    PosixFilePermissions.fromString(filePermissions));
+            } else {
+                Files.setPosixFilePermissions(top, PosixFilePermissions.fromString(dirPermissions));
+                Files.walkFileTree(top, new SimpleFileVisitor<Path>() {
+
+                    @Override
+                    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+                    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+                        try {
+                            Files.setPosixFilePermissions(dir,
+                                PosixFilePermissions.fromString(dirPermissions));
+                        } catch (IOException e) {
+                            throw new UncheckedIOException(
+                                "Failed to set permissions on dir " + dir.toString(), e);
+                        }
+                        return FileVisitResult.CONTINUE;
+                    }
 
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-                    throws IOException {
-                    if (Files.isSymbolicLink(file)) {
+                    @Override
+                    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+                        if (Files.isSymbolicLink(file)) {
+                            return FileVisitResult.CONTINUE;
+                        }
+                        try {
+                            Files.setPosixFilePermissions(file,
+                                PosixFilePermissions.fromString(filePermissions));
+                        } catch (IOException e) {
+                            throw new UncheckedIOException(
+                                "Failed to set permissions on file " + file.toString(), e);
+                        }
                         return FileVisitResult.CONTINUE;
                     }
-                    Files.setPosixFilePermissions(file,
-                        PosixFilePermissions.fromString(filePermissions));
-                    return FileVisitResult.CONTINUE;
-                }
-            });
+                });
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException("Failed to set permissions on dir " + top.toString(), e);
         }
     }
 
@@ -126,51 +144,54 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
      * words: if directory /bar is a link to directory /foo, and directory /foo contains real file
      * baz, the map will contain /bar/baz as the key AND /bar/baz as the value, rather than /foo/baz
      * as the value.
-     *
-     * @throws IOException
      */
-    public static Map<Path, Path> regularFilesInDirTree(Path rootDir) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static Map<Path, Path> regularFilesInDirTree(Path rootDir) {
 
         Map<Path, Path> regularFiles = new HashMap<>();
+        try {
+            // Walk the file tree.
+            Files.walkFileTree(rootDir, ImmutableSet.of(FileVisitOption.FOLLOW_LINKS),
+                Integer.MAX_VALUE, new FileVisitor<Path>() {
 
-        // Walk the file tree.
-        Files.walkFileTree(rootDir, ImmutableSet.of(FileVisitOption.FOLLOW_LINKS),
-            Integer.MAX_VALUE, new FileVisitor<Path>() {
-
-                @Override
-                public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-                    throws IOException {
-                    return FileVisitResult.CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-                    throws IOException {
-
-                    // Add the file and its real source to the map.
-                    Path realFile = DataFileManager.realSourceFile(file);
-                    if (Files.isDirectory(realFile) || Files.isHidden(file)) {
+                    @Override
+                    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
                         return FileVisitResult.CONTINUE;
                     }
-                    regularFiles.put(rootDir.relativize(file), realFile.toAbsolutePath());
-                    return FileVisitResult.CONTINUE;
-                }
 
-                @Override
-                public FileVisitResult visitFileFailed(Path file, IOException exc)
-                    throws IOException {
-                    log.error("Unable to visit file " + file + " for checksum purposes.", exc);
-                    return FileVisitResult.CONTINUE;
-                }
+                    @Override
+                    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+
+                        // Add the file and its real source to the map.
+                        try {
+                            Path realFile = DataFileManager.realSourceFile(file);
+                            if (Files.isDirectory(realFile) || Files.isHidden(file)) {
+                                return FileVisitResult.CONTINUE;
+                            }
+                            regularFiles.put(rootDir.relativize(file), realFile.toAbsolutePath());
+                            return FileVisitResult.CONTINUE;
+                        } catch (IOException e) {
+                            throw new UncheckedIOException(
+                                "Unable to test whether file " + file.toString() + " is hidden", e);
+                        }
+                    }
 
-                @Override
-                public FileVisitResult postVisitDirectory(Path dir, IOException exc)
-                    throws IOException {
-                    return FileVisitResult.CONTINUE;
-                }
-            });
+                    @Override
+                    public FileVisitResult visitFileFailed(Path file, IOException exc) {
+                        log.error("Unable to visit file " + file + " for checksum purposes.", exc);
+                        return FileVisitResult.CONTINUE;
+                    }
 
-        return regularFiles;
+                    @Override
+                    public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
+                        return FileVisitResult.CONTINUE;
+                    }
+                });
+            return regularFiles;
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to walk file tree  " + rootDir.toString(), e);
+        }
     }
 
     /**
@@ -178,12 +199,16 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc)
      *
      * @param bldr
      * @param in
-     * @throws IOException
      */
-    public static void readAll(Appendable bldr, InputStream in) throws IOException {
-        for (int byteValue = in.read(); byteValue != -1; byteValue = in.read()) {
-            char c = (char) byteValue;
-            bldr.append(c);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static void readAll(Appendable bldr, InputStream in) {
+        try {
+            for (int byteValue = in.read(); byteValue != -1; byteValue = in.read()) {
+                char c = (char) byteValue;
+                bldr.append(c);
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to read input stream", e);
         }
     }
 
@@ -192,23 +217,29 @@ public static void readAll(Appendable bldr, InputStream in) throws IOException {
      * operation is not recursive (i.e., if there's a subdirectory in the source directory, it will
      * get symlinked to the destination).
      */
-    public static void symlinkDirectoryContents(Path src, Path dest) throws IOException {
-        if (!Files.exists(src) || !Files.isDirectory(src)) {
-            throw new IllegalArgumentException(
-                "Source \"" + src + "\"does not exist or is not a directory.");
-        }
-        if (Files.exists(dest) && !Files.isDirectory(dest)) {
-            throw new IllegalArgumentException(
-                "Destination \"" + dest + "\"exists but is not a directory.");
-        }
-        if (!Files.exists(dest)) {
-            Files.createDirectories(dest);
-        }
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(src)) {
-            for (Path entry : stream) {
-                String srcName = entry.getFileName().toString();
-                Files.createSymbolicLink(dest.resolve(srcName), entry);
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static void symlinkDirectoryContents(Path src, Path dest) {
+        try {
+            if (!Files.exists(src) || !Files.isDirectory(src)) {
+                throw new IllegalArgumentException(
+                    "Source \"" + src + "\"does not exist or is not a directory.");
+            }
+            if (Files.exists(dest) && !Files.isDirectory(dest)) {
+                throw new IllegalArgumentException(
+                    "Destination \"" + dest + "\"exists but is not a directory.");
+            }
+            if (!Files.exists(dest)) {
+                Files.createDirectories(dest);
             }
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(src)) {
+                for (Path entry : stream) {
+                    String srcName = entry.getFileName().toString();
+                    Files.createSymbolicLink(dest.resolve(srcName), entry);
+                }
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to symlink " + src.toString() + " to " + dest.toString(), e);
         }
     }
 
@@ -268,36 +299,51 @@ public static Set<PosixFilePermission> modeToPosixFilePermissions(int mode) {
      * @param directory top-level directory.
      * @param force indicates that permissions should be changed, if necessary, to delete files and
      * directories.
-     * @throws IOException
      */
-    public static void cleanDirectoryTree(Path directory, boolean force) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static void cleanDirectoryTree(Path directory, boolean force) {
         if (force) {
             prepareDirectoryTreeForOverwrites(directory);
         }
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
             for (Path file : stream) {
-                if (Files.isDirectory(file)) {
-                    cleanDirectoryTree(file, force);
+                if (Files.isDirectory(file) && !Files.isSymbolicLink(file)) {
+                    cleanDirectoryTree(file);
                 }
                 Files.delete(file);
             }
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                "Unable to clean directory tree  " + directory.toString(), e);
         }
     }
 
-    public static void cleanDirectoryTree(Path directory) throws IOException {
+    public static void cleanDirectoryTree(Path directory) {
         cleanDirectoryTree(directory, false);
     }
 
-    public static void deleteDirectoryTree(Path directory) throws IOException {
+    public static void deleteDirectoryTree(Path directory) {
         deleteDirectoryTree(directory, false);
     }
 
-    public static void deleteDirectoryTree(Path directory, boolean force) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static void deleteDirectoryTree(Path directory, boolean force) {
+        if (!Files.exists(directory)) {
+            return;
+        }
+        if (!Files.isDirectory(directory)) {
+            throw new IllegalArgumentException(
+                "File " + directory.toString() + " is not a directory");
+        }
         cleanDirectoryTree(directory, force);
-        if (force) {
-            setPosixPermissionsRecursively(directory, "rw-r--r--", "rwxr-xr-x");
+        try {
+            if (force) {
+                Files.setPosixFilePermissions(directory,
+                    PosixFilePermissions.fromString(DIR_OVERWRITE_PERMISSIONS));
+            }
+            FileUtils.deleteDirectory(directory.toFile());
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to delete directory " + directory.toString(), e);
         }
-        FileUtils.deleteDirectory(directory.toFile());
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/io/LockManager.java b/src/main/java/gov/nasa/ziggy/util/io/LockManager.java
index 20508ce..21e2553 100644
--- a/src/main/java/gov/nasa/ziggy/util/io/LockManager.java
+++ b/src/main/java/gov/nasa/ziggy/util/io/LockManager.java
@@ -4,6 +4,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.file.StandardOpenOption;
@@ -12,6 +13,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.ZiggyShutdownHook;
 
 /**
@@ -25,23 +28,15 @@ public enum LockManager {
 
     LockManager() {
         ZiggyShutdownHook.addShutdownHook(() -> {
-            try {
-                releaseAllLocks();
-            } catch (IOException e) {
-                // We can swallow this exception because it occurs during a shutdown. Therefore,
-                // by definition there's nothing to be done because we're just trying to exit
-                // Ziggy...
-            }
+            releaseAllLocks();
         });
     }
 
     /**
      * Releases all locks held by the {@link LockManager} singleton instance. For use in testing and
      * in the shutdown hook.
-     *
-     * @throws IOException if exception occurs when releasing locks.
      */
-    public static synchronized void releaseAllLocks() throws IOException {
+    public static synchronized void releaseAllLocks() {
         for (File f : INSTANCE.readerChannels.keySet()) {
             releaseReadLock(f);
         }
@@ -82,9 +77,8 @@ private synchronized AtomicInteger getReaderCount(File f) {
      * lock on the file, an OS file lock is obtained.
      *
      * @param f the file on which to get the lock
-     * @throws IOException if there is an error accessing the file
      */
-    public static void getReadLock(File f) throws IOException {
+    public static void getReadLock(File f) {
         INSTANCE.getReadLockInternal(f);
     }
 
@@ -93,9 +87,8 @@ public static void getReadLock(File f) throws IOException {
      * file.
      *
      * @param f the file on which to lock
-     * @throws IOException if there is an error accessing the file
      */
-    public static void releaseReadLock(File f) throws IOException {
+    public static void releaseReadLock(File f) {
         INSTANCE.releaseReadLockInternal(f);
     }
 
@@ -109,9 +102,8 @@ public static void releaseReadLock(File f) throws IOException {
      * {@link #getWriteLockWithoutBlocking(File)}.
      *
      * @param f the file on which to get the lock
-     * @throws IOException if there is an error accessing the file
      */
-    public static void getWriteLockOrBlock(File f) throws IOException {
+    public static void getWriteLockOrBlock(File f) {
         INSTANCE.getWriteLockOrBlockInternal(f);
     }
 
@@ -128,9 +120,8 @@ public static void getWriteLockOrBlock(File f) throws IOException {
      * @return true if the lock is obtained, false otherwise. A return of false indicates that
      * either another thread in the current process holds the lock, or that another process entirely
      * holds it.
-     * @throws IOException if there is an error accessing the file.
      */
-    public static boolean getWriteLockWithoutBlocking(File f) throws IOException {
+    public static boolean getWriteLockWithoutBlocking(File f) {
         return INSTANCE.getWriteLockWithoutBlockingInternal(f);
     }
 
@@ -139,13 +130,13 @@ public static boolean getWriteLockWithoutBlocking(File f) throws IOException {
      * lock.
      *
      * @param f the file on which to lock
-     * @throws IOException if there is an error accessing the file
      */
-    public static void releaseWriteLock(File f) throws IOException {
+    public static void releaseWriteLock(File f) {
         INSTANCE.releaseWriteLockInternal(f);
     }
 
-    private void getReadLockInternal(File f) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void getReadLockInternal(File f) {
         if (!f.exists()) {
             throw new IllegalStateException("Attempted read lock on nonexistent file: " + f);
         }
@@ -153,43 +144,59 @@ private void getReadLockInternal(File f) throws IOException {
 
         AtomicInteger readerCount = getReaderCount(f);
         synchronized (readerChannels) {
-            if (readerCount.incrementAndGet() == 1) {
-                // First reader - must lock file in file system.
-                FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.READ);
-                channel.lock(0L, Long.MAX_VALUE, true);
-                readerChannels.put(f, channel);
+            try {
+                if (readerCount.incrementAndGet() == 1) {
+                    // First reader - must lock file in file system.
+                    FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.READ);
+                    channel.lock(0L, Long.MAX_VALUE, true);
+                    readerChannels.put(f, channel);
+                }
+            } catch (IOException e) {
+                throw new UncheckedIOException("Failed to get read lock on file " + f.toString(),
+                    e);
             }
         }
     }
 
-    private void releaseReadLockInternal(File f) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void releaseReadLockInternal(File f) {
         AtomicInteger readerCount = getReaderCount(f);
         checkNotNull(readerCount, "Tried to release a read lock when never locked");
 
         synchronized (readerChannels) {
-            if (readerCount.decrementAndGet() == 0) {
-                // Last reader - must unlock file in file system.
-                FileChannel channel = readerChannels.remove(f);
-                channel.close();
+            try {
+                if (readerCount.decrementAndGet() == 0) {
+                    // Last reader - must unlock file in file system.
+                    FileChannel channel = readerChannels.remove(f);
+                    channel.close();
+                }
+            } catch (IOException e) {
+                throw new UncheckedIOException(
+                    "Failed to release read lock on file  " + f.toString(), e);
             }
         }
 
         getLock(f).readLock().unlock();
     }
 
-    private void getWriteLockOrBlockInternal(File f) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void getWriteLockOrBlockInternal(File f) {
         getLock(f).writeLock().lock();
-
-        f.getParentFile().mkdirs();
-        FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.CREATE,
-            StandardOpenOption.WRITE);
-        channel.lock();
-        synchronized (writerChannels) {
-            writerChannels.put(f, channel);
+        try {
+            f.getParentFile().mkdirs();
+            FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.CREATE,
+                StandardOpenOption.WRITE);
+            channel.lock();
+            synchronized (writerChannels) {
+                writerChannels.put(f, channel);
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException("Failed to get write lock on file " + f.toString(), e);
         }
     }
 
-    private synchronized boolean getWriteLockWithoutBlockingInternal(File f) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private synchronized boolean getWriteLockWithoutBlockingInternal(File f) {
 
         // See if some other thread already has the lock, if so return false.
         if (!getLock(f).writeLock().tryLock()) {
@@ -198,14 +205,18 @@ private synchronized boolean getWriteLockWithoutBlockingInternal(File f) throws
 
         // Try to get the OS-level lock.
         f.getParentFile().mkdirs();
-        FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.CREATE,
-            StandardOpenOption.WRITE);
-        FileLock fileLock = channel.tryLock();
-
-        // If the OS-level lock is obtained, then record that fact and return true.
-        if (fileLock != null) {
-            writerChannels.put(f, channel);
-            return true;
+        try {
+            FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.CREATE,
+                StandardOpenOption.WRITE);
+            FileLock fileLock = channel.tryLock();
+
+            // If the OS-level lock is obtained, then record that fact and return true.
+            if (fileLock != null) {
+                writerChannels.put(f, channel);
+                return true;
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException("Failed to get write lock on file " + f.toString(), e);
         }
 
         // If we got this far then we got the local lock but not the OS-level one.
@@ -214,17 +225,21 @@ private synchronized boolean getWriteLockWithoutBlockingInternal(File f) throws
         // always in the same state (either got both or ain't got both).
         getLock(f).writeLock().unlock();
         return false;
-
     }
 
-    private void releaseWriteLockInternal(File f) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    private void releaseWriteLockInternal(File f) {
         synchronized (writerChannels) {
             FileChannel channel = writerChannels.remove(f);
             checkNotNull(channel, "Tried to release a write lock when never locked");
-            channel.close();
+            try {
+                channel.close();
+            } catch (IOException e) {
+                throw new UncheckedIOException(
+                    "Failed to release write lock on file " + f.toString(), e);
+            }
         }
 
         getLock(f).writeLock().unlock();
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/os/AbstractMemInfo.java b/src/main/java/gov/nasa/ziggy/util/os/AbstractMemInfo.java
index 10a7418..6773437 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/AbstractMemInfo.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/AbstractMemInfo.java
@@ -1,6 +1,5 @@
 package gov.nasa.ziggy.util.os;
 
-import java.io.IOException;
 import java.util.Collection;
 
 import org.slf4j.Logger;
@@ -15,7 +14,7 @@ public abstract class AbstractMemInfo extends AbstractSysInfo implements MemInfo
 
     public static final long BYTES_PER_KB = 1024L;
 
-    public AbstractMemInfo(Collection<String> commandOutput) throws IOException {
+    public AbstractMemInfo(Collection<String> commandOutput) {
         super(commandOutput);
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/util/os/AbstractSysInfo.java b/src/main/java/gov/nasa/ziggy/util/os/AbstractSysInfo.java
index 5870a61..833a382 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/AbstractSysInfo.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/AbstractSysInfo.java
@@ -1,6 +1,5 @@
 package gov.nasa.ziggy.util.os;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -24,23 +23,10 @@ public abstract class AbstractSysInfo implements SysInfo {
     private final Map<String, String> sysInfoMap = new HashMap<>();
 
     protected static final List<String> commandOutput(String command) {
-        return commandOutput(command, (String[]) null);
+        return ExternalProcess.commandOutput(command, (String[]) null);
     }
 
-    /**
-     * Executes a command as an external process and returns the result as a {@link List} of
-     * {@link String}s. The results are filtered to only include strings that themselves contain one
-     * or more target strings.
-     */
-    protected static final List<String> commandOutput(String command, String... targets) {
-        ExternalProcess commandProcess = ExternalProcess.simpleExternalProcess(command);
-        commandProcess.writeStdErr(true);
-        commandProcess.writeStdOut(true);
-        commandProcess.run(true, 0);
-        return commandProcess.stdout(targets);
-    }
-
-    public AbstractSysInfo(Collection<String> sysInfo) throws IOException {
+    public AbstractSysInfo(Collection<String> sysInfo) {
         parse(sysInfo);
     }
 
@@ -54,7 +40,7 @@ public void put(String key, String value) {
         sysInfoMap.put(key.toLowerCase(), value);
     }
 
-    protected void parse(Collection<String> sysInfo) throws IOException {
+    protected void parse(Collection<String> sysInfo) {
         for (String line : sysInfo) {
             log.debug("line = " + line);
 
@@ -68,5 +54,4 @@ protected void parse(Collection<String> sysInfo) throws IOException {
             }
         }
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/os/LinuxCpuInfo.java b/src/main/java/gov/nasa/ziggy/util/os/LinuxCpuInfo.java
index ec69f87..d455148 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/LinuxCpuInfo.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/LinuxCpuInfo.java
@@ -1,7 +1,5 @@
 package gov.nasa.ziggy.util.os;
 
-import java.io.IOException;
-
 /**
  * @author Forrest Girouard
  * @author PT
@@ -11,7 +9,7 @@ public class LinuxCpuInfo extends AbstractSysInfo implements CpuInfo {
     private static final String SOCKETS_KEY = "Socket(s)";
     private static final String COMMAND = "/usr/bin/lscpu";
 
-    public LinuxCpuInfo() throws IOException {
+    public LinuxCpuInfo() {
         super(commandOutput(COMMAND));
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/util/os/LinuxMemInfo.java b/src/main/java/gov/nasa/ziggy/util/os/LinuxMemInfo.java
index 1ea22f4..41b4f69 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/LinuxMemInfo.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/LinuxMemInfo.java
@@ -1,7 +1,5 @@
 package gov.nasa.ziggy.util.os;
 
-import java.io.IOException;
-
 /**
  * Determines the total memory for the current hardware at runtime under the Linux operating system.
  *
@@ -39,7 +37,7 @@ public class LinuxMemInfo extends AbstractMemInfo {
     private static final String SWAP_TOTAL_KEY = "SwapTotal";
     private static final String SWAP_FREE_KEY = "SwapFree";
 
-    public LinuxMemInfo() throws IOException {
+    public LinuxMemInfo() {
         super(commandOutput(MEMINFO_COMMAND));
     }
 
diff --git a/src/main/java/gov/nasa/ziggy/util/os/LinuxProcInfo.java b/src/main/java/gov/nasa/ziggy/util/os/LinuxProcInfo.java
index 70de28e..d049599 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/LinuxProcInfo.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/LinuxProcInfo.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -12,6 +13,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+import gov.nasa.ziggy.util.io.FileUtil;
+
 /**
  * This class parses /proc/PID/status on a Linux box and provides the contents as a {@link Map}.
  *
@@ -29,24 +34,24 @@ public class LinuxProcInfo extends AbstractSysInfo implements ProcInfo {
 
     private final long pid;
 
-    public LinuxProcInfo(long pid) throws IOException {
+    public LinuxProcInfo(long pid) {
         super(commandOutput(String.format(PROC_STATUS_FILE, pid)));
         this.pid = pid;
     }
 
-    public LinuxProcInfo() throws IOException {
+    public LinuxProcInfo() {
         super(commandOutput(
             String.format(PROC_STATUS_FILE, gov.nasa.ziggy.util.os.ProcessUtils.getPid())));
         pid = gov.nasa.ziggy.util.os.ProcessUtils.getPid();
     }
 
     @Override
-    public List<Long> getChildPids() throws IOException {
+    public List<Long> getChildPids() {
         return getChildPids(null);
     }
 
     @Override
-    public List<Long> getChildPids(String name) throws IOException {
+    public List<Long> getChildPids(String name) {
         int currentPid = Integer.parseInt(get("Pid"));
         File procDir = new File("/proc");
         File[] procFiles = procDir.listFiles();
@@ -89,7 +94,7 @@ public long getPid() {
      * @throws IOException
      */
     @Override
-    public int getOpenFileLimit() throws IOException {
+    public int getOpenFileLimit() {
         int openFileLimit = -1;
 
         List<String> limitsFileOutput = commandOutput(
@@ -109,16 +114,18 @@ public int getOpenFileLimit() throws IOException {
      * Return the maximum process id value.
      */
     @Override
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
     public long getMaximumPid() {
         Path pidMaxFile = Paths.get("/proc/sys/kernel/pid_max");
         try {
-            String pidMaxLine = Files.readAllLines(pidMaxFile).get(0);
+            String pidMaxLine = Files.readAllLines(pidMaxFile, FileUtil.ZIGGY_CHARSET).get(0);
             if (pidMaxLine.endsWith("\n")) {
                 pidMaxLine = pidMaxLine.substring(0, pidMaxLine.length() - 1);
             }
             return Integer.parseInt(pidMaxLine);
         } catch (IOException e) {
-            throw new IllegalStateException("Can't get pid_max from " + pidMaxFile + ".");
+            throw new UncheckedIOException("Read of pid file " + pidMaxFile.toString() + " failed",
+                e);
         }
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/os/MacOSXCpuInfo.java b/src/main/java/gov/nasa/ziggy/util/os/MacOSXCpuInfo.java
index 17530d5..ea65be2 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/MacOSXCpuInfo.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/MacOSXCpuInfo.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.util.os;
 
-import java.io.IOException;
+import gov.nasa.ziggy.services.process.ExternalProcess;
 
 /**
  * Determines the number of CPU cores for the current hardware at runtime under the Mac OS X
@@ -12,8 +12,8 @@
 public class MacOSXCpuInfo extends AbstractSysInfo implements CpuInfo {
     private static final String NUM_CORES_KEY = "hw.physicalcpu";
 
-    public MacOSXCpuInfo() throws IOException {
-        super(commandOutput("/usr/sbin/sysctl -a", "hw."));
+    public MacOSXCpuInfo() {
+        super(ExternalProcess.commandOutput("/usr/sbin/sysctl -a", "hw."));
     }
 
     @Override
diff --git a/src/main/java/gov/nasa/ziggy/util/os/MacOSXMemInfo.java b/src/main/java/gov/nasa/ziggy/util/os/MacOSXMemInfo.java
index 3c88dd1..9ba1208 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/MacOSXMemInfo.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/MacOSXMemInfo.java
@@ -1,6 +1,5 @@
 package gov.nasa.ziggy.util.os;
 
-import java.io.IOException;
 import java.util.Collection;
 
 import org.slf4j.Logger;
@@ -25,12 +24,12 @@ public class MacOSXMemInfo extends AbstractMemInfo {
 
     private static final String UNAVAILABLE = "Unavailable";
 
-    public MacOSXMemInfo() throws IOException {
+    public MacOSXMemInfo() {
         super(commandOutput(TOP_COMMAND));
     }
 
     @Override
-    protected void parse(Collection<String> topOutput) throws IOException {
+    protected void parse(Collection<String> topOutput) {
         for (String line : topOutput) {
             log.debug("line = " + line);
 
diff --git a/src/main/java/gov/nasa/ziggy/util/os/MacOSXProcInfo.java b/src/main/java/gov/nasa/ziggy/util/os/MacOSXProcInfo.java
index cba4e06..2af90ff 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/MacOSXProcInfo.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/MacOSXProcInfo.java
@@ -1,6 +1,5 @@
 package gov.nasa.ziggy.util.os;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -24,19 +23,19 @@ public class MacOSXProcInfo extends AbstractSysInfo implements ProcInfo {
 
     private final long pid;
 
-    public MacOSXProcInfo(long pid) throws IOException {
+    public MacOSXProcInfo(long pid) {
         super(commandOutput(String.format(PS_COMMAND, pid)));
         this.pid = pid;
     }
 
-    public MacOSXProcInfo() throws IOException {
+    public MacOSXProcInfo() {
         super(
             commandOutput(String.format(PS_COMMAND, gov.nasa.ziggy.util.os.ProcessUtils.getPid())));
         pid = gov.nasa.ziggy.util.os.ProcessUtils.getPid();
     }
 
     @Override
-    protected void parse(Collection<String> commandOutput) throws IOException {
+    protected void parse(Collection<String> commandOutput) {
         for (String line : commandOutput) {
             log.debug("line = " + line);
 
@@ -54,12 +53,12 @@ protected void parse(Collection<String> commandOutput) throws IOException {
     }
 
     @Override
-    public List<Long> getChildPids() throws IOException {
+    public List<Long> getChildPids() {
         return getChildPids(null);
     }
 
     @Override
-    public List<Long> getChildPids(String name) throws IOException {
+    public List<Long> getChildPids(String name) {
         long currentPid = Long.parseLong(get("Pid"));
         List<String> commandOutput = commandOutput(PS_LIST_COMMAND);
         List<Long> childPids = new LinkedList<>();
@@ -87,7 +86,7 @@ public List<Long> getChildPids(String name) throws IOException {
     }
 
     @Override
-    public long getParentPid() throws Exception {
+    public long getParentPid() {
         return Long.parseLong(get("PPid"));
     }
 
@@ -102,13 +101,9 @@ public long getPid() {
      * @return -1 for unlimited.
      */
     @Override
-    public int getOpenFileLimit() throws IOException {
-        try {
-            List<String> commandOutput = commandOutput(ULIMIT_COMMAND);
-            return Integer.parseInt(commandOutput.get(0));
-        } catch (NumberFormatException e) {
-            return -1;
-        }
+    public int getOpenFileLimit() {
+        List<String> commandOutput = commandOutput(ULIMIT_COMMAND);
+        return Integer.parseInt(commandOutput.get(0));
     }
 
     /**
diff --git a/src/main/java/gov/nasa/ziggy/util/os/OperatingSystemType.java b/src/main/java/gov/nasa/ziggy/util/os/OperatingSystemType.java
index b5a0e85..2f8b4e3 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/OperatingSystemType.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/OperatingSystemType.java
@@ -1,9 +1,12 @@
 package gov.nasa.ziggy.util.os;
 
+import static gov.nasa.ziggy.services.config.PropertyName.OPERATING_SYSTEM;
+import static gov.nasa.ziggy.services.config.PropertyName.SUN_ARCH_DATA_MODEL;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 
 /**
  * This type is a container for operating system specific information and can be used for
@@ -12,30 +15,20 @@
  * @author Forrest Girouard
  */
 public enum OperatingSystemType {
-    DEFAULT("Linux", "LD_LIBRARY_PATH", LinuxMemInfo.class, LinuxCpuInfo.class,
-        LinuxProcInfo.class),
-    LINUX("Linux", "LD_LIBRARY_PATH", LinuxMemInfo.class, LinuxCpuInfo.class, LinuxProcInfo.class),
-    MAC_OS_X("Darwin", "DYLD_LIBRARY_PATH", MacOSXMemInfo.class, MacOSXCpuInfo.class,
-        MacOSXProcInfo.class);
+    DEFAULT("Linux", "LD_LIBRARY_PATH"),
+    LINUX("Linux", "LD_LIBRARY_PATH"),
+    MAC_OS_X("Darwin", "DYLD_LIBRARY_PATH");
 
     private static final Logger log = LoggerFactory.getLogger(OperatingSystemType.class);
 
     private final String name;
     private final String archDataModel;
     private final String sharedObjectPathEnvVar;
-    private final Class<? extends MemInfo> memInfoClass;
-    private final Class<? extends CpuInfo> cpuInfoClass;
-    private final Class<? extends ProcInfo> procInfoClass;
 
-    OperatingSystemType(String name, String sharedObjectPathEnvVar,
-        Class<? extends MemInfo> memInfoClass, Class<? extends CpuInfo> cpuInfoClass,
-        Class<? extends ProcInfo> procInfoClass) {
+    OperatingSystemType(String name, String sharedObjectPathEnvVar) {
         this.name = name;
-        archDataModel = System.getProperty(PropertyNames.ARCH_DATA_MODEL_PROPERTY_NAME);
+        archDataModel = ZiggyConfiguration.getInstance().getString(SUN_ARCH_DATA_MODEL.property());
         this.sharedObjectPathEnvVar = sharedObjectPathEnvVar;
-        this.memInfoClass = memInfoClass;
-        this.cpuInfoClass = cpuInfoClass;
-        this.procInfoClass = procInfoClass;
     }
 
     public String getName() {
@@ -53,21 +46,36 @@ public String getSharedObjectPathEnvVar() {
         return sharedObjectPathEnvVar;
     }
 
-    public CpuInfo getCpuInfo() throws Exception {
-        return cpuInfoClass.getDeclaredConstructor().newInstance();
+    public CpuInfo getCpuInfo() {
+        return switch (this) {
+            case DEFAULT -> new LinuxCpuInfo();
+            case LINUX -> new LinuxCpuInfo();
+            case MAC_OS_X -> new MacOSXCpuInfo();
+        };
     }
 
-    public MemInfo getMemInfo() throws Exception {
-        return memInfoClass.getDeclaredConstructor().newInstance();
+    public MemInfo getMemInfo() {
+        return switch (this) {
+            case DEFAULT -> new LinuxMemInfo();
+            case LINUX -> new LinuxMemInfo();
+            case MAC_OS_X -> new MacOSXMemInfo();
+        };
     }
 
-    public ProcInfo getProcInfo(long pid) throws Exception {
-        Class<?>[] procInfoArgs = new Class[] { long.class };
-        return procInfoClass.getConstructor(procInfoArgs).newInstance(pid);
+    public ProcInfo getProcInfo(long pid) {
+        return switch (this) {
+            case DEFAULT -> new LinuxProcInfo(pid);
+            case LINUX -> new LinuxProcInfo(pid);
+            case MAC_OS_X -> new MacOSXProcInfo(pid);
+        };
     }
 
-    public ProcInfo getProcInfo() throws Exception {
-        return procInfoClass.getDeclaredConstructor().newInstance();
+    public ProcInfo getProcInfo() {
+        return switch (this) {
+            case DEFAULT -> new LinuxProcInfo();
+            case LINUX -> new LinuxProcInfo();
+            case MAC_OS_X -> new MacOSXProcInfo();
+        };
     }
 
     public static final OperatingSystemType byName(String name) {
@@ -103,6 +111,6 @@ public static final OperatingSystemType byType(String name) {
 
     public static final OperatingSystemType getInstance() {
         return OperatingSystemType
-            .byType(System.getProperty(PropertyNames.OPERATING_SYSTEM_PROPERTY_NAME));
+            .byType(ZiggyConfiguration.getInstance().getString(OPERATING_SYSTEM.property()));
     }
 }
diff --git a/src/main/java/gov/nasa/ziggy/util/os/ProcInfo.java b/src/main/java/gov/nasa/ziggy/util/os/ProcInfo.java
index 8b3d2ca..399b219 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/ProcInfo.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/ProcInfo.java
@@ -1,6 +1,5 @@
 package gov.nasa.ziggy.util.os;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -10,17 +9,17 @@ public interface ProcInfo extends SysInfo {
     /**
      * Return a List of PIDs for all child processes.
      */
-    List<Long> getChildPids() throws IOException;
+    List<Long> getChildPids();
 
     /**
      * Return a List of PIDs for child processes that match the specified name.
      */
-    List<Long> getChildPids(String name) throws IOException;
+    List<Long> getChildPids(String name);
 
     /**
      * Return the parent PID.
      */
-    long getParentPid() throws Exception;
+    long getParentPid();
 
     /**
      * Return the PID.
@@ -32,7 +31,7 @@ public interface ProcInfo extends SysInfo {
      *
      * @return -1 for unlimited.
      */
-    int getOpenFileLimit() throws IOException;
+    int getOpenFileLimit();
 
     /**
      * Return the maximum process id value.
diff --git a/src/main/java/gov/nasa/ziggy/util/os/ProcessUtils.java b/src/main/java/gov/nasa/ziggy/util/os/ProcessUtils.java
index 3b94afd..0531aa4 100644
--- a/src/main/java/gov/nasa/ziggy/util/os/ProcessUtils.java
+++ b/src/main/java/gov/nasa/ziggy/util/os/ProcessUtils.java
@@ -4,6 +4,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.ArrayList;
@@ -11,11 +12,14 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.process.ExternalProcess;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
 import gov.nasa.ziggy.util.io.FileUtil;
 
 /**
@@ -109,15 +113,17 @@ public static void closeProcess(Process process) {
      * @param mainClass The class containing the main() method.
      * @param mainArgs The parameters to pass to the class's main method.
      * @return a {@link Process} object.
-     * @throws IOException if the process could not be started.
      */
-    public static Process runJava(Class<?> mainClass, List<String> mainArgs) throws IOException {
+    @AcceptableCatchBlock(rationale = Rationale.EXCEPTION_CHAIN)
+    public static Process runJava(Class<?> mainClass, List<String> mainArgs) {
 
         String className = mainClass.getCanonicalName();
         RuntimeMXBean rmx = ManagementFactory.getRuntimeMXBean();
         String classPath = rmx.getClassPath();
         List<String> javaCommandLineParameters = rmx.getInputArguments();
-        String javaExe = SystemUtils.JAVA_HOME + File.separator + "bin" + File.separator + "java";
+        String javaExe = ZiggyConfiguration.getInstance()
+            .getString(PropertyName.JAVA_HOME.property()) + File.separator + "bin" + File.separator
+            + "java";
 
         List<String> commandList = new ArrayList<>();
         StringBuilder cmd = new StringBuilder();
@@ -148,22 +154,24 @@ public static Process runJava(Class<?> mainClass, List<String> mainArgs) throws
 
         String[] commandArray = new String[commandList.size()];
         commandList.toArray(commandArray);
+        try {
+            log.info("Executing java process with command line \"" + cmd + "\".");
+            Process process = Runtime.getRuntime().exec(commandArray);
+            BufferedReader errors = new BufferedReader(
+                new InputStreamReader(process.getErrorStream(), FileUtil.ZIGGY_CHARSET_NAME));
+
+            // Report stderr if the process fails to launch. Unfortunately, if there
+            // is a problem here, it seems you have to be stepping in the debugger
+            // in order for errors.ready() to return true so that output can be
+            // seen.
+            while (errors.ready()) {
+                String errString = errors.readLine();
+                log.error(errString);
+            }
 
-        log.info("Executing java process with command line \"" + cmd + "\".");
-        Process process = Runtime.getRuntime().exec(commandArray);
-        BufferedReader errors = new BufferedReader(
-            new InputStreamReader(process.getErrorStream(), FileUtil.ZIGGY_CHARSET_NAME));
-
-        // Report stderr if the process fails to launch. Unfortunately, if there
-        // is a problem here, it seems you have to be stepping in the debugger
-        // in order for errors.ready() to return true so that output can be
-        // seen.
-        while (errors.ready()) {
-            String errString = errors.readLine();
-            log.error(errString);
+            return process;
+        } catch (IOException e) {
+            throw new UncheckedIOException("Runjava failed for class " + mainClass.toString(), e);
         }
-
-        return process;
     }
-
 }
diff --git a/src/main/java/gov/nasa/ziggy/worker/PipelineWorker.java b/src/main/java/gov/nasa/ziggy/worker/PipelineWorker.java
new file mode 100644
index 0000000..ab15b3a
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/worker/PipelineWorker.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2022-2023 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
+ *
+ * NASA acknowledges the SETI Institute's primary role in authoring and producing Ziggy, a Pipeline
+ * Management System for Data Analysis Pipelines, under Cooperative Agreement Nos. NNX14AH97A,
+ * 80NSSC18M0068 & 80NSSC21M0079.
+ *
+ * This file is available under the terms of the NASA Open Source Agreement (NOSA). You should have
+ * received a copy of this agreement with the Ziggy source code; see the file LICENSE.pdf.
+ *
+ * Disclaimers
+ *
+ * No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SUBJECT
+ * SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL BE
+ * ERROR FREE, OR ANY WARRANTY THAT DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT
+ * SOFTWARE. THIS AGREEMENT DOES NOT, IN ANY MANNER, CONSTITUTE AN ENDORSEMENT BY GOVERNMENT AGENCY
+ * OR ANY PRIOR RECIPIENT OF ANY RESULTS, RESULTING DESIGNS, HARDWARE, SOFTWARE PRODUCTS OR ANY
+ * OTHER APPLICATIONS RESULTING FROM USE OF THE SUBJECT SOFTWARE. FURTHER, GOVERNMENT AGENCY
+ * DISCLAIMS ALL WARRANTIES AND LIABILITIES REGARDING THIRD-PARTY SOFTWARE, IF PRESENT IN THE
+ * ORIGINAL SOFTWARE, AND DISTRIBUTES IT "AS IS."
+ *
+ * Waiver and Indemnity: RECIPIENT AGREES TO WAIVE ANY AND ALL CLAIMS AGAINST THE UNITED STATES
+ * GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT. IF RECIPIENT'S
+ * USE OF THE SUBJECT SOFTWARE RESULTS IN ANY LIABILITIES, DEMANDS, DAMAGES, EXPENSES OR LOSSES
+ * ARISING FROM SUCH USE, INCLUDING ANY DAMAGES FROM PRODUCTS BASED ON, OR RESULTING FROM,
+ * RECIPIENT'S USE OF THE SUBJECT SOFTWARE, RECIPIENT SHALL INDEMNIFY AND HOLD HARMLESS THE UNITED
+ * STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT, TO THE
+ * EXTENT PERMITTED BY LAW. RECIPIENT'S SOLE REMEDY FOR ANY SUCH MATTER SHALL BE THE IMMEDIATE,
+ * UNILATERAL TERMINATION OF THIS AGREEMENT.
+ */
+
+package gov.nasa.ziggy.worker;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.hibernate.Hibernate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.module.ModuleFatalProcessingException;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.services.logging.TaskLog;
+import gov.nasa.ziggy.services.messages.HeartbeatMessage;
+import gov.nasa.ziggy.services.messages.KillTasksRequest;
+import gov.nasa.ziggy.services.messages.ShutdownMessage;
+import gov.nasa.ziggy.services.messaging.ProcessHeartbeatManager;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiClient;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiServer;
+import gov.nasa.ziggy.services.process.AbstractPipelineProcess;
+import gov.nasa.ziggy.supervisor.PipelineSupervisor;
+import gov.nasa.ziggy.supervisor.TaskRequestHandler;
+import gov.nasa.ziggy.util.ZiggyShutdownHook;
+
+/**
+ * Manages execution of a single pipeline task.
+ * <p>
+ * The {@link PipelineWorker} is started by the {@link TaskRequestHandler} that runs as a thread in
+ * the {@link PipelineSupervisor}. The {@link PipelineWorker} runs in its own JVM, as a separate
+ * process, in order to ensure that pipeline tasks can be processed in parallel even if they require
+ * resources that do not support thread-level concurrency (this includes both HDF5 and netCDF).
+ * <p>
+ * The worker life cycle is linked to that of the process it manages. As soon as the process
+ * completes or hands off to a remote compute node, the worker process exits. Each
+ * {@link PipelineWorker} manages one and only one task at a time; the supervisor will create as
+ * many {@link PipelineWorker} instances as it requires, subject to resource limits, to process
+ * tasks.
+ *
+ * @author PT
+ */
+public class PipelineWorker extends AbstractPipelineProcess {
+
+    private static final Logger log = LoggerFactory.getLogger(PipelineSupervisor.class);
+
+    public static final String NAME = "Worker";
+    public static final int MAX_TASK_RETRIEVE_RETRIES = 1;
+    public static final long WAIT_BETWEEN_RETRIES_MILLIS = 100;
+    public static final long FINAL_MESSAGE_LATCH_WAIT_MILLIS = 5000;
+
+    private int workerId;
+    private long taskId;
+
+    /**
+     * The {@link #main(String[])} method permits this class to be run in its own JVM, which is a
+     * requirement for making it a separate process from the supervisor. Because the worker is never
+     * instantiated except by the supervisor, positional arguments are acceptable.
+     */
+    public static void main(String[] args) {
+
+        int workerId = Integer.parseInt(args[0]);
+        long taskId = Long.parseLong(args[1]);
+        RunMode runMode = RunMode.valueOf(args[2]);
+
+        // Construct the WorkerProcess instance
+        PipelineWorker workerProcess = new PipelineWorker(NAME, workerId);
+        workerProcess.initialize();
+        workerProcess.processTask(taskId, runMode);
+        log.info("Worker exiting with status 0");
+        System.exit(0);
+    }
+
+    /**
+     * Kills the worker by calling {@link System#exit(int)}. This method is called when the worker
+     * receives a {@link KillTasksRequest} message from the supervisor, and the task processed in
+     * this worker is one of the ones that is to be killed. Because the worker is a standalone
+     * process, and because each worker processes one and only one task, this approach (killing the
+     * task by killing the worker) is the easiest and most robust way to ensure that the task is
+     * stopped.
+     */
+    public static void killWorker() {
+        System.exit(1);
+    }
+
+    public PipelineWorker(String name, int workerId) {
+        super(name + " " + Integer.toString(workerId));
+        this.workerId = workerId;
+    }
+
+    /**
+     * Main processing method. Instantiates the {@link ZiggyRmiClient} and {@link TaskExecutor}
+     * instances, then starts the {@link TaskExecutor#executeTask()} method.
+     */
+    private void processTask(long taskId, RunMode runMode) {
+
+        this.taskId = taskId;
+        TaskLog taskLog = taskLog();
+        log.info("Process " + NAME + " instance " + workerId + " starting");
+
+        // Initialize an instance of TaskExecutor
+        TaskExecutor taskRequestExecutor = new TaskExecutor(workerId, taskId, taskLog, runMode);
+        addProcessStatusReporter(taskRequestExecutor);
+
+        // Initialize the ProcessHeartbeatManager for this process.
+        log.info("Initializing ProcessHeartbeatManager...");
+        ProcessHeartbeatManager
+            .initializeInstance(new ProcessHeartbeatManager.WorkerHeartbeatManagerAssistant());
+        log.info("Initializing ProcessHeartbeatManager...done");
+
+        // Initialize the UiCommunicator for this process.
+        int rmiPort = ZiggyConfiguration.getInstance()
+            .getInt(PropertyName.SUPERVISOR_PORT.property(), ZiggyRmiServer.RMI_PORT_DEFAULT);
+        log.info("Starting ZiggyRmiClient instance with registry on port " + rmiPort + "...");
+        ZiggyRmiClient.initializeInstance(rmiPort, NAME);
+        ZiggyShutdownHook.addShutdownHook(() -> {
+
+            // Note that we need to wait for the final status message to get sent
+            // before we reset the ZiggyRmiClient.
+            CountDownLatch latch = new CountDownLatch(1);
+            ZiggyMessenger.publish(taskRequestExecutor.statusMessage(true), latch);
+            try {
+                latch.await(FINAL_MESSAGE_LATCH_WAIT_MILLIS, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+            ZiggyRmiClient.reset();
+        });
+        log.info("Starting ZiggyRmiClient instance ... done");
+
+        // Subscribe to messages as needed.
+        subscribe();
+
+        // Start the TaskExecutor
+        taskRequestExecutor.executeTask();
+    }
+
+    /**
+     * Starts logging for this process.
+     * <p>
+     * Log messages for this process go directly to the Ziggy task log in logs/ziggy.
+     */
+    private TaskLog taskLog() {
+        PipelineTaskCrud crud = new PipelineTaskCrud();
+        PipelineTask pipelineTask = (PipelineTask) DatabaseTransactionFactory
+            .performTransaction(() -> {
+                PipelineTask task = null;
+                int iTry = 0;
+                while (task == null && iTry < MAX_TASK_RETRIEVE_RETRIES) {
+                    task = crud.retrieve(taskId);
+                    if (task == null) {
+                        Thread.sleep(WAIT_BETWEEN_RETRIES_MILLIS);
+                    }
+                }
+                if (task == null) {
+                    throw new ModuleFatalProcessingException(
+                        "No pipeline task found for ID=" + taskId);
+                }
+                Hibernate.initialize(task.getSummaryMetrics());
+                Hibernate.initialize(task.getExecLog());
+                Hibernate.initialize(task.getProducerTaskIds());
+                return task;
+            });
+
+        TaskLog taskLog = new TaskLog(workerId, pipelineTask);
+        taskLog.startLogging();
+        DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineTask task = crud.retrieve(taskId);
+            task.incrementTaskLogIndex();
+            crud.merge(task);
+            return null;
+        });
+        return taskLog;
+    }
+
+    /**
+     * Subscribes to messages where the worker as a whole is the intended recipient.
+     */
+    private void subscribe() {
+
+        // When a heartbeat comes in, send out the update message.
+        ZiggyMessenger.subscribe(HeartbeatMessage.class, message -> {
+            Thread t = new Thread(() -> {
+                log.debug("heartbeat received");
+                AbstractPipelineProcess.sendUpdates();
+            });
+            t.setDaemon(true);
+            t.start();
+        });
+        ZiggyMessenger.subscribe(ShutdownMessage.class, message -> {
+            log.info("Shutting down due to shutdown signal");
+            System.exit(0);
+        });
+        ZiggyMessenger.subscribe(KillTasksRequest.class, message -> {
+            if (message.getTaskIds().contains(taskId)) {
+                killWorker();
+            }
+        });
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/worker/RandomDelay.java b/src/main/java/gov/nasa/ziggy/worker/RandomDelay.java
deleted file mode 100644
index 7f295f0..0000000
--- a/src/main/java/gov/nasa/ziggy/worker/RandomDelay.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package gov.nasa.ziggy.worker;
-
-import org.apache.commons.configuration.Configuration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-
-/**
- * @author Todd Klaus
- */
-public class RandomDelay {
-    private static final Logger log = LoggerFactory.getLogger(RandomDelay.class);
-
-    private static final String RANDOM_DELAY_PROP = "pi.worker.randomDelaySeconds";
-    private static final int RANDOM_DELAY_DEFAULT = 0;
-
-    // private to prevent instantiation
-    private RandomDelay() {
-    }
-
-    public static void randomWait() {
-        Configuration config = ZiggyConfiguration.getInstance();
-        int maxDelaySeconds = config.getInt(RANDOM_DELAY_PROP, RANDOM_DELAY_DEFAULT);
-
-        if (maxDelaySeconds > 0) {
-            int delayMillis = (int) (Math.random() * maxDelaySeconds * 1000);
-            log.info("Sleeping for " + delayMillis + " milliseconds to stagger transaction start");
-            try {
-                Thread.sleep(delayMillis);
-            } catch (Throwable t) {
-            }
-        } else {
-            log.info("No delay configured");
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/worker/TaskExecutor.java b/src/main/java/gov/nasa/ziggy/worker/TaskExecutor.java
new file mode 100644
index 0000000..80689d7
--- /dev/null
+++ b/src/main/java/gov/nasa/ziggy/worker/TaskExecutor.java
@@ -0,0 +1,407 @@
+package gov.nasa.ziggy.worker;
+
+import static gov.nasa.ziggy.services.database.DatabaseTransactionFactory.performTransaction;
+import static gov.nasa.ziggy.services.process.AbstractPipelineProcess.getProcessInfo;
+
+import java.util.Date;
+import java.util.List;
+
+import org.hibernate.Hibernate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.nasa.ziggy.metrics.CounterMetric;
+import gov.nasa.ziggy.metrics.IntervalMetric;
+import gov.nasa.ziggy.metrics.IntervalMetricKey;
+import gov.nasa.ziggy.metrics.Metric;
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.PipelineOperations;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.ProcessingState;
+import gov.nasa.ziggy.pipeline.definition.TaskExecutionLog;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.ProcessingSummaryOperations;
+import gov.nasa.ziggy.services.alert.AlertService;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+import gov.nasa.ziggy.services.database.DatabaseService;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.services.logging.TaskLog;
+import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
+import gov.nasa.ziggy.services.messaging.ZiggyMessenger;
+import gov.nasa.ziggy.services.process.StatusMessage;
+import gov.nasa.ziggy.services.process.StatusReporter;
+import gov.nasa.ziggy.supervisor.TaskContext;
+import gov.nasa.ziggy.util.AcceptableCatchBlock;
+import gov.nasa.ziggy.util.AcceptableCatchBlock.Rationale;
+
+/**
+ * Coordinates processing of inbound worker task request messages. Manages the database and
+ * messaging transaction context, invokes the module, then invokes the transition logic.
+ * <p>
+ *
+ * @author Todd Klaus
+ * @author PT
+ */
+public class TaskExecutor implements StatusReporter {
+    private static final Logger log = LoggerFactory.getLogger(TaskExecutor.class);
+
+    public static final String PIPELINE_MODULE_COMMIT_METRIC = "pipeline.module.commitTime";
+    public static final int MAX_TASK_RETRIEVE_RETRIES = 1;
+    public static final long WAIT_BETWEEN_RETRIES_MILLIS = 100;
+
+    /**
+     * Instance of {@link PipelineTask} processed by this instance of {@link TaskExecutor}. By
+     * placing it in a static field, we make it available to other classes that run under the same
+     * {@link PipelineWorker}. As there is only 1 task per {@link PipelineWorker}, there is no
+     * danger that multiple pipeline tasks will compete for use of this field.
+     */
+    private static PipelineTask workerTask;
+
+    private final int workerNumber;
+    private String lastErrorMessage = "";
+    private boolean taskDone;
+    private TaskContext taskContext = new TaskContext();
+    private long taskId;
+    private RunMode runMode;
+
+    /**
+     * @param processInfo
+     * @param threadNum
+     * @param memoryManager
+     */
+    public TaskExecutor(int workerNumber, long taskId, TaskLog taskLog, RunMode runMode) {
+        this.taskId = taskId;
+        this.workerNumber = workerNumber;
+        this.runMode = runMode;
+
+        taskContext.setTaskLog(taskLog);
+        DatabaseTransactionFactory.performTransaction(() -> {
+            new PipelineTaskCrud().retrieve(taskId);
+            taskContext.setTask(new PipelineTaskCrud().retrieve(taskId));
+            return null;
+        });
+    }
+
+    /**
+     * Master method that invokes all steps needed to pre-process, process, and post-process the
+     * task.
+     */
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    public void executeTask() {
+        IntervalMetricKey key = IntervalMetric.start();
+        try {
+            executeTaskInternal();
+        } catch (Exception e) {
+            // Here we catch Exception because it's what's thrown by PipelineModule.processTask().
+            // See the documentation for that class and method for an explanation. Once the
+            // exception gets here we handle it so that the worker doesn't terminate until after
+            // all the foregoing catch and finally actions are complete.
+            lastErrorMessage = e.getMessage();
+
+            log.error("processMessage(): caught exception processing worker task request for "
+                + contextString(taskContext), e);
+
+            CounterMetric.increment("pipeline.module.execFailCount");
+
+            postProcessingAfterException();
+        } finally {
+            IntervalMetric.stop("pipeline.module.processMessage", key);
+
+            // make sure any active transaction is cleaned up
+            DatabaseService databaseService = DatabaseService.getInstance();
+            databaseService.rollbackTransactionIfActive();
+        }
+    }
+
+    private void executeTaskInternal() throws Exception {
+
+        taskContext.setState(TaskContext.TaskState.PROCESSING);
+        taskContext.setProcessingStartTimeMillis(System.currentTimeMillis());
+        ZiggyMessenger.publish(statusMessage(false));
+
+        log.info("Executing pre-processing for taskId = " + taskId + "...");
+        preProcessing();
+        log.info("DONE executing pre-processing for taskId = " + taskId);
+
+        try {
+            Metric.enableThreadMetrics();
+
+            /* Invoke the module */
+            log.info("Executing processTask for taskId = " + taskId + "...");
+            taskDone = processTask();
+
+            if (taskDone) {
+                log.info("DONE executing processTask for taskId = " + taskId);
+                CounterMetric.increment("pipeline.module.execSuccessCount");
+            } else {
+                log.info(
+                    "DONE executing processTask for current step (more steps remain) for taskId = "
+                        + taskId);
+            }
+        } finally {
+            taskContext.setTaskMetrics(Metric.getThreadMetrics());
+            Metric.disableThreadMetrics();
+        }
+
+        /* Update the task status */
+        log.info("Executing post-processing for taskId = " + taskId + "...");
+        postProcessing(taskDone, true);
+        log.info("DONE executing post-processing for taskId = " + taskId);
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    private void postProcessingAfterException() {
+        if (taskContext.getPipelineTaskId() != null) {
+            // could be null if it wasn't found in the db
+            try {
+                postProcessing(true, false);
+            } catch (Exception e) {
+                log.error("Failed in postProcessing for: " + contextString(taskContext), e);
+            }
+        }
+    }
+
+    /**
+     * Update the PipelineTask in the db to reflect the fact that this worker is now processing the
+     * task. This is done with a local transaction (outside of the distributed transaction) and
+     * committed immediately so that the console will show updated status right away
+     */
+    private boolean preProcessing() {
+
+        return (boolean) DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineInstanceCrud pipelineInstanceCrud = new PipelineInstanceCrud();
+            long pipelineInstanceId = taskContext.getPipelineInstanceId();
+            PipelineInstance pipelineInstance = pipelineInstanceCrud.retrieve(pipelineInstanceId);
+
+            if (pipelineInstance == null) {
+                throw new PipelineException(
+                    "No PipelineInstance found for id=" + pipelineInstanceId);
+            }
+
+            PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
+            PipelineTask pipelineTask = pipelineTaskCrud.retrieve(taskId);
+
+            if (pipelineTask == null) {
+                throw new PipelineException("No PipelineTask found for id=" + taskId);
+            }
+
+            TaskExecutionLog execLog = new TaskExecutionLog(getProcessInfo().getHost(),
+                workerNumber);
+            execLog.setStartProcessingTime(new Date(taskContext.getProcessingStartTimeMillis()));
+            execLog.setInitialState(pipelineTask.getState());
+            execLog.setInitialProcessingState(pipelineTask.getProcessingState());
+
+            pipelineTask.getExecLog().add(execLog);
+
+            /*
+             * If the user requested that only the transition logic be re-run, or if the transition
+             * logic previously failed, then we only need to re-run the transition logic
+             */
+            boolean transitionOnly = pipelineTask.getState() == PipelineTask.State.COMPLETED
+                || pipelineTask.getState() == PipelineTask.State.PARTIAL;
+
+            if (!transitionOnly) {
+                new PipelineOperations().setTaskState(pipelineTask, PipelineTask.State.PROCESSING);
+                pipelineTask.setWorkerHost(getProcessInfo().getHost());
+                pipelineTask.setWorkerThread(workerNumber);
+                pipelineTask.setTransitionComplete(false);
+                pipelineTask.setSoftwareRevision(ZiggyConfiguration.getInstance()
+                    .getString(PropertyName.ZIGGY_VERSION.property()));
+            }
+            return transitionOnly;
+        });
+    }
+
+    /**
+     * Invoke PipelineModule.processTask() and execute the transition logic (if applicable)
+     *
+     * @throws Throwable
+     * @returns boolean If true, task is done (no more steps)
+     */
+    @AcceptableCatchBlock(rationale = Rationale.CLEANUP_BEFORE_EXIT)
+    private boolean processTask() throws Exception {
+        String moduleExecMetricPrefix = null;
+
+        try {
+            return processTaskInternal();
+        } catch (Exception e) {
+            log.error("Failed in PipelineModule.processTask() for: " + contextString(taskContext));
+            CounterMetric.increment("pipeline.module.execFailCount");
+            throw e;
+        } finally {
+
+            if (moduleExecMetricPrefix != null) {
+                CounterMetric.increment(moduleExecMetricPrefix + ".execCount");
+            }
+        }
+    }
+
+    private boolean processTaskInternal() throws Exception {
+
+        PipelineTask pipelineTask = (PipelineTask) performTransaction(() -> {
+            PipelineTask task = new PipelineTaskCrud().retrieve(taskId);
+            Hibernate.initialize(task.getPipelineInstance().getPipelineParameterSets());
+            Hibernate.initialize(task.getPipelineInstanceNode().getModuleParameterSets());
+            Hibernate.initialize(task.getPipelineDefinitionNode().getInputDataFileTypes());
+            Hibernate.initialize(task.getPipelineDefinitionNode().getOutputDataFileTypes());
+            Hibernate.initialize(task.getPipelineDefinitionNode().getModelTypes());
+            return task;
+        });
+
+        workerTask = pipelineTask;
+        String moduleExecMetricPrefix = "pipeline.module." + taskContext.getModule();
+
+        log.info("processing:" + contextString(taskContext));
+
+        PipelineModule currentPipelineModule = pipelineTask.getModuleImplementation(runMode);
+        taskContext.setPipelineModule(currentPipelineModule);
+
+        String moduleSimpleName = taskContext.getPipelineModule().getClass().getSimpleName();
+
+        log.info("Calling " + moduleSimpleName + ".processTask()");
+
+        pipelineModuleProcessTask(currentPipelineModule, moduleExecMetricPrefix);
+        log.info(moduleSimpleName + ".process() completed");
+
+        if (isTaskDone()) {
+            ProcessingSummaryOperations attrOps = new ProcessingSummaryOperations();
+            attrOps.updateProcessingState(taskId, ProcessingState.COMPLETE);
+        }
+
+        return isTaskDone();
+    }
+
+    @AcceptableCatchBlock(rationale = Rationale.MUST_NOT_CRASH)
+    private void pipelineModuleProcessTask(PipelineModule currentPipelineModule,
+        String moduleExecMetricPrefix) throws Exception {
+
+        IntervalMetricKey key = IntervalMetric.start();
+        long startTime = System.currentTimeMillis();
+
+        try {
+            // Hand off control to the PipelineModule implementation
+            if (currentPipelineModule.processTaskRequiresDatabaseTransaction()) {
+                performTransaction(() -> {
+                    setTaskDone(currentPipelineModule.processTask());
+                    return null;
+                });
+            } else {
+                setTaskDone(currentPipelineModule.processTask());
+            }
+        } finally {
+            IntervalMetric.stop(moduleExecMetricPrefix + ".processTask", key);
+            taskContext.setModuleExecTime(System.currentTimeMillis() - startTime);
+        }
+    }
+
+    /**
+     * Update the PipelineTask in the db with the results of the processing
+     *
+     * @param summaryMetrics
+     */
+    private void postProcessing(boolean done, boolean success) {
+
+        performTransaction(() -> {
+            PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
+            PipelineTask pipelineTask = pipelineTaskCrud.retrieve(taskId);
+
+            if (pipelineTask == null) {
+                throw new PipelineException("No PipelineTask found for id=" + taskId);
+            }
+
+            long processingEndTimeMillis = System.currentTimeMillis();
+            long totalProcessingTimeMillis = processingEndTimeMillis
+                - taskContext.getProcessingStartTimeMillis();
+
+            log.info("Total processing time for this step (minutes): "
+                + totalProcessingTimeMillis / 1000.0 / 60.0);
+
+            Date endProcessingTime = new Date(processingEndTimeMillis);
+
+            // Update summary metrics
+            taskContext.getPipelineModule()
+                .updateMetrics(pipelineTask, taskContext.getTaskMetrics(),
+                    totalProcessingTimeMillis);
+
+            if (done) {
+                PipelineTask.State newState = null;
+                if (success) {
+                    if (taskContext.getPipelineModule().isPartialSuccess()) {
+                        newState = PipelineTask.State.PARTIAL;
+                    } else {
+                        newState = PipelineTask.State.COMPLETED;
+                    }
+                } else {
+                    newState = PipelineTask.State.ERROR;
+                    pipelineTask.incrementFailureCount();
+
+                    AlertService alertService = AlertService.getInstance();
+                    alertService.generateAlert("PI(" + taskContext.getModule() + ")",
+                        pipelineTask.getId(), AlertService.Severity.INFRASTRUCTURE,
+                        lastErrorMessage);
+                }
+                new PipelineOperations().setTaskState(pipelineTask, newState);
+            }
+
+            List<TaskExecutionLog> execLog = pipelineTask.getExecLog();
+            log.info("execLog = " + execLog.size());
+
+            if (execLog != null && !execLog.isEmpty()) {
+                TaskExecutionLog currentExecLog = execLog.get(execLog.size() - 1);
+                currentExecLog.setEndProcessingTime(endProcessingTime);
+                currentExecLog.setFinalState(pipelineTask.getState());
+                currentExecLog.setFinalProcessingState(pipelineTask.getProcessingState());
+            } else {
+                log.warn("stepLog is missing or empty for taskId: " + taskId);
+            }
+            return null;
+        });
+    }
+
+    private void setTaskDone(boolean taskDone) {
+        this.taskDone = taskDone;
+    }
+
+    private boolean isTaskDone() {
+        return taskDone;
+    }
+
+    /**
+     * @param task
+     * @return
+     */
+    private String contextString(TaskContext context) {
+        return "IID=" + context.getPipelineInstanceId() + ", TID=" + taskId + ", M="
+            + context.getModule() + ", UOW=" + context.getModuleUow();
+    }
+
+    @Override
+    public StatusMessage reportCurrentStatus() {
+        return statusMessage(false);
+    }
+
+    public StatusMessage statusMessage(boolean lastMessage) {
+        Long pipelineInstanceId = taskContext.getPipelineInstanceId();
+        Long pipelineTaskId = taskContext.getPipelineTaskId();
+        String currentPipelineInstanceId = pipelineInstanceId == null ? "-"
+            : "" + pipelineInstanceId.toString();
+        String currentPipelineTaskId = pipelineTaskId == null ? "-"
+            : "" + pipelineTaskId.toString();
+
+        WorkerStatusMessage message = new WorkerStatusMessage(workerNumber,
+            taskContext.getState().toString(), currentPipelineInstanceId, currentPipelineTaskId,
+            taskContext.getModule(), taskContext.getModuleUow(),
+            taskContext.getProcessingStartTimeMillis(), lastMessage);
+        message.setSourceProcess(getProcessInfo());
+        return message;
+    }
+
+    public static PipelineTask getWorkerTask() {
+        return workerTask;
+    }
+}
diff --git a/src/main/java/gov/nasa/ziggy/worker/TaskFileCopy.java b/src/main/java/gov/nasa/ziggy/worker/TaskFileCopy.java
deleted file mode 100644
index 2a11dcb..0000000
--- a/src/main/java/gov/nasa/ziggy/worker/TaskFileCopy.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package gov.nasa.ziggy.worker;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.AndFileFilter;
-import org.apache.commons.io.filefilter.IOFileFilter;
-import org.apache.commons.io.filefilter.NameFileFilter;
-import org.apache.commons.io.filefilter.NotFileFilter;
-import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.metrics.ValueMetric;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.module.PipelineMetrics;
-import gov.nasa.ziggy.module.WorkingDirManager;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-
-/**
- * Copy task files from the worker to another directory, typically a shared volume.
- * <p>
- * This class uses {@link TaskFileCopyParameters} to control behavior.
- *
- * @author Todd Klaus
- */
-public class TaskFileCopy {
-    private static final Logger log = LoggerFactory.getLogger(TaskFileCopy.class);
-
-    private final PipelineTask pipelineTask;
-    private final TaskFileCopyParameters copyParams;
-
-    public TaskFileCopy(PipelineTask pipelineTask, TaskFileCopyParameters copyParams) {
-        this.pipelineTask = pipelineTask;
-        this.copyParams = copyParams;
-    }
-
-    public void copyTaskFiles() throws Exception {
-        File srcTaskDir = WorkingDirManager.workingDir(pipelineTask);
-
-        if (copyParams.isDeleteWithoutCopy()) {
-            log.warn("*** TEST USE ONLY ***: deleting source directory without copying");
-            try {
-                FileUtils.forceDelete(srcTaskDir);
-            } catch (IOException e) {
-                handleError("Failed to delete source task dir: " + srcTaskDir + ", caught e = " + e,
-                    e);
-                return;
-            }
-            log.info("Done deleting source directory");
-        } else {
-            String destPath = copyParams.getDestinationPath();
-            File destDir = new File(destPath);
-
-            if (!destDir.exists()) {
-                try {
-                    FileUtils.forceMkdir(destDir);
-                } catch (IOException e1) {
-                    handleError("Unable to create destDir: " + destDir + ", caught e=" + e1);
-                    return;
-                }
-            }
-
-            log.info("srcTaskDir = " + srcTaskDir);
-            log.info("destPath = " + destPath);
-
-            if (!destDir.exists() || !destDir.isDirectory()) {
-                handleError("destDir does not exist or is not a directory: " + destPath);
-                return;
-            }
-
-            if (srcTaskDir != null) {
-                File destTaskDir = new File(destDir, srcTaskDir.getName());
-                File destTaskTmpDir = new File(destDir, srcTaskDir.getName() + ".in_progress");
-
-                log.info("destTaskDir = " + destTaskDir);
-
-                if (destTaskTmpDir.exists()) {
-                    try {
-                        log.info("destTaskTmpDir already exists, deleting: " + destTaskTmpDir);
-                        FileUtils.forceDelete(destTaskTmpDir);
-                    } catch (IOException e) {
-                        handleError("Unable to delete existing destTaskTmpDir: " + destTaskTmpDir
-                            + ", caught e=" + e);
-                        return;
-                    }
-                }
-
-                // setup exclude filter
-                FileFilter excludeFilter = null;
-                String[] wildcards = copyParams.getExcludeWildcards();
-                if (wildcards != null && wildcards.length > 0) {
-                    excludeFilter = new NotFileFilter(new WildcardFileFilter(wildcards));
-                    NotFileFilter svnFilter = new NotFileFilter(new NameFileFilter(".svn"));
-                    excludeFilter = new AndFileFilter(svnFilter, (IOFileFilter) excludeFilter);
-                    log.info("Using filter: " + excludeFilter);
-                }
-
-                // do copy
-                try {
-                    if (excludeFilter != null) {
-                        FileUtils.copyDirectory(srcTaskDir, destTaskTmpDir, excludeFilter);
-                    } else {
-                        FileUtils.copyDirectory(srcTaskDir, destTaskTmpDir);
-                    }
-                } catch (IOException e) {
-                    handleError("Failed to copy task dir: " + srcTaskDir + ", caught e = " + e, e);
-                    return;
-                }
-
-                // rename dest now that copy is complete
-                boolean renamed = destTaskTmpDir.renameTo(destTaskDir);
-                if (!renamed) {
-                    handleError("Failed to rename: " + destTaskTmpDir + " -> " + destTaskDir);
-                    return;
-                }
-
-                // delete source
-                if (copyParams.isDeleteAfterCopy()) {
-                    log.info("Copy complete, deleting source directory");
-                    try {
-                        FileUtils.forceDelete(srcTaskDir);
-                    } catch (IOException e) {
-                        handleError(
-                            "Failed to delete source task dir: " + srcTaskDir + ", caught e = " + e,
-                            e);
-                        return;
-                    }
-                    log.info("Done deleting source directory");
-                }
-
-                // attempt to measure dest file sizes
-                try {
-                    long archiveSize = FileUtils.sizeOfDirectory(destTaskDir);
-                    ValueMetric.addValue(PipelineMetrics.TF_ARCHIVE_SIZE_METRIC, archiveSize);
-                } catch (Exception e) {
-                    log.warn("Failed to size destTaskDir: " + destTaskDir + ", caught e = " + e, e);
-                }
-            } else {
-                handleError("sourceTaskDir not found for pipelineTask: " + pipelineTask);
-            }
-        }
-    }
-
-    private void handleError(String msg) {
-        handleError(msg, null);
-    }
-
-    private void handleError(String msg, Exception e) {
-        log.error(msg, e);
-        if (copyParams.isFailTaskOnError()) {
-            throw new PipelineException(msg, e);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/worker/WorkerPipelineProcess.java b/src/main/java/gov/nasa/ziggy/worker/WorkerPipelineProcess.java
deleted file mode 100644
index 7d9e9b0..0000000
--- a/src/main/java/gov/nasa/ziggy/worker/WorkerPipelineProcess.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package gov.nasa.ziggy.worker;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.PriorityBlockingQueue;
-import java.util.stream.Collectors;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.metrics.MetricsDumper;
-import gov.nasa.ziggy.module.AlgorithmMonitor;
-import gov.nasa.ziggy.module.WorkerMemoryManager;
-import gov.nasa.ziggy.pipeline.PipelineExecutor;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud.ClearStaleStateResults;
-import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
-import gov.nasa.ziggy.services.events.ZiggyEventCrud;
-import gov.nasa.ziggy.services.events.ZiggyEventHandler;
-import gov.nasa.ziggy.services.events.ZiggyEventHandler.ZiggyEventHandlerInfoForDisplay;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
-import gov.nasa.ziggy.services.messaging.WorkerCommunicator;
-import gov.nasa.ziggy.services.process.AbstractPipelineProcess;
-import gov.nasa.ziggy.util.ZiggyShutdownHook;
-import gov.nasa.ziggy.worker.messaging.TriggerRequestManager;
-import gov.nasa.ziggy.worker.messaging.WorkerMessageDispatcher;
-import hdf.hdf5lib.H5;
-
-/**
- * @author Todd Klaus
- * @author PT
- */
-public class WorkerPipelineProcess extends AbstractPipelineProcess {
-    public static final String NAME = "Worker";
-
-    private static final Logger log = LoggerFactory.getLogger(WorkerPipelineProcess.class);
-
-    public static final String WORKER_STATUS_REPORT_INTERVAL_MILLIS_PROP = "services.statusReport.workerThread.reportIntervalMillis";
-    public static final int WORKER_STATUS_REPORT_INTERVAL_MILLIS_DEFAULT = 15000;
-
-    private static final String WORKER_CLEAN_TMP_AT_STARTUP_PROP = "pi.worker.cleanTmp.enabled";
-    private static final boolean WORKER_CLEAN_TMP_AT_STARTUP_DEFAULT = false;
-
-    private WorkerMemoryManager memoryManager = null;
-    private static int workerThreadCount;
-    private static long heapSize;
-    private static final Set<ZiggyEventHandler> ziggyEventHandlers = new HashSet<>();
-    public static final List<WorkerTaskRequestHandler> workerThreads = new LinkedList<>();
-
-    public static final PriorityBlockingQueue<WorkerTaskRequest> workerTaskRequestQueue = new PriorityBlockingQueue<>();
-
-    public WorkerPipelineProcess(int threadCount) {
-        super(NAME);
-        checkArgument(threadCount > 0, "workerThreadCount must be positive");
-        workerThreadCount = threadCount;
-        heapSize = Runtime.getRuntime().maxMemory();
-    }
-
-    public WorkerPipelineProcess(boolean messaging, boolean database) {
-        super(NAME, messaging, database);
-    }
-
-    public void go() {
-        try {
-            initialize();
-
-            Configuration config = ZiggyConfiguration.getInstance();
-
-            clearStaleTaskStates(getProcessInfo().getHost());
-
-            clearTemporaryDirs();
-
-            // if HDF5 is to be used as the default binfile format (or indeed at all),
-            // load the library now -- note that (a) this is necessary because in linux
-            // some kind of conflict occurs when libhdf5 is loaded before libjhdf5, but not
-            // vice versa; (b) use of the System.loadLibrary doesn't work because at the first
-            // call to an HDF5 method, the code looks at a private static var that tells it
-            // whether the library is loaded, and that var is false (because H5 didn't load it).
-            // It doesn't look to see whether the library was loaded by somebody other than H5.
-            // It thus attempts to load again and we get the conflict.
-
-            H5.loadH5Lib();
-
-            try {
-                memoryManager = new WorkerMemoryManager();
-            } catch (IOException e) {
-                log.warn("unable to determine system physical memory, disabling memory manager", e);
-            }
-
-            int rmiPort = config.getInt(MessageHandler.RMI_REGISTRY_PORT_PROP,
-                MessageHandler.RMI_REGISTRY_PORT_PROP_DEFAULT);
-            log.info("Starting RMI communications server with registry on port " + rmiPort);
-            WorkerCommunicator.initializeInstance(
-                new MessageHandler(new WorkerMessageDispatcher(new TriggerRequestManager())),
-                rmiPort);
-
-            log.info("Starting " + workerThreadCount + " worker task threads");
-
-            for (int i = 0; i < workerThreadCount; i++) {
-                log.info("Starting worker task thread #" + (i + 1) + " of " + workerThreadCount);
-                WorkerTaskRequestHandler workerThread = new WorkerTaskRequestHandler(
-                    getProcessInfo(), i, memoryManager);
-
-                /*
-                 * Add this taskHandler to the ProcessStatusBroadcaster so that it will be
-                 * periodically queried for state
-                 */
-                int workerReportIntervalMillis = config.getInt(
-                    WORKER_STATUS_REPORT_INTERVAL_MILLIS_PROP,
-                    WORKER_STATUS_REPORT_INTERVAL_MILLIS_DEFAULT);
-                log.info("Adding worker thread to status reporter");
-                addProcessStatusReporter(workerThread.getTaskDispatcher(),
-                    workerReportIntervalMillis);
-
-                workerThread.start();
-
-                workerThreads.add(workerThread);
-            }
-
-            log.info("Adding shutdown hook");
-            ZiggyShutdownHook
-                .addShutdownHook(new WorkerShutdownHook(getProcessInfo().getPid(), workerThreads));
-
-            log.info("Starting metrics dumper thread...");
-            MetricsDumper metricsDumper = new MetricsDumper(
-                AbstractPipelineProcess.getProcessInfo().getPid());
-            Thread metricsDumperThread = new Thread(metricsDumper, "MetricsDumper");
-            metricsDumperThread.setDaemon(true);
-            metricsDumperThread.start();
-
-            log.info("Starting algorithm monitor threads...");
-            AlgorithmMonitor.initialize();
-
-            log.info("Loading event handlers...");
-            ziggyEventHandlers.addAll(new ZiggyEventCrud().retrieveAllEventHandlers());
-            for (ZiggyEventHandler handler : ziggyEventHandlers) {
-                if (handler.isEnableOnClusterStart()) {
-                    handler.start();
-                }
-            }
-            log.info("Loading event handlers...done");
-
-        } catch (Exception e) {
-            log.error("Initialization failed!", e);
-            System.exit(-1);
-        }
-    }
-
-    private void clearTemporaryDirs() {
-        Configuration config = ZiggyConfiguration.getInstance();
-        boolean enabled = config.getBoolean(WORKER_CLEAN_TMP_AT_STARTUP_PROP,
-            WORKER_CLEAN_TMP_AT_STARTUP_DEFAULT);
-
-        if (enabled) {
-            log.info("Cleaning worker tmp dir");
-
-            try {
-                File dataDir = DirectoryProperties.taskDataDir().toFile();
-
-                FileUtils.cleanDirectory(dataDir);
-            } catch (IOException e) {
-                log.warn("Failed to clean worker tmp dir, caught e = " + e, e);
-            }
-        }
-    }
-
-    /**
-     * Set the state to ERROR for all tasks assigned to this worker where the state is currently
-     * PROCESSING or SUBMITTED. Used at worker startup to reset the state after an abnormal worker
-     * exit while processing.
-     *
-     * @param workerHost
-     */
-    public void clearStaleTaskStates(String workerHost) {
-
-        /*
-         * Set the pipeline task state to ERROR for any tasks assigned to this worker that are in
-         * the PROCESSING state or the SUBMITTED state. These conditions indicate that the previous
-         * instance of the worker process on this host died abnormally
-         */
-        ClearStaleStateResults clearStateResults = (ClearStaleStateResults) DatabaseTransactionFactory
-            .performTransaction(() -> {
-                PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-                return pipelineTaskCrud.clearStaleState(workerHost);
-            });
-
-        /*
-         * Update the pipeline instance state for the instances associated with the stale tasks from
-         * above since that change may result in a change to the instances
-         */
-
-        DatabaseTransactionFactory.performTransaction(() -> {
-            PipelineExecutor pe = new PipelineExecutor();
-            PipelineInstanceCrud instanceCrud = new PipelineInstanceCrud();
-
-            for (Long instanceId : clearStateResults.uniqueInstanceIds) {
-                log.info("Updating instance state for instanceId = " + instanceId);
-                PipelineInstance instance = instanceCrud.retrieve(instanceId);
-                pe.updateInstanceState(instance);
-            }
-            return null;
-        });
-
-    }
-
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        int workerThreads = Integer.parseInt(args[0]);
-        WorkerPipelineProcess p = new WorkerPipelineProcess(workerThreads);
-        p.go();
-    }
-
-    public static int workerThreadCount() {
-        return workerThreadCount;
-    }
-
-    public static long heapSize() {
-        return heapSize;
-    }
-
-    public static Set<ZiggyEventHandler> ziggyEventHandlers() {
-        return ziggyEventHandlers;
-    }
-
-    public static Set<ZiggyEventHandlerInfoForDisplay> serializableZiggyEventHandlers() {
-        return ziggyEventHandlers.stream()
-            .map(ZiggyEventHandlerInfoForDisplay::new)
-            .collect(Collectors.toSet());
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/worker/WorkerShutdownHook.java b/src/main/java/gov/nasa/ziggy/worker/WorkerShutdownHook.java
deleted file mode 100644
index 6a60fa5..0000000
--- a/src/main/java/gov/nasa/ziggy/worker/WorkerShutdownHook.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package gov.nasa.ziggy.worker;
-
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Shutdown hook for the pipeline worker process. Responsible for killing any running MATLAB
- * external processes and rolling back outstanding transactions.
- *
- * @author Todd Klaus
- */
-public class WorkerShutdownHook implements Runnable {
-    private static final Logger log = LoggerFactory.getLogger(WorkerShutdownHook.class);
-
-    private final List<WorkerTaskRequestHandler> workerThreads;
-
-    public WorkerShutdownHook(int workerPid, List<WorkerTaskRequestHandler> workerThreads) {
-        this.workerThreads = workerThreads;
-    }
-
-    @Override
-    public void run() {
-        try {
-            int threadIndex = 0;
-            for (WorkerTaskRequestHandler workerThread : workerThreads) {
-                log.info("SHUTDOWN: Shutting down worker thread #" + threadIndex + "...");
-                workerThread.interrupt();
-                threadIndex++;
-            }
-
-            log.info("SHUTDOWN: waiting for tasks to rollback...");
-            Thread.sleep(5000);
-
-            log.info("SHUTDOWN: exiting");
-        } catch (Throwable t) {
-            log.error("SHUTDOWN: Caught exception during shutdown", t);
-        }
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/worker/WorkerTaskRequestDispatcher.java b/src/main/java/gov/nasa/ziggy/worker/WorkerTaskRequestDispatcher.java
deleted file mode 100644
index 8a9fc48..0000000
--- a/src/main/java/gov/nasa/ziggy/worker/WorkerTaskRequestDispatcher.java
+++ /dev/null
@@ -1,648 +0,0 @@
-package gov.nasa.ziggy.worker;
-
-import static gov.nasa.ziggy.services.database.DatabaseTransactionFactory.performTransaction;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.hibernate.Hibernate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.metrics.CounterMetric;
-import gov.nasa.ziggy.metrics.IntervalMetric;
-import gov.nasa.ziggy.metrics.IntervalMetricKey;
-import gov.nasa.ziggy.metrics.Metric;
-import gov.nasa.ziggy.module.ModuleFatalProcessingException;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.module.WorkerMemoryManager;
-import gov.nasa.ziggy.pipeline.PipelineExecutor;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineModule;
-import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.pipeline.definition.ProcessingState;
-import gov.nasa.ziggy.pipeline.definition.TaskCounts;
-import gov.nasa.ziggy.pipeline.definition.TaskExecutionLog;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceNodeCrud;
-import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
-import gov.nasa.ziggy.pipeline.definition.crud.ProcessingSummaryOperations;
-import gov.nasa.ziggy.services.alert.AlertService;
-import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.services.database.DatabaseService;
-import gov.nasa.ziggy.services.database.DatabaseTransaction;
-import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
-import gov.nasa.ziggy.services.logging.TaskLog;
-import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-import gov.nasa.ziggy.services.process.ProcessInfo;
-import gov.nasa.ziggy.services.process.StatusMessage;
-import gov.nasa.ziggy.services.process.StatusReporter;
-import gov.nasa.ziggy.util.ZiggyShutdownHook;
-import gov.nasa.ziggy.util.ZiggyVersion;
-
-/**
- * Coordinates processing of inbound worker task request messages. Manages the database and
- * messaging transaction context, invokes the module, then invokes the transition logic.
- * <p>
- * This class is not MT-safe, and is intended to be called only by a single, dedicated worker thread
- * ({@link WorkerTaskRequestHandler}
- *
- * @author Todd Klaus
- */
-public class WorkerTaskRequestDispatcher implements StatusReporter {
-    private static final Logger log = LoggerFactory.getLogger(WorkerTaskRequestDispatcher.class);
-
-    // This Map contains the ID of every task being processed by a WorkerTaskRequestDispatcher
-    // instance, and whether that task is slated for deletion. This allows outside threads to
-    // tell WorkerTaskRequestDispatcher that a task needs to be deleted, and then allows both
-    // WorkerTaskRequestDispatcher and the PipelineModule instances that this is the case.
-    private static Map<Long, Boolean> taskDeletionStatus = new ConcurrentHashMap<>();
-
-    public static final String PIPELINE_MODULE_COMMIT_METRIC = "pipeline.module.commitTime";
-    public static final int MAX_TASK_RETRIEVE_RETRIES = 1;
-    public static final long WAIT_BETWEEN_RETRIES_MILLIS = 100;
-
-    private final ProcessInfo processInfo;
-    private final int threadNumber;
-    private TaskLog taskLog;
-    private WorkerMemoryManager memoryManager = null;
-    private String lastErrorMessage = "";
-    private boolean taskDone;
-    private WorkerThreadContext threadContext = new WorkerThreadContext();
-    private long taskId;
-
-    /**
-     * @param processInfo
-     * @param threadNum
-     * @param memoryManager
-     */
-    public WorkerTaskRequestDispatcher(ProcessInfo processInfo, int threadNum,
-        WorkerMemoryManager memoryManager) {
-        this.processInfo = processInfo;
-        threadNumber = threadNum;
-        this.memoryManager = memoryManager;
-
-        ZiggyConfiguration.getInstance();
-    }
-
-    /**
-     * Process incoming worker task requests
-     *
-     * @throws PipelineException
-     */
-    public void processMessage(WorkerTaskRequest workerRequest) {
-        threadContext.setRequest(workerRequest);
-        taskId = workerRequest.getTaskId();
-        taskLog = initializeTaskLog(workerRequest.getTaskId());
-
-        IntervalMetricKey key = IntervalMetric.start();
-
-        boolean taskDone = false;
-
-        try {
-            taskLog.startLogging();
-
-            threadContext.setState(WorkerThreadContext.ThreadState.PROCESSING);
-            threadContext.setProcessingStartTimeMillis(System.currentTimeMillis());
-
-            /*
-             * Insert a random delay in order to stagger the start times across all workers. Useful
-             * for reducing the surge on the database and filestore when a new pipeline starts
-             */
-            RandomDelay.randomWait();
-
-            if (isTaskDeleted(taskId)) {
-                log.info("Task deleted, exiting prior to pre-processing step");
-                cleanup();
-                return;
-            }
-            log.info("Executing pre-processing for taskId = " + workerRequest.getTaskId() + "...");
-
-            boolean doTransitionOnly = preProcessing(workerRequest.isDoTransitionOnly());
-
-            log.info("DONE executing pre-processing for taskId = " + workerRequest.getTaskId());
-
-            if (!doTransitionOnly) {
-                try {
-                    Metric.enableThreadMetrics();
-
-                    if (isTaskDeleted(taskId)) {
-                        log.info("Task deleted, exiting prior to processTask step");
-                        cleanup();
-                        return;
-                    }
-
-                    /* Invoke the module */
-                    log.info(
-                        "Executing processTask for taskId = " + workerRequest.getTaskId() + "...");
-                    taskDone = processTask();
-
-                    if (isTaskDeleted(taskId)) {
-                        log.info("Task deleted, exiting after processTask step");
-                        cleanup();
-                        return;
-                    }
-
-                    if (taskDone) {
-                        log.info(
-                            "DONE executing processTask for taskId = " + workerRequest.getTaskId());
-                        CounterMetric.increment("pipeline.module.execSuccessCount");
-                    } else {
-                        log.info(
-                            "DONE executing processTask for current step (more steps remain) for taskId = "
-                                + workerRequest.getTaskId());
-                    }
-                } finally {
-                    threadContext.setThreadMetrics(Metric.getThreadMetrics());
-                    Metric.disableThreadMetrics();
-                }
-            }
-
-            /* Update the task status */
-
-            if (isTaskDeleted(taskId)) {
-                log.info("Task deleted, exiting prior to post-processing step");
-                cleanup();
-                return;
-            }
-            log.info("Executing post-processing for taskId = " + workerRequest.getTaskId() + "...");
-            postProcessing(taskDone, true);
-
-            if (taskDone) {
-                /* run the transition logic */
-                if (isTaskDeleted(taskId)) {
-                    log.info("Task deleted, exiting prior to doTransition step");
-                    cleanup();
-                    return;
-                }
-                doTransition(true);
-                log.info(
-                    "DONE executing post-processing for taskId = " + workerRequest.getTaskId());
-            }
-
-        } catch (Throwable t) {
-            lastErrorMessage = t.getMessage();
-
-            log.error("processMessage(): caught exception processing worker task request for "
-                + contextString(threadContext), t);
-
-            CounterMetric.increment("pipeline.module.execFailCount");
-
-            if (threadContext.getPipelineTask() != null) {
-                // could be null if it wasn't found in the db
-                try {
-                    postProcessing(true, false);
-                } catch (Throwable t2) {
-                    log.error("Failed in postProcessing for: " + contextString(threadContext), t2);
-                }
-                try {
-                    doTransition(false);
-                } catch (Throwable t2) {
-                    log.error("Failed in doTransition for: " + contextString(threadContext), t2);
-                }
-            }
-
-        } finally {
-            cleanup();
-            IntervalMetric.stop("pipeline.module.processMessage", key);
-
-            // make sure any active transaction is cleaned up
-            DatabaseService databaseService = DatabaseService.getInstance();
-            databaseService.rollbackTransactionIfActive();
-        }
-    }
-
-    private TaskLog initializeTaskLog(long taskId) {
-        PipelineTaskCrud crud = new PipelineTaskCrud();
-        PipelineTask pipelineTask = (PipelineTask) DatabaseTransactionFactory
-            .performTransaction(() -> {
-                PipelineTask task = null;
-                int iTry = 0;
-                while (task == null && iTry < MAX_TASK_RETRIEVE_RETRIES) {
-                    task = crud.retrieve(taskId);
-                    if (task == null) {
-                        Thread.sleep(WAIT_BETWEEN_RETRIES_MILLIS);
-                    }
-                }
-                if (task == null) {
-                    throw new ModuleFatalProcessingException(
-                        "No pipeline task found for ID=" + taskId);
-                }
-                Hibernate.initialize(task.getSummaryMetrics());
-                Hibernate.initialize(task.getExecLog());
-                Hibernate.initialize(task.getProducerTaskIds());
-                return task;
-            });
-
-        TaskLog taskLog = new TaskLog(threadNumber, pipelineTask);
-        threadContext.setTaskLog(taskLog);
-
-        DatabaseTransactionFactory.performTransaction(() -> {
-            PipelineTask task = crud.retrieve(taskId);
-            task.incrementTaskLogIndex();
-            crud.update(task);
-            return null;
-        });
-
-        return taskLog;
-    }
-
-    /**
-     * Update the PipelineTask in the db to reflect the fact that this worker is now processing the
-     * task. This is done with a local transaction (outside of the distributed transaction) and
-     * committed immediately so that the console will show updated status right away
-     *
-     * @return boolean Indicates whether only the transition logic needs to be run
-     * @throws PipelineException
-     */
-    private boolean preProcessing(boolean doTransitionOnlyOverride) throws Exception {
-
-        return (boolean) DatabaseTransactionFactory.performTransaction(() -> {
-            PipelineInstanceCrud pipelineInstanceCrud = new PipelineInstanceCrud();
-            PipelineInstance pipelineInstance = pipelineInstanceCrud
-                .retrieve(threadContext.getRequest().getInstanceId());
-
-            if (pipelineInstance == null) {
-                throw new PipelineException("No PipelineInstance found for id="
-                    + threadContext.getRequest().getInstanceId());
-            }
-
-            PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-            PipelineTask pipelineTask = pipelineTaskCrud
-                .retrieve(threadContext.getRequest().getTaskId());
-
-            if (pipelineTask == null) {
-                throw new PipelineException(
-                    "No PipelineTask found for id=" + threadContext.getRequest().getTaskId());
-            }
-
-            TaskExecutionLog execLog = new TaskExecutionLog(processInfo.getHost(), threadNumber);
-            execLog.setStartProcessingTime(new Date(threadContext.getProcessingStartTimeMillis()));
-            execLog.setInitialState(pipelineTask.getState());
-            execLog.setInitialProcessingState(pipelineTask.getProcessingState());
-
-            pipelineTask.getExecLog().add(execLog);
-
-            if (pipelineTask.getState() == PipelineTask.State.ERROR) {
-                PipelineInstanceNodeCrud pipelineInstanceNodeCrud = new PipelineInstanceNodeCrud();
-
-                pipelineInstanceNodeCrud
-                    .decrementFailedTaskCount(threadContext.getRequest().getInstanceNodeId());
-            }
-
-            PipelineModuleDefinition moduleDefinition = pipelineTask.getPipelineInstanceNode()
-                .getPipelineModuleDefinition();
-            threadContext.setMinMemoryMegaBytes(moduleDefinition.getMinMemoryMegaBytes());
-
-            /*
-             * If the user requested that only the transition logic be re-run, or if the transition
-             * logic previously failed, then we only need to re-run the transition logic
-             */
-            boolean transitionOnly = doTransitionOnlyOverride
-                || pipelineTask.getState() == PipelineTask.State.COMPLETED
-                || pipelineTask.getState() == PipelineTask.State.PARTIAL;
-
-            if (!transitionOnly) {
-                pipelineTask.setState(PipelineTask.State.PROCESSING);
-                pipelineTask.setWorkerHost(processInfo.getHost());
-                pipelineTask.setWorkerThread(threadNumber);
-                pipelineTask.setTransitionComplete(false);
-                pipelineTask.setSoftwareRevision(ZiggyVersion.getSoftwareVersion());
-                pipelineTask.startExecutionClock();
-            }
-            return transitionOnly;
-        });
-    }
-
-    /**
-     * Invoke PipelineModule.processTask() and execute the transition logic (if applicable)
-     *
-     * @throws Throwable
-     * @returns boolean If true, task is done (no more steps)
-     */
-    private boolean processTask() throws Throwable {
-        IntervalMetricKey key = null;
-        String moduleExecMetricPrefix = null;
-
-        try {
-            /*
-             * Make sure enough memory is available for this task before starting the transaction
-             */
-            if (memoryManager != null) {
-                memoryManager.acquireMemoryMegaBytes(threadContext.getMinMemoryMegaBytes());
-            }
-
-            performTransaction(() -> {
-                PipelineInstanceCrud pipelineInstanceCrud = new PipelineInstanceCrud();
-                PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-
-                WorkerTaskRequest currentRequest = threadContext.getRequest();
-                threadContext.setPipelineInstance(
-                    pipelineInstanceCrud.retrieve(currentRequest.getInstanceId()));
-                threadContext
-                    .setPipelineTask(pipelineTaskCrud.retrieve(currentRequest.getTaskId()));
-                Hibernate.initialize(threadContext.getPipelineTask()
-                    .getPipelineInstance()
-                    .getPipelineParameterSets());
-                Hibernate.initialize(threadContext.getPipelineTask()
-                    .getPipelineInstanceNode()
-                    .getModuleParameterSets());
-                Hibernate.initialize(threadContext.getPipelineTask()
-                    .getPipelineDefinitionNode()
-                    .getInputDataFileTypes());
-                Hibernate.initialize(threadContext.getPipelineTask()
-                    .getPipelineDefinitionNode()
-                    .getOutputDataFileTypes());
-                Hibernate.initialize(
-                    threadContext.getPipelineTask().getPipelineDefinitionNode().getModelTypes());
-                return null;
-            });
-            PipelineModuleDefinition moduleDefinition = threadContext.getPipelineTask()
-                .getPipelineInstanceNode()
-                .getPipelineModuleDefinition();
-            String moduleName = moduleDefinition.getName().getName();
-            threadContext.setModule(moduleName);
-            threadContext
-                .setModuleUow(threadContext.getPipelineTask().uowTaskInstance().briefState());
-            moduleExecMetricPrefix = "pipeline.module." + threadContext.getModule();
-
-            log.info("processing:" + contextString(threadContext));
-
-            PipelineModule currentPipelineModule = threadContext.getPipelineTask()
-                .getModuleImplementation(threadContext.getRequest().getRunMode());
-
-            threadContext.setPipelineModule(currentPipelineModule);
-
-            String moduleSimpleName = threadContext.getPipelineModule().getClass().getSimpleName();
-
-            log.info("Calling " + moduleSimpleName + ".processTask()");
-
-            key = IntervalMetric.start();
-            long startTime = System.currentTimeMillis();
-
-            try {
-                // Hand off control to the PipelineModule implementation
-                if (currentPipelineModule.processTaskRequiresDatabaseTransaction()) {
-                    performTransaction(() -> {
-                        setTaskDone(currentPipelineModule.processTask());
-                        return null;
-                    });
-                } else {
-                    setTaskDone(currentPipelineModule.processTask());
-                }
-            } catch (Throwable e) {
-                log.error("Unexpected exception processing task", e);
-                throw e;
-            } finally {
-                IntervalMetric.stop(moduleExecMetricPrefix + ".processTask", key);
-                threadContext.setModuleExecTime(System.currentTimeMillis() - startTime);
-            }
-
-            log.info(moduleSimpleName + ".process() completed");
-
-            // send any queued messages
-            currentPipelineModule.flushWorkerMessages();
-
-            if (isTaskDone()) {
-                ProcessingSummaryOperations attrOps = new ProcessingSummaryOperations();
-                attrOps.updateProcessingState(threadContext.getPipelineTask().getId(),
-                    ProcessingState.COMPLETE);
-            }
-
-            return isTaskDone();
-        } catch (Throwable t) {
-            log.error("Failed in PipelineModule.processTask() for: " + contextString(threadContext),
-                t);
-            CounterMetric.increment("pipeline.module.execFailCount");
-            throw t;
-        } finally {
-            if (memoryManager != null) {
-                memoryManager.releaseMemoryMegaBytes(threadContext.getMinMemoryMegaBytes());
-            }
-
-            if (moduleExecMetricPrefix != null) {
-                CounterMetric.increment(moduleExecMetricPrefix + ".execCount");
-            }
-        }
-    }
-
-    /**
-     * Update the PipelineTask in the db with the results of the processing
-     *
-     * @param summaryMetrics
-     * @throws Exception
-     */
-    private void postProcessing(boolean done, boolean success) throws Throwable {
-
-        performTransaction(() -> {
-            PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-            long taskId = threadContext.getRequest().getTaskId();
-            PipelineTask pipelineTask = pipelineTaskCrud.retrieve(taskId);
-
-            if (pipelineTask == null) {
-                throw new PipelineException("No PipelineTask found for id=" + taskId);
-            }
-
-            long processingEndTimeMillis = System.currentTimeMillis();
-            long totalProcessingTimeMillis = processingEndTimeMillis
-                - threadContext.getProcessingStartTimeMillis();
-
-            log.info("Total processing time for this step (minutes): "
-                + totalProcessingTimeMillis / 1000.0 / 60.0);
-
-            Date endProcessingTime = new Date(processingEndTimeMillis);
-
-            // Update summary metrics
-            threadContext.getPipelineModule()
-                .updateMetrics(pipelineTask, threadContext.getThreadMetrics(),
-                    totalProcessingTimeMillis);
-
-            if (done) {
-                pipelineTask.stopExecutionClock();
-                if (success) {
-                    if (threadContext.getPipelineModule().isPartialSuccess()) {
-                        pipelineTask.setState(PipelineTask.State.PARTIAL);
-                    } else {
-                        pipelineTask.setState(PipelineTask.State.COMPLETED);
-                    }
-                } else {
-                    pipelineTask.setState(PipelineTask.State.ERROR);
-                    pipelineTask.incrementFailureCount();
-
-                    try {
-                        AlertService alertService = AlertService.getInstance();
-                        alertService.generateAlert("PI(" + threadContext.getModule() + ")",
-                            pipelineTask.getId(), AlertService.Severity.INFRASTRUCTURE,
-                            lastErrorMessage);
-                    } catch (Throwable t) {
-                        log.warn("Failed to generate alert for message: " + lastErrorMessage);
-                    }
-                }
-            }
-
-            List<TaskExecutionLog> execLog = pipelineTask.getExecLog();
-            log.info("execLog = " + execLog.size());
-
-            if (execLog != null && !execLog.isEmpty()) {
-                TaskExecutionLog currentExecLog = execLog.get(execLog.size() - 1);
-                currentExecLog.setEndProcessingTime(endProcessingTime);
-                currentExecLog.setFinalState(pipelineTask.getState());
-                currentExecLog.setFinalProcessingState(pipelineTask.getProcessingState());
-            } else {
-                log.warn("stepLog is missing or empty for taskId: " + taskId);
-            }
-            return null;
-        });
-
-    }
-
-    private void doTransition(boolean success) throws Throwable {
-
-        /*
-         * Start a separate transaction to run the transition logic. Do this in a separate
-         * transaction so that if it fails, the next worker to get this task only has to re-try the
-         * transition logic rather than the whole unit of work (because we set the pipeline task
-         * state to COMPLETED in postProcessing)
-         */
-
-        performTransaction(new DatabaseTransaction<Void>() {
-
-            String moduleExecMetricPrefix = "pipeline.module." + threadContext.getModule();
-            IntervalMetricKey key = IntervalMetric.start();
-
-            @Override
-            public void finallyBlock() {
-                IntervalMetric.stop(moduleExecMetricPrefix + ".doTransition", key);
-            }
-
-            @Override
-            public Void transaction() {
-                WorkerTaskRequest currentRequest = threadContext.getRequest();
-                LinkedList<PipelineTask> createdTasks = new LinkedList<>();
-
-                /*
-                 * update pipelineInstance state based on the current task counts of all of the
-                 * PipelineInstanceNodes
-                 */
-
-                PipelineInstanceCrud pipelineInstanceCrud = new PipelineInstanceCrud();
-                PipelineInstance pipelineInstance = pipelineInstanceCrud
-                    .retrieve(currentRequest.getInstanceId());
-
-                if (pipelineInstance == null) {
-                    throw new PipelineException(
-                        "No PipelineInstance found for id=" + currentRequest.getInstanceId());
-                }
-
-                PipelineTaskCrud pipelineTaskCrud = new PipelineTaskCrud();
-                PipelineTask pipelineTask = pipelineTaskCrud.retrieve(currentRequest.getTaskId());
-
-                if (pipelineTask == null) {
-                    throw new PipelineException(
-                        "No PipelineTask found for id=" + currentRequest.getTaskId());
-                }
-
-                PipelineExecutor pipelineExecutor = new PipelineExecutor();
-                PipelineModule currentModule = threadContext.getPipelineModule();
-
-                if (currentModule != null && currentModule.isHaltPipelineOnTaskCompletion()) {
-                    log.info(
-                        "currentPipelineModule.isHaltPipelineOnTaskCompletion == true, so NOT executing transition logic for "
-                            + contextString(threadContext));
-                } else {
-                    log.info("executing transition logic for " + contextString(threadContext));
-
-                    // obtains lock on PI_PIPELINE_INST_NODE (select for update)
-                    TaskCounts taskCountsForCurrentNode = pipelineExecutor
-                        .updateTaskCountsForCurrentNode(pipelineTask, success);
-
-                    if (success) {
-                        log.info("Executing transition logic");
-
-                        createdTasks = pipelineExecutor.doTransition(pipelineInstance, pipelineTask,
-                            taskCountsForCurrentNode);
-                        pipelineTask.setTransitionComplete(true);
-                    } else {
-                        log.info(
-                            "postProcessing: not executing transition logic because of current task failure");
-                    }
-                }
-
-                log.info("updating instance state for " + contextString(threadContext));
-                pipelineExecutor.updateInstanceState(pipelineInstance);
-
-                for (PipelineTask task : createdTasks) {
-                    pipelineExecutor.sendWorkerMessageForTask(task);
-                }
-                return null;
-            }
-        });
-    }
-
-    private void setTaskDone(boolean taskDone) {
-        this.taskDone = taskDone;
-    }
-
-    private boolean isTaskDone() {
-        return taskDone;
-    }
-
-    public static boolean isTaskDeleted(long taskId) {
-        return taskDeletionStatus.containsKey(taskId) ? taskDeletionStatus.get(taskId) : false;
-    }
-
-    public static boolean deleteTask(long taskId) {
-        boolean taskPresent = taskDeletionStatus.containsKey(taskId);
-        if (taskPresent) {
-            taskDeletionStatus.put(taskId, true);
-        }
-        return taskPresent;
-    }
-
-    /**
-     * @param task
-     * @return
-     */
-    private String contextString(WorkerThreadContext context) {
-        WorkerTaskRequest request = context.getRequest();
-        return "IID=" + request.getInstanceId() + ", TID=" + request.getTaskId() + ", M="
-            + context.getModule() + ", UOW=" + context.getModuleUow();
-    }
-
-    /**
-     * Performs 2 actions that need to be taken before the {@link WorkerTaskRequestDispatcher} is
-     * ready to process a new task: ending any current task logging, and deleting the
-     * {@link WorkerThreadContext}.
-     */
-    private void cleanup() {
-        if (ZiggyShutdownHook.shutdownInProgress()) {
-            return;
-        }
-        taskDeletionStatus.remove(taskId);
-        threadContext = new WorkerThreadContext();
-        if (taskLog != null) {
-            taskLog.endLogging();
-            taskLog = null;
-        }
-    }
-
-    @Override
-    public synchronized StatusMessage reportCurrentStatus() {
-        PipelineInstance currentPipelineInstance = threadContext.getPipelineInstance();
-        PipelineTask currentPipelineTask = threadContext.getPipelineTask();
-        String currentPipelineInstanceId = currentPipelineInstance == null ? "-"
-            : "" + currentPipelineInstance.getId();
-        String currentPipelineTaskId = currentPipelineTask == null ? "-"
-            : "" + currentPipelineTask.getId();
-
-        return new WorkerStatusMessage(threadNumber, threadContext.getState().toString(),
-            currentPipelineInstanceId, currentPipelineTaskId, threadContext.getModule(),
-            threadContext.getModuleUow(), threadContext.getProcessingStartTimeMillis());
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/worker/WorkerTaskRequestHandler.java b/src/main/java/gov/nasa/ziggy/worker/WorkerTaskRequestHandler.java
deleted file mode 100644
index 043862f..0000000
--- a/src/main/java/gov/nasa/ziggy/worker/WorkerTaskRequestHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package gov.nasa.ziggy.worker;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.module.WorkerMemoryManager;
-import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-import gov.nasa.ziggy.services.process.ProcessInfo;
-
-/**
- * Interacts with the worker task queue to handle task requests. Hands off incoming messages to the
- * {@link WorkerTaskRequestDispatcher} for processing.
- *
- * @author Todd Klaus
- * @author Sean McCauliff
- * @author PT
- */
-public class WorkerTaskRequestHandler extends Thread {
-    private static final Logger log = LoggerFactory.getLogger(WorkerTaskRequestHandler.class);
-
-    private WorkerTaskRequestDispatcher taskDispatcher = null;
-
-    public WorkerTaskRequestHandler(ProcessInfo processInfo, int threadNum,
-        WorkerMemoryManager memoryManager) {
-        super("task-" + threadNum);
-
-        ZiggyConfiguration.getInstance();
-
-        taskDispatcher = new WorkerTaskRequestDispatcher(processInfo, threadNum, memoryManager);
-    }
-
-    @Override
-    public void run() {
-        log.debug("run() - start");
-
-        while (!isInterrupted()) {
-            try {
-                WorkerTaskRequest request = WorkerPipelineProcess.workerTaskRequestQueue.take();
-                log.info("Retrieved a request, processing");
-                taskDispatcher.processMessage(request);
-            } catch (InterruptedException e) {
-
-                // If there was an interrupted exception, re-interrupt the thread so that
-                // this loop will exit.
-                interrupt();
-            }
-        }
-    }
-
-    /**
-     * @return the taskDispatcher
-     */
-    public WorkerTaskRequestDispatcher getTaskDispatcher() {
-        return taskDispatcher;
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/worker/WorkerThreadContext.java b/src/main/java/gov/nasa/ziggy/worker/WorkerThreadContext.java
deleted file mode 100644
index 20f726d..0000000
--- a/src/main/java/gov/nasa/ziggy/worker/WorkerThreadContext.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package gov.nasa.ziggy.worker;
-
-import java.util.Map;
-
-import gov.nasa.ziggy.metrics.Metric;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
-import gov.nasa.ziggy.pipeline.definition.PipelineModule;
-import gov.nasa.ziggy.pipeline.definition.PipelineTask;
-import gov.nasa.ziggy.services.logging.TaskLog;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-
-/**
- * @author Todd Klaus
- */
-public class WorkerThreadContext {
-    public enum ThreadState {
-        IDLE, PROCESSING
-    }
-
-    private WorkerTaskRequest request = null;
-    private PipelineInstance pipelineInstance = null;
-    private PipelineTask pipelineTask = null;
-    private PipelineModule pipelineModule = null;
-    private ThreadState state = ThreadState.IDLE;
-    private String module = "-";
-    private String moduleUow = "-";
-    private long processingStartTimeMillis = 0;
-    private int minMemoryMegaBytes = 0;
-    private TaskLog taskLog = null;
-    private long moduleExecTime = 0L;
-    private Map<String, Metric> threadMetrics = null;
-
-    public WorkerThreadContext() {
-    }
-
-    public WorkerTaskRequest getRequest() {
-        return request;
-    }
-
-    public void setRequest(WorkerTaskRequest currentRequest) {
-        request = currentRequest;
-    }
-
-    public PipelineInstance getPipelineInstance() {
-        return pipelineInstance;
-    }
-
-    public void setPipelineInstance(PipelineInstance currentPipelineInstance) {
-        pipelineInstance = currentPipelineInstance;
-    }
-
-    public PipelineTask getPipelineTask() {
-        return pipelineTask;
-    }
-
-    public void setPipelineTask(PipelineTask currentPipelineTask) {
-        pipelineTask = currentPipelineTask;
-    }
-
-    public PipelineModule getPipelineModule() {
-        return pipelineModule;
-    }
-
-    public void setPipelineModule(PipelineModule currentPipelineModule) {
-        pipelineModule = currentPipelineModule;
-    }
-
-    public ThreadState getState() {
-        return state;
-    }
-
-    public void setState(ThreadState currentState) {
-        state = currentState;
-    }
-
-    public String getModule() {
-        return module;
-    }
-
-    public void setModule(String currentModule) {
-        module = currentModule;
-    }
-
-    public String getModuleUow() {
-        return moduleUow;
-    }
-
-    public void setModuleUow(String currentModuleUow) {
-        moduleUow = currentModuleUow;
-    }
-
-    public long getProcessingStartTimeMillis() {
-        return processingStartTimeMillis;
-    }
-
-    public void setProcessingStartTimeMillis(long currentProcessingStartTimeMillis) {
-        processingStartTimeMillis = currentProcessingStartTimeMillis;
-    }
-
-    public int getMinMemoryMegaBytes() {
-        return minMemoryMegaBytes;
-    }
-
-    public void setMinMemoryMegaBytes(int currentMinMemoryMegaBytes) {
-        minMemoryMegaBytes = currentMinMemoryMegaBytes;
-    }
-
-    public TaskLog getTaskLog() {
-        return taskLog;
-    }
-
-    public void setTaskLog(TaskLog taskLog) {
-        this.taskLog = taskLog;
-    }
-
-    /**
-     * @return the moduleExecTime
-     */
-    public long getModuleExecTime() {
-        return moduleExecTime;
-    }
-
-    /**
-     * @param moduleExecTime the moduleExecTime to set
-     */
-    public void setModuleExecTime(long moduleExecTime) {
-        this.moduleExecTime = moduleExecTime;
-    }
-
-    /**
-     * @return the threadMetrics
-     */
-    public Map<String, Metric> getThreadMetrics() {
-        return threadMetrics;
-    }
-
-    /**
-     * @param threadMetrics the threadMetrics to set
-     */
-    public void setThreadMetrics(Map<String, Metric> threadMetrics) {
-        this.threadMetrics = threadMetrics;
-    }
-}
diff --git a/src/main/java/gov/nasa/ziggy/worker/messaging/WorkerMessageDispatcher.java b/src/main/java/gov/nasa/ziggy/worker/messaging/WorkerMessageDispatcher.java
deleted file mode 100644
index 0711fea..0000000
--- a/src/main/java/gov/nasa/ziggy/worker/messaging/WorkerMessageDispatcher.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package gov.nasa.ziggy.worker.messaging;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Set;
-
-import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import gov.nasa.ziggy.metrics.report.Memdrone;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.services.events.ZiggyEventHandler;
-import gov.nasa.ziggy.services.events.ZiggyEventHandler.ZiggyEventHandlerInfoForDisplay;
-import gov.nasa.ziggy.services.logging.TaskLog;
-import gov.nasa.ziggy.services.logging.TaskLogInformation;
-import gov.nasa.ziggy.services.messages.DeleteTasksRequest;
-import gov.nasa.ziggy.services.messages.RunningPipelinesCheckRequest;
-import gov.nasa.ziggy.services.messages.StartMemdroneRequest;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
-import gov.nasa.ziggy.services.messages.WorkerResourceRequest;
-import gov.nasa.ziggy.services.messages.WorkerSingleTaskLogRequest;
-import gov.nasa.ziggy.services.messages.WorkerTaskLogInformationRequest;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-import gov.nasa.ziggy.services.messaging.WorkerMessageHandler;
-import gov.nasa.ziggy.worker.WorkerPipelineProcess;
-
-/**
- * Provides worker-side abstraction for processing message requests from a client.
- *
- * @author PT
- */
-public class WorkerMessageDispatcher implements WorkerMessageHandler {
-
-    Logger log = LoggerFactory.getLogger(WorkerMessageDispatcher.class);
-
-    private TriggerRequestManager triggerRequestManager;
-
-    public WorkerMessageDispatcher(TriggerRequestManager triggerRequestManager) {
-        this.triggerRequestManager = triggerRequestManager;
-    }
-
-    @Override
-    public synchronized void handleTriggerRequest(WorkerFireTriggerRequest fireTriggerRequest) {
-        triggerRequestManager.processRequest(fireTriggerRequest);
-    }
-
-    @Override
-    public synchronized void handleRunningPipelinesCheckRequest(
-        RunningPipelinesCheckRequest checkRequest) {
-        triggerRequestManager.processRequest(checkRequest);
-    }
-
-    @Override
-    public synchronized void handleWorkerTaskRequest(WorkerTaskRequest request) {
-        WorkerPipelineProcess.workerTaskRequestQueue.put(request);
-    }
-
-    @Override
-    public synchronized void handleStartMemdroneRequest(StartMemdroneRequest request) {
-        try {
-            if (Memdrone.memdroneEnabled()) {
-                request.memdrone().startMemdrone();
-            }
-        } catch (IOException e) {
-            throw new PipelineException("Unable to start Memdrone", e);
-        }
-
-    }
-
-    @Override
-    public synchronized Set<TaskLogInformation> handleTaskLogInformationRequest(
-        WorkerTaskLogInformationRequest request) {
-        return TaskLog.searchForLogFiles(request.getInstanceId(), request.getTaskId());
-    }
-
-    @Override
-    public synchronized String handleSingleTaskLogRequest(WorkerSingleTaskLogRequest request) {
-
-        File taskLogFile = new File(request.getTaskLogInformation().getFullPath());
-        String stepLogContents = "<Request timed-out!>";
-        log.info("Reading task log: " + taskLogFile);
-
-        Charset defaultCharset = null;
-        StringBuilder fileContents = new StringBuilder(1024 * 4);
-        try {
-            fileContents.append(FileUtils.readFileToString(taskLogFile, defaultCharset));
-            log.info("Returning task log (" + fileContents.length() + " chars): " + taskLogFile);
-            stepLogContents = fileContents.toString();
-        } catch (IOException e) {
-            log.warn("Exception waiting for response from: worker ", e);
-        }
-        return stepLogContents;
-    }
-
-    @Override
-    public synchronized WorkerResourceRequest.WorkerResources handleResourceRequest() {
-        return new WorkerResourceRequest.WorkerResources(WorkerPipelineProcess.workerThreadCount(),
-            WorkerPipelineProcess.heapSize());
-    }
-
-    @Override
-    public synchronized Set<ZiggyEventHandlerInfoForDisplay> handleEventHandlerRequest() {
-        return WorkerPipelineProcess.serializableZiggyEventHandlers();
-    }
-
-    @Override
-    public synchronized void handleEventHandlerToggleRequest(String handlerName) {
-        WorkerPipelineProcess.ziggyEventHandlers()
-            .stream()
-            .filter(s -> s.getName().equals(handlerName))
-            .forEach(ZiggyEventHandler::toggleStatus);
-    }
-
-    @Override
-    public boolean deleteTasks(DeleteTasksRequest request) throws IOException {
-        return request.deleteTasks();
-    }
-
-}
diff --git a/src/main/java/gov/nasa/ziggy/worker/messaging/package.html b/src/main/java/gov/nasa/ziggy/worker/messaging/package.html
deleted file mode 100644
index e86221a..0000000
--- a/src/main/java/gov/nasa/ziggy/worker/messaging/package.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-  <body>
-    <p>
-      The first sentence is used as the brief description of the
-      package and appears at the top of the package documentation.
-      Additional sentences will appear at the bottom in the
-      Description section.
-    </p>
-    <dl>
-      <dt>Author</dt>
-      <dd>Bill Wohler</dd>
-      <dd>PT</dd>
-    </dl>
-    
-    <h2>Headings</h2>
-
-    <p>
-      Additional headings should use h2.
-    </p>
-
-    <h3>Sub-headings</h3>
-    
-    <p>
-      Sub-headings should use h3 and so on.
-    </p>
-
-  </body>
-</html>
diff --git a/src/main/matlab/ZiggyErrorWriter.m b/src/main/matlab/ZiggyErrorWriter.m
index b3df0f8..f1b5bb5 100644
--- a/src/main/matlab/ZiggyErrorWriter.m
+++ b/src/main/matlab/ZiggyErrorWriter.m
@@ -3,10 +3,7 @@
 % ZiggyErrorWriter -- writes an HDF5 error file that can be read by Ziggy. The file
 % contains the error type and message, plus a stack trace.
 %
-% The entirety of the class' capabilities is in its constructor. The constructor can take
-% an optional integer argument which is the sequence number to be used in the file name of
-% the error file. If no sequence number is supplied (which is the more typical use-case),
-% a value of 0 will be used. The resulting file will be <module-name>-error-<seq-num>.h5.
+% The entirety of the class' capabilities is in its constructor. 
 %
 
 %=========================================================================================
@@ -22,24 +19,20 @@
 methods
     
     % constructor
-    function obj = ZiggyErrorWriter(sequenceNumber)
-        if ~exist('sequenceNumber', 'var') || isempty(sequenceNumber)
-            sequenceNumber = 0;
-        end
-        if ~is_int_valued(sequenceNumber) || ~isscalar(sequenceNumber)
-            sequenceNumber = 0;
+    function obj = ZiggyErrorWriter(lastError)
+        if ~exist('lastError', 'var') || isempty(lastError) 
+            lastError = lasterror;
         end
         
         % get the module name from the directory
         [filePath, ~, ~] = fileparts(pwd);
         [~, taskDir, ~] = fileparts(filePath);
         taskDirParts = split(taskDir, '-');
-        moduleName = taskDirParts{1};
+        moduleName = taskDirParts{3};
         
-        errorFileName = [moduleName, '-error-', num2str(sequenceNumber),'.h5'];
+        errorFileName = [moduleName, '-error.h5'];
         
         % populate the members of this object
-        lastError = lasterror;
         obj.message = lastError.message;
         obj.identifier = lastError.identifier;
         obj.stack = lastError.stack;
diff --git a/src/main/matlab/initialize_pipeline_configuration.m b/src/main/matlab/initialize_pipeline_configuration.m
index 9d7d57d..03e2c9b 100644
--- a/src/main/matlab/initialize_pipeline_configuration.m
+++ b/src/main/matlab/initialize_pipeline_configuration.m
@@ -1,4 +1,4 @@
-function initialize_pipeline_configuration() 
+function initialize_pipeline_configuration( csciNamesToSkip ) 
 %
 % initialize_pipeline_configuration -- sets up the necessary MATLAB paths and etc. for use
 % with a Ziggy-based pipeline.
@@ -10,6 +10,13 @@ function initialize_pipeline_configuration()
 % The function assumes the existence of an environment variable, ZIGGY_CODE_ROOT, which
 % is pointed to the top-level directory of the Ziggy directory tree. 
 %
+% During the Ziggy build, Ziggy copies this and other MATLAB files to its build directory:
+% ziggy/build/src/main/matlab. This function is written with the assumption that the user
+% will run from the build location and not from ziggy/src/main/matlab. 
+%
+% If argument csciNamesToSkip is defined, it must be a cell array of names of CSCIs that
+% are not to be added to the MATLAB search path. 
+%
 
 %=========================================================================================
 
@@ -21,24 +28,23 @@ function initialize_pipeline_configuration()
         
 %       get the Ziggy code root env var
 
-%       get the location of this file (it's in pipeline/ziggy/src/main/matlab, so once we
+%       get the location of this file (it's in ziggy/build/src/main/matlab, so once we
 %       find this file we know where the libs directory is)
 
         thisFile = strsplit(mfilename('fullpath'), filesep) ;
         thisFile{1} = filesep ;
         
-%       need to lop off the last 5 parts of the path to this file: the filename, "matlab",
-%       "main", "src", "ziggy"
+%       need to lop off the last 4 parts of the path to this file: the filename, "matlab",
+%       "main", "src"
 
         nPathSteps = length(thisFile) - 4 ;
-        pipelineLocation = fullfile(thisFile{1:nPathSteps});
+        buildDir = fullfile(thisFile{1:nPathSteps});
         thisLocation = fullfile(thisFile{1:length(thisFile)-1}) ;
         
 %       add this location to the path
 
         addpath(thisLocation) ;
         
-        buildDir = fullfile(pipelineLocation, 'build') ;
         if exist(fullfile(buildDir, 'libs', 'pipeline-classpath.jar'), 'file') ~= 0
             javaaddpath(fullfile(buildDir, 'libs', 'pipeline-classpath.jar')) ;
         else
@@ -59,10 +65,13 @@ function initialize_pipeline_configuration()
         csciNames = csciNames(:)' ;
         
         for iCsci = csciNames
-            csciMatlabDirs = pipelinePathObject.get_csci_paths( iCsci{1} ) ;
-            pipelinePathClass.addpath_cell_array( csciMatlabDirs ) ;
-            csciMexDirs = pipelinePathObject.get_csci_mex_paths( iCsci{1} ) ;
-            pipelinePathClass.addpath_cell_array( csciMexDirs ) ;
+            if ~exist('csciNamesToSkip', 'var') || ...
+                    ~any(ismember(csciNamesToSkip, iCsci{1}))
+                csciMatlabDirs = pipelinePathObject.get_csci_paths( iCsci{1} ) ;
+                pipelinePathClass.addpath_cell_array( csciMatlabDirs ) ;
+                csciMexDirs = pipelinePathObject.get_csci_mex_paths( iCsci{1} ) ;
+                pipelinePathClass.addpath_cell_array( csciMexDirs ) ;
+            end
         end
 
 %       log4j configuration
@@ -78,7 +87,7 @@ function initialize_pipeline_configuration()
             disp(['Setting log4j2 configuration file to ' log4jConfigFile]);
             java.lang.System.setProperty('log4j2.configurationFile', log4jConfigFile);
             log4jDestination = fullfile(pipelineProperties.get_property( ...
-                'pipeline.home.dir'), 'logs') ;
+                'ziggy.pipeline.home.dir'), 'logs') ;
             disp(['Setting log4j destination to: ',log4jDestination]) ;
             % trailing slash needed
             java.lang.System.setProperty('log4j.logfile.prefix', ...
diff --git a/src/main/matlab/pipelinePathClass.m b/src/main/matlab/pipelinePathClass.m
index 80acc50..2ab6ffa 100644
--- a/src/main/matlab/pipelinePathClass.m
+++ b/src/main/matlab/pipelinePathClass.m
@@ -32,7 +32,7 @@
 %   get the code directories, assuming they are 1 level above the build directories, which in
 %   turn are in the properties
 
-    pipelineHomeDir = propertiesObject.get_property('pipeline.home.dir') ;
+    pipelineHomeDir = propertiesObject.get_property('ziggy.pipeline.home.dir') ;
     ziggyHomeDir   = propertiesObject.get_property('ziggy.home.dir') ;
     if (pipelineHomeDir(end) == filesep)
         pipelineHomeDir = pipelineHomeDir(1:end-1) ;
@@ -46,6 +46,7 @@
 %   dynamically construct the CSCI list and populate it with everything
 
     object.csciPathStruct = object.set_csci_paths( {pipelineCodeDir, ziggyCodeDir} ) ;
+    object.csciPathStruct(end).csciName = 'ziggy';
     
 end % constructor
 
@@ -207,19 +208,10 @@
                     csciPathStruct0(iCsci).unitTestPaths ] ;
             end
         
-% %       similar process for the release test directories
-% 
-%         matlabReleaseTestRoot = fullfile( csciRoot, 'src', 'release-test', 'matlab' ) ;
-%         if exist( matlabReleaseTestRoot, 'dir' )
-%             csciPathStruct(iCsci).releaseTestPaths = ...
-%                 spocMatlabPathClass.recursively_find_bottom_dirs( ...
-%                 matlabReleaseTestRoot ) ;
-%         end
-        
-%           mexfile paths are relatively easy, since they go into the build/lib directory
+%           mexfile paths are relatively easy, since they go into the build/mex directory
 %           under the given CSCI
 
-            mexPathRoot = fullfile( csciRoot, 'build', 'lib' ) ;
+            mexPathRoot = fullfile( csciRoot, 'build', 'mex' ) ;
             if exist( mexPathRoot, 'dir' )
                 libsDir = dir(mexPathRoot) ;
                 mexSuffix = regexp( {libsDir.name}, '(\.mex)' ) ;
@@ -253,50 +245,6 @@
     csciIndex = strcmpi( csciName, allCsciNames ) ;
 end
 
-% function to populate the CSCI test data directories
-
-% function set_csci_test_data_paths( object, displayMissing )
-%     
-% %   default value of displayMissing is false
-% 
-%     if ~exist('displayMissing', 'var') || isempty( displayMissing )
-%         displayMissing = false ;
-%     end
-%     
-% %   loop over CSCIs 
-%     
-%     for iCsci = 1:length( object.csciPathStruct )
-%         thisCsci = object.csciPathStruct(iCsci).csciName ;
-%         
-% %       look for UNIT_TEST_DATA_ROOT/csciName/test, which is the expected directory for
-% %       unit test data for this CSCI
-% 
-%         csciTestDataDir = fullfile( object.testDataRoot, thisCsci, 'test' ) ;
-%         if exist( csciTestDataDir, 'dir' )
-%             object.csciPathStruct(iCsci).unitTestDataPaths = {csciTestDataDir} ;
-%         else
-%             if displayMissing
-%                 disp(['No unit test data directory for CSCI ',thisCsci]) ;
-%             end
-%             object.csciPathStruct(iCsci).unitTestDataPaths = [] ;
-%         end
-%         
-% %       same sort of deal for release test data
-% 
-%         csciTestDataDir = fullfile( object.testDataRoot, thisCsci, 'release-test' ) ;
-%         if exist( csciTestDataDir, 'dir' )
-%             object.csciPathStruct(iCsci).releaseTestDataPaths = {csciTestDataDir} ;
-%         else
-%             if displayMissing
-%                 disp(['No release test data directory for CSCI ',thisCsci]) ;
-%             end
-%             object.csciPathStruct(iCsci).releaseTestDataPaths = [] ;
-%         end
-%         
-%     end
-%         
-% end
-
 end % protected methods
 
 %=========================================================================================
@@ -354,18 +302,6 @@ function addpath_cell_array( cellArray )
         addpath( iArray{1} ) ;
     end
 end
-
-% function set_unit_test_data_path( pathName )
-%     
-%     setenv( pipelinePathClass.dataRootEnvVar, pathName ) ;
-% 
-% end
-% 
-% function set_release_test_data_path( pathName )
-%     
-%     setenv( pipelinePathClass.releaseTestDataRootEnvVar, pathName ) ;
-%     
-% end
     
 end % static methods
 end
diff --git a/src/main/matlab/write_MatlabErrorReturn.m b/src/main/matlab/write_MatlabErrorReturn.m
deleted file mode 100644
index c755d82..0000000
--- a/src/main/matlab/write_MatlabErrorReturn.m
+++ /dev/null
@@ -1,38 +0,0 @@
-function write_MatlabErrorReturn(file, s)
-
-if(isnumeric(file))
-    % assume a file descriptor was passed in
-   fid = file;
-   closeFile = false;
-else
-    % assume a filename was passed in
-    fid = fopen(file, 'wb');
-    if(fid == -1)
-      error(['write_MatlabErrorReturn: Unable to open file: ' file ]);
-    end;
-    closeFile = true;
- end;
-
-% String message
-fwrite(fid, length(s.message), 'int32');
-fwrite(fid, s.message, 'char');
-
-% String identifier
-fwrite(fid, length(s.identifier), 'int32');
-fwrite(fid, s.identifier, 'char');
-
-% MatlabStack stack[]
-if(length(find(size(s.stack) > 1)) > 1)
-	error('Error serializing .bin file: field s.stack is not a vector (see array2D_to_struct.m)');
-end;
-v1_stack_length = length(s.stack);
-fwrite(fid, v1_stack_length, 'int32');
-
-for i = 1:v1_stack_length
-    write_MatlabStack(fid, s.stack(i));
-end;
-
-if(closeFile)
-    fclose(fid);
-end;
-
diff --git a/src/main/perl/runjava.pl b/src/main/perl/runjava.pl
deleted file mode 100755
index 2e66fc8..0000000
--- a/src/main/perl/runjava.pl
+++ /dev/null
@@ -1,424 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-
-use Data::Dumper;
-use File::Basename;
-use File::Spec;
-use Getopt::Long qw(:config auto_help pass_through);
-
-my %pars = (
-    conffile     => '',                 # default is runjavaHome/etc/runjava.conf
-    norun        => 0,
-    properties   => $ENV{'PIPELINE_CONFIG_PATH'},
-    runjavaHome  => '',                 # default is ziggy.home.dir property
-    verbose      => 0,
-);
-
-my @args = qw{
-    conffile=s
-    norun
-    properties=s
-    runjavaHome=s
-    verbose!
-};
-
-my %properties;
-
-my $exitCode;
-eval {
-    $exitCode = main();
-};
-if (my $err = $@) {
-    print STDERR "# $0: $_\n", foreach split /\n/, $err;
-    exit 1;
-}
-exit ($exitCode != 0);
-
-sub main {
-    # Load user arguments, first picking out what's in %pars. Do not allow
-    # abbreviated args for %pars, and pass the rest into @ARGV.
-    GetOptions(\%pars, @args);
-    my ($inName, $jvmargs, $progargs) = getUserArgs(@ARGV);
-
-    # Read properties.
-    %properties = getProperties();
-
-    # Determine runjavaHome from option or ziggy.home.dir property.
-    if ($pars{runjavaHome} eq "") {
-        exists($properties{'ziggy.home.dir'})
-            or die "Missing Ziggy property ziggy.home.dir";
-        $pars{runjavaHome} = makeSubstitutions($properties{'ziggy.home.dir'}, %properties);
-    }
-    -d $pars{runjavaHome}
-        or die "Directory $pars{runjavaHome} set by runjavaHome option or ziggy.home.dir property does not exist";
-
-    # Now that we have a home, find the configuration file.
-    if ($pars{conffile} eq "") {
-        $pars{conffile} = "$pars{runjavaHome}/etc/runjava.conf";
-    }
-    -e $pars{conffile}
-        or die "$pars{conffile}: No such file";
-
-    # If the user didn't specify a nickname or fully qualified class name,
-    # display the nicknames.
-    if (!(defined $inName and length $inName)) {
-        displayNicknames();
-        exit 0;
-    }
-
-    my %nicknames  = getNicknames(1);
-
-    # Update unset environment variables from options.
-    if (!defined($ENV{'ZIGGY_HOME'})) {
-        $ENV{'ZIGGY_HOME'} = $pars{runjavaHome};
-    }
-    if (!defined($ENV{'PIPELINE_CONFIG_PATH'})) {
-        $ENV{'PIPELINE_CONFIG_PATH'} = $pars{properties};
-    }
-
-	# Make the Java runtime executable command. Use the location specified as java.home
-	# in the properties file, if any; otherwise, assume that a usable Java runtime
-	# executable is available on the search path. 
-	my $javacmd = 'java';
-	my $javahome = makeSubstitutions($properties{'java.home'}, %properties);
-	if ($javahome ne "") {
-		$javacmd = File::Spec->catfile($javahome, 'bin', $javacmd);
-		-e $javacmd
-			or die "$javacmd executable does not exist";
-	}
-	
-    # Start to make the command line.  Every call will use this prefix:
-    my $cmd = "$javacmd -cp \"$pars{runjavaHome}/libs/*";
-    my $pipelineClasspath = $properties{'pipeline.classpath'};
-    if (defined($pipelineClasspath) && $pipelineClasspath ne "") {
-        $cmd .= ":" . $pipelineClasspath;
-    }
-    $cmd .= "\" ";
-
-    # If the user-specified name is one of the pre-defined entries in the
-    # nicknames, use information that that nickname maps to. If not, the user will
-    # need to specify everything.
-    if (exists $nicknames{$inName}) {
-        my $substJvm = makeSubstitutions("$cmd $nicknames{$inName}{jvmargs} @$jvmargs", %properties);
-        $cmd = "$substJvm " .
-                "$nicknames{$inName}{classname} " .
-                "$nicknames{$inName}{progargs} @$progargs";
-    } else {
-        my $substJvm = makeSubstitutions("$cmd @$jvmargs", %properties);
-        $cmd = "$substJvm $inName @$progargs";
-    }
-
-    print "Running command:\n\t$cmd\n" if $pars{verbose};
-    return system $cmd if not $pars{norun};
-}
-
-sub getUserArgs {
-    # Parse through command line args. The first argument without a leading
-    # dash is the classname/nickname. All args before that are JVM args, all
-    # args after that are program args.
-    my @cmdLineArgs = @_;
-
-    my $name  = undef;
-    my $jvms  = [];
-    my $progs = [];
-
-    # Begin with the assumption that the Java classname/nickname has not been
-    # found yet.
-    my $isNameFound = 0;
-    foreach (@cmdLineArgs) {
-        # The Java classname or nickname is the first argument that does not
-        # have a leading dash.
-        if (!$isNameFound && !/^-/) {
-            $isNameFound = 1;
-            $name = $_;
-            next;
-        }
-
-        # If the name has been found already, all subsequent args are program
-        # arguments. Program arguments that contain spaces were entered by the
-        # user with quotes around them, and the quotes were stripped by the
-        # shell. Add the quotes back in so the user's intent is preserved.
-        #
-        # Otherwise, they are JVM arguments.
-        if ($isNameFound) {
-            $_ = "\"$_\"" if / /;
-            push @$progs, $_;
-        } else {
-            push @$jvms, $_;
-        }
-    }
-
-    return($name, $jvms, $progs);
-}
-
-sub getNicknames {
-    # The nicknames table is a hash table, hash-keys being the nicknames of the
-    # Java programs, and the hash-values being an anonymous hash table of
-    # classname, string of default JVM args, and string of default program
-    # args:
-    #
-    #       nickname => {
-    #           classname => classname-value
-    #           jvmargs   => string JVM arguments for this nickname
-    #           progargs  => string of program arguments for this nickname
-    #       }
-    #
-    # The configuration file that this structure is generated from has the following format:
-    #
-    # nickname|fully.specified.classname|space-delimited JVM args|space-delimited program args
-    #
-    # with "#" as a comment character, a la Perl.  Blank lines are ignored.
-    #
-    # If there is a line beginning with 'DEFAULT_JVM_ARGS=', the text from the
-    # rest of that line is added to every nickname's jvmargs.
-
-    open(my $fh, $pars{conffile})
-        or die "Can't open configuration file $pars{conffile}";
-
-    my %nicknames = ();
-    my $default_jvm_args = "";
-    my $logfile_prefix = "";
-    my $logfile="";
-    my $logfile_cmdline_property="";
-    my $process_logfile_prefix = $_[0];
-
-    while (<$fh>) {
-        s/#.*//;        # strip comments
-        s/^\s+|\s+$//g; # strip leading/trailing whitespace
-        chomp;          # strip EOL \n
-        next if /^$/;   # ignore empty lines
-
-        # Capture DEFAULT_JVM_ARGS.
-        if (/^DEFAULT_JVM_ARGS=(.*)/) {
-            $default_jvm_args = $1;
-            next;
-        }
-
-        # Capture LOGFILE_PREFIX.
-        if (/^LOGFILE_PREFIX=(.*)/) {
-            if ($process_logfile_prefix) {
-                $logfile_prefix = $1;
-                $logfile = File::Spec->catfile($properties{'pipeline.results.dir'}, 'logs', 'cli', $logfile_prefix . '.log');
-                $logfile_cmdline_property = ' -Dcli.logfile=' . $logfile;
-            }
-            next;
-        }
-
-        my @fields = split /\|/;
-        push @fields, "" while scalar @fields < 4;
-
-        # Load the data into the nicknames structure.
-
-        #nickname -> classname mapping
-        $nicknames{$fields[0]}{classname} = $fields[1];
-
-        #nickname -> (defaults) + JVM args mapping
-        $nicknames{$fields[0]}{jvmargs} = $default_jvm_args . $logfile_cmdline_property . " " . $fields[2];
-
-        #nickname -> program args mapping
-        $nicknames{$fields[0]}{progargs} = $fields[3];
-
-        # Replace any null fields with the empty string to remove
-        # concatenation errors later.
-        foreach (keys %{$nicknames{$fields[0]}}) {
-            $nicknames{$fields[0]}{$_} = ""
-                if not defined $nicknames{$fields[0]}{$_};
-        }
-    }
-
-    close $fh or warn "Error closing configuration file $pars{conffile}";
-
-    return %nicknames;
-}
-
-sub displayNicknames {
-    # Displays the nicknames in the default (or user-supplied) nicknames
-    # file, along with fully-qualified class names of each nickname
-
-    # Get the nicknames out of the nicknames file.
-    my %nicknames  = getNicknames(0);
-    my $max_key_length = maxKeyLength(\%nicknames);
-    my $format = "%" . $max_key_length . "s      %s\n";
-    printf($format, "NICKNAME", "CLASSNAME");
-    foreach my $key (sort keys %nicknames) {
-        printf($format, $key, $nicknames{$key}{classname});
-    }
-}
-
-sub maxKeyLength {
-
-    my %hash = %{$_[0]};
-    my $max_length = -1;
-    foreach my $key (keys %hash) {
-        my $key_length = length $key;
-        if ($key_length > $max_length) {
-            $max_length = length $key;
-        }
-    }
-    return $max_length;
-}
-
-sub getProperties {
-    # Parses a Java properties file and return the properties found. Only
-    # lines of the form "var = value" are parsed. Properties escapes are not
-    # currently processed.
-
-    defined($pars{properties})
-        or die "Properties file not specified with either PIPELINE_CONFIG_PATH or properties option";
-
-    open(my $fh, $pars{properties})
-        or die "Can't open properties file $pars{properties}";
-
-    my %properties = ();
-
-    while (<$fh>) {
-        s/#.*//;        # strip comments
-        s/^\s+|\s+$//g; # strip leading/trailing whitespace
-        chomp;          # strip EOL \n
-        next if /^$/;   # ignore empty lines
-
-        # Property names are any characters except ':' or '=', unless escaped.
-        # Property names and values may use '\' to escape characters. Names
-        # and values are separated by ':' or '='. See Properties#load(Reader)
-        # for details. This code does not support continuation lines.
-        if (/^(([^ =:]|\\.)+)\s*[=:]\s*(.*)$/) {
-            my $key = $1;
-            my $value = $3;
-            $key =~ s/\\(.)/$1/g;
-            $value =~ s/\\(.)/$1/g;
-            $properties{$key} = $value;
-        }
-    }
-
-    close $fh or warn "Error closing properties file $pars{properties}";
-    return %properties;
-}
-
-sub makeSubstitutions {
-    # Substitute property value and environment variable references in a string.
-
-    my ($s, %properties) = @_;
-    my $substitutionMade = 1;           # to get the loop started
-
-    while ($substitutionMade) {
-        $substitutionMade = 0;
-
-        # Substitute Apache Commons Configuration environment variable references.
-        # Do this before the property reference to keep the latter from failing.
-        if ($s =~ /\$\{env:([^}]+)}/) {
-            my $envVar = $1;
-            die "Missing environment variable '$envVar'" if (!defined($ENV{$envVar}));
-            $s =~ s/\$\{env:$envVar}/$ENV{$envVar}/;
-            $substitutionMade = 1;
-        }
-
-        # Substitute property references.
-        if ($s =~ /\$\{([^}]+)}/) {
-            my $key = $1;
-            die "Missing Ziggy property '$key'" if (!exists($properties{$key}));
-            $s =~ s/\$\{$key}/$properties{$key}/;
-            $substitutionMade = 1;
-        }
-
-        # Substitute environment variable references.
-        if ($s =~ /\%([^%]+)\%/) {
-            my $envVar = $1;
-            die "Missing environment variable '$envVar'" if (!defined($ENV{$envVar}));
-            $s =~ s/\%$envVar\%/$ENV{$envVar}/;
-            $substitutionMade = 1;
-        }
-    }
-
-    return $s;
-}
-
-=head1 NAME
-
-runjava - A wrapper to run the Ziggy Java tools
-
-=head1 SYNOPSIS
-
-runjava [--help] [--norun] [--[no]verbose] [--conffile=file] [--runjavaHome=dir] [--properties=file] [jvm-args] nickname [program args]
-
-runjava [--help] [--norun] [--[no]verbose] [--conffile=file] [--runjavaHome=dir] [--properties=file] [jvm-args] fully-specified-classname [program args]
-
-=head1 OPTIONS
-
-=over
-
-=item --help
-
-Prints a short help message.
-
-=item --norun
-
-Generate the Java command that would be run, but do not run it.  Useful
-when combined with the verbose option to echo out what would be done.
-Default is off.
-
-=item --[no]verbose
-
-Print the Java command line as it is being run.  Default is non-verbose.
-
-=item --conffile=file
-
-Specify a non-default nickname file. See the DESCRIPTION section for the
-specification of the nickname file format. Default is
-runjavaHome/etc/runjava.conf.
-
-=item --runjavaHome=directory
-
-Specify the home directory of the package distribution. Default is
-the value of the ziggy.home.dir property.
-
-=item --properties=file
-
-Specify the path to the properties file containing the Ziggy configuration.
-Default is $PIPELINE_CONFIG_PATH.
-
-=back
-
-=head1  DESCRIPTION
-
-A wrapper for the Ziggy Java tools, runjava allows the user to run a subset of
-the Java tools without having to specify any of the default JVM or program
-arguments. Any Ziggy Java tool can be run if the desired JVM and program
-arguments are specified. Additional JVM or program arguments can be added to
-either type of Ziggy Java tool.
-
-The configuration file specified by the --conffile option or default defines
-the tools that are specified for easy use with runjava. Each line in this file
-defines a tool's nickname and arguments in the following pipe-delimited
-format:
-
-    nickname|fully.specified.classname|string of jvm args|string of program args
-
-Blank lines are ignored and the # character is a comment char, as in Perl.
-
-Additionally, JVM arguments for every nickname in the file can be specified by
-including a 'DEFAULT_JVM_ARGS=...', with the elipsis replaced by the desired
-JVM arguments string. The text after DEFAULT_JVM_ARGS= will be given as the
-first JVM arguments.
-
-A logfile prefix can be specified by including a 'LOGFILE_PREFIX=...', with
-the ellipsis replaced by the desired logfile prefix. This will be inserted in
-the full Java command as a "-Dcli.logfile=..." clause.
-
-If the user-specified name is a nicknamne in the configuration file, the
-defaults specified in the configuration file are used. Otherwise, the user
-must specify all necessary parameters, including a fully-specified classname.
-
-Additional arguments can be given on the command line. JVM arguments can be
-given before the nickname/class name, and must have a '-' prefix. Program
-arguments can be given after the nickname/class name, and do not require a
-prefix. The nickname/class name is taken to be the first argument to runjava
-without a '-' prefix. The runjava arguments --[no]verbose, --norun,
---conffile, and --runjavaHome are never passed on to the Java call.
-
-=head1 AUTHORS
-
-Kester Allen
-
-=cut
diff --git a/src/main/perl/ziggy.pl b/src/main/perl/ziggy.pl
new file mode 100755
index 0000000..bdc44c6
--- /dev/null
+++ b/src/main/perl/ziggy.pl
@@ -0,0 +1,420 @@
+#!/usr/bin/perl
+
+use warnings;
+use strict;
+
+use Data::Dumper;
+use File::Basename;
+use File::Spec;
+use Getopt::Long qw(:config pass_through);
+use Getopt::Long qw(HelpMessage);
+
+my @options = qw{
+    dry-run
+    properties=s
+    verbose!
+    ziggyHome=s
+};
+
+my %optionValues = (
+    "dry-run"      => 0,
+    "properties"   => $ENV{'PIPELINE_CONFIG_PATH'},
+    "verbose"      => 0,
+    "ziggyHome"    => '',               # default is ziggy.home.dir property
+);
+
+my %properties;
+
+my $exitCode;
+eval {
+    $exitCode = main();
+};
+if (my $err = $@) {
+    print STDERR "# $0: $_\n", foreach split /\n/, $err;
+    exit 1;
+}
+exit ($exitCode != 0);
+
+sub main {
+    # Load user options, first picking out what's in %optionValues. Do not allow
+    # abbreviated options for %optionValues, and pass the rest into @ARGV.
+    GetOptions(\%optionValues, @options);
+    my ($nickname, $className, $ziggyHelp, $jvmOptions, $programOptions) = getUserOptions(@ARGV);
+
+    if ($ziggyHelp) {
+        HelpMessage();
+    }
+
+    # Read user-defined properties.
+    defined($optionValues{properties})
+        or die "Properties file not specified with either PIPELINE_CONFIG_PATH or properties option";
+    %properties = getProperties($optionValues{properties}, %properties);
+
+    # Determine ziggyHome from option or ziggy.home.dir property.
+    if ($optionValues{ziggyHome} eq "") {
+        exists($properties{'ziggy.home.dir'})
+            or die "Missing Ziggy property ziggy.home.dir";
+        $optionValues{ziggyHome} = makeSubstitutions($properties{'ziggy.home.dir'}, %properties);
+    }
+    -d $optionValues{ziggyHome}
+        or die "Directory $optionValues{ziggyHome} set by ziggyHome option or ziggy.home.dir property does not exist";
+
+    # Read Ziggy properties.
+    my $ziggyProperties = File::Spec->catfile($optionValues{ziggyHome}, "etc", "ziggy.properties");
+    %properties = getProperties($ziggyProperties, %properties);
+
+    # Extract nicknames from both property files.
+    my %nicknames = getNicknames(%properties);
+
+    # If the user didn't specify a nickname or fully qualified class name,
+    # display the nicknames.
+    if (!(defined($nickname) or defined($className))) {
+        displayNicknames(%nicknames);
+        return 0;
+    }
+
+    # Update unset environment variables from options.
+    if (!defined($ENV{'ZIGGY_HOME'})) {
+        $ENV{'ZIGGY_HOME'} = $optionValues{ziggyHome};
+    }
+    if (!defined($ENV{'PIPELINE_CONFIG_PATH'})) {
+        $ENV{'PIPELINE_CONFIG_PATH'} = $optionValues{properties};
+    }
+
+    # Make the Java runtime executable command. Use the location specified as
+    # java.home in the properties file, if any; otherwise, assume that a
+    # usable Java runtime executable is available on the search path.
+    my $javacmd = 'java';
+    my $javahome = "";
+    if (defined($properties{'java.home'})) {
+        $javahome = makeSubstitutions($properties{'java.home'}, %properties);
+    }
+    if ($javahome ne "") {
+        $javacmd = File::Spec->catfile($javahome, 'bin', $javacmd);
+        -e $javacmd
+            or die "$javacmd executable does not exist";
+    }
+
+    # Start to make the command line.
+    my $cmd = "$javacmd";
+    my $pipelineClasspath = $properties{'ziggy.pipeline.classpath'};
+    if (defined($pipelineClasspath) && $pipelineClasspath ne "") {
+        $cmd .= " -cp \"$pipelineClasspath\"";
+    } else {
+        # Use Ziggy's libs as default.
+        $cmd .= " -cp \"$optionValues{ziggyHome}/libs/*\"";
+    }
+
+    # If the user-specified name is one of the pre-defined entries in the
+    # nicknames, use information that that nickname maps to. If not, the user
+    # will need to specify everything.
+    if (defined($nickname)) {
+        if (exists $nicknames{$nickname}) {
+            my $substJvm = makeSubstitutions("$cmd $nicknames{$nickname}{jvmOptions} @$jvmOptions", %properties);
+            $cmd = "$substJvm " .
+                "$nicknames{$nickname}{className} " .
+                "$nicknames{$nickname}{programOptions} @$programOptions";
+        } else {
+            print "Nickname $nickname unknown\n\n";
+            displayNicknames(%nicknames);
+            return 0;
+        }
+    } elsif (defined($className)) {
+        my $substJvm = makeSubstitutions("$cmd @$jvmOptions", %properties);
+        $cmd = "$substJvm $className @$programOptions";
+    } else {
+        print "Neither nickname nor class name provided";
+        return 1;
+    }
+
+    my $dryRunText = $optionValues{"dry-run"} ? " (DRY-RUN)" : "";
+    print "Running command$dryRunText:\n\t$cmd\n" if $optionValues{verbose} || $optionValues{"dry-run"};
+
+    my $exitStatus = $optionValues{"dry-run"} ? 0 : system $cmd;
+    if ($exitStatus) {
+        my $program = defined($nickname) ? $nickname : $className;
+        print "$program exited with status $exitStatus\n\n";
+    }
+
+    return $exitStatus;
+}
+
+# Parse through command line options. The first option without a leading dash
+# is the nickname. All options before that or a --class option are JVM
+# options, all options after that are program options.
+sub getUserOptions {
+    my @cmdLineOptions = @_;
+
+    my $name  = undef;
+    my $class  = undef;
+    my $ziggyHelp = 0;
+    my $jvmOptions  = [];
+    my $programOptions = [];
+
+    # Begin with the assumption that the Java class name/nickname has not been
+    # found yet.
+    my $isNameFound = 0;
+    foreach (@cmdLineOptions) {
+        # The Java class name or nickname is the first option that does not
+        # have a leading dash.
+        if (!$isNameFound) {
+            if (!/^-/) {
+                $isNameFound = 1;
+                $name = $_;
+                next;
+            } elsif (/^--class=([[:alnum:].]+)/) {
+                $isNameFound = 1;
+                $class = $1;
+                next;
+            }
+        }
+
+        # The user is asking for help.
+        if (!$isNameFound && (/^--h/ || /^-h/)) {
+            $ziggyHelp = 1;
+            next;
+        }
+
+        # If the name has been found already, all subsequent options are
+        # program options. Program options that contain spaces were entered by
+        # the user with quotes around them, and the quotes were stripped by
+        # the shell. Add the quotes back in so the user's intent is preserved.
+        #
+        # Otherwise, they are JVM options.
+        if ($isNameFound) {
+            $_ = "\"$_\"" if / /;
+            push @$programOptions, $_;
+        } else {
+            push @$jvmOptions, $_;
+        }
+    }
+
+    return($name, $class, $ziggyHelp, $jvmOptions, $programOptions);
+}
+
+# Parses a Java properties file and return the properties found. Only
+# lines of the form "var = value" are parsed. Properties escapes are not
+# currently processed.
+sub getProperties {
+    my ($propertiesFile, %properties) = @_;
+
+    open(my $fh, $propertiesFile)
+        or die "Can't open properties file $propertiesFile";
+
+    while (<$fh>) {
+        s/#.*//;        # strip comments
+        s/^\s+|\s+$//g; # strip leading/trailing whitespace
+        chomp;          # strip EOL \n
+        next if /^$/;   # ignore empty lines
+
+        # Property names are any characters except ':' or '=', unless escaped.
+        # Property names and values may use '\' to escape characters. Names
+        # and values are separated by ':' or '='. See Properties#load(Reader)
+        # for details. This code does not support continuation lines.
+        if (/^(([^ =:]|\\.)+)\s*[=:]\s*(.*)$/) {
+            my $key = $1;
+            my $value = $3;
+            $key =~ s/\\(.)/$1/g;
+            $value =~ s/\\(.)/$1/g;
+            $properties{$key} = $value;
+        }
+    }
+
+    close $fh or warn "Error closing properties file $propertiesFile";
+
+    return %properties;
+}
+
+# Substitute property value and environment variable references in a string.
+sub makeSubstitutions {
+    my ($s, %properties) = @_;
+    my $substitutionMade = 1;           # to get the loop started
+
+    while ($substitutionMade) {
+        $substitutionMade = 0;
+
+        # Substitute Apache Commons Configuration environment variable references.
+        # Do this before the property reference to keep the latter from failing.
+        if ($s =~ /\$\{env:([^}]+)}/) {
+            my $envVar = $1;
+            die "Missing environment variable '$envVar'" if (!defined($ENV{$envVar}));
+            $s =~ s/\$\{env:$envVar}/$ENV{$envVar}/;
+            $substitutionMade = 1;
+        }
+
+        # Substitute property references.
+        if ($s =~ /\$\{([^}]+)}/) {
+            my $key = $1;
+            die "Missing Ziggy property '$key'" if (!exists($properties{$key}));
+            $s =~ s/\$\{$key}/$properties{$key}/;
+            $substitutionMade = 1;
+        }
+
+        # Substitute environment variable references.
+        if ($s =~ /\%([^%]+)\%/) {
+            my $envVar = $1;
+            die "Missing environment variable '$envVar'" if (!defined($ENV{$envVar}));
+            $s =~ s/\%$envVar\%/$ENV{$envVar}/;
+            $substitutionMade = 1;
+        }
+    }
+
+    return $s;
+}
+
+# The nicknames table is a hash table, hash-keys being the nicknames of the
+# Java programs, and the hash-values being an anonymous hash table of class
+# name, log file basename, JVM options, and program options:
+#
+#       nickname => {
+#           className => class name
+#           logFile => basename for log file
+#           jvmOptions   => JVM options
+#           programOptions  => program options
+#       }
+#
+# See the description for the property format that is used to build this
+# structure.
+sub getNicknames {
+    my (%properties) = @_;
+    my %nicknames = ();
+    my $default_jvm_options = $properties{"ziggy.default.jvm.args"};
+
+    foreach my $property (keys %properties) {
+        next if ($property !~ /^ziggy\.nickname\./);
+
+        # Turn the pipe-deliminated value into an array and ensure array is
+        # fully populated, even if the input is not.
+        my @fields = split(/\|/, makeSubstitutions($properties{$property}, %properties));
+        push @fields, "" while scalar @fields < 4;
+
+        # Load the data into the nicknames structure.
+        my $nickname = $property =~ s/^ziggy\.nickname\.//r;
+        $nicknames{$nickname}{className} = $fields[0];
+        $nicknames{$nickname}{logFile} = $fields[1];
+        $nicknames{$nickname}{jvmOptions} = $default_jvm_options . " " . logFileOption($fields[1]) . " " . $fields[2];
+        $nicknames{$nickname}{programOptions} = $fields[3];
+    }
+
+    return %nicknames;
+}
+
+sub logFileOption {
+    my ($logFileBasename) = @_;
+    my ($logFileName, $logFileOption);
+
+    $logFileBasename = "ziggy" if $logFileBasename eq "";
+    $logFileName = File::Spec->catfile($properties{'ziggy.pipeline.results.dir'}, 'logs', 'cli', $logFileBasename . '.log');
+    $logFileOption = "-Dziggy.logfile=" . $logFileName;
+
+    return $logFileOption;
+}
+
+# Displays the nicknames along with their fully qualified class names.
+sub displayNicknames {
+    my (%nicknames) = @_;
+
+    my $max_key_length = maxKeyLength(%nicknames);
+    my $format = "%-" . $max_key_length . "s  %s\n";
+    printf($format, "NICKNAME", "CLASS NAME");
+    foreach my $key (sort keys %nicknames) {
+        printf($format, $key, $nicknames{$key}{className});
+    }
+}
+
+sub maxKeyLength {
+
+    my (%hash) = @_;
+    my $max_length = -1;
+    foreach my $key (keys %hash) {
+        my $key_length = length $key;
+        if ($key_length > $max_length) {
+            $max_length = length $key;
+        }
+    }
+    return $max_length;
+}
+
+=head1 NAME
+
+ziggy - Run Ziggy tools
+
+=head1 SYNOPSIS
+
+ziggy [--help] [--dry-run] [--[no]verbose] [--ziggyHome=<dir>] [--properties=<file>] [<JVM options>] [<nickname> | --class=<fully qualified class name>] [<program options>]
+
+=head1 OPTIONS
+
+=over
+
+=item --class=fully qualified class name
+
+Run the Java class rather than a nickname.
+
+=item --help
+
+Prints a short help message.
+
+=item --dry-run
+
+Show the Java command that would be run, but do not run it. Default is off.
+
+=item --[no]verbose
+
+Print the Java command line as it is being run. Default is non-verbose.
+
+=item --ziggyHome=directory
+
+Specify the home directory of the package distribution. Default is the value
+of the ziggy.home.dir property.
+
+=item --properties=file
+
+Specify the path to the properties file containing the Ziggy configuration.
+Default is $PIPELINE_CONFIG_PATH.
+
+=back
+
+=head1  DESCRIPTION
+
+A wrapper for the Ziggy Java tools, ziggy allows the user to run a subset of
+the Java tools without having to specify any of the default JVM or program
+options. Any Ziggy Java tool can be run if the desired JVM and program options
+are specified. Additional JVM or program options can be added to either type
+of Ziggy Java tool.
+
+This wrapper makes use of properties found in the $PIPELINE_CONFIG_PATH
+environment variable or in the --properties option. It also uses properties
+found in a file called etc/ziggy.properties located in $ziggy.home.dir or the
+--ziggyHome option. The properties that begin with ziggy.nickname define a
+tool's nickname as follows:
+
+    ziggy.nickname.<nickname> = <fully qualified class name>|<logfile basename>|<space-delimited JVM args>|<space-delimited program args>
+
+Log files are found in logs/cli/<logfile basename>.log in pipeline
+results directory. If a logfile basename is not specified, "ziggy"
+is used.
+
+Values can refer to other properties.
+
+The contents of the property ziggy.default.jvm.args is added to the JVM
+arguments.
+
+If the user-specified name is a known nickname, the settings in the property's
+value are used. Otherwise, the user must specify the fully qualified class
+name with the --class option and all necessary parameters.
+
+Additional options can be given on the command line. JVM options can be given
+before the nickname or class option, and must have a '-' prefix. Program
+options can be given after the nickname or class option, and do not require a
+prefix. The nickname is taken to be the first option to ziggy without a '-'
+prefix. The ziggy options --[no]verbose, --dry-run, --conffile, and
+--ziggyHome are not passed on to the Java call.
+
+=head1 AUTHORS
+
+Kester Allen
+Bill Wohler
+PT
+
+=cut
diff --git a/src/main/sh/hsqldb.sh b/src/main/sh/hsqldb.sh
new file mode 100755
index 0000000..545ee40
--- /dev/null
+++ b/src/main/sh/hsqldb.sh
@@ -0,0 +1,556 @@
+#! /bin/sh
+
+#
+# Copyright (c) 1999, 2006 Tanuki Software Inc.
+#
+# Java Service Wrapper sh script.  Suitable for starting and stopping
+#  wrapped Java applications on UNIX platforms.
+#
+
+#-----------------------------------------------------------------------------
+# These settings can be modified to fit the needs of your application
+
+# Application
+APP_NAME="hsqldb"
+APP_LONG_NAME="Ziggy HSQLDB Server"
+
+# Wrapper
+WRAPPER_CMD="./wrapper"
+WRAPPER_CONF="../etc/hsqldb.wrapper.conf"
+
+# Priority at which to run the wrapper.  See "man nice" for valid priorities.
+#  nice is only used if a priority is specified.
+PRIORITY=
+
+# Location of the pid file.
+PIDDIR="."
+
+# If uncommented, causes the Wrapper to be shutdown using an anchor file.
+#  When launched with the 'start' command, it will also ignore all INT and
+#  TERM signals.
+#IGNORE_SIGNALS=true
+
+# If specified, the Wrapper will be run as the specified user.
+# IMPORTANT - Make sure that the user has the required privileges to write
+#  the PID file and wrapper.log files.  Failure to be able to write the log
+#  file will cause the Wrapper to exit without any way to write out an error
+#  message.
+# NOTE - This will set the user which is used to run the Wrapper as well as
+#  the JVM and is not useful in situations where a privileged resource or
+#  port needs to be allocated prior to the user being changed.
+#RUN_AS_USER=
+
+# The following two lines are used by the chkconfig command. Change as is
+#  appropriate for your application.  They should remain commented.
+# chkconfig: 2345 20 80
+# description: @app.long.name@
+
+# Do not modify anything beyond this point
+#-----------------------------------------------------------------------------
+
+# Get the fully qualified path to the script
+case $0 in
+    /*)
+        SCRIPT="$0"
+        ;;
+    *)
+        PWD=`pwd`
+        SCRIPT="$PWD/$0"
+        ;;
+esac
+
+# Resolve the true real path without any sym links.
+CHANGED=true
+while [ "X$CHANGED" != "X" ]
+do
+    # Change spaces to ":" so the tokens can be parsed.
+    SAFESCRIPT=`echo $SCRIPT | sed -e 's; ;:;g'`
+    # Get the real path to this script, resolving any symbolic links
+    TOKENS=`echo $SAFESCRIPT | sed -e 's;/; ;g'`
+    REALPATH=
+    for C in $TOKENS; do
+        # Change any ":" in the token back to a space.
+        C=`echo $C | sed -e 's;:; ;g'`
+        REALPATH="$REALPATH/$C"
+        # If REALPATH is a sym link, resolve it.  Loop for nested links.
+        while [ -h "$REALPATH" ] ; do
+            LS="`ls -ld "$REALPATH"`"
+            LINK="`expr "$LS" : '.*-> \(.*\)$'`"
+            if expr "$LINK" : '/.*' > /dev/null; then
+                # LINK is absolute.
+                REALPATH="$LINK"
+            else
+                # LINK is relative.
+                REALPATH="`dirname "$REALPATH"`""/$LINK"
+            fi
+        done
+    done
+
+    if [ "$REALPATH" = "$SCRIPT" ]
+    then
+        CHANGED=""
+    else
+        SCRIPT="$REALPATH"
+    fi
+done
+
+# Change the current directory to the location of the script
+cd "`dirname "$REALPATH"`"
+REALDIR=`pwd`
+
+# If the PIDDIR is relative, set its value relative to the full REALPATH to avoid problems if
+#  the working directory is later changed.
+FIRST_CHAR=`echo $PIDDIR | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+    PIDDIR=$REALDIR/$PIDDIR
+fi
+# Same test for WRAPPER_CMD
+FIRST_CHAR=`echo $WRAPPER_CMD | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+    WRAPPER_CMD=$REALDIR/$WRAPPER_CMD
+fi
+# Same test for WRAPPER_CONF
+FIRST_CHAR=`echo $WRAPPER_CONF | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+    WRAPPER_CONF=$REALDIR/$WRAPPER_CONF
+fi
+
+# Process ID
+ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
+PIDFILE="$PIDDIR/$APP_NAME.pid"
+LOCKDIR="/var/lock/subsys"
+LOCKFILE="$LOCKDIR/$APP_NAME"
+pid=""
+
+# Resolve the location of the 'ps' command
+PSEXE="/usr/bin/ps"
+if [ ! -x "$PSEXE" ]
+then
+    PSEXE="/bin/ps"
+    if [ ! -x "$PSEXE" ]
+    then
+        echo "Unable to locate 'ps'."
+        echo "Please report this message along with the location of the command on your system."
+        exit 1
+    fi
+fi
+
+# Resolve the os
+DIST_OS=`uname -s | tr [:upper:] [:lower:] | tr -d [:blank:]`
+case "$DIST_OS" in
+    'sunos')
+        DIST_OS="solaris"
+        ;;
+    'hp-ux' | 'hp-ux64')
+        DIST_OS="hpux"
+        ;;
+    'darwin')
+        DIST_OS="macosx"
+        ;;
+    'unix_sv')
+        DIST_OS="unixware"
+        ;;
+esac
+
+# Resolve the architecture
+DIST_ARCH=`uname -p | tr [:upper:] [:lower:] | tr -d [:blank:]`
+if [ "$DIST_ARCH" = "unknown" ]
+then
+    DIST_ARCH=`uname -m | tr [:upper:] [:lower:] | tr -d [:blank:]`
+fi
+case "$DIST_ARCH" in
+    'amd64' | 'athlon' | 'ia32' | 'ia64' | 'i386' | 'i486' | 'i586' | 'i686' | 'x86_64')
+        DIST_ARCH="x86"
+        ;;
+    'ip27')
+        DIST_ARCH="mips"
+        ;;
+    'power' | 'powerpc' | 'power_pc' | 'ppc64')
+        DIST_ARCH="ppc"
+        ;;
+    'pa_risc' | 'pa-risc')
+        DIST_ARCH="parisc"
+        ;;
+    'sun4u' | 'sparcv9')
+        DIST_ARCH="sparc"
+        ;;
+    '9000/800')
+        DIST_ARCH="parisc"
+        ;;
+esac
+
+outputFile() {
+    if [ -f "$1" ]
+    then
+        echo "  $1 (Found but not executable.)";
+    else
+        echo "  $1"
+    fi
+}
+
+# Decide on the wrapper binary to use.
+# If a 32-bit wrapper binary exists then it will work on 32 or 64 bit
+#  platforms, if the 64-bit binary exists then the distribution most
+#  likely wants to use long names.  Otherwise, look for the default.
+# For macosx, we also want to look for universal binaries.
+WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+if [ -x "$WRAPPER_TEST_CMD" ]
+then
+    WRAPPER_CMD="$WRAPPER_TEST_CMD"
+else
+    if [ "$DIST_OS" = "macosx" ]
+    then
+        WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-universal-32"
+        if [ -x "$WRAPPER_TEST_CMD" ]
+        then
+            WRAPPER_CMD="$WRAPPER_TEST_CMD"
+        else
+            WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
+            if [ -x "$WRAPPER_TEST_CMD" ]
+            then
+                WRAPPER_CMD="$WRAPPER_TEST_CMD"
+            else
+                WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-universal-64"
+                if [ -x "$WRAPPER_TEST_CMD" ]
+                then
+                    WRAPPER_CMD="$WRAPPER_TEST_CMD"
+                else
+                    if [ ! -x "$WRAPPER_CMD" ]
+                    then
+                        echo "Unable to locate any of the following binaries:"
+                        outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+                        outputFile "$WRAPPER_CMD-$DIST_OS-universal-32"
+                        outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
+                        outputFile "$WRAPPER_CMD-$DIST_OS-universal-64"
+                        outputFile "$WRAPPER_CMD"
+                        exit 1
+                    fi
+                fi
+            fi
+        fi
+    else
+        WRAPPER_TEST_CMD="$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
+        if [ -x "$WRAPPER_TEST_CMD" ]
+        then
+            WRAPPER_CMD="$WRAPPER_TEST_CMD"
+        else
+            if [ ! -x "$WRAPPER_CMD" ]
+            then
+                echo "Unable to locate any of the following binaries:"
+                outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+                outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-64"
+                outputFile "$WRAPPER_CMD"
+                exit 1
+            fi
+        fi
+    fi
+fi
+
+# Build the nice clause
+if [ "X$PRIORITY" = "X" ]
+then
+    CMDNICE=""
+else
+    CMDNICE="nice -$PRIORITY"
+fi
+
+# Build the anchor file clause.
+if [ "X$IGNORE_SIGNALS" = "X" ]
+then
+   ANCHORPROP=
+   IGNOREPROP=
+else
+   ANCHORPROP=wrapper.anchorfile=\"$ANCHORFILE\"
+   IGNOREPROP=wrapper.ignore_signals=TRUE
+fi
+
+# Build the lock file clause.  Only create a lock file if the lock directory exists on this platform.
+LOCKPROP=
+if [ -d $LOCKDIR ]
+then
+    if [ -w $LOCKDIR ]
+    then
+        LOCKPROP=wrapper.lockfile=\"$LOCKFILE\"
+    fi
+fi
+
+checkUser() {
+    # $1 touchLock flag
+    # $2 command
+
+    # Check the configured user.  If necessary rerun this script as the desired user.
+    if [ "X$RUN_AS_USER" != "X" ]
+    then
+        # Resolve the location of the 'id' command
+        IDEXE="/usr/xpg4/bin/id"
+        if [ ! -x "$IDEXE" ]
+        then
+            IDEXE="/usr/bin/id"
+            if [ ! -x "$IDEXE" ]
+            then
+                echo "Unable to locate 'id'."
+                echo "Please report this message along with the location of the command on your system."
+                exit 1
+            fi
+        fi
+
+        if [ "`$IDEXE -u -n`" = "$RUN_AS_USER" ]
+        then
+            # Already running as the configured user.  Avoid password prompts by not calling su.
+            RUN_AS_USER=""
+        fi
+    fi
+    if [ "X$RUN_AS_USER" != "X" ]
+    then
+        # If LOCKPROP and $RUN_AS_USER are defined then the new user will most likely not be
+        # able to create the lock file.  The Wrapper will be able to update this file once it
+        # is created but will not be able to delete it on shutdown.  If $2 is defined then
+        # the lock file should be created for the current command
+        if [ "X$LOCKPROP" != "X" ]
+        then
+            if [ "X$1" != "X" ]
+            then
+                # Resolve the primary group
+                RUN_AS_GROUP=`groups $RUN_AS_USER | awk '{print $3}' | tail -1`
+                if [ "X$RUN_AS_GROUP" = "X" ]
+                then
+                    RUN_AS_GROUP=$RUN_AS_USER
+                fi
+                touch $LOCKFILE
+                chown $RUN_AS_USER:$RUN_AS_GROUP $LOCKFILE
+            fi
+        fi
+
+        # Still want to change users, recurse.  This means that the user will only be
+        #  prompted for a password once. Variables shifted by 1
+        su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
+
+        # Now that we are the original user again, we may need to clean up the lock file.
+        if [ "X$LOCKPROP" != "X" ]
+        then
+            getpid
+            if [ "X$pid" = "X" ]
+            then
+                # Wrapper is not running so make sure the lock file is deleted.
+                if [ -f "$LOCKFILE" ]
+                then
+                    rm "$LOCKFILE"
+                fi
+            fi
+        fi
+
+        exit 0
+    fi
+}
+
+getpid() {
+    if [ -f "$PIDFILE" ]
+    then
+        if [ -r "$PIDFILE" ]
+        then
+            pid=`cat "$PIDFILE"`
+            if [ "X$pid" != "X" ]
+            then
+                # It is possible that 'a' process with the pid exists but that it is not the
+                #  correct process.  This can happen in a number of cases, but the most
+                #  common is during system startup after an unclean shutdown.
+                # The ps statement below looks for the specific wrapper command running as
+                #  the pid.  If it is not found then the pid file is considered to be stale.
+                pidtest=`$PSEXE -p $pid -o command= -ww | grep "$WRAPPER_CMD" | tail -1`
+                if [ "X$pidtest" = "X" ]
+                then
+                    # This is a stale pid file.
+                    rm -f "$PIDFILE"
+                    echo "Removed stale pid file: $PIDFILE"
+                    pid=""
+                fi
+            fi
+        else
+            echo "Cannot read $PIDFILE."
+            exit 1
+        fi
+    fi
+}
+
+testpid() {
+    pid=`$PSEXE -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+    if [ "X$pid" = "X" ]
+    then
+        # Process is gone so remove the pid file.
+        rm -f "$PIDFILE"
+        pid=""
+    fi
+}
+
+console() {
+    echo "Running $APP_LONG_NAME..."
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        # The string passed to eval must handles spaces in paths correctly.
+        COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=$APP_NAME wrapper.pidfile=\"$PIDFILE\" $ANCHORPROP $LOCKPROP"
+        eval $COMMAND_LINE
+    else
+        echo "$APP_LONG_NAME is already running."
+        exit 1
+    fi
+}
+
+start() {
+    echo "Starting $APP_LONG_NAME..."
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        # The string passed to eval must handles spaces in paths correctly.
+        COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=$APP_NAME wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $LOCKPROP $USERPROP"
+        eval $COMMAND_LINE
+    else
+        echo "$APP_LONG_NAME is already running."
+        exit 1
+    fi
+}
+
+stopit() {
+    echo "Stopping $APP_LONG_NAME..."
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        echo "$APP_LONG_NAME was not running."
+    else
+        if [ "X$IGNORE_SIGNALS" = "X" ]
+        then
+            # Running so try to stop it.
+            kill $pid
+            if [ $? -ne 0 ]
+            then
+                # An explanation for the failure should have been given
+                echo "Unable to stop $APP_LONG_NAME."
+                exit 1
+            fi
+        else
+            rm -f "$ANCHORFILE"
+            if [ -f "$ANCHORFILE" ]
+            then
+                # An explanation for the failure should have been given
+                echo "Unable to stop $APP_LONG_NAME."
+                exit 1
+            fi
+        fi
+
+        # We can not predict how long it will take for the wrapper to
+        #  actually stop as it depends on settings in wrapper.conf.
+        #  Loop until it does.
+        savepid=$pid
+        CNT=0
+        TOTCNT=0
+        while [ "X$pid" != "X" ]
+        do
+            # Show a waiting message every 5 seconds.
+            if [ "$CNT" -lt "5" ]
+            then
+                CNT=`expr $CNT + 1`
+            else
+                echo "Waiting for $APP_LONG_NAME to exit..."
+                CNT=0
+            fi
+            TOTCNT=`expr $TOTCNT + 1`
+
+            sleep 1
+
+            testpid
+        done
+
+        pid=$savepid
+        testpid
+        if [ "X$pid" != "X" ]
+        then
+            echo "Failed to stop $APP_LONG_NAME."
+            exit 1
+        else
+            echo "Stopped $APP_LONG_NAME."
+        fi
+    fi
+}
+
+status() {
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        echo "$APP_LONG_NAME is not running."
+        exit 1
+    else
+        echo "$APP_LONG_NAME is running ($pid)."
+        exit 0
+    fi
+}
+
+dump() {
+    echo "Dumping $APP_LONG_NAME..."
+    getpid
+    if [ "X$pid" = "X" ]
+    then
+        echo "$APP_LONG_NAME was not running."
+
+    else
+        kill -3 $pid
+
+        if [ $? -ne 0 ]
+        then
+            echo "Failed to dump $APP_LONG_NAME."
+            exit 1
+        else
+            echo "Dumped $APP_LONG_NAME."
+        fi
+    fi
+}
+
+# Modification to support user options in daemon mode
+USERPROP=
+while [ $# -gt 1 ]; do
+    USERPROP="$USERPROP $1"
+    shift
+done
+
+case "$1" in
+
+    'console')
+        checkUser touchlock $1
+        console
+        ;;
+
+    'start')
+        checkUser touchlock $1
+        start
+        ;;
+
+    'stop')
+        checkUser "" $1
+        stopit
+        ;;
+
+    'restart')
+        checkUser touchlock $1
+        stopit
+        start
+        ;;
+
+    'status')
+        checkUser "" $1
+        status
+        ;;
+
+    'dump')
+        checkUser "" $1
+        dump
+        ;;
+
+    *)
+        echo "Usage: $0 { console | start | stop | restart | status | dump }"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/src/main/sh/worker.sh b/src/main/sh/supervisor.sh
similarity index 99%
rename from src/main/sh/worker.sh
rename to src/main/sh/supervisor.sh
index e252634..26a17ec 100755
--- a/src/main/sh/worker.sh
+++ b/src/main/sh/supervisor.sh
@@ -11,12 +11,12 @@
 # These settings can be modified to fit the needs of your application
 
 # Application
-APP_NAME="worker"
-APP_LONG_NAME="Pipeline Cluster Worker"
+APP_NAME="supervisor"
+APP_LONG_NAME="Pipeline Cluster Supervisor"
 
 # Wrapper
 WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../etc/worker.wrapper.conf"
+WRAPPER_CONF="../etc/supervisor.wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.
diff --git a/src/test/java/gov/nasa/ziggy/MemoryTestUtils.java b/src/test/java/gov/nasa/ziggy/MemoryTestUtils.java
index 0758464..3b5b096 100644
--- a/src/test/java/gov/nasa/ziggy/MemoryTestUtils.java
+++ b/src/test/java/gov/nasa/ziggy/MemoryTestUtils.java
@@ -29,5 +29,4 @@ public static byte[][] allocateAllChunksPossible(int chunkSize) {
 
         return chunks.toArray(new byte[chunks.size()][]);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/ReflectionEquals.java b/src/test/java/gov/nasa/ziggy/ReflectionEquals.java
index 0bbe5e4..7827473 100644
--- a/src/test/java/gov/nasa/ziggy/ReflectionEquals.java
+++ b/src/test/java/gov/nasa/ziggy/ReflectionEquals.java
@@ -18,6 +18,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.module.io.ProxyIgnore;
+
 /**
  * Utility class for unit tests that uses reflection to do a deep compare of two object trees. It is
  * intended to overcome 2 limitations with the JUnit assertEquals method: 1- Allows deep compare of
@@ -32,6 +34,8 @@ public class ReflectionEquals {
     private static final Logger log = LoggerFactory.getLogger(ReflectionEquals.class);
 
     private final Set<Pattern> excludedFieldPatterns = new HashSet<>();
+    private final Set<String> excludedFieldNames = new HashSet<>();
+    public boolean compareProxyIgnoreFields = true;
 
     public ReflectionEquals() {
     }
@@ -51,6 +55,14 @@ public void excludeField(String fullyQualifiedFieldNamePattern) {
         excludedFieldPatterns.add(Pattern.compile(fullyQualifiedFieldNamePattern));
     }
 
+    public void excludeFieldByName(String fullyQualifiedFieldName) {
+        excludedFieldNames.add(fullyQualifiedFieldName);
+    }
+
+    public void setCompareProxyIgnoreFields(boolean compare) {
+        compareProxyIgnoreFields = compare;
+    }
+
     public void assertEquals(String message, Object expectedObject, Object actualObject)
         throws IllegalAccessException {
         compareObjects(message, "", expectedObject, actualObject);
@@ -58,18 +70,16 @@ public void assertEquals(String message, Object expectedObject, Object actualObj
 
     public void assertEquals(Object expectedObject, Object actualObject)
         throws IllegalAccessException {
-        compareObjects(expectedObject.getClass().toString(), "", expectedObject, actualObject);
+        compareObjects("", expectedObject.getClass().toString(), expectedObject, actualObject);
     }
 
     private void compareObjects(String message, String fullyQualifiedFieldName,
         Object expectedObject, Object actualObject) throws IllegalAccessException {
         if (matchesExcludeFilter(fullyQualifiedFieldName)) {
-            log.debug("skipping:" + message + " because it's on the exclude list");
             return;
         }
 
         log.debug("comparing: " + message);
-        // log.debug("fqfn=" + fullyQualifiedFieldName);
 
         if (expectedObject == actualObject) {
             // same object, must be equal!
@@ -179,6 +189,9 @@ private void compareObjects(String message, String fullyQualifiedFieldName,
                 Field[] fields = hClazz.getDeclaredFields();
                 for (Field field2 : fields) {
                     Field field = field2;
+                    if (field.isAnnotationPresent(ProxyIgnore.class) && !compareProxyIgnoreFields) {
+                        continue;
+                    }
 
                     if (!Modifier.isTransient(field.getModifiers())) {
                         // allow us to access the value of private fields
@@ -243,6 +256,11 @@ private String getGetterName(String prefix, String fieldName) {
     }
 
     private boolean matchesExcludeFilter(String fieldName) {
+        for (String excludedFieldName : excludedFieldNames) {
+            if (fieldName.equals(excludedFieldName)) {
+                return true;
+            }
+        }
         for (Pattern pattern : excludedFieldPatterns) {
             Matcher matcher = pattern.matcher(fieldName);
             if (matcher.matches()) {
diff --git a/src/test/java/gov/nasa/ziggy/XmlUtils.java b/src/test/java/gov/nasa/ziggy/XmlUtils.java
index 8df5965..ef7bdb7 100644
--- a/src/test/java/gov/nasa/ziggy/XmlUtils.java
+++ b/src/test/java/gov/nasa/ziggy/XmlUtils.java
@@ -8,7 +8,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
 import gov.nasa.ziggy.pipeline.xml.XmlReference;
 
 /**
@@ -105,11 +104,10 @@ public static void compareXmlReferences(
      * asserts that the two have the same length, and that each name in one {@link Collection} is
      * present in the other.
      */
-    public static void compareParameterSetReferences(
-        Collection<ParameterSetName> groundTruthReferences,
-        Collection<ParameterSetName> nodeReferences) {
+    public static void compareParameterSetReferences(Collection<String> groundTruthReferences,
+        Collection<String> nodeReferences) {
         assertEquals(groundTruthReferences.size(), nodeReferences.size());
-        for (ParameterSetName reference : nodeReferences) {
+        for (String reference : nodeReferences) {
             assertTrue(groundTruthReferences.contains(reference));
         }
     }
@@ -132,7 +130,5 @@ public static List<String> complexTypeContent(List<String> allContents,
     public static List<String> simpleTypeContent(List<String> allContents,
         String pipelineDefinitionLine) {
         return xmlElementContent(allContents, pipelineDefinitionLine, "</xs:simpleType>");
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/ZiggyDatabaseRule.java b/src/test/java/gov/nasa/ziggy/ZiggyDatabaseRule.java
index bb97916..a66800d 100644
--- a/src/test/java/gov/nasa/ziggy/ZiggyDatabaseRule.java
+++ b/src/test/java/gov/nasa/ziggy/ZiggyDatabaseRule.java
@@ -1,12 +1,17 @@
 package gov.nasa.ziggy;
 
-import static gov.nasa.ziggy.ZiggyPropertyRule.resetSystemProperty;
-import static gov.nasa.ziggy.services.config.PropertyNames.DATABASE_SOFTWARE_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_DIALECT_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_DRIVER_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_PASSWD_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_URL_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HIBERNATE_USERNAME_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATABASE_SCHEMA_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.DATABASE_SOFTWARE;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_DIALECT;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_DRIVER;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_JDBC_BATCH_SIZE;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_PASSWORD;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_SHOW_SQL;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_URL;
+import static gov.nasa.ziggy.services.config.PropertyName.HIBERNATE_USERNAME;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
+
+import java.io.File;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
@@ -50,28 +55,35 @@ public class ZiggyDatabaseRule extends ExternalResource {
     private String hibernateJdbcBatchSize;
     private String hibernateShowSql;
     private String hibernateDriverClass;
+    private String homeDir;
+    private String databaseSchemaDir;
+
+    private DatabaseController databaseController;
 
     @Override
     protected void before() throws Throwable {
-        databaseSoftwareName = System.setProperty(DATABASE_SOFTWARE_PROP_NAME, "hsqldb");
-        DatabaseController databaseController = new HsqldbController();
+        databaseSoftwareName = System.setProperty(DATABASE_SOFTWARE.property(), "hsqldb");
+        databaseController = new HsqldbController();
 
-        hibernateConnectionPassword = System.setProperty(HIBERNATE_PASSWD_PROP_NAME, "");
-        hibernateConnectionUrl = System.setProperty(HIBERNATE_URL_PROP_NAME,
+        hibernateConnectionPassword = System.setProperty(HIBERNATE_PASSWORD.property(), "");
+        hibernateConnectionUrl = System.setProperty(HIBERNATE_URL.property(),
             "jdbc:hsqldb:mem:hsqldb-ziggy");
-        hibernateConnectionUsername = System.setProperty(HIBERNATE_USERNAME_PROP_NAME, "sa");
+        hibernateConnectionUsername = System.setProperty(HIBERNATE_USERNAME.property(), "sa");
+        homeDir = System.setProperty(ZIGGY_HOME_DIR.property(), "build");
+        databaseSchemaDir = System.setProperty(DATABASE_SCHEMA_DIR.property(),
+            "build" + File.separator + "schema");
 
         // For some reason, the unit tests won't run successfully without the Hibernate
         // dialect being set as a system property, even though the actual pipelines
         // function just fine without any dialect in the properties. Something to figure
         // out and fix when possible.
-        hibernateDialect = System.setProperty(HIBERNATE_DIALECT_PROP_NAME,
+        hibernateDialect = System.setProperty(HIBERNATE_DIALECT.property(),
             databaseController.sqlDialect().dialect());
-        hibernateDriverClass = System.setProperty(HIBERNATE_DRIVER_PROP_NAME,
+        hibernateDriverClass = System.setProperty(HIBERNATE_DRIVER.property(),
             databaseController.driver());
 
-        hibernateJdbcBatchSize = System.setProperty("hibernate.jdbc.batch_size", "0");
-        hibernateShowSql = System.setProperty("hibernate.show_sql", "false");
+        hibernateJdbcBatchSize = System.setProperty(HIBERNATE_JDBC_BATCH_SIZE.property(), "0");
+        hibernateShowSql = System.setProperty(HIBERNATE_SHOW_SQL.property(), "false");
 
         DatabaseTransactionFactory.performTransaction(() -> {
             databaseController.createDatabase();
@@ -82,18 +94,36 @@ protected void before() throws Throwable {
     @Override
     protected void after() {
         DatabaseTransactionFactory.performTransaction(() -> {
+            databaseController.dropDatabase();
             DatabaseService.getInstance().clear();
             return null;
         });
         DatabaseService.reset();
 
-        resetSystemProperty(DATABASE_SOFTWARE_PROP_NAME, databaseSoftwareName);
-        resetSystemProperty(HIBERNATE_PASSWD_PROP_NAME, hibernateConnectionPassword);
-        resetSystemProperty(HIBERNATE_URL_PROP_NAME, hibernateConnectionUrl);
-        resetSystemProperty(HIBERNATE_USERNAME_PROP_NAME, hibernateConnectionUsername);
-        resetSystemProperty(HIBERNATE_DIALECT_PROP_NAME, hibernateDialect);
-        resetSystemProperty("hibernate.jdbc.batch_size", hibernateJdbcBatchSize);
-        resetSystemProperty("hibernate.show_sql", hibernateShowSql);
-        resetSystemProperty(HIBERNATE_DRIVER_PROP_NAME, hibernateDriverClass);
+        resetSystemProperty(DATABASE_SOFTWARE.property(), databaseSoftwareName);
+        resetSystemProperty(HIBERNATE_PASSWORD.property(), hibernateConnectionPassword);
+        resetSystemProperty(HIBERNATE_URL.property(), hibernateConnectionUrl);
+        resetSystemProperty(HIBERNATE_USERNAME.property(), hibernateConnectionUsername);
+        resetSystemProperty(HIBERNATE_DIALECT.property(), hibernateDialect);
+        resetSystemProperty(HIBERNATE_JDBC_BATCH_SIZE.property(), hibernateJdbcBatchSize);
+        resetSystemProperty(HIBERNATE_SHOW_SQL.property(), hibernateShowSql);
+        resetSystemProperty(HIBERNATE_DRIVER.property(), hibernateDriverClass);
+        resetSystemProperty(ZIGGY_HOME_DIR.property(), homeDir);
+        resetSystemProperty(DATABASE_SCHEMA_DIR.property(), databaseSchemaDir);
+    }
+
+    /**
+     * Sets the given property to the given value. If {@code value} is {@code null}, the property is
+     * cleared.
+     *
+     * @param property the property to set
+     * @param value the value to set the property to, or {@code null} to clear the property
+     */
+    public static void resetSystemProperty(String property, String value) {
+        if (value != null) {
+            System.setProperty(property, value);
+        } else {
+            System.clearProperty(property);
+        }
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/ZiggyPropertyRule.java b/src/test/java/gov/nasa/ziggy/ZiggyPropertyRule.java
index 990b7a7..7f3ece7 100644
--- a/src/test/java/gov/nasa/ziggy/ZiggyPropertyRule.java
+++ b/src/test/java/gov/nasa/ziggy/ZiggyPropertyRule.java
@@ -4,11 +4,13 @@
 
 import java.nio.file.Path;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
+import org.apache.commons.configuration2.Configuration;
 import org.junit.rules.ExternalResource;
 import org.junit.rules.TestRule;
 
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
+
 /*
  * Idea: If multiple properties need to be set, perhaps it would be more convenient to put them in
  * one rule. If so, add constructors that take multiple name/value pairs as varargs or a map. In
@@ -20,7 +22,8 @@
 
 /**
  * Implements a {@link TestRule} for the setting and resetting of properties for use by unit tests.
- * To use, declare a field that refers to this rule as shown.
+ * To use, declare a field that refers to this rule as shown. Note that "foo" can be a string or a
+ * {@link PropertyName}.
  *
  * <pre>
  * &#64;Rule
@@ -34,7 +37,7 @@
  *
  * <pre>
  * public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
- * public ZiggyPropertyRule fooPropertyRule = new ZiggyPropertyRule("foo", "value");
+ * public ZiggyPropertyRule fooPropertyRule = new ZiggyPropertyRule("foo", directoryRule, "bar");
  *
  * &#64;Rule
  * public final RuleChain ruleChain = RuleChain.outerRule(directoryRule).around(fooPropertyRule);
@@ -44,12 +47,10 @@
  * value and a {@link #getPreviousProperty} method to access the value of the property before the
  * test started.
  * <p>
- * This class is marked {@code @NotThreadSafe} as it manipulates system properties that are global
- * across the JVM.
+ * This class is thread-safe as it uses thread-safe configuration objects.
  *
  * @author Bill Wohler
  */
-@NotThreadSafe
 public class ZiggyPropertyRule extends ExternalResource {
 
     private String property;
@@ -58,6 +59,20 @@ public class ZiggyPropertyRule extends ExternalResource {
     private String subdirectory;
     private String previousValue;
 
+    /**
+     * Creates a {@code ZiggyPropertyRule} with the given property and value. See class
+     * documentation for usage.
+     *
+     * @param property the non-{@code null} property to set
+     * @param value the value to set the property to. This can be {@code null} to clear the property
+     * before each test, and reset the property after each test. This is useful if a test modifies
+     * the property or depends on the property being cleared.
+     * @throws NullPointerException if property is {@code null}
+     */
+    public ZiggyPropertyRule(PropertyName property, String value) {
+        this(checkNotNull(property, "property").property(), value);
+    }
+
     /**
      * Creates a {@code ZiggyPropertyRule} with the given property and value. See class
      * documentation for usage.
@@ -73,6 +88,19 @@ public ZiggyPropertyRule(String property, String value) {
         this.value = value;
     }
 
+    /**
+     * Creates a {@code ZiggyPropertyRule} with the given property and directory. See class
+     * documentation for usage.
+     *
+     * @param property the non-{@code null} property to set
+     * @param directoryRule the non-{@code null} directory rule from which the directory is obtained
+     * and used as the value of the property
+     * @throws NullPointerException if property or directoryRule are {@code null}
+     */
+    public ZiggyPropertyRule(PropertyName property, ZiggyDirectoryRule directoryRule) {
+        this(property, directoryRule, null);
+    }
+
     /**
      * Creates a {@code ZiggyPropertyRule} with the given property and directory. See class
      * documentation for usage.
@@ -86,6 +114,22 @@ public ZiggyPropertyRule(String property, ZiggyDirectoryRule directoryRule) {
         this(property, directoryRule, null);
     }
 
+    /**
+     * Creates a {@code ZiggyPropertyRule} with the given property and directory and subdirectory.
+     * See class documentation for usage.
+     *
+     * @param property the non-{@code null} property to set
+     * @param directoryRule the non-{@code null} directory rule from which the directory is obtained
+     * and used as the value of the property
+     * @param subdirectory the subdirectory, which is appended to the directory and used as the
+     * value of the property; ignored if {@code null}
+     * @throws NullPointerException if property or directoryRule are {@code null}
+     */
+    public ZiggyPropertyRule(PropertyName property, ZiggyDirectoryRule directoryRule,
+        String subdirectory) {
+        this(checkNotNull(property, "property").property(), directoryRule, subdirectory);
+    }
+
     /**
      * Creates a {@code ZiggyPropertyRule} with the given property and directory and subdirectory.
      * See class documentation for usage.
@@ -114,32 +158,18 @@ protected void before() throws Throwable {
             value = directory.toString();
         }
 
+        Configuration configuration = ZiggyConfiguration.getMutableInstance();
+        previousValue = configuration.getString(property, null);
         if (value != null) {
-            previousValue = System.setProperty(property, value);
+            configuration.setProperty(property, value);
         } else {
-            previousValue = System.getProperty(property);
-            System.clearProperty(property);
+            configuration.clearProperty(property);
         }
     }
 
     @Override
     protected void after() {
-        resetSystemProperty(property, previousValue);
-    }
-
-    /**
-     * Sets the given property to the given value. If {@code value} is {@code null}, the property is
-     * cleared.
-     *
-     * @param property the property to set
-     * @param value the value to set the property to, or {@code null} to clear the property
-     */
-    public static void resetSystemProperty(String property, String value) {
-        if (value != null) {
-            System.setProperty(property, value);
-        } else {
-            System.clearProperty(property);
-        }
+        ZiggyConfiguration.reset();
     }
 
     /**
diff --git a/src/test/java/gov/nasa/ziggy/ZiggyPropertyRuleTest.java b/src/test/java/gov/nasa/ziggy/ZiggyPropertyRuleTest.java
new file mode 100644
index 0000000..6788ba0
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/ZiggyPropertyRuleTest.java
@@ -0,0 +1,34 @@
+package gov.nasa.ziggy;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+
+import gov.nasa.ziggy.services.config.PropertyName;
+
+/**
+ * All of our tests test the constructors that take a {@link PropertyName}. What they don't test are
+ * the constructors that take a string, which may be used by other projects. Test those here.
+ */
+public class ZiggyPropertyRuleTest {
+    public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
+
+    @Rule
+    public ZiggyPropertyRule stringPropertyRule = new ZiggyPropertyRule("string", "value");
+
+    public ZiggyPropertyRule stringDirectoryPropertyRule = new ZiggyPropertyRule("directory-string",
+        directoryRule);
+
+    @Rule
+    public RuleChain ruleChain = RuleChain.outerRule(directoryRule)
+        .around(stringDirectoryPropertyRule);
+
+    @Test
+    public void stringConstructorTest() {
+        assertEquals("value", stringPropertyRule.getProperty());
+        assertEquals("build/test/ZiggyPropertyRuleTest/stringConstructorTest",
+            stringDirectoryPropertyRule.getProperty());
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/ZiggyUnitTestUtils.java b/src/test/java/gov/nasa/ziggy/ZiggyUnitTestUtils.java
index b077501..8ccb1a2 100644
--- a/src/test/java/gov/nasa/ziggy/ZiggyUnitTestUtils.java
+++ b/src/test/java/gov/nasa/ziggy/ZiggyUnitTestUtils.java
@@ -23,6 +23,13 @@
  */
 public class ZiggyUnitTestUtils {
 
+    /**
+     * Location of test/data relative to the working directory (assumed to be the main Ziggy
+     * directory, since that's where both Eclipse and Gradle set the working directory when they run
+     * tests).
+     */
+    public static final Path TEST_DATA = Paths.get("test", "data");
+
     // The items below perform Hibernate initialization of lazy-loaded elements of a database
     // object. This is necessary because we need to be able to compare the objects with the
     // expected objects, and that comparison necessarily includes lazy-loaded bits.
@@ -57,6 +64,7 @@ public static void initializePipelineInstanceNode(PipelineInstanceNode node) {
     public static void initializePipelineDefinition(PipelineDefinition pipelineDefinition) {
         initializeUser(pipelineDefinition.getAuditInfo().getLastChangedUser());
         Hibernate.initialize(pipelineDefinition.getRootNodes());
+        Hibernate.initialize(pipelineDefinition.getPipelineParameterSetNames());
         initializePipelineDefinitionNodes(pipelineDefinition.getRootNodes());
     }
 
@@ -73,6 +81,7 @@ public static void initializePipelineDefinitionNode(PipelineDefinitionNode node)
         Hibernate.initialize(node.getOutputDataFileTypes());
         Hibernate.initialize(node.getModelTypes());
         Hibernate.initialize(node.getNextNodes());
+        Hibernate.initialize(node.getModuleParameterSetNames());
         initializePipelineDefinitionNodes(node.getNextNodes());
     }
 
@@ -86,12 +95,4 @@ public static void initializeUser(User user) {
         Hibernate.initialize(user.getRoles());
         Hibernate.initialize(user.getPrivileges());
     }
-
-    /**
-     * Location of test/data relative to the working directory (assumed to be the main Ziggy
-     * directory, since that's where both Eclipse and Gradle set the working directory when they run
-     * tests).
-     */
-    public static final Path TEST_DATA = Paths.get("test", "data");
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/collections/HyperRectangleIteratorTest.java b/src/test/java/gov/nasa/ziggy/collections/HyperRectangleIteratorTest.java
index 0a8503e..4f91b4d 100644
--- a/src/test/java/gov/nasa/ziggy/collections/HyperRectangleIteratorTest.java
+++ b/src/test/java/gov/nasa/ziggy/collections/HyperRectangleIteratorTest.java
@@ -108,6 +108,5 @@ public void testNextFailure() {
         for (int i = 0; i < 7; i++) {
             hi.next();
         }
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/collections/HyperRectangleTest.java b/src/test/java/gov/nasa/ziggy/collections/HyperRectangleTest.java
index 1066af1..b5e1221 100644
--- a/src/test/java/gov/nasa/ziggy/collections/HyperRectangleTest.java
+++ b/src/test/java/gov/nasa/ziggy/collections/HyperRectangleTest.java
@@ -74,7 +74,6 @@ public void testInvalidShape() {
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidTrailingOffsets() {
         new HyperRectangle(new int[] { 3, 4, 6 }, new int[] { 1, 2, 6 }, new int[] { 1, 2, 1 });
-
     }
 
     @Test
@@ -95,5 +94,4 @@ public void testOffsetCombinationError() {
         HyperRectangle hr = new HyperRectangle(aSize, size, offset);
         hr.getOffset(new int[] { 1, 2 });
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/collections/ZiggyArrayUtilsTest.java b/src/test/java/gov/nasa/ziggy/collections/ZiggyArrayUtilsTest.java
index 5307b14..030d035 100644
--- a/src/test/java/gov/nasa/ziggy/collections/ZiggyArrayUtilsTest.java
+++ b/src/test/java/gov/nasa/ziggy/collections/ZiggyArrayUtilsTest.java
@@ -88,7 +88,6 @@ public void testBoxAndUnbox1dArray() {
         assertTrue(Arrays.equals(dArray1, (double[]) dArray2));
         Object DArray2 = ZiggyArrayUtils.box(dArray1);
         assertTrue(Arrays.deepEquals(DArray1, (Double[]) DArray2));
-
     }
 
     @Test
@@ -213,7 +212,6 @@ public void testConstructPrimitiveArray() {
         assertEquals(2, returnObject.length);
         assertNull(returnObject[0]);
         assertNull(returnObject[1]);
-
     }
 
     @Test
@@ -272,7 +270,6 @@ public void testConstructBoxedArray() {
         assertEquals(2, returnObject.length);
         assertNull(returnObject[0]);
         assertNull(returnObject[1]);
-
     }
 
     @Test
diff --git a/src/test/java/gov/nasa/ziggy/collections/ZiggyDataTypeTest.java b/src/test/java/gov/nasa/ziggy/collections/ZiggyDataTypeTest.java
index 8ab896f..fe67648 100644
--- a/src/test/java/gov/nasa/ziggy/collections/ZiggyDataTypeTest.java
+++ b/src/test/java/gov/nasa/ziggy/collections/ZiggyDataTypeTest.java
@@ -165,7 +165,6 @@ public void exerciseDataTypeDetection(ZiggyDataType type)
         }
         Object boxedList = Arrays.asList(boxedArray1);
         assertEquals(type, getDataType(boxedList));
-
     }
 
     /**
diff --git a/src/test/java/gov/nasa/ziggy/crud/ZiggyQueryTest.java b/src/test/java/gov/nasa/ziggy/crud/ZiggyQueryTest.java
new file mode 100644
index 0000000..dbc3c32
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/crud/ZiggyQueryTest.java
@@ -0,0 +1,621 @@
+package gov.nasa.ziggy.crud;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.appender.FileAppender;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.mockito.Mockito;
+
+import gov.nasa.ziggy.ZiggyDatabaseRule;
+import gov.nasa.ziggy.ZiggyDirectoryRule;
+import gov.nasa.ziggy.ZiggyPropertyRule;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask.State;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask_;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.util.StringUtils;
+import gov.nasa.ziggy.util.io.FileUtil;
+
+/**
+ * Unit tests for {@link ZiggyQuery}.
+ *
+ * @author PT
+ */
+public class ZiggyQueryTest {
+
+    private final String HIBERNATE_LOG_FILE_NAME = "hibernate.log";
+    private final String APPENDER_NAME = "file-appender.log";
+    private final String TABLE_NAME = "ziggy_PipelineTask";
+    private final String DUMMY_TASK_NAME = "p1_0";
+
+    private PipelineTaskCrud crud;
+    private Path logPath;
+    private FileAppender hibernateLog;
+
+    @Rule
+    public ZiggyDatabaseRule databaseRule = new ZiggyDatabaseRule();
+
+    public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
+
+    @Rule
+    public ZiggyPropertyRule showSqlProperty = new ZiggyPropertyRule(
+        PropertyName.HIBERNATE_SHOW_SQL, "true");
+
+    @Rule
+    public ZiggyPropertyRule formatSqlProperty = new ZiggyPropertyRule(
+        PropertyName.HIBERNATE_FORMAT_SQL, "true");
+
+    @Rule
+    public ZiggyPropertyRule sqlCommentsProperty = new ZiggyPropertyRule(
+        PropertyName.HIBERNATE_USE_SQL_COMMENTS, "true");
+
+    @Rule
+    public ZiggyPropertyRule log4jConfigProperty = new ZiggyPropertyRule(
+        PropertyName.LOG4J2_CONFIGURATION_FILE, Paths.get("etc").resolve("log4j2.xml").toString());
+
+    public ZiggyPropertyRule log4jLogFileProperty = new ZiggyPropertyRule("ziggy.logfile",
+        directoryRule, HIBERNATE_LOG_FILE_NAME);
+
+    @Rule
+    public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
+        .around(log4jLogFileProperty);
+
+    @Before
+    public void setUp() {
+        crud = new PipelineTaskCrud();
+
+        LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+        Configuration c = ctx.getConfiguration();
+        LoggerConfig lc = c.getLoggerConfig("");
+        lc.setLevel(Level.ALL);
+
+        logPath = directoryRule.directory().resolve(HIBERNATE_LOG_FILE_NAME);
+
+        hibernateLog = FileAppender.newBuilder()
+            .withFileName(logPath.toString())
+            .setName(APPENDER_NAME)
+            .build();
+        hibernateLog.start();
+        lc.addAppender(hibernateLog, Level.ALL, null);
+    }
+
+    @After
+    public void shutDown() {
+        LoggerConfig rootConfig = ((LoggerContext) LogManager.getContext(false)).getConfiguration()
+            .getLoggerConfig("");
+        Appender appender = rootConfig.getAppenders().get(APPENDER_NAME);
+        if (appender != null) {
+            appender.stop();
+            rootConfig.removeAppender(APPENDER_NAME);
+        }
+    }
+
+    /**
+     * Tests that the SQL for a simple query is as expected.
+     */
+    @Test
+    public void sqlRetrieveTest() throws IOException {
+
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertTrue(tasks.isEmpty());
+
+        // Read in the log file
+        List<String> logFileContents = logFileContents();
+        assertFalse(CollectionUtils.isEmpty(logFileContents));
+
+        // The last line should hold the SQL for the query.
+        String queryString = logFileContents.get(logFileContents.size() - 1);
+        int queryStart = queryString.indexOf("select");
+        assertTrue(queryStart > 0);
+
+        // The name of the table and the name of the dummy retrieved task should be at the end.
+        int tableNameStart = queryString.indexOf("from " + TABLE_NAME + " " + DUMMY_TASK_NAME);
+        assertTrue(tableNameStart > queryStart);
+
+        // Get the fields for a PipelineTask, removing any fields that are lazy initialized, as they
+        // don't appear in the query.
+        Field[] fields = PipelineTask.class.getDeclaredFields();
+        List<String> fieldNames = new ArrayList<>();
+        Set<String> lazyFieldNames = Set.of("log", "uowTaskParameters", "summaryMetrics", "execLog",
+            "producerTaskIds", "remoteJobs");
+
+        for (Field field : fields) {
+            if (!lazyFieldNames.contains(field.getName())) {
+                fieldNames.add(field.getName());
+            }
+        }
+
+        // All the non-lazy fields should appear between the select statement and the from
+        // statement.
+        for (String fieldName : fieldNames) {
+            String fullFieldName = DUMMY_TASK_NAME + "." + fieldName;
+            assertTrue(fieldName, queryString.indexOf(fullFieldName) > queryStart
+                && queryString.indexOf(fullFieldName) < tableNameStart);
+        }
+
+        // None of the lazy fields should appear at all.
+        for (String fieldName : lazyFieldNames) {
+            String fullFieldName = DUMMY_TASK_NAME + "." + fieldName;
+            assertEquals(fieldName, -1, queryString.indexOf(fullFieldName));
+        }
+    }
+
+    /**
+     * Tests that a simple query that retrieves all instances behaves as expected.
+     */
+    @Test
+    public void testRetrieveAllInstances() {
+
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(4, tasks.size());
+    }
+
+    /**
+     * Tests that a single-valued column criterion behaves as expected.
+     */
+    @Test
+    public void testColumnCriterion() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        query.column(PipelineTask_.state).in(PipelineTask.State.COMPLETED);
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(2, tasks.size());
+        List<Long> taskIds = tasks.stream().map(PipelineTask::getId).collect(Collectors.toList());
+        assertTrue(taskIds.contains(1L));
+        assertTrue(taskIds.contains(4L));
+    }
+
+    /**
+     * Tests that the {@link ZiggyQuery#where(jakarta.persistence.criteria.Predicate)} method
+     * accepts a user-constructed predicate.
+     */
+    @Test
+    public void testWhereClause() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        query.where(query.getBuilder().between(query.getRoot().get(PipelineTask_.id), 2L, 3L));
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(2, tasks.size());
+        List<Long> taskIds = tasks.stream().map(PipelineTask::getId).collect(Collectors.toList());
+        assertTrue(taskIds.contains(2L));
+        assertTrue(taskIds.contains(3L));
+    }
+
+    /**
+     * Tests the {@link ZiggyQuery#get(String)} and
+     * {@link ZiggyQuery#in(jakarta.persistence.criteria.Expression, java.util.Collection)} methods.
+     */
+    @Test
+    public void testGetInClauses() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        query.where(query.in(query.get(PipelineTask_.id), Set.of(1L, 2L)));
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(2, tasks.size());
+        List<Long> taskIds = tasks.stream().map(PipelineTask::getId).collect(Collectors.toList());
+        assertTrue(taskIds.contains(1L));
+        assertTrue(taskIds.contains(2L));
+    }
+
+    /**
+     * Tests the {@link ZiggyQuery#in(jakarta.persistence.criteria.Expression, Object)} method.
+     */
+    @Test
+    public void testScalarInClause() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        query.where(query.in(query.get(PipelineTask_.id), 1L));
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(1, tasks.size());
+        List<Long> taskIds = tasks.stream().map(PipelineTask::getId).collect(Collectors.toList());
+        assertTrue(taskIds.contains(1L));
+    }
+
+    /**
+     * Tests that a multi-valued column criterion behaves as expected (i.e., any task that matches
+     * any of the criteria is returned).
+     */
+    @Test
+    public void testColumnMultiValueCriterion() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        query.column(PipelineTask_.state)
+            .in(Set.of(PipelineTask.State.COMPLETED, PipelineTask.State.PROCESSING));
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(3, tasks.size());
+        List<Long> taskIds = tasks.stream().map(PipelineTask::getId).collect(Collectors.toList());
+        assertTrue(taskIds.contains(1L));
+        assertTrue(taskIds.contains(2L));
+        assertTrue(taskIds.contains(4L));
+    }
+
+    /**
+     * Test that multiple criteria on a single column are combined by an AND operation.
+     */
+    @Test
+    public void testColumnMultipleCriteria() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        query.column(PipelineTask_.id).in(Set.of(2L, 4L)).between(1L, 3L);
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(1, tasks.size());
+        List<Long> taskIds = tasks.stream().map(PipelineTask::getId).collect(Collectors.toList());
+        assertTrue(taskIds.contains(2L));
+    }
+
+    /**
+     * Tests that criteria on multiple columns are combined by an AND operation.
+     */
+    @Test
+    public void testCriteriaOnMultipleColumns() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        query.column(PipelineTask_.id)
+            .in(Set.of(2L, 3L, 4L))
+            .column(PipelineTask_.state)
+            .in(PipelineTask.State.COMPLETED);
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(1, tasks.size());
+        List<Long> taskIds = tasks.stream().map(PipelineTask::getId).collect(Collectors.toList());
+        assertTrue(taskIds.contains(4L));
+    }
+
+    /**
+     * Tests that a descending sort works as expected.
+     */
+    @Test
+    public void testSort() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask> query = crud.createZiggyQuery(PipelineTask.class);
+        query.column(PipelineTask_.id).descendingOrder();
+        @SuppressWarnings("unchecked")
+        List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(4, tasks.size());
+        assertEquals(Long.valueOf(4L), tasks.get(0).getId());
+        assertEquals(Long.valueOf(3L), tasks.get(1).getId());
+        assertEquals(Long.valueOf(2L), tasks.get(2).getId());
+        assertEquals(Long.valueOf(1L), tasks.get(3).getId());
+    }
+
+    /**
+     * Tests that a single-column select operation behaves as expected.
+     */
+    @Test
+    public void testSelectColumn() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Long> query = crud.createZiggyQuery(PipelineTask.class,
+            Long.class);
+        query.column(PipelineTask_.id).select();
+        @SuppressWarnings("unchecked")
+        List<Long> ids = (List<Long>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(4, ids.size());
+        assertTrue(ids.contains(1L));
+        assertTrue(ids.contains(2L));
+        assertTrue(ids.contains(3L));
+        assertTrue(ids.contains(4L));
+    }
+
+    /**
+     * Tests that a single-column select operation where the column name is supplied as an argument
+     * to the select method behaves as expected.
+     */
+    @Test
+    public void testSelectColumnWithColNameArg() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Long> query = crud.createZiggyQuery(PipelineTask.class,
+            Long.class);
+        query.select(PipelineTask_.id);
+        @SuppressWarnings("unchecked")
+        List<Long> ids = (List<Long>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(4, ids.size());
+        assertTrue(ids.contains(1L));
+        assertTrue(ids.contains(2L));
+        assertTrue(ids.contains(3L));
+        assertTrue(ids.contains(4L));
+    }
+
+    /**
+     * Tests that the {@link ZiggyQuery#select(jakarta.persistence.criteria.Selection)} method
+     * accepts a user-constructed selection instance.
+     */
+    @Test
+    public void testSelectClause() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Long> query = crud.createZiggyQuery(PipelineTask.class,
+            Long.class);
+        query.select(query.getRoot().get("id"));
+        @SuppressWarnings("unchecked")
+        List<Long> ids = (List<Long>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(4, ids.size());
+        assertTrue(ids.contains(1L));
+        assertTrue(ids.contains(2L));
+        assertTrue(ids.contains(3L));
+        assertTrue(ids.contains(4L));
+    }
+
+    /**
+     * Tests that non-distinct selection works as expected.
+     */
+    @Test
+    public void testNonDistinctSelection() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask.State> query = crud
+            .createZiggyQuery(PipelineTask.class, PipelineTask.State.class);
+        query.column(PipelineTask_.state).select();
+        @SuppressWarnings("unchecked")
+        List<PipelineTask.State> states = (List<PipelineTask.State>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(4, states.size());
+        assertTrue(states.contains(PipelineTask.State.COMPLETED));
+        assertTrue(states.contains(PipelineTask.State.PROCESSING));
+        assertTrue(states.contains(PipelineTask.State.ERROR));
+    }
+
+    /**
+     * Tests that distinct selection works as expected.
+     */
+    @Test
+    public void testDistinctSelection() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, PipelineTask.State> query = crud
+            .createZiggyQuery(PipelineTask.class, PipelineTask.State.class);
+        query.column(PipelineTask_.state).select();
+        query.distinct(true);
+        @SuppressWarnings("unchecked")
+        List<PipelineTask.State> states = (List<PipelineTask.State>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(3, states.size());
+        assertTrue(states.contains(PipelineTask.State.COMPLETED));
+        assertTrue(states.contains(PipelineTask.State.PROCESSING));
+        assertTrue(states.contains(PipelineTask.State.ERROR));
+    }
+
+    /**
+     * Tests selection of the max value of a column.
+     */
+    @Test
+    public void testMax() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Long> query = crud.createZiggyQuery(PipelineTask.class,
+            Long.class);
+        query.column(PipelineTask_.id).max();
+        Long maxId = (Long) DatabaseTransactionFactory
+            .performTransaction(() -> crud.uniqueResult(query));
+        assertEquals(4L, maxId.longValue());
+    }
+
+    /**
+     * Tests selection of the min value of a column.
+     */
+    @Test
+    public void testMin() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Long> query = crud.createZiggyQuery(PipelineTask.class,
+            Long.class);
+        query.column(PipelineTask_.id).min();
+        Long minId = (Long) DatabaseTransactionFactory
+            .performTransaction(() -> crud.uniqueResult(query));
+        assertEquals(1L, minId.longValue());
+    }
+
+    /**
+     * tests selection of the sum of a column.
+     */
+    @Test
+    public void testSum() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Long> query = crud.createZiggyQuery(PipelineTask.class,
+            Long.class);
+        query.column(PipelineTask_.id).sum();
+        Long idSum = (Long) DatabaseTransactionFactory
+            .performTransaction(() -> crud.uniqueResult(query));
+        assertEquals(10L, idSum.longValue());
+    }
+
+    /**
+     * Tests selection of mulitple columns.
+     */
+    @Test
+    public void testMultiSelect() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Object[]> query = crud.createZiggyQuery(PipelineTask.class,
+            Object[].class);
+        query.column(PipelineTask_.id).select();
+        query.column(PipelineTask_.state).select();
+        query.column(PipelineTask_.id).descendingOrder();
+        @SuppressWarnings("unchecked")
+        List<Object[]> results = (List<Object[]>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(4, results.size());
+        assertEquals(4L, ((Long) results.get(0)[0]).longValue());
+        assertEquals(PipelineTask.State.COMPLETED, results.get(0)[1]);
+        assertEquals(3L, ((Long) results.get(1)[0]).longValue());
+        assertEquals(PipelineTask.State.ERROR, results.get(1)[1]);
+        assertEquals(2L, ((Long) results.get(2)[0]).longValue());
+        assertEquals(PipelineTask.State.PROCESSING, results.get(2)[1]);
+        assertEquals(1L, ((Long) results.get(3)[0]).longValue());
+        assertEquals(PipelineTask.State.COMPLETED, results.get(3)[1]);
+    }
+
+    /**
+     * Test of simultaneous min and max selection.
+     */
+    @Test
+    public void testMinMax() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Object[]> query = crud.createZiggyQuery(PipelineTask.class,
+            Object[].class);
+        query.column(PipelineTask_.id).minMax();
+        @SuppressWarnings("unchecked")
+        List<Object[]> results = (List<Object[]>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(1, results.size());
+        assertEquals(1L, ((Long) results.get(0)[0]).longValue());
+        assertEquals(4L, ((Long) results.get(0)[1]).longValue());
+    }
+
+    /**
+     * Tests a query in which both a where clause and a select clause are used.
+     */
+    @Test
+    public void testCombineWhereSelect() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Long> query = crud.createZiggyQuery(PipelineTask.class,
+            Long.class);
+        query.column(PipelineTask_.state).in(PipelineTask.State.COMPLETED);
+        query.column(PipelineTask_.id).select();
+        @SuppressWarnings("unchecked")
+        List<Long> results = (List<Long>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(2, results.size());
+        assertTrue(results.contains(1L));
+        assertTrue(results.contains(4L));
+    }
+
+    @Test
+    public void testWhereScalarInScalar() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, State> query = crud
+            .createZiggyQuery(PipelineTask.class, State.class)
+            .column(PipelineTask_.state)
+            .select()
+            .in(PipelineTask.State.ERROR);
+        @SuppressWarnings("unchecked")
+        List<State> results = (List<State>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(1, results.size());
+        assertTrue(results.contains(State.ERROR));
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testWhereCollectionInScalar() {
+        populatePipelineTasks();
+        crud.createZiggyQuery(PipelineTask.class, Long.class)
+            .column(PipelineTask_.producerTaskIds)
+            .select()
+            .in(42L);
+    }
+
+    /**
+     * Tests that the {#link {@link ZiggyQuery#chunkedIn(java.util.Collection)}} works as expected.
+     */
+    @Test
+    public void testChunkedIn() {
+        populatePipelineTasks();
+        final ZiggyQuery<PipelineTask, Long> query = Mockito
+            .spy(crud.createZiggyQuery(PipelineTask.class, Long.class));
+        Mockito.doReturn(2).when(query).maxExpressions();
+        query.column(PipelineTask_.id).select().chunkedIn(Set.of(1L, 2L, 3L, 4L));
+        @SuppressWarnings("unchecked")
+        List<Long> results = (List<Long>) DatabaseTransactionFactory
+            .performTransaction(() -> crud.list(query));
+        assertEquals(4, results.size());
+        assertTrue(results.contains(1L));
+        assertTrue(results.contains(2L));
+        assertTrue(results.contains(3L));
+        assertTrue(results.contains(4L));
+        List<List<Object>> queryChunks = query.queryChunks();
+        assertEquals(2, queryChunks.size());
+        assertEquals(2, queryChunks.get(0).size());
+        assertEquals(2, queryChunks.get(1).size());
+        List<Object> allQueryChunks = new ArrayList<>(queryChunks.get(0));
+        allQueryChunks.addAll(queryChunks.get(1));
+        assertTrue(allQueryChunks.contains(1L));
+        assertTrue(allQueryChunks.contains(2L));
+        assertTrue(allQueryChunks.contains(3L));
+        assertTrue(allQueryChunks.contains(4L));
+    }
+
+    /**
+     * Exercises the {@link ZiggyQuery#count()} method.
+     */
+    @Test
+    public void testCount() {
+        populatePipelineTasks();
+        ZiggyQuery<PipelineTask, Long> query = crud.createZiggyQuery(PipelineTask.class,
+            Long.class);
+        query.column(PipelineTask_.state).in(PipelineTask.State.COMPLETED);
+        query.count();
+        Long resultCount = (Long) DatabaseTransactionFactory
+            .performTransaction(() -> crud.uniqueResult(query));
+        assertEquals(2L, resultCount.longValue());
+    }
+
+    private List<String> logFileContents() throws IOException {
+        return StringUtils
+            .breakStringAtLineTerminations(Files.readString(logPath, FileUtil.ZIGGY_CHARSET));
+    }
+
+    private void populatePipelineTasks() {
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineTask pipelineTask = new PipelineTask();
+            pipelineTask.setState(PipelineTask.State.COMPLETED);
+            pipelineTask.addProducerTaskId(40);
+            crud.persist(pipelineTask);
+            pipelineTask = new PipelineTask();
+            pipelineTask.setState(PipelineTask.State.PROCESSING);
+            pipelineTask.addProducerTaskId(41);
+            crud.persist(pipelineTask);
+            pipelineTask = new PipelineTask();
+            pipelineTask.setState(PipelineTask.State.ERROR);
+            pipelineTask.addProducerTaskId(42);
+            crud.persist(pipelineTask);
+            pipelineTask = new PipelineTask();
+            pipelineTask.setState(PipelineTask.State.COMPLETED);
+            pipelineTask.addProducerTaskId(43);
+            crud.persist(pipelineTask);
+            return null;
+        });
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/data/accounting/DataAccountabilityReportTest.java b/src/test/java/gov/nasa/ziggy/data/accounting/DataAccountabilityReportTest.java
index 4656be7..76ddb65 100644
--- a/src/test/java/gov/nasa/ziggy/data/accounting/DataAccountabilityReportTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/accounting/DataAccountabilityReportTest.java
@@ -15,8 +15,6 @@
 
 import gov.nasa.ziggy.ReflectionEquals;
 import gov.nasa.ziggy.collections.ZiggyDataType;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
@@ -53,9 +51,9 @@ public void noProducers() throws Exception {
 
         DataAccountabilityReport report = new DataAccountabilityReport(init, pipelineTaskCrud,
             taskRenderer);
-        reflectionEquals.assertEquals(new HashMap<Long, Set<Long>>(), report.calculateClosure());
+        reflectionEquals.assertEquals(new HashMap<>(), report.calculateClosure());
         reflectionEquals.assertEquals(init,
-            report.findRoots(new HashSet<Long>(), new HashMap<>(), new HashMap<>()));
+            report.findRoots(new HashSet<>(), new HashMap<>(), new HashMap<>()));
 
         String expectedReport = "Data Receipt\nStub taskId = 1\n";
         assertEquals(expectedReport, report.produceReport());
@@ -126,9 +124,15 @@ public void pyramid() throws Exception {
 
         DataAccountabilityReport report = new DataAccountabilityReport(init, pipelineTaskCrud,
             taskRenderer);
-        String expectedReport = "Stub taskId = 6\n    Stub taskId = 4\n"
-            + "        Data Receipt\n        Stub taskId = 1\n"
-            + "    Stub taskId = 5\n        Stub taskId = 2\n        Stub taskId = 3\n";
+        String expectedReport = """
+            Stub taskId = 6
+                Stub taskId = 4
+                    Data Receipt
+                    Stub taskId = 1
+                Stub taskId = 5
+                    Stub taskId = 2
+                    Stub taskId = 3
+            """;
 
         assertEquals(expectedReport, report.produceReport());
     }
@@ -154,10 +158,20 @@ public void invertedPyramid() throws Exception {
         DataAccountabilityReport report = new DataAccountabilityReport(init, pipelineTaskCrud,
             taskRenderer);
 
-        String expectedReport = "Data Receipt\n    Stub taskId = 4\n        Stub taskId = 6\n"
-            + "Stub taskId = 1\n    Stub taskId = 4\n        Stub taskId = 6\n"
-            + "Stub taskId = 2\n    Stub taskId = 5\n        Stub taskId = 6\n"
-            + "Stub taskId = 3\n    Stub taskId = 5\n        Stub taskId = 6\n";
+        String expectedReport = """
+            Data Receipt
+                Stub taskId = 4
+                    Stub taskId = 6
+            Stub taskId = 1
+                Stub taskId = 4
+                    Stub taskId = 6
+            Stub taskId = 2
+                Stub taskId = 5
+                    Stub taskId = 6
+            Stub taskId = 3
+                Stub taskId = 5
+                    Stub taskId = 6
+            """;
 
         assertEquals(expectedReport, report.produceReport());
     }
@@ -248,17 +262,9 @@ public PipelineTask retrieve(final long pipelineTaskId) {
             UnitOfWork uowt = new UnitOfWork();
             uowt.addParameter(new TypedParameter(UnitOfWork.BRIEF_STATE_PARAMETER_NAME,
                 "Stub taskId = " + pipelineTaskId, ZiggyDataType.ZIGGY_STRING));
-
-            BeanWrapper<UnitOfWork> bwUow;
-            try {
-                bwUow = new BeanWrapper<>(uowt);
-            } catch (PipelineException e) {
-                throw new IllegalStateException("Can't instantiate UowTask.", e);
-            }
-            task.setUowTask(bwUow);
+            task.setUowTaskParameters(uowt.getParameters());
 
             return task;
         }
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/data/management/AcknowledgementTest.java b/src/test/java/gov/nasa/ziggy/data/management/AcknowledgementTest.java
index 4e8810f..e9a037c 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/AcknowledgementTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/AcknowledgementTest.java
@@ -5,8 +5,8 @@
 import static gov.nasa.ziggy.XmlUtils.simpleTypeContent;
 import static gov.nasa.ziggy.ZiggyUnitTestUtils.TEST_DATA;
 import static gov.nasa.ziggy.data.management.Manifest.manifestEntryAckEntryEquals;
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -52,12 +52,12 @@ public class AcknowledgementTest {
     public ZiggyDirectoryRule dirRule = new ZiggyDirectoryRule();
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, DirectoryProperties.ziggyCodeBuildDir().toString());
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
 
     @Rule
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, "/dev/null");
+        DATASTORE_ROOT_DIR, "/dev/null");
 
     @Before
     public void setUp() {
@@ -252,7 +252,7 @@ public void testSchema() throws IOException {
 
         Path schemaPath = Paths.get(ziggyHomeDirPropertyRule.getProperty(), "schema", "xml",
             new Acknowledgement().getXmlSchemaFilename());
-        List<String> schemaContent = Files.readAllLines(schemaPath);
+        List<String> schemaContent = Files.readAllLines(schemaPath, FileUtil.ZIGGY_CHARSET);
 
         assertContains(schemaContent,
             "<xs:element name=\"acknowledgement\" type=\"acknowledgement\"/>");
@@ -290,7 +290,6 @@ public void testSchema() throws IOException {
         assertContains(complexTypeContent, "<xs:enumeration value=\"SHA1\"/>");
         assertContains(complexTypeContent, "<xs:enumeration value=\"SHA256\"/>");
         assertContains(complexTypeContent, "<xs:enumeration value=\"SHA512\"/>");
-
     }
 
     private void testAcknowledgementFiles(Map<String, AcknowledgementEntry> aFileMap,
@@ -315,5 +314,4 @@ private void validateAckFiles(Map<String, ManifestEntry> mFileMap,
             assertTrue(manifestEntryAckEntryEquals(mFile, aFile));
         }
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/data/management/DataFileInfoTest.java b/src/test/java/gov/nasa/ziggy/data/management/DataFileInfoTest.java
index cb08078..e667791 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/DataFileInfoTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/DataFileInfoTest.java
@@ -46,5 +46,4 @@ public void testCompareTo() {
         assertTrue(d1.compareTo(d2) < 0);
         assertTrue(d1.compareTo(d1) == 0);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/data/management/DataFileManagerTest.java b/src/test/java/gov/nasa/ziggy/data/management/DataFileManagerTest.java
index 75f3b52..7820dd3 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/DataFileManagerTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/DataFileManagerTest.java
@@ -1,8 +1,8 @@
 package gov.nasa.ziggy.data.management;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.USE_SYMLINKS_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_TEST_WORKING_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.USE_SYMLINKS;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_TEST_WORKING_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -55,7 +55,6 @@
 public class DataFileManagerTest {
 
     private String datastoreRoot;
-    private String taskDirRoot;
     private String taskDir;
     private String subtaskDir;
     private DataFileManager dataFileManager;
@@ -74,19 +73,19 @@ public class DataFileManagerTest {
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, directoryRule, "datastore");
+        DATASTORE_ROOT_DIR, directoryRule, "datastore");
 
     @Rule
-    public ZiggyPropertyRule useSymlinksPropertyRule = new ZiggyPropertyRule(USE_SYMLINKS_PROP_NAME,
+    public ZiggyPropertyRule useSymlinksPropertyRule = new ZiggyPropertyRule(USE_SYMLINKS,
         (String) null);
 
-    @Rule
     public ZiggyPropertyRule ziggyTestWorkingDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_TEST_WORKING_DIR_PROP_NAME, (String) null);
+        ZIGGY_TEST_WORKING_DIR, directoryRule, "pa-5-10" + File.separator + "st-0");
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
-        .around(datastoreRootDirPropertyRule);
+        .around(datastoreRootDirPropertyRule)
+        .around(ziggyTestWorkingDirPropertyRule);
 
     @Before
     public void setup() throws IOException {
@@ -96,8 +95,10 @@ public void setup() throws IOException {
 
         Path taskDirRoot = directoryRule.directory().resolve("taskspace");
         Files.createDirectories(taskDirRoot);
-        this.taskDirRoot = taskDirRoot.toString();
-        makeTaskDir("pa-5-10");
+        subtaskDir = ziggyTestWorkingDirPropertyRule.getProperty();
+        File subtaskFile = new File(subtaskDir);
+        subtaskFile.mkdirs();
+        taskDir = subtaskFile.getParent();
 
         Path externalTemp = directoryRule.directory().resolve("tmp");
         Files.createDirectories(externalTemp);
@@ -129,20 +130,6 @@ public void setup() throws IOException {
         DataFileTestUtils.initializeDataFileTypeSamples();
     }
 
-    private void makeTaskDir(String taskDirName) {
-        File taskDir = new File(taskDirRoot, taskDirName);
-        taskDir.mkdirs();
-        this.taskDir = taskDir.getAbsolutePath();
-        File subtaskDir = new File(taskDir, "st-0");
-        subtaskDir.mkdirs();
-        this.subtaskDir = subtaskDir.getAbsolutePath();
-    }
-
-    /**
-     * Tests the dataFilesMap() method of DatastoreFileManager.
-     *
-     * @throws IOException
-     */
     @Test
     public void testDataFilesMap() throws IOException {
 
@@ -215,7 +202,6 @@ public void testTaskDirectoryDataFilesMap() throws IOException {
         Set<String> d2Names = getNamesFromPaths(d2Set);
         assertTrue(d2Names.contains("cal-1-1-A-20-results.h5"));
         assertTrue(d2Names.contains("cal-1-1-B-20-results.h5"));
-
     }
 
     /**
@@ -252,7 +238,6 @@ public void testDatastoreDataFilesMap() throws IOException, InterruptedException
         Set<String> d2Names = getNamesFromPaths(d2Set);
         assertTrue(d2Names.contains("cal-1-1-A-20-results.h5"));
         assertTrue(d2Names.contains("cal-1-1-B-20-results.h5"));
-
     }
 
     /**
@@ -278,7 +263,6 @@ public void testDatastoreFiles() throws IOException, InterruptedException {
         assertTrue(names.contains("pa-765432100-20-results.h5"));
         assertTrue(names.contains("cal-1-1-A-20-results.h5"));
         assertTrue(names.contains("cal-1-1-B-20-results.h5"));
-
     }
 
     /**
@@ -320,7 +304,6 @@ public void testCopyFilesToTaskDirectory() throws IOException, InterruptedExcept
         assertEquals(2, producerTaskIds.size());
         assertTrue(producerTaskIds.contains(PROD_TASK_ID1));
         assertTrue(producerTaskIds.contains(PROD_TASK_ID2));
-
     }
 
     /**
@@ -341,8 +324,6 @@ public void testCopyFilesByNameToWorkingDirectory() throws IOException, Interrup
         File[] endFileList = new File(taskDir).listFiles();
         Set<String> filenames = getNamesFromListFiles(endFileList);
 
-        // Set the working directory
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir);
         endFileList = new File(subtaskDir).listFiles();
         assertEquals(0, endFileList.length);
         dataFileManager.copyFilesByNameFromTaskDirToWorkingDir(filenames);
@@ -374,7 +355,7 @@ public void testSymlinkFilesToTaskDirectory() throws IOException, InterruptedExc
         constructDatastoreFiles();
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager();
 
         // construct a new file in the external temp directory
@@ -442,7 +423,7 @@ public void testSymlinkFilesWithSearchLimits() throws IOException, InterruptedEx
         constructDatastoreFiles();
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager();
 
         // construct a new file in the external temp directory
@@ -472,7 +453,6 @@ public void testSymlinkFilesWithSearchLimits() throws IOException, InterruptedEx
         // check that the copies are symlinks of the correct files
         assertEquals(Paths.get(datastoreRoot, "pa", "20", "pa-001234569-20-results.h5"),
             java.nio.file.Files.readSymbolicLink(Paths.get(taskDir, "pa-001234569-20-results.h5")));
-
     }
 
     /**
@@ -487,7 +467,7 @@ public void testSymlinkFilesByNameToWorkingDirectory()
         constructDatastoreFiles();
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager();
 
         // create the DatastoreId objects
@@ -508,8 +488,6 @@ public void testSymlinkFilesByNameToWorkingDirectory()
         File[] endFileList = new File(taskDir).listFiles();
         Set<String> filenames = getNamesFromListFiles(endFileList);
 
-        // Set the working directory
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir);
         endFileList = new File(subtaskDir).listFiles();
         assertEquals(0, endFileList.length);
         dataFileManager.copyFilesByNameFromTaskDirToWorkingDir(filenames);
@@ -540,7 +518,6 @@ public void testSymlinkFilesByNameToWorkingDirectory()
                 .readSymbolicLink(Paths.get(subtaskDir, "pa-001234569-20-results.h5")));
         assertEquals(Paths.get(datastoreRoot, "cal", "20", "cal-1-1-A-20-results.h5"),
             java.nio.file.Files.readSymbolicLink(Paths.get(subtaskDir, "cal-1-1-A-20-results.h5")));
-
     }
 
     @Test
@@ -549,7 +526,7 @@ public void testSymlinkDirectoriesByNameToWorkingDirectory() throws IOException
         constructDatastoreDirectories();
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager2();
 
         // construct a new file in the external temp directory and a symlink to same in
@@ -580,7 +557,6 @@ public void testSymlinkDirectoriesByNameToWorkingDirectory() throws IOException
         dirNamesToCopy.add("EO1H2240632000337112NP_WGS_01");
         dirNamesToCopy.add("EO1H0230412000337112N0_WGS_01");
 
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir);
         dataFileManager2.copyFilesByNameFromTaskDirToWorkingDir(dirNamesToCopy);
 
         File[] endFileList = new File(subtaskDir).listFiles();
@@ -598,7 +574,6 @@ public void testSymlinkDirectoriesByNameToWorkingDirectory() throws IOException
             .readSymbolicLink(Paths.get(subtaskDir, "EO1H2240632000337112NP_WGS_01")));
         assertEquals(Paths.get(datastoreRoot, "EO1H0230412000337112N0_WGS_01"), java.nio.file.Files
             .readSymbolicLink(Paths.get(subtaskDir, "EO1H0230412000337112N0_WGS_01")));
-
     }
 
     /**
@@ -612,8 +587,7 @@ public void testDeleteFilesFromTaskDirectory() throws IOException {
         // create the DataFileInfo objects
         Set<DataFileInfo> datastoreIds = constructDatastoreIds();
 
-        // Copy the data file objects to the subtask directory
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir);
+        // Copy the data file objects to the subtask directory.
         dataFileManager.copyFilesByNameFromTaskDirToWorkingDir(datastoreFilenames);
 
         // The files in the datastoreIds should be gone from the task directory but still
@@ -642,7 +616,7 @@ public void testDeleteSymlinksFromTaskDirectory() throws IOException, Interrupte
         constructDatastoreFiles();
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager();
 
         // create the DatastoreId objects
@@ -653,8 +627,6 @@ public void testDeleteSymlinksFromTaskDirectory() throws IOException, Interrupte
         File[] endFileList = new File(taskDir).listFiles();
         Set<String> filenames = getNamesFromListFiles(endFileList);
 
-        // Set the working directory
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir);
         dataFileManager.copyFilesByNameFromTaskDirToWorkingDir(filenames);
 
         // The files in the datastoreIds should be gone from the task directory but still
@@ -675,7 +647,6 @@ public void testDeleteSymlinksFromTaskDirectory() throws IOException, Interrupte
             assertTrue(java.nio.file.Files.isSymbolicLink(subtaskPath));
             assertTrue(java.nio.file.Files.readSymbolicLink(subtaskPath).startsWith(datastorePath));
         }
-
     }
 
     /**
@@ -723,7 +694,6 @@ public void testMoveFilesToDatastore() throws IOException {
         filenames = getNamesFromListFiles(taskFileList);
         assertTrue(filenames.contains("cal-1-1-B-20-results.h5"));
         assertTrue(filenames.contains("pdc-1-1-20-results.h5"));
-
     }
 
     /**
@@ -738,7 +708,7 @@ public void testMoveFilesToDatastoreSymlinkMode() throws IOException {
         constructTaskDirFiles();
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager();
 
         // create the DataFileInfo objects
@@ -776,7 +746,6 @@ public void testMoveFilesToDatastoreSymlinkMode() throws IOException {
         filenames = getNamesFromListFiles(taskFileList);
         assertTrue(filenames.contains("cal-1-1-B-20-results.h5"));
         assertTrue(filenames.contains("pdc-1-1-20-results.h5"));
-
     }
 
     /**
@@ -845,7 +814,6 @@ public void testCopyDirectoriesToTaskDirectory() throws IOException {
         assertEquals(1, dir2SubDirList.length);
         assertEquals("next-level-down-content.L0", dir2SubDirList[0].getName());
         assertTrue(dir2SubDirList[0].isFile());
-
     }
 
     @Test
@@ -855,7 +823,7 @@ public void testSymlinkDirectoriesToTaskDirectory() throws IOException {
         constructDatastoreDirectories();
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager();
 
         // construct a new file in the external temp directory and a symlink to same in
@@ -908,7 +876,6 @@ public void testSymlinkDirectoriesToTaskDirectory() throws IOException {
             .readSymbolicLink(taskDirFile.toPath().resolve("EO1H2240632000337112NP_WGS_01")));
         assertEquals(Paths.get(datastoreRoot, "EO1H0230412000337112N0_WGS_01"), java.nio.file.Files
             .readSymbolicLink(taskDirFile.toPath().resolve("EO1H0230412000337112N0_WGS_01")));
-
     }
 
     /**
@@ -976,7 +943,6 @@ public void testMoveDirectoriesToDatastore() throws IOException {
         assertEquals(1, dir2SubDirList.length);
         assertEquals("next-level-down-content.L0", dir2SubDirList[0].getName());
         assertTrue(dir2SubDirList[0].isFile());
-
     }
 
     /**
@@ -1012,7 +978,6 @@ public void testCopyDataFilesByTypeToTaskDirectory() throws IOException, Interru
         assertEquals(2, producerTaskIds.size());
         assertTrue(producerTaskIds.contains(PROD_TASK_ID1));
         assertTrue(producerTaskIds.contains(PROD_TASK_ID2));
-
     }
 
     @Test
@@ -1052,7 +1017,6 @@ ArgumentMatchers.<Set<Long>> any(),
         filenames = paths.stream().map(s -> s.getFileName().toString()).collect(Collectors.toSet());
         assertTrue(filenames.contains("pa-765432100-20-results.h5"));
         assertTrue(filenames.contains("cal-1-1-B-20-results.h5"));
-
     }
 
     /**
@@ -1067,7 +1031,7 @@ public void testSymlinkDataFilesByTypeToTaskDirectory()
         constructDatastoreFiles();
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager2();
 
         // construct a new file in the external temp directory
@@ -1106,7 +1070,6 @@ public void testSymlinkDataFilesByTypeToTaskDirectory()
             java.nio.file.Files.readSymbolicLink(Paths.get(taskDir, "cal-1-1-A-20-results.h5")));
         assertEquals(Paths.get(datastoreRoot, "cal", "20", "cal-1-1-B-20-results.h5"),
             java.nio.file.Files.readSymbolicLink(Paths.get(taskDir, "cal-1-1-B-20-results.h5")));
-
     }
 
     @Test
@@ -1116,7 +1079,7 @@ public void testSymlinkDirectoriesByTypeToTaskDirectory() throws IOException {
         constructDatastoreDirectories();
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager2();
 
         // construct a new file in the external temp directory and a symlink to same in
@@ -1166,7 +1129,6 @@ public void testSymlinkDirectoriesByTypeToTaskDirectory() throws IOException {
             .readSymbolicLink(taskDirFile.toPath().resolve("EO1H2240632000337112NP_WGS_01")));
         assertEquals(Paths.get(datastoreRoot, "EO1H0230412000337112N0_WGS_01"), java.nio.file.Files
             .readSymbolicLink(taskDirFile.toPath().resolve("EO1H0230412000337112N0_WGS_01")));
-
     }
 
     /**
@@ -1192,7 +1154,6 @@ public void testDeleteDataFilesByTypeFromTaskDirectory()
         new File(taskDir, "pdc-1-1-20-results.h5").createNewFile();
 
         // move to the subtask directory and copy the files to there
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir);
         dataFileManager2.copyFilesByNameFromTaskDirToWorkingDir(datastoreFilenames);
 
         // delete the files
@@ -1215,7 +1176,6 @@ public void testDeleteDataFilesByTypeFromTaskDirectory()
         assertTrue(filesInTaskDir.contains("cal-1-1-A-20-results.h5"));
         assertTrue(filesInTaskDir.contains("cal-1-1-B-20-results.h5"));
         assertTrue(checkForSymlinks(listFiles, false));
-
     }
 
     @Test
@@ -1227,7 +1187,7 @@ public void testDeleteSymlinksByTypeFromTaskDirectory()
         datastoreFilenames.remove("pdc-1-1-20-results.h5");
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager2();
 
         // setup the data file types
@@ -1238,8 +1198,6 @@ public void testDeleteSymlinksByTypeFromTaskDirectory()
         // Copy the files to the task directory
         dataFileManager2.copyDataFilesByTypeToTaskDirectory(Paths.get(""), dataFileTypes);
 
-        // move to the subtask directory and copy the files to there
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir);
         dataFileManager2.copyFilesByNameFromTaskDirToWorkingDir(datastoreFilenames);
 
         // delete the files
@@ -1320,7 +1278,6 @@ public void testMoveDataFilesByTypeToDatastore() throws IOException {
         assertEquals(2, taskFileList.length);
         filenames = getNamesFromListFiles(taskFileList);
         assertTrue(filenames.contains("pdc-1-1-20-results.h5"));
-
     }
 
     /**
@@ -1346,18 +1303,15 @@ public void testDeleteDirectoriesFromTaskDirectory() throws IOException {
         File[] endFileList = new File(taskDir).listFiles();
         assertEquals(1, endFileList.length);
         assertEquals("st-0", endFileList[0].getName());
-
     }
 
     @Test
     public void testMoveSymlinkedFileToDatastore() throws IOException {
 
         // Enable symlinking
-        System.setProperty(USE_SYMLINKS_PROP_NAME, "true");
+        System.setProperty(USE_SYMLINKS.property(), "true");
         initializeDataFileManager2();
 
-        // change to the subtask directory and populate with files
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir);
         new File(subtaskDir, "pa-001234567-20-results.h5").createNewFile();
         new File(subtaskDir, "pa-765432100-20-results.h5").createNewFile();
         new File(subtaskDir, "cal-1-1-A-20-results.h5").createNewFile();
@@ -1419,7 +1373,6 @@ public void testMoveSymlinkedFileToDatastore() throws IOException {
             java.nio.file.Files.readSymbolicLink(Paths.get(subtaskDir, "cal-1-1-A-20-results.h5")));
         assertEquals(Paths.get(datastoreRoot, "cal", "20", "cal-1-1-B-20-results.h5"),
             java.nio.file.Files.readSymbolicLink(Paths.get(subtaskDir, "cal-1-1-B-20-results.h5")));
-
     }
 
     @Test
@@ -1450,8 +1403,8 @@ public void testDatastoreFilesInCompletedSubtasks() throws IOException {
 
         // Create and persist a TaskConfigurationManager instance
         TaskConfigurationManager tcm = new TaskConfigurationManager(new File(taskDir));
-        tcm.addFilesForSubtask(new TreeSet<String>());
-        tcm.addFilesForSubtask(new TreeSet<String>());
+        tcm.addFilesForSubtask(new TreeSet<>());
+        tcm.addFilesForSubtask(new TreeSet<>());
         tcm.persist();
 
         // Get the flavors of input files
@@ -1535,7 +1488,6 @@ public void testDatastoreFilesInCompletedSubtasks() throws IOException {
         filesFromCompletedSubtasks = dataFileManager2
             .datastoreFilesInCompletedSubtasksWithoutResults(dataFileTypes);
         assertEquals(0, filesFromCompletedSubtasks.size());
-
     }
 
     @Test
@@ -1566,8 +1518,8 @@ public void testFilesInCompletedSubtasks() throws IOException {
 
         // Create and persist a TaskConfigurationManager instance
         TaskConfigurationManager tcm = new TaskConfigurationManager(new File(taskDir));
-        tcm.addFilesForSubtask(new TreeSet<String>());
-        tcm.addFilesForSubtask(new TreeSet<String>());
+        tcm.addFilesForSubtask(new TreeSet<>());
+        tcm.addFilesForSubtask(new TreeSet<>());
         tcm.persist();
 
         // construct the set of DatastoreId subclasses
@@ -1646,7 +1598,6 @@ ArgumentMatchers.<Set<Long>> any(),
         assertEquals(2, filenames.size());
         assertTrue(filenames.contains("pa-765432100-20-results.h5"));
         assertTrue(filenames.contains("cal-1-1-B-20-results.h5"));
-
     }
 
     @Test
@@ -1672,7 +1623,6 @@ ArgumentMatchers.<Set<Long>> any(),
         Set<String> filenames = getNamesFromListFiles(endFileList);
         assertEquals(1, filenames.size());
         assertTrue(filenames.contains("pa-765432100-20-results.h5"));
-
     }
 
     @Test
@@ -1684,8 +1634,6 @@ public void testWorkingDirHasFilesOfTypes() throws IOException {
         sample1.createNewFile();
         sample2.createNewFile();
 
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir);
-
         // Files of the type of the DataFileTypeSample1 should be found.
         assertTrue(dataFileManager2.workingDirHasFilesOfTypes(
             Collections.singleton(DataFileTestUtils.dataFileTypeSample1)));
@@ -1701,7 +1649,6 @@ public void testWorkingDirHasFilesOfTypes() throws IOException {
         // When searching for both data types, a result of true should be
         // returned.
         assertTrue(dataFileManager2.workingDirHasFilesOfTypes(dataFileTypeSet));
-
     }
 
     private static List<DatastoreProducerConsumer> datastoreProducerConsumers() {
@@ -1760,7 +1707,6 @@ private Set<String> constructTaskDirFiles() throws IOException {
         sample1.createNewFile();
         filenames.add(sample1.getName());
         return filenames;
-
     }
 
     private Set<String> constructDatastoreFiles() throws IOException, InterruptedException {
@@ -1796,7 +1742,6 @@ private Set<String> constructDatastoreFiles() throws IOException, InterruptedExc
         dmy = !dmy;
         datastoreFilenames.add(sample1.getName());
         return datastoreFilenames;
-
     }
 
     private <T extends DataFileInfo> Set<String> getNamesFromDatastoreIds(Set<T> datastoreSet) {
@@ -1970,8 +1915,6 @@ public Set<Long> retrieveProducers(Set<Path> paths) {
         @Override
         public void createOrUpdateProducer(PipelineTask pipelineTask,
             Collection<Path> datastoreFiles, DatastoreProducerConsumer.DataReceiptFileType type) {
-
         }
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/data/management/DataFileTestUtils.java b/src/test/java/gov/nasa/ziggy/data/management/DataFileTestUtils.java
index 0042fb2..6182fb1 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/DataFileTestUtils.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/DataFileTestUtils.java
@@ -53,7 +53,6 @@ public DataFileInfoSample1(String name) {
         protected Pattern getPattern() {
             return PATTERN;
         }
-
     }
 
     /**
@@ -88,7 +87,6 @@ public DataFileInfoSample2(String name) {
         protected Pattern getPattern() {
             return PATTERN;
         }
-
     }
 
     /**
@@ -117,7 +115,6 @@ public DataFileInfoSampleForDirs(Path name) {
         protected Pattern getPattern() {
             return PATTERN;
         }
-
     }
 
     /**
@@ -136,7 +133,6 @@ public int getValue() {
         public void setValue(int value) {
             this.value = value;
         }
-
     }
 
     /**
@@ -200,7 +196,6 @@ public void copyDatastoreFilesToTaskDirectory(
         public Set<Path> findDatastoreFilesForInputs(PipelineTask pipelineTask) {
             return Collections.emptySet();
         }
-
     }
 
     public static class PipelineOutputsSample1 extends PipelineOutputs {
@@ -253,7 +248,6 @@ public void updateInputFileConsumers(PipelineInputs pipelineInputs,
         protected boolean subtaskProducedResults() {
             return true;
         }
-
     }
 
     /**
@@ -283,7 +277,6 @@ public Path datastorePath(DataFileInfo dataFileInfo) {
             }
             return p;
         }
-
     }
 
     public static final DataFileType dataFileTypeSample1 = new DataFileType();
@@ -308,5 +301,4 @@ public static void initializeDataFileTypeForDirectories() {
             "EO1H([0-9]{6})([0-9]{4})([0-9]{2})([0-9]{1})([A-Z0-9]{5})_([A-Z]{3})_([0-9]{2})");
         dataFileTypeForDirectories.setFileNameWithSubstitutionsForDatastore("EO1H$1$2$3$4$5_$6_$7");
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/data/management/DataFileTypeImporterTest.java b/src/test/java/gov/nasa/ziggy/data/management/DataFileTypeImporterTest.java
index c7972a9..3947b6c 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/DataFileTypeImporterTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/DataFileTypeImporterTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.data.management;
 
 import static gov.nasa.ziggy.ZiggyUnitTestUtils.TEST_DATA;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 import static org.junit.Assert.assertEquals;
 
 import java.nio.file.Path;
@@ -42,8 +42,8 @@ public class DataFileTypeImporterTest {
     private ModelCrud modelCrud = Mockito.mock(ModelCrud.class);
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, DirectoryProperties.ziggyCodeBuildDir().toString());
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
 
     // Basic functionality -- multiple files, multiple definitions, get imported
     @Test
@@ -58,11 +58,10 @@ public void testBasicImport() throws JAXBException {
 
         assertEquals(6, importerSpy.getDataFileImportedCount());
         Mockito.verify(dataFileTypeCrud, Mockito.times(1))
-            .create(ArgumentMatchers.<DataFileType> anyList());
+            .persist(ArgumentMatchers.<DataFileType> anyList());
 
         assertEquals(2, importerSpy.getModelFileImportedCount());
-        Mockito.verify(modelCrud, Mockito.times(1)).create(ArgumentMatchers.<ModelType> anyList());
-
+        Mockito.verify(modelCrud, Mockito.times(1)).persist(ArgumentMatchers.<ModelType> anyList());
     }
 
     // Dry run test -- should import but not persist
@@ -78,9 +77,9 @@ public void testDryRun() throws JAXBException {
 
         assertEquals(6, importerSpy.getDataFileImportedCount());
         Mockito.verify(dataFileTypeCrud, Mockito.times(0))
-            .create(ArgumentMatchers.<DataFileType> anyList());
+            .persist(ArgumentMatchers.<DataFileType> anyList());
         assertEquals(2, importerSpy.getModelFileImportedCount());
-        Mockito.verify(modelCrud, Mockito.times(0)).create(ArgumentMatchers.<ModelType> anyList());
+        Mockito.verify(modelCrud, Mockito.times(0)).persist(ArgumentMatchers.<ModelType> anyList());
     }
 
     // Test with missing and non-regular files -- should still import from the present,
@@ -97,7 +96,7 @@ public void testWithInvalidFiles() throws JAXBException {
 
         assertEquals(6, importerSpy.getDataFileImportedCount());
         Mockito.verify(dataFileTypeCrud, Mockito.times(1))
-            .create(ArgumentMatchers.<DataFileType> anyList());
+            .persist(ArgumentMatchers.<DataFileType> anyList());
     }
 
     // Test with a file that has an entry that is valid XML but instantiates to an
@@ -114,7 +113,7 @@ public void testWithInvalidDataFileType() throws JAXBException {
 
         assertEquals(5, importerSpy.getDataFileImportedCount());
         Mockito.verify(dataFileTypeCrud, Mockito.times(1))
-            .create(ArgumentMatchers.<DataFileType> anyList());
+            .persist(ArgumentMatchers.<DataFileType> anyList());
     }
 
     // Test with a file that has an entry that is invalid XML
@@ -130,7 +129,7 @@ public void testWithInvalidDataXml() throws JAXBException {
 
         assertEquals(5, importerSpy.getDataFileImportedCount());
         Mockito.verify(dataFileTypeCrud, Mockito.times(1))
-            .create(ArgumentMatchers.<DataFileType> anyList());
+            .persist(ArgumentMatchers.<DataFileType> anyList());
     }
 
     @Test(expected = IllegalStateException.class)
diff --git a/src/test/java/gov/nasa/ziggy/data/management/DataFileTypeTest.java b/src/test/java/gov/nasa/ziggy/data/management/DataFileTypeTest.java
index 7deea78..697442d 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/DataFileTypeTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/DataFileTypeTest.java
@@ -69,7 +69,6 @@ public void testFileNameInTaskDirMatches() {
         d.setFileNameRegexForTaskDir("perm-(\\S+)-(set-[0-9])-(file-[0-9]).png");
         d.setFileNameWithSubstitutionsForDatastore("$2/L0/$1-$3.png");
         assertTrue(d.fileNameInTaskDirMatches("perm-nasa_logo-set-1-file-0.png"));
-
     }
 
     @Test
@@ -133,5 +132,4 @@ public void testNoName() {
         d.setName("");
         d.validate();
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/data/management/DataReceiptPipelineModuleTest.java b/src/test/java/gov/nasa/ziggy/data/management/DataReceiptPipelineModuleTest.java
index d951141..aaaa6eb 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/DataReceiptPipelineModuleTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/DataReceiptPipelineModuleTest.java
@@ -1,11 +1,11 @@
 package gov.nasa.ziggy.data.management;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.DATA_RECEIPT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.PIPELINE_HOME_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.RESULTS_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.USE_SYMLINKS_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.DATA_RECEIPT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.PIPELINE_HOME_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.RESULTS_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.USE_SYMLINKS;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -22,14 +22,12 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
@@ -46,7 +44,6 @@
 import gov.nasa.ziggy.data.management.DatastoreProducerConsumer.DataReceiptFileType;
 import gov.nasa.ziggy.models.ModelImporter;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.ModelMetadata;
 import gov.nasa.ziggy.pipeline.definition.ModelMetadataTest.ModelMetadataFixedDate;
 import gov.nasa.ziggy.pipeline.definition.ModelRegistry;
@@ -63,7 +60,6 @@
 import gov.nasa.ziggy.uow.DirectoryUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.UnitOfWork;
 import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
-import gov.nasa.ziggy.worker.WorkerTaskRequestDispatcher;
 import jakarta.xml.bind.JAXBException;
 
 /**
@@ -88,26 +84,26 @@ public class DataReceiptPipelineModuleTest {
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
-    public ZiggyPropertyRule dataReceiptDirPropertyRule = new ZiggyPropertyRule(
-        DATA_RECEIPT_DIR_PROP_NAME, directoryRule, "data-import");
+    public ZiggyPropertyRule dataReceiptDirPropertyRule = new ZiggyPropertyRule(DATA_RECEIPT_DIR,
+        directoryRule, "data-import");
 
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, directoryRule, "datastore");
+        DATASTORE_ROOT_DIR, directoryRule, "datastore");
 
     @Rule
-    public ZiggyPropertyRule pipelineHomeDirPropertyRule = new ZiggyPropertyRule(
-        PIPELINE_HOME_DIR_PROP_NAME, (String) null);
+    public ZiggyPropertyRule pipelineHomeDirPropertyRule = new ZiggyPropertyRule(PIPELINE_HOME_DIR,
+        (String) null);
 
-    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR_PROP_NAME,
+    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR,
         directoryRule);
 
     @Rule
-    public ZiggyPropertyRule useSymlinksPropertyRule = new ZiggyPropertyRule(USE_SYMLINKS_PROP_NAME,
+    public ZiggyPropertyRule useSymlinksPropertyRule = new ZiggyPropertyRule(USE_SYMLINKS,
         (String) null);
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, DirectoryProperties.ziggyCodeBuildDir().toString());
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
@@ -190,7 +186,7 @@ public void testImportFromDataReceiptDir() throws IOException, InstantiationExce
         setUpModelsForImport(dataImporterPath);
         constructManifests();
 
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(singleUow);
 
         // Perform the import
         DataReceiptModuleForTest module = new DataReceiptModuleForTest(pipelineTask,
@@ -289,7 +285,7 @@ public void testImportFromDataSubdir() throws IOException, InstantiationExceptio
 
         // Set up the pipeline module to return the single unit of work task and the appropriate
         // families of model and data types
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(dataSubdirUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(dataSubdirUow);
 
         // Perform the import
         DataReceiptModuleForTest module = new DataReceiptModuleForTest(pipelineTask,
@@ -379,7 +375,7 @@ public void testImportFromModelsSubdir() throws IOException, InstantiationExcept
 
         // Set up the pipeline module to return the single unit of work task and the appropriate
         // families of model and data types
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(modelSubdirUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(modelSubdirUow);
         Mockito.when(pipelineTask.getPipelineDefinitionNode()).thenReturn(node);
         Mockito.when(pipelineTask.getId()).thenReturn(101L);
 
@@ -454,7 +450,6 @@ public void testImportFromModelsSubdir() throws IOException, InstantiationExcept
         assertEquals(DataReceiptStatus.VALID, dbManifest.getStatus());
         assertEquals("model-importer-subdir-manifest.xml", dbManifest.getName());
         assertNotNull(dbManifest.getImportTime());
-
     }
 
     @Test
@@ -468,7 +463,7 @@ public void testImportWithErrors() throws IOException, InstantiationException,
 
         // Set up the pipeline module to return the single unit of work task and the appropriate
         // families of model and data types
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(singleUow);
         Mockito.when(pipelineTask.getPipelineDefinitionNode()).thenReturn(node);
         Mockito.when(pipelineTask.getId()).thenReturn(101L);
 
@@ -608,7 +603,7 @@ public void testCleanupFailOnNonEmptyDir() throws IOException, InstantiationExce
 
         // Set up the pipeline module to return the single unit of work task and the appropriate
         // families of model and data types
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(singleUow);
         Mockito.when(pipelineTask.getPipelineDefinitionNode()).thenReturn(node);
         Mockito.when(pipelineTask.getId()).thenReturn(101L);
 
@@ -618,61 +613,11 @@ public void testCleanupFailOnNonEmptyDir() throws IOException, InstantiationExce
         module.processTask();
     }
 
-    @Ignore
-    @Test
-    public void testInterruptInAlgorithm()
-        throws IOException, InstantiationException, IllegalAccessException, SAXException,
-        InterruptedException, JAXBException, IllegalArgumentException, InvocationTargetException,
-        NoSuchMethodException, SecurityException, ExecutionException {
-
-        // Populate the models
-        setUpModelsForImport(dataImporterPath);
-        constructManifests();
-
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
-
-        // Perform the import
-        DataReceiptModuleForTest module = new DataReceiptModuleForTest(pipelineTask,
-            RunMode.STANDARD);
-        execThread.submit(module).get();
-        WorkerTaskRequestDispatcher.deleteTask(101L);
-        assertTrue(module.isAlgorithmStarted());
-        assertFalse(module.isAlgorithmCompleted());
-        assertFalse(module.isStoringStarted());
-        assertFalse(module.isStoringCompleted());
-        assertFalse(module.isTaskCompleted());
-    }
-
-    @Ignore
-    @Test
-    public void testInterruptInStoring()
-        throws IOException, InstantiationException, IllegalAccessException, SAXException,
-        InterruptedException, JAXBException, IllegalArgumentException, InvocationTargetException,
-        NoSuchMethodException, SecurityException {
-
-        // Populate the models
-        setUpModelsForImport(dataImporterPath);
-        constructManifests();
-
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
-
-        // Perform the import
-        DataReceiptModuleForTest module = new DataReceiptModuleForTest(pipelineTask,
-            RunMode.STANDARD);
-        execThread.submit(module);
-        WorkerTaskRequestDispatcher.deleteTask(101L);
-        assertTrue(module.isAlgorithmStarted());
-        assertTrue(module.isAlgorithmCompleted());
-        assertTrue(module.isStoringStarted());
-        assertFalse(module.isStoringCompleted());
-        assertFalse(module.isTaskCompleted());
-    }
-
     @Test
     public void testImportOnEmptyDirectory() throws IOException {
 
         FileUtils.cleanDirectory(dataImporterPath.toFile());
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(singleUow);
         // Perform the import
         DataReceiptModuleForTest module = new DataReceiptModuleForTest(pipelineTask,
             RunMode.STANDARD);
@@ -682,7 +627,7 @@ public void testImportOnEmptyDirectory() throws IOException {
 
     @Test(expected = PipelineException.class)
     public void testMissingManifest() {
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(singleUow);
         // Perform the import
         DataReceiptModuleForTest module = new DataReceiptModuleForTest(pipelineTask,
             RunMode.STANDARD);
@@ -739,7 +684,6 @@ private Set<String> constructFilesForImport() throws IOException {
         sample1.createNewFile();
         filenames.add(sample1.getName());
         return filenames;
-
     }
 
     private void setUpModelsForImport(Path modelDirPath) throws IOException {
@@ -749,7 +693,6 @@ private void setUpModelsForImport(Path modelDirPath) throws IOException {
         new File(modelImportDir, "tess2020321141517-12345_025-geometry.xml").createNewFile();
         new File(modelImportDir, "calibration-4.12.19.h5").createNewFile();
         new File(modelImportDir, "simple-text.h5").createNewFile();
-
     }
 
     private void constructManifests() throws IOException, InstantiationException,
@@ -800,7 +743,6 @@ protected ModelMetadata modelMetadata(ModelType modelType, String modelName,
         protected ModelCrud modelCrud() {
             return crud;
         }
-
     }
 
     /**
@@ -818,54 +760,23 @@ private class DataReceiptModuleForTest extends DataReceiptPipelineModule impleme
         private Set<FailedImport> failedImportsDataAccountability = new HashSet<>();
         private Manifest manifest;
 
-        boolean algorithmStarted = false;
-        boolean algorithmCompleted = false;
-        boolean storingStarted = false;
-        boolean storingCompleted = false;
-        boolean taskCompleted = false;
-
         public DataReceiptModuleForTest(PipelineTask pipelineTask, RunMode runMode) {
             super(pipelineTask, runMode);
         }
 
         @Override
         public void executingTaskAction() {
-            algorithmStarted = true;
             super.executingTaskAction();
-            algorithmCompleted = true;
         }
 
         @Override
         public void storingTaskAction() {
-            storingStarted = true;
             super.storingTaskAction();
-            storingCompleted = true;
         }
 
         @Override
         public void processingCompleteTaskAction() {
             super.processingCompleteTaskAction();
-            taskCompleted = true;
-        }
-
-        public boolean isAlgorithmStarted() {
-            return algorithmStarted;
-        }
-
-        public boolean isAlgorithmCompleted() {
-            return algorithmCompleted;
-        }
-
-        public boolean isStoringStarted() {
-            return storingStarted;
-        }
-
-        public boolean isStoringCompleted() {
-            return storingCompleted;
-        }
-
-        public boolean isTaskCompleted() {
-            return taskCompleted;
         }
 
         @Override
@@ -916,7 +827,6 @@ public void incrementProcessingState() {
 
         @Override
         protected void flushDatabase() {
-
         }
 
         public void disableDirectoryCleanup() {
@@ -948,7 +858,7 @@ public Manifest getManifest() {
         private class ManifestCrudForTest extends ManifestCrud {
 
             @Override
-            public void create(Object o) {
+            public void persist(Object o) {
                 manifest = (Manifest) o;
             }
 
@@ -962,7 +872,5 @@ public boolean datasetIdExists(long datasetId) {
         public void run() {
             processTask();
         }
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/data/management/DatastoreConfigurationFileTest.java b/src/test/java/gov/nasa/ziggy/data/management/DatastoreConfigurationFileTest.java
index 220086c..1f90be9 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/DatastoreConfigurationFileTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/DatastoreConfigurationFileTest.java
@@ -3,7 +3,7 @@
 import static gov.nasa.ziggy.XmlUtils.assertContains;
 import static gov.nasa.ziggy.XmlUtils.complexTypeContent;
 import static gov.nasa.ziggy.ZiggyUnitTestUtils.TEST_DATA;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_TEST_WORKING_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_TEST_WORKING_DIR;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
@@ -22,6 +22,7 @@
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
+import gov.nasa.ziggy.util.io.FileUtil;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.SchemaOutputResolver;
@@ -40,7 +41,7 @@ public class DatastoreConfigurationFileTest {
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
     public ZiggyPropertyRule ziggyTestWorkingDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_TEST_WORKING_DIR_PROP_NAME, directoryRule);
+        ZIGGY_TEST_WORKING_DIR, directoryRule);
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
@@ -56,7 +57,8 @@ public void setUp() {
     public void testGenerateSchema() throws JAXBException, IOException {
         JAXBContext context = JAXBContext.newInstance(DatastoreConfigurationFile.class);
         context.generateSchema(new DatastoreFileSchemaResolver());
-        List<String> schemaContent = Files.readAllLines(schemaFile.toPath());
+        List<String> schemaContent = Files.readAllLines(schemaFile.toPath(),
+            FileUtil.ZIGGY_CHARSET);
 
         assertContains(schemaContent,
             "<xs:element name=\"datastoreConfiguration\" type=\"datastoreConfigurationFile\"/>");
@@ -120,7 +122,5 @@ public Result createOutput(String namespaceUri, String suggestedFileName)
             result.setSystemId(schemaFile.toURI().toURL().toString());
             return result;
         }
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/DatastoreProducerConsumerCrudTest.java b/src/test/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumerCrudTest.java
similarity index 74%
rename from src/test/java/gov/nasa/ziggy/pipeline/definition/crud/DatastoreProducerConsumerCrudTest.java
rename to src/test/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumerCrudTest.java
index 79a00ef..5cf164d 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/DatastoreProducerConsumerCrudTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/DatastoreProducerConsumerCrudTest.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.pipeline.definition.crud;
+package gov.nasa.ziggy.data.management;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -6,6 +6,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -18,8 +19,6 @@
 import com.google.common.collect.Sets;
 
 import gov.nasa.ziggy.ZiggyDatabaseRule;
-import gov.nasa.ziggy.data.management.DatastoreProducerConsumer;
-import gov.nasa.ziggy.data.management.DatastoreProducerConsumerCrud;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 
@@ -48,7 +47,6 @@ public void setup() {
         resultsOriginatorCrud = new DatastoreProducerConsumerCrud();
         pipelineTask = Mockito.mock(PipelineTask.class);
         Mockito.when(pipelineTask.getId()).thenReturn(TASK_ID);
-
     }
 
     /**
@@ -101,7 +99,6 @@ public void testCreateOrUpdateOriginator() {
         assertEquals(TASK_ID + 1, (long) resultsOriginatorMap.get(FILE_NAME_2));
         assertTrue(filenames.contains(FILE_NAME_1));
         assertEquals(TASK_ID + 1, (long) resultsOriginatorMap.get(FILE_NAME_3));
-
     }
 
     /**
@@ -149,4 +146,46 @@ public void retrieveOriginatorsAllDifferent() {
         assertTrue(originators.contains(TASK_ID + 1));
     }
 
+    /**
+     * Tests retrieval of files that are consumed by a specified task.
+     */
+    @Test
+    public void testRetrieveFilesConsumedByTask() {
+
+        // Create some files in the producer-consumer database table, and add consumers to them.
+        DatabaseTransactionFactory.performTransaction(() -> {
+
+            resultsOriginatorCrud.createOrUpdateProducer(pipelineTask, PATH_1,
+                DatastoreProducerConsumer.DataReceiptFileType.DATA);
+            resultsOriginatorCrud.createOrUpdateProducer(pipelineTask, PATH_2,
+                DatastoreProducerConsumer.DataReceiptFileType.DATA);
+            resultsOriginatorCrud.createOrUpdateProducer(pipelineTask, PATH_3,
+                DatastoreProducerConsumer.DataReceiptFileType.DATA);
+
+            PipelineTask consumer1 = Mockito.mock(PipelineTask.class);
+            Mockito.when(consumer1.getId()).thenReturn(31L);
+            resultsOriginatorCrud.addConsumer(consumer1,
+                new HashSet<>(Set.of(PATH_1.toString(), PATH_3.toString())));
+            PipelineTask consumer2 = Mockito.mock(PipelineTask.class);
+            Mockito.when(consumer2.getId()).thenReturn(32L);
+            resultsOriginatorCrud.addConsumer(consumer2,
+                new HashSet<>(Set.of(PATH_1.toString(), PATH_2.toString())));
+            PipelineTask consumer3 = Mockito.mock(PipelineTask.class);
+            Mockito.when(consumer3.getId()).thenReturn(33L);
+            resultsOriginatorCrud.addConsumer(consumer3,
+                new HashSet<>(Set.of(PATH_2.toString(), PATH_3.toString())));
+
+            return null;
+        });
+
+        // Retrieve the files that have the relevant pipeline task as consumer.
+        DatabaseTransactionFactory.performTransaction(() -> {
+
+            Set<String> files = resultsOriginatorCrud.retrieveFilesConsumedByTask(31L);
+            assertEquals(2, files.size());
+            assertTrue(files.contains(PATH_1.toString()));
+            assertTrue(files.contains(PATH_3.toString()));
+            return null;
+        });
+    }
 }
diff --git a/src/test/java/gov/nasa/ziggy/data/management/DefaultDataImporterTest.java b/src/test/java/gov/nasa/ziggy/data/management/DefaultDataImporterTest.java
index 01c106e..eba00a1 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/DefaultDataImporterTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/DefaultDataImporterTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.data.management;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.USE_SYMLINKS_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.USE_SYMLINKS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -28,10 +28,10 @@
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
 import gov.nasa.ziggy.collections.ZiggyDataType;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
+import gov.nasa.ziggy.services.alert.AlertService;
 import gov.nasa.ziggy.uow.DataReceiptUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.DirectoryUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.UnitOfWork;
@@ -57,14 +57,14 @@ public class DefaultDataImporterTest {
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, directoryRule, "datastore");
+        DATASTORE_ROOT_DIR, directoryRule, "datastore");
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
         .around(datastoreRootDirPropertyRule);
 
     @Rule
-    public ZiggyPropertyRule useSymlinksPropertyRule = new ZiggyPropertyRule(USE_SYMLINKS_PROP_NAME,
+    public ZiggyPropertyRule useSymlinksPropertyRule = new ZiggyPropertyRule(USE_SYMLINKS,
         (String) null);
 
     @Before
@@ -104,7 +104,7 @@ public void setUp() throws IOException {
 
     @Test
     public void testSingleUowConstructor() {
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(singleUow);
         DefaultDataImporter importer = new DefaultDataImporter(pipelineTask, dataImporterPath,
             datastoreRootPath);
         assertEquals(dataImporterPath, importer.getDataImportPath());
@@ -112,7 +112,7 @@ public void testSingleUowConstructor() {
 
     @Test
     public void testDefaultUowConstructor() {
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(subdirUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(subdirUow);
         DefaultDataImporter importer = new DefaultDataImporter(pipelineTask, dataImporterPath,
             datastoreRootPath);
         assertEquals(dataImporterSubdirPath, importer.getDataImportPath());
@@ -121,7 +121,7 @@ public void testDefaultUowConstructor() {
     @Test
     public void testDataFilesInMainDir() throws IOException {
         dirForImports = dataImporterPath;
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(singleUow);
         Mockito.when(pipelineTask.getPipelineDefinitionNode()).thenReturn(node);
         DefaultDataImporter importer = new DefaultDataImporter(pipelineTask, dataImporterPath,
             datastoreRootPath);
@@ -138,7 +138,7 @@ public void testDataFilesInMainDir() throws IOException {
     @Test
     public void testDataFilesInSubdir() throws IOException {
         dirForImports = dataImporterSubdirPath;
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(subdirUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(subdirUow);
         Mockito.when(pipelineTask.getPipelineDefinitionNode()).thenReturn(node);
         DefaultDataImporter importer = new DefaultDataImporter(pipelineTask, dataImporterPath,
             datastoreRootPath);
@@ -155,7 +155,7 @@ public void testDataFilesInSubdir() throws IOException {
     @Test
     public void testImportFilesFromMainDir() throws IOException {
         dirForImports = dataImporterPath;
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(singleUow);
         Mockito.when(pipelineTask.getPipelineDefinitionNode()).thenReturn(node);
         DefaultDataImporter importer = new DefaultDataImporter(pipelineTask, dataImporterPath,
             datastoreRootPath);
@@ -190,7 +190,7 @@ public void testImportFilesFromMainDir() throws IOException {
     @Test
     public void testImportFilesFromSubdir() throws IOException {
         dirForImports = dataImporterSubdirPath;
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(subdirUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(subdirUow);
         Mockito.when(pipelineTask.getPipelineDefinitionNode()).thenReturn(node);
         DefaultDataImporter importer = new DefaultDataImporter(pipelineTask, dataImporterPath,
             datastoreRootPath);
@@ -224,11 +224,12 @@ public void testImportFilesFromSubdir() throws IOException {
     @Test
     public void testImportFilesWithFailure() throws IOException {
         dirForImports = dataImporterPath;
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(singleUow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(singleUow);
         Mockito.when(pipelineTask.getPipelineDefinitionNode()).thenReturn(node);
         DefaultDataImporter importer = new DefaultDataImporter(pipelineTask, dataImporterPath,
             datastoreRootPath);
         importer = Mockito.spy(importer);
+        Mockito.doReturn(Mockito.mock(AlertService.class)).when(importer).alertService();
         Mockito.doThrow(IOException.class)
             .when(importer)
             .moveOrSymlink(dataImporterPath.resolve(Paths.get("pa-001234567-20-results.h5")),
@@ -286,7 +287,6 @@ private Set<String> constructFilesForImport() throws IOException {
         sample1.createNewFile();
         filenames.add(sample1.getName());
         return filenames;
-
     }
 
     private List<String> filenamesInDirectory() throws IOException {
@@ -298,5 +298,4 @@ private List<String> filenamesInDirectory() throws IOException {
         }
         return filenamesInDirectory;
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/data/management/ManifestTest.java b/src/test/java/gov/nasa/ziggy/data/management/ManifestTest.java
index 4cc7a26..ce29f05 100644
--- a/src/test/java/gov/nasa/ziggy/data/management/ManifestTest.java
+++ b/src/test/java/gov/nasa/ziggy/data/management/ManifestTest.java
@@ -4,8 +4,8 @@
 import static gov.nasa.ziggy.XmlUtils.complexTypeContent;
 import static gov.nasa.ziggy.XmlUtils.simpleTypeContent;
 import static gov.nasa.ziggy.ZiggyUnitTestUtils.TEST_DATA;
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -27,6 +27,7 @@
 import gov.nasa.ziggy.ZiggyPropertyRule;
 import gov.nasa.ziggy.data.management.Manifest.ManifestEntry;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.util.io.FileUtil;
 import jakarta.xml.bind.JAXBException;
 
@@ -48,12 +49,12 @@ public class ManifestTest {
     public ZiggyDirectoryRule ziggyDirectoryRule = new ZiggyDirectoryRule();
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, DirectoryProperties.ziggyCodeBuildDir().toString());
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
 
     @Rule
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, "/dev/null");
+        DATASTORE_ROOT_DIR, "/dev/null");
 
     @Before
     public void setUp() {
@@ -170,9 +171,10 @@ public void testWriteAndReadManifestSymlinks() throws IOException, Instantiation
 
     @Test
     public void testSchema() throws IOException {
-        Path schemaPath = Paths.get(System.getProperty(ZIGGY_HOME_DIR_PROP_NAME), "schema", "xml",
+        Path schemaPath = Paths.get(
+            ZiggyConfiguration.getInstance().getString(ZIGGY_HOME_DIR.property()), "schema", "xml",
             new Manifest().getXmlSchemaFilename());
-        List<String> schemaContent = Files.readAllLines(schemaPath);
+        List<String> schemaContent = Files.readAllLines(schemaPath, FileUtil.ZIGGY_CHARSET);
 
         assertContains(schemaContent, "<xs:element name=\"manifest\" type=\"manifest\"/>");
 
@@ -212,5 +214,4 @@ private void validateManifestFile(ManifestEntry manifestFile) throws IOException
         String sha256 = checksumType.checksum(file);
         assertEquals(sha256, manifestFile.getChecksum());
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/metrics/MetricsCrudTest.java b/src/test/java/gov/nasa/ziggy/metrics/MetricsCrudTest.java
new file mode 100644
index 0000000..4250e91
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/metrics/MetricsCrudTest.java
@@ -0,0 +1,75 @@
+package gov.nasa.ziggy.metrics;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Date;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import gov.nasa.ziggy.ZiggyDatabaseRule;
+import gov.nasa.ziggy.crud.ZiggyQuery;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+
+/**
+ * Unit tests for {@link MetricsCrud} class.
+ *
+ * @author PT
+ */
+public class MetricsCrudTest {
+
+    @Rule
+    public ZiggyDatabaseRule databaseRule = new ZiggyDatabaseRule();
+
+    @Test
+    public void testDeleteOldMetrics() {
+
+        MetricsCrud crud = new MetricsCrud();
+
+        // Create 10 metrics.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            for (int i = 0; i < 10; i++) {
+                crud.persist(new MetricValue("dummy", null, new Date(), 1.0F));
+            }
+            return null;
+        });
+
+        // Try a delete where maxRows > the actual number of rows.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            crud.deleteOldMetrics(100);
+            return null;
+        });
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            ZiggyQuery<MetricValue, Long> query = crud.createZiggyQuery(MetricValue.class,
+                Long.class);
+            query.column(MetricValue_.id).select();
+            List<Long> ids = crud.list(query);
+            assertEquals(10, ids.size());
+            for (long i = 1; i <= 10; i++) {
+                assertTrue(ids.contains(i));
+            }
+            return null;
+        });
+
+        // Now try a delete where some metrics will get deleted.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            crud.deleteOldMetrics(5);
+            return null;
+        });
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            ZiggyQuery<MetricValue, Long> query = crud.createZiggyQuery(MetricValue.class,
+                Long.class);
+            query.column(MetricValue_.id).select();
+            List<Long> ids = crud.list(query);
+            assertEquals(5, ids.size());
+            for (long i = 6; i <= 10; i++) {
+                assertTrue(ids.contains(i));
+            }
+            return null;
+        });
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/metrics/report/MemdroneLogTest.java b/src/test/java/gov/nasa/ziggy/metrics/report/MemdroneLogTest.java
index a1b52ba..23b98da 100644
--- a/src/test/java/gov/nasa/ziggy/metrics/report/MemdroneLogTest.java
+++ b/src/test/java/gov/nasa/ziggy/metrics/report/MemdroneLogTest.java
@@ -13,12 +13,16 @@
 
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.IntegrationTestCategory;
+
 /**
  * @author Todd Klaus
  */
+@Category(IntegrationTestCategory.class)
 public class MemdroneLogTest {
     private static final Logger log = LoggerFactory.getLogger(MemdroneLogTest.class);
 
diff --git a/src/test/java/gov/nasa/ziggy/metrics/report/MemdroneTest.java b/src/test/java/gov/nasa/ziggy/metrics/report/MemdroneTest.java
index 8e4b706..374f0d3 100644
--- a/src/test/java/gov/nasa/ziggy/metrics/report/MemdroneTest.java
+++ b/src/test/java/gov/nasa/ziggy/metrics/report/MemdroneTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.metrics.report;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.RESULTS_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.RESULTS_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -27,8 +27,8 @@ public class MemdroneTest {
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
-    public ZiggyPropertyRule pipelineResultsDirPropertyRule = new ZiggyPropertyRule(
-        RESULTS_DIR_PROP_NAME, directoryRule);
+    public ZiggyPropertyRule pipelineResultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR,
+        directoryRule);
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
@@ -78,6 +78,5 @@ public void testMemdronePath() throws IOException, InterruptedException {
 
         Path pLatest = memdrone.latestMemdronePath();
         assertEquals(p2.getFileName().toString(), pLatest.getFileName().toString());
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/models/ModelImporterTest.java b/src/test/java/gov/nasa/ziggy/models/ModelImporterTest.java
index 9b8f283..4a195ab 100644
--- a/src/test/java/gov/nasa/ziggy/models/ModelImporterTest.java
+++ b/src/test/java/gov/nasa/ziggy/models/ModelImporterTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.models;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -18,9 +18,11 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.rules.RuleChain;
 import org.mockito.Mockito;
 
+import gov.nasa.ziggy.IntegrationTestCategory;
 import gov.nasa.ziggy.ZiggyDatabaseRule;
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
@@ -30,6 +32,7 @@
 import gov.nasa.ziggy.pipeline.definition.crud.ModelCrud;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 
+@Category(IntegrationTestCategory.class)
 public class ModelImporterTest {
 
     private ModelType modelType1;
@@ -43,8 +46,8 @@ public class ModelImporterTest {
     @Rule
     public ZiggyDatabaseRule databaseRule = new ZiggyDatabaseRule();
 
-    public ZiggyPropertyRule ziggyDatastorePropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, directoryRule, "datastore");
+    public ZiggyPropertyRule ziggyDatastorePropertyRule = new ZiggyPropertyRule(DATASTORE_ROOT_DIR,
+        directoryRule, "datastore");
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
@@ -93,12 +96,12 @@ public void setup() throws IOException {
         // Create the database objects
         DatabaseTransactionFactory.performTransaction(() -> {
             ModelCrud modelCrud = new ModelCrud();
-            modelCrud.create(modelType1);
-            modelCrud.create(modelType2);
-            modelCrud.create(modelType3);
-            modelCrud.create(modelMetadata1);
-            modelCrud.create(modelMetadata2);
-            modelCrud.create(modelMetadata3);
+            modelCrud.persist(modelType1);
+            modelCrud.persist(modelType2);
+            modelCrud.persist(modelType3);
+            modelCrud.persist(modelMetadata1);
+            modelCrud.persist(modelMetadata2);
+            modelCrud.persist(modelMetadata3);
             ModelRegistry modelRegistry = modelCrud.retrieveUnlockedRegistry();
             modelRegistry.updateModelMetadata(modelMetadata1);
             modelRegistry.updateModelMetadata(modelMetadata2);
@@ -133,7 +136,7 @@ public void testImportWithCurrentRegistryUnlocked() {
 
         // Check the registry's properties
         assertFalse(modelRegistry.isLocked());
-        assertEquals(1L, modelRegistry.getId());
+        assertEquals(Long.valueOf(1L), modelRegistry.getId());
         Map<ModelType, ModelMetadata> models = modelRegistry.getModels();
         assertEquals(3, models.size());
 
@@ -198,7 +201,6 @@ public void testImportWithCurrentRegistryUnlocked() {
         File[] ravenswoodModels = ravenswoodModelsDirectory.listFiles();
         assertEquals(1, ravenswoodModels.length);
         assertEquals(modelFilename, ravenswoodModels[0].getName());
-
     }
 
     @Test
@@ -228,7 +230,7 @@ public void testImportWithCurrentRegistryLocked() {
 
         // Check the registry's properties
         assertFalse(modelRegistry.isLocked());
-        assertEquals(2L, modelRegistry.getId());
+        assertEquals(Long.valueOf(2L), modelRegistry.getId());
         Map<ModelType, ModelMetadata> models = modelRegistry.getModels();
         assertEquals(3, models.size());
 
@@ -293,7 +295,6 @@ public void testImportWithCurrentRegistryLocked() {
         File[] ravenswoodModels = ravenswoodModelsDirectory.listFiles();
         assertEquals(1, ravenswoodModels.length);
         assertEquals(modelFilename, ravenswoodModels[0].getName());
-
     }
 
     @Test
@@ -326,7 +327,7 @@ public void testImportWithFailures() throws IOException {
 
         // Check the registry's properties
         assertFalse(modelRegistry.isLocked());
-        assertEquals(1L, modelRegistry.getId());
+        assertEquals(Long.valueOf(1L), modelRegistry.getId());
         Map<ModelType, ModelMetadata> models = modelRegistry.getModels();
         assertEquals(3, models.size());
 
@@ -391,7 +392,6 @@ public void testImportWithFailures() throws IOException {
         File[] ravenswoodModels = ravenswoodModelsDirectory.listFiles();
         assertEquals(1, ravenswoodModels.length);
         assertEquals(modelFilename, ravenswoodModels[0].getName());
-
     }
 
     private List<String> filenamesInDirectory() throws IOException {
@@ -404,5 +404,4 @@ private List<String> filenamesInDirectory() throws IOException {
         }
         return filenamesInDirectory;
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/models/ModelMetadataOperationsTest.java b/src/test/java/gov/nasa/ziggy/models/ModelMetadataOperationsTest.java
index de39041..4a51d87 100644
--- a/src/test/java/gov/nasa/ziggy/models/ModelMetadataOperationsTest.java
+++ b/src/test/java/gov/nasa/ziggy/models/ModelMetadataOperationsTest.java
@@ -1,12 +1,14 @@
 package gov.nasa.ziggy.models;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import gov.nasa.ziggy.IntegrationTestCategory;
 import gov.nasa.ziggy.ZiggyDatabaseRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
@@ -15,13 +17,14 @@
 /**
  * @author Todd Klaus
  */
+@Category(IntegrationTestCategory.class)
 public class ModelMetadataOperationsTest {
     @Rule
     public ZiggyDatabaseRule databaseRule = new ZiggyDatabaseRule();
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, DirectoryProperties.ziggyCodeBuildDir().toString());
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
 
     @Test
     public void testReport() {
diff --git a/src/test/java/gov/nasa/ziggy/models/SemanticVersionNumberTest.java b/src/test/java/gov/nasa/ziggy/models/SemanticVersionNumberTest.java
index 509fd51..a09d714 100644
--- a/src/test/java/gov/nasa/ziggy/models/SemanticVersionNumberTest.java
+++ b/src/test/java/gov/nasa/ziggy/models/SemanticVersionNumberTest.java
@@ -46,5 +46,4 @@ public void testCompareTo() {
         assertTrue(y.compareTo(z) > 0);
         assertTrue(x.compareTo(z) > 0);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/AlgorithmExecutorTest.java b/src/test/java/gov/nasa/ziggy/module/AlgorithmExecutorTest.java
index 9b7da63..f6b6fcc 100644
--- a/src/test/java/gov/nasa/ziggy/module/AlgorithmExecutorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/AlgorithmExecutorTest.java
@@ -97,6 +97,5 @@ public void testNewInstanceRemote() {
         Mockito.when(sumOps.processingSummary(100L)).thenReturn(summary);
         AlgorithmExecutor executor = AlgorithmExecutor.newInstance(task, parameterSetCrud, sumOps);
         assertTrue(executor instanceof NasExecutor);
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/AlgorithmMonitorTest.java b/src/test/java/gov/nasa/ziggy/module/AlgorithmMonitorTest.java
index f7e3d57..1e7f13a 100644
--- a/src/test/java/gov/nasa/ziggy/module/AlgorithmMonitorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/AlgorithmMonitorTest.java
@@ -1,13 +1,14 @@
 package gov.nasa.ziggy.module;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.RESULTS_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.RESULTS_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.List;
 
-import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -16,15 +17,19 @@
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
+import gov.nasa.ziggy.TestEventDetector;
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
+import gov.nasa.ziggy.module.AlgorithmExecutor.AlgorithmType;
 import gov.nasa.ziggy.pipeline.PipelineExecutor;
+import gov.nasa.ziggy.pipeline.PipelineOperations;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.pipeline.definition.ProcessingState;
+import gov.nasa.ziggy.pipeline.definition.TaskCounts;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceNodeCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
@@ -33,8 +38,8 @@
 import gov.nasa.ziggy.services.alert.AlertService;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 import gov.nasa.ziggy.services.database.DatabaseService;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-import gov.nasa.ziggy.worker.WorkerPipelineProcess;
+import gov.nasa.ziggy.supervisor.TaskRequestHandlerLifecycleManager;
+import gov.nasa.ziggy.supervisor.TaskRequestHandlerLifecycleManagerTest.InstrumentedTaskRequestHandlerLifecycleManager;
 
 /**
  * Unit tests for {@link AlgorithmMonitor}.
@@ -49,13 +54,15 @@ public class AlgorithmMonitorTest {
     private JobMonitor jobMonitor;
     private PipelineTaskCrud pipelineTaskCrud;
     private PipelineExecutor pipelineExecutor;
+    private PipelineOperations pipelineOperations;
     private AlertService alertService;
     private ProcessingSummaryOperations attrOps;
     private PipelineInstanceNodeCrud nodeCrud;
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
+    public TaskRequestHandlerLifecycleManager lifecycleManager = new InstrumentedTaskRequestHandlerLifecycleManager();
 
-    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR_PROP_NAME,
+    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR,
         directoryRule);
 
     @Rule
@@ -69,9 +76,10 @@ public void setUp() throws IOException, ConfigurationException {
 
         Files.createDirectories(DirectoryProperties.stateFilesDir());
         jobMonitor = Mockito.mock(JobMonitor.class);
-        monitor = Mockito.spy(new AlgorithmMonitor(false));
+        monitor = Mockito.spy(new AlgorithmMonitor(AlgorithmType.LOCAL));
         Mockito.when(monitor.jobMonitor()).thenReturn(jobMonitor);
         Mockito.when(monitor.pollingIntervalMillis()).thenReturn(50L);
+        Mockito.doReturn(false).when(monitor).taskIsKilled(ArgumentMatchers.isA(long.class));
         pipelineTask = Mockito.mock(PipelineTask.class);
         Mockito.when(pipelineTask.pipelineInstanceId()).thenReturn(50L);
         Mockito.when(pipelineTask.getId()).thenReturn(100L);
@@ -82,22 +90,27 @@ public void setUp() throws IOException, ConfigurationException {
             .thenReturn(Mockito.mock(PipelineDefinitionNode.class));
         pipelineTaskCrud = Mockito.mock(PipelineTaskCrud.class);
         Mockito.when(pipelineTaskCrud.retrieve(100L)).thenReturn(pipelineTask);
+        Mockito.when(pipelineTaskCrud.merge(ArgumentMatchers.isA(PipelineTask.class)))
+            .thenReturn(pipelineTask);
         Mockito.when(monitor.pipelineTaskCrud()).thenReturn(pipelineTaskCrud);
         nodeCrud = Mockito.mock(PipelineInstanceNodeCrud.class);
+        pipelineOperations = Mockito.mock(PipelineOperations.class);
+        Mockito
+            .when(pipelineOperations.taskCounts(ArgumentMatchers.isA(PipelineInstanceNode.class)))
+            .thenReturn(new TaskCounts(50, 50, 10, 1));
+        Mockito.when(monitor.pipelineOperations()).thenReturn(pipelineOperations);
         pipelineExecutor = Mockito.spy(PipelineExecutor.class);
         pipelineExecutor.setPipelineTaskCrud(pipelineTaskCrud);
         pipelineExecutor.setPipelineInstanceNodeCrud(nodeCrud);
+        pipelineExecutor.setPipelineOperations(pipelineOperations);
+        Mockito.doNothing()
+            .when(pipelineExecutor)
+            .removeTaskFromKilledTaskList(ArgumentMatchers.isA(long.class));
         Mockito
             .when(nodeCrud.retrieve(ArgumentMatchers.isA(PipelineInstance.class),
                 ArgumentMatchers.isA(PipelineDefinitionNode.class)))
             .thenReturn(Mockito.mock(PipelineInstanceNode.class));
-        Mockito.doReturn(null)
-            .when(pipelineExecutor)
-            .updateTaskCountsForCurrentNode(ArgumentMatchers.isA(PipelineTask.class),
-                ArgumentMatchers.anyBoolean());
-        Mockito.doNothing()
-            .when(pipelineExecutor)
-            .updateInstanceState(ArgumentMatchers.isA(PipelineInstance.class));
+        Mockito.when(pipelineExecutor.taskRequestEnabled()).thenReturn(false);
         attrOps = Mockito.mock(ProcessingSummaryOperations.class);
         pipelineExecutor.setPipelineInstanceCrud(Mockito.mock(PipelineInstanceCrud.class));
         Mockito.when(monitor.pipelineExecutor()).thenReturn(pipelineExecutor);
@@ -114,7 +127,7 @@ public void setUp() throws IOException, ConfigurationException {
     @After
     public void tearDown() throws IOException {
         DatabaseService.reset();
-        WorkerPipelineProcess.workerTaskRequestQueue.clear();
+        TestEventDetector.detectTestEvent(500L, () -> (lifecycleManager.taskRequestSize() == 0));
     }
 
     /**
@@ -183,54 +196,17 @@ public void testExecutionFailed()
         assertNull(monitor.getStateFile(stateFile));
 
         // The state file on disk is moved to state COMPLETE.
-        StateFile updatedStateFile = StateFile.newStateFileFromDiskFile(
-            DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true);
+        StateFile updatedStateFile = stateFile.newStateFileFromDiskFile();
         assertEquals(StateFile.State.COMPLETE, updatedStateFile.getState());
 
         // The task should be advanced to Ac state
         Mockito.verify(attrOps).updateProcessingState(100L, ProcessingState.ALGORITHM_COMPLETE);
 
         // The pipeline task state was set to ERROR.
-        Mockito.verify(pipelineTask).setState(PipelineTask.State.ERROR);
-
-        // There are no task requests in the queue.
-        assertEquals(0, WorkerPipelineProcess.workerTaskRequestQueue.size());
-    }
-
-    // Tests the reaction to a deleted task. In particular, even if the task is
-    // "successful" in terms, of having few enough failed tasks, it won't be
-    // submitted for re-running or for persisting.
-    @Test
-    public void testTaskDeletion()
-        throws ConfigurationException, IOException, InterruptedException {
-        Mockito.when(pipelineTask.maxFailedSubtasks()).thenReturn(6);
-        stateFile.setState(StateFile.State.DELETED);
-        stateFile.setNumComplete(95);
-        stateFile.setNumFailed(5);
-        stateFile.persist();
-        iterateAlgorithmMonitorRunMethod(3);
-
-        // No state file remains in the monitoring system.
-        assertNull(monitor.getStateFile(stateFile));
-
-        // The state file on disk is moved to state COMPLETE.
-        StateFile updatedStateFile = StateFile.newStateFileFromDiskFile(
-            DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true);
-        assertEquals(StateFile.State.DELETED, updatedStateFile.getState());
-
-        // The task should be advanced to Ac state
-        Mockito.verify(attrOps).updateProcessingState(100L, ProcessingState.ALGORITHM_COMPLETE);
-
-        // The pipeline task state was set to ERROR.
-        Mockito.verify(pipelineTask).setState(PipelineTask.State.ERROR);
+        Mockito.verify(pipelineOperations).setTaskState(pipelineTask, PipelineTask.State.ERROR);
 
         // There are no task requests in the queue.
-        assertEquals(0, WorkerPipelineProcess.workerTaskRequestQueue.size());
-
-        // An alert should have been issued.
-        Mockito.verify(alertService)
-            .generateAndBroadcastAlert(ArgumentMatchers.anyString(), ArgumentMatchers.anyLong(),
-                ArgumentMatchers.eq(AlertService.Severity.ERROR), ArgumentMatchers.anyString());
+        assertEquals(0, lifecycleManager.taskRequestSize());
     }
 
     // Tests an execution that is complete, but has too many errors to be persisted.
@@ -252,10 +228,10 @@ public void testExecutionCompleteTooManyErrors()
         Mockito.verify(attrOps).updateProcessingState(100L, ProcessingState.ALGORITHM_COMPLETE);
 
         // The pipeline task state was set to ERROR.
-        Mockito.verify(pipelineTask).setState(PipelineTask.State.ERROR);
+        Mockito.verify(pipelineOperations).setTaskState(pipelineTask, PipelineTask.State.ERROR);
 
         // There are no task requests in the queue.
-        assertEquals(0, WorkerPipelineProcess.workerTaskRequestQueue.size());
+        assertEquals(0, lifecycleManager.taskRequestSize());
     }
 
     // Tests an execution that is complete, but has too many unprocessed subtasks to
@@ -278,10 +254,10 @@ public void testExecutionCompleteTooManyMissed()
         Mockito.verify(attrOps).updateProcessingState(100L, ProcessingState.ALGORITHM_COMPLETE);
 
         // The pipeline task state was set to ERROR.
-        Mockito.verify(pipelineTask).setState(PipelineTask.State.ERROR);
+        Mockito.verify(pipelineOperations).setTaskState(pipelineTask, PipelineTask.State.ERROR);
 
         // There are no task requests in the queue.
-        assertEquals(0, WorkerPipelineProcess.workerTaskRequestQueue.size());
+        assertEquals(0, lifecycleManager.taskRequestSize());
     }
 
     // Tests that when execution is COMPLETE and the number of failed subtasks is
@@ -303,13 +279,8 @@ public void testExecutionComplete()
         // The task should be advanced to Ac state
         Mockito.verify(attrOps).updateProcessingState(100L, ProcessingState.ALGORITHM_COMPLETE);
 
-        // There should be a task request in the queue
-        assertEquals(1, WorkerPipelineProcess.workerTaskRequestQueue.size());
-        WorkerTaskRequest taskRequest = WorkerPipelineProcess.workerTaskRequestQueue.take();
-        assertEquals(0, taskRequest.getPriority());
-        assertEquals(50L, taskRequest.getInstanceId());
-        assertEquals(100L, taskRequest.getTaskId());
-        assertEquals(RunMode.STANDARD, taskRequest.getRunMode());
+        // The PipelineExecutor should have been asked to submit the task for persisting.
+        Mockito.verify(pipelineExecutor).persistTaskResults(pipelineTask);
     }
 
     // Test automatic resubmission of a task that's almost but not quite finished
@@ -318,10 +289,16 @@ public void testExecutionComplete()
     public void testAutoResubmit()
         throws ConfigurationException, IOException, InterruptedException {
 
+        int taskCount = lifecycleManager.taskRequestSize();
+        assertEquals(0, taskCount);
         Mockito.when(pipelineTask.maxFailedSubtasks()).thenReturn(4);
         Mockito.when(pipelineTask.maxAutoResubmits()).thenReturn(3);
         Mockito.when(pipelineTask.getAutoResubmitCount()).thenReturn(1);
         Mockito.when(pipelineTask.getState()).thenReturn(PipelineTask.State.ERROR);
+        Mockito.doNothing()
+            .when(pipelineExecutor)
+            .restartFailedTasks(ArgumentMatchers.anyCollection(), ArgumentMatchers.anyBoolean(),
+                ArgumentMatchers.isA(RunMode.class));
         stateFile.setState(StateFile.State.COMPLETE);
         stateFile.setNumComplete(95);
         stateFile.setNumFailed(5);
@@ -337,17 +314,12 @@ public void testAutoResubmit()
         // The task should have its auto-resubmit count incremented
         Mockito.verify(pipelineTask).incrementAutoResubmitCount();
 
-        // The pipeline task state was set to ERROR, then to SUBMITTED
-        Mockito.verify(pipelineTask).setState(PipelineTask.State.ERROR);
-        Mockito.verify(pipelineTask).setState(PipelineTask.State.SUBMITTED);
-
-        // There should be a task request in the queue
-        assertEquals(1, WorkerPipelineProcess.workerTaskRequestQueue.size());
-        WorkerTaskRequest taskRequest = WorkerPipelineProcess.workerTaskRequestQueue.take();
-        assertEquals(0, taskRequest.getPriority());
-        assertEquals(50L, taskRequest.getInstanceId());
-        assertEquals(100L, taskRequest.getTaskId());
-        assertEquals(RunMode.RESUBMIT, taskRequest.getRunMode());
+        // The pipeline task state was set to ERROR
+        Mockito.verify(pipelineOperations).setTaskState(pipelineTask, PipelineTask.State.ERROR);
+
+        // The pipeline executor method to restart tasks was called
+        Mockito.verify(pipelineExecutor)
+            .restartFailedTasks(List.of(pipelineTask), false, RunMode.RESUBMIT);
     }
 
     // Test the case where automatic submission would be called except that the
@@ -373,11 +345,9 @@ public void testOutOfAutoResubmits()
         Mockito.verify(attrOps).updateProcessingState(100L, ProcessingState.ALGORITHM_COMPLETE);
 
         // The pipeline task state was set to ERROR, then to SUBMITTED
-        Mockito.verify(pipelineTask).setState(PipelineTask.State.ERROR);
+        Mockito.verify(pipelineOperations).setTaskState(pipelineTask, PipelineTask.State.ERROR);
 
         // There are no task requests in the queue.
-        assertEquals(0, WorkerPipelineProcess.workerTaskRequestQueue.size());
-
+        assertEquals(0, lifecycleManager.taskRequestSize());
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/ComputeNodeMasterTest.java b/src/test/java/gov/nasa/ziggy/module/ComputeNodeMasterTest.java
index 6c350a7..2b3185c 100644
--- a/src/test/java/gov/nasa/ziggy/module/ComputeNodeMasterTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/ComputeNodeMasterTest.java
@@ -18,7 +18,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadFactory;
 
-import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -31,7 +31,7 @@
 import gov.nasa.ziggy.module.remote.TimestampFile;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.logging.TaskLog;
 
 /**
@@ -43,8 +43,8 @@ public class ComputeNodeMasterTest {
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
-    public ZiggyPropertyRule resultsDirRule = new ZiggyPropertyRule(
-        PropertyNames.RESULTS_DIR_PROP_NAME, directoryRule);
+    public ZiggyPropertyRule resultsDirRule = new ZiggyPropertyRule(PropertyName.RESULTS_DIR,
+        directoryRule);
 
     @Rule
     public RuleChain ruleChain = RuleChain.outerRule(directoryRule).around(resultsDirRule);
@@ -108,16 +108,13 @@ public void setUp() throws Exception {
 
         // Create the ComputeNodeMaster. To be precise, create an instance of the
         // class that is a Mockito spy.
-        computeNodeMaster = Mockito.spy(new ComputeNodeMaster(taskDir.toString(), "dummy",
-            DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toString(), "dummy",
-            taskLog));
+        computeNodeMaster = Mockito.spy(new ComputeNodeMaster(taskDir.toString(), taskLog));
         doReturn(inputsHandler).when(computeNodeMaster).getInputsHandler();
         doReturn(subtaskServer).when(computeNodeMaster).subtaskServer();
         doReturn(subtaskMasterThreadPool).when(computeNodeMaster).subtaskMasterThreadPool();
         doReturn(true).when(computeNodeMaster)
             .getWriteLockWithoutBlocking(ArgumentMatchers.any(File.class));
         doNothing().when(computeNodeMaster).releaseWriteLock(ArgumentMatchers.any(File.class));
-
     }
 
     /**
@@ -128,21 +125,13 @@ public void testInitializeAndUpdateState()
         throws ConfigurationException, IllegalStateException, IOException, InterruptedException {
 
         // The initial state of the state file should be QUEUED.
-        assertEquals(StateFile.State.QUEUED,
-            StateFile
-                .newStateFileFromDiskFile(
-                    DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true)
-                .getState());
+        assertEquals(StateFile.State.QUEUED, stateFile.newStateFileFromDiskFile().getState());
 
         // Initialize the instance.
         computeNodeMaster.initialize();
 
         // The state file on disk should now be PROCESSING
-        assertEquals(StateFile.State.PROCESSING,
-            StateFile
-                .newStateFileFromDiskFile(
-                    DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true)
-                .getState());
+        assertEquals(StateFile.State.PROCESSING, stateFile.newStateFileFromDiskFile().getState());
 
         // The state file in the ComputeNodeMaster should have correct counts
         assertEquals(5, computeNodeMaster.getStateFileNumTotal());
@@ -180,11 +169,7 @@ public void testInitializeWithoutUpdatingState()
         computeNodeMaster.initialize();
 
         // The state file on disk should still be QUEUED
-        assertEquals(StateFile.State.QUEUED,
-            StateFile
-                .newStateFileFromDiskFile(
-                    DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true)
-                .getState());
+        assertEquals(StateFile.State.QUEUED, stateFile.newStateFileFromDiskFile().getState());
 
         // The state file in the ComputeNodeMaster should have correct counts
         assertEquals(5, computeNodeMaster.getStateFileNumTotal());
@@ -206,7 +191,6 @@ public void testInitializeWithoutUpdatingState()
             TimestampFile.timestamp(taskDir.toFile(), TimestampFile.Event.PBS_JOB_START) > 0);
         assertEquals(-1L,
             TimestampFile.timestamp(taskDir.toFile(), TimestampFile.Event.QUEUED_PBS));
-
     }
 
     /**
@@ -230,11 +214,7 @@ public void testInitializeAllSubtasksDone()
         computeNodeMaster.initialize();
 
         // The state file on disk should still be QUEUED
-        assertEquals(StateFile.State.QUEUED,
-            StateFile
-                .newStateFileFromDiskFile(
-                    DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true)
-                .getState());
+        assertEquals(StateFile.State.QUEUED, stateFile.newStateFileFromDiskFile().getState());
 
         // The SubtaskServer should not have started
         verify(subtaskServer, times(0)).start();
@@ -244,7 +224,6 @@ public void testInitializeAllSubtasksDone()
         verify(subtaskMasterThreadPool, times(0)).submit(ArgumentMatchers.any(SubtaskMaster.class),
             ArgumentMatchers.any(ThreadFactory.class));
         assertEquals(-1, computeNodeMaster.getSemaphorePermits());
-
     }
 
     /**
@@ -346,35 +325,6 @@ public void testMonitoringWhenServerFails()
 
         // All of the semaphore permits should still be in use.
         assertEquals(0, computeNodeMaster.getSemaphorePermits());
-
-    }
-
-    /**
-     * Tests the performance of the monitoring process when the state file indicates a deleted task.
-     */
-    @Test
-    public void testMonitoringDeletedTask()
-        throws ConfigurationException, IllegalStateException, IOException, InterruptedException {
-
-        when(subtaskServer.isListenerRunning()).thenReturn(true);
-
-        // Initialize the instance.
-        computeNodeMaster.initialize();
-
-        StateFile diskStateFile = StateFile.newStateFileFromDiskFile(
-            DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true);
-        diskStateFile.setState(StateFile.State.DELETED);
-        diskStateFile.persist();
-
-        // Run the monitoring process once.
-        computeNodeMaster.run();
-
-        // The countdown latch should no longer be waiting.
-        assertEquals(0, computeNodeMaster.getCountDownLatchCount());
-
-        // All of the semaphore permits should still be in use.
-        assertEquals(0, computeNodeMaster.getSemaphorePermits());
-
     }
 
     /**
@@ -411,11 +361,7 @@ public void testMonitoringCompletedTask()
         assertEquals(0, computeNodeMaster.getSemaphorePermits());
 
         // The state of the state file should still be processing.
-        assertEquals(StateFile.State.PROCESSING,
-            StateFile
-                .newStateFileFromDiskFile(
-                    DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true)
-                .getState());
+        assertEquals(StateFile.State.PROCESSING, stateFile.newStateFileFromDiskFile().getState());
 
         // The state file in the ComputeNodeMaster should have correct counts
         assertEquals(5, computeNodeMaster.getStateFileNumTotal());
@@ -461,11 +407,7 @@ public void testFinish()
         computeNodeMaster.finish();
 
         // The state file on disk should now be PROCESSING
-        assertEquals(StateFile.State.PROCESSING,
-            StateFile
-                .newStateFileFromDiskFile(
-                    DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true)
-                .getState());
+        assertEquals(StateFile.State.PROCESSING, stateFile.newStateFileFromDiskFile().getState());
 
         // The job finish timestamp should be present.
         assertTrue(
@@ -486,11 +428,6 @@ public void testFinish()
         // This time, the state file should be updated.
         computeNodeMaster.finish();
 
-        assertEquals(StateFile.State.COMPLETE,
-            StateFile
-                .newStateFileFromDiskFile(
-                    DirectoryProperties.stateFilesDir().resolve(stateFile.name()).toFile(), true)
-                .getState());
-
+        assertEquals(StateFile.State.COMPLETE, stateFile.newStateFileFromDiskFile().getState());
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/DefaultPipelineInputsTest.java b/src/test/java/gov/nasa/ziggy/module/DefaultPipelineInputsTest.java
index 236f8d5..a7ef987 100644
--- a/src/test/java/gov/nasa/ziggy/module/DefaultPipelineInputsTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/DefaultPipelineInputsTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.module;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_TEST_WORKING_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_TEST_WORKING_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -39,7 +39,7 @@
 import gov.nasa.ziggy.models.ModelImporter;
 import gov.nasa.ziggy.module.hdf5.Hdf5ModuleInterface;
 import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.ModelMetadata;
 import gov.nasa.ziggy.pipeline.definition.ModelRegistry;
@@ -91,11 +91,11 @@ public class DefaultPipelineInputsTest {
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, directoryRule, "datastore");
+        DATASTORE_ROOT_DIR, directoryRule, "datastore");
 
     @Rule
     public ZiggyPropertyRule ziggyTestWorkingDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_TEST_WORKING_DIR_PROP_NAME, (String) null);
+        ZIGGY_TEST_WORKING_DIR, (String) null);
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
@@ -189,7 +189,6 @@ public void setup() throws IOException {
         // for a mocked object. Instead we resort to the tried-and-true approach of a
         // constructor that takes as argument the objects we want to replace.
         defaultPipelineInputs = new DefaultPipelineInputs(mockedDataFileManager, alertService);
-
     }
 
     /**
@@ -228,7 +227,7 @@ public void testCopyDatastoreFilesToTaskDirectory() throws IOException {
         DefaultPipelineInputs storedInputs = new DefaultPipelineInputs();
         hdf5ModuleInterface.readFile(new File(taskDir, "csci-inputs.h5"), storedInputs, true);
 
-        List<Parameters> pars = storedInputs.getModuleParameters().getModuleParameters();
+        List<ParametersInterface> pars = storedInputs.getModuleParameters().getModuleParameters();
         assertEquals(2, pars.size());
         if (pars.get(0) instanceof Params1) {
             assertTrue(pars.get(1) instanceof Params2);
@@ -245,7 +244,6 @@ public void testCopyDatastoreFilesToTaskDirectory() throws IOException {
         assertEquals(2, modelFilenames.size());
         assertTrue(modelFilenames.contains("tess2020234101112-12345_023-geometry.xml"));
         assertTrue(modelFilenames.contains("calibration-4.12.9.h5"));
-
     }
 
     @Test
@@ -296,7 +294,7 @@ public void testDatastoreKeepUpProcessingNoOldFiles() throws IOException {
         Mockito
             .when(pipelineTaskCrud.retrieveIdsForPipelineDefinitionNode(ArgumentMatchers.anySet(),
                 ArgumentMatchers.eq(pipelineDefinitionNode)))
-            .thenReturn(new ArrayList<Long>());
+            .thenReturn(new ArrayList<>());
 
         // Perform the copy
         performCopyToTaskDir(false);
@@ -427,7 +425,7 @@ public void testDatastoreKeepUpProcessing() throws IOException {
     @Test
     public void testFindDatastoreFilesForInputs() {
 
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(uow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(uow);
 
         Set<Path> paths = defaultPipelineInputs.findDatastoreFilesForInputs(pipelineTask);
         assertEquals(4, paths.size());
@@ -443,8 +441,7 @@ public void testFindDatastoreFilesForInputs() {
     @Test
     public void testSubtaskInformation() {
 
-        BeanWrapper<UnitOfWork> bwuow = new BeanWrapper<>(uow);
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(bwuow);
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(uow);
 
         SubtaskInformation subtaskInformation = defaultPipelineInputs
             .subtaskInformation(pipelineTask);
@@ -456,7 +453,7 @@ public void testSubtaskInformation() {
         TypedParameter singleSubtask = uow
             .getParameter(DatastoreDirectoryUnitOfWorkGenerator.SINGLE_SUBTASK_PROPERTY_NAME);
         singleSubtask.setValue(Boolean.TRUE);
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(uow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(uow);
         subtaskInformation = defaultPipelineInputs.subtaskInformation(pipelineTask);
         assertEquals("csci", subtaskInformation.getModuleName());
         assertEquals("sector-0001/ccd-1:1/pa", subtaskInformation.getUowBriefState());
@@ -498,7 +495,8 @@ public void testCopyDatastoreFilesToDirectorySingleSubtask() throws IOException
             DefaultPipelineInputs storedInputs = new DefaultPipelineInputs();
             hdf5ModuleInterface.readFile(new File(taskDir, "csci-inputs.h5"), storedInputs, true);
 
-            List<Parameters> pars = storedInputs.getModuleParameters().getModuleParameters();
+            List<ParametersInterface> pars = storedInputs.getModuleParameters()
+                .getModuleParameters();
             assertEquals(2, pars.size());
             if (pars.get(0) instanceof Params1) {
                 assertTrue(pars.get(1) instanceof Params2);
@@ -515,9 +513,7 @@ public void testCopyDatastoreFilesToDirectorySingleSubtask() throws IOException
             assertEquals(2, modelFilenames.size());
             assertTrue(modelFilenames.contains("tess2020234101112-12345_023-geometry.xml"));
             assertTrue(modelFilenames.contains("calibration-4.12.9.h5"));
-
         }
-
     }
 
     /**
@@ -530,7 +526,7 @@ public void testPopulateSubTaskInputs() throws IOException {
 
         // move to the st-0 subtask directory
         Path subtaskDir = Paths.get(taskDir.getAbsolutePath(), "st-0");
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir.toString());
+        System.setProperty(ZIGGY_TEST_WORKING_DIR.property(), subtaskDir.toString());
 
         new DefaultPipelineInputs(mockedDataFileManager, alertService).populateSubTaskInputs();
 
@@ -539,7 +535,7 @@ public void testPopulateSubTaskInputs() throws IOException {
         try (Stream<Path> taskDirPaths = java.nio.file.Files.list(subtaskDir)) {
             List<String> subtaskDirFileNames = taskDirPaths.map(s -> s.getFileName().toString())
                 .collect(Collectors.toList());
-            assertTrue(subtaskDirFileNames.contains("csci-inputs-0.h5"));
+            assertTrue(subtaskDirFileNames.contains("csci-inputs.h5"));
             if (subtaskDirFileNames.contains("sector-0001-ccd-1:1-tic-001234567-flux.h5")) {
                 subtask0DataFiles = "001234567";
                 assertTrue(
@@ -567,7 +563,7 @@ public void testPopulateSubTaskInputs() throws IOException {
         // data is getting processed someplace
 
         subtaskDir = Paths.get(taskDir.getAbsolutePath(), "st-1");
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir.toString());
+        System.setProperty(ZIGGY_TEST_WORKING_DIR.property(), subtaskDir.toString());
 
         new DefaultPipelineInputs(mockedDataFileManager, alertService).populateSubTaskInputs();
 
@@ -609,7 +605,7 @@ public void testPopulateSubTaskInputsSingleSubtask() throws IOException {
 
         // move to the st-0 subtask directory
         Path subtaskDir = Paths.get(taskDir.getAbsolutePath(), "st-0");
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir.toString());
+        System.setProperty(ZIGGY_TEST_WORKING_DIR.property(), subtaskDir.toString());
 
         defaultPipelineInputs.populateSubTaskInputs();
 
@@ -649,7 +645,6 @@ public void testDeleteTempInputsFromTaskDirectory() throws IOException {
             assertFalse(taskDirFileNames.contains("sector-0001-ccd-1:1-tic-765432100-centroid.h5"));
             assertFalse(taskDirFileNames.contains("tess2020234101112-12345_023-geometry.xml"));
             assertFalse(taskDirFileNames.contains("calibration-4.12.9.h5"));
-
         }
     }
 
@@ -665,7 +660,7 @@ private void performCopyToTaskDir(boolean singleSubtask) {
             .getParameter(DatastoreDirectoryUnitOfWorkGenerator.SINGLE_SUBTASK_PROPERTY_NAME);
         singleSubtaskProp.setValue(Boolean.valueOf(singleSubtask));
 
-        Mockito.when(pipelineTask.getUowTask()).thenReturn(new BeanWrapper<>(uow));
+        Mockito.when(pipelineTask.uowTaskInstance()).thenReturn(uow);
 
         // Create a TaskConfigurationManager
         TaskConfigurationManager tcm = new TaskConfigurationManager(taskDir);
@@ -673,7 +668,6 @@ private void performCopyToTaskDir(boolean singleSubtask) {
         defaultPipelineInputs.copyDatastoreFilesToTaskDirectory(tcm, pipelineTask,
             taskDir.toPath());
         tcm.persist();
-
     }
 
     private void initializeDataFileTypes() {
@@ -721,7 +715,6 @@ private void initializeDataFileTypes() {
         modelType3.setType("ravenswood");
         modelType3.setTimestampGroup(-1);
         modelType3.setVersionNumberGroup(-1);
-
     }
 
     private void initializeModelRegistry() throws IOException {
@@ -759,7 +752,6 @@ private void initializeModelRegistry() throws IOException {
         modelTypes = new HashSet<>();
         modelTypes.add(modelType1);
         modelTypes.add(modelType2);
-
     }
 
     private void initializeDataFiles() throws IOException {
@@ -783,28 +775,26 @@ private void initializeDataFiles() throws IOException {
         for (Path path : fluxPaths) {
             Files.createFile(datastore.toPath().resolve(path));
         }
-
     }
 
-    private Map<ClassWrapper<Parameters>, ParameterSet> parametersMap() {
+    private Map<ClassWrapper<ParametersInterface>, ParameterSet> parametersMap() {
 
-        Map<ClassWrapper<Parameters>, ParameterSet> parMap = new HashMap<>();
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> parMap = new HashMap<>();
 
-        ClassWrapper<Parameters> c1 = new ClassWrapper<>(Params1.class);
+        ClassWrapper<ParametersInterface> c1 = new ClassWrapper<>(Params1.class);
         ParameterSet s1 = new ParameterSet("params1");
-        s1.setParameters(new BeanWrapper<Parameters>(new Params1()));
+        s1.populateFromParametersInstance(new Params1());
         parMap.put(c1, s1);
 
-        ClassWrapper<Parameters> c2 = new ClassWrapper<>(Params2.class);
+        ClassWrapper<ParametersInterface> c2 = new ClassWrapper<>(Params2.class);
         ParameterSet s2 = new ParameterSet("params2");
-        s2.setParameters(new BeanWrapper<Parameters>(new Params2()));
+        s2.populateFromParametersInstance(new Params2());
         parMap.put(c2, s2);
 
         return parMap;
-
     }
 
-    public static class Params1 implements Parameters {
+    public static class Params1 extends Parameters {
         private int dmy1 = 500;
         private double dmy2 = 2856.3;
 
@@ -825,7 +815,7 @@ public void setDmy2(double dmy2) {
         }
     }
 
-    public static class Params2 implements Parameters {
+    public static class Params2 extends Parameters {
         private String dmy3 = "dummy string";
         private boolean[] dmy4 = { true, false };
 
@@ -844,6 +834,5 @@ public boolean[] getDmy4() {
         public void setDmy4(boolean[] dmy4) {
             this.dmy4 = dmy4;
         }
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/DefaultPipelineOutputsTest.java b/src/test/java/gov/nasa/ziggy/module/DefaultPipelineOutputsTest.java
index ec97a66..e5ba495 100644
--- a/src/test/java/gov/nasa/ziggy/module/DefaultPipelineOutputsTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/DefaultPipelineOutputsTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.module;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_TEST_WORKING_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_TEST_WORKING_DIR;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -47,11 +47,11 @@ public class DefaultPipelineOutputsTest {
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, directoryRule, "datastore");
+        DATASTORE_ROOT_DIR, directoryRule, "datastore");
 
     @Rule
     public ZiggyPropertyRule ziggyTestWorkingDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_TEST_WORKING_DIR_PROP_NAME, (String) null);
+        ZIGGY_TEST_WORKING_DIR, (String) null);
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
@@ -107,7 +107,6 @@ public void setup() throws IOException {
         subtaskDir.mkdirs();
         new File(subtaskDir, "sector-0001-ccd-1:1-tic-001234567-results.h5").createNewFile();
         new File(subtaskDir, "sector-0001-ccd-1:1-tic-765432100-results.h5").createNewFile();
-
     }
 
     /**
@@ -128,7 +127,7 @@ public void testPopulateTaskResults() throws IOException {
 
         // Go to the subtask directory
         Path subtaskDir = taskDir.toPath().resolve("st-0");
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, subtaskDir.toString());
+        System.setProperty(ZIGGY_TEST_WORKING_DIR.property(), subtaskDir.toString());
 
         // Populate the task results
         defaultPipelineOutputs.populateTaskResults();
@@ -167,7 +166,6 @@ public void testCopyTaskDirectoryResultsToDatastore() throws IOException {
             Paths.get(datastore.getAbsolutePath(), datastoreResultsPath, "001234567.results.h5")));
         assertTrue(java.nio.file.Files.exists(
             Paths.get(datastore.getAbsolutePath(), datastoreResultsPath, "765432100.results.h5")));
-
     }
 
     private void initializeDataFileTypes() {
@@ -179,5 +177,4 @@ private void initializeDataFileTypes() {
         resultsDataFileType
             .setFileNameWithSubstitutionsForDatastore("sector-$1/ccd-$2/results/$3.results.h5");
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/ExternalProcessPipelineModuleTest.java b/src/test/java/gov/nasa/ziggy/module/ExternalProcessPipelineModuleTest.java
index 4eb278c..71ff814 100644
--- a/src/test/java/gov/nasa/ziggy/module/ExternalProcessPipelineModuleTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/ExternalProcessPipelineModuleTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.module;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.PIPELINE_HALT_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.PIPELINE_HALT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -46,6 +46,7 @@
 import gov.nasa.ziggy.pipeline.definition.ProcessingState;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.ProcessingSummaryOperations;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.database.DatabaseService;
 
 /**
@@ -74,15 +75,15 @@ public class ExternalProcessPipelineModuleTest {
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
     @Rule
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, "/dev/null");
+        DATASTORE_ROOT_DIR, "/dev/null");
 
     @Rule
-    public ZiggyPropertyRule piProcessingHaltStepPropertyRule = new ZiggyPropertyRule(
-        PIPELINE_HALT_PROP_NAME, (String) null);
+    public ZiggyPropertyRule piProcessingHaltStepPropertyRule = new ZiggyPropertyRule(PIPELINE_HALT,
+        (String) null);
 
     @Rule
     public ZiggyPropertyRule piWorkerAllowPartialTasksPropertyRule = new ZiggyPropertyRule(
-        "pi.worker.allowPartialTasks", (String) null);
+        PropertyName.ALLOW_PARTIAL_TASKS, (String) null);
 
     @Before
     public void setup() {
@@ -97,10 +98,8 @@ public void setup() {
         when(p.getParameters(RemoteParameters.class, false)).thenReturn(r);
         when(p.getPipelineInstanceNode()).thenReturn(pin);
         when(pin.getPipelineModuleDefinition()).thenReturn(pmd);
-        when(pmd.getInputsClass())
-            .thenReturn(new ClassWrapper<PipelineInputs>(PipelineInputsSample.class));
-        when(pmd.getOutputsClass())
-            .thenReturn(new ClassWrapper<PipelineOutputs>(PipelineOutputsSample1.class));
+        when(pmd.getInputsClass()).thenReturn(new ClassWrapper<>(PipelineInputsSample.class));
+        when(pmd.getOutputsClass()).thenReturn(new ClassWrapper<>(PipelineOutputsSample1.class));
         when(i.getId()).thenReturn(50L);
         a = mock(ProcessingSummaryOperations.class);
         c = mock(PipelineTaskCrud.class);
@@ -144,7 +143,6 @@ public void testNextProcessingState() {
         assertEquals(ProcessingState.STORING, s);
         s = t.nextProcessingState(s);
         assertEquals(ProcessingState.COMPLETE, s);
-
     }
 
     /**
@@ -155,7 +153,6 @@ public void testNextProcessingState() {
     public void testExceptionFinalState() {
 
         t.nextProcessingState(ProcessingState.COMPLETE);
-
     }
 
     /**
@@ -169,7 +166,6 @@ public void testInitialize() {
         assertNotNull(t.algorithmManager());
         assertTrue(t.pipelineInputs() instanceof PipelineInputsSample);
         assertTrue(t.pipelineOutputs() instanceof PipelineOutputsSample1);
-
     }
 
     /**
@@ -201,7 +197,6 @@ public void testProcessMarshalingLocal() throws Exception {
         verify(ih).validate();
         verify(ih).persist(eq(taskDir));
         verify(t).incrementProcessingState();
-
     }
 
     /**
@@ -224,7 +219,6 @@ public void testProcessMarshalingRemote() throws Exception {
         verify(ih).validate();
         verify(ih).persist(eq(taskDir));
         verify(t).incrementProcessingState();
-
     }
 
     /**
@@ -246,7 +240,6 @@ public void testProcessMarshalingNoInputs() throws Exception {
         verify(ih).validate();
         verify(ih, never()).persist(eq(taskDir));
         verify(t, never()).incrementProcessingState();
-
     }
 
     /**
@@ -273,7 +266,6 @@ public void testProcessMarshalingError2() throws Exception {
         t = spy(t);
         doThrow(IllegalStateException.class).when(ds).commitTransaction();
         t.processMarshaling();
-
     }
 
     /**
@@ -393,7 +385,7 @@ public void testPartialFailureStoreResults() {
     @Test(expected = PipelineException.class)
     public void testPartialFailureThrowException() {
 
-        System.setProperty("pi.worker.allowPartialTasks", "false");
+        System.setProperty(PropertyName.ALLOW_PARTIAL_TASKS.property(), "false");
         t = spy(t);
         ProcessingFailureSummary f = mock(ProcessingFailureSummary.class);
         when(f.isAllTasksSucceeded()).thenReturn(false);
@@ -658,12 +650,16 @@ public void testProcessingMainLoopNoTaskDirs() {
     public void testHaltInitialize() {
 
         // Set the desired stopping point
-        System.setProperty(PIPELINE_HALT_PROP_NAME, "I");
+        System.setProperty(PIPELINE_HALT.property(), "I");
         // Set up mockery and states as though to run the main loop for local processing
         t = new TestPipelineModule(p, RunMode.STANDARD);
         t = spy(t);
         when(t.algorithmManager()).thenReturn(tal);
-        assertThrows(PipelineException.class, () -> t.processingMainLoop());
+        PipelineException exception = assertThrows(PipelineException.class,
+            () -> t.processingMainLoop());
+        assertEquals(
+            "Halting processing at end of step INITIALIZING due to configuration request for halt after step I",
+            exception.getMessage());
         verify(t).initializingTaskAction();
         verify(t, never()).marshalingTaskAction();
         verify(t, never()).submittingTaskAction();
@@ -681,12 +677,16 @@ public void testHaltInitialize() {
     public void testHaltMarshaling() {
 
         // Set the desired stopping point
-        System.setProperty(PIPELINE_HALT_PROP_NAME, "M");
+        System.setProperty(PIPELINE_HALT.property(), "M");
         // Set up mockery and states as though to run the main loop for local processing
         t = new TestPipelineModule(p, RunMode.STANDARD);
         t = spy(t);
         when(t.algorithmManager()).thenReturn(tal);
-        assertThrows(PipelineException.class, () -> t.processingMainLoop());
+        PipelineException exception = assertThrows(PipelineException.class,
+            () -> t.processingMainLoop());
+        assertEquals(
+            "Halting processing at end of step MARSHALING due to configuration request for halt after step M",
+            exception.getMessage());
         verify(t).initializingTaskAction();
         verify(t).marshalingTaskAction();
         verify(t, never()).submittingTaskAction();
@@ -704,13 +704,17 @@ public void testHaltMarshaling() {
     public void testHaltAlgorithmComplete() {
 
         // Set the desired stopping point
-        System.setProperty(PIPELINE_HALT_PROP_NAME, "Ac");
+        System.setProperty(PIPELINE_HALT.property(), "Ac");
         // Set up mockery and states as though to run the main loop for local processing
         t = new TestPipelineModule(p, RunMode.STANDARD);
         t = spy(t);
         t.tdb.setPState(ProcessingState.ALGORITHM_COMPLETE);
         when(t.algorithmManager()).thenReturn(tal);
-        assertThrows(PipelineException.class, () -> t.processingMainLoop());
+        PipelineException exception = assertThrows(PipelineException.class,
+            () -> t.processingMainLoop());
+        assertEquals(
+            "Halting processing at end of step ALGORITHM_COMPLETE due to configuration request for halt after step Ac",
+            exception.getMessage());
         verify(t, never()).initializingTaskAction();
         verify(t, never()).marshalingTaskAction();
         verify(t, never()).submittingTaskAction();
@@ -728,13 +732,15 @@ public void testHaltAlgorithmComplete() {
     public void testHaltStoring() {
 
         // Set the desired stopping point
-        System.setProperty(PIPELINE_HALT_PROP_NAME, "S");
+        System.setProperty(PIPELINE_HALT.property(), "S");
         // Set up mockery and states as though to run the main loop for local processing
         t = new TestPipelineModule(p, RunMode.STANDARD);
         t = spy(t);
         t.tdb.setPState(ProcessingState.ALGORITHM_COMPLETE);
         when(t.algorithmManager()).thenReturn(tal);
-        assertThrows(PipelineException.class, () -> t.processingMainLoop());
+        PipelineException exception = assertThrows(PipelineException.class,
+            () -> t.processingMainLoop());
+        assertEquals("Unable to persist due to sub-task failures", exception.getMessage());
         verify(t, never()).initializingTaskAction();
         verify(t, never()).marshalingTaskAction();
         verify(t, never()).submittingTaskAction();
@@ -752,14 +758,18 @@ public void testHaltStoring() {
     public void testHaltAlgorithmSubmitting() {
 
         // Set the desired stopping point
-        System.setProperty(PIPELINE_HALT_PROP_NAME, "As");
+        System.setProperty(PIPELINE_HALT.property(), "As");
         // Set up mockery and states as though to run the main loop for local processing
         t = new TestPipelineModule(p, RunMode.STANDARD);
         t = spy(t);
         when(t.algorithmManager()).thenReturn(tal);
         mockForLoopTest(t, tal, true, true);
         t.setInitialProcessingState(ProcessingState.ALGORITHM_SUBMITTING);
-        assertThrows(PipelineException.class, () -> t.processingMainLoop());
+        PipelineException exception = assertThrows(PipelineException.class,
+            () -> t.processingMainLoop());
+        assertEquals(
+            "Halting processing at end of step ALGORITHM_SUBMITTING due to configuration request for halt after step As",
+            exception.getMessage());
         verify(t, never()).initializingTaskAction();
         verify(t, never()).marshalingTaskAction();
         verify(t).submittingTaskAction();
@@ -777,14 +787,18 @@ public void testHaltAlgorithmSubmitting() {
     public void testHaltAlgorithmQueued() {
 
         // Set the desired stopping point
-        System.setProperty(PIPELINE_HALT_PROP_NAME, "Aq");
+        System.setProperty(PIPELINE_HALT.property(), "Aq");
         // Set up mockery and states as though to run the main loop for local processing
         t = new TestPipelineModule(p, RunMode.STANDARD);
         t = spy(t);
         when(t.algorithmManager()).thenReturn(tal);
         mockForLoopTest(t, tal, true, true);
         t.setInitialProcessingState(ProcessingState.ALGORITHM_QUEUED);
-        assertThrows(PipelineException.class, () -> t.processingMainLoop());
+        PipelineException exception = assertThrows(PipelineException.class,
+            () -> t.processingMainLoop());
+        assertEquals(
+            "Halting processing at end of step ALGORITHM_QUEUED due to configuration request for halt after step Aq",
+            exception.getMessage());
         verify(t, never()).initializingTaskAction();
         verify(t, never()).marshalingTaskAction();
         verify(t, never()).submittingTaskAction();
@@ -816,7 +830,6 @@ private void mockForLoopTest(TestPipelineModule t, TestAlgorithmLifecycle tal,
 
         // mock the algorithm lifecycle manager's isRemote() call
         when(tal.isRemote()).thenReturn(remote);
-
     }
 
     /**
@@ -882,7 +895,6 @@ public void testProcessRestart() {
             eq(ProcessingState.ALGORITHM_SUBMITTING));
         verify(t, never()).processingMainLoop();
         verify(ae).resumeMonitoring();
-
     }
 
     @Test
@@ -902,7 +914,6 @@ public void testProcessTask() {
         assertTrue(b);
         verify(t).processingMainLoop();
         verify(t).resubmit();
-
     }
 
     /**
@@ -1017,7 +1028,6 @@ public PipelineTask pipelineTask() {
         DatastoreProducerConsumerCrud datastoreProducerConsumerCrud() {
             return dpcc;
         }
-
     }
 
     /**
@@ -1034,12 +1044,10 @@ public File getTaskDir(boolean cleanExisting) {
 
         @Override
         public void executeAlgorithm(TaskConfigurationManager inputs) {
-
         }
 
         @Override
         public void doPostProcessing() {
-
         }
 
         @Override
@@ -1051,7 +1059,6 @@ public boolean isRemote() {
         public AlgorithmExecutor getExecutor() {
             return ae;
         }
-
     }
 
     /**
@@ -1074,6 +1081,5 @@ public ProcessingState getPState() {
         public void setPState(ProcessingState pState) {
             this.pState = pState;
         }
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/PipelineInputsOutputsUtilsTest.java b/src/test/java/gov/nasa/ziggy/module/PipelineInputsOutputsUtilsTest.java
index 59f84fc..15ece08 100644
--- a/src/test/java/gov/nasa/ziggy/module/PipelineInputsOutputsUtilsTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/PipelineInputsOutputsUtilsTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.module;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_TEST_WORKING_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_TEST_WORKING_DIR;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -28,14 +28,14 @@ public class PipelineInputsOutputsUtilsTest {
 
     @Rule
     public ZiggyPropertyRule ziggyTestWorkingDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_TEST_WORKING_DIR_PROP_NAME, (String) null);
+        ZIGGY_TEST_WORKING_DIR, (String) null);
 
     @Before
     public void setup() throws IOException {
 
         taskDir = directoryRule.directory().resolve("1-2-pa");
         Path workingDir = taskDir.resolve("st-12");
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, workingDir.toString());
+        System.setProperty(ZIGGY_TEST_WORKING_DIR.property(), workingDir.toString());
         // Create the task dir and the subtask dir
         Files.createDirectories(workingDir);
     }
@@ -56,5 +56,4 @@ public void testTaskDir() {
     public void testModuleName() {
         assertEquals("pa", PipelineInputsOutputsUtils.moduleName());
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/PipelineInputsTest.java b/src/test/java/gov/nasa/ziggy/module/PipelineInputsTest.java
index feac858..d7af428 100644
--- a/src/test/java/gov/nasa/ziggy/module/PipelineInputsTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/PipelineInputsTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.module;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_TEST_WORKING_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_TEST_WORKING_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -45,18 +45,18 @@ public class PipelineInputsTest {
 
     @Rule
     public ZiggyPropertyRule ziggyTestWorkingDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_TEST_WORKING_DIR_PROP_NAME, (String) null);
+        ZIGGY_TEST_WORKING_DIR, (String) null);
 
     @Rule
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, "/dev/null");
+        DATASTORE_ROOT_DIR, "/dev/null");
 
     @Before
     public void setup() throws IOException {
 
         taskDir = directoryRule.directory().resolve("1-2-pa");
         Path workingDir = taskDir.resolve("st-12");
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, workingDir.toString());
+        System.setProperty(ZIGGY_TEST_WORKING_DIR.property(), workingDir.toString());
         // Create the task dir and the subtask dir
         Files.createDirectories(workingDir);
 
@@ -116,7 +116,6 @@ public void testResultsFiles() {
         Set<String> filenames = dataFileInfosToNames(datastoreIds);
         assertTrue(filenames.contains("pa-001234567-20-results.h5"));
         assertTrue(filenames.contains("pa-765432100-20-results.h5"));
-
     }
 
     /**
@@ -127,11 +126,11 @@ public void testWrite() {
 
         PipelineInputsSample pipelineInputs = new PipelineInputsSample();
         pipelineInputs.populateSubTaskInputs();
-        pipelineInputs.writeSubTaskInputs(0);
+        pipelineInputs.writeSubTaskInputs();
         Hdf5ModuleInterface h = new Hdf5ModuleInterface();
         PipelineInputsSample inputsFromFile = new PipelineInputsSample();
         Path subTaskDir = taskDir.resolve("st-12");
-        h.readFile(subTaskDir.resolve("pa-inputs-0.h5").toFile(), inputsFromFile, true);
+        h.readFile(subTaskDir.resolve("pa-inputs.h5").toFile(), inputsFromFile, true);
         assertEquals(105.3, inputsFromFile.getDvalue(), 1e-9);
     }
 
@@ -181,20 +180,19 @@ public void testReadWriteToTaskDir() {
         pipelineInputs.populateSubTaskInputs();
         File taskDirFile = taskDir.toFile();
         String taskDirRoot = taskDirFile.getParent();
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, taskDirRoot);
+        System.setProperty(ZIGGY_TEST_WORKING_DIR.property(), taskDirRoot);
         PipelineTask pipelineTask = Mockito.mock(PipelineTask.class);
         Mockito.when(pipelineTask.getModuleName()).thenReturn("pa");
         pipelineInputs.writeToTaskDir(pipelineTask, taskDirFile);
         File writtenInputsFile = new File(taskDirFile, "pa-inputs.h5");
         assertTrue(writtenInputsFile.exists());
 
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME,
+        System.setProperty(ZIGGY_TEST_WORKING_DIR.property(),
             new File(taskDirFile, "st-12").getAbsolutePath());
         pipelineInputs = new PipelineInputsSample();
         assertEquals(0.0, pipelineInputs.getDvalue(), 1e-9);
         pipelineInputs.readFromTaskDir();
         assertEquals(105.3, pipelineInputs.getDvalue(), 1e-9);
-
     }
 
     private Set<String> dataFileInfosToNames(Set<? extends DataFileInfo> dataFileInfos) {
diff --git a/src/test/java/gov/nasa/ziggy/module/PipelineOutputsTest.java b/src/test/java/gov/nasa/ziggy/module/PipelineOutputsTest.java
index 004b812..c5117e7 100644
--- a/src/test/java/gov/nasa/ziggy/module/PipelineOutputsTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/PipelineOutputsTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.module;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_TEST_WORKING_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_TEST_WORKING_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -33,26 +33,25 @@
 public class PipelineOutputsTest {
 
     private Path taskDir;
-    private String filename = ModuleInterfaceUtils.outputsFileName("pa", 0);
-    private String otherFilename = ModuleInterfaceUtils.outputsFileName("pa", 2);
+    private String filename = ModuleInterfaceUtils.outputsFileName("pa");
 
     @Rule
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
     @Rule
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, "/dev/null");
+        DATASTORE_ROOT_DIR, "/dev/null");
 
     @Rule
     public ZiggyPropertyRule ziggyTestWorkingDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_TEST_WORKING_DIR_PROP_NAME, (String) null);
+        ZIGGY_TEST_WORKING_DIR, (String) null);
 
     @Before
     public void setup() throws IOException {
 
         taskDir = directoryRule.directory().resolve("100-200-pa");
         Path workingDir = taskDir.resolve("st-12");
-        System.setProperty(ZIGGY_TEST_WORKING_DIR_PROP_NAME, workingDir.toString());
+        System.setProperty(ZIGGY_TEST_WORKING_DIR.property(), workingDir.toString());
         // Create the task dir and the subtask dir
         Files.createDirectories(workingDir);
 
@@ -61,7 +60,6 @@ public void setup() throws IOException {
         p.populateTaskResults();
         Hdf5ModuleInterface h = new Hdf5ModuleInterface();
         h.writeFile(DirectoryProperties.workingDir().resolve(filename).toFile(), p, true);
-        h.writeFile(DirectoryProperties.workingDir().resolve(otherFilename).toFile(), p, true);
     }
 
     /**
@@ -113,7 +111,6 @@ public void testSaveResults() {
             assertEquals(200L, pr.getOriginator());
             assertEquals(ivalues[i], pr.getValue());
         }
-
     }
 
     /**
@@ -123,12 +120,11 @@ public void testSaveResults() {
     public void testOutputFiles() {
         PipelineOutputsSample1 p = new PipelineOutputsSample1();
         File[] files = p.outputFiles();
-        assertEquals(2, files.length);
+        assertEquals(1, files.length);
         Set<String> filenames = new HashSet<>();
         for (File f : files) {
             filenames.add(f.getName());
         }
         assertTrue(filenames.contains(filename));
-        assertTrue(filenames.contains(otherFilename));
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/ProcessingFailureSummaryTest.java b/src/test/java/gov/nasa/ziggy/module/ProcessingFailureSummaryTest.java
index c766036..454f56a 100644
--- a/src/test/java/gov/nasa/ziggy/module/ProcessingFailureSummaryTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/ProcessingFailureSummaryTest.java
@@ -36,7 +36,6 @@ public void setup() {
         subTaskDir.mkdirs();
         subTaskDir = new File(taskDir, "st-200");
         subTaskDir.mkdirs();
-
     }
 
     /**
@@ -58,15 +57,14 @@ public void testNoErrors() {
      */
     @Test
     public void testSomeErrors() throws IOException {
-        new File(new File(taskDir, "st-3"), "modulename-error-0.h5").createNewFile();
-        new File(new File(taskDir, "st-200"), "modulename-error-0.h5").createNewFile();
+        new File(new File(taskDir, "st-3"), "modulename-error.h5").createNewFile();
+        new File(new File(taskDir, "st-200"), "modulename-error.h5").createNewFile();
         ProcessingFailureSummary p = new ProcessingFailureSummary(moduleName, taskDir);
         assertFalse(p.isAllTasksSucceeded());
         assertFalse(p.isAllTasksFailed());
         assertEquals(2, p.getFailedSubTaskDirs().size());
         assertEquals("st-3", p.getFailedSubTaskDirs().get(0));
         assertEquals("st-200", p.getFailedSubTaskDirs().get(1));
-
     }
 
     /**
@@ -76,9 +74,9 @@ public void testSomeErrors() throws IOException {
      */
     @Test
     public void testAllErrored() throws IOException {
-        new File(new File(taskDir, "st-3"), "modulename-error-0.h5").createNewFile();
-        new File(new File(taskDir, "st-200"), "modulename-error-0.h5").createNewFile();
-        new File(new File(taskDir, "st-0"), "modulename-error-0.h5").createNewFile();
+        new File(new File(taskDir, "st-3"), "modulename-error.h5").createNewFile();
+        new File(new File(taskDir, "st-200"), "modulename-error.h5").createNewFile();
+        new File(new File(taskDir, "st-0"), "modulename-error.h5").createNewFile();
         ProcessingFailureSummary p = new ProcessingFailureSummary(moduleName, taskDir);
         assertFalse(p.isAllTasksSucceeded());
         assertTrue(p.isAllTasksFailed());
@@ -87,5 +85,4 @@ public void testAllErrored() throws IOException {
         assertEquals("st-3", p.getFailedSubTaskDirs().get(1));
         assertEquals("st-200", p.getFailedSubTaskDirs().get(2));
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/StateFileTest.java b/src/test/java/gov/nasa/ziggy/module/StateFileTest.java
index 269b7bd..ef5b7ad 100644
--- a/src/test/java/gov/nasa/ziggy/module/StateFileTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/StateFileTest.java
@@ -1,10 +1,9 @@
 
 package gov.nasa.ziggy.module;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.RESULTS_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.RESULTS_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.File;
@@ -15,10 +14,9 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
 import org.mockito.MockitoAnnotations;
 
-import com.google.common.collect.ImmutableList;
-
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
 import gov.nasa.ziggy.module.StateFile.State;
@@ -60,13 +58,15 @@ public class StateFileTest {
         StateFile.PREFIX + "2.2.foo.INITIALIZED_1-0-0",
         StateFile.PREFIX + "1.2.foo.INITIALIZED_1-0-0", };
 
-    @Rule
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
-    @Rule
-    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR_PROP_NAME,
+    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR,
         directoryRule);
 
+    @Rule
+    public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
+        .around(resultsDirPropertyRule);
+
     @Before
     public void setUp() throws IOException {
         Files.createDirectories(DirectoryProperties.stateFilesDir());
@@ -87,7 +87,6 @@ public void testConstructors() {
         stateFile.setPfeArrivalTimeMillis(PFE_ARRIVAL_TIME_MILLIS);
         stateFile.setRemoteGroup(REMOTE_GROUP);
         testStateFileProperties(stateFile);
-
     }
 
     private PipelineTask createPipelineTask() {
@@ -95,14 +94,12 @@ private PipelineTask createPipelineTask() {
         PipelineDefinition pipelineDefinition = new PipelineDefinition("any");
 
         PipelineInstance instance = new PipelineInstance();
-        instance.setId(42);
+        instance.setId(42L);
 
-        PipelineTask task = new PipelineTask(instance,
-            new PipelineInstanceNode(instance,
-                new PipelineDefinitionNode(moduleDefinition.getName(),
-                    pipelineDefinition.getName().getName()),
-                moduleDefinition));
-        task.setId(43);
+        PipelineTask task = new PipelineTask(instance, new PipelineInstanceNode(instance,
+            new PipelineDefinitionNode(moduleDefinition.getName(), pipelineDefinition.getName()),
+            moduleDefinition));
+        task.setId(43L);
 
         return task;
     }
@@ -171,38 +168,27 @@ public void testState() {
         stateFile.setState(State.CLOSED);
         assertEquals(true, stateFile.isDone());
         assertEquals(false, stateFile.isRunning());
-        assertEquals(false, stateFile.isDeleted());
         assertEquals(false, stateFile.isQueued());
         stateFile.setState(State.COMPLETE);
         assertEquals(true, stateFile.isDone());
         assertEquals(false, stateFile.isRunning());
-        assertEquals(false, stateFile.isDeleted());
         assertEquals(false, stateFile.isQueued());
         stateFile.setState(State.INITIALIZED);
         assertEquals(false, stateFile.isDone());
         assertEquals(false, stateFile.isRunning());
-        assertEquals(false, stateFile.isDeleted());
         assertEquals(false, stateFile.isQueued());
         stateFile.setState(State.PROCESSING);
         assertEquals(false, stateFile.isDone());
         assertEquals(true, stateFile.isRunning());
-        assertEquals(false, stateFile.isDeleted());
         assertEquals(false, stateFile.isQueued());
         stateFile.setState(State.QUEUED);
         assertEquals(false, stateFile.isDone());
         assertEquals(false, stateFile.isRunning());
-        assertEquals(false, stateFile.isDeleted());
         assertEquals(true, stateFile.isQueued());
         stateFile.setState(State.SUBMITTED);
         assertEquals(false, stateFile.isDone());
         assertEquals(false, stateFile.isRunning());
-        assertEquals(false, stateFile.isDeleted());
         assertEquals(false, stateFile.isQueued());
-        stateFile.setState(State.DELETED);
-        assertTrue(stateFile.isDone());
-        assertFalse(stateFile.isRunning());
-        assertTrue(stateFile.isDeleted());
-        assertFalse(stateFile.isQueued());
     }
 
     @Test
@@ -221,7 +207,6 @@ public void testDefaultPropertyValues() {
         assertEquals(StateFile.INVALID_VALUE, stateFile.getPbsSubmitTimeMillis());
         assertEquals(StateFile.INVALID_VALUE, stateFile.getPfeArrivalTimeMillis());
         assertEquals(StateFile.INVALID_VALUE, stateFile.getGigsPerSubtask(), 1e-9);
-
     }
 
     @Test
@@ -241,26 +226,6 @@ public void testFileIO() {
             fail("Unexpected exception " + e);
         }
 
-        // No directory.
-        try {
-            stateFile.persist();
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        } catch (Exception e) {
-            fail("Unexpected exception " + e);
-        }
-
-        // Directory is a file.
-        try {
-            workingDirectory.createNewFile();
-            stateFile.persist();
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            workingDirectory.delete();
-        } catch (Exception e) {
-            fail("Unexpected exception " + e);
-        }
-
         // Nominal write and read.
         workingDirectory.mkdirs();
         try {
@@ -270,11 +235,7 @@ public void testFileIO() {
         }
 
         try {
-            StateFile newStateFile = StateFile
-                .newStateFileFromDiskFile(new File(workingDirectory, stateFile.name()), false);
-            checkEqual(stateFile, newStateFile);
-            newStateFile = StateFile
-                .newStateFileFromDiskFile(new File(workingDirectory, stateFile.name()), true);
+            StateFile newStateFile = stateFile.newStateFileFromDiskFile();
             checkEqual(stateFile, newStateFile);
         } catch (Exception e) {
             fail("Unexpected exception " + e);
@@ -283,25 +244,13 @@ public void testFileIO() {
         // Update the state
         StateFile newStateFile = new StateFile(stateFile);
         newStateFile.setState(State.SUBMITTED);
-        StateFile.updateStateFile(stateFile, newStateFile, workingDirectory);
+        StateFile.updateStateFile(stateFile, newStateFile);
         try {
-            stateFile = StateFile
-                .newStateFileFromDiskFile(new File(workingDirectory, newStateFile.name()), false);
+            stateFile = newStateFile.newStateFileFromDiskFile();
             checkEqual(stateFile, newStateFile);
         } catch (Exception e) {
             fail("Unexpected exception " + e);
         }
-
-        // Check fromDirectory. Note that we have left behind one SUBMITTED file above.
-        try {
-            assertEquals(0,
-                StateFile.fromDirectory(workingDirectory, ImmutableList.of(State.COMPLETE)).size());
-            assertEquals(1,
-                StateFile.fromDirectory(workingDirectory, ImmutableList.of(State.SUBMITTED))
-                    .size());
-        } catch (Exception e) {
-            fail("Unexpected exception " + e);
-        }
     }
 
     private void checkEqual(StateFile stateFile, StateFile newStateFile) {
diff --git a/src/test/java/gov/nasa/ziggy/module/SubtaskClientTest.java b/src/test/java/gov/nasa/ziggy/module/SubtaskClientTest.java
index c1ae74d..c5059e1 100644
--- a/src/test/java/gov/nasa/ziggy/module/SubtaskClientTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/SubtaskClientTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.ArrayBlockingQueue;
@@ -70,7 +71,6 @@ public void testReportSubtaskComplete() throws InterruptedException, ExecutionEx
         assertTrue(TestEventDetector.detectTestEvent(1000L, () -> response.isDone()));
         Response responseContent = response.get();
         assertEquals(ResponseType.OK, responseContent.status);
-
     }
 
     @Test
@@ -95,7 +95,6 @@ public void testReportSubtaskLocked() throws InterruptedException, ExecutionExce
         assertTrue(TestEventDetector.detectTestEvent(1000L, () -> response.isDone()));
         Response responseContent = response.get();
         assertEquals(ResponseType.OK, responseContent.status);
-
     }
 
     @Test
@@ -168,29 +167,12 @@ public void testInterruption() throws ExecutionException, InterruptedException {
         threadPool.shutdownNow();
         assertTrue(TestEventDetector.detectTestEvent(1000L, () -> response.isDone()));
 
-        try {
-            response.get();
-            assertFalse("ExecutionException did not occur", true);
-        } catch (ExecutionException e) {
-            Throwable t = e.getCause();
-            StackTraceElement[] stackTrace = t.getStackTrace();
-            assertEquals(InterruptedException.class, t.getClass());
-
-            // Make sure the interrupt was in the correct location.
-            boolean correctInterruptLocation = false;
-            for (StackTraceElement element : stackTrace) {
-                if (element.getClassName().equals("gov.nasa.ziggy.module.SubtaskClient")
-                    && element.getMethodName().equals("receive")) {
-                    correctInterruptLocation = true;
-                    break;
-                }
-            }
-            assertTrue(correctInterruptLocation);
-        }
+        assertNull(response.get());
     }
 
     @Test
-    public void testInterruptBeforeSendingRequest() throws InterruptedException {
+    public void testInterruptBeforeSendingRequest()
+        throws InterruptedException, ExecutionException {
 
         // Here we want to do something peculiar, to wit: we want the SubtaskClient
         // thread to wait for the interrupt to appear, and then try to submit a
@@ -210,7 +192,7 @@ public void testInterruptBeforeSendingRequest() throws InterruptedException {
         } catch (ExecutionException e) {
             Throwable t = e.getCause();
             StackTraceElement[] stackTrace = t.getStackTrace();
-            assertEquals(InterruptedException.class, t.getClass());
+            assertEquals(AssertionError.class, t.getClass());
 
             // Make sure the interrupt was in the correct location.
             boolean correctInterruptLocation = false;
diff --git a/src/test/java/gov/nasa/ziggy/module/SubtaskDirectoryIteratorTest.java b/src/test/java/gov/nasa/ziggy/module/SubtaskDirectoryIteratorTest.java
index aea0577..6c8fa02 100644
--- a/src/test/java/gov/nasa/ziggy/module/SubtaskDirectoryIteratorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/SubtaskDirectoryIteratorTest.java
@@ -60,6 +60,5 @@ public void test() throws IOException {
         assertFalse(it.hasNext());
 
         FileUtils.deleteDirectory(taskDir);
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/SubtaskExecutorTest.java b/src/test/java/gov/nasa/ziggy/module/SubtaskExecutorTest.java
index 5fd9530..236df23 100644
--- a/src/test/java/gov/nasa/ziggy/module/SubtaskExecutorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/SubtaskExecutorTest.java
@@ -1,11 +1,11 @@
 package gov.nasa.ziggy.module;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.MODULE_EXE_BINPATH_PROPERTY_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.MODULE_EXE_LIBPATH_PROPERTY_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.MODULE_EXE_MCRROOT_PROPERTY_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.PIPELINE_HOME_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.RESULTS_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.BINPATH;
+import static gov.nasa.ziggy.services.config.PropertyName.LIBPATH;
+import static gov.nasa.ziggy.services.config.PropertyName.MCRROOT;
+import static gov.nasa.ziggy.services.config.PropertyName.PIPELINE_HOME_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.RESULTS_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -16,12 +16,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.ExecuteException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
@@ -51,32 +52,35 @@ public class SubtaskExecutorTest {
     private File buildDir;
     private File binDir;
 
-    @Rule
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
     @Rule
-    public ZiggyPropertyRule moduleExeBinpathPropertyRule = new ZiggyPropertyRule(
-        MODULE_EXE_BINPATH_PROPERTY_NAME, (String) null);
+    public ZiggyPropertyRule moduleExeBinpathPropertyRule = new ZiggyPropertyRule(BINPATH,
+        (String) null);
 
     @Rule
-    public ZiggyPropertyRule moduleExeLibpathPropertyRule = new ZiggyPropertyRule(
-        MODULE_EXE_LIBPATH_PROPERTY_NAME, "path1" + File.pathSeparator + "path2");
+    public ZiggyPropertyRule moduleExeLibpathPropertyRule = new ZiggyPropertyRule(LIBPATH,
+        "path1" + File.pathSeparator + "path2");
 
     @Rule
-    public ZiggyPropertyRule moduleExeMcrrootPropertyRule = new ZiggyPropertyRule(
-        MODULE_EXE_MCRROOT_PROPERTY_NAME, (String) null);
+    public ZiggyPropertyRule moduleExeMcrrootPropertyRule = new ZiggyPropertyRule(MCRROOT,
+        (String) null);
 
+    // This rule can be set to anything, but if it's not set at all the unit tests fail.
     @Rule
-    public ZiggyPropertyRule pipelineHomeDirPropertyRule = new ZiggyPropertyRule(
-        PIPELINE_HOME_DIR_PROP_NAME, (String) null);
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        "/path/to/ziggy/build");
 
-    @Rule
-    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR_PROP_NAME,
-        (String) null);
+    public ZiggyPropertyRule pipelineHomeDirPropertyRule = new ZiggyPropertyRule(PIPELINE_HOME_DIR,
+        directoryRule, "build");
+
+    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR,
+        directoryRule, "results");
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, "/path/to/ziggy/build");
+    public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
+        .around(pipelineHomeDirPropertyRule)
+        .around(resultsDirPropertyRule);
 
     @Before
     public void setup() throws IOException, ConfigurationException {
@@ -85,15 +89,13 @@ public void setup() throws IOException, ConfigurationException {
         taskDir = new File(rootDir, "10-20-pa");
         subTaskDir = new File(taskDir, "st-0");
         subTaskDir.mkdirs();
-        buildDir = new File(rootDir, "build");
+        buildDir = new File(pipelineHomeDirPropertyRule.getProperty());
         binDir = new File(buildDir, "bin");
         binDir.mkdirs();
         File paFile = new File(binDir, "pa");
         paFile.createNewFile();
 
-        System.setProperty(PIPELINE_HOME_DIR_PROP_NAME, buildDir.toString());
-        System.setProperty(RESULTS_DIR_PROP_NAME, new File(rootDir, "results").getAbsolutePath());
-        new File(System.getProperty(RESULTS_DIR_PROP_NAME)).mkdirs();
+        new File(resultsDirPropertyRule.getProperty()).mkdirs();
 
         // Create the state file directory
         Files.createDirectories(DirectoryProperties.stateFilesDir());
@@ -112,8 +114,6 @@ public void testConstructor() throws IOException {
             .taskDir(taskDir)
             .subtaskIndex(0)
             .timeoutSecs(1000000)
-            .pipelineHomeDir(buildDir.getAbsolutePath())
-            .pipelineConfigPath("/dev/null")
             .build();
         assertEquals("pa", e.binaryName());
         assertEquals(binDir.getCanonicalPath(), e.binaryDir().getCanonicalPath());
@@ -122,13 +122,11 @@ public void testConstructor() throws IOException {
         assertEquals("path1" + File.pathSeparator + "path2", e.libPath());
 
         // with MATLAB paths defined
-        System.setProperty(MODULE_EXE_MCRROOT_PROPERTY_NAME, "/path/to/mcr/v22");
+        System.setProperty(MCRROOT.property(), "/path/to/mcr/v22");
         e = new SubtaskExecutor.Builder().binaryName("pa")
             .taskDir(taskDir)
             .subtaskIndex(0)
             .timeoutSecs(1000000)
-            .pipelineHomeDir(buildDir.getAbsolutePath())
-            .pipelineConfigPath("/dev/null")
             .build();
         String[] libPaths = e.libPath().split(File.pathSeparator);
 
@@ -156,12 +154,9 @@ public void testConstructor() throws IOException {
                 .taskDir(taskDir)
                 .subtaskIndex(0)
                 .timeoutSecs(1000000)
-                .pipelineHomeDir(buildDir.getAbsolutePath())
-                .pipelineConfigPath("/dev/null")
                 .build();
             assertEquals("cal", e.binaryName());
         }
-
     }
 
     /**
@@ -180,17 +175,14 @@ public void testBinPath() throws IOException {
         new File(binDir3, "pa").createNewFile();
         String binPath = phonyBinDir1 + File.pathSeparator + phonyBinDir2 + File.pathSeparator
             + binDir3;
-        System.setProperty(MODULE_EXE_BINPATH_PROPERTY_NAME, binPath);
+        System.setProperty(BINPATH.property(), binPath);
         SubtaskExecutor e = new SubtaskExecutor.Builder().binaryName("pa")
             .taskDir(taskDir)
             .subtaskIndex(0)
             .timeoutSecs(1000000)
-            .pipelineHomeDir(buildDir.getAbsolutePath())
-            .pipelineConfigPath("/dev/null")
             .build();
         assertEquals("pa", e.binaryName());
         assertEquals(binDir3File.getCanonicalPath(), e.binaryDir().getCanonicalPath());
-
     }
 
     @Test
@@ -203,14 +195,14 @@ public void testRunInputsOutputsCommand() throws ExecuteException, IOException {
         CommandLine commandLine = externalProcessExecutor.commandLine();
         Mockito.verify(externalProcess).setWorkingDirectory(subTaskDir);
         String cmdString = commandLine.toString();
-        String expectedCommandString = "[/path/to/ziggy/build/bin/runjava, --verbose, "
-            + "-Djava.library.path=/path/to/ziggy/build/lib, "
-            + "-Dlog4j2.configurationFile=/path/to/ziggy/build/etc/log4j2.xml, "
-            + "gov.nasa.ziggy.module.TaskFileManager, "
-            + "gov.nasa.ziggy.data.management.DataFileTestUtils.PipelineInputsSample]";
+        String expectedCommandString = """
+            [/path/to/ziggy/build/bin/ziggy, --verbose,\s\
+            -Djava.library.path=path1:path2:/path/to/ziggy/build/lib,\s\
+            -Dlog4j2.configurationFile=/path/to/ziggy/build/etc/log4j2.xml,\s\
+            --class=gov.nasa.ziggy.module.TaskFileManager,\s\
+            gov.nasa.ziggy.data.management.DataFileTestUtils.PipelineInputsSample]""";
         assertEquals(expectedCommandString, cmdString);
         assertEquals(0, retCode);
-
     }
 
     /**
@@ -240,12 +232,11 @@ public void testInputsErrorSetsErrorStatus() throws Exception {
         Mockito.doReturn(1)
             .when(externalProcessExecutor)
             .runInputsOutputsCommand(PipelineInputsSample.class);
-        int retCode = externalProcessExecutor.execAlgorithmInternal(0);
+        int retCode = externalProcessExecutor.execAlgorithmInternal();
         assertEquals(1, retCode);
         assertTrue(new File(subTaskDir, ".FAILED").exists());
         Mockito.verify(externalProcessExecutor, Mockito.never())
-            .runCommandline(ArgumentMatchers.anyList(), ArgumentMatchers.any(String.class),
-                ArgumentMatchers.any(String.class));
+            .runCommandline(ArgumentMatchers.anyList(), ArgumentMatchers.any(String.class));
     }
 
     @Test
@@ -257,7 +248,7 @@ public void testRunCommandLine() throws Exception {
         List<String> cmdLineArgs = new ArrayList<>();
         cmdLineArgs.add("dummyArg1");
         cmdLineArgs.add("dummyArg2");
-        int retCode = externalProcessExecutor.runCommandline(cmdLineArgs, "a", "b");
+        int retCode = externalProcessExecutor.runCommandline(cmdLineArgs, "a");
         CommandLine commandLine = externalProcessExecutor.commandLine();
         Mockito.verify(externalProcess).setWorkingDirectory(subTaskDir);
         Mockito.verify(externalProcess).setCommandLine(commandLine);
@@ -269,7 +260,6 @@ public void testRunCommandLine() throws Exception {
         // we'll have to do some kind of indirect checking of the command
         assertTrue(cmdString.startsWith("[" + binDir.getAbsolutePath() + "/pa"));
         assertTrue(cmdString.endsWith("pa, dummyArg1, dummyArg2]"));
-
     }
 
     private void setUpMockedObjects() throws IOException {
@@ -278,8 +268,6 @@ private void setUpMockedObjects() throws IOException {
             .taskDir(taskDir)
             .subtaskIndex(0)
             .timeoutSecs(1000000)
-            .pipelineHomeDir(buildDir.getAbsolutePath())
-            .pipelineConfigPath("/dev/null")
             .build();
         externalProcessExecutor = Mockito.spy(externalProcessExecutor);
         Mockito.when(externalProcessExecutor.externalProcess(ArgumentMatchers.isNull(),
diff --git a/src/test/java/gov/nasa/ziggy/module/SubtaskMasterTest.java b/src/test/java/gov/nasa/ziggy/module/SubtaskMasterTest.java
index 7260daa..e76d2ef 100644
--- a/src/test/java/gov/nasa/ziggy/module/SubtaskMasterTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/SubtaskMasterTest.java
@@ -26,7 +26,7 @@
 import gov.nasa.ziggy.ZiggyPropertyRule;
 import gov.nasa.ziggy.module.SubtaskServer.ResponseType;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.util.io.LockManager;
 
 /**
@@ -38,8 +38,8 @@ public class SubtaskMasterTest {
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
-    public ZiggyPropertyRule resultsDirRule = new ZiggyPropertyRule(
-        PropertyNames.RESULTS_DIR_PROP_NAME, directoryRule);
+    public ZiggyPropertyRule resultsDirRule = new ZiggyPropertyRule(PropertyName.RESULTS_DIR,
+        directoryRule);
 
     @Rule
     public RuleChain ruleChain = RuleChain.outerRule(directoryRule).around(resultsDirRule);
@@ -54,9 +54,7 @@ public class SubtaskMasterTest {
     private final String NODE = "dummy";
     private final String BINARY_NAME = "dummy";
     private final String TASK_DIR = "dummy";
-    private final String HOME_DIR = "dummy";
     private final int TIMEOUT = 3_600_000;
-    private final String PIPELINE_CONFIG_PATH = "dummy";
     private final int SUBTASK_INDEX = 50;
 
     @Before
@@ -71,8 +69,7 @@ public void setUp() throws IOException, InterruptedException {
         completionCounter = new Semaphore(THREAD_NUMBER);
         completionCounter.acquire();
         subtaskMaster = spy(new SubtaskMaster(THREAD_NUMBER, NODE, completionCounter, BINARY_NAME,
-            DirectoryProperties.taskDataDir().resolve(TASK_DIR).toString(), TIMEOUT, HOME_DIR,
-            PIPELINE_CONFIG_PATH));
+            DirectoryProperties.taskDataDir().resolve(TASK_DIR).toString(), TIMEOUT));
         doReturn(subtaskClient).when(subtaskMaster).subtaskClient();
         doReturn(subtaskExecutor).when(subtaskMaster).subtaskExecutor(ArgumentMatchers.anyInt());
         doReturn(algorithmStateFiles).when(subtaskMaster)
@@ -107,7 +104,6 @@ public void testNormalExecution() throws InterruptedException, IOException {
         verify(subtaskMaster, times(0)).logException(ArgumentMatchers.any(Integer.class),
             ArgumentMatchers.any(Exception.class));
         assertEquals(5, completionCounter.availablePermits());
-
     }
 
     /**
@@ -135,7 +131,6 @@ public void testAlgorithmFailure() throws InterruptedException, IOException {
         verify(subtaskMaster).logException(ArgumentMatchers.eq(SUBTASK_INDEX),
             ArgumentMatchers.any(ModuleFatalProcessingException.class));
         assertEquals(5, completionCounter.availablePermits());
-
     }
 
     /**
@@ -165,7 +160,6 @@ public void testSubtaskAlreadyComplete() throws InterruptedException, IOExceptio
         verify(subtaskMaster, times(0)).logException(ArgumentMatchers.any(Integer.class),
             ArgumentMatchers.any(Exception.class));
         assertEquals(5, completionCounter.availablePermits());
-
     }
 
     /**
@@ -195,7 +189,6 @@ public void testSubtaskAlreadyFailed() throws InterruptedException, IOException
         verify(subtaskMaster, times(0)).logException(ArgumentMatchers.any(Integer.class),
             ArgumentMatchers.any(Exception.class));
         assertEquals(5, completionCounter.availablePermits());
-
     }
 
     /**
@@ -228,7 +221,6 @@ public void testSubtaskAlreadyProcessing() throws InterruptedException, IOExcept
         verify(subtaskMaster, times(0)).logException(ArgumentMatchers.any(Integer.class),
             ArgumentMatchers.any(Exception.class));
         assertEquals(5, completionCounter.availablePermits());
-
     }
 
     /**
@@ -258,7 +250,7 @@ public void testUnableToObtainFileLock() throws InterruptedException, IOExceptio
         // execAlgorithm() method should not run and the write lock should not be
         // released (since it was never obtained).
         verify(subtaskExecutor, times(0)).execAlgorithm();
-        verify(subtaskMaster, times(0)).releaseWriteLock(DirectoryProperties.taskDataDir()
+        verify(subtaskMaster, times(1)).releaseWriteLock(DirectoryProperties.taskDataDir()
             .resolve(TASK_DIR)
             .resolve("st-" + SUBTASK_INDEX)
             .resolve(TaskConfigurationManager.LOCK_FILE_NAME)
@@ -266,7 +258,6 @@ public void testUnableToObtainFileLock() throws InterruptedException, IOExceptio
         verify(subtaskMaster, times(0)).logException(ArgumentMatchers.any(Integer.class),
             ArgumentMatchers.any(Exception.class));
         assertEquals(5, completionCounter.availablePermits());
-
     }
 
     /**
@@ -279,7 +270,7 @@ public void testIOException() throws InterruptedException, IOException {
         standardSetUp();
 
         // The locking method should cause an exception.
-        doThrow(new IOException("dummy")).when(subtaskMaster)
+        doThrow(new PipelineException("dummy")).when(subtaskMaster)
             .getWriteLockWithoutBlocking(DirectoryProperties.taskDataDir()
                 .resolve(TASK_DIR)
                 .resolve("st-" + SUBTASK_INDEX)
@@ -297,9 +288,8 @@ public void testIOException() throws InterruptedException, IOException {
             Paths.get(TASK_DIR, "st-" + SUBTASK_INDEX, TaskConfigurationManager.LOCK_FILE_NAME)
                 .toFile());
         verify(subtaskMaster).logException(ArgumentMatchers.eq(SUBTASK_INDEX),
-            ArgumentMatchers.any(IOException.class));
+            ArgumentMatchers.any(PipelineException.class));
         assertEquals(5, completionCounter.availablePermits());
-
     }
 
     /**
@@ -334,5 +324,4 @@ private void standardSetUp() throws InterruptedException, IOException {
         when(subtaskExecutor.execAlgorithm()).thenReturn(0);
 
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/SubtaskServerTest.java b/src/test/java/gov/nasa/ziggy/module/SubtaskServerTest.java
index 5b6002e..59a03c0 100644
--- a/src/test/java/gov/nasa/ziggy/module/SubtaskServerTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/SubtaskServerTest.java
@@ -110,5 +110,4 @@ public void testInterrupt() throws InterruptedException {
         assertTrue(TestEventDetector.detectTestEvent(1000L,
             () -> subtaskServer.getListenerThread().getState().equals(Thread.State.TERMINATED)));
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/TaskConfigurationManagerTest.java b/src/test/java/gov/nasa/ziggy/module/TaskConfigurationManagerTest.java
index bd8d372..1bbf7e3 100644
--- a/src/test/java/gov/nasa/ziggy/module/TaskConfigurationManagerTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/TaskConfigurationManagerTest.java
@@ -172,5 +172,4 @@ public void testPersistRestore() {
         TaskConfigurationManager h2 = TaskConfigurationManager.restore(h1.getTaskDir());
         assertEquals(h1, h2);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/TaskMonitorTest.java b/src/test/java/gov/nasa/ziggy/module/TaskMonitorTest.java
index 5c362c1..39b8b10 100644
--- a/src/test/java/gov/nasa/ziggy/module/TaskMonitorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/TaskMonitorTest.java
@@ -13,7 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -21,9 +21,8 @@
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
-import gov.nasa.ziggy.module.StateFile.State;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
-import gov.nasa.ziggy.services.config.PropertyNames;
+import gov.nasa.ziggy.services.config.PropertyName;
 
 /**
  * Unit tests for {@link TestMonitor} class.
@@ -40,8 +39,8 @@ public class TaskMonitorTest {
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
-    public ZiggyPropertyRule pipelineResultsRule = new ZiggyPropertyRule(
-        PropertyNames.RESULTS_DIR_PROP_NAME, directoryRule, "pipeline-results");
+    public ZiggyPropertyRule pipelineResultsRule = new ZiggyPropertyRule(PropertyName.RESULTS_DIR,
+        directoryRule, "pipeline-results");
 
     @Rule
     public RuleChain ruleChain = RuleChain.outerRule(directoryRule).around(pipelineResultsRule);
@@ -72,8 +71,7 @@ public void setUp() throws IOException, ConfigurationException {
         TaskConfigurationManager inputsHandler = mock(TaskConfigurationManager.class);
         when(inputsHandler.allSubTaskDirectories()).thenReturn(subtaskDirectories);
 
-        taskMonitor = new TaskMonitor(inputsHandler, stateFile, stateFileDir.toFile(),
-            taskDir.toFile());
+        taskMonitor = new TaskMonitor(inputsHandler, stateFile, taskDir.toFile());
     }
 
     @Test
@@ -111,8 +109,7 @@ public void testUpdateState() throws IOException {
 
         // Changing the state of the on-disk state file should get reflected in the state file
         // stored in the monitor.
-        new StateFile(stateFile).setStateAndPersist(StateFile.State.PROCESSING,
-            stateFileDir.toFile());
+        new StateFile(stateFile).setStateAndPersist(StateFile.State.PROCESSING);
         taskMonitor.updateState();
         assertEquals(StateFile.State.PROCESSING, stateFile.getState());
         assertEquals(6, stateFile.getNumTotal());
@@ -120,14 +117,6 @@ public void testUpdateState() throws IOException {
         assertEquals(1, stateFile.getNumFailed());
     }
 
-    @Test
-    public void testIsDeleted() throws IOException {
-        assertFalse(taskMonitor.isDeleted());
-        new StateFile(stateFile).setStateAndPersist(State.DELETED, stateFileDir.toFile());
-        taskMonitor.updateState();
-        assertTrue(taskMonitor.isDeleted());
-    }
-
     /**
      * Tests whether marking a state file as complete when it has subtasks that never got run moves
      * those subtasks to being counted in the state file as failed.
@@ -141,8 +130,7 @@ public void testMarkStateFileCompleteWithSkippedTasks() throws IOException {
         assertEquals(6, stateFile.getNumTotal());
         assertEquals(0, stateFile.getNumComplete());
         assertEquals(6, stateFile.getNumFailed());
-        StateFile diskStateFile = StateFile
-            .newStateFileFromDiskFile(stateFileDir.resolve(stateFile.name()).toFile(), true);
+        StateFile diskStateFile = stateFile.newStateFileFromDiskFile();
         assertEquals(StateFile.State.COMPLETE, diskStateFile.getState());
         assertEquals(6, diskStateFile.getNumTotal());
         assertEquals(0, diskStateFile.getNumComplete());
@@ -160,8 +148,7 @@ public void markStateFileComplete() throws IOException {
         assertEquals(6, stateFile.getNumTotal());
         assertEquals(6, stateFile.getNumComplete());
         assertEquals(0, stateFile.getNumFailed());
-        StateFile diskStateFile = StateFile
-            .newStateFileFromDiskFile(stateFileDir.resolve(stateFile.name()).toFile(), true);
+        StateFile diskStateFile = stateFile.newStateFileFromDiskFile();
         assertEquals(StateFile.State.COMPLETE, diskStateFile.getState());
         assertEquals(6, diskStateFile.getNumTotal());
         assertEquals(6, diskStateFile.getNumComplete());
@@ -180,5 +167,4 @@ public void testAllSubtasksProcessed() throws IOException {
         taskMonitor.updateState();
         assertTrue(taskMonitor.allSubtasksProcessed());
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/hdf5/Hdf5ModuleInterfaceTest.java b/src/test/java/gov/nasa/ziggy/module/hdf5/Hdf5ModuleInterfaceTest.java
index 6e4440a..4a34f98 100644
--- a/src/test/java/gov/nasa/ziggy/module/hdf5/Hdf5ModuleInterfaceTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/hdf5/Hdf5ModuleInterfaceTest.java
@@ -113,7 +113,6 @@ public void testWriteAndReadFile() throws HDF5LibraryException, IOException {
 
         recoveredTestValues.ignoreThisField = 11.5;
         assertTrue(persistableTest2.equals(recoveredTestValues));
-
     }
 
     @Test(expected = PipelineException.class)
@@ -125,5 +124,4 @@ public void testErrorOnFileWithMissingField() throws IOException {
         recoveredTestValues.ignoreThisField = 0;
         moduleInterface.readFile(hdf5File, recoveredTestValues, false);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/hdf5/ModuleParametersHdf5ArrayTest.java b/src/test/java/gov/nasa/ziggy/module/hdf5/ModuleParametersHdf5ArrayTest.java
index 81eee4f..e65ef24 100644
--- a/src/test/java/gov/nasa/ziggy/module/hdf5/ModuleParametersHdf5ArrayTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/hdf5/ModuleParametersHdf5ArrayTest.java
@@ -19,9 +19,9 @@
 import gov.nasa.ziggy.collections.ZiggyDataType;
 import gov.nasa.ziggy.module.io.Persistable;
 import gov.nasa.ziggy.module.remote.RemoteParameters;
-import gov.nasa.ziggy.parameters.DefaultParameters;
 import gov.nasa.ziggy.parameters.ModuleParameters;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 
 /**
@@ -77,13 +77,13 @@ public void testWriteAndRead() {
         loadArticle.setModuleParameters(new ModuleParameters());
         hdf5ModuleInterface.readFile(testFile, loadArticle, true);
         ModuleParameters m = loadArticle.getModuleParameters();
-        List<Parameters> p = m.getModuleParameters();
+        List<ParametersInterface> p = m.getModuleParameters();
         assertEquals(2, p.size());
-        DefaultParameters d;
+        Parameters d;
         if (p.get(0) instanceof RemoteParameters) {
-            d = (DefaultParameters) p.get(1);
+            d = (Parameters) p.get(1);
         } else {
-            d = (DefaultParameters) p.get(0);
+            d = (Parameters) p.get(0);
         }
         assertEquals(d.getName(), "test default parameters");
         Set<TypedParameter> t = d.getParameters();
@@ -112,15 +112,15 @@ public void testWriteAndRead() {
 
     private ModuleParameters populateModuleParameters() {
         ModuleParameters m = new ModuleParameters();
-        List<Parameters> p = m.getModuleParameters();
+        List<ParametersInterface> p = m.getModuleParameters();
         p.add(new RemoteParameters());
-        p.add(defaultParameters());
+        p.add(parameters());
 
         return m;
     }
 
-    private DefaultParameters defaultParameters() {
-        DefaultParameters d = new DefaultParameters();
+    private Parameters parameters() {
+        Parameters d = new Parameters();
         d.setName("test default parameters");
         Set<TypedParameter> typedProperties = new HashSet<>();
         typedProperties.add(new TypedParameter("intValue", "300", ZiggyDataType.ZIGGY_INT));
@@ -162,6 +162,5 @@ public ModuleParameters getModuleParameters() {
         public void setModuleParameters(ModuleParameters moduleParameters) {
             this.moduleParameters = moduleParameters;
         }
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/hdf5/ParameterSetHdf5Test.java b/src/test/java/gov/nasa/ziggy/module/hdf5/ParameterSetHdf5Test.java
index 5a5b74b..07c5fce 100644
--- a/src/test/java/gov/nasa/ziggy/module/hdf5/ParameterSetHdf5Test.java
+++ b/src/test/java/gov/nasa/ziggy/module/hdf5/ParameterSetHdf5Test.java
@@ -65,7 +65,7 @@ public void serializeAndDeserialize() {
         assertTrue(((ScalarPars) p4.get(1)).checkVars());
     }
 
-    public static class ScalarPars implements Parameters {
+    public static class ScalarPars extends Parameters {
 
         public int getValue1() {
             return value1;
@@ -98,10 +98,9 @@ public void setValue3(String value3) {
         public boolean checkVars() {
             return value1 == 100 && value2 == 28.56 && value3.equals("surprise!");
         }
-
     }
 
-    public static class NonScalarPars implements Parameters {
+    public static class NonScalarPars extends Parameters {
 
         private int[] value1 = { 1, 2, 3 };
         private double[][] value2 = { { 1.1, 2.2 }, { 3.3, 4.4 } };
diff --git a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableHdf5ArrayTest.java b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableHdf5ArrayTest.java
index 330c7e1..3a6a520 100644
--- a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableHdf5ArrayTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableHdf5ArrayTest.java
@@ -115,7 +115,6 @@ public void testObjectConstructor() {
         assertEquals(p3.get(0), oa3[0]);
         assertEquals(p3.get(1), oa3[1]);
         assertFalse(a3.isScalar());
-
     }
 
     @Test
@@ -150,7 +149,6 @@ public void testFieldConstructor() throws NoSuchFieldException, SecurityExceptio
         assertNull(a3.getHdf5DataType());
         assertNull(a3.getDimensions());
         assertEquals("persistableList", a3.getFieldName());
-
     }
 
     @Test
@@ -309,7 +307,6 @@ public void testArrayCounter() throws NoSuchFieldException, SecurityException {
         a2.resetArrayLocationCounter();
         location = a2.nextArrayLocation();
         assertTrue(Arrays.equals(new long[] { 0, 0 }, location));
-
     }
 
     @Test
@@ -318,7 +315,6 @@ public void testNewPersistableObject() throws NoSuchFieldException, SecurityExce
             PersistableSample2.class.getDeclaredField("persistableScalar1"));
         Object newObject = a1.newPersistableObject();
         assertEquals(PersistableSample1.class, newObject.getClass());
-
     }
 
     @Test
@@ -344,7 +340,6 @@ public void testDetectionOfPrimitiveScalarFields()
         a2 = new PersistableHdf5Array(
             PersistableSample4.class.getDeclaredField("persistableTest2"));
         assertFalse(a2.areAllFieldsPrimitiveScalar());
-
     }
 
     /**
@@ -380,7 +375,6 @@ public void testReadScalarField()
         assertEquals(pTest1Input, pTest1Result);
 
         H5.H5Gclose(fieldGroupId);
-
     }
 
     @SuppressWarnings("unchecked")
@@ -466,7 +460,6 @@ public void testPersistableObjectInterface() throws HDF5LibraryException, NullPo
         subGroupIds = persistableArray.writePersistableScalarObject(fieldGroupId, fieldName);
         assertEquals(100, subGroupIds.size());
         H5.H5Gclose(fieldGroupId);
-
     }
 
     /**
@@ -556,7 +549,6 @@ public void testObjectWithScalarPrimitiveFields() {
         assertEquals(92.7F, returnedPersistableArray.getFloatScalar(), 1e-7);
         assertEquals(37, returnedPersistableArray.getIntScalar());
         assertEquals("Allons-y", returnedPersistableArray.getStringScalar());
-
     }
 
     /**
@@ -701,7 +693,6 @@ public boolean isBooleanScalar() {
         public void setBooleanScalar(boolean booleanScalar) {
             this.booleanScalar = booleanScalar;
         }
-
     }
 
     /**
@@ -747,7 +738,6 @@ public boolean[] getBooleanArray() {
         public void setBooleanArray(boolean[] booleanArray) {
             this.booleanArray = booleanArray;
         }
-
     }
 
     /**
@@ -766,7 +756,5 @@ public PersistableWithScalarPrimitives[][] getStructArray() {
         public void setStructArray(PersistableWithScalarPrimitives[][] structArray) {
             this.structArray = structArray;
         }
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample1.java b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample1.java
index 050f8d1..26a163a 100644
--- a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample1.java
+++ b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample1.java
@@ -55,7 +55,9 @@ public boolean equals(Object obj) {
             || enumScalar != other.enumScalar) {
             return false;
         }
-        if (!Arrays.equals(floatArray1, other.floatArray1) || !Objects.equals(intList, other.intList) || !Arrays.deepEquals(longArray2, other.longArray2)) {
+        if (!Arrays.equals(floatArray1, other.floatArray1)
+            || !Objects.equals(intList, other.intList)
+            || !Arrays.deepEquals(longArray2, other.longArray2)) {
             return false;
         }
         return true;
@@ -119,5 +121,4 @@ public static PersistableSample1 newInstance(int integerSize, int float1Size1, i
 
         return persistableObject;
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample2.java b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample2.java
index 42b39d6..b3b2d1b 100644
--- a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample2.java
+++ b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample2.java
@@ -43,30 +43,19 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         PersistableSample2 other = (PersistableSample2) obj;
         if (Double.doubleToLongBits(ignoreThisField) != Double
-            .doubleToLongBits(other.ignoreThisField)) {
+            .doubleToLongBits(other.ignoreThisField) || intScalar != other.intScalar
+            || !Arrays.deepEquals(persistableArray2, other.persistableArray2)
+            || !Objects.equals(persistableList, other.persistableList)) {
             return false;
         }
-        if (intScalar != other.intScalar) {
-            return false;
-        }
-        if (!Arrays.deepEquals(persistableArray2, other.persistableArray2)) {
-            return false;
-        }
-        if (!Objects.equals(persistableList, other.persistableList)) {
-            return false;
-        }
-        if (!Objects.equals(persistableScalar1, other.persistableScalar1)) {
-            return false;
-        }
-        if (!Objects.equals(persistableScalar2, other.persistableScalar2)) {
+        if (!Objects.equals(persistableScalar1, other.persistableScalar1) || !Objects.equals(persistableScalar2, other.persistableScalar2)) {
             return false;
         }
         return true;
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample3.java b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample3.java
index 2f746db..5a6ac0b 100644
--- a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample3.java
+++ b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample3.java
@@ -76,29 +76,17 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         PersistableSample3 other = (PersistableSample3) obj;
-        if (boolVar != other.boolVar) {
+        if (boolVar != other.boolVar || !Objects.equals(boxedBoolVar, other.boxedBoolVar)
+            || !Objects.equals(boxedIntVar, other.boxedIntVar) || enumScalar != other.enumScalar) {
             return false;
         }
-        if (!Objects.equals(boxedBoolVar, other.boxedBoolVar)) {
-            return false;
-        }
-        if (!Objects.equals(boxedIntVar, other.boxedIntVar)) {
-            return false;
-        }
-        if (enumScalar != other.enumScalar) {
-            return false;
-        }
-        if (intVar != other.intVar) {
-            return false;
-        }
-        if (!Objects.equals(stringVar, other.stringVar)) {
+        if ((intVar != other.intVar) || !Objects.equals(stringVar, other.stringVar)) {
             return false;
         }
         return true;
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample4.java b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample4.java
index 796a77a..c6f0708 100644
--- a/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample4.java
+++ b/src/test/java/gov/nasa/ziggy/module/hdf5/PersistableSample4.java
@@ -44,20 +44,15 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if ((obj == null) || (getClass() != obj.getClass())) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         PersistableSample4 other = (PersistableSample4) obj;
-        if (!Objects.equals(persistableTest2, other.persistableTest2)) {
-            return false;
-        }
-        if (!Objects.equals(persistableTest3, other.persistableTest3)) {
-            return false;
-        }
-        if (!Arrays.equals(persistableTest3Array, other.persistableTest3Array)) {
+        if (!Objects.equals(persistableTest2, other.persistableTest2)
+            || !Objects.equals(persistableTest3, other.persistableTest3)
+            || !Arrays.equals(persistableTest3Array, other.persistableTest3Array)) {
             return false;
         }
         return true;
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/hdf5/PrimitiveHdf5ArrayTest.java b/src/test/java/gov/nasa/ziggy/module/hdf5/PrimitiveHdf5ArrayTest.java
index ac27884..3544219 100644
--- a/src/test/java/gov/nasa/ziggy/module/hdf5/PrimitiveHdf5ArrayTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/hdf5/PrimitiveHdf5ArrayTest.java
@@ -353,7 +353,6 @@ public void testEmptyToJava() throws NoSuchFieldException, SecurityException {
         assertTrue(List.class.isAssignableFrom(o4.getClass()));
         List<Object> objList = (List<Object>) o4;
         assertEquals(0, objList.size());
-
     }
 
     /**
@@ -404,7 +403,6 @@ public void testWriteAndReadNumericArray()
         intArrayPersistable.read(fieldGroupId);
         assertTrue(
             Arrays.deepEquals((Object[]) intArrayPersistable.arrayObject, (Object[]) intTestArray));
-
     }
 
     /**
@@ -453,7 +451,6 @@ public void testWriteAndReadBooleanArray()
         assertTrue(Arrays.equals((boolean[]) returnedArray, booleanTestArray));
         assertFalse(H5.H5Aexists(fieldGroupId, EMPTY_FIELD_ATT_NAME));
         H5.H5Gclose(fieldGroupId);
-
     }
 
     /**
@@ -579,7 +576,6 @@ public void testReadScalarField()
         Double returnObject = (Double) unboxedField.toJava();
         assertEquals(53.5, returnObject, 0);
         H5.H5Gclose(fieldGroupId);
-
     }
 
     /**
@@ -745,7 +741,6 @@ public void testPutHyperslab() throws NoSuchFieldException, SecurityException {
         hyperslab.putHyperslab(randomArray4);
         aArray = (int[][][]) a.getArrayObject();
         assertTrue(Arrays.equals(randomArray4, aArray));
-
     }
 
     @Test
diff --git a/src/test/java/gov/nasa/ziggy/module/io/matlab/MatlabUtilsTest.java b/src/test/java/gov/nasa/ziggy/module/io/matlab/MatlabUtilsTest.java
index ed262fe..cee2c91 100644
--- a/src/test/java/gov/nasa/ziggy/module/io/matlab/MatlabUtilsTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/io/matlab/MatlabUtilsTest.java
@@ -12,18 +12,35 @@ public class MatlabUtilsTest {
     public void testLinuxMcrPath() {
         MatlabUtils.setOsType(OperatingSystemType.LINUX);
         String mPath = MatlabUtils.mcrPaths("/path/to/mcr/v93");
-        String mPathExpect = "/path/to/mcr/v93/runtime/glnxa64:" + "/path/to/mcr/v93/bin/glnxa64:"
-            + "/path/to/mcr/v93/sys/os/glnxa64:" + "/path/to/mcr/v93/sys/opengl/lib/glnxa64";
+        String mPathExpect = """
+            /path/to/mcr/v93/runtime/glnxa64:\
+            /path/to/mcr/v93/bin/glnxa64:\
+            /path/to/mcr/v93/sys/os/glnxa64:\
+            /path/to/mcr/v93/sys/opengl/lib/glnxa64""";
         assertEquals(mPathExpect, mPath);
     }
 
     @Test
-    public void testOsXMcrPath() {
+    public void testOsXIntelMcrPath() {
         MatlabUtils.setOsType(OperatingSystemType.MAC_OS_X);
+        MatlabUtils.setArchitecture("x86_64");
         String mPath = MatlabUtils.mcrPaths("/path/to/mcr/v93");
-        String mPathExpect = "/path/to/mcr/v93/runtime/maci64:" + "/path/to/mcr/v93/bin/maci64:"
-            + "/path/to/mcr/v93/sys/os/maci64";
+        String mPathExpect = """
+            /path/to/mcr/v93/runtime/maci64:\
+            /path/to/mcr/v93/bin/maci64:\
+            /path/to/mcr/v93/sys/os/maci64""";
         assertEquals(mPathExpect, mPath);
+    }
 
+    @Test
+    public void testOsXM1McrPath() {
+        MatlabUtils.setOsType(OperatingSystemType.MAC_OS_X);
+        MatlabUtils.setArchitecture("aarch");
+        String mPath = MatlabUtils.mcrPaths("/path/to/mcr/v93");
+        String mPathExpect = """
+            /path/to/mcr/v93/runtime/maca64:\
+            /path/to/mcr/v93/bin/maca64:\
+            /path/to/mcr/v93/sys/os/maca64""";
+        assertEquals(mPathExpect, mPath);
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/PbsParametersTest.java b/src/test/java/gov/nasa/ziggy/module/remote/PbsParametersTest.java
index 064116f..0d32ea6 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/PbsParametersTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/PbsParametersTest.java
@@ -2,12 +2,11 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.Set;
+
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 
-import gov.nasa.ziggy.ZiggyPropertyRule;
-
 /**
  * Unit test class for {@link PbsParameters} class.
  *
@@ -19,10 +18,6 @@ public class PbsParametersTest {
     private RemoteNodeDescriptor descriptor;
     private PbsParameters pbsParameters;
 
-    @Rule
-    public ZiggyPropertyRule pleiadesGroupPropertyRule = new ZiggyPropertyRule("pleiades.group",
-        "12345");
-
     @Before
     public void setup() {
         descriptor = RemoteNodeDescriptor.SANDY_BRIDGE;
@@ -93,7 +88,7 @@ public void testSmallTask() {
         assertEquals(RemoteNodeDescriptor.SANDY_BRIDGE, pbsParameters.getArchitecture());
         assertEquals("normal", pbsParameters.getQueueName());
         assertEquals(1, pbsParameters.getRequestedNodeCount());
-        assertEquals(16, pbsParameters.getActiveCoresPerNode());
+        assertEquals(10, pbsParameters.getActiveCoresPerNode());
         assertEquals(2.115, pbsParameters.getEstimatedCost(), 1e-9);
         assertEquals("4:30:00", pbsParameters.getRequestedWallTime());
     }
@@ -200,6 +195,43 @@ public void testBadArchitectureOverride() {
         pbsParameters.populateArchitecture(remoteParameters, 500, SupportedRemoteClusters.NAS);
     }
 
+    /**
+     * Ensure that even when the required wall time is low, neither the DEBUG nor the DEVEL queue is
+     * selected.
+     */
+    @Test
+    public void testSelectQueueSmallJob() {
+        pbsParameters();
+        remoteParameters.setMaxNodes("5");
+        remoteParameters.setSubtaskMaxWallTimeHours(0.5);
+        remoteParameters.setSubtaskTypicalWallTimeHours(0.5);
+        remoteParameters.setGigsPerSubtask(2.0);
+        pbsParameters.populateResourceParameters(remoteParameters, 50);
+        assertEquals(RemoteQueueDescriptor.LOW.getQueueName(), pbsParameters.getQueueName());
+        assertEquals("0:30:00", pbsParameters.getRequestedWallTime());
+    }
+
+    @Test
+    public void testAggregatePbsParameters() {
+        pbsParameters();
+        PbsParameters parameterSet1 = pbsParameters;
+        parameterSet1.populateResourceParameters(remoteParameters, 500);
+        pbsParameters();
+        PbsParameters parameterSet2 = pbsParameters;
+        parameterSet2.populateResourceParameters(remoteParameters, 500);
+        parameterSet2.setActiveCoresPerNode(3);
+        parameterSet2.setRequestedWallTime("20:00:00");
+        parameterSet2.setQueueName("long");
+        Set<PbsParameters> parameterSets = Set.of(parameterSet1, parameterSet2);
+        PbsParameters aggregatedParameters = PbsParameters.aggregatePbsParameters(parameterSets);
+        assertEquals(RemoteNodeDescriptor.SANDY_BRIDGE, aggregatedParameters.getArchitecture());
+        assertEquals("long", aggregatedParameters.getQueueName());
+        assertEquals(5, aggregatedParameters.getActiveCoresPerNode());
+        assertEquals("20:00:00", aggregatedParameters.getRequestedWallTime());
+        assertEquals(24, aggregatedParameters.getRequestedNodeCount());
+        assertEquals(50.76, aggregatedParameters.getEstimatedCost(), 1e-9);
+    }
+
     private void pbsParameters() {
         pbsParameters = remoteParameters.pbsParametersInstance();
         pbsParameters.setMinCoresPerNode(descriptor.getMinCores());
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/QstatMonitorTest.java b/src/test/java/gov/nasa/ziggy/module/remote/QstatMonitorTest.java
index 1feb09a..2683507 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/QstatMonitorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/QstatMonitorTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.module.remote;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.QUEUE_COMMAND_CLASS_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_QUEUE_COMMAND_CLASS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
@@ -30,8 +30,7 @@ public class QstatMonitorTest {
 
     @Rule
     public ZiggyPropertyRule queueCommandClassPropertyRule = new ZiggyPropertyRule(
-        QUEUE_COMMAND_CLASS_PROP_NAME,
-        "gov.nasa.ziggy.module.remote.QueueCommandManagerForUnitTests");
+        REMOTE_QUEUE_COMMAND_CLASS, "gov.nasa.ziggy.module.remote.QueueCommandManagerForUnitTests");
 
     @Before
     public void setup() {
@@ -60,7 +59,6 @@ public void testConstructors() {
         assertEquals("user", monitor.getOwner());
         assertEquals("host1", monitor.getServerName());
         assertSame(cmdManager, monitor.getQstatCommandManager());
-
     }
 
     /**
@@ -298,5 +296,4 @@ public void testUpdateMultipleJobsPerTask() {
         assertEquals(1, exitCommentMap.size());
         assertEquals("crashed and burned", exitCommentMap.get(1234597L));
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/QueueCommandManagerTest.java b/src/test/java/gov/nasa/ziggy/module/remote/QueueCommandManagerTest.java
index b851f44..1be89d8 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/QueueCommandManagerTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/QueueCommandManagerTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.module.remote;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.QUEUE_COMMAND_CLASS_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_QUEUE_COMMAND_CLASS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -31,8 +31,7 @@ public class QueueCommandManagerTest {
 
     @Rule
     public ZiggyPropertyRule queueCommandClassPropertyRule = new ZiggyPropertyRule(
-        QUEUE_COMMAND_CLASS_PROP_NAME,
-        "gov.nasa.ziggy.module.remote.QueueCommandManagerForUnitTests");
+        REMOTE_QUEUE_COMMAND_CLASS, "gov.nasa.ziggy.module.remote.QueueCommandManagerForUnitTests");
 
     @Before
     public void setup() {
@@ -59,7 +58,6 @@ public void testGetQstatInfoByJobName() {
         assertEquals(2, returnedJobs.size());
         assertTrue(returnedJobs.get(0).equals(job1));
         assertTrue(returnedJobs.get(1).equals(job2));
-
     }
 
     /**
@@ -149,7 +147,6 @@ public void testExitComment() {
         // execute the method
         String exitComment = cmdManager.exitComment(9101154L);
         assertTrue(exitComment.equals("test comment"));
-
     }
 
     /**
@@ -196,7 +193,6 @@ public void testDeleteJobsForPipelineTasks() {
         // and task2 job IDs are present, there is an extra space due to null task3 job
         // ID, etc.
         Mockito.verify(cmdManager, Mockito.times(1)).qdel("1234567 7654321 ");
-
     }
 
     /**
@@ -298,5 +294,4 @@ public static void mockQstatCall(QueueCommandManager cmdManager, String command,
         }
         Mockito.doReturn(replies).when(cmdManager).qstat(command, (String[]) null);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/RemoteArchitectureOptimizerTest.java b/src/test/java/gov/nasa/ziggy/module/remote/RemoteArchitectureOptimizerTest.java
index 3fa87a3..7cd0788 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/RemoteArchitectureOptimizerTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/RemoteArchitectureOptimizerTest.java
@@ -69,7 +69,6 @@ public void testOptimizeForCores() {
         descriptor = optimizer.optimalArchitecture(remoteParameters, 0, RemoteNodeDescriptor
             .nodesWithSufficientRam(descriptors, remoteParameters.getGigsPerSubtask()));
         assertEquals(RemoteNodeDescriptor.HASWELL, descriptor);
-
     }
 
     @Test
@@ -85,7 +84,6 @@ public void testOptimizeForCost() {
             RemoteNodeDescriptor.nodesWithSufficientRam(descriptors,
                 remoteParameters.getGigsPerSubtask()));
         assertEquals(RemoteNodeDescriptor.HASWELL, descriptor);
-
     }
 
     @Test
@@ -117,5 +115,4 @@ public void testOptimizeForQueueTime() {
                 remoteParameters.getGigsPerSubtask()));
         assertEquals(RemoteNodeDescriptor.IVY_BRIDGE, descriptor);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/RemoteExecutorTest.java b/src/test/java/gov/nasa/ziggy/module/remote/RemoteExecutorTest.java
index deb79dd..d1cffe5 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/RemoteExecutorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/RemoteExecutorTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.module.remote;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.RESULTS_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.RESULTS_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -52,7 +52,7 @@ public class RemoteExecutorTest {
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
-    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR_PROP_NAME,
+    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR,
         directoryRule);
 
     @Rule
@@ -137,7 +137,6 @@ public void testExecuteAlgorithmFirstIteration() {
         // get called.
         verify(crud, never()).processingSummary(any(long.class));
         verify(parameterSetCrud, never()).retrieveRemoteParameters(any(PipelineTask.class));
-
     }
 
     @Test
@@ -171,7 +170,6 @@ public void testExecuteAlgorithmLaterIteration() {
         checkStateFileValues(gExecutor.pbsParameters, stateFile);
 
         assertEquals(stateFile, gExecutor.monitoredStateFile);
-
     }
 
     private void checkPbsParameterValues(RemoteParameters rParameters, PbsParameters pParameters) {
@@ -226,7 +224,6 @@ private RemoteParameters remoteParametersFromDatabase() {
         parameters.setMinGigsPerNode("101");
         parameters.setMinCoresPerNode("51");
         return parameters;
-
     }
 
     private static class GenericRemoteExecutor extends RemoteExecutor {
@@ -271,9 +268,8 @@ public void setProcessingSummaryOperations(ProcessingSummaryOperations crud) {
         }
 
         @Override
-        protected void submitForExecution(StateFile stateFile) throws Exception {
-            // do nothing
+        protected void submitForExecution(StateFile stateFile) {
+            addToMonitor(stateFile);
         }
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/RemoteNodeDescriptorTest.java b/src/test/java/gov/nasa/ziggy/module/remote/RemoteNodeDescriptorTest.java
index 7a3c5ef..1a88232 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/RemoteNodeDescriptorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/RemoteNodeDescriptorTest.java
@@ -34,7 +34,6 @@ public void testSelectArchitecture() {
             RemoteNodeDescriptor.selectArchitecture(SupportedRemoteClusters.NAS, 25));
         assertEquals(RemoteNodeDescriptor.R5,
             RemoteNodeDescriptor.selectArchitecture(SupportedRemoteClusters.AWS, 25));
-
     }
 
     @Test
@@ -56,7 +55,6 @@ public void testDescriptorsSortedByCost() {
         assertEquals(RemoteNodeDescriptor.C5, descriptors.get(0));
         assertEquals(RemoteNodeDescriptor.M5, descriptors.get(1));
         assertEquals(RemoteNodeDescriptor.R5, descriptors.get(2));
-
     }
 
     @Test
@@ -79,7 +77,6 @@ public void testDescriptorsSortedByRamThenCost() {
         assertEquals(RemoteNodeDescriptor.C5, descriptors.get(0));
         assertEquals(RemoteNodeDescriptor.M5, descriptors.get(1));
         assertEquals(RemoteNodeDescriptor.R5, descriptors.get(2));
-
     }
 
     @Test
@@ -94,7 +91,6 @@ public void testNodesWithSufficientRam() {
         assertEquals(RemoteNodeDescriptor.BROADWELL, acceptableDescriptors.get(2));
         assertEquals(RemoteNodeDescriptor.SKYLAKE, acceptableDescriptors.get(3));
         assertEquals(RemoteNodeDescriptor.HASWELL, acceptableDescriptors.get(4));
-
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -102,7 +98,6 @@ public void testNoNodesHaveSufficientRam() {
         List<RemoteNodeDescriptor> descriptors = RemoteNodeDescriptor
             .descriptorsSortedByRamThenCost(SupportedRemoteClusters.NAS);
         RemoteNodeDescriptor.nodesWithSufficientRam(descriptors, 1000.0);
-
     }
 
     @Test
@@ -118,5 +113,4 @@ public void testGetMaxGigs() {
         assertEquals(384, RemoteNodeDescriptor.M5.getMaxGigs());
         assertEquals(768, RemoteNodeDescriptor.R5.getMaxGigs());
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/TimestampFileTest.java b/src/test/java/gov/nasa/ziggy/module/remote/TimestampFileTest.java
index cf60c57..7a5567a 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/TimestampFileTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/TimestampFileTest.java
@@ -48,6 +48,5 @@ public void test() throws IOException {
         long actualTime = TimestampFile.timestamp(directory, TimestampFile.Event.QUEUED_PBS);
 
         assertEquals("timestamp", timeMillis, actualTime);
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/aws/AwsExecutorTest.java b/src/test/java/gov/nasa/ziggy/module/remote/aws/AwsExecutorTest.java
index 70e4032..9a75083 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/aws/AwsExecutorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/aws/AwsExecutorTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.module.remote.aws;
 
-import static gov.nasa.ziggy.module.remote.RemoteExecutionProperties.GROUP_PROPERTY;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_GROUP;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Rule;
@@ -21,7 +21,7 @@
 public class AwsExecutorTest {
 
     @Rule
-    public ZiggyPropertyRule groupPropertyRule = new ZiggyPropertyRule(GROUP_PROPERTY, "12345");
+    public ZiggyPropertyRule groupPropertyRule = new ZiggyPropertyRule(REMOTE_GROUP, "12345");
 
     @Test
     public void testGeneratePbsParameters() {
@@ -130,7 +130,5 @@ public void testGeneratePbsParameters() {
         assertEquals("12345", pbsParameters.getRemoteGroup());
         assertEquals("4:30:00", pbsParameters.getRequestedWallTime());
         assertEquals(4100.544, pbsParameters.getEstimatedCost(), 1e-9);
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/nas/NasExecutorTest.java b/src/test/java/gov/nasa/ziggy/module/remote/nas/NasExecutorTest.java
index 4a66716..6392eaa 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/nas/NasExecutorTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/nas/NasExecutorTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.module.remote.nas;
 
-import static gov.nasa.ziggy.module.remote.RemoteExecutionProperties.GROUP_PROPERTY;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_GROUP;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -21,7 +21,7 @@
 public class NasExecutorTest {
 
     @Rule
-    public ZiggyPropertyRule groupPropertyRule = new ZiggyPropertyRule(GROUP_PROPERTY, "12345");
+    public ZiggyPropertyRule groupPropertyRule = new ZiggyPropertyRule(REMOTE_GROUP, "12345");
 
     @Test
     public void testGeneratePbsParameters() {
@@ -46,7 +46,5 @@ public void testGeneratePbsParameters() {
         assertEquals(3, pbsParameters.getRequestedNodeCount());
         assertEquals(10.8, pbsParameters.getEstimatedCost(), 1e-9);
         assertEquals("12345", pbsParameters.getRemoteGroup());
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/nas/NasQueueTimeMetricsTest.java b/src/test/java/gov/nasa/ziggy/module/remote/nas/NasQueueTimeMetricsTest.java
index 377b8a7..53b784d 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/nas/NasQueueTimeMetricsTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/nas/NasQueueTimeMetricsTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.module.remote.nas;
 
 import static gov.nasa.ziggy.ZiggyUnitTestUtils.TEST_DATA;
-import static gov.nasa.ziggy.services.config.PropertyNames.NASA_DIRECTORATE_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_NASA_DIRECTORATE;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -31,7 +31,7 @@ public class NasQueueTimeMetricsTest {
 
     @Rule
     public ZiggyPropertyRule nasaDirectoratePropertyRule = new ZiggyPropertyRule(
-        NASA_DIRECTORATE_PROP_NAME, (String) null);
+        REMOTE_NASA_DIRECTORATE, (String) null);
 
     @Before
     public void setup() {
@@ -45,7 +45,7 @@ public void setup() {
 
     @Test
     public void testArmdMetrics() {
-        System.setProperty(NASA_DIRECTORATE_PROP_NAME, "ARMD");
+        System.setProperty(REMOTE_NASA_DIRECTORATE.property(), "ARMD");
         instance.populate(QS_MOCK_OUTPUT_FILE);
         testValues(RemoteNodeDescriptor.SANDY_BRIDGE, 53.8, 1.0);
         testValues(RemoteNodeDescriptor.IVY_BRIDGE, 197.5, 122.4);
@@ -58,7 +58,7 @@ public void testArmdMetrics() {
 
     @Test
     public void testHeomdMetrics() {
-        System.setProperty(NASA_DIRECTORATE_PROP_NAME, "HEOMD");
+        System.setProperty(REMOTE_NASA_DIRECTORATE.property(), "HEOMD");
         instance.populate(QS_MOCK_OUTPUT_FILE);
         testValues(RemoteNodeDescriptor.SANDY_BRIDGE, 278.4, 2.0);
         testValues(RemoteNodeDescriptor.IVY_BRIDGE, 218.9, 2.6);
@@ -71,7 +71,7 @@ public void testHeomdMetrics() {
 
     @Test
     public void testSmdMetrics() {
-        System.setProperty(NASA_DIRECTORATE_PROP_NAME, "SMD");
+        System.setProperty(REMOTE_NASA_DIRECTORATE.property(), "SMD");
         instance.populate(QS_MOCK_OUTPUT_FILE);
         testValues(RemoteNodeDescriptor.SANDY_BRIDGE, 175.7, 15.6);
         testValues(RemoteNodeDescriptor.IVY_BRIDGE, 199.8, 31.7);
diff --git a/src/test/java/gov/nasa/ziggy/module/remote/nas/RemoteExecutionPropertiesTest.java b/src/test/java/gov/nasa/ziggy/module/remote/nas/RemoteExecutionPropertiesTest.java
index 83662cd..fb496cf 100644
--- a/src/test/java/gov/nasa/ziggy/module/remote/nas/RemoteExecutionPropertiesTest.java
+++ b/src/test/java/gov/nasa/ziggy/module/remote/nas/RemoteExecutionPropertiesTest.java
@@ -1,8 +1,8 @@
 package gov.nasa.ziggy.module.remote.nas;
 
-import static gov.nasa.ziggy.module.remote.RemoteExecutionProperties.GROUP_PROPERTY;
-import static gov.nasa.ziggy.module.remote.RemoteExecutionProperties.HOST_PROPERTY;
-import static gov.nasa.ziggy.module.remote.RemoteExecutionProperties.USER_PROPERTY;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_GROUP;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_HOST;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_USER;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -11,6 +11,7 @@
 
 import gov.nasa.ziggy.ZiggyPropertyRule;
 import gov.nasa.ziggy.module.remote.RemoteExecutionProperties;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 
 /**
  * Tests the {@link RemoteExecutionProperties} and {@link NasProperties} classes.
@@ -20,32 +21,32 @@
 public class RemoteExecutionPropertiesTest {
 
     @Rule
-    public ZiggyPropertyRule groupPropertyRule = new ZiggyPropertyRule(GROUP_PROPERTY,
-        (String) null);
+    public ZiggyPropertyRule groupPropertyRule = new ZiggyPropertyRule(REMOTE_GROUP, "g1");
 
     @Rule
-    public ZiggyPropertyRule hostPropertyRule = new ZiggyPropertyRule(HOST_PROPERTY, (String) null);
+    public ZiggyPropertyRule hostPropertyRule = new ZiggyPropertyRule(REMOTE_HOST, "h1;h2");
 
     @Rule
-    public ZiggyPropertyRule userPropertyRule = new ZiggyPropertyRule(USER_PROPERTY, (String) null);
+    public ZiggyPropertyRule userPropertyRule = new ZiggyPropertyRule(REMOTE_USER, "u1");
 
     @Test
     public void testPropertiesRetrieval() {
 
-        // Start with tests that involve setting the value and retrieving it
-        System.setProperty(RemoteExecutionProperties.HOST_PROPERTY, "h1;h2");
-        System.setProperty(RemoteExecutionProperties.USER_PROPERTY, "u1");
-        System.setProperty(RemoteExecutionProperties.GROUP_PROPERTY, "g1");
-
         assertTrue(RemoteExecutionProperties.getUser().equals("u1"));
         assertTrue(RemoteExecutionProperties.getGroup().equals("g1"));
         String[] hosts = RemoteExecutionProperties.getHost();
         assertEquals(2, hosts.length);
         assertTrue(hosts[0].equals("h1"));
         assertTrue(hosts[1].equals("h2"));
-        System.clearProperty(RemoteExecutionProperties.GROUP_PROPERTY);
-        System.clearProperty(RemoteExecutionProperties.HOST_PROPERTY);
-        System.clearProperty(RemoteExecutionProperties.USER_PROPERTY);
+    }
+
+    @Test
+    public void testEmptyPropertiesRetrieval() {
+
+        // This clears properties set by rules, and ensures that ZiggyConfiguration doesn't read the
+        // user's property file.
+        ZiggyConfiguration.reset();
+        ZiggyConfiguration.getMutableInstance();
 
         assertTrue(RemoteExecutionProperties.getUser().isEmpty());
         assertTrue(RemoteExecutionProperties.getGroup().isEmpty());
diff --git a/src/test/java/gov/nasa/ziggy/parameters/ParameterLibraryTest.java b/src/test/java/gov/nasa/ziggy/parameters/ParameterLibraryTest.java
index fce5d78..1effd8e 100644
--- a/src/test/java/gov/nasa/ziggy/parameters/ParameterLibraryTest.java
+++ b/src/test/java/gov/nasa/ziggy/parameters/ParameterLibraryTest.java
@@ -18,6 +18,7 @@
 import org.junit.Test;
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
+import gov.nasa.ziggy.util.io.FileUtil;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.SchemaOutputResolver;
@@ -48,7 +49,8 @@ public void setUp() {
     public void testGenerateSchema() throws JAXBException, IOException {
         JAXBContext context = JAXBContext.newInstance(ParameterLibrary.class);
         context.generateSchema(new ParamLibSchemaResolver());
-        List<String> schemaContent = Files.readAllLines(schemaFile.toPath());
+        List<String> schemaContent = Files.readAllLines(schemaFile.toPath(),
+            FileUtil.ZIGGY_CHARSET);
 
         assertContains(schemaContent,
             "<xs:element name=\"parameterLibrary\" type=\"parameterLibrary\"/>");
@@ -58,18 +60,12 @@ public void testGenerateSchema() throws JAXBException, IOException {
         assertContains(complexTypeContent,
             "<xs:element name=\"parameter-set\" type=\"parameterSet\" minOccurs=\"0\" maxOccurs=\"unbounded\"/>");
         assertContains(complexTypeContent, "<xs:attribute name=\"release\" type=\"xs:string\"/>");
-        assertContains(complexTypeContent,
-            "<xs:attribute name=\"repository-revision\" type=\"xs:string\"/>");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"database-user\" type=\"xs:string\"/>");
-        assertContains(complexTypeContent,
-            "<xs:attribute name=\"build-date\" type=\"xs:anySimpleType\"/>");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"override-only\" type=\"xs:boolean\"/>");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"database-url\" type=\"xs:string\"/>");
-        assertContains(complexTypeContent,
-            "<xs:attribute name=\"repository-branch\" type=\"xs:string\"/> ");
 
         complexTypeContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"parameterSet\">");
@@ -77,8 +73,6 @@ public void testGenerateSchema() throws JAXBException, IOException {
             "<xs:element name=\"parameter\" type=\"parameter\" minOccurs=\"0\" maxOccurs=\"unbounded\"/>");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"name\" type=\"xs:string\" use=\"required\"/>");
-        assertContains(complexTypeContent, "<xs:attribute name=\"version\" type=\"xs:int\"/>");
-        assertContains(complexTypeContent, "<xs:attribute name=\"locked\" type=\"xs:boolean\"/>");
         assertContains(complexTypeContent, "<xs:attribute name=\"classname\" type=\"xs:string\"/>");
 
         complexTypeContent = complexTypeContent(schemaContent,
@@ -88,7 +82,6 @@ public void testGenerateSchema() throws JAXBException, IOException {
         assertContains(complexTypeContent,
             "<xs:attribute name=\"value\" type=\"xs:string\" use=\"required\"/>");
         assertContains(complexTypeContent, "<xs:attribute name=\"type\" type=\"xs:string\"/>");
-
     }
 
     @Test
@@ -108,7 +101,5 @@ public Result createOutput(String namespaceUri, String suggestedFileName)
             result.setSystemId(schemaFile.toURI().toURL().toString());
             return result;
         }
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/parameters/ParameterSetDescriptorTest.java b/src/test/java/gov/nasa/ziggy/parameters/ParameterSetDescriptorTest.java
index a046a74..39b3973 100644
--- a/src/test/java/gov/nasa/ziggy/parameters/ParameterSetDescriptorTest.java
+++ b/src/test/java/gov/nasa/ziggy/parameters/ParameterSetDescriptorTest.java
@@ -1,12 +1,17 @@
 package gov.nasa.ziggy.parameters;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.junit.Test;
 
 import gov.nasa.ziggy.collections.ZiggyDataType;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 
@@ -17,36 +22,152 @@
  */
 public class ParameterSetDescriptorTest {
 
-    @Test(expected = IllegalStateException.class)
+    @Test(expected = NumberFormatException.class)
     public void testValidationFailureDataTypes() {
-        DefaultParameters parameters = new DefaultParameters();
         Set<TypedParameter> typedProperties = new HashSet<>();
         typedProperties.add(new TypedParameter("badParameter", "string", ZiggyDataType.ZIGGY_INT));
-        parameters.setParameters(typedProperties);
+        ParameterSet parameterSet = new ParameterSet();
+        parameterSet.setTypedParameters(typedProperties);
         ParameterSetDescriptor desc = new ParameterSetDescriptor("test",
-            "gov.nasa.ziggy.parameters.DefaultParameters");
-        desc.setImportedParamsBean(new BeanWrapper<>(parameters));
+            "gov.nasa.ziggy.parameters.Parameters");
+        desc.setParameterSet(parameterSet);
         desc.validate();
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testValidateAgainstParameterSetException() {
-        DefaultParameters parameters = new DefaultParameters();
         Set<TypedParameter> typedProperties = new HashSet<>();
         typedProperties
             .add(new TypedParameter("badParameter", "string", ZiggyDataType.ZIGGY_STRING));
-        parameters.setParameters(typedProperties);
         ParameterSetDescriptor desc = new ParameterSetDescriptor("test",
-            "gov.nasa.ziggy.parameters.DefaultParameters");
-        desc.setImportedParamsBean(new BeanWrapper<>(parameters));
-        DefaultParameters parameters2 = new DefaultParameters();
+            "gov.nasa.ziggy.parameters.Parameters");
+        ParameterSet parameterSet = new ParameterSet();
+        parameterSet.setTypedParameters(typedProperties);
+        desc.setParameterSet(parameterSet);
+
         Set<TypedParameter> newProperties = new HashSet<>();
         newProperties
             .add(new TypedParameter("mismatchedParameter", "string", ZiggyDataType.ZIGGY_STRING));
-        parameters2.setParameters(newProperties);
+        ParameterSet parameterSet2 = new ParameterSet();
+        parameterSet2.setTypedParameters(newProperties);
+        desc.validateAgainstParameterSet(parameterSet2);
+    }
+
+    /**
+     * Tests that any {@link TypedParameter} instances that need an update of their type and/or
+     * scalar values, get that update.
+     */
+    @Test
+    public void testTypedParameterUpdate() {
+
+        // Start with a Parameters instance.
+        Set<TypedParameter> typedProperties = new HashSet<>();
+        typedProperties.add(new TypedParameter("f1", "100", ZiggyDataType.ZIGGY_INT, true));
+        typedProperties
+            .add(new TypedParameter("f2", "100.5, 100.6", ZiggyDataType.ZIGGY_FLOAT, false));
+        ParameterSetDescriptor desc = new ParameterSetDescriptor("test",
+            "gov.nasa.ziggy.parameters.Parameters");
+        ParameterSet parameterSet = new ParameterSet();
+        parameterSet.setTypedParameters(typedProperties);
+        desc.setParameterSet(parameterSet);
+        ParametersOperations ops = new ParametersOperations();
+        Map<String, TypedParameter> originalParameters = ops
+            .nameToTypedPropertyMap(typedProperties);
+        Map<String, TypedParameter> descriptorParameters = ops
+            .nameToTypedPropertyMap(desc.getParameterSet().getTypedParameters());
+        assertEquals(originalParameters.size(), descriptorParameters.size());
+        for (Map.Entry<String, TypedParameter> entry : originalParameters.entrySet()) {
+            TypedParameter updatedParameter = descriptorParameters.get(entry.getKey());
+            assertNotNull(updatedParameter);
+            TypedParameter originalParameter = entry.getValue();
+            assertEquals(originalParameter.getName(), updatedParameter.getName());
+            assertEquals(originalParameter.getString(), updatedParameter.getString());
+            assertEquals(originalParameter.getDataType(), updatedParameter.getDataType());
+            assertEquals(originalParameter.isScalar(), updatedParameter.isScalar());
+        }
+
+        // Now for a subclass that has typed fields.
+        desc = new ParameterSetDescriptor("test",
+            "gov.nasa.ziggy.parameters.ParameterSetDescriptorTest$ParWithFields");
+        typedProperties.clear();
+        typedProperties.add(new TypedParameter("f1", "100"));
+        typedProperties.add(new TypedParameter("f2", "100.5, 100.6"));
+        parameterSet = new ParameterSet();
+        parameterSet.setTypedParameters(typedProperties);
+        desc.setParameterSet(parameterSet);
+        originalParameters = ops.nameToTypedPropertyMap(typedProperties);
+        descriptorParameters = ops
+            .nameToTypedPropertyMap(desc.getParameterSet().getTypedParameters());
+        assertEquals(originalParameters.size(), descriptorParameters.size());
+        assertEquals(2, originalParameters.size());
+
+        TypedParameter par = originalParameters.get("f1");
+        assertEquals(ZiggyDataType.ZIGGY_STRING, par.getDataType());
+        assertTrue(par.isScalar());
+        par = originalParameters.get("f2");
+        assertEquals(ZiggyDataType.ZIGGY_STRING, par.getDataType());
+        assertTrue(par.isScalar());
+
+        par = descriptorParameters.get("f1");
+        assertEquals(ZiggyDataType.ZIGGY_INT, par.getDataType());
+        assertTrue(par.isScalar());
+        par = descriptorParameters.get("f2");
+        assertEquals(ZiggyDataType.ZIGGY_FLOAT, par.getDataType());
+        assertFalse(par.isScalar());
+
+        // Now for a collection of TypedParameter instances that doesn't cover all of the
+        // class fields.
+        desc = new ParameterSetDescriptor("test",
+            "gov.nasa.ziggy.parameters.ParameterSetDescriptorTest$ParWithFields");
+        typedProperties.clear();
+        typedProperties.add(new TypedParameter("f1", "100"));
+        parameterSet = new ParameterSet();
+        parameterSet.setTypedParameters(typedProperties);
+        desc.setParameterSet(parameterSet);
+        originalParameters = ops.nameToTypedPropertyMap(typedProperties);
+        descriptorParameters = ops
+            .nameToTypedPropertyMap(desc.getParameterSet().getTypedParameters());
+        assertEquals(2, descriptorParameters.size());
+        assertEquals(1, originalParameters.size());
+        par = originalParameters.get("f1");
+        assertEquals(ZiggyDataType.ZIGGY_STRING, par.getDataType());
+        assertTrue(par.isScalar());
+
+        par = descriptorParameters.get("f1");
+        assertEquals(ZiggyDataType.ZIGGY_INT, par.getDataType());
+        assertTrue(par.isScalar());
+        par = descriptorParameters.get("f2");
+        assertEquals(ZiggyDataType.ZIGGY_FLOAT, par.getDataType());
+        assertFalse(par.isScalar());
+    }
+
+    /**
+     * Tests that the correct exception occurs if the data type of a field and the value that wants
+     * to go into that field are mismatched.
+     */
+    @Test(expected = IllegalStateException.class)
+    public void testTypedParameterMismatch() {
+        ParameterSetDescriptor desc = new ParameterSetDescriptor("test",
+            "gov.nasa.ziggy.parameters.ParameterSetDescriptorTest$ParWithFields");
         ParameterSet parameterSet = new ParameterSet();
-        parameterSet.setParameters(new BeanWrapper<>(parameters2));
-        desc.validateAgainstParameterSet(parameterSet);
+        Set<TypedParameter> typedProperties = new HashSet<>();
+        typedProperties.add(new TypedParameter("f1", "100"));
+        typedProperties.add(new TypedParameter("f2", "Tanar of Pellucidar"));
+        parameterSet.setTypedParameters(typedProperties);
+        desc.setParameterSet(parameterSet);
     }
 
+    public static class ParWithFields extends Parameters {
+
+        private int f1;
+        private float[] f2;
+
+        public int getF1() {
+            return f1;
+        }
+
+        public float[] getF2() {
+            return f2;
+        }
+    }
 }
diff --git a/src/test/java/gov/nasa/ziggy/parameters/ParameterTestClasses.java b/src/test/java/gov/nasa/ziggy/parameters/ParameterTestClasses.java
index a0049f7..4e1e022 100644
--- a/src/test/java/gov/nasa/ziggy/parameters/ParameterTestClasses.java
+++ b/src/test/java/gov/nasa/ziggy/parameters/ParameterTestClasses.java
@@ -1,10 +1,30 @@
 package gov.nasa.ziggy.parameters;
 
+import gov.nasa.ziggy.collections.ZiggyDataType;
 import gov.nasa.ziggy.module.io.Persistable;
-
+import gov.nasa.ziggy.pipeline.definition.TypedParameter;
+
+/**
+ * Test parameter classes.
+ * <p>
+ * Note that these classes were originally written for the Spiffy parameter API, in which parameter
+ * classes conformed to the design rules for Java Beans and used bean utilities to manage the
+ * interchange between the database and the Java objects. The Ziggy parameter API uses
+ * {@link TypedParameter} instances as the definitive representation of the parameter values, and
+ * the parameter fields are populated from the TypedParameter collection but the TypedParameter
+ * collection never gets populated from the parameter fields. In general this relies on the
+ * parameters being imported from XML and then saved to the database, in which case the management
+ * of the two representations is automagically handled. For these test classes, the parameter values
+ * don't get imported from XML and the class instances are often constructed rather than retrieved,
+ * so it was necessary to modify the classes such that the TypedParameter collection is correctly
+ * constructed and populated, and such that the field setters automatically propagate new values to
+ * the TypedParameter collection.
+ *
+ * @author PT
+ */
 public class ParameterTestClasses {
 
-    public static class TestParameters implements Parameters {
+    public static class TestParameters extends Parameters {
         private boolean booleanValue;
         private long longValue;
         private int intValue;
@@ -14,6 +34,14 @@ public static class TestParameters implements Parameters {
         private String[] stringArray;
 
         public TestParameters() {
+            addParameter(
+                new TypedParameter("booleanValue", "false", ZiggyDataType.ZIGGY_BOOLEAN, true));
+            addParameter(new TypedParameter("longValue", "0", ZiggyDataType.ZIGGY_LONG, true));
+            addParameter(new TypedParameter("intValue", "0", ZiggyDataType.ZIGGY_INT, true));
+            addParameter(new TypedParameter("intArray", "", ZiggyDataType.ZIGGY_INT, false));
+            addParameter(new TypedParameter("doubleValue", "0", ZiggyDataType.ZIGGY_DOUBLE, true));
+            addParameter(new TypedParameter("stringValue", "", ZiggyDataType.ZIGGY_STRING, true));
+            addParameter(new TypedParameter("stringArray", "", ZiggyDataType.ZIGGY_STRING, false));
         }
 
         public boolean isBooleanValue() {
@@ -21,7 +49,7 @@ public boolean isBooleanValue() {
         }
 
         public void setBooleanValue(boolean booleanValue) {
-            this.booleanValue = booleanValue;
+            updateParameter("booleanValue", ZiggyDataType.objectToString(booleanValue));
         }
 
         public long getLongValue() {
@@ -29,7 +57,7 @@ public long getLongValue() {
         }
 
         public void setLongValue(long longValue) {
-            this.longValue = longValue;
+            updateParameter("longValue", ZiggyDataType.objectToString(longValue));
         }
 
         public int getIntValue() {
@@ -37,7 +65,7 @@ public int getIntValue() {
         }
 
         public void setIntValue(int intValue) {
-            this.intValue = intValue;
+            updateParameter("intValue", ZiggyDataType.objectToString(intValue));
         }
 
         public int[] getIntArray() {
@@ -45,7 +73,7 @@ public int[] getIntArray() {
         }
 
         public void setIntArray(int[] intArray) {
-            this.intArray = intArray;
+            updateParameter("intArray", ZiggyDataType.objectToString(intArray));
         }
 
         public double getDoubleValue() {
@@ -53,7 +81,7 @@ public double getDoubleValue() {
         }
 
         public void setDoubleValue(double doubleValue) {
-            this.doubleValue = doubleValue;
+            updateParameter("doubleValue", ZiggyDataType.objectToString(doubleValue));
         }
 
         public String getStringValue() {
@@ -61,7 +89,7 @@ public String getStringValue() {
         }
 
         public void setStringValue(String stringValue) {
-            this.stringValue = stringValue;
+            updateParameter("stringValue", ZiggyDataType.objectToString(stringValue));
         }
 
         public String[] getStringArray() {
@@ -69,17 +97,21 @@ public String[] getStringArray() {
         }
 
         public void setStringArray(String[] stringArray) {
-            this.stringArray = stringArray;
+            updateParameter("stringArray", ZiggyDataType.objectToString(stringArray));
         }
     }
 
-    public static class TestParametersBaz implements Parameters {
+    public static class TestParametersBaz extends Parameters {
         private int baz1;
         private boolean baz2;
         private String baz3;
         private String[] baz4;
 
         public TestParametersBaz() {
+            addParameter(new TypedParameter("baz1", "0", ZiggyDataType.ZIGGY_INT, true));
+            addParameter(new TypedParameter("baz2", "false", ZiggyDataType.ZIGGY_BOOLEAN, true));
+            addParameter(new TypedParameter("baz3", "", ZiggyDataType.ZIGGY_STRING, true));
+            addParameter(new TypedParameter("baz4", "", ZiggyDataType.ZIGGY_STRING, false));
         }
 
         public int getBaz1() {
@@ -87,7 +119,7 @@ public int getBaz1() {
         }
 
         public void setBaz1(int baz1) {
-            this.baz1 = baz1;
+            updateParameter("baz1", ZiggyDataType.objectToString(baz1));
         }
 
         public boolean isBaz2() {
@@ -95,7 +127,7 @@ public boolean isBaz2() {
         }
 
         public void setBaz2(boolean baz2) {
-            this.baz2 = baz2;
+            updateParameter("baz2", ZiggyDataType.objectToString(baz2));
         }
 
         public String getBaz3() {
@@ -103,7 +135,7 @@ public String getBaz3() {
         }
 
         public void setBaz3(String baz3) {
-            this.baz3 = baz3;
+            updateParameter("baz3", ZiggyDataType.objectToString(baz3));
         }
 
         public String[] getBaz4() {
@@ -111,22 +143,26 @@ public String[] getBaz4() {
         }
 
         public void setBaz4(String[] baz4) {
-            this.baz4 = baz4;
+            updateParameter("baz4", ZiggyDataType.objectToString(baz4));
         }
     }
 
-    public static class TestParametersBar implements Persistable, Parameters {
+    public static class TestParametersBar extends Parameters implements Persistable {
         private float bar1;
         private double bar2;
         private short bar3;
 
         public TestParametersBar() {
+            addParameter(new TypedParameter("bar1", "0", ZiggyDataType.ZIGGY_FLOAT, true));
+            addParameter(new TypedParameter("bar2", "0", ZiggyDataType.ZIGGY_DOUBLE, true));
+            addParameter(new TypedParameter("bar3", "0", ZiggyDataType.ZIGGY_SHORT, true));
         }
 
         public TestParametersBar(float bar1, double bar2, short bar3) {
-            this.bar1 = bar1;
-            this.bar2 = bar2;
-            this.bar3 = bar3;
+            this();
+            setBar1(bar1);
+            setBar2(bar2);
+            setBar3(bar3);
         }
 
         public float getBar1() {
@@ -134,7 +170,7 @@ public float getBar1() {
         }
 
         public void setBar1(float bar1) {
-            this.bar1 = bar1;
+            updateParameter("bar1", ZiggyDataType.objectToString(bar1));
         }
 
         public double getBar2() {
@@ -142,7 +178,7 @@ public double getBar2() {
         }
 
         public void setBar2(double bar2) {
-            this.bar2 = bar2;
+            updateParameter("bar2", ZiggyDataType.objectToString(bar2));
         }
 
         public short getBar3() {
@@ -150,24 +186,29 @@ public short getBar3() {
         }
 
         public void setBar3(short bar3) {
-            this.bar3 = bar3;
+            updateParameter("bar3", ZiggyDataType.objectToString(bar3));
         }
     }
 
-    public static class TestParametersFoo implements Persistable, Parameters {
+    public static class TestParametersFoo extends Parameters implements Persistable {
         private int foo1;
         private boolean foo2;
         private String foo3;
         private String[] foo4;
 
         public TestParametersFoo() {
+            addParameter(new TypedParameter("foo1", "0", ZiggyDataType.ZIGGY_INT, true));
+            addParameter(new TypedParameter("foo2", "0", ZiggyDataType.ZIGGY_BOOLEAN, true));
+            addParameter(new TypedParameter("foo3", "", ZiggyDataType.ZIGGY_STRING, true));
+            addParameter(new TypedParameter("foo4", "", ZiggyDataType.ZIGGY_STRING, false));
         }
 
         public TestParametersFoo(int foo1, boolean foo2, String foo3, String[] foo4) {
-            this.foo1 = foo1;
-            this.foo2 = foo2;
-            this.foo3 = foo3;
-            this.foo4 = foo4;
+            this();
+            setFoo1(foo1);
+            setFoo2(foo2);
+            setFoo3(foo3);
+            setFoo4(foo4);
         }
 
         public int getFoo1() {
@@ -175,7 +216,7 @@ public int getFoo1() {
         }
 
         public void setFoo1(int foo1) {
-            this.foo1 = foo1;
+            updateParameter("foo1", ZiggyDataType.objectToString(foo1));
         }
 
         public boolean isFoo2() {
@@ -183,7 +224,7 @@ public boolean isFoo2() {
         }
 
         public void setFoo2(boolean foo2) {
-            this.foo2 = foo2;
+            updateParameter("foo2", ZiggyDataType.objectToString(foo2));
         }
 
         public String getFoo3() {
@@ -191,7 +232,7 @@ public String getFoo3() {
         }
 
         public void setFoo3(String foo3) {
-            this.foo3 = foo3;
+            updateParameter("foo3", ZiggyDataType.objectToString(foo3));
         }
 
         public String[] getFoo4() {
@@ -199,8 +240,7 @@ public String[] getFoo4() {
         }
 
         public void setFoo4(String[] foo4) {
-            this.foo4 = foo4;
+            updateParameter("foo4", ZiggyDataType.objectToString(foo4));
         }
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/parameters/ParametersOperationsTest.java b/src/test/java/gov/nasa/ziggy/parameters/ParametersOperationsTest.java
index ace5654..8d7ed0c 100644
--- a/src/test/java/gov/nasa/ziggy/parameters/ParametersOperationsTest.java
+++ b/src/test/java/gov/nasa/ziggy/parameters/ParametersOperationsTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.parameters;
 
 import static gov.nasa.ziggy.ZiggyUnitTestUtils.TEST_DATA;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
@@ -17,12 +17,16 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import gov.nasa.ziggy.IntegrationTestCategory;
 import gov.nasa.ziggy.ReflectionEquals;
 import gov.nasa.ziggy.ZiggyDatabaseRule;
 import gov.nasa.ziggy.ZiggyDirectoryRule;
@@ -36,17 +40,16 @@
 import gov.nasa.ziggy.parameters.ParameterTestClasses.TestParametersFoo;
 import gov.nasa.ziggy.pipeline.PipelineConfigurator;
 import gov.nasa.ziggy.pipeline.PipelineOperations;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
 import gov.nasa.ziggy.pipeline.definition.TypedParameter;
 import gov.nasa.ziggy.pipeline.definition.crud.ParameterSetCrud;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
-import jakarta.xml.bind.UnmarshalException;
 
 /**
  * @author Todd Klaus
  */
+@Category(IntegrationTestCategory.class)
 public class ParametersOperationsTest {
     private static final String TEST_PARAMETERS = "testParameters";
     private static final String TEST_PARAMETERS_FOO = "testParametersFoo";
@@ -67,8 +70,8 @@ public class ParametersOperationsTest {
     public ZiggyDatabaseRule databaseRule = new ZiggyDatabaseRule();
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, DirectoryProperties.ziggyCodeBuildDir().toString());
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
 
     @Before
     public void setUp() {
@@ -99,7 +102,7 @@ private void modifyLibrary() {
         // delete a param set to trigger CREATE
         ParameterSetCrud paramCrud = new ParameterSetCrud();
         ParameterSet fooPs = paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_FOO);
-        paramCrud.delete(fooPs);
+        paramCrud.remove(fooPs);
 
         // modify a param set to trigger UPDATE
         ParameterSet barPs = paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_BAR);
@@ -120,6 +123,11 @@ private void exportLibrary(List<String> excludeList) throws IOException {
             ParamIoMode.STANDARD);
     }
 
+    private List<ParameterSetDescriptor> sortDescriptorsByName(
+        List<ParameterSetDescriptor> unsorted) {
+        return unsorted.stream().sorted().collect(Collectors.toList());
+    }
+
     @Test
     public void testRoundTrip() throws Exception {
         ParametersOperations paramOps = new ParametersOperations();
@@ -165,23 +173,26 @@ public void testRoundTrip() throws Exception {
 
         comparator.excludeField(".*\\.libraryProps");
         comparator.excludeField(".*\\.fileProps");
-        comparator.excludeField(".*\\.libraryParamSet");
-        comparator.excludeField(".*\\.importedParamsBean");
-        comparator.assertEquals("results", expectedResults, actualResults);
+        comparator.excludeField(".*\\.parameterSet");
+        comparator.assertEquals("results", sortDescriptorsByName(expectedResults),
+            sortDescriptorsByName(actualResults));
 
         ParameterSetCrud paramCrud = new ParameterSetCrud();
 
         // Compare the database values for parameters with the ORIGINAL values for foo, bar, and
         // baz, and the values for TEST_PARAMETERS created in the modifyLibrary() operation. This
         // confirms that value updates got overwritten when the library was re-imported.
-        comparator.assertEquals("TEST_PARAMETERS_BAR", new BeanWrapper<>(testParametersBar),
-            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_BAR).getParameters());
-        comparator.assertEquals("TEST_PARAMETERS_BAZ", new BeanWrapper<>(testParametersBaz),
-            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_BAZ).getParameters());
-        comparator.assertEquals("TEST_PARAMETERS_FOO", new BeanWrapper<>(testParametersFoo),
-            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_FOO).getParameters());
-        comparator.assertEquals("TEST_PARAMETERS", new BeanWrapper<>(testParameters),
-            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS).getParameters());
+        comparator.assertEquals("TEST_PARAMETERS_BAR", testParametersBar.getParameters(),
+            new TreeSet<>(
+                paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_BAR).getTypedParameters()));
+        comparator.assertEquals("TEST_PARAMETERS_BAZ", testParametersBaz.getParameters(),
+            new TreeSet<>(
+                paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_BAZ).getTypedParameters()));
+        comparator.assertEquals("TEST_PARAMETERS_FOO", testParametersFoo.getParameters(),
+            new TreeSet<>(
+                paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_FOO).getTypedParameters()));
+        comparator.assertEquals("TEST_PARAMETERS", testParameters.getParameters(), new TreeSet<>(
+            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS).getTypedParameters()));
     }
 
     @Test
@@ -224,20 +235,22 @@ public void testRoundTripWithDryRun() throws Exception {
 
         comparator.excludeField(".*\\.libraryProps");
         comparator.excludeField(".*\\.fileProps");
-        comparator.excludeField(".*\\.libraryParamSet");
-        comparator.excludeField(".*\\.importedParamsBean");
-        comparator.assertEquals("results", expectedResults, actualResults);
+        comparator.excludeField(".*\\.parameterSet");
+        comparator.assertEquals("results", sortDescriptorsByName(expectedResults),
+            sortDescriptorsByName(actualResults));
 
         ParameterSetCrud paramCrud = new ParameterSetCrud();
 
         TestParametersBar modifiedBar = new TestParametersBar();
         modifiedBar.setBar1(1.1F);
-        comparator.assertEquals("TEST_PARAMETERS_BAR", new BeanWrapper<>(modifiedBar),
-            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_BAR).getParameters());
-        comparator.assertEquals("TEST_PARAMETERS_BAZ", new BeanWrapper<>(testParametersBaz),
-            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_BAZ).getParameters());
-        comparator.assertEquals("TEST_PARAMETERS", new BeanWrapper<>(testParameters),
-            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS).getParameters());
+
+        comparator.assertEquals("TEST_PARAMETERS_BAR", modifiedBar.getParameters(), new TreeSet<>(
+            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_BAR).getTypedParameters()));
+        comparator.assertEquals("TEST_PARAMETERS_BAZ", testParametersBaz.getParameters(),
+            new TreeSet<>(
+                paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS_BAZ).getTypedParameters()));
+        comparator.assertEquals("TEST_PARAMETERS", testParameters.getParameters(), new TreeSet<>(
+            paramCrud.retrieveLatestVersionForName(TEST_PARAMETERS).getTypedParameters()));
     }
 
     @Test
@@ -280,14 +293,14 @@ public void testExportWithExclusions() throws Exception {
 
         comparator.excludeField(".*\\.libraryProps");
         comparator.excludeField(".*\\.fileProps");
-        comparator.excludeField(".*\\.libraryParamSet");
-        comparator.excludeField(".*\\.importedParamsBean");
-        comparator.assertEquals("results", expectedResults, actualResults);
+        comparator.excludeField(".*\\.parameterSet");
+        comparator.assertEquals("results", sortDescriptorsByName(expectedResults),
+            sortDescriptorsByName(actualResults));
     }
 
     @Test
     public void testExportToInvalidExistingFile() throws Exception {
-        assertThrows(PipelineException.class, () -> {
+        PipelineException exception = assertThrows(PipelineException.class, () -> {
             ParametersOperations paramOps = new ParametersOperations();
 
             DatabaseTransactionFactory.performTransaction(() -> {
@@ -310,6 +323,7 @@ public void testExportToInvalidExistingFile() throws Exception {
                 return null;
             });
         });
+        assertEquals("Transaction failed with error", exception.getMessage());
     }
 
     /**
@@ -318,7 +332,7 @@ public void testExportToInvalidExistingFile() throws Exception {
      *
      * @throws Exception if there is a problem reading a test data file
      */
-    @Test(expected = UnmarshalException.class)
+    @Test(expected = PipelineException.class)
     public void testNonexistentParameter() throws Exception {
         ParametersOperations ops = new ParametersOperations();
         ops.importParameterLibrary(Paths.get("src")
@@ -342,30 +356,45 @@ public void testImportFromFile() throws Exception {
         Map<String, ParameterSetDescriptor> nameToParameterSetDescriptor = nameToParameterSetDescriptor(
             paramsDescriptors);
 
-        // Start with the RemoteParameters instance in which everything is a String; remember that
-        // for parameters that have a Java-side class description, we don't save the data types
-        // because the data types are defined as part of the class
+        // Start with the RemoteParameters instance.
         ParameterSetDescriptor descriptor = nameToParameterSetDescriptor.get("Remote Hyperion L1");
         assertEquals("gov.nasa.ziggy.module.remote.RemoteParameters", descriptor.getClassName());
-        Set<TypedParameter> typedProperties = descriptor.getImportedParamsBean()
-            .getTypedProperties();
-        assertEquals(5, typedProperties.size());
+        Set<TypedParameter> typedProperties = descriptor.getImportedProperties();
+        assertEquals(14, typedProperties.size());
         Map<String, TypedParameter> nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "enabled", "false",
-            ZiggyDataType.ZIGGY_STRING, true));
+            ZiggyDataType.ZIGGY_BOOLEAN, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "gigsPerSubtask", "0.1",
-            ZiggyDataType.ZIGGY_STRING, true));
+            ZiggyDataType.ZIGGY_DOUBLE, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "subtaskMaxWallTimeHours", "2.1",
-            ZiggyDataType.ZIGGY_STRING, true));
+            ZiggyDataType.ZIGGY_DOUBLE, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "subtaskTypicalWallTimeHours",
-            "2.1", ZiggyDataType.ZIGGY_STRING, true));
+            "2.1", ZiggyDataType.ZIGGY_DOUBLE, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "optimizer", "COST",
             ZiggyDataType.ZIGGY_STRING, true));
+        assertTrue(checkTypedPropertyValues(nameToTypedProperty, "minSubtasksForRemoteExecution",
+            "0", ZiggyDataType.ZIGGY_INT, true));
+        assertTrue(checkTypedPropertyValues(nameToTypedProperty, "remoteNodeArchitecture", "",
+            ZiggyDataType.ZIGGY_STRING, true));
+        assertTrue(checkTypedPropertyValues(nameToTypedProperty, "queueName", "",
+            ZiggyDataType.ZIGGY_STRING, true));
+        assertTrue(checkTypedPropertyValues(nameToTypedProperty, "subtasksPerCore", "",
+            ZiggyDataType.ZIGGY_STRING, true));
+        assertTrue(checkTypedPropertyValues(nameToTypedProperty, "maxNodes", "",
+            ZiggyDataType.ZIGGY_STRING, true));
+        assertTrue(checkTypedPropertyValues(nameToTypedProperty, "minGigsPerNode", "",
+            ZiggyDataType.ZIGGY_STRING, true));
+        assertTrue(checkTypedPropertyValues(nameToTypedProperty, "minCoresPerNode", "",
+            ZiggyDataType.ZIGGY_STRING, true));
+        assertTrue(checkTypedPropertyValues(nameToTypedProperty, "nodeSharing", "true",
+            ZiggyDataType.ZIGGY_BOOLEAN, true));
+        assertTrue(checkTypedPropertyValues(nameToTypedProperty, "wallTimeScaling", "true",
+            ZiggyDataType.ZIGGY_BOOLEAN, true));
 
         // sample classless parameter set
         descriptor = nameToParameterSetDescriptor.get("Sample classless parameter set");
-        assertEquals("gov.nasa.ziggy.parameters.DefaultParameters", descriptor.getClassName());
-        typedProperties = descriptor.getImportedParamsBean().getTypedProperties();
+        assertEquals("gov.nasa.ziggy.parameters.Parameters", descriptor.getClassName());
+        typedProperties = descriptor.getImportedProperties();
         assertEquals(3, typedProperties.size());
         nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "z1", "100",
@@ -377,8 +406,8 @@ public void testImportFromFile() throws Exception {
 
         // ISOFIT classless parameter set
         descriptor = nameToParameterSetDescriptor.get("ISOFIT module parameters");
-        assertEquals("gov.nasa.ziggy.parameters.DefaultParameters", descriptor.getClassName());
-        typedProperties = descriptor.getImportedParamsBean().getTypedProperties();
+        assertEquals("gov.nasa.ziggy.parameters.Parameters", descriptor.getClassName());
+        typedProperties = descriptor.getImportedProperties();
         assertEquals(3, typedProperties.size());
         nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "n_cores", "4",
@@ -396,7 +425,6 @@ private Map<String, ParameterSetDescriptor> nameToParameterSetDescriptor(
             nameToParameterSet.put(descriptor.getName(), descriptor);
         }
         return nameToParameterSet;
-
     }
 
     private Map<String, TypedParameter> nameToTypedPropertyMap(
@@ -447,25 +475,23 @@ public void testImportOverrideFromFile() {
 
         // The Hyperion L1 dataset has its gigs per subtask value changed
         Set<TypedParameter> typedProperties = nameToParameterSet.get("Remote Hyperion L1")
-            .getParameters()
-            .getTypedProperties();
+            .getTypedParameters();
         assertEquals(14, typedProperties.size());
         Map<String, TypedParameter> nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "enabled", "false",
-            ZiggyDataType.ZIGGY_STRING, true));
+            ZiggyDataType.ZIGGY_BOOLEAN, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "gigsPerSubtask", "1.0",
-            ZiggyDataType.ZIGGY_STRING, true));
+            ZiggyDataType.ZIGGY_DOUBLE, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "subtaskMaxWallTimeHours", "2.1",
-            ZiggyDataType.ZIGGY_STRING, true));
+            ZiggyDataType.ZIGGY_DOUBLE, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "subtaskTypicalWallTimeHours",
-            "2.1", ZiggyDataType.ZIGGY_STRING, true));
+            "2.1", ZiggyDataType.ZIGGY_DOUBLE, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "optimizer", "COST",
             ZiggyDataType.ZIGGY_STRING, true));
 
         // The sample classless parameter set no changed parameters
         typedProperties = nameToParameterSet.get("Sample classless parameter set")
-            .getParameters()
-            .getTypedProperties();
+            .getTypedParameters();
         assertEquals(3, typedProperties.size());
         nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "z1", "100",
@@ -476,9 +502,7 @@ public void testImportOverrideFromFile() {
             ZiggyDataType.ZIGGY_STRING, true));
 
         // ISOFIT classless parameter set has no changes
-        typedProperties = nameToParameterSet.get("ISOFIT module parameters")
-            .getParameters()
-            .getTypedProperties();
+        typedProperties = nameToParameterSet.get("ISOFIT module parameters").getTypedParameters();
         assertEquals(3, typedProperties.size());
         nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "n_cores", "4",
@@ -487,7 +511,6 @@ public void testImportOverrideFromFile() {
             ZiggyDataType.ZIGGY_BOOLEAN, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "empirical_line", "true",
             ZiggyDataType.ZIGGY_BOOLEAN, true));
-
     }
 
     @Test
@@ -533,34 +556,30 @@ public void importReplacementParameterSetsFromFile() {
 
         // The Hyperion L1 dataset has only its gigsPerSubtask set to a non-default value
         Set<TypedParameter> typedProperties = nameToParameterSet.get("Remote Hyperion L1")
-            .getParameters()
-            .getTypedProperties();
+            .getTypedParameters();
         assertEquals(14, typedProperties.size());
         Map<String, TypedParameter> nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "enabled", "false",
-            ZiggyDataType.ZIGGY_STRING, true));
+            ZiggyDataType.ZIGGY_BOOLEAN, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "gigsPerSubtask", "3.0",
-            ZiggyDataType.ZIGGY_STRING, true));
+            ZiggyDataType.ZIGGY_DOUBLE, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "subtaskMaxWallTimeHours", "0.0",
-            ZiggyDataType.ZIGGY_STRING, true));
+            ZiggyDataType.ZIGGY_DOUBLE, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "subtaskTypicalWallTimeHours",
-            "0.0", ZiggyDataType.ZIGGY_STRING, true));
+            "0.0", ZiggyDataType.ZIGGY_DOUBLE, true));
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "optimizer", "CORES",
             ZiggyDataType.ZIGGY_STRING, true));
 
         // The sample classless parameter set now has only 1 parameter
         typedProperties = nameToParameterSet.get("Sample classless parameter set")
-            .getParameters()
-            .getTypedProperties();
+            .getTypedParameters();
         assertEquals(1, typedProperties.size());
         nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "z1", "100",
             ZiggyDataType.ZIGGY_STRING, true));
 
         // ISOFIT classless parameter set has no changes
-        typedProperties = nameToParameterSet.get("ISOFIT module parameters")
-            .getParameters()
-            .getTypedProperties();
+        typedProperties = nameToParameterSet.get("ISOFIT module parameters").getTypedParameters();
         assertEquals(3, typedProperties.size());
         nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "n_cores", "4",
@@ -571,9 +590,7 @@ public void importReplacementParameterSetsFromFile() {
             ZiggyDataType.ZIGGY_BOOLEAN, true));
 
         // All-new parameters has 1 parameter
-        typedProperties = nameToParameterSet.get("All-new parameters")
-            .getParameters()
-            .getTypedProperties();
+        typedProperties = nameToParameterSet.get("All-new parameters").getTypedParameters();
         assertEquals(1, typedProperties.size());
         nameToTypedProperty = nameToTypedPropertyMap(typedProperties);
         assertTrue(checkTypedPropertyValues(nameToTypedProperty, "parameter", "4",
@@ -582,16 +599,7 @@ public void importReplacementParameterSetsFromFile() {
 
     // And now for a bunch of tests that exercise all the error cases
 
-    // Test import of a parameter library with a mismatched parameter
-    @Test(expected = IllegalArgumentException.class)
-    public void testMismatchedParameterImportException() throws Exception {
-        ParametersOperations ops = new ParametersOperations();
-        ops.importParameterLibrary(
-            TEST_DATA.resolve("paramlib").resolve("params-mismatch.xml").toString(), null,
-            ParamIoMode.STANDARD);
-    }
-
-    // Test an override that tries to change the parameters in a DefaultParameters instance
+    // Test an override that tries to change the parameters in a Parameters instance
     @Test(expected = IllegalArgumentException.class)
     public void testOverrideWithNewParamException() throws Exception {
 
@@ -609,8 +617,8 @@ public void testOverrideWithNewParamException() throws Exception {
             ParamIoMode.STANDARD);
     }
 
-    // Test an override that changes the type of a DefaultParameter instance
-    @Test(expected = IllegalStateException.class)
+    // Test an override that changes the type of a Parameters instance
+    @Test(expected = NumberFormatException.class)
     public void testOverrideWithBadTypeException() throws Exception {
 
         // Import the initial parameter library and persist to the database
@@ -648,7 +656,7 @@ public void testOverrideWithNewParamSetException() throws Exception {
     private Map<String, ParameterSet> nameToParameterSet(Collection<ParameterSet> parameterSets) {
         Map<String, ParameterSet> nameToParameterSet = new HashMap<>();
         for (ParameterSet parameterSet : parameterSets) {
-            nameToParameterSet.put(parameterSet.getName().getName(), parameterSet);
+            nameToParameterSet.put(parameterSet.getName(), parameterSet);
         }
         return nameToParameterSet;
     }
@@ -665,22 +673,4 @@ private boolean checkTypedPropertyValues(Map<String, TypedParameter> nameToTyped
 
         return goodProperty;
     }
-
-    /**
-     * Implements a test bean that has one parameter.
-     */
-    public static class TestBean implements Parameters {
-
-        private String name;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-    }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/parameters/ParametersTest.java b/src/test/java/gov/nasa/ziggy/parameters/ParametersTest.java
new file mode 100644
index 0000000..3a2390a
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/parameters/ParametersTest.java
@@ -0,0 +1,33 @@
+package gov.nasa.ziggy.parameters;
+
+import static gov.nasa.ziggy.collections.ZiggyDataType.ZIGGY_INT;
+import static gov.nasa.ziggy.collections.ZiggyDataType.ZIGGY_STRING;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Set;
+
+import org.junit.Test;
+
+import gov.nasa.ziggy.pipeline.definition.TypedParameter;
+
+/**
+ * @author Bill Wohler
+ */
+public class ParametersTest {
+
+    @Test
+    public void testPopulate() throws Exception {
+        Set<TypedParameter> typedParameters = Set.of(new TypedParameter("a", "42", ZIGGY_INT),
+            new TypedParameter("b", "xyzzy", ZIGGY_STRING),
+            new TypedParameter("c", "1,3,5,7,11", ZIGGY_INT, false),
+            new TypedParameter("d", "a,b,c", ZIGGY_STRING, false));
+
+        TestBean bean = TestBean.class.getDeclaredConstructor().newInstance();
+        bean.populate(typedParameters);
+
+        TestBean expectedBean = new TestBean(42, "xyzzy", new int[] { 1, 3, 5, 7, 11 },
+            new String[] { "a", "b", "c" });
+
+        assertEquals(expectedBean, bean);
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/parameters/TestBean.java b/src/test/java/gov/nasa/ziggy/parameters/TestBean.java
new file mode 100644
index 0000000..dba14df
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/parameters/TestBean.java
@@ -0,0 +1,86 @@
+package gov.nasa.ziggy.parameters;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+
+/**
+ * @author Todd Klaus
+ * @author Bill Wohler
+ */
+public class TestBean extends Parameters {
+    private int a = 1;
+    private String b = "foo";
+    private int[] c = { 1, 2, 3 };
+    private String[] d = { "a", "b", "c" };
+
+    public TestBean(int a, String b, int[] c, String[] d) {
+        this.a = a;
+        this.b = b;
+        this.c = c;
+        this.d = d;
+    }
+
+    public TestBean() {
+    }
+
+    public int getA() {
+        return a;
+    }
+
+    public void setA(int a) {
+        this.a = a;
+    }
+
+    public String getB() {
+        return b;
+    }
+
+    public void setB(String b) {
+        this.b = b;
+    }
+
+    public int[] getC() {
+        return c;
+    }
+
+    public void setC(int[] c) {
+        this.c = c;
+    }
+
+    public String[] getD() {
+        return d;
+    }
+
+    public void setD(String[] d) {
+        this.d = d;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + Arrays.hashCode(c);
+        result = prime * result + Arrays.hashCode(d);
+        return prime * result + Objects.hash(a, b);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj) || getClass() != obj.getClass()) {
+            return false;
+        }
+        TestBean other = (TestBean) obj;
+        return a == other.a && Objects.equals(b, other.b) && Arrays.equals(c, other.c)
+            && Arrays.equals(d, other.d);
+    }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this);
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/PipelineOperationsTest.java b/src/test/java/gov/nasa/ziggy/pipeline/PipelineOperationsTest.java
new file mode 100644
index 0000000..3f735f5
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/pipeline/PipelineOperationsTest.java
@@ -0,0 +1,459 @@
+package gov.nasa.ziggy.pipeline;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import gov.nasa.ziggy.ZiggyDatabaseRule;
+import gov.nasa.ziggy.pipeline.PipelineOperations.TaskStateSummary;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
+import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
+import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.TaskCounts;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionNodeCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceNodeCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineModuleDefinitionCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+
+/**
+ * Unit tests for {@link PipelineOperations}. Legacy methods are not tested, but all methods added
+ * since Ziggy version 0.3.0 are tested.
+ * <p>
+ * In addition to {@link PipelineOperations}, there are implicit tests of some methods in
+ * {@link PipelineInstanceCrud} and {@link TestCounts}.
+ *
+ * @author PT
+ */
+public class PipelineOperationsTest {
+
+    private PipelineTask task1, task2, task3, task4;
+    private PipelineInstance pipelineInstance;
+    private PipelineInstanceNode instanceNode, newInstanceNode;
+    private PipelineDefinitionNode definitionNode;
+    private PipelineModuleDefinition moduleDefinition;
+    private PipelineDefinition pipelineDefinition;
+    private PipelineOperations pipelineOperations;
+    private PipelineTaskCrud pipelineTaskCrud;
+    private PipelineInstanceCrud pipelineInstanceCrud;
+
+    @Rule
+    public ZiggyDatabaseRule databaseRule = new ZiggyDatabaseRule();
+
+    @Before
+    public void setUp() {
+
+        pipelineOperations = new PipelineOperations();
+        pipelineTaskCrud = new PipelineTaskCrud();
+        pipelineInstanceCrud = new PipelineInstanceCrud();
+
+        // Construct a pipeline instance with 2 tasks, both of which are in the same instance node.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            moduleDefinition = new PipelineModuleDefinition("dummy1");
+            new PipelineModuleDefinitionCrud().persist(moduleDefinition);
+            definitionNode = new PipelineDefinitionNode("dummy2", "dummy3");
+            pipelineDefinition = new PipelineDefinition("dummy4");
+            pipelineDefinition.setRootNodes(List.of(definitionNode));
+            new PipelineDefinitionCrud().persist(pipelineDefinition);
+            pipelineInstance = new PipelineInstance(pipelineDefinition);
+            pipelineInstanceCrud.persist(pipelineInstance);
+            instanceNode = new PipelineInstanceNode(pipelineInstance, definitionNode,
+                moduleDefinition);
+            new PipelineInstanceNodeCrud().persist(instanceNode);
+            pipelineInstance.setEndNode(instanceNode);
+            PipelineInstance mergedInstance = pipelineInstanceCrud.merge(pipelineInstance);
+            task1 = new PipelineTask(mergedInstance, instanceNode);
+            task2 = new PipelineTask(mergedInstance, instanceNode);
+            pipelineTaskCrud.persist(List.of(task1, task2));
+            return null;
+        });
+    }
+
+    /**
+     * Tests that the
+     * {@link PipelineOperations#setTaskState(PipelineTask, gov.nasa.ziggy.pipeline.definition.PipelineTask.State)}
+     * method performs correctly in the case where all tasks run to completion without errors. In
+     * particular, the pipeline task execution clocks should start and stop at the correct times,
+     * the pipeline instance task execution clock should start and stop at the correct times, and
+     * the pipeline instance and pipeline instance node task counts should be correct.
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testSetTaskStateNoErrors() {
+
+        // Check initial states.
+        List<PipelineTask> databaseTasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> {
+
+                List<PipelineTask> tasks = pipelineTaskCrud.retrieveAll();
+                for (PipelineTask task : tasks) {
+                    assertTrue(task.getCurrentExecutionStartTimeMillis() <= 0);
+                    assertEquals(PipelineTask.State.INITIALIZED, task.getState());
+                }
+                PipelineInstance instance = pipelineInstanceCrud.retrieveAll().get(0);
+                assertTrue(instance.getCurrentExecutionStartTimeMillis() <= 0);
+                assertEquals(PipelineInstance.State.INITIALIZED, instance.getState());
+
+                TaskCounts counts = pipelineOperations.taskCounts(instance);
+                assertEquals(2, counts.getTaskCount());
+                assertEquals(0, counts.getCompletedTaskCount());
+                assertEquals(0, counts.getFailedTaskCount());
+                assertEquals(0, counts.getSubmittedTaskCount());
+
+                counts = pipelineOperations.taskCounts(tasks.get(0).getPipelineInstanceNode());
+                assertEquals(2, counts.getTaskCount());
+                assertEquals(0, counts.getCompletedTaskCount());
+                assertEquals(0, counts.getFailedTaskCount());
+                assertEquals(0, counts.getSubmittedTaskCount());
+
+                return tasks;
+            });
+
+        // Move the tasks one at a time to the SUBMITTED state.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            TaskStateSummary updatedStates = pipelineOperations.setTaskState(databaseTasks.get(0),
+                PipelineTask.State.SUBMITTED);
+            assertEquals(PipelineTask.State.SUBMITTED, updatedStates.getTask().getState());
+            assertEquals(PipelineInstance.State.PROCESSING, updatedStates.getInstance().getState());
+            TaskCounts counts = updatedStates.getInstanceCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertEquals(1, counts.getSubmittedTaskCount());
+            counts = updatedStates.getInstanceNodeCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertEquals(1, counts.getSubmittedTaskCount());
+            assertTrue(updatedStates.getTask().getCurrentExecutionStartTimeMillis() > 0);
+            assertTrue(updatedStates.getInstance().getCurrentExecutionStartTimeMillis() > 0);
+
+            updatedStates = pipelineOperations.setTaskState(databaseTasks.get(1),
+                PipelineTask.State.SUBMITTED);
+            assertEquals(PipelineTask.State.SUBMITTED, updatedStates.getTask().getState());
+            assertEquals(PipelineInstance.State.PROCESSING, updatedStates.getInstance().getState());
+            counts = updatedStates.getInstanceCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            counts = updatedStates.getInstanceNodeCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertTrue(updatedStates.getTask().getCurrentExecutionStartTimeMillis() > 0);
+            assertTrue(updatedStates.getInstance().getCurrentExecutionStartTimeMillis() > 0);
+            return null;
+        });
+
+        // Make sure that the state changes are actually persisted to the database
+        List<PipelineTask> submittedTasks = (List<PipelineTask>) DatabaseTransactionFactory
+            .performTransaction(() -> {
+                List<PipelineTask> tasks = pipelineTaskCrud.retrieveAll();
+                for (PipelineTask task : tasks) {
+                    assertEquals(PipelineTask.State.SUBMITTED, task.getState());
+                    assertTrue(task.getCurrentExecutionStartTimeMillis() > 0);
+                }
+                PipelineInstance instance = pipelineInstanceCrud.retrieveAll().get(0);
+                assertEquals(PipelineInstance.State.PROCESSING, instance.getState());
+                assertTrue(instance.getCurrentExecutionStartTimeMillis() > 0);
+                return tasks;
+            });
+
+        // Move the tasks to the PROCESSING state.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineOperations.setTaskState(submittedTasks.get(0), PipelineTask.State.PROCESSING);
+            TaskStateSummary updatedStates = pipelineOperations.setTaskState(submittedTasks.get(1),
+                PipelineTask.State.PROCESSING);
+            TaskCounts counts = updatedStates.getInstanceCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            counts = updatedStates.getInstanceNodeCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            return null;
+        });
+
+        // Move both tasks to the COMPLETED state.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<PipelineTask> tasks = pipelineTaskCrud.retrieveAll();
+            pipelineOperations.setTaskState(tasks.get(0), PipelineTask.State.COMPLETED);
+            TaskStateSummary updatedStates = pipelineOperations.setTaskState(tasks.get(1),
+                PipelineTask.State.COMPLETED);
+            assertEquals(PipelineInstance.State.COMPLETED, updatedStates.getInstance().getState());
+            assertTrue(updatedStates.getInstance().getCurrentExecutionStartTimeMillis() <= 0);
+            TaskCounts counts = updatedStates.getInstanceCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            counts = updatedStates.getInstanceNodeCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            return null;
+        });
+
+        // Make sure the tasks got their clocks stopped.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<PipelineTask> tasks = pipelineTaskCrud.retrieveAll();
+            assertTrue(tasks.get(0).getCurrentExecutionStartTimeMillis() <= 0);
+            assertTrue(tasks.get(1).getCurrentExecutionStartTimeMillis() <= 0);
+            return null;
+        });
+    }
+
+    /**
+     * Tests that the correct state transitions are performed when there are tasks that error out.
+     */
+    @Test
+    public void testSetTaskStateWithErrors() {
+
+        // Move the tasks to the PROCESSING state
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineOperations.setTaskState(task1, PipelineTask.State.PROCESSING);
+            pipelineOperations.setTaskState(task2, PipelineTask.State.PROCESSING);
+            return null;
+        });
+
+        // Move one task to state ERROR.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            TaskStateSummary updatedStates = pipelineOperations.setTaskState(task1,
+                PipelineTask.State.ERROR);
+
+            // Check that the updated states are all correct.
+            assertEquals(PipelineInstance.State.ERRORS_RUNNING,
+                updatedStates.getInstance().getState());
+            assertEquals(PipelineTask.State.ERROR, updatedStates.getTask().getState());
+            TaskCounts counts = updatedStates.getInstanceCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(1, counts.getFailedTaskCount());
+            counts = updatedStates.getInstanceNodeCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(1, counts.getFailedTaskCount());
+
+            assertTrue(updatedStates.getInstance().getCurrentExecutionStartTimeMillis() > 0);
+            assertTrue(updatedStates.getTask().getCurrentExecutionStartTimeMillis() <= 0);
+            return null;
+        });
+
+        // Move the other task to state COMPLETED.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            TaskStateSummary updatedStates = pipelineOperations.setTaskState(task2,
+                PipelineTask.State.COMPLETED);
+
+            // Check that the updated states are all correct.
+            assertEquals(PipelineInstance.State.ERRORS_STALLED,
+                updatedStates.getInstance().getState());
+            assertEquals(PipelineTask.State.COMPLETED, updatedStates.getTask().getState());
+            TaskCounts counts = updatedStates.getInstanceCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(1, counts.getCompletedTaskCount());
+            assertEquals(1, counts.getFailedTaskCount());
+            counts = updatedStates.getInstanceNodeCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(1, counts.getCompletedTaskCount());
+            assertEquals(1, counts.getFailedTaskCount());
+
+            assertTrue(updatedStates.getInstance().getCurrentExecutionStartTimeMillis() <= 0);
+            assertTrue(updatedStates.getTask().getCurrentExecutionStartTimeMillis() <= 0);
+            return null;
+        });
+    }
+
+    /**
+     * Tests that the correct state transitions occur when there are multiple nodes in the pipeline.
+     */
+    @Test
+    public void testMultipleInstanceNodesNoErrors() {
+
+        // Create a new instance node with 2 tasks in it and attach it to the instance.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineModuleDefinition newModuleDefinition = new PipelineModuleDefinition("dummy6");
+            new PipelineModuleDefinitionCrud().persist(newModuleDefinition);
+            PipelineDefinitionNode newDefinitionNode = new PipelineDefinitionNode("dummy7",
+                "dummy7");
+            definitionNode.setNextNodes(List.of(newDefinitionNode));
+            pipelineDefinition.setRootNodes(List.of(definitionNode));
+            new PipelineDefinitionNodeCrud().persist(newDefinitionNode);
+            new PipelineDefinitionNodeCrud().merge(definitionNode);
+            new PipelineDefinitionCrud().merge(pipelineDefinition);
+            newInstanceNode = new PipelineInstanceNode(pipelineInstance, newDefinitionNode,
+                newModuleDefinition);
+            new PipelineInstanceNodeCrud().persist(newInstanceNode);
+            pipelineInstance.setEndNode(newInstanceNode);
+            pipelineInstanceCrud.merge(pipelineInstance);
+            return null;
+        });
+
+        // Move the first 2 tasks to completed and check that all the correct states are
+        // generated. Then create 2 new pipeline tasks in the second instance node.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineOperations.setTaskState(task1, PipelineTask.State.COMPLETED);
+            TaskStateSummary states = pipelineOperations.setTaskState(task2,
+                PipelineTask.State.COMPLETED);
+            assertEquals(PipelineInstance.State.PROCESSING, states.getInstance().getState());
+            TaskCounts counts = states.getInstanceCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(2, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            counts = states.getInstanceNodeCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(2, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertTrue(states.getInstance().getCurrentExecutionStartTimeMillis() > 0);
+
+            task3 = new PipelineTask(states.getInstance(), newInstanceNode);
+            task4 = new PipelineTask(states.getInstance(), newInstanceNode);
+            pipelineTaskCrud.persist(List.of(task3, task4));
+
+            counts = pipelineOperations.taskCounts(states.getInstance());
+            assertEquals(4, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(2, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+
+            counts = pipelineOperations.taskCounts(newInstanceNode);
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(0, counts.getSubmittedTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+
+            return null;
+        });
+
+        // Move the new tasks to state PROCESSING.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineOperations.setTaskState(task3, PipelineTask.State.PROCESSING);
+            TaskStateSummary states = pipelineOperations.setTaskState(task4,
+                PipelineTask.State.PROCESSING);
+            assertEquals(PipelineInstance.State.PROCESSING, states.getInstance().getState());
+            TaskCounts counts = states.getInstanceCounts();
+            assertEquals(4, counts.getTaskCount());
+            assertEquals(4, counts.getSubmittedTaskCount());
+            assertEquals(2, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            counts = states.getInstanceNodeCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertTrue(states.getInstance().getCurrentExecutionStartTimeMillis() > 0);
+
+            return null;
+        });
+
+        // Move the tasks to COMPLETED.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineOperations.setTaskState(task3, PipelineTask.State.COMPLETED);
+            TaskStateSummary states = pipelineOperations.setTaskState(task4,
+                PipelineTask.State.COMPLETED);
+            assertEquals(PipelineInstance.State.COMPLETED, states.getInstance().getState());
+            TaskCounts counts = states.getInstanceCounts();
+            assertEquals(4, counts.getTaskCount());
+            assertEquals(4, counts.getSubmittedTaskCount());
+            assertEquals(4, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            counts = states.getInstanceNodeCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(2, counts.getCompletedTaskCount());
+            assertEquals(0, counts.getFailedTaskCount());
+            assertTrue(states.getInstance().getCurrentExecutionStartTimeMillis() <= 0);
+
+            return null;
+        });
+    }
+
+    @Test
+    public void testMultipleInstanceNodesWithErrors() {
+
+        // Create a new instance node with 2 tasks in it and attach it to the instance.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineModuleDefinition newModuleDefinition = new PipelineModuleDefinition("dummy6");
+            new PipelineModuleDefinitionCrud().persist(newModuleDefinition);
+            PipelineDefinitionNode newDefinitionNode = new PipelineDefinitionNode("dummy7",
+                "dummy7");
+            definitionNode.setNextNodes(List.of(newDefinitionNode));
+            pipelineDefinition.setRootNodes(List.of(definitionNode));
+            new PipelineDefinitionNodeCrud().persist(newDefinitionNode);
+            new PipelineDefinitionNodeCrud().merge(definitionNode);
+            new PipelineDefinitionCrud().merge(pipelineDefinition);
+            newInstanceNode = new PipelineInstanceNode(pipelineInstance, newDefinitionNode,
+                newModuleDefinition);
+            new PipelineInstanceNodeCrud().persist(newInstanceNode);
+            pipelineInstance.setEndNode(newInstanceNode);
+            pipelineInstanceCrud.merge(pipelineInstance);
+            return null;
+        });
+
+        // Move the first task into PROCESSING state.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            TaskStateSummary states = pipelineOperations.setTaskState(task1,
+                PipelineTask.State.PROCESSING);
+            assertTrue(states.getInstance().getCurrentExecutionStartTimeMillis() > 0);
+            return null;
+        });
+
+        // Now move the first task into the ERROR state.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            TaskStateSummary states = pipelineOperations.setTaskState(task1,
+                PipelineTask.State.ERROR);
+            assertTrue(states.getInstance().getCurrentExecutionStartTimeMillis() > 0);
+            assertEquals(PipelineInstance.State.ERRORS_RUNNING, states.getInstance().getState());
+            TaskCounts counts = states.getInstanceCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(1, counts.getSubmittedTaskCount());
+            assertEquals(0, counts.getCompletedTaskCount());
+            assertEquals(1, counts.getFailedTaskCount());
+            return null;
+        });
+
+        // Move the second task into PROCESSING.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            TaskStateSummary states = pipelineOperations.setTaskState(task2,
+                PipelineTask.State.PROCESSING);
+            assertTrue(states.getInstance().getCurrentExecutionStartTimeMillis() > 0);
+            return null;
+        });
+
+        // When the second task completes, the instance should go to ERRORS_STALLED even
+        // though there are pipeline instance nodes that have not yet been run.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            TaskStateSummary states = pipelineOperations.setTaskState(task2,
+                PipelineTask.State.COMPLETED);
+            assertTrue(states.getInstance().getCurrentExecutionStartTimeMillis() <= 0);
+            assertEquals(PipelineInstance.State.ERRORS_STALLED, states.getInstance().getState());
+            TaskCounts counts = states.getInstanceCounts();
+            assertEquals(2, counts.getTaskCount());
+            assertEquals(2, counts.getSubmittedTaskCount());
+            assertEquals(1, counts.getCompletedTaskCount());
+            assertEquals(1, counts.getFailedTaskCount());
+            return null;
+        });
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/PipelineTaskInformationTest.java b/src/test/java/gov/nasa/ziggy/pipeline/PipelineTaskInformationTest.java
index 29ca950..561acdd 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/PipelineTaskInformationTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/PipelineTaskInformationTest.java
@@ -24,10 +24,9 @@
 import gov.nasa.ziggy.module.SubtaskInformation;
 import gov.nasa.ziggy.module.remote.RemoteParameters;
 import gov.nasa.ziggy.parameters.Parameters;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
@@ -52,13 +51,13 @@ public class PipelineTaskInformationTest {
     private PipelineModuleDefinitionCrud pipelineModuleDefinitionCrud = mock(
         PipelineModuleDefinitionCrud.class);
     private PipelineTaskInformation pipelineTaskInformation = spy(PipelineTaskInformation.class);
-    private ParameterSetName instancePars1Name = new ParameterSetName("Instance Pars 1");
-    private ParameterSetName instancePars2Name = new ParameterSetName("Instance Pars 2");
-    private ParameterSet instanceParSet1 = new ParameterSet(instancePars1Name.getName());
-    private ParameterSet instanceParSet2 = new ParameterSet(instancePars2Name.getName());
-    private ParameterSetName moduleParsName = new ParameterSetName("Module Pars");
+    private String instancePars1Name = "Instance Pars 1";
+    private String instancePars2Name = "Instance Pars 2";
+    private ParameterSet instanceParSet1 = new ParameterSet(instancePars1Name);
+    private ParameterSet instanceParSet2 = new ParameterSet(instancePars2Name);
+    private String moduleParsName = "Module Pars";
     private RemoteParameters remoteParams = new RemoteParameters();
-    private ParameterSet moduleParSet = new ParameterSet(moduleParsName.getName());
+    private ParameterSet moduleParSet = new ParameterSet(moduleParsName);
     private PipelineTask p1 = new PipelineTask();
     private PipelineTask p2 = new PipelineTask();
     private SubtaskInformation s1, s2;
@@ -84,19 +83,17 @@ public void setup() {
         moduleDefinition.setInputsClass(inputsClass);
         node.setModuleName(moduleDefinition.getName());
         pipelineDefinition = new PipelineDefinition("pipeline");
-        node.setPipelineName(pipelineDefinition.getName().getName());
+        node.setPipelineName(pipelineDefinition.getName());
         when(pipelineDefinitionCrud.retrieveLatestVersionForName("pipeline"))
             .thenReturn(pipelineDefinition);
 
         // Set up of instance-level parameters
-        Map<ClassWrapper<Parameters>, ParameterSetName> instanceParameterNames = new HashMap<>();
-        instanceParameterNames.put(new ClassWrapper<Parameters>(InstancePars1.class),
-            instancePars1Name);
-        instanceParameterNames.put(new ClassWrapper<Parameters>(InstancePars2.class),
-            instancePars2Name);
+        Map<ClassWrapper<ParametersInterface>, String> instanceParameterNames = new HashMap<>();
+        instanceParameterNames.put(new ClassWrapper<>(InstancePars1.class), instancePars1Name);
+        instanceParameterNames.put(new ClassWrapper<>(InstancePars2.class), instancePars2Name);
         pipelineDefinition.setPipelineParameterSetNames(instanceParameterNames);
-        instanceParSet1.setParameters(new BeanWrapper<Parameters>(new InstancePars1()));
-        instanceParSet2.setParameters(new BeanWrapper<Parameters>(new InstancePars2()));
+        instanceParSet1.setTypedParameters(new InstancePars1().getParameters());
+        instanceParSet2.setTypedParameters(new InstancePars2().getParameters());
         when(parameterSetCrud.retrieveLatestVersionForName(instancePars1Name))
             .thenReturn(instanceParSet1);
         when(parameterSetCrud.retrieveLatestVersionForName(instancePars2Name))
@@ -105,11 +102,10 @@ public void setup() {
         // Set up of module-level parameters
         when(pipelineModuleDefinitionCrud.retrieveLatestVersionForName(moduleDefinition.getName()))
             .thenReturn(moduleDefinition);
-        Map<ClassWrapper<Parameters>, ParameterSetName> moduleParameterNames = new HashMap<>();
-        moduleParameterNames.put(new ClassWrapper<Parameters>(RemoteParameters.class),
-            moduleParsName);
+        Map<ClassWrapper<ParametersInterface>, String> moduleParameterNames = new HashMap<>();
+        moduleParameterNames.put(new ClassWrapper<>(RemoteParameters.class), moduleParsName);
         node.setModuleParameterSetNames(moduleParameterNames);
-        moduleParSet.setParameters(new BeanWrapper<Parameters>(remoteParams));
+        moduleParSet.setTypedParameters(remoteParams.getParameters());
         when(parameterSetCrud.retrieveLatestVersionForName(moduleParsName))
             .thenReturn(moduleParSet);
 
@@ -122,7 +118,8 @@ public void setup() {
         uowList.add(u2);
         doReturn(uowList).when(pipelineTaskInformation)
             .unitsOfWork(ArgumentMatchers.<ClassWrapper<UnitOfWorkGenerator>> any(),
-                ArgumentMatchers.<Map<Class<? extends Parameters>, Parameters>> any());
+                ArgumentMatchers
+                    .<Map<Class<? extends ParametersInterface>, ParametersInterface>> any());
 
         // Set up pipeline task generation
         p1.setId(1L);
@@ -152,34 +149,32 @@ public void testBasicFunctionality() {
         assertTrue(subtaskInfo.contains(s1));
         assertTrue(subtaskInfo.contains(s2));
 
-        ParameterSetName psn = PipelineTaskInformation.remoteParameters(node);
-        assertEquals(moduleParsName.getName(), psn.getName());
+        String psn = PipelineTaskInformation.remoteParameters(node);
+        assertEquals(moduleParsName, psn);
 
         // Resetting it should cause it to disappear again
         PipelineTaskInformation.reset(node);
         assertFalse(PipelineTaskInformation.hasPipelineDefinitionNode(node));
-
     }
 
     @Test
     public void testRemoteParamsAtInstanceLevel() {
 
         pipelineDefinition.getPipelineParameterSetNames()
-            .put(new ClassWrapper<Parameters>(RemoteParameters.class), moduleParsName);
+            .put(new ClassWrapper<>(RemoteParameters.class), moduleParsName);
         node.getModuleParameterSetNames().clear();
-        ParameterSetName psn = PipelineTaskInformation.remoteParameters(node);
-        assertEquals(moduleParsName.getName(), psn.getName());
-
+        String psn = PipelineTaskInformation.remoteParameters(node);
+        assertEquals(moduleParsName, psn);
     }
 
     @Test
     public void testNoRemoteParams() {
         node.getModuleParameterSetNames().clear();
-        ParameterSetName psn = PipelineTaskInformation.remoteParameters(node);
+        String psn = PipelineTaskInformation.remoteParameters(node);
         assertNull(psn);
     }
 
-    public static class InstancePars1 implements Parameters {
+    public static class InstancePars1 extends Parameters {
         private int intParam;
 
         public int getIntParam() {
@@ -191,7 +186,7 @@ public void setIntParam(int intParam) {
         }
     }
 
-    public static class InstancePars2 implements Parameters {
+    public static class InstancePars2 extends Parameters {
         private float floatParam;
 
         public float getFloatParam() {
@@ -202,5 +197,4 @@ public void setFloatParam(float floatParam) {
             this.floatParam = floatParam;
         }
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/BeanWrapperDefaultParametersTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/BeanWrapperDefaultParametersTest.java
deleted file mode 100644
index ecac1f9..0000000
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/BeanWrapperDefaultParametersTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import gov.nasa.ziggy.collections.ZiggyDataType;
-import gov.nasa.ziggy.parameters.DefaultParameters;
-
-/**
- * Test of BeanWrapper class when the object being wrapped is a DefaultParameters instance.
- *
- * @author PT
- */
-public class BeanWrapperDefaultParametersTest {
-
-    private DefaultParameters parameters = new DefaultParameters();
-    private TypedParameter p1, p2, p3;
-    private Map<String, TypedParameter> typedPropertyMap = new HashMap<>();
-
-    @Before
-    public void setup() {
-
-        p1 = new TypedParameter("tired", "wired", ZiggyDataType.ZIGGY_STRING);
-        p2 = new TypedParameter("dummy", "300", ZiggyDataType.ZIGGY_INT);
-        p3 = new TypedParameter("euros", "28.56", ZiggyDataType.ZIGGY_FLOAT);
-        Set<TypedParameter> typedProperties = new HashSet<>();
-        typedProperties.add(p1);
-        typedProperties.add(p2);
-        typedProperties.add(p3);
-        parameters.setName("test");
-        parameters.setParameters(typedProperties);
-        for (TypedParameter property : typedProperties) {
-            typedPropertyMap.put(property.getName(), property);
-        }
-    }
-
-    @Test
-    public void testConstructor() {
-        BeanWrapper<DefaultParameters> b1 = new BeanWrapper<>(DefaultParameters.class);
-        assertEquals(DefaultParameters.class.getName(), b1.getClassName());
-        assertTrue(b1.getTypedProperties().isEmpty());
-        assertEquals(DefaultParameters.class, b1.getClazz());
-
-        b1 = new BeanWrapper<>();
-        assertNull(b1.getClassName());
-        b1.setClazz(DefaultParameters.class);
-        assertEquals(DefaultParameters.class.getName(), b1.getClassName());
-
-        b1 = new BeanWrapper<>(parameters);
-        assertEquals(DefaultParameters.class.getName(), b1.getClassName());
-        assertEquals(DefaultParameters.class, b1.getClazz());
-        assertEquals(3, b1.getTypedProperties().size());
-        assertTrue(b1.getTypedProperties().contains(p1));
-        assertTrue(b1.getTypedProperties().contains(p2));
-        assertTrue(b1.getTypedProperties().contains(p3));
-        Map<String, String> b1p = BeanWrapper.propertyValueByName(b1.getTypedProperties());
-        Set<String> b1pk = b1p.keySet();
-        assertTrue(b1pk.contains("tired"));
-        assertTrue(b1pk.contains("dummy"));
-        assertTrue(b1pk.contains("euros"));
-        assertEquals("wired", b1p.get("tired"));
-        assertEquals("300", b1p.get("dummy"));
-        assertEquals("28.56", b1p.get("euros"));
-
-        BeanWrapper<DefaultParameters> b2 = new BeanWrapper<>(b1);
-        assertEquals(DefaultParameters.class.getName(), b2.getClassName());
-        assertEquals(DefaultParameters.class, b2.getClazz());
-        assertEquals(3, b2.getTypedProperties().size());
-        assertTrue(b2.getTypedProperties().contains(p1));
-        assertTrue(b2.getTypedProperties().contains(p2));
-        assertTrue(b2.getTypedProperties().contains(p3));
-        Map<String, String> b2p = BeanWrapper.propertyValueByName(b2.getTypedProperties());
-        Set<String> b2pk = b2p.keySet();
-        assertTrue(b2pk.contains("tired"));
-        assertTrue(b2pk.contains("dummy"));
-        assertTrue(b2pk.contains("euros"));
-        assertEquals("wired", b2p.get("tired"));
-        assertEquals("300", b2p.get("dummy"));
-        assertEquals("28.56", b2p.get("euros"));
-    }
-
-    @Test
-    public void testGetInstance() {
-        BeanWrapper<DefaultParameters> b = new BeanWrapper<>(parameters);
-        DefaultParameters p = b.getInstance();
-        Set<TypedParameter> t = p.getParameters();
-        assertEquals(3, t.size());
-        assertTrue(t.contains(p1));
-        assertTrue(t.contains(p2));
-        assertTrue(t.contains(p3));
-        assertNull(p.getName());
-        Map<String, TypedParameter> instancePropertyMap = new HashMap<>();
-        for (TypedParameter typedProperty : t) {
-            instancePropertyMap.put(typedProperty.getName(), typedProperty);
-        }
-
-        // Test to make sure that the instance has COPIES of the typed properties rather than
-        // references to the ones in the BeanWrapper
-        Set<String> propertyNames = typedPropertyMap.keySet();
-        for (String propertyName : propertyNames) {
-            assertFalse(
-                instancePropertyMap.get(propertyName) == typedPropertyMap.get(propertyName));
-        }
-    }
-
-    @Test
-    public void testPopulateFromInstance() {
-        BeanWrapper<DefaultParameters> b1 = new BeanWrapper<>();
-        b1.populateFromInstance(parameters);
-        assertEquals(DefaultParameters.class.getName(), b1.getClassName());
-        Set<TypedParameter> t = b1.getTypedProperties();
-        assertEquals(3, t.size());
-        assertTrue(t.contains(p1));
-        assertTrue(t.contains(p2));
-        assertTrue(t.contains(p3));
-        Map<String, TypedParameter> instancePropertyMap = new HashMap<>();
-        for (TypedParameter typedProperty : t) {
-            instancePropertyMap.put(typedProperty.getName(), typedProperty);
-        }
-
-        // Test to make sure that the instance has COPIES of the typed properties rather than
-        // references to the ones in the BeanWrapper
-        Set<String> propertyNames = typedPropertyMap.keySet();
-        for (String propertyName : propertyNames) {
-            assertFalse(
-                instancePropertyMap.get(propertyName) == typedPropertyMap.get(propertyName));
-        }
-    }
-
-    @Test
-    public void testSetProps() {
-        BeanWrapper<DefaultParameters> b1 = new BeanWrapper<>(DefaultParameters.class);
-        Map<String, String> m = new HashMap<>();
-        m.put("abcd", "efgh");
-        m.put("ijkl", "mnop");
-        b1.setProperties(m);
-        assertEquals(BeanWrapper.propertyValueByName(b1.getTypedProperties()), m);
-        Set<TypedParameter> t = b1.getTypedProperties();
-        assertEquals(2, t.size());
-        List<TypedParameter> tl = new ArrayList<>(t);
-        TypedParameter tl0 = tl.get(0);
-        if (tl0.getName().equals("abcd")) {
-            assertEquals("efgh", tl0.getValue());
-            assertEquals("ijkl", tl.get(1).getName());
-            assertEquals("mnop", tl.get(1).getValue());
-        } else {
-            assertEquals("abcd", tl.get(1).getName());
-            assertEquals("efgh", tl.get(1).getValue());
-            assertEquals("ijkl", tl.get(0).getName());
-            assertEquals("mnop", tl.get(0).getValue());
-        }
-        assertEquals(ZiggyDataType.ZIGGY_STRING, tl.get(0).getDataType());
-        assertEquals(ZiggyDataType.ZIGGY_STRING, tl.get(1).getDataType());
-    }
-
-    @Test
-    public void testSetTypedProperties() {
-        BeanWrapper<DefaultParameters> b1 = new BeanWrapper<>(DefaultParameters.class);
-        b1.setTypedProperties(parameters.getParameters());
-        Set<TypedParameter> t = b1.getTypedProperties();
-        assertEquals(3, t.size());
-        assertTrue(t.contains(p1));
-        assertTrue(t.contains(p2));
-        assertTrue(t.contains(p3));
-        Map<String, String> m = BeanWrapper.propertyValueByName(b1.getTypedProperties());
-        assertEquals(3, m.size());
-        Set<String> keys = m.keySet();
-        assertTrue(keys.contains("tired"));
-        assertTrue(keys.contains("dummy"));
-        assertTrue(keys.contains("euros"));
-        assertEquals("wired", m.get("tired"));
-        assertEquals("300", m.get("dummy"));
-        assertEquals("28.56", m.get("euros"));
-    }
-
-    @Test
-    public void testGetAllPropNames() {
-        BeanWrapper<DefaultParameters> b = new BeanWrapper<>(parameters);
-        Set<String> s = b.getAllPropertyNames();
-        assertEquals(3, s.size());
-        assertTrue(s.contains("tired"));
-        assertTrue(s.contains("dummy"));
-        assertTrue(s.contains("euros"));
-    }
-}
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/BeanWrapperTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/BeanWrapperTest.java
deleted file mode 100644
index c817db3..0000000
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/BeanWrapperTest.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-import gov.nasa.ziggy.ReflectionEquals;
-import gov.nasa.ziggy.module.PipelineException;
-
-/**
- * @author Todd Klaus
- */
-public class BeanWrapperTest {
-
-    @Test
-    public void constructFromClass() throws Exception {
-        BeanWrapper<TestBean> beanWrapper = new BeanWrapper<>(TestBean.class);
-
-        Map<String, String> expectedProps = new HashMap<>();
-        expectedProps.put("a", "1");
-        expectedProps.put("b", "foo");
-        expectedProps.put("c", "1,2,3");
-        expectedProps.put("d", "a,b,c");
-
-        assertEquals("BeanWrapper<TestBean>.beanClassName", TestBean.class, beanWrapper.getClazz());
-        assertEquals("BeanWrapper<TestBean>.props", expectedProps,
-            BeanWrapper.propertyValueByName(beanWrapper.getTypedProperties()));
-
-        TestBean expectedBean = new TestBean();
-        TestBean actualBean = beanWrapper.getInstance();
-
-        ReflectionEquals comparator = new ReflectionEquals();
-        comparator.assertEquals(expectedBean, actualBean);
-    }
-
-    @Test
-    public void constructFromInstance() throws PipelineException {
-        TestBean bean = new TestBean(42, "xyzzy", new int[] { 1, 3, 5, 7, 11 },
-            new String[] { "latest--planet.txt", "b.1", "c.1" });
-        BeanWrapper<TestBean> beanWrapper = new BeanWrapper<>(bean);
-
-        assertEquals("BeanWrapper<TestBean>.beanClassName", TestBean.class, beanWrapper.getClazz());
-        assertEquals("BeanWrapper<TestBean>.props.size", 4,
-            beanWrapper.getTypedProperties().size());
-        Map<String, String> properties = BeanWrapper
-            .propertyValueByName(beanWrapper.getTypedProperties());
-        assertTrue("BeanWrapper<TestBean>.props contains 'a'", properties.containsKey("a"));
-        assertEquals("BeanWrapper<TestBean>.props.get(\"a\")", "42", properties.get("a"));
-        assertTrue("BeanWrapper<TestBean>.props contains 'b'", properties.containsKey("b"));
-        assertEquals("BeanWrapper<TestBean>.props.get(\"b\")", "xyzzy", properties.get("b"));
-        assertTrue("BeanWrapper<TestBean>.props contains 'c'", properties.containsKey("c"));
-        assertEquals("BeanWrapper<TestBean>.props.get(\"c\")", "1,3,5,7,11", properties.get("c"));
-        assertEquals("BeanWrapper<TestBean>.props.get(\"d\")", "latest--planet.txt,b.1,c.1",
-            properties.get("d"));
-    }
-
-    @Test
-    public void copyConstructor() throws Exception {
-        TestBean bean1 = new TestBean(42, "xyzzy", new int[] { 1, 3, 5, 7, 11 },
-            new String[] { "a", "b", "c" });
-        BeanWrapper<TestBean> beanWrapper1 = new BeanWrapper<>(bean1);
-        BeanWrapper<TestBean> beanWrapper2 = new BeanWrapper<>(beanWrapper1);
-        TestBean bean2 = beanWrapper2.getInstance();
-
-        ReflectionEquals comparator = new ReflectionEquals();
-        comparator.assertEquals(bean1, bean2);
-
-        assertEquals("BeanWrapper<TestBean>.beanClassName", beanWrapper1.getClazz(),
-            beanWrapper2.getClazz());
-        assertEquals("BeanWrapper<TestBean>.props",
-            BeanWrapper.propertyValueByName(beanWrapper1.getTypedProperties()),
-            BeanWrapper.propertyValueByName(beanWrapper2.getTypedProperties()));
-    }
-
-    @Test
-    public void testGetPropertiesAllProvided() {
-        BeanWrapper<TestBean> beanWrapper = new BeanWrapper<>(TestBean.class);
-
-        Map<String, String> expectedProps = new HashMap<>();
-        expectedProps.put("a", "1");
-        expectedProps.put("b", "foo");
-        expectedProps.put("c", "1,2,3");
-        expectedProps.put("d", "a,b,c");
-
-        beanWrapper.setProperties(expectedProps);
-        Map<String, String> actualProps = BeanWrapper
-            .propertyValueByName(beanWrapper.getTypedProperties());
-        assertEquals(expectedProps, actualProps);
-    }
-
-    /**
-     * Simulate construction of the object after loading from the db.
-     *
-     * @throws Exception
-     */
-    @Test
-    public void constructFromHibernateLoad() throws Exception {
-        Map<String, String> props = new HashMap<>();
-        props.put("a", "42");
-        props.put("b", "xyzzy");
-        props.put("c", "1,3,5,7,11");
-        props.put("d", "a--.1,b_.1,c.1");
-
-        BeanWrapper<TestBean> beanWrapper = new BeanWrapper<>();
-        beanWrapper.setClazz(TestBean.class);
-        beanWrapper.setProperties(props);
-
-        TestBean expectedBean = new TestBean(42, "xyzzy", new int[] { 1, 3, 5, 7, 11 },
-            new String[] { "a--.1", "b_.1", "c.1" });
-        TestBean actualBean = beanWrapper.getInstance();
-
-        ReflectionEquals comparator = new ReflectionEquals();
-        comparator.assertEquals(expectedBean, actualBean);
-    }
-
-    @Test
-    public void constructFromHibernateLoadWithNulls() throws Exception {
-        Map<String, String> props = new HashMap<>();
-        props.put("a", "42");
-        props.put("b", "foo");
-        props.put("c", "1,3,5,7,11");
-        props.put("d", "a--.1,b_.1,c.1");
-
-        BeanWrapper<TestBean> beanWrapper = new BeanWrapper<>();
-        beanWrapper.setClazz(TestBean.class);
-        beanWrapper.setProperties(props);
-
-        TestBean expectedBean = new TestBean(42, "foo", new int[] { 1, 3, 5, 7, 11 },
-            new String[] { "a--.1", "b_.1", "c.1" });
-        TestBean actualBean = beanWrapper.getInstance();
-
-        ReflectionEquals comparator = new ReflectionEquals();
-        comparator.assertEquals(expectedBean, actualBean);
-    }
-
-    @Test
-    public void testPopulate() throws Exception {
-        Map<String, String> props = new HashMap<>();
-        props.put("a", "42");
-        props.put("b", "xyzzy");
-        props.put("c", "1,3,5,7,11");
-        props.put("d", "a,b,c");
-
-        BeanWrapper<TestBean> beanWrapper = new BeanWrapper<>(TestBean.class);
-
-        beanWrapper.setProperties(props);
-
-        TestBean expectedBean = new TestBean(42, "xyzzy", new int[] { 1, 3, 5, 7, 11 },
-            new String[] { "a", "b", "c" });
-        TestBean actualBean = beanWrapper.getInstance();
-
-        ReflectionEquals comparator = new ReflectionEquals();
-        comparator.assertEquals(expectedBean, actualBean);
-    }
-
-    @Test
-    public void testGetProps() throws Exception {
-        Map<String, String> expectedProps = new HashMap<>();
-        expectedProps.put("a", "42");
-        expectedProps.put("b", "xyzzy");
-        expectedProps.put("c", "1,3,5,7,11");
-        expectedProps.put("d", "a,b,c");
-
-        TestBean bean = new TestBean(42, "xyzzy", new int[] { 1, 3, 5, 7, 11 },
-            new String[] { "a", "b", "c" });
-        BeanWrapper<TestBean> beanWrapper = new BeanWrapper<>(bean);
-
-        assertEquals("BeanWrapper<TestBean>.props", expectedProps,
-            BeanWrapper.propertyValueByName(beanWrapper.getTypedProperties()));
-    }
-
-    /**
-     * Tests that {@link BeanWrapper#getAllPropertyNames()} returns all bean properties, even those
-     * that are not set.
-     */
-    @Test
-    public void testAllPropNames() {
-        Map<String, String> expectedProps = new HashMap<>();
-        expectedProps.put("a", "42");
-        expectedProps.put("c", "1,3,5,7,11");
-
-        // Add some properties for bean initialization that have empty and
-        // null values. These should be ignored when getting the non-empty
-        // properties.
-        Map<String, String> allProps = new HashMap<>();
-        for (Map.Entry<String, String> entry : expectedProps.entrySet()) {
-            allProps.put(entry.getKey(), entry.getValue());
-        }
-
-        BeanWrapper<TestBean> beanWrapper = new BeanWrapper<>(TestBean.class);
-        beanWrapper.setProperties(allProps);
-
-        Set<String> expectedPropNames = ImmutableSet.of("a", "b", "c", "d");
-        assertEquals(expectedPropNames, beanWrapper.getAllPropertyNames());
-    }
-
-    /**
-     * Tests that {@link BeanWrapper#getAllPropertyNames()} returns properties from derived classes.
-     */
-    @Test
-    public void testGetAllDerivedProps() {
-        Map<String, String> providedProps = new HashMap<>();
-        providedProps.put("a", "42");
-        providedProps.put("b", "xyzzy");
-        providedProps.put("c", "1,3,5,7,11");
-        providedProps.put("d", "a,b,c");
-
-        BeanWrapper<DerivedBean> beanWrapper = new BeanWrapper<>(DerivedBean.class);
-        beanWrapper.setProperties(providedProps);
-
-        Set<String> expectedNames = ImmutableSet.of("a", "b", "c", "d", "e");
-        assertEquals(expectedNames, beanWrapper.getAllPropertyNames());
-    }
-
-    /**
-     * Tests that {@link BeanWrapper#getInstance()} leaves null those bean properties for which
-     * empty or all-whitespace string values were provided.
-     */
-    @Test
-    public void testEmptyProps() {
-        Map<String, String> props = new HashMap<>();
-        props.put("iValue", " ");
-        props.put("sValue", " ");
-        props.put("iArray", " ");
-        props.put("sArray", " ");
-
-        BeanWrapper<NullableBean> beanWrapper = new BeanWrapper<>(NullableBean.class);
-        beanWrapper.setProperties(props);
-
-        NullableBean instance = beanWrapper.getInstance();
-
-        assertEquals(0, instance.getiValue());
-        assertEquals("", instance.getsValue());
-        assertEquals(0, instance.getiArray().length);
-        assertEquals(0, instance.getsArray().length);
-    }
-
-    /**
-     * Tests that instantiating a bean with inherited fields and no supplied properties correctly
-     * handles those fields that don't have a zero-argument constructor.
-     */
-    @Test
-    public void testNullPropsWithInheritedFields() {
-        Map<String, String> props = new HashMap<>();
-        BeanWrapper<DerivedNullableBean> beanWrapper = new BeanWrapper<>(DerivedNullableBean.class);
-        beanWrapper.setProperties(props);
-
-        DerivedNullableBean instance = beanWrapper.getInstance();
-
-        assertEquals(0, instance.getiValue());
-        assertEquals("", instance.getsValue());
-        assertEquals(0, instance.getiArray().length);
-        assertEquals(0, instance.getsArray().length);
-    }
-
-    /**
-     * A bean that inherits from another bean, testing derived class property access.
-     */
-    public static class DerivedBean extends TestBean {
-
-        private String e;
-
-        public String getE() {
-            return e;
-        }
-
-        public void setE(String e) {
-            this.e = e;
-        }
-
-    }
-
-    /**
-     * A bean for testing that has fields that can contain nulls.
-     */
-    public static class NullableBean {
-
-        private int iValue;
-
-        private String sValue;
-
-        private int[] iArray;
-
-        private String[] sArray;
-
-        public int getiValue() {
-            return iValue;
-        }
-
-        public void setiValue(int iValue) {
-            this.iValue = iValue;
-        }
-
-        public String getsValue() {
-            return sValue;
-        }
-
-        public void setsValue(String sValue) {
-            this.sValue = sValue;
-        }
-
-        public int[] getiArray() {
-            return iArray;
-        }
-
-        public void setiArray(int[] iArray) {
-            this.iArray = iArray;
-        }
-
-        public String[] getsArray() {
-            return sArray;
-        }
-
-        public void setsArray(String[] sArray) {
-            this.sArray = sArray;
-        }
-
-    }
-
-    /**
-     * Implements a derived bean that inherits its fields, so that field access won't work and bean
-     * methods must be used.
-     */
-    public static class DerivedNullableBean extends NullableBean {
-
-        // Nothing added.
-
-    }
-
-}
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/ClassWrapperTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/ClassWrapperTest.java
new file mode 100644
index 0000000..4d5dea2
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/ClassWrapperTest.java
@@ -0,0 +1,87 @@
+package gov.nasa.ziggy.pipeline.definition;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import gov.nasa.ziggy.module.remote.RemoteParameters;
+import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
+
+public class ClassWrapperTest {
+
+    @Test
+    public void testSimpleClassConstructor() {
+        ClassWrapper<Foo> fooWrapper = new ClassWrapper<>(Foo.class);
+        assertEquals("gov.nasa.ziggy.pipeline.definition.ClassWrapperTest$Foo",
+            fooWrapper.getClassName());
+        assertEquals(Foo.class, fooWrapper.getClazz());
+        assertEquals("gov.nasa.ziggy.pipeline.definition.ClassWrapperTest$Foo",
+            fooWrapper.unmangledClassName());
+        assertEquals(Foo.class, fooWrapper.newInstance().getClass());
+    }
+
+    @Test
+    public void testExtendedClassConstructor() {
+        ClassWrapper<Foo> fooWrapper = new ClassWrapper<>(Bar.class);
+        assertEquals("gov.nasa.ziggy.pipeline.definition.ClassWrapperTest$Bar",
+            fooWrapper.getClassName());
+        assertEquals(Bar.class, fooWrapper.getClazz());
+        assertEquals("gov.nasa.ziggy.pipeline.definition.ClassWrapperTest$Bar",
+            fooWrapper.unmangledClassName());
+        assertEquals(Bar.class, fooWrapper.newInstance().getClass());
+    }
+
+    @Test
+    public void testInstanceConstructor() {
+        ClassWrapper<Foo> fooWrapper = new ClassWrapper<>(new Foo());
+        assertEquals("gov.nasa.ziggy.pipeline.definition.ClassWrapperTest$Foo",
+            fooWrapper.getClassName());
+        assertEquals(Foo.class, fooWrapper.getClazz());
+        assertEquals("gov.nasa.ziggy.pipeline.definition.ClassWrapperTest$Foo",
+            fooWrapper.unmangledClassName());
+        assertEquals(Foo.class, fooWrapper.newInstance().getClass());
+    }
+
+    @Test
+    public void testExtendedInstanceConstructor() {
+        ClassWrapper<Foo> fooWrapper = new ClassWrapper<>(new Bar());
+        assertEquals("gov.nasa.ziggy.pipeline.definition.ClassWrapperTest$Bar",
+            fooWrapper.getClassName());
+        assertEquals(Bar.class, fooWrapper.getClazz());
+        assertEquals("gov.nasa.ziggy.pipeline.definition.ClassWrapperTest$Bar",
+            fooWrapper.unmangledClassName());
+        assertEquals(Bar.class, fooWrapper.newInstance().getClass());
+    }
+
+    @Test
+    public void testParameterSetConstructor() {
+        ParameterSet paramSet = new ParameterSet();
+        Parameters params = new Parameters();
+        paramSet.populateFromParametersInstance(params);
+        paramSet.setName("foo");
+        ClassWrapper<ParametersInterface> paramWrapper = new ClassWrapper<>(paramSet);
+        assertEquals("gov.nasa.ziggy.parameters.Parameters foo", paramWrapper.getClassName());
+        assertEquals("gov.nasa.ziggy.parameters.Parameters", paramWrapper.unmangledClassName());
+        assertEquals(Parameters.class, paramWrapper.getClazz());
+    }
+
+    @Test
+    public void testParameterSetSubclassConstructor() {
+        ParameterSet paramSet = new ParameterSet();
+        RemoteParameters params = new RemoteParameters();
+        paramSet.populateFromParametersInstance(params);
+        paramSet.setName("foo");
+        ClassWrapper<ParametersInterface> paramWrapper = new ClassWrapper<>(paramSet);
+        assertEquals("gov.nasa.ziggy.module.remote.RemoteParameters", paramWrapper.getClassName());
+        assertEquals("gov.nasa.ziggy.module.remote.RemoteParameters",
+            paramWrapper.unmangledClassName());
+        assertEquals(RemoteParameters.class, paramWrapper.getClazz());
+    }
+
+    public static class Foo {
+    }
+
+    public static class Bar extends Foo {
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/DatastoreProducerConsumerTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/DatastoreProducerConsumerTest.java
index 230123a..3463d97 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/DatastoreProducerConsumerTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/DatastoreProducerConsumerTest.java
@@ -29,7 +29,5 @@ public void testResultsOriginatorMethods() {
             DatastoreProducerConsumer.DataReceiptFileType.DATA);
         assertEquals(FILE_SPEC, r.getFilename());
         assertEquals(TASK_ID, r.getProducer());
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/FakePipelineTaskFactory.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/FakePipelineTaskFactory.java
index 069fbea..8edbdff 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/FakePipelineTaskFactory.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/FakePipelineTaskFactory.java
@@ -2,7 +2,7 @@
 
 import java.util.Date;
 
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.crud.SimpleCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.ParameterSetCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
@@ -14,7 +14,6 @@
 import gov.nasa.ziggy.services.security.UserCrud;
 import gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.UnitOfWork;
-import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
 
 /**
  * Creates a debug pipeline task object. This is useful for testing hibernate objects that need a
@@ -50,9 +49,9 @@ public PipelineTask newTask(boolean inDb) {
             // create a module param set def
             ParameterSet parameterSet = new ParameterSet(new AuditInfo(testUser, new Date()),
                 "test mps1");
-            parameterSet.setParameters(new BeanWrapper<Parameters>(new TestModuleParameters()));
+            parameterSet.setTypedParameters(new TestModuleParameters().getParameters());
             if (inDb) {
-                parameterSetCrud.create(parameterSet);
+                parameterSet = parameterSetCrud.merge(parameterSet);
             }
 
             // create a module def
@@ -60,42 +59,41 @@ public PipelineTask newTask(boolean inDb) {
             PipelineDefinition pipelineDef = new PipelineDefinition(
                 new AuditInfo(testUser, new Date()), "test pipeline name");
             if (inDb) {
-                pipelineModuleDefinitionCrud.create(moduleDef);
-                pipelineDefinitionCrud.create(pipelineDef);
-
+                moduleDef = pipelineModuleDefinitionCrud.merge(moduleDef);
+                pipelineDef = pipelineDefinitionCrud.merge(pipelineDef);
             }
 
             // create some pipeline def nodes
             PipelineDefinitionNode pipelineDefNode1 = new PipelineDefinitionNode(
-                moduleDef.getName(), pipelineDef.getName().getName());
-            pipelineDefNode1.setUnitOfWorkGenerator(
-                new ClassWrapper<UnitOfWorkGenerator>(new SingleUnitOfWorkGenerator()));
+                moduleDef.getName(), pipelineDef.getName());
+            pipelineDefNode1
+                .setUnitOfWorkGenerator(new ClassWrapper<>(new SingleUnitOfWorkGenerator()));
             pipelineDefNode1.setStartNewUow(true);
-
+            pipelineDefNode1 = new SimpleCrud<>().merge(pipelineDefNode1);
             pipelineDef.getRootNodes().add(pipelineDefNode1);
             if (inDb) {
-                pipelineDefinitionCrud.create(pipelineDef);
+                pipelineDef = pipelineDefinitionCrud.merge(pipelineDef);
             }
 
             PipelineInstance pipelineInstance = new PipelineInstance(pipelineDef);
-            pipelineInstance.putParameterSet(
-                new ClassWrapper<Parameters>(new TestPipelineParameters()), parameterSet);
+            pipelineInstance.putParameterSet(new ClassWrapper<>(new TestPipelineParameters()),
+                parameterSet);
             if (inDb) {
-                pipelineInstanceCrud.create(pipelineInstance);
+                pipelineInstanceCrud.persist(pipelineInstance);
             }
 
             PipelineInstanceNode pipelineInstanceNode1 = new PipelineInstanceNode(pipelineInstance,
                 pipelineDefNode1, moduleDef);
             if (inDb) {
-                pipelineInstanceNodeCrud.create(pipelineInstanceNode1);
+                pipelineInstanceNodeCrud.persist(pipelineInstanceNode1);
             }
 
             PipelineTask task = new PipelineTask(pipelineInstance, pipelineInstanceNode1);
-            task.setUowTask(new BeanWrapper<>(new UnitOfWork()));
+            task.setUowTaskParameters(new UnitOfWork().getParameters());
             task.setWorkerHost("test worker name");
             task.setSoftwareRevision("42");
             if (inDb) {
-                pipelineTaskCrud.create(task);
+                pipelineTaskCrud.persist(task);
             }
             return task;
         });
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/ModelMetadataTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/ModelMetadataTest.java
index 5037c70..a7f1533 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/ModelMetadataTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/ModelMetadataTest.java
@@ -85,7 +85,6 @@ public void testConstructorNoExistingVersion() {
         assertEquals(modelType3, modelMetadata.getModelType());
         assertFalse(modelMetadata.isLocked());
         assertEquals(fixedDate, modelMetadata.getImportTime());
-
     }
 
     @Test
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/ModelTypeTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/ModelTypeTest.java
index 99b9251..2d3bb24 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/ModelTypeTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/ModelTypeTest.java
@@ -72,5 +72,4 @@ public void testVersionNumber() {
         modelType.validate();
         assertTrue(modelType.versionNumber(s1).isEmpty());
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionFileTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionFileTest.java
index dcb0be1..8e53647 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionFileTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionFileTest.java
@@ -18,6 +18,7 @@
 import org.junit.Test;
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
+import gov.nasa.ziggy.util.io.FileUtil;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.SchemaOutputResolver;
@@ -50,7 +51,8 @@ public void setUp() {
     public void testGenerateSchema() throws JAXBException, IOException {
         JAXBContext context = JAXBContext.newInstance(PipelineDefinitionFile.class);
         context.generateSchema(new PipelineFileSchemaResolver());
-        List<String> schemaContent = Files.readAllLines(schemaFile.toPath());
+        List<String> schemaContent = Files.readAllLines(schemaFile.toPath(),
+            FileUtil.ZIGGY_CHARSET);
 
         assertContains(schemaContent,
             "<xs:element name=\"pipelineDefinition\" type=\"pipelineDefinitionFile\"/>");
@@ -88,20 +90,16 @@ public void testGenerateSchema() throws JAXBException, IOException {
         assertContains(complexTypeContent,
             "<xs:attribute name=\"name\" type=\"xs:string\" use=\"required\"/>");
         assertContains(complexTypeContent,
-            "<xs:attribute name=\"instancePriority\" type=\"xs:int\"/>");
+            "<xs:attribute name=\"instancePriority\" type=\"xs:string\"/>");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"rootNodeNames\" type=\"xs:string\" use=\"required\"/>");
         assertContains(complexTypeContent,
-            "<xs:element name=\"pipelineParameter\" type=\"parameterSetName\"/>");
-
-        complexTypeContent = complexTypeContent(schemaContent,
-            "<xs:complexType name=\"parameterSetName\">");
-        assertContains(complexTypeContent, "<xs:extension base=\"xmlReference\">");
+            "<xs:element name=\"pipelineParameter\" type=\"parameterSetReference\"/>");
 
         complexTypeContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"pipelineDefinitionNode\">");
         assertContains(complexTypeContent,
-            "<xs:element name=\"moduleParameter\" type=\"parameterSetName\"/>");
+            "<xs:element name=\"moduleParameter\" type=\"parameterSetReference\"/>");
         assertContains(complexTypeContent,
             "<xs:element name=\"inputDataFileType\" type=\"inputTypeReference\"/>");
         assertContains(complexTypeContent,
@@ -129,6 +127,10 @@ public void testGenerateSchema() throws JAXBException, IOException {
             "<xs:complexType name=\"modelTypeReference\">");
         assertContains(complexTypeContent, "<xs:extension base=\"xmlReference\">");
 
+        complexTypeContent = complexTypeContent(schemaContent,
+            "<xs:complexType name=\"parameterSetReference\">");
+        assertContains(complexTypeContent, "<xs:extension base=\"xmlReference\">");
+
         complexTypeContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"xmlReference\">");
         assertContains(complexTypeContent,
@@ -142,7 +144,7 @@ public void testUnmarshaller() throws JAXBException {
         PipelineDefinitionFile pipelineDefinitionFile = (PipelineDefinitionFile) unmarshaller
             .unmarshal(xmlUnmarshalingFile);
         assertEquals(1, pipelineDefinitionFile.getPipelines().size());
-        assertEquals(4, pipelineDefinitionFile.getModules().size());
+        assertEquals(2, pipelineDefinitionFile.getModules().size());
     }
 
     private class PipelineFileSchemaResolver extends SchemaOutputResolver {
@@ -154,7 +156,5 @@ public Result createOutput(String namespaceUri, String suggestedFileName)
             result.setSystemId(schemaFile.toURI().toURL().toString());
             return result;
         }
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNodeTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNodeTest.java
index 720038e..5848937 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNodeTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionNodeTest.java
@@ -26,7 +26,9 @@
 import gov.nasa.ziggy.pipeline.xml.XmlReference.InputTypeReference;
 import gov.nasa.ziggy.pipeline.xml.XmlReference.ModelTypeReference;
 import gov.nasa.ziggy.pipeline.xml.XmlReference.OutputTypeReference;
+import gov.nasa.ziggy.pipeline.xml.XmlReference.ParameterSetReference;
 import gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator;
+import gov.nasa.ziggy.util.io.FileUtil;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
@@ -61,18 +63,17 @@ public void setUp() {
         schemaFile = directoryRule.directory().resolve("node.xsd").toFile();
 
         // Construct a new node for the test
-        node = new Node(new ModuleName("module 1"), null);
+        node = new Node("module 1", null);
         node.setStartNewUow(true);
         node.setUnitOfWorkGenerator(new ClassWrapper<>(SingleUnitOfWorkGenerator.class));
         node.setChildNodeNames("module 2, module 3");
         Set<XmlReference> xmlReferences = new HashSet<>();
-        xmlReferences.add(new ParameterSetName("Remote execution"));
-        xmlReferences.add(new ParameterSetName("Convergence criteria"));
+        xmlReferences.add(new ParameterSetReference("Remote execution"));
+        xmlReferences.add(new ParameterSetReference("Convergence criteria"));
         xmlReferences.add(new InputTypeReference("flight L0 data"));
         xmlReferences.add(new OutputTypeReference("flight L1 data"));
         xmlReferences.add(new ModelTypeReference("calibration constants"));
         node.setXmlReferences(xmlReferences);
-
     }
 
     @Test
@@ -82,10 +83,10 @@ public void testMarshaller() throws JAXBException, IOException {
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
         marshaller.marshal(node, xmlFile);
         assertTrue(xmlFile.exists());
-        List<String> xmlContent = Files.readAllLines(xmlFile.toPath());
+        List<String> xmlContent = Files.readAllLines(xmlFile.toPath(), FileUtil.ZIGGY_CHARSET);
         assertEquals(8, xmlContent.size());
         List<String> nodeContent = nodeContent(xmlContent,
-            "<node startNewUow=\"true\" "
+            "<node startNewUow=\"true\" " + "maxWorkers=\"0\" " + "heapSizeMb=\"0\" "
                 + "uowGenerator=\"gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator\" "
                 + "moduleName=\"module 1\" childNodeNames=\"module 2, module 3\">");
         String[] xmlLines = { "<moduleParameter name=\"Convergence criteria\"/>",
@@ -103,13 +104,12 @@ public void testUnmarshaller() throws JAXBException {
         JAXBContext context = JAXBContext.newInstance(Node.class);
         Unmarshaller unmarshaller = context.createUnmarshaller();
         PipelineDefinitionNode node = (Node) unmarshaller.unmarshal(xmlUnmarshalingFile);
-        assertEquals("module 1", node.getModuleName().getName());
+        assertEquals("module 1", node.getModuleName());
         assertTrue(node.isStartNewUow());
         assertEquals("module 2, module 3", node.getChildNodeNames());
         assertEquals(2, node.getParameterSetNames().size());
-        assertTrue(node.getParameterSetNames().contains(new ParameterSetName("Remote execution")));
-        assertTrue(
-            node.getParameterSetNames().contains(new ParameterSetName("Convergence criteria")));
+        assertTrue(node.getParameterSetNames().contains("Remote execution"));
+        assertTrue(node.getParameterSetNames().contains("Convergence criteria"));
         assertEquals(1, node.getInputDataFileTypeReferences().size());
         assertTrue(node.getInputDataFileTypeReferences()
             .contains(new InputTypeReference("flight L0 data")));
@@ -125,7 +125,8 @@ public void testUnmarshaller() throws JAXBException {
     public void testGenerateSchema() throws JAXBException, IOException {
         JAXBContext context = JAXBContext.newInstance(Node.class);
         context.generateSchema(new NodeSchemaResolver());
-        List<String> schemaContent = Files.readAllLines(schemaFile.toPath());
+        List<String> schemaContent = Files.readAllLines(schemaFile.toPath(),
+            FileUtil.ZIGGY_CHARSET);
         assertContains(schemaContent, "<xs:element name=\"node\" type=\"node\"/>");
 
         List<String> nodeContent = complexTypeContent(schemaContent,
@@ -134,22 +135,20 @@ public void testGenerateSchema() throws JAXBException, IOException {
 
         nodeContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"pipelineDefinitionNode\">");
-        String[] nodeStrings = { "<xs:element name=\"moduleParameter\" type=\"parameterSetName\"/>",
+        String[] nodeStrings = {
+            "<xs:element name=\"moduleParameter\" type=\"parameterSetReference\"/>",
             "<xs:element name=\"inputDataFileType\" type=\"inputTypeReference\"/>",
             "<xs:element name=\"outputDataFileType\" type=\"outputTypeReference\"/>",
             "<xs:element name=\"modelType\" type=\"modelTypeReference\"/>",
             "<xs:attribute name=\"startNewUow\" type=\"xs:boolean\"/>",
             "<xs:attribute name=\"uowGenerator\" type=\"xs:string\"/>",
+            "<xs:attribute name=\"maxWorkers\" type=\"xs:int\"/>",
             "<xs:attribute name=\"moduleName\" type=\"xs:string\" use=\"required\"/>",
             "<xs:attribute name=\"childNodeNames\" type=\"xs:string\"/>" };
         for (String nodeString : nodeStrings) {
             assertContains(nodeContent, nodeString);
         }
 
-        List<String> paramSetContent = complexTypeContent(schemaContent,
-            "<xs:complexType name=\"parameterSetName\">");
-        assertContains(paramSetContent, "<xs:extension base=\"xmlReference\">");
-
         List<String> xmlReferenceContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"xmlReference\">");
         assertContains(xmlReferenceContent,
@@ -166,24 +165,28 @@ public void testGenerateSchema() throws JAXBException, IOException {
         xmlReferenceContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"modelTypeReference\">");
         assertContains(xmlReferenceContent, "<xs:extension base=\"xmlReference\">");
+
+        xmlReferenceContent = complexTypeContent(schemaContent,
+            "<xs:complexType name=\"parameterSetReference\">");
+        assertContains(xmlReferenceContent, "<xs:extension base=\"xmlReference\">");
     }
 
     @Test
     public void testNodeListConstruction() {
 
-        PipelineDefinitionNode node2 = new PipelineDefinitionNode(new ModuleName("module 2"), null);
+        PipelineDefinitionNode node2 = new PipelineDefinitionNode("module 2", null);
         node2.setStartNewUow(true);
-        node2.addXmlReference(new ParameterSetName("Remote execution"));
-        node2.addXmlReference(new ParameterSetName("Convergence criteria"));
+        node2.addXmlReference(new ParameterSetReference("Remote execution"));
+        node2.addXmlReference(new ParameterSetReference("Convergence criteria"));
         node2.addXmlReference(new InputTypeReference("flight L1 data"));
         node2.addXmlReference(new OutputTypeReference("flight L2 data"));
         node2.addXmlReference(new ModelTypeReference("georeferencing constants"));
 
         node.addNextNode(node2);
 
-        PipelineDefinitionNode node3 = new PipelineDefinitionNode(new ModuleName("module 3"), null);
+        PipelineDefinitionNode node3 = new PipelineDefinitionNode("module 3", null);
         node3.setStartNewUow(true);
-        node3.addXmlReference(new ParameterSetName("Excluded bands"));
+        node3.addXmlReference(new ParameterSetReference("Excluded bands"));
         node3.addXmlReference(new InputTypeReference("flight L1 data"));
         node3.addXmlReference(new OutputTypeReference("flight L2 data"));
         node3.addXmlReference(new ModelTypeReference("Temperature references"));
@@ -204,7 +207,6 @@ public Result createOutput(String namespaceUri, String suggestedFileName)
             result.setSystemId(schemaFile.toURI().toURL().toString());
             return result;
         }
-
     }
 
     /**
@@ -223,9 +225,8 @@ private static class Node extends PipelineDefinitionNode {
         public Node() {
         }
 
-        public Node(ModuleName pipelineModuleDefinitionName, String pipelineDefinitionName) {
+        public Node(String pipelineModuleDefinitionName, String pipelineDefinitionName) {
             super(pipelineModuleDefinitionName, pipelineDefinitionName);
         }
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionOperationsTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionOperationsTest.java
index 71bda11..95ca1c6 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionOperationsTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionOperationsTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.pipeline.definition;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
@@ -19,14 +19,15 @@
 import gov.nasa.ziggy.ZiggyDatabaseRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
 import gov.nasa.ziggy.ZiggyUnitTestUtils;
-import gov.nasa.ziggy.parameters.DefaultParameters;
 import gov.nasa.ziggy.parameters.ParameterLibraryImportExportCli.ParamIoMode;
 import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.parameters.ParametersOperations;
 import gov.nasa.ziggy.pipeline.PipelineExecutor;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.supervisor.PipelineSupervisor;
 
 /**
  * Implements unit tests for the {@link PipelineDefinitionOperations} class. Because of the
@@ -38,12 +39,14 @@ public class PipelineDefinitionOperationsTest {
     public ZiggyDatabaseRule databaseRule = new ZiggyDatabaseRule();
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, DirectoryProperties.ziggyCodeBuildDir().toString());
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
 
     @Test
     public void testMultipleDefaultParamSets() throws Exception {
 
+        // Use the PipelineSupervisor constructor to set the worker count.
+        new PipelineSupervisor(1, 1000);
         // Define the path to the pipeline definitions directory
         Path pipelineDefsDir = ZiggyUnitTestUtils.TEST_DATA.resolve("classwrapper");
 
@@ -55,7 +58,7 @@ public void testMultipleDefaultParamSets() throws Exception {
             return null;
         });
 
-        // Read in the pipeline definition that has 2 instances of DefaultParameters
+        // Read in the pipeline definition that has 2 instances of Parameters
         // attached to it.
         DatabaseTransactionFactory.performTransaction(() -> {
             new PipelineDefinitionOperations().importPipelineConfiguration(Sets
@@ -73,27 +76,24 @@ public void testMultipleDefaultParamSets() throws Exception {
             });
 
         // Check the contents of the parameter set map.
-        Map<ClassWrapper<Parameters>, ParameterSetName> parsMap = pipelineDef
+        Map<ClassWrapper<ParametersInterface>, String> parsMap = pipelineDef
             .getPipelineParameterSetNames();
         assertEquals(2, parsMap.size());
-        for (Map.Entry<ClassWrapper<Parameters>, ParameterSetName> mapEntry : parsMap.entrySet()) {
-            assertEquals("gov.nasa.ziggy.parameters.DefaultParameters",
+        for (Map.Entry<ClassWrapper<ParametersInterface>, String> mapEntry : parsMap.entrySet()) {
+            assertEquals("gov.nasa.ziggy.parameters.Parameters",
                 mapEntry.getKey().unmangledClassName());
-            assertEquals(
-                "gov.nasa.ziggy.parameters.DefaultParameters " + mapEntry.getValue().getName(),
+            assertEquals("gov.nasa.ziggy.parameters.Parameters " + mapEntry.getValue(),
                 mapEntry.getKey().getClassName());
 
             // Make sure that newInstance() works.
-            assertEquals(DefaultParameters.class, mapEntry.getKey().newInstance().getClass());
+            assertEquals(Parameters.class, mapEntry.getKey().newInstance().getClass());
         }
 
         // Create a pipeline instance for this pipeline
-        PipelineInstance pipelineInstance = (PipelineInstance) DatabaseTransactionFactory
-            .performTransaction(
-                () -> new PipelineExecutor().launch(pipelineDef, "instance-name", null, null)
-                    .getPipelineInstance());
+        PipelineInstance pipelineInstance = new PipelineExecutor().launch(pipelineDef,
+            "instance-name", null, null, null);
 
-        Map<ClassWrapper<Parameters>, ParameterSet> pipelineParameters = pipelineInstance
+        Map<ClassWrapper<ParametersInterface>, ParameterSet> pipelineParameters = pipelineInstance
             .getPipelineParameterSets();
         assertEquals(2, pipelineParameters.size());
 
@@ -103,22 +103,23 @@ public void testMultipleDefaultParamSets() throws Exception {
 
     private void checkParameterSetValues(Collection<ParameterSet> parameterSets) {
         for (ParameterSet parameterSet : parameterSets) {
-            DefaultParameters pars = (DefaultParameters) parameterSet.getParameters().getInstance();
-            if (parameterSet.getName().getName().equals("Sample classless parameter set")) {
-                assertEquals(3, pars.getParameters().size());
-                assertEquals(100, pars.getParameter("z1").getValue());
-                assertEquals("some text", pars.getParameter("z3").getValue());
-                float[] floatArray = (float[]) pars.getParameter("z2").getValue();
+            Parameters parameters = new Parameters();
+            parameters.setParameters(parameterSet.getTypedParameters());
+            if (parameterSet.getName().equals("Sample classless parameter set")) {
+                assertEquals(3, parameters.getParameters().size());
+                assertEquals(100, parameters.getParameter("z1").getValue());
+                assertEquals("some text", parameters.getParameter("z3").getValue());
+                float[] floatArray = (float[]) parameters.getParameter("z2").getValue();
                 assertEquals(2, floatArray.length);
                 assertEquals(28.56, floatArray[0], 1e-3);
                 assertEquals(57.12, floatArray[1], 1e-3);
             } else {
-                assertEquals("ISOFIT module parameters", parameterSet.getName().getName());
-                assertEquals(4, pars.getParameters().size());
-                assertEquals(4, pars.getParameter("n_cores").getValue());
-                assertEquals(false, pars.getParameter("use_hyperthreading").getValue());
-                assertEquals(true, pars.getParameter("presolve").getValue());
-                assertEquals(true, pars.getParameter("empirical_line").getValue());
+                assertEquals("ISOFIT module parameters", parameterSet.getName());
+                assertEquals(4, parameters.getParameters().size());
+                assertEquals(4, parameters.getParameter("n_cores").getValue());
+                assertEquals(false, parameters.getParameter("use_hyperthreading").getValue());
+                assertEquals(true, parameters.getParameter("presolve").getValue());
+                assertEquals(true, parameters.getParameter("empirical_line").getValue());
             }
         }
     }
@@ -140,5 +141,4 @@ private void verifyParsing(String value, String[] elements) {
         List<String> actual = PipelineDefinitionOperations.splitAndListifyString(value);
         assertEquals(expected, actual);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionTest.java
index 129e817..f37e02c 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineDefinitionTest.java
@@ -25,11 +25,14 @@
 import org.junit.Test;
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
-import gov.nasa.ziggy.parameters.DefaultParameters;
+import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.Priority;
 import gov.nasa.ziggy.pipeline.xml.XmlReference.InputTypeReference;
 import gov.nasa.ziggy.pipeline.xml.XmlReference.ModelTypeReference;
 import gov.nasa.ziggy.pipeline.xml.XmlReference.OutputTypeReference;
+import gov.nasa.ziggy.pipeline.xml.XmlReference.ParameterSetReference;
 import gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator;
+import gov.nasa.ziggy.util.io.FileUtil;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
@@ -65,26 +68,26 @@ public void setUp() {
         schemaFile = directoryRule.directory().resolve("pipeline-definition.xsd").toFile();
 
         // Create some nodes
-        PipelineDefinitionNode node1 = new PipelineDefinitionNode(new ModuleName("module 1"), null);
+        PipelineDefinitionNode node1 = new PipelineDefinitionNode("module 1", null);
         node1.setStartNewUow(true);
         node1.setUnitOfWorkGenerator(new ClassWrapper<>(SingleUnitOfWorkGenerator.class));
-        node1.addXmlReference(new ParameterSetName("Remote execution"));
-        node1.addXmlReference(new ParameterSetName("Convergence criteria"));
+        node1.addXmlReference(new ParameterSetReference("Remote execution"));
+        node1.addXmlReference(new ParameterSetReference("Convergence criteria"));
         node1.addXmlReference(new InputTypeReference("flight L0 data"));
         node1.addXmlReference(new OutputTypeReference("flight L1 data"));
         node1.addXmlReference(new ModelTypeReference("calibration constants"));
 
-        PipelineDefinitionNode node2 = new PipelineDefinitionNode(new ModuleName("module 2"), null);
+        PipelineDefinitionNode node2 = new PipelineDefinitionNode("module 2", null);
         node2.setStartNewUow(true);
-        node2.addXmlReference(new ParameterSetName("Remote execution"));
-        node2.addXmlReference(new ParameterSetName("Convergence criteria"));
+        node2.addXmlReference(new ParameterSetReference("Remote execution"));
+        node2.addXmlReference(new ParameterSetReference("Convergence criteria"));
         node2.addXmlReference(new InputTypeReference("flight L1 data"));
         node2.addXmlReference(new OutputTypeReference("flight L2 data"));
         node2.addXmlReference(new ModelTypeReference("georeferencing constants"));
 
-        PipelineDefinitionNode node3 = new PipelineDefinitionNode(new ModuleName("module 3"), null);
+        PipelineDefinitionNode node3 = new PipelineDefinitionNode("module 3", null);
         node3.setStartNewUow(true);
-        node3.addXmlReference(new ParameterSetName("Excluded bands"));
+        node3.addXmlReference(new ParameterSetReference("Excluded bands"));
         node3.addXmlReference(new InputTypeReference("flight L1 data"));
         node3.addXmlReference(new OutputTypeReference("flight L2 data"));
         node3.addXmlReference(new ModelTypeReference("Temperature references"));
@@ -92,9 +95,9 @@ public void setUp() {
         node1.addNextNode(node2);
         node1.addNextNode(node3);
 
-        PipelineDefinitionNode node4 = new PipelineDefinitionNode(new ModuleName("module 4"), null);
+        PipelineDefinitionNode node4 = new PipelineDefinitionNode("module 4", null);
         node4.setStartNewUow(true);
-        node4.addXmlReference(new ParameterSetName("Export format"));
+        node4.addXmlReference(new ParameterSetReference("Export format"));
         node4.addXmlReference(new InputTypeReference("flight L2 data"));
         node4.addXmlReference(new OutputTypeReference("exports"));
 
@@ -104,10 +107,9 @@ public void setUp() {
         pipelineDefinition1 = new PipelineDef("pipeline 1");
         pipelineDefinition1.addRootNode(node1);
         pipelineDefinition1.setDescription("first pipeline");
-        pipelineDefinition1.addPipelineParameterSetName(DefaultParameters.class,
+        pipelineDefinition1.addPipelineParameterSetName(Parameters.class,
             new ParameterSet("Pipeline parameters"));
-        pipelineDefinition1.setInstancePriority(2);
-
+        pipelineDefinition1.setInstancePriority(Priority.LOW);
     }
 
     @Test
@@ -117,38 +119,38 @@ public void testMarshaller() throws JAXBException, IOException {
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
         marshaller.marshal(pipelineDefinition1, xmlFile);
         assertTrue(xmlFile.exists());
-        List<String> xmlContent = Files.readAllLines(xmlFile.toPath());
+        List<String> xmlContent = Files.readAllLines(xmlFile.toPath(), FileUtil.ZIGGY_CHARSET);
 
         List<String> pipelineContents = pipelineContent(xmlContent,
-            "<pipeline description=\"first pipeline\" name=\"pipeline 1\" "
-                + "instancePriority=\"2\" rootNodeNames=\"module 1\">");
+            "<pipeline name=\"pipeline 1\" description=\"first pipeline\" "
+                + "instancePriority=\"LOW\" rootNodeNames=\"module 1\">");
         assertContains(pipelineContents, "<pipelineParameter name=\"Pipeline parameters\"/>");
         List<String> nodeContents = nodeContent(pipelineContents,
-            "<node startNewUow=\"true\" uowGenerator=\"gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator\" "
+            "<node startNewUow=\"true\" maxWorkers=\"0\" " + "heapSizeMb=\"0\" "
+                + "uowGenerator=\"gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator\" "
                 + "moduleName=\"module 1\" childNodeNames=\"module 2, module 3\">");
         assertContains(nodeContents, "<moduleParameter name=\"Convergence criteria\"/>");
         assertContains(nodeContents, "<moduleParameter name=\"Remote execution\"/>");
         assertContains(nodeContents, "<inputDataFileType name=\"flight L0 data\"/>");
         assertContains(nodeContents, "<outputDataFileType name=\"flight L1 data\"/>");
-        nodeContents = nodeContent(pipelineContents,
-            "<node startNewUow=\"true\" " + "moduleName=\"module 2\" childNodeNames=\"module 4\">");
+        nodeContents = nodeContent(pipelineContents, "<node startNewUow=\"true\" maxWorkers=\"0\" "
+            + "heapSizeMb=\"0\" " + "moduleName=\"module 2\" childNodeNames=\"module 4\">");
         assertContains(nodeContents, "<moduleParameter name=\"Convergence criteria\"/>");
         assertContains(nodeContents, "<moduleParameter name=\"Remote execution\"/>");
         assertContains(nodeContents, "<inputDataFileType name=\"flight L1 data\"/>");
         assertContains(nodeContents, "<outputDataFileType name=\"flight L2 data\"/>");
         assertContains(nodeContents, "<modelType name=\"georeferencing constants\"/>");
-        nodeContents = nodeContent(pipelineContents,
-            "<node startNewUow=\"true\" moduleName=\"module 3\">");
+        nodeContents = nodeContent(pipelineContents, "<node startNewUow=\"true\" maxWorkers=\"0\" "
+            + "heapSizeMb=\"0\" " + "moduleName=\"module 3\">");
         assertContains(nodeContents, "<moduleParameter name=\"Excluded bands\"/>");
         assertContains(nodeContents, "<inputDataFileType name=\"flight L1 data\"/>");
         assertContains(nodeContents, "<outputDataFileType name=\"flight L2 data\"/>");
         assertContains(nodeContents, "<modelType name=\"Temperature references\"/>");
-        nodeContents = nodeContent(pipelineContents,
-            "<node startNewUow=\"true\" moduleName=\"module 4\">");
+        nodeContents = nodeContent(pipelineContents, "<node startNewUow=\"true\" maxWorkers=\"0\" "
+            + "heapSizeMb=\"0\" " + "moduleName=\"module 4\">");
         assertContains(nodeContents, "<moduleParameter name=\"Export format\"/>");
         assertContains(nodeContents, "<inputDataFileType name=\"flight L2 data\"/>");
         assertContains(nodeContents, "<outputDataFileType name=\"exports\"/>");
-
     }
 
     @Test
@@ -167,7 +169,7 @@ private void comparePipelines(PipelineDefinition groundTruthPipeline,
         assertEquals(groundTruthPipeline.getRootNodeNames(), pipeline.getRootNodeNames());
         assertEquals(groundTruthPipeline.getParameterSetNames().size(),
             pipeline.getParameterSetNames().size());
-        for (ParameterSetName paramSetName : pipeline.getParameterSetNames()) {
+        for (String paramSetName : pipeline.getParameterSetNames()) {
             assertTrue(groundTruthPipeline.getParameterSetNames().contains(paramSetName));
         }
         for (PipelineDefinitionNode node : pipeline.getNodes()) {
@@ -179,7 +181,7 @@ private void checkNode(PipelineDefinitionNode node,
         Collection<PipelineDefinitionNode> groundTruthNodes) {
         PipelineDefinitionNode groundTruthNode = null;
         for (PipelineDefinitionNode loopNode : groundTruthNodes) {
-            if (loopNode.getModuleName().getName().equals(node.getModuleName().getName())) {
+            if (loopNode.getModuleName().equals(node.getModuleName())) {
                 groundTruthNode = loopNode;
                 break;
             }
@@ -196,14 +198,14 @@ private void checkNode(PipelineDefinitionNode node,
             node.getOutputDataFileTypeReferences());
         compareParameterSetReferences(groundTruthNode.getParameterSetNames(),
             node.getParameterSetNames());
-
     }
 
     @Test
     public void testGenerateSchema() throws IOException, JAXBException {
         JAXBContext context = JAXBContext.newInstance(PipelineDef.class);
         context.generateSchema(new PipelineDefinitionListSchemaResolver());
-        List<String> schemaContent = Files.readAllLines(schemaFile.toPath());
+        List<String> schemaContent = Files.readAllLines(schemaFile.toPath(),
+            FileUtil.ZIGGY_CHARSET);
         assertContains(schemaContent, "<xs:element name=\"pipeline\" type=\"pipelineDef\"/>");
 
         List<String> complexTypeContent = complexTypeContent(schemaContent,
@@ -211,24 +213,20 @@ public void testGenerateSchema() throws IOException, JAXBException {
         assertContains(complexTypeContent,
             "<xs:element name=\"node\" type=\"pipelineDefinitionNode\"/>");
         assertContains(complexTypeContent,
-            "<xs:element name=\"pipelineParameter\" " + "type=\"parameterSetName\"/>");
+            "<xs:element name=\"pipelineParameter\" " + "type=\"parameterSetReference\"/>");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"description\" type=\"xs:string\" use=\"required\"/>");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"name\" type=\"xs:string\" use=\"required\"/>");
         assertContains(complexTypeContent,
-            "<xs:attribute name=\"instancePriority\" type=\"xs:int\"/>");
+            "<xs:attribute name=\"instancePriority\" type=\"xs:string\"/>");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"rootNodeNames\" type=\"xs:string\" use=\"required\"/>");
 
-        complexTypeContent = complexTypeContent(schemaContent,
-            "<xs:complexType name=\"parameterSetName\">");
-        assertContains(complexTypeContent, "<xs:extension base=\"xmlReference\">");
-
         complexTypeContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"pipelineDefinitionNode\">");
         assertContains(complexTypeContent,
-            "<xs:element name=\"moduleParameter\" " + "type=\"parameterSetName\"/>");
+            "<xs:element name=\"moduleParameter\" " + "type=\"parameterSetReference\"/>");
         assertContains(complexTypeContent,
             "<xs:element name=\"inputDataFileType\" type=\"inputTypeReference\"/>");
         assertContains(complexTypeContent,
@@ -243,6 +241,7 @@ public void testGenerateSchema() throws IOException, JAXBException {
             "<xs:attribute name=\"moduleName\" type=\"xs:string\" use=\"required\"/>");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"childNodeNames\" type=\"xs:string\"/>");
+        assertContains(complexTypeContent, "<xs:attribute name=\"maxWorkers\" type=\"xs:int\"/>");
 
         complexTypeContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"inputTypeReference\">");
@@ -256,11 +255,14 @@ public void testGenerateSchema() throws IOException, JAXBException {
             "<xs:complexType name=\"modelTypeReference\">");
         assertContains(complexTypeContent, "<xs:extension base=\"xmlReference\">");
 
+        complexTypeContent = complexTypeContent(schemaContent,
+            "<xs:complexType name=\"parameterSetReference\">");
+        assertContains(complexTypeContent, "<xs:extension base=\"xmlReference\">");
+
         complexTypeContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"xmlReference\">");
         assertContains(complexTypeContent,
             "<xs:attribute name=\"name\" type=\"xs:string\" use=\"required\"/>");
-
     }
 
     private class PipelineDefinitionListSchemaResolver extends SchemaOutputResolver {
@@ -294,5 +296,4 @@ public PipelineDef(String name) {
             super(name);
         }
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineModuleDefinitionTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineModuleDefinitionTest.java
index b1bf770..5dcfb5b 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineModuleDefinitionTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/PipelineModuleDefinitionTest.java
@@ -22,6 +22,7 @@
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.data.management.DataFileTestUtils;
 import gov.nasa.ziggy.module.ExternalProcessPipelineModuleTest;
+import gov.nasa.ziggy.util.io.FileUtil;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
@@ -63,11 +64,12 @@ public void setUp() {
         module1.setDescription("first module");
         module1.setExeTimeoutSecs(100);
         module1.setMinMemoryMegaBytes(200);
-        module1XmlString = "<module name=\"module 1\" description=\"first module\" "
-            + "pipelineModuleClass=\"gov.nasa.ziggy.module.ExternalProcessPipelineModule\" "
-            + "inputsClass=\"gov.nasa.ziggy.module.DefaultPipelineInputs\" "
-            + "outputsClass=\"gov.nasa.ziggy.module.DefaultPipelineOutputs\" "
-            + "exeTimeoutSecs=\"100\" minMemoryMegaBytes=\"200\"/>";
+        module1XmlString = """
+            <module name="module 1" description="first module" \
+            pipelineModuleClass="gov.nasa.ziggy.module.ExternalProcessPipelineModule" \
+            inputsClass="gov.nasa.ziggy.module.DefaultPipelineInputs" \
+            outputsClass="gov.nasa.ziggy.module.DefaultPipelineOutputs" \
+            exeTimeoutSecs="100" minMemoryMegaBytes="200"/>""";
 
         // Module 2 uses no defaults
         module2 = new PipelineMod("module 2");
@@ -78,11 +80,12 @@ public void setUp() {
         module2.setOutputsClass(new ClassWrapper<>(DataFileTestUtils.PipelineOutputsSample1.class));
         module2.setPipelineModuleClass(
             new ClassWrapper<>(ExternalProcessPipelineModuleTest.TestPipelineModule.class));
-        module2XmlString = "<module name=\"module 2\" description=\"second module\" "
-            + "pipelineModuleClass=\"gov.nasa.ziggy.module.ExternalProcessPipelineModuleTest$TestPipelineModule\" "
-            + "inputsClass=\"gov.nasa.ziggy.data.management.DataFileTestUtils$PipelineInputsSample\" "
-            + "outputsClass=\"gov.nasa.ziggy.data.management.DataFileTestUtils$PipelineOutputsSample1\" "
-            + "exeTimeoutSecs=\"300\" minMemoryMegaBytes=\"400\"/>";
+        module2XmlString = """
+            <module name="module 2" description="second module" \
+            pipelineModuleClass="gov.nasa.ziggy.module.ExternalProcessPipelineModuleTest$TestPipelineModule" \
+            inputsClass="gov.nasa.ziggy.data.management.DataFileTestUtils$PipelineInputsSample" \
+            outputsClass="gov.nasa.ziggy.data.management.DataFileTestUtils$PipelineOutputsSample1" \
+            exeTimeoutSecs="300" minMemoryMegaBytes="400"/>""";
     }
 
     @Test
@@ -92,14 +95,13 @@ public void testMarshaling() throws JAXBException, IOException {
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
         marshaller.marshal(module1, xmlFile);
         assertTrue(xmlFile.exists());
-        List<String> xmlContent = Files.readAllLines(xmlFile.toPath());
+        List<String> xmlContent = Files.readAllLines(xmlFile.toPath(), FileUtil.ZIGGY_CHARSET);
         assertContains(xmlContent, module1XmlString);
 
         marshaller.marshal(module2, xmlFile);
         assertTrue(xmlFile.exists());
-        xmlContent = Files.readAllLines(xmlFile.toPath());
+        xmlContent = Files.readAllLines(xmlFile.toPath(), FileUtil.ZIGGY_CHARSET);
         assertContains(xmlContent, module2XmlString);
-
     }
 
     @Test
@@ -118,7 +120,8 @@ public void testUnmarshaling()
     public void testGenerateSchema() throws JAXBException, IOException {
         JAXBContext context = JAXBContext.newInstance(PipelineMod.class);
         context.generateSchema(new ModulesSchemaResolver());
-        List<String> schemaContent = Files.readAllLines(schemaFile.toPath());
+        List<String> schemaContent = Files.readAllLines(schemaFile.toPath(),
+            FileUtil.ZIGGY_CHARSET);
         assertContains(schemaContent, "<xs:element name=\"module\" type=\"pipelineMod\"/>");
         List<String> moduleDefContent = complexTypeContent(schemaContent,
             "<xs:complexType name=\"pipelineModuleDefinition\">");
@@ -146,7 +149,6 @@ public Result createOutput(String namespaceUri, String suggestedFileName)
             result.setSystemId(schemaFile.toURI().toURL().toString());
             return result;
         }
-
     }
 
     /**
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/RemoteJobTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/RemoteJobTest.java
index 958d3cf..bea190a 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/RemoteJobTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/RemoteJobTest.java
@@ -33,6 +33,5 @@ public void testCostEstimate() {
         info.setNodes(1);
         info.setModel("bro_ele");
         assertEquals(0, info.costEstimate(), 1e-9);
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/TestBean.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/TestBean.java
deleted file mode 100644
index 48e8c4a..0000000
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/TestBean.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-import gov.nasa.ziggy.parameters.Parameters;
-
-/**
- * @author Todd Klaus
- */
-public class TestBean implements Parameters {
-    private int a = 1;
-    private String b = "foo";
-    private int[] c = { 1, 2, 3 };
-    private String[] d = { "a", "b", "c" };
-
-    public TestBean(int a, String b, int[] c, String[] d) {
-        this.a = a;
-        this.b = b;
-        this.c = c;
-        this.d = d;
-    }
-
-    public TestBean() {
-    }
-
-    /**
-     * @return the a
-     */
-    public int getA() {
-        return a;
-    }
-
-    /**
-     * @param a the a to set
-     */
-    public void setA(int a) {
-        this.a = a;
-    }
-
-    /**
-     * @return the b
-     */
-    public String getB() {
-        return b;
-    }
-
-    /**
-     * @param b the b to set
-     */
-    public void setB(String b) {
-        this.b = b;
-    }
-
-    public int[] getC() {
-        return c;
-    }
-
-    public void setC(int[] c) {
-        this.c = c;
-    }
-
-    public String[] getD() {
-        return d;
-    }
-
-    public void setD(String[] d) {
-        this.d = d;
-    }
-}
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/TestBean2.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/TestBean2.java
deleted file mode 100644
index 55d0fe3..0000000
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/TestBean2.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package gov.nasa.ziggy.pipeline.definition;
-
-import gov.nasa.ziggy.parameters.Parameters;
-
-/**
- * @author Todd Klaus
- */
-public class TestBean2 implements Parameters {
-    private String a = "a";
-    private String b = "b";
-
-    public TestBean2(String a, String b) {
-        this.a = a;
-        this.b = b;
-    }
-
-    public TestBean2() {
-    }
-
-    /**
-     * @return the a
-     */
-    public String getA() {
-        return a;
-    }
-
-    /**
-     * @param a the a to set
-     */
-    public void setA(String a) {
-        this.a = a;
-    }
-
-    /**
-     * @return the b
-     */
-    public String getB() {
-        return b;
-    }
-
-    /**
-     * @param b the b to set
-     */
-    public void setB(String b) {
-        this.b = b;
-    }
-}
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/TestModuleParameters.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/TestModuleParameters.java
index 9d84c00..cae3e83 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/TestModuleParameters.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/TestModuleParameters.java
@@ -5,7 +5,7 @@
 /**
  * @author Todd Klaus
  */
-public class TestModuleParameters implements Parameters {
+public class TestModuleParameters extends Parameters {
     private int value = 42;
 
     public TestModuleParameters() {
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/TestPipelineParameters.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/TestPipelineParameters.java
index 74abf2c..300bb84 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/TestPipelineParameters.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/TestPipelineParameters.java
@@ -2,7 +2,7 @@
 
 import gov.nasa.ziggy.parameters.Parameters;
 
-public class TestPipelineParameters implements Parameters {
+public class TestPipelineParameters extends Parameters {
     public TestPipelineParameters() {
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/TypedParameterCollectionTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/TypedParameterCollectionTest.java
new file mode 100644
index 0000000..6e076d5
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/TypedParameterCollectionTest.java
@@ -0,0 +1,107 @@
+package gov.nasa.ziggy.pipeline.definition;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests the TypedParameterCollection class.
+ *
+ * @author Bill Wohler
+ */
+public class TypedParameterCollectionTest {
+
+    private TypedParameterCollection collection1;
+    private TypedParameterCollection collection2;
+    private TypedParameter a;
+    private TypedParameter b;
+    private TypedParameter c;
+
+    @Before
+    public void setup() {
+        // Collection1 initialized with add().
+        collection1 = new TypedParameterCollection();
+        a = new TypedParameter("a", " a , a ");
+        collection1.addParameter(a);
+        b = new TypedParameter("b", " b,b ");
+        collection1.addParameter(b);
+        c = new TypedParameter("c", " xy zzy ");
+        collection1.addParameter(c);
+
+        // Collection2 initialized with setParameters().
+        collection2 = new TypedParameterCollection();
+        collection2.setParameters(Set.of(a, b, c));
+    }
+
+    // Test that the value's whitespace is trimmed.
+    @Test
+    public void testTrimWhitespace() {
+        assertEquals("a,a", a.getValue());
+        assertEquals("b,b", b.getValue());
+        assertEquals("xy zzy", c.getValue());
+    }
+
+    @Test
+    public void testOriginalsGetModifiedWithAdd() {
+        testOriginalsGetModified(collection1);
+    }
+
+    @Test
+    public void testOriginalsGetModifiedWithSetParameters() {
+        testOriginalsGetModified(collection2);
+    }
+
+    private void testOriginalsGetModified(TypedParameterCollection collection) {
+        // Changes to the original objects should affect the collection we created.
+        a.setValue("new value");
+        assertEquals("new value", collection.getParameter("a").getValue());
+
+        // Changes to the objects retrieved from the collection should also affect the
+        // original objects.
+        collection1.getParameter("b").setValue("new value");
+        assertEquals("new value", b.getValue());
+    }
+
+    @Test
+    public void testOriginalsGetModifiedWithGetParameters() {
+        // Changes to the original objects should affect the collection we created.
+        a.setValue("new value");
+        for (TypedParameter parameter : collection1.getParameters()) {
+            if (parameter.getName() == "a") {
+                assertEquals("new value", parameter.getValue());
+            }
+        }
+
+        // Changes to the objects retrieved from the collection should also affect the
+        // original objects.
+        for (TypedParameter parameter : collection1.getParameters()) {
+            if (parameter.getName() == "b") {
+                parameter.setValue("new value");
+            }
+        }
+        assertEquals("new value", b.getValue());
+    }
+
+    @Test
+    public void testOriginalsGetModifiedWithGetParametersByName() {
+        // Changes to the original objects should affect the collection we created.
+        a.setValue("new value");
+        for (TypedParameter parameter : collection1.getParameters()) {
+            if (parameter.getName() == "a") {
+                assertEquals("new value", parameter.getValue());
+            }
+        }
+
+        // Changes to the objects retrieved from the collection should also affect the
+        // original objects.
+        for (TypedParameter parameter : collection1.getParameters()) {
+            if (parameter.getName() == "b") {
+                parameter.setValue("new value");
+            }
+        }
+        assertEquals("new value", b.getValue());
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/TypedParameterTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/TypedParameterTest.java
index 38e30a5..10401b6 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/TypedParameterTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/TypedParameterTest.java
@@ -40,7 +40,7 @@ public void testConstructor() {
         assertEquals(double[].class, t.getType());
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test(expected = NumberFormatException.class)
     public void testInvalidConstruction() {
         new TypedParameter("dummy", "text", "dOuBlE");
     }
@@ -105,11 +105,8 @@ public void testGetTypedValue() {
         v = t.getValueAsArray();
         assertTrue(v instanceof double[]);
         vv = (double[]) v;
-        assertEquals(3, vv.length);
+        assertEquals(1, vv.length);
         assertEquals(0, vv[0], 1e-9);
-        assertEquals(0, vv[1], 1e-9);
-        assertEquals(0, vv[2], 1e-9);
-
     }
 
     @Test
@@ -141,7 +138,6 @@ public void testGetValue() {
         vvv = (double[]) v;
         assertEquals(1, vvv.length);
         assertEquals(100.0, vvv[0], 1e-9);
-
     }
 
     @Test
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ModelCrudTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ModelCrudTest.java
index ec7de1f..0fafff0 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ModelCrudTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ModelCrudTest.java
@@ -35,8 +35,8 @@ public void setup() {
         setUpModelTypes();
         DatabaseTransactionFactory.performTransaction(() -> {
             ModelCrud modelCrud = new ModelCrud();
-            modelCrud.create(modelType1);
-            modelCrud.create(modelType2);
+            modelCrud.persist(modelType1);
+            modelCrud.persist(modelType2);
             return null;
         });
     }
@@ -46,9 +46,8 @@ public void retrieveUnlockedRegistryWhenEmpty() {
 
         ModelRegistry registry = (ModelRegistry) DatabaseTransactionFactory
             .performTransaction(() -> new ModelCrud().retrieveUnlockedRegistry());
-        assertEquals(1L, registry.getId());
+        assertEquals(Long.valueOf(1L), registry.getId());
         assertFalse(registry.isLocked());
-
     }
 
     @Test
@@ -56,9 +55,8 @@ public void retrieveCurrentRegistryWhenEmpty() {
 
         ModelRegistry registry = (ModelRegistry) DatabaseTransactionFactory
             .performTransaction(() -> new ModelCrud().retrieveCurrentRegistry());
-        assertEquals(1L, registry.getId());
+        assertEquals(Long.valueOf(1L), registry.getId());
         assertFalse(registry.isLocked());
-
     }
 
     @Test
@@ -75,7 +73,7 @@ public void retrieveCurrentAndUnlockedRegistries() {
             ModelCrud modelCrud = new ModelCrud();
             return modelCrud.retrieveCurrentRegistry();
         });
-        assertEquals(1L, registry.getId());
+        assertEquals(Long.valueOf(1L), registry.getId());
         assertFalse(registry.isLocked());
 
         // Lock the current registry and then retrieve it; it should
@@ -85,7 +83,7 @@ public void retrieveCurrentAndUnlockedRegistries() {
             modelCrud.lockCurrentRegistry();
             return modelCrud.retrieveCurrentRegistry();
         });
-        assertEquals(1L, registry.getId());
+        assertEquals(Long.valueOf(1L), registry.getId());
         assertTrue(registry.isLocked());
 
         // Retrieve the unlocked registry and see that it's really
@@ -94,7 +92,7 @@ public void retrieveCurrentAndUnlockedRegistries() {
             ModelCrud modelCrud = new ModelCrud();
             return modelCrud.retrieveUnlockedRegistry();
         });
-        assertEquals(2L, registry.getId());
+        assertEquals(Long.valueOf(2L), registry.getId());
         assertFalse(registry.isLocked());
 
         // Just retrieve the ID of the unlocked registry
@@ -103,7 +101,6 @@ public void retrieveCurrentAndUnlockedRegistries() {
             return modelCrud.retrieveUnlockedRegistryId();
         });
         assertEquals(2L, currentRegistryId);
-
     }
 
     @Test
@@ -115,7 +112,6 @@ public void testRetrieveModelTypes() {
         assertEquals(2, modelTypes.size());
         assertTrue(modelTypes.contains(modelType1));
         assertTrue(modelTypes.contains(modelType2));
-
     }
 
     @Test
@@ -127,7 +123,6 @@ public void testRetrieveModelTypeMap() {
         assertEquals(2, modelTypeMap.size());
         assertEquals(modelType1, modelTypeMap.get("geometry"));
         assertEquals(modelType2, modelTypeMap.get("read-noise"));
-
     }
 
     private void setUpModelTypes() {
@@ -143,5 +138,4 @@ private void setUpModelTypes() {
         modelType2.setTimestampGroup(-1);
         modelType2.setVersionNumberGroup(-1);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ParameterSetCrudTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ParameterSetCrudTest.java
new file mode 100644
index 0000000..da6e56d
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ParameterSetCrudTest.java
@@ -0,0 +1,186 @@
+package gov.nasa.ziggy.pipeline.definition.crud;
+
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import gov.nasa.ziggy.ZiggyDatabaseRule;
+import gov.nasa.ziggy.ZiggyPropertyRule;
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.parameters.ParameterTestClasses;
+import gov.nasa.ziggy.parameters.ParameterTestClasses.TestParametersFoo;
+import gov.nasa.ziggy.pipeline.PipelineConfigurator;
+import gov.nasa.ziggy.pipeline.definition.ParameterSet;
+import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+
+public class ParameterSetCrudTest {
+
+    private static final String TEST_PARAMETERS_FOO = "testParametersFoo";
+
+    private ParameterTestClasses.TestParametersFoo testParametersFoo;
+
+    @Rule
+    public ZiggyDatabaseRule databaseRule = new ZiggyDatabaseRule();
+
+    @Rule
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
+
+    @Before
+    public void setUp() {
+        PipelineConfigurator pc = new PipelineConfigurator();
+        testParametersFoo = new TestParametersFoo();
+        pc.createParamSet(TEST_PARAMETERS_FOO, testParametersFoo);
+    }
+
+    @Test
+    public void testCreateOrUpdateDuplicateInstance() throws NoSuchFieldException,
+        SecurityException, IllegalArgumentException, IllegalAccessException {
+
+        ParameterSet ps = (ParameterSet) DatabaseTransactionFactory.performTransaction(
+            () -> new ParameterSetCrud().retrieveLatestVersionForName(TEST_PARAMETERS_FOO));
+
+        ps.setDescription("New description");
+        DatabaseTransactionFactory.performTransaction(() -> {
+            new ParameterSetCrud().merge(ps);
+            return null;
+        });
+
+        // When using an instance that was actually retrieved from the database, createOrUpdate
+        // works correctly.
+        @SuppressWarnings("unchecked")
+        List<ParameterSet> parameterSets0 = (List<ParameterSet>) DatabaseTransactionFactory
+            .performTransaction(
+                () -> new ParameterSetCrud().retrieveAllVersionsForName(TEST_PARAMETERS_FOO));
+
+        assertEquals(1, parameterSets0.size());
+        assertEquals("New description", parameterSets0.get(0).getDescription());
+
+        @SuppressWarnings("unchecked")
+        List<ParameterSet> parameterSets = (List<ParameterSet>) DatabaseTransactionFactory
+            .performTransaction(
+                () -> new ParameterSetCrud().retrieveAllVersionsForName(TEST_PARAMETERS_FOO));
+
+        assertEquals(1, parameterSets.size());
+    }
+
+    @Test(expected = PipelineException.class)
+    public void testOptimisticLocking() {
+
+        ParameterSet ps = (ParameterSet) DatabaseTransactionFactory.performTransaction(
+            () -> new ParameterSetCrud().retrieveLatestVersionForName(TEST_PARAMETERS_FOO));
+
+        // Retrieve and edit
+        DatabaseTransactionFactory.performTransaction(() -> {
+            ParameterSet psMod = new ParameterSetCrud().retrieveLatestVersionForName(ps.getName());
+            psMod.setDescription("New description");
+            return null;
+        });
+
+        // An attempt to save the original ps will fail because its optimistic locking
+        // version is now out of date.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            new ParameterSetCrud().merge(ps);
+            return null;
+        });
+    }
+
+    @Test
+    public void testUpdateUnlockedParameterSet() {
+
+        ParameterSetCrud parameterSetCrud = new ParameterSetCrud();
+        ParameterSet paramSet = (ParameterSet) DatabaseTransactionFactory.performTransaction(() -> {
+            ParameterSet ps = parameterSetCrud.retrieveLatestVersionForName(TEST_PARAMETERS_FOO);
+            assertFalse(ps.isLocked());
+            assertEquals(0, ps.getVersion());
+            return ps;
+        });
+
+        TestParametersFoo paramInstance = paramSet.parametersInstance();
+        int foo1 = paramInstance.getFoo1();
+        foo1++;
+        paramInstance.setFoo1(foo1);
+        paramSet.populateFromParametersInstance(paramInstance);
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            parameterSetCrud.merge(paramSet);
+            return null;
+        });
+
+        ParameterSet psMerged = (ParameterSet) DatabaseTransactionFactory.performTransaction(
+            () -> new ParameterSetCrud().retrieveLatestVersionForName(TEST_PARAMETERS_FOO));
+
+        assertFalse(psMerged.isLocked());
+        assertEquals(0, psMerged.getVersion());
+        paramInstance = psMerged.parametersInstance();
+        assertEquals(foo1, paramInstance.getFoo1());
+    }
+
+    @Test
+    public void testUpdateLockedParameterSet() {
+
+        ParameterSetCrud parameterSetCrud = new ParameterSetCrud();
+        DatabaseTransactionFactory.performTransaction(() -> {
+            ParameterSet ps = parameterSetCrud.retrieveLatestVersionForName(TEST_PARAMETERS_FOO);
+            ps.lock();
+            return null;
+        });
+
+        ParameterSet paramSet = (ParameterSet) DatabaseTransactionFactory.performTransaction(() -> {
+            ParameterSet ps = parameterSetCrud.retrieveLatestVersionForName(TEST_PARAMETERS_FOO);
+            assertTrue(ps.isLocked());
+            assertEquals(0, ps.getVersion());
+            return ps;
+        });
+
+        TestParametersFoo paramInstance = paramSet.parametersInstance();
+        int foo1 = paramInstance.getFoo1();
+        foo1++;
+        paramInstance.setFoo1(foo1);
+        paramSet.populateFromParametersInstance(paramInstance);
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            parameterSetCrud.merge(paramSet);
+            return null;
+        });
+
+        ParameterSet psMerged = (ParameterSet) DatabaseTransactionFactory.performTransaction(
+            () -> new ParameterSetCrud().retrieveLatestVersionForName(TEST_PARAMETERS_FOO));
+
+        assertFalse(psMerged.isLocked());
+        assertEquals(1, psMerged.getVersion());
+        paramInstance = psMerged.parametersInstance();
+        assertEquals(foo1, paramInstance.getFoo1());
+    }
+
+    @Test
+    public void testLockedUnchangedParameterSet() {
+
+        ParameterSetCrud parameterSetCrud = new ParameterSetCrud();
+        DatabaseTransactionFactory.performTransaction(() -> {
+            ParameterSet ps = parameterSetCrud.retrieveLatestVersionForName(TEST_PARAMETERS_FOO);
+            ps.lock();
+            return null;
+        });
+
+        ParameterSet paramSet = (ParameterSet) DatabaseTransactionFactory.performTransaction(() -> {
+            ParameterSet ps = parameterSetCrud.retrieveLatestVersionForName(TEST_PARAMETERS_FOO);
+            assertTrue(ps.isLocked());
+            assertEquals(0, ps.getVersion());
+            return ps;
+        });
+
+        ParameterSet mergedParamSet = (ParameterSet) DatabaseTransactionFactory
+            .performTransaction(() -> parameterSetCrud.merge(paramSet));
+
+        assertEquals(0, mergedParamSet.getVersion());
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionCrudTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionCrudTest.java
index 7bac7d4..036a156 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionCrudTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineDefinitionCrudTest.java
@@ -1,11 +1,12 @@
 package gov.nasa.ziggy.pipeline.definition.crud;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
+import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.List;
 
-import org.hibernate.Query;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -13,10 +14,10 @@
 import gov.nasa.ziggy.ReflectionEquals;
 import gov.nasa.ziggy.ZiggyDatabaseRule;
 import gov.nasa.ziggy.ZiggyUnitTestUtils;
+import gov.nasa.ziggy.crud.SimpleCrud;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
 import gov.nasa.ziggy.pipeline.definition.AuditInfo;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
@@ -24,12 +25,10 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
 import gov.nasa.ziggy.pipeline.definition.TestModuleParameters;
-import gov.nasa.ziggy.services.database.DatabaseService;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 import gov.nasa.ziggy.services.security.User;
 import gov.nasa.ziggy.services.security.UserCrud;
 import gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator;
-import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
 
 /**
  * Tests for {@link PipelineDefinitionCrud} Tests that objects can be stored, retrieved, and edited
@@ -88,24 +87,22 @@ private PipelineDefinition populateObjects() {
 
             // create a module param set def
             expectedParamSet = new ParameterSet(new AuditInfo(adminUser, new Date()), "test mps1");
-            expectedParamSet.setParameters(new BeanWrapper<Parameters>(new TestModuleParameters()));
-            parameterSetCrud.create(expectedParamSet);
+            expectedParamSet.setTypedParameters(new TestModuleParameters().getParameters());
+            expectedParamSet = parameterSetCrud.merge(expectedParamSet);
 
             // create a few module defs
             expectedModuleDef1 = new PipelineModuleDefinition("Test-1");
-            pipelineModuleDefinitionCrud.create(expectedModuleDef1);
+            expectedModuleDef1 = pipelineModuleDefinitionCrud.merge(expectedModuleDef1);
 
             expectedModuleDef2 = new PipelineModuleDefinition("Test-2");
-            pipelineModuleDefinitionCrud.create(expectedModuleDef2);
+            expectedModuleDef2 = pipelineModuleDefinitionCrud.merge(expectedModuleDef2);
 
             expectedModuleDef3 = new PipelineModuleDefinition("Test-3");
-            pipelineModuleDefinitionCrud.create(expectedModuleDef3);
+            expectedModuleDef3 = pipelineModuleDefinitionCrud.merge(expectedModuleDef3);
 
             // create a pipeline def
             PipelineDefinition pd = createPipelineDefinition();
-            pipelineDefinitionCrud.create(pd);
-
-            return pd;
+            return pipelineDefinitionCrud.merge(pd);
         });
     }
 
@@ -113,17 +110,15 @@ private PipelineDefinition createPipelineDefinition() {
         PipelineDefinition pipelineDef = new PipelineDefinition(
             new AuditInfo(adminUser, new Date()), TEST_PIPELINE_NAME_1);
         PipelineDefinitionNode pipelineNode1 = new PipelineDefinitionNode(
-            expectedModuleDef1.getName(), pipelineDef.getName().getName());
+            expectedModuleDef1.getName(), pipelineDef.getName());
         PipelineDefinitionNode pipelineNode2 = new PipelineDefinitionNode(
-            expectedModuleDef2.getName(), pipelineDef.getName().getName());
+            expectedModuleDef2.getName(), pipelineDef.getName());
         pipelineNode1.getNextNodes().add(pipelineNode2);
 
-        pipelineNode1.setUnitOfWorkGenerator(
-            new ClassWrapper<UnitOfWorkGenerator>(new SingleUnitOfWorkGenerator()));
+        pipelineNode1.setUnitOfWorkGenerator(new ClassWrapper<>(new SingleUnitOfWorkGenerator()));
         pipelineNode1.setStartNewUow(false);
 
-        pipelineNode2.setUnitOfWorkGenerator(
-            new ClassWrapper<UnitOfWorkGenerator>(new SingleUnitOfWorkGenerator()));
+        pipelineNode2.setUnitOfWorkGenerator(new ClassWrapper<>(new SingleUnitOfWorkGenerator()));
         pipelineNode2.setStartNewUow(false);
 
         pipelineDef.addRootNode(pipelineNode1);
@@ -132,23 +127,81 @@ private PipelineDefinition createPipelineDefinition() {
     }
 
     private int pipelineNodeCount() {
-        DatabaseService databaseService = DatabaseService.getInstance();
-        Query q = databaseService.getSession()
-            .createQuery("select count(*) from PipelineDefinitionNode");
-        return ((Long) q.uniqueResult()).intValue();
+        ZiggyQuery<PipelineDefinitionNode, Long> query = pipelineDefinitionCrud
+            .createZiggyQuery(PipelineDefinitionNode.class, Long.class);
+        Long count = pipelineDefinitionCrud.uniqueResult(query.count());
+        return count.intValue();
     }
 
     private int pipelineModuleDefinitionCount() {
-        DatabaseService databaseService = DatabaseService.getInstance();
-        Query q = databaseService.getSession()
-            .createQuery("select count(*) from PipelineModuleDefinition");
-        return ((Long) q.uniqueResult()).intValue();
+        ZiggyQuery<PipelineModuleDefinition, Long> query = pipelineModuleDefinitionCrud
+            .createZiggyQuery(PipelineModuleDefinition.class, Long.class);
+        Long count = pipelineModuleDefinitionCrud.uniqueResult(query.count());
+        return count.intValue();
     }
 
     private int pipelineModuleParamSetCount() {
-        DatabaseService databaseService = DatabaseService.getInstance();
-        Query q = databaseService.getSession().createQuery("select count(*) from ParameterSet");
-        return ((Long) q.uniqueResult()).intValue();
+        ZiggyQuery<ParameterSet, Long> query = parameterSetCrud.createZiggyQuery(ParameterSet.class,
+            Long.class);
+        Long count = parameterSetCrud.uniqueResult(query.count());
+        return count.intValue();
+    }
+
+    /**
+     * Sets the value of private field optimisticLockValue. This allows the test to emulate
+     * something that would ordinarily be done by the database, which is why it's okay to use
+     * reflection to do it.
+     */
+    private void setOptimisticLockValue(PipelineDefinition pipelineDefinition, int dirtyValue)
+        throws NoSuchFieldException, SecurityException, IllegalArgumentException,
+        IllegalAccessException {
+        Field dirtyField = pipelineDefinition.getClass()
+            .getSuperclass()
+            .getDeclaredField("optimisticLockValue");
+        dirtyField.setAccessible(true);
+        dirtyField.set(pipelineDefinition, dirtyValue);
+    }
+
+    /**
+     * Sets the values of the version and locked fields. This allows us to create an exact copy of
+     * an instance of {@link PipelineDefinition}, which we need for these tests but not in normal
+     * operation.
+     */
+    private void setVersion(PipelineDefinition pipelineDefinition, long id, int version,
+        boolean locked) throws NoSuchFieldException, SecurityException, IllegalArgumentException,
+        IllegalAccessException {
+        Field versionField = pipelineDefinition.getClass()
+            .getSuperclass()
+            .getDeclaredField("version");
+        versionField.setAccessible(true);
+        versionField.set(pipelineDefinition, version);
+        Field lockedField = pipelineDefinition.getClass()
+            .getSuperclass()
+            .getDeclaredField("locked");
+        lockedField.setAccessible(true);
+        lockedField.set(pipelineDefinition, locked);
+        Field idField = pipelineDefinition.getClass().getDeclaredField("id");
+        idField.setAccessible(true);
+        idField.set(pipelineDefinition, id);
+    }
+
+    /**
+     * Returns a new instance that is an exact copy of the original {@link PipelineDefinition}.
+     */
+    private PipelineDefinition copyOf(PipelineDefinition original) throws NoSuchFieldException,
+        SecurityException, IllegalArgumentException, IllegalAccessException {
+        PipelineDefinition copy = new PipelineDefinition();
+        copy.setName(original.getName());
+        copy.setDescription(original.getDescription());
+        copy.setAuditInfo(original.getAuditInfo());
+        copy.setGroup(original.group());
+        setOptimisticLockValue(copy, original.getOptimisticLockValue());
+        setVersion(copy, original.getId(), original.getVersion(), original.isLocked());
+        List<PipelineDefinitionNode> rootNodes = copy.getRootNodes();
+        for (PipelineDefinitionNode originalNode : original.getRootNodes()) {
+            rootNodes.add(new PipelineDefinitionNode(originalNode));
+        }
+        return copy;
     }
 
     /**
@@ -169,7 +222,6 @@ public void testStoreAndRetrieve() throws Exception {
                     .retrieveLatestVersionForName(TEST_PIPELINE_NAME_1);
                 ZiggyUnitTestUtils.initializePipelineDefinition(apd);
                 return apd;
-
             });
         comparer.assertEquals("PipelineDefinition", expectedPipelineDef, actualPipelineDef);
 
@@ -211,7 +263,7 @@ public void testEditPipelineDefinition() throws Exception {
             .performTransaction(() -> {
                 PipelineDefinition epd = createPipelineDefinition();
                 editPipelineDef(epd);
-                epd.setDirty(1);
+                setOptimisticLockValue(epd, 1);
                 ZiggyUnitTestUtils.initializePipelineDefinition(epd);
                 return epd;
             });
@@ -225,11 +277,42 @@ public void testEditPipelineDefinition() throws Exception {
 
         comparer.assertEquals("PipelineDefinition", expectedPipelineDef, actualPipelineDef);
 
+        // The retrieved object should have its Hibernate-side version number incremented.
+        assertEquals(1, expectedPipelineDef.getOptimisticLockValue());
+
         assertEquals("PipelineDefinitionNode count", 2, pipelineNodeCount());
         assertEquals("PipelineModuleDefinition count", 3, pipelineModuleDefinitionCount());
         assertEquals("ParameterSet count", 1, pipelineModuleParamSetCount());
     }
 
+    /**
+     * Demonstrates optimistic locking of PipelineDefinition instances: once the database version of
+     * an object has been changed, the original (unchanged) version cannot be stored because it's
+     * out of date.
+     */
+    @Test(expected = PipelineException.class)
+    public void testOptimisticLocking() {
+        // Create
+        PipelineDefinition pd = populateObjects();
+
+        assertEquals("PipelineDefinitionNode count", 2, pipelineNodeCount());
+
+        // Retrieve & Edit
+        DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineDefinition modifiedPipelineDef = pipelineDefinitionCrud
+                .retrieveLatestVersionForName(TEST_PIPELINE_NAME_1);
+            editPipelineDef(modifiedPipelineDef);
+            return null;
+        });
+
+        // Attempting to commit the original version should be blocked by the
+        // opportunistic locking system.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineDefinitionCrud.merge(pd);
+            return null;
+        });
+    }
+
     /**
      * simulate modifications made by a user
      *
@@ -241,6 +324,41 @@ private void editPipelineDef(PipelineDefinition pipelineDef) {
         pipelineDef.getAuditInfo().setLastChangedUser(operatorUser);
     }
 
+    @Test
+    public void testCreateOrUpdateDuplicateInstance() {
+
+        PipelineDefinition pd = populateObjects();
+        pd.setInstancePriority(PipelineInstance.Priority.HIGHEST);
+
+        // Executing with the same object but changed content does the right thing
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineDefinitionCrud.merge(pd);
+            return null;
+        });
+
+        @SuppressWarnings("unchecked")
+        List<PipelineDefinition> pipelineDefinitions0 = (List<PipelineDefinition>) DatabaseTransactionFactory
+            .performTransaction(
+                () -> pipelineDefinitionCrud.retrieveAllVersionsForName(pd.getName()));
+
+        assertEquals(1, pipelineDefinitions0.size());
+        assertEquals(PipelineInstance.Priority.HIGHEST,
+            pipelineDefinitions0.get(0).getInstancePriority());
+
+        // Use the same content but a new object.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineDefinitionCrud.merge(copyOf(pipelineDefinitions0.get(0)));
+            return null;
+        });
+
+        @SuppressWarnings("unchecked")
+        List<PipelineDefinition> pipelineDefinitions = (List<PipelineDefinition>) DatabaseTransactionFactory
+            .performTransaction(
+                () -> pipelineDefinitionCrud.retrieveAllVersionsForName(pd.getName()));
+
+        assertEquals(1, pipelineDefinitions.size());
+    }
+
     @Test
     public void testEditPipelineDefinitionAddNextNode() throws Exception {
         // Create
@@ -250,7 +368,8 @@ public void testEditPipelineDefinitionAddNextNode() throws Exception {
         DatabaseTransactionFactory.performTransaction(() -> {
             PipelineDefinition modifiedPipelineDef = pipelineDefinitionCrud
                 .retrieveLatestVersionForName(TEST_PIPELINE_NAME_1);
-            editPipelineDefAddNextNode(modifiedPipelineDef);
+            PipelineDefinitionNode newNode = editPipelineDefAddNextNode(modifiedPipelineDef);
+            new SimpleCrud<>().persist(newNode);
             return null;
         });
 
@@ -281,13 +400,13 @@ public void testEditPipelineDefinitionAddNextNode() throws Exception {
      * @param pipelineDef
      * @throws PipelineException
      */
-    private void editPipelineDefAddNextNode(PipelineDefinition pipelineDef) {
+    private PipelineDefinitionNode editPipelineDefAddNextNode(PipelineDefinition pipelineDef) {
         PipelineDefinitionNode newPipelineNode = new PipelineDefinitionNode(
-            expectedModuleDef3.getName(), pipelineDef.getName().getName());
+            expectedModuleDef3.getName(), pipelineDef.getName());
         pipelineDef.getRootNodes().get(0).getNextNodes().get(0).getNextNodes().add(newPipelineNode);
-        newPipelineNode.setUnitOfWorkGenerator(
-            new ClassWrapper<UnitOfWorkGenerator>(new SingleUnitOfWorkGenerator()));
+        newPipelineNode.setUnitOfWorkGenerator(new ClassWrapper<>(new SingleUnitOfWorkGenerator()));
         newPipelineNode.setStartNewUow(false);
+        return newPipelineNode;
     }
 
     @Test
@@ -300,7 +419,9 @@ public void testEditPipelineDefinitionAddBranchNode() throws Exception {
 
             PipelineDefinition modifiedPipelineDef = pipelineDefinitionCrud
                 .retrieveLatestVersionForName(TEST_PIPELINE_NAME_1);
-            editPipelineDefAddBranchNode(modifiedPipelineDef);
+            PipelineDefinitionNode newPipelineDefNode = editPipelineDefAddBranchNode(
+                modifiedPipelineDef);
+            new SimpleCrud<>().persist(newPipelineDefNode);
             return null;
         });
 
@@ -332,13 +453,13 @@ public void testEditPipelineDefinitionAddBranchNode() throws Exception {
      * @param pipelineDef
      * @throws PipelineException
      */
-    private void editPipelineDefAddBranchNode(PipelineDefinition pipelineDef) {
+    private PipelineDefinitionNode editPipelineDefAddBranchNode(PipelineDefinition pipelineDef) {
         PipelineDefinitionNode newPipelineNode = new PipelineDefinitionNode(
-            expectedModuleDef3.getName(), pipelineDef.getName().getName());
+            expectedModuleDef3.getName(), pipelineDef.getName());
         pipelineDef.getRootNodes().get(0).getNextNodes().add(newPipelineNode);
-        newPipelineNode.setUnitOfWorkGenerator(
-            new ClassWrapper<UnitOfWorkGenerator>(new SingleUnitOfWorkGenerator()));
+        newPipelineNode.setUnitOfWorkGenerator(new ClassWrapper<>(new SingleUnitOfWorkGenerator()));
         newPipelineNode.setStartNewUow(false);
+        return newPipelineNode;
     }
 
     @Test
@@ -428,7 +549,7 @@ private void editPipelineDefDeleteLastNode(PipelineDefinition pipelineDef) {
         List<PipelineDefinitionNode> nextNodes = pipelineDef.getRootNodes().get(0).getNextNodes();
 
         for (PipelineDefinitionNode nextNode : nextNodes) {
-            pipelineDefinitionCrud.delete(nextNode);
+            pipelineDefinitionCrud.remove(nextNode);
         }
         nextNodes.clear();
     }
@@ -457,7 +578,7 @@ public void testEditPipelineDefinitionDeleteAllNodes() throws Exception {
 
         PipelineDefinition expectedPipelineDef = createPipelineDefinition();
         editPipelineDefDeleteAllNodes(expectedPipelineDef);
-        expectedPipelineDef.setDirty(1);
+        setOptimisticLockValue(expectedPipelineDef, 1);
 
         comparer.excludeField(".*\\.id");
 
@@ -489,13 +610,11 @@ public void testRetrievePipelineDefinitionNamesInUse() throws Exception {
 
         assertEquals(0, pipelineDefinitionCrud.retrievePipelineDefinitionNamesInUse().size());
 
-        // Now, create a pipeline instance associated with the pipeline
-        // definition. Should return a single item.
-        PipelineInstance pipelineInstance = new PipelineInstance(pipelineDefinition);
-        PipelineInstanceCrud pipelineInstanceCrud = new PipelineInstanceCrud();
+        // Now, lock the pipeline definition. Should return a single item.
 
         DatabaseTransactionFactory.performTransaction(() -> {
-            pipelineInstanceCrud.create(pipelineInstance);
+            pipelineDefinitionCrud.retrieveLatestVersionForName(pipelineDefinition.getName())
+                .lock();
             return null;
         });
 
@@ -507,4 +626,37 @@ public void testRetrievePipelineDefinitionNamesInUse() throws Exception {
         String name = pipelineDefinitions.get(0);
         assertEquals(TEST_PIPELINE_NAME_1, name);
     }
+
+    @Test
+    public void testNewInstance() {
+        PipelineDefinition pipelineDefinition = populateObjects();
+        PipelineDefinition pipelineDefinitionCopy = pipelineDefinition.newInstance();
+
+        assertNotEquals(pipelineDefinition, pipelineDefinitionCopy);
+
+        assertEquals("Copy of " + pipelineDefinition, pipelineDefinitionCopy.getName());
+        assertEquals(0, pipelineDefinitionCopy.getVersion());
+        assertEquals(false, pipelineDefinitionCopy.isLocked());
+        assertEquals(null, pipelineDefinitionCopy.getId());
+
+        assertEquals(null, pipelineDefinitionCopy.getId());
+        assertEquals(pipelineDefinition.getAuditInfo(), pipelineDefinitionCopy.getAuditInfo());
+        assertEquals(pipelineDefinition.getDescription(), pipelineDefinitionCopy.getDescription());
+        assertEquals(pipelineDefinition.group(), pipelineDefinitionCopy.group());
+        assertEquals(pipelineDefinition.getInstancePriority(),
+            pipelineDefinitionCopy.getInstancePriority());
+        assertEquals(pipelineDefinition.getPipelineParameterSetNames(),
+            pipelineDefinitionCopy.getPipelineParameterSetNames());
+        assertEquals(pipelineDefinition.getRootNodes().size(),
+            pipelineDefinitionCopy.getRootNodes().size());
+
+        // Compare modules names only due to implementation of PipelineDefinitionNode.equals().
+        for (int i = 0; i < pipelineDefinition.getRootNodes().size(); i++) {
+            assertEquals(pipelineDefinition.getRootNodes().get(i).getModuleName(),
+                pipelineDefinitionCopy.getRootNodes().get(i).getModuleName());
+        }
+
+        DatabaseTransactionFactory
+            .performTransaction(() -> pipelineDefinitionCrud.merge(pipelineDefinitionCopy));
+    }
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceTaskCrudTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceTaskCrudTest.java
index 6919404..8fa2742 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceTaskCrudTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineInstanceTaskCrudTest.java
@@ -11,39 +11,39 @@
 import java.util.List;
 import java.util.Set;
 
-import org.hibernate.Query;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import gov.nasa.ziggy.IntegrationTestCategory;
 import gov.nasa.ziggy.ReflectionEquals;
 import gov.nasa.ziggy.ZiggyDatabaseRule;
 import gov.nasa.ziggy.ZiggyUnitTestUtils;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.pipeline.PipelineOperations;
 import gov.nasa.ziggy.pipeline.definition.AuditInfo;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance.State;
-import gov.nasa.ziggy.pipeline.definition.PipelineInstanceAggregateState;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstanceNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask_;
+import gov.nasa.ziggy.pipeline.definition.TaskCounts;
 import gov.nasa.ziggy.pipeline.definition.TestModuleParameters;
 import gov.nasa.ziggy.pipeline.definition.TestPipelineParameters;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud.ClearStaleStateResults;
-import gov.nasa.ziggy.services.database.DatabaseService;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 import gov.nasa.ziggy.services.security.User;
 import gov.nasa.ziggy.services.security.UserCrud;
 import gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.UnitOfWork;
-import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
 
 /**
  * Tests for {@link PipelineInstanceCrud} and {@link PipelineTaskCrud} Tests that objects can be
@@ -52,6 +52,7 @@
  *
  * @author Todd Klaus
  */
+@Category(IntegrationTestCategory.class)
 public class PipelineInstanceTaskCrudTest {
 
     private static final String TEST_PIPELINE_NAME = "Test Pipeline";
@@ -65,6 +66,7 @@ public class PipelineInstanceTaskCrudTest {
     private PipelineInstanceCrud pipelineInstanceCrud;
     private PipelineInstanceNodeCrud pipelineInstanceNodeCrud;
     private PipelineTaskCrud pipelineTaskCrud;
+    private PipelineOperations pipelineOperations;
 
     private PipelineModuleDefinitionCrud pipelineModuleDefinitionCrud;
     private ParameterSetCrud parameterSetCrud;
@@ -95,6 +97,7 @@ public void setUp() {
         pipelineInstanceCrud = new PipelineInstanceCrud();
         pipelineInstanceNodeCrud = new PipelineInstanceNodeCrud();
         pipelineTaskCrud = new PipelineTaskCrud();
+        pipelineOperations = new PipelineOperations();
 
         pipelineModuleDefinitionCrud = new PipelineModuleDefinitionCrud();
         parameterSetCrud = new ParameterSetCrud();
@@ -113,13 +116,13 @@ private void populateObjects() {
 
             // create a module param set def
             parameterSet = new ParameterSet(new AuditInfo(adminUser, new Date()), "test mps1");
-            parameterSet.setParameters(new BeanWrapper<Parameters>(new TestModuleParameters()));
-            parameterSetCrud.create(parameterSet);
+            parameterSet.setTypedParameters(new TestModuleParameters().getParameters());
+            parameterSet = parameterSetCrud.merge(parameterSet);
 
             // create a module def
             moduleDef = new PipelineModuleDefinition(new AuditInfo(adminUser, new Date()),
                 "Test-1");
-            pipelineModuleDefinitionCrud.create(moduleDef);
+            moduleDef = pipelineModuleDefinitionCrud.merge(moduleDef);
 
             // Create a pipeline definition.
             pipelineDef = new PipelineDefinition(new AuditInfo(adminUser, new Date()),
@@ -127,46 +130,47 @@ private void populateObjects() {
 
             // create some pipeline def nodes
             pipelineDefNode1 = new PipelineDefinitionNode(moduleDef.getName(),
-                pipelineDef.getName().getName());
-            pipelineDefNode1.setUnitOfWorkGenerator(
-                new ClassWrapper<UnitOfWorkGenerator>(new SingleUnitOfWorkGenerator()));
+                pipelineDef.getName());
+            pipelineDefNode1
+                .setUnitOfWorkGenerator(new ClassWrapper<>(new SingleUnitOfWorkGenerator()));
             pipelineDefNode1.setStartNewUow(true);
 
             pipelineDefNode2 = new PipelineDefinitionNode(moduleDef.getName(),
-                pipelineDef.getName().getName());
-            pipelineDefNode2.setUnitOfWorkGenerator(
-                new ClassWrapper<UnitOfWorkGenerator>(new SingleUnitOfWorkGenerator()));
+                pipelineDef.getName());
+            pipelineDefNode2
+                .setUnitOfWorkGenerator(new ClassWrapper<>(new SingleUnitOfWorkGenerator()));
             pipelineDefNode2.setStartNewUow(true);
 
             pipelineDef.getRootNodes().add(pipelineDefNode1);
             pipelineDefNode1.getNextNodes().add(pipelineDefNode2);
 
-            pipelineDefinitionCrud.create(pipelineDef);
+            pipelineDef = pipelineDefinitionCrud.merge(pipelineDef);
 
             pipelineInstance = createPipelineInstance();
-            pipelineInstanceCrud.create(pipelineInstance);
 
-            pipelineInstanceNode1 = createPipelineInstanceNode(pipelineDefNode1, 2, 2, 1, 0);
-            pipelineInstanceNodeCrud.create(pipelineInstanceNode1);
+            pipelineInstanceNode1 = createPipelineInstanceNode(pipelineDefNode1);
+            pipelineInstanceNodeCrud.persist(pipelineInstanceNode1);
 
             pipelineTask1 = createPipelineTask(pipelineInstanceNode1);
             pipelineTask1.setState(PipelineTask.State.PROCESSING);
-            pipelineTaskCrud.create(pipelineTask1);
+            pipelineTaskCrud.persist(pipelineTask1);
 
             pipelineTask2 = createPipelineTask(pipelineInstanceNode1);
             pipelineTask2.setState(PipelineTask.State.COMPLETED);
-            pipelineTaskCrud.create(pipelineTask2);
+            pipelineTaskCrud.persist(pipelineTask2);
 
-            pipelineInstanceNode2 = createPipelineInstanceNode(pipelineDefNode2, 2, 2, 0, 1);
-            pipelineInstanceNodeCrud.create(pipelineInstanceNode2);
+            pipelineInstanceNode2 = createPipelineInstanceNode(pipelineDefNode2);
+            pipelineInstanceNodeCrud.persist(pipelineInstanceNode2);
 
             pipelineTask3 = createPipelineTask(pipelineInstanceNode2);
             pipelineTask3.setState(PipelineTask.State.PROCESSING);
-            pipelineTaskCrud.create(pipelineTask3);
+            pipelineTaskCrud.persist(pipelineTask3);
 
             pipelineTask4 = createPipelineTask(pipelineInstanceNode2);
             pipelineTask4.setState(PipelineTask.State.ERROR);
-            pipelineTaskCrud.create(pipelineTask4);
+            pipelineTaskCrud.persist(pipelineTask4);
+
+            pipelineInstanceCrud.persist(pipelineInstance);
 
             return null;
         });
@@ -174,47 +178,44 @@ private void populateObjects() {
 
     private PipelineInstance createPipelineInstance() throws PipelineException {
         PipelineInstance pipelineInstance = new PipelineInstance(pipelineDef);
-        pipelineInstance.putParameterSet(new ClassWrapper<Parameters>(new TestPipelineParameters()),
+        pipelineInstance.putParameterSet(new ClassWrapper<>(new TestPipelineParameters()),
             parameterSet);
         return pipelineInstance;
     }
 
-    private PipelineInstanceNode createPipelineInstanceNode(PipelineDefinitionNode pipelineDefNode,
-        int numTasks, int numSubmittedTasks, int numCompletedTasks, int numFailedTasks)
+    private PipelineInstanceNode createPipelineInstanceNode(PipelineDefinitionNode pipelineDefNode)
         throws PipelineException {
-        return new PipelineInstanceNode(pipelineInstance, pipelineDefNode, moduleDef, numTasks,
-            numSubmittedTasks, numCompletedTasks, numFailedTasks);
+        return new PipelineInstanceNode(pipelineInstance, pipelineDefNode, moduleDef);
     }
 
     private PipelineTask createPipelineTask(PipelineInstanceNode parentPipelineInstanceNode)
         throws PipelineException {
         PipelineTask pipelineTask = new PipelineTask(pipelineInstance, parentPipelineInstanceNode);
-        pipelineTask.setUowTask(new BeanWrapper<>(new UnitOfWork()));
+        UnitOfWork uow = new SingleUnitOfWorkGenerator().generateUnitsOfWork(null).get(0);
+        pipelineTask.setUowTaskParameters(uow.getParameters());
         pipelineTask.setWorkerHost(TEST_WORKER_NAME);
         pipelineTask.setSoftwareRevision("42");
         return pipelineTask;
     }
 
     private int pipelineInstanceCount() {
-        Query q = DatabaseService.getInstance()
-            .getSession()
-            .createQuery("select count(*) from PipelineInstance");
-        return ((Long) q.uniqueResult()).intValue();
+        PipelineInstanceCrud crud = new PipelineInstanceCrud();
+        return crud.uniqueResult(crud.createZiggyQuery(PipelineInstance.class, Long.class).count())
+            .intValue();
     }
 
     private int pipelineTaskCount() {
-        Query q = DatabaseService.getInstance()
-            .getSession()
-            .createQuery("select count(*) from PipelineTask");
-        return ((Long) q.uniqueResult()).intValue();
+        PipelineTaskCrud crud = new PipelineTaskCrud();
+        return crud.uniqueResult(crud.createZiggyQuery(PipelineTask.class, Long.class).count())
+            .intValue();
     }
 
     private int pipelineTaskWithErrorsCount() {
-        Query q = DatabaseService.getInstance()
-            .getSession()
-            .createQuery("select count(*) from PipelineTask where state = :state");
-        q.setParameter("state", PipelineTask.State.ERROR);
-        return ((Long) q.uniqueResult()).intValue();
+        PipelineTaskCrud crud = new PipelineTaskCrud();
+        return crud.uniqueResult(crud.createZiggyQuery(PipelineTask.class, Long.class)
+            .column(PipelineTask_.state)
+            .in(PipelineTask.State.ERROR)
+            .count()).intValue();
     }
 
     /**
@@ -391,13 +392,12 @@ public void testInstanceState() throws Exception {
         populateObjects();
 
         // Retrieve
-        PipelineInstanceAggregateState actualState = (PipelineInstanceAggregateState) DatabaseTransactionFactory
-            .performTransaction(() -> pipelineInstanceCrud.instanceState(pipelineInstance));
+        TaskCounts actualState = (TaskCounts) DatabaseTransactionFactory
+            .performTransaction(() -> pipelineOperations.taskCounts(pipelineInstance));
 
         ReflectionEquals comparer = new ReflectionEquals();
 
-        PipelineInstanceAggregateState expectedState = new PipelineInstanceAggregateState(4L, 4L,
-            1L, 1L);
+        TaskCounts expectedState = new TaskCounts(4, 4, 1, 1);
 
         comparer.assertEquals("instanceState", expectedState, actualState);
     }
@@ -522,25 +522,33 @@ public void testClearStaleState() throws Exception {
         // Create
         populateObjects();
 
-        assertEquals("pipelineTaskWithErrorsCount count", 1, pipelineTaskWithErrorsCount());
+        // Add an end node
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineInstance.setEndNode(pipelineInstanceNode2);
+            pipelineInstance = pipelineInstanceCrud.merge(pipelineInstance);
+            return null;
+        });
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            assertEquals("pipelineTaskWithErrorsCount count", 1, pipelineTaskWithErrorsCount());
 
-        ClearStaleStateResults staleStateResults = pipelineTaskCrud
-            .clearStaleState(TEST_WORKER_NAME);
+            ClearStaleStateResults staleStateResults = pipelineTaskCrud.clearStaleState();
 
-        assertEquals("stale row count", 2, staleStateResults.totalUpdatedTaskCount);
-        assertEquals("unique instance ids count", 1, staleStateResults.uniqueInstanceIds.size());
-        assertEquals("unique instance id", pipelineInstance.getId(),
-            staleStateResults.uniqueInstanceIds.iterator().next().intValue());
-        assertEquals("pipelineTaskWithErrorsCount count", 3, pipelineTaskWithErrorsCount());
+            assertEquals("stale row count", 2, staleStateResults.totalUpdatedTaskCount);
+            assertEquals("unique instance ids count", 1,
+                staleStateResults.uniqueInstanceIds.size());
+            assertEquals("unique instance id", pipelineInstance.getId(),
+                staleStateResults.uniqueInstanceIds.iterator().next());
+            assertEquals("pipelineTaskWithErrorsCount count", 3, pipelineTaskWithErrorsCount());
 
-        PipelineInstanceAggregateState actualState = pipelineInstanceCrud
-            .instanceState(pipelineInstance);
+            TaskCounts actualState = pipelineOperations.taskCounts(pipelineInstance);
 
-        PipelineInstanceAggregateState expectedState = new PipelineInstanceAggregateState(4L, 4L,
-            1L, 3L);
+            TaskCounts expectedState = new TaskCounts(4, 4, 1, 3);
 
-        ReflectionEquals comparer = new ReflectionEquals();
-        comparer.assertEquals("instanceState", expectedState, actualState);
+            ReflectionEquals comparer = new ReflectionEquals();
+            comparer.assertEquals("instanceState", expectedState, actualState);
+            return null;
+        });
     }
 
     @Test
@@ -550,7 +558,7 @@ public void testRetrieveAllPipelineInstancesForPipelineInstanceIds() {
         PipelineInstance pipelineInstance2 = new PipelineInstance();
 
         DatabaseTransactionFactory.performTransaction(() -> {
-            pipelineInstanceCrud.create(pipelineInstance2);
+            pipelineInstanceCrud.persist(pipelineInstance2);
             return null;
         });
 
@@ -565,4 +573,50 @@ public void testRetrieveAllPipelineInstancesForPipelineInstanceIds() {
 
         assertEquals(expectedPipelineInstances, actualPipelineInstances);
     }
+
+    @Test
+    public void testUpdateName() {
+        populateObjects();
+
+        // The name should start out as empty or null.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineInstance instance = pipelineInstanceCrud.retrieve(1L);
+            assertTrue(StringUtils.isEmpty(instance.getName()));
+            return null;
+        });
+
+        // Update the name.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineInstanceCrud.updateName(1L, "test");
+            return null;
+        });
+
+        // Check the name again.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineInstance instance = pipelineInstanceCrud.retrieve(1L);
+            assertEquals("test", instance.getName());
+            return null;
+        });
+    }
+
+    @Test
+    public void testInstanceIdsForModuleName() {
+        populateObjects();
+
+        // If I use the named module, I should get back 1 instance.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<PipelineInstance> instances = pipelineInstanceCrud.instanceIdsForModule("Test-1");
+            assertEquals(1, instances.size());
+            assertEquals(Long.valueOf(1L), instances.get(0).getId());
+            return null;
+        });
+
+        // If I use a module name that has no instances, I should get an empty result.
+        // If I use the named module, I should get back 1 instance.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<PipelineInstance> instances = pipelineInstanceCrud.instanceIdsForModule("Test-2");
+            assertEquals(0, instances.size());
+            return null;
+        });
+    }
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineModuleDefinitionCrudTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineModuleDefinitionCrudTest.java
index 975ce30..22a4a3a 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineModuleDefinitionCrudTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineModuleDefinitionCrudTest.java
@@ -1,12 +1,13 @@
 package gov.nasa.ziggy.pipeline.definition.crud;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 
+import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.List;
 
-import org.hibernate.Query;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -14,14 +15,12 @@
 import gov.nasa.ziggy.ReflectionEquals;
 import gov.nasa.ziggy.ZiggyDatabaseRule;
 import gov.nasa.ziggy.ZiggyUnitTestUtils;
+import gov.nasa.ziggy.crud.ZiggyQuery;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
 import gov.nasa.ziggy.pipeline.definition.AuditInfo;
-import gov.nasa.ziggy.pipeline.definition.BeanWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
 import gov.nasa.ziggy.pipeline.definition.TestModuleParameters;
-import gov.nasa.ziggy.services.database.DatabaseService;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 import gov.nasa.ziggy.services.security.User;
 import gov.nasa.ziggy.services.security.UserCrud;
@@ -75,18 +74,16 @@ private PipelineModuleDefinition populateObjects() {
             userCrud.createUser(operatorUser);
 
             ParameterSet paramSet = createParameterSet(TEST_PARAM_SET_NAME_1);
-            parameterSetCrud.create(paramSet);
+            parameterSetCrud.persist(paramSet);
 
             PipelineModuleDefinition pmd = createPipelineModuleDefinition();
-            pipelineModuleDefinitionCrud.create(pmd);
-
-            return pmd;
+            return pipelineModuleDefinitionCrud.merge(pmd);
         });
     }
 
     private ParameterSet createParameterSet(String name) {
         ParameterSet parameterSet = new ParameterSet(new AuditInfo(adminUser, new Date()), name);
-        parameterSet.setParameters(new BeanWrapper<Parameters>(new TestModuleParameters(1)));
+        parameterSet.populateFromParametersInstance(new TestModuleParameters(1));
         return parameterSet;
     }
 
@@ -96,31 +93,67 @@ private PipelineModuleDefinition createPipelineModuleDefinition() {
     }
 
     private int pipelineModuleDefinitionCount() {
-        Query q = DatabaseService.getInstance()
-            .getSession()
-            .createQuery("select count(*) from PipelineModuleDefinition");
-        return ((Long) q.uniqueResult()).intValue();
+        ZiggyQuery<PipelineModuleDefinition, Long> query = pipelineModuleDefinitionCrud
+            .createZiggyQuery(PipelineModuleDefinition.class, Long.class);
+        Long count = pipelineModuleDefinitionCrud.uniqueResult(query.count());
+        return count.intValue();
     }
 
     private int pipelineModuleParamSetCount() {
-        Query q = DatabaseService.getInstance()
-            .getSession()
-            .createQuery("select count(*) from ParameterSet");
-        return ((Long) q.uniqueResult()).intValue();
+        ZiggyQuery<ParameterSet, Long> query = parameterSetCrud.createZiggyQuery(ParameterSet.class,
+            Long.class);
+        Long count = parameterSetCrud.uniqueResult(query.count());
+        return count.intValue();
     }
 
+    // For some reason, I'm not able to do the following two count queries as proper queries
+    // using count(), but I'm able to retrieve all distinct names and return the size of the
+    // resulting list.
     private int paramSetNameCount() {
-        Query q = DatabaseService.getInstance()
-            .getSession()
-            .createQuery("select count(*) from ParameterSetName");
-        return ((Long) q.uniqueResult()).intValue();
+        return parameterSetCrud.retrieveNames().size();
     }
 
     private int moduleNameCount() {
-        Query q = DatabaseService.getInstance()
-            .getSession()
-            .createQuery("select count(*) from ModuleName");
-        return ((Long) q.uniqueResult()).intValue();
+        return pipelineModuleDefinitionCrud.retrieveNames().size();
+    }
+
+    PipelineModuleDefinition copy(PipelineModuleDefinition original) throws NoSuchFieldException,
+        SecurityException, IllegalArgumentException, IllegalAccessException {
+        PipelineModuleDefinition copy = new PipelineModuleDefinition(original.getName());
+        copy.setGroup(original.getGroup());
+        copy.setAuditInfo(original.getAuditInfo());
+        copy.setDescription(original.getDescription());
+        copy.setPipelineModuleClass(original.getPipelineModuleClass());
+        copy.setExeTimeoutSecs(original.getExeTimeoutSecs());
+        copy.setMinMemoryMegaBytes(original.getMinMemoryMegaBytes());
+        Field versionField = original.getClass().getSuperclass().getDeclaredField("version");
+        versionField.setAccessible(true);
+        versionField.set(copy, original.getVersion());
+        setOptimisticLockValue(copy, original.getOptimisticLockValue());
+        Field idField = original.getClass().getDeclaredField("id");
+        idField.setAccessible(true);
+        idField.set(copy, original.getId());
+        return copy;
+    }
+
+    private void setOptimisticLockValue(PipelineModuleDefinition pipelineModuleDefinition,
+        int dirty) throws NoSuchFieldException, SecurityException, IllegalArgumentException,
+        IllegalAccessException {
+        Field dirtyField = pipelineModuleDefinition.getClass()
+            .getSuperclass()
+            .getDeclaredField("optimisticLockValue");
+        dirtyField.setAccessible(true);
+        dirtyField.set(pipelineModuleDefinition, dirty);
+    }
+
+    private void setOptimisticLockValue(ParameterSet parameterSet, int dirty)
+        throws NoSuchFieldException, SecurityException, IllegalArgumentException,
+        IllegalAccessException {
+        Field dirtyField = parameterSet.getClass()
+            .getSuperclass()
+            .getDeclaredField("optimisticLockValue");
+        dirtyField.setAccessible(true);
+        dirtyField.set(parameterSet, dirty);
     }
 
     /**
@@ -140,7 +173,6 @@ public void testStoreAndRetrieve() throws Exception {
                     .retrieveLatestVersionForName(TEST_MODULE_NAME_1);
                 ZiggyUnitTestUtils.initializePipelineModuleDefinition(amd);
                 return amd;
-
             });
 
         comparer.assertEquals("PipelineModuleDefinition", expectedModuleDef, actualModuleDef);
@@ -158,6 +190,27 @@ public void testRetrieveMissing() {
         assertNull("missing module", moduleDef);
     }
 
+    @Test(expected = PipelineException.class)
+    public void testOptimisticLocking() {
+        // Create
+        PipelineModuleDefinition pmd = populateObjects();
+
+        // Retrieve & Edit
+        DatabaseTransactionFactory.performTransaction(() -> {
+            PipelineModuleDefinition modifiedPipelineModDef = pipelineModuleDefinitionCrud
+                .retrieveLatestVersionForName(pmd.getName());
+            editModuleDef(modifiedPipelineModDef);
+            return null;
+        });
+
+        // Attempting to save the original version will fail because the save of a
+        // modified version causes the original to be out of date.
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineModuleDefinitionCrud.merge(pmd);
+            return null;
+        });
+    }
+
     @Test
     public void testEditPipelineModuleDefinition() throws Exception {
         // Create
@@ -184,9 +237,10 @@ public void testEditPipelineModuleDefinition() throws Exception {
         createParameterSet(TEST_PARAM_SET_NAME_1);
         PipelineModuleDefinition expectedModuleDef = createPipelineModuleDefinition();
         editModuleDef(expectedModuleDef);
-        expectedModuleDef.setDirty(1);
+        setOptimisticLockValue(expectedModuleDef, 1);
 
         comparer.assertEquals("PipelineModuleDefinition", expectedModuleDef, actualModuleDef);
+        assertEquals(1, actualModuleDef.getOptimisticLockValue());
 
         assertEquals("PipelineModuleDefinition count", 1, pipelineModuleDefinitionCount());
         assertEquals("ParameterSet count", 1, pipelineModuleParamSetCount());
@@ -236,7 +290,7 @@ public void testEditPipelineModuleParameterSetChangeParam() throws Exception {
 
         ParameterSet expectedParamSet = createParameterSet(TEST_PARAM_SET_NAME_1);
         editParamSetChangeParam(expectedParamSet);
-        expectedParamSet.setDirty(1);
+        setOptimisticLockValue(expectedParamSet, 1);
 
         comparer.assertEquals("ParameterSet", expectedParamSet, actualParamSet);
 
@@ -254,7 +308,49 @@ public void testEditPipelineModuleParameterSetChangeParam() throws Exception {
     private void editParamSetChangeParam(ParameterSet paramSet) {
         TestModuleParameters moduleParams = paramSet.parametersInstance();
         moduleParams.setValue(100);
-        paramSet.getParameters().populateFromInstance(moduleParams);
+        paramSet.setTypedParameters(moduleParams.getParameters());
+    }
+
+    @Test
+    public void testCreateOrUpdateDuplicateInstance() {
+        PipelineModuleDefinition pmd = populateObjects();
+        pmd.setDescription("New description");
+
+        // Executing with the same object but changed content does the right thing
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineModuleDefinitionCrud.merge(pmd);
+            return null;
+        });
+
+        @SuppressWarnings("unchecked")
+        List<PipelineModuleDefinition> pipelineModuleDefinitions0 = (List<PipelineModuleDefinition>) DatabaseTransactionFactory
+            .performTransaction(
+                () -> pipelineModuleDefinitionCrud.retrieveAllVersionsForName(pmd.getName()));
+        assertEquals(1, pipelineModuleDefinitions0.size());
+        assertEquals("New description", pipelineModuleDefinitions0.get(0).getDescription());
+
+        // Executing with a different object does the wrong thing
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineModuleDefinitionCrud.merge(copy(pipelineModuleDefinitions0.get(0)));
+            return null;
+        });
+
+        @SuppressWarnings("unchecked")
+        List<PipelineModuleDefinition> pipelineModuleDefinitions = (List<PipelineModuleDefinition>) DatabaseTransactionFactory
+            .performTransaction(
+                () -> pipelineModuleDefinitionCrud.retrieveAllVersionsForName(pmd.getName()));
+
+        if (pipelineModuleDefinitions.size() == 2) {
+            assertEquals(pipelineModuleDefinitions.get(0).getName(),
+                pipelineModuleDefinitions.get(1).getName());
+            assertEquals(pipelineModuleDefinitions.get(0).getVersion(),
+                pipelineModuleDefinitions.get(1).getVersion());
+            assertFalse(pipelineModuleDefinitions.get(0).isLocked());
+            assertFalse(pipelineModuleDefinitions.get(1).isLocked());
+        }
+
+        // Here's where we fail, because this should not have created a duplicate object
+        assertEquals(1, pipelineModuleDefinitions.size());
     }
 
     @Test
@@ -267,11 +363,11 @@ public void testDeletePipelineModuleParameterSet() throws Exception {
         DatabaseTransactionFactory.performTransaction(() -> {
             PipelineModuleDefinition deletedModuleDef = pipelineModuleDefinitionCrud
                 .retrieveLatestVersionForName(TEST_MODULE_NAME_1);
-            pipelineModuleDefinitionCrud.delete(deletedModuleDef);
+            pipelineModuleDefinitionCrud.remove(deletedModuleDef);
 
             ParameterSet deletedParamSet = parameterSetCrud
                 .retrieveLatestVersionForName(TEST_PARAM_SET_NAME_1);
-            parameterSetCrud.delete(deletedParamSet);
+            parameterSetCrud.remove(deletedParamSet);
             return null;
         });
 
@@ -294,10 +390,9 @@ public void testFailedDeletePipelineModuleParameterSet() throws Exception {
              */
             ParameterSet deletedParamSet = parameterSetCrud
                 .retrieveLatestVersionForName(TEST_PARAM_SET_NAME_1);
-            parameterSetCrud.delete(deletedParamSet);
+            parameterSetCrud.remove(deletedParamSet);
             return null;
         });
-
     }
 
     @Test
@@ -310,7 +405,7 @@ public void testDeletePipelineModule() throws Exception {
         DatabaseTransactionFactory.performTransaction(() -> {
             PipelineModuleDefinition deletedModuleDef = pipelineModuleDefinitionCrud
                 .retrieveLatestVersionForName(TEST_MODULE_NAME_1);
-            pipelineModuleDefinitionCrud.delete(deletedModuleDef);
+            pipelineModuleDefinitionCrud.remove(deletedModuleDef);
             return null;
         });
 
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskCrudTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskCrudTest.java
index 5e77899..379919a 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskCrudTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskCrudTest.java
@@ -14,6 +14,7 @@
 import org.junit.Test;
 
 import gov.nasa.ziggy.ZiggyDatabaseRule;
+import gov.nasa.ziggy.crud.SimpleCrud;
 import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
@@ -26,7 +27,6 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 import gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator;
-import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
 
 /**
  * Implements unit tests for {@link PipelineTaskCrud}.
@@ -80,7 +80,7 @@ public void testRetrieveNoTasks() {
     @Test
     public void testRetrieveOneTask() {
         DatabaseTransactionFactory.performTransaction(() -> {
-            createTasksForPipeline("pipeline1", pipelineDef, moduleDef);
+            createTasksForPipeline("pipeline1", pipelineDef, moduleDef, 1);
             return null;
         });
 
@@ -99,7 +99,6 @@ public void testRetrieveOneTask() {
             assertEquals("pipeline1", task.getPipelineInstance().getName());
             return null;
         });
-
     }
 
     /**
@@ -108,8 +107,8 @@ public void testRetrieveOneTask() {
     @Test
     public void testRetrieveTwoTasks() {
         DatabaseTransactionFactory.performTransaction(() -> {
-            createTasksForPipeline("pipeline1", pipelineDef, moduleDef);
-            createTasksForPipeline("pipeline2", pipelineDef, moduleDef);
+            createTasksForPipeline("pipeline1", pipelineDef, moduleDef, 1);
+            createTasksForPipeline("pipeline2", pipelineDef, moduleDef, 1);
             return null;
         });
 
@@ -134,14 +133,42 @@ public void testRetrieveTwoTasks() {
             assertEquals("pipeline2", task.getPipelineInstance().getName());
             return null;
         });
+    }
+
+    @Test
+    public void testRetrieveStateCount() {
+        DatabaseTransactionFactory.performTransaction(() -> {
+            createTasksForPipeline("pipeline1", pipelineDef, moduleDef, 4);
+            createTasksForPipeline("pipeline2", pipelineDef, moduleDef, 2);
+            return null;
+        });
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            pipelineTaskCrud.retrieve(1L).setState(PipelineTask.State.PROCESSING);
+            pipelineTaskCrud.retrieve(2L).setState(PipelineTask.State.PROCESSING);
+            pipelineTaskCrud.retrieve(3L).setState(PipelineTask.State.ERROR);
+            pipelineTaskCrud.retrieve(4L).setState(PipelineTask.State.COMPLETED);
+            pipelineTaskCrud.retrieve(5L).setState(PipelineTask.State.PROCESSING);
+            pipelineTaskCrud.retrieve(6L).setState(PipelineTask.State.PROCESSING);
+            return null;
+        });
 
+        DatabaseTransactionFactory.performTransaction(() -> {
+            Integer taskCount = pipelineTaskCrud.retrieveStateCount(1L,
+                PipelineTask.State.PROCESSING);
+            assertEquals(2L, taskCount.longValue());
+            taskCount = pipelineTaskCrud.retrieveStateCount(1L, PipelineTask.State.ERROR);
+            assertEquals(1L, taskCount.longValue());
+            taskCount = pipelineTaskCrud.retrieveStateCount(2L, PipelineTask.State.PROCESSING);
+            assertEquals(2L, taskCount.longValue());
+            return null;
+        });
     }
 
     private PipelineModuleDefinition createModule(String moduleName) {
         PipelineModuleDefinition moduleDef = new PipelineModuleDefinition(moduleName);
         moduleDef.setPipelineModuleClass(new ClassWrapper<>(TestModule.class));
-        new PipelineModuleDefinitionCrud().create(moduleDef);
-        return moduleDef;
+        return new PipelineModuleDefinitionCrud().merge(moduleDef);
     }
 
     private PipelineDefinition createPipelineDefinition(String pipelineName,
@@ -152,23 +179,20 @@ private PipelineDefinition createPipelineDefinition(String pipelineName,
         List<Integer> path = new ArrayList<>();
         List<PipelineDefinitionNode> nodes = Stream.of(modules).map(module -> {
             PipelineDefinitionNode node = new PipelineDefinitionNode(module.getName(),
-                pipelineDef.getName().getName());
-            node.setUnitOfWorkGenerator(
-                new ClassWrapper<UnitOfWorkGenerator>(new SingleUnitOfWorkGenerator()));
+                pipelineDef.getName());
+            node.setUnitOfWorkGenerator(new ClassWrapper<>(new SingleUnitOfWorkGenerator()));
             path.add(0);
             node.setPath(new PipelineDefinitionNodePath(path));
-            new PipelineDefinitionCrud().create(node);
+            new SimpleCrud<>().persist(node);
             return node;
         }).collect(Collectors.toList());
 
         pipelineDef.setRootNodes(nodes);
-        new PipelineDefinitionCrud().create(pipelineDef);
-
-        return pipelineDef;
+        return new PipelineDefinitionCrud().merge(pipelineDef);
     }
 
     private PipelineInstance createTasksForPipeline(String instanceName,
-        PipelineDefinition pipelineDef, PipelineModuleDefinition moduleDef) {
+        PipelineDefinition pipelineDef, PipelineModuleDefinition moduleDef, int taskCount) {
 
         PipelineInstance instance = new PipelineInstance(pipelineDef);
         instance.setName(instanceName);
@@ -177,16 +201,18 @@ private PipelineInstance createTasksForPipeline(String instanceName,
         PipelineDefinitionNode node = pipelineDef.getRootNodes().get(0);
         while (node != null) {
             PipelineInstanceNode instanceNode = new PipelineInstanceNode(instance, node, moduleDef);
-            new PipelineInstanceCrud().create(instanceNode);
+            new PipelineInstanceCrud().persist(instanceNode);
 
-            PipelineTask task = new PipelineTask(instance, instanceNode);
-            new PipelineTaskCrud().create(task);
+            for (int i = 0; i < taskCount; i++) {
+                PipelineTask task = new PipelineTask(instance, instanceNode);
+                new PipelineTaskCrud().persist(task);
+            }
 
             // Assuming a sequential path of nodes!
             node = node.getNextNodes().isEmpty() ? null : node.getNextNodes().get(0);
         }
 
-        new PipelineInstanceCrud().create(instance);
+        new PipelineInstanceCrud().persist(instance);
         return instance;
     }
 
@@ -208,22 +234,18 @@ public String getModuleName() {
 
         @Override
         protected void restartFromBeginning() {
-
         }
 
         @Override
         protected void resumeCurrentStep() {
-
         }
 
         @Override
         protected void resubmit() {
-
         }
 
         @Override
         protected void resumeMonitoring() {
-
         }
 
         @Override
@@ -233,9 +255,6 @@ protected List<RunMode> restartModes() {
 
         @Override
         protected void runStandard() {
-
         }
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskOperationsTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskOperationsTest.java
index b47ed31..705f621 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskOperationsTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/PipelineTaskOperationsTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.pipeline.definition.crud;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.QUEUE_COMMAND_CLASS_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.REMOTE_QUEUE_COMMAND_CLASS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -18,6 +18,7 @@
 
 import gov.nasa.ziggy.ZiggyDatabaseRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
+import gov.nasa.ziggy.crud.SimpleCrud;
 import gov.nasa.ziggy.module.remote.QueueCommandManager;
 import gov.nasa.ziggy.module.remote.QueueCommandManagerTest;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
@@ -43,8 +44,7 @@ public class PipelineTaskOperationsTest {
 
     @Rule
     public ZiggyPropertyRule queueCommandClassPropertyRule = new ZiggyPropertyRule(
-        QUEUE_COMMAND_CLASS_PROP_NAME,
-        "gov.nasa.ziggy.module.remote.QueueCommandManagerForUnitTests");
+        REMOTE_QUEUE_COMMAND_CLASS, "gov.nasa.ziggy.module.remote.QueueCommandManagerForUnitTests");
 
     @Before
     public void setUp() {
@@ -165,29 +165,26 @@ public void testUpdateJobsForPipelineInstance() {
             assertEquals(otherJob.isFinished(), remoteJob.isFinished());
             assertEquals(otherJob.getCostEstimate(), remoteJob.getCostEstimate(), 1e-9);
         }
-
     }
 
     private PipelineTask createPipelineTask() {
 
         PipelineTask task = new PipelineTask();
-        task.setId(1L);
         PipelineInstance instance = new PipelineInstance();
-        instance.setId(1L);
         PipelineModuleDefinition modDef = new PipelineModuleDefinition("tps");
         PipelineDefinitionNode defNode = new PipelineDefinitionNode(modDef.getName(), "dummy");
         PipelineInstanceNode instNode = new PipelineInstanceNode(instance, defNode, modDef);
         task.setPipelineInstance(instance);
         task.setPipelineInstanceNode(instNode);
         DatabaseTransactionFactory.performTransaction(() -> {
-            new PipelineInstanceCrud().create(instance);
-            new PipelineModuleDefinitionCrud().create(modDef);
-            new PipelineDefinitionCrud().create(defNode);
-            new PipelineInstanceNodeCrud().create(instNode);
+            new PipelineInstanceCrud().persist(instance);
+            new PipelineModuleDefinitionCrud().persist(modDef);
+            new SimpleCrud<>().persist(defNode);
+            new PipelineInstanceNodeCrud().persist(instNode);
             return null;
         });
         DatabaseTransactionFactory.performTransaction(() -> {
-            new PipelineTaskCrud().create(task);
+            new PipelineTaskCrud().persist(task);
             return null;
         });
 
@@ -229,5 +226,4 @@ private void mockRemoteJobUpdates() {
         QueueCommandManagerTest.mockQstatCall(cmdManager, "-xf 6020203",
             new String[] { QueueCommandManager.SELECT, QueueCommandManager.WALLTIME }, "");
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ProcessingSummaryOperationsTest.java b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ProcessingSummaryOperationsTest.java
index 8f10929..46cbb6f 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ProcessingSummaryOperationsTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/definition/crud/ProcessingSummaryOperationsTest.java
@@ -39,10 +39,10 @@ public void setUp() {
             PipelineInstance pipelineInstance = new PipelineInstance();
             pipelineTask1.setPipelineInstance(pipelineInstance);
             pipelineTask2.setPipelineInstance(pipelineInstance);
-            new PipelineInstanceCrud().create(pipelineInstance);
+            new PipelineInstanceCrud().persist(pipelineInstance);
             PipelineTaskCrud crud = new PipelineTaskCrud();
-            crud.create(pipelineTask1);
-            crud.create(pipelineTask2);
+            crud.persist(pipelineTask1);
+            crud.persist(pipelineTask2);
             tasks.add(pipelineTask1);
             tasks.add(pipelineTask2);
             return null;
@@ -141,5 +141,4 @@ public void testProcessingSummariesForInstance() {
             return null;
         });
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/pipeline/xml/ValidatingXmlManagerTest.java b/src/test/java/gov/nasa/ziggy/pipeline/xml/ValidatingXmlManagerTest.java
index 9b5c9fd..8df86e7 100644
--- a/src/test/java/gov/nasa/ziggy/pipeline/xml/ValidatingXmlManagerTest.java
+++ b/src/test/java/gov/nasa/ziggy/pipeline/xml/ValidatingXmlManagerTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.pipeline.xml;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
@@ -13,10 +13,10 @@
 import org.xml.sax.SAXException;
 
 import gov.nasa.ziggy.ZiggyPropertyRule;
+import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionFile;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
 import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.UnmarshalException;
 
 /**
  * Unit tests for {@link ValidatingXmlManager} class.
@@ -29,8 +29,8 @@ public class ValidatingXmlManagerTest {
     private File validXmlFile;
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, DirectoryProperties.ziggyCodeBuildDir().toString());
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
 
     @Before
     public void setUp() {
@@ -41,7 +41,7 @@ public void setUp() {
         validXmlFile = validXmlPath.toFile();
     }
 
-    @Test(expected = UnmarshalException.class)
+    @Test(expected = PipelineException.class)
     public void testUnmarshalInvalidXml() throws InstantiationException, IllegalAccessException,
         SAXException, JAXBException, IllegalArgumentException, InvocationTargetException,
         NoSuchMethodException, SecurityException {
@@ -59,5 +59,4 @@ public void testUnmarshalValidXml() throws InstantiationException, IllegalAccess
             PipelineDefinitionFile.class);
         xmlManager.unmarshal(validXmlFile);
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/services/alert/AlertLogCrudTest.java b/src/test/java/gov/nasa/ziggy/services/alert/AlertLogCrudTest.java
index adf12ad..8d239b4 100644
--- a/src/test/java/gov/nasa/ziggy/services/alert/AlertLogCrudTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/alert/AlertLogCrudTest.java
@@ -13,6 +13,11 @@
 import org.slf4j.event.Level;
 
 import gov.nasa.ziggy.ZiggyDatabaseRule;
+import gov.nasa.ziggy.module.PipelineException;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineTask;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 
 public class AlertLogCrudTest {
@@ -46,64 +51,89 @@ public void setUp() throws Exception {
 
     @Test
     public void testRetrieveComponents() {
-        List<String> components = alertCrud.retrieveComponents();
-        assertEquals(0, components.size());
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<String> components = alertCrud.retrieveComponents();
+            assertEquals(0, components.size());
+            return null;
+        });
 
         populateObjects();
-
-        components = alertCrud.retrieveComponents();
-
-        // Check number of components as well as sort.
-        assertEquals(8, components.size());
-        assertEquals("s1", components.get(0));
-        assertEquals("s2", components.get(1));
-        assertEquals("s3", components.get(2));
-        assertEquals("s4", components.get(3));
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<String> components = alertCrud.retrieveComponents();
+
+            // Check number of components as well as sort.
+            assertEquals(8, components.size());
+            assertEquals("s1", components.get(0));
+            assertEquals("s2", components.get(1));
+            assertEquals("s3", components.get(2));
+            assertEquals("s4", components.get(3));
+            return null;
+        });
     }
 
     @Test
     public void testRetrieveSeverities() {
-        List<String> severities = alertCrud.retrieveSeverities();
-        assertEquals(0, severities.size());
-
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<String> severities = alertCrud.retrieveSeverities();
+            assertEquals(0, severities.size());
+            return null;
+        });
         populateObjects();
 
-        severities = alertCrud.retrieveSeverities();
-
-        // Check number of components as well as sort.
-        assertEquals(4, severities.size());
-        assertEquals(Level.DEBUG.toString(), severities.get(0));
-        assertEquals(Level.ERROR.toString(), severities.get(1));
-        assertEquals(Level.INFO.toString(), severities.get(2));
-        assertEquals(Level.WARN.toString(), severities.get(3));
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<String> severities = alertCrud.retrieveSeverities();
+
+            // Check number of components as well as sort.
+            assertEquals(4, severities.size());
+            assertEquals(Level.DEBUG.toString(), severities.get(0));
+            assertEquals(Level.ERROR.toString(), severities.get(1));
+            assertEquals(Level.INFO.toString(), severities.get(2));
+            assertEquals(Level.WARN.toString(), severities.get(3));
+            return null;
+        });
     }
 
     @Test
     public void testCreateRetrieve() throws Exception {
         populateObjects();
 
-        List<AlertLog> alerts = alertCrud.retrieve(date2, date6);
-        assertEquals("alerts.size()", 6, alerts.size());
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<AlertLog> alerts = alertCrud.retrieve(date2, date6);
+            assertEquals("alerts.size()", 6, alerts.size());
+            return null;
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = PipelineException.class)
     public void testRetrieveNullStart() {
-        alertCrud.retrieve(null, null, null, null);
+        DatabaseTransactionFactory.performTransaction(() -> {
+            alertCrud.retrieve(null, null, null, null);
+            return null;
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = PipelineException.class)
     public void testRetrieveNullEnd() {
-        alertCrud.retrieve(new Date(), null, null, null);
+        DatabaseTransactionFactory.performTransaction(() -> {
+            alertCrud.retrieve(new Date(), null, null, null);
+            return null;
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = PipelineException.class)
     public void testRetrieveNullComponent() {
-        alertCrud.retrieve(new Date(), new Date(), null, null);
+        DatabaseTransactionFactory.performTransaction(() -> {
+            alertCrud.retrieve(new Date(), new Date(), null, null);
+            return null;
+        });
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = PipelineException.class)
     public void testRetrieveNullSeverity() {
-        alertCrud.retrieve(new Date(), new Date(), new String[0], null);
+        DatabaseTransactionFactory.performTransaction(() -> {
+            alertCrud.retrieve(new Date(), new Date(), new String[0], null);
+            return null;
+        });
     }
 
     @Test
@@ -114,79 +144,129 @@ public void testRetrieveAlertsByTaskId() {
         taskIds.add(5L);
         taskIds.add(1L);
 
-        List<AlertLog> alerts = alertCrud.retrieveByPipelineTaskIds(taskIds);
-        assertEquals(4, alerts.size());
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<AlertLog> alerts = alertCrud.retrieveByPipelineTaskIds(taskIds);
+            assertEquals(4, alerts.size());
+            return null;
+        });
     }
 
     @Test
     public void testRetrieve() {
         populateObjects();
 
-        // Test that empty components means that all components are considered.
-        String[] components = {};
-        String[] severities = {};
-        List<AlertLog> alerts = alertCrud.retrieve(date2, date6, components, severities);
-        assertEquals(6, alerts.size());
-
-        // This component isn't in the date range.
-        components = new String[] { "s4" };
-        alerts = alertCrud.retrieve(date2, date6, components, severities);
-        assertEquals(0, alerts.size());
-
-        // This component has one entry in and one outside of the range.
-        components[0] = "s1";
-        alerts = alertCrud.retrieve(date2, date6, components, severities);
-        assertEquals(1, alerts.size());
-        assertEquals("D", alerts.get(0).getAlertData().getProcessName());
-
-        // Specify all components; check sort.
-        components = new String[] { "s1", "s2", "s3", "s4" };
-        severities = new String[] { Level.ERROR.toString(), Level.ERROR.toString(),
-            Level.DEBUG.toString(), Level.INFO.toString(), Level.WARN.toString(),
-            Level.ERROR.toString() };
-        alerts = alertCrud.retrieve(date1, date7, components, severities);
-        assertEquals(5, alerts.size());
-        assertEquals("D", alerts.get(0).getAlertData().getProcessName());
-        assertEquals("E", alerts.get(1).getAlertData().getProcessName());
-        assertEquals("C", alerts.get(2).getAlertData().getProcessName());
-        assertEquals("B", alerts.get(3).getAlertData().getProcessName());
-        assertEquals("A", alerts.get(4).getAlertData().getProcessName());
-        assertEquals(Level.ERROR.toString(), alerts.get(0).getAlertData().getSeverity());
-
-        components = new String[] { "s5", "s6", "s7", "s8" };
-        alerts = alertCrud.retrieve(date1, date7, components, severities);
-        assertEquals(5, alerts.size());
-        assertEquals(Level.ERROR.toString(), alerts.get(0).getAlertData().getSeverity());
-        assertEquals(Level.ERROR.toString(), alerts.get(1).getAlertData().getSeverity());
-        assertEquals(Level.DEBUG.toString(), alerts.get(2).getAlertData().getSeverity());
-        assertEquals(Level.INFO.toString(), alerts.get(3).getAlertData().getSeverity());
-        assertEquals(Level.WARN.toString(), alerts.get(4).getAlertData().getSeverity());
-
-        // Check just the SEVERE severity.
-        severities = new String[] { Level.ERROR.toString() };
-        alerts = alertCrud.retrieve(date1, date7, components, severities);
-        assertEquals(2, alerts.size());
-        assertEquals(Level.ERROR.toString(), alerts.get(0).getAlertData().getSeverity());
+        DatabaseTransactionFactory.performTransaction(() -> {
+
+            // Test that empty components means that all components are considered.
+            String[] components = {};
+            String[] severities = {};
+            List<AlertLog> alerts = alertCrud.retrieve(date2, date6, components, severities);
+            assertEquals(6, alerts.size());
+
+            // This component isn't in the date range.
+            components = new String[] { "s4" };
+            alerts = alertCrud.retrieve(date2, date6, components, severities);
+            assertEquals(0, alerts.size());
+
+            // This component has one entry in and one outside of the range.
+            components[0] = "s1";
+            alerts = alertCrud.retrieve(date2, date6, components, severities);
+            assertEquals(1, alerts.size());
+            assertEquals("D", alerts.get(0).getAlertData().getProcessName());
+
+            // Specify all components; check sort.
+            components = new String[] { "s1", "s2", "s3", "s4" };
+            severities = new String[] { Level.ERROR.toString(), Level.ERROR.toString(),
+                Level.DEBUG.toString(), Level.INFO.toString(), Level.WARN.toString(),
+                Level.ERROR.toString() };
+            alerts = alertCrud.retrieve(date1, date7, components, severities);
+            assertEquals(5, alerts.size());
+            assertEquals("D", alerts.get(0).getAlertData().getProcessName());
+            assertEquals("E", alerts.get(1).getAlertData().getProcessName());
+            assertEquals("C", alerts.get(2).getAlertData().getProcessName());
+            assertEquals("B", alerts.get(3).getAlertData().getProcessName());
+            assertEquals("A", alerts.get(4).getAlertData().getProcessName());
+            assertEquals(Level.ERROR.toString(), alerts.get(0).getAlertData().getSeverity());
+
+            components = new String[] { "s5", "s6", "s7", "s8" };
+            alerts = alertCrud.retrieve(date1, date7, components, severities);
+            assertEquals(5, alerts.size());
+            assertEquals(Level.ERROR.toString(), alerts.get(0).getAlertData().getSeverity());
+            assertEquals(Level.ERROR.toString(), alerts.get(1).getAlertData().getSeverity());
+            assertEquals(Level.DEBUG.toString(), alerts.get(2).getAlertData().getSeverity());
+            assertEquals(Level.INFO.toString(), alerts.get(3).getAlertData().getSeverity());
+            assertEquals(Level.WARN.toString(), alerts.get(4).getAlertData().getSeverity());
+
+            // Check just the SEVERE severity.
+            severities = new String[] { Level.ERROR.toString() };
+            alerts = alertCrud.retrieve(date1, date7, components, severities);
+            assertEquals(2, alerts.size());
+            assertEquals(Level.ERROR.toString(), alerts.get(0).getAlertData().getSeverity());
+            return null;
+        });
+    }
+
+    @Test
+    public void testRetrieveForPipelineInstance() {
+        populateInstancesAndTasks();
+        populateObjects();
+
+        DatabaseTransactionFactory.performTransaction(() -> {
+            List<AlertLog> logs = alertCrud.retrieveForPipelineInstance(1L);
+            assertEquals(4, logs.size());
+            return null;
+        });
     }
 
     private void populateObjects() {
         DatabaseTransactionFactory.performTransaction(() -> {
-            alertCrud.create(new AlertLog(new Alert(date7, "s1", 5, "E", "e", 105, "message5")));
-            alertCrud.create(new AlertLog(new Alert(date5, "s1", 4, "D", "d", 104, "message4")));
-            alertCrud.create(new AlertLog(new Alert(date4, "s2", 3, "C", "c", 103, "message3")));
-            alertCrud.create(new AlertLog(new Alert(date3, "s3", 2, "B", "b", 102, "message2")));
-            alertCrud.create(new AlertLog(new Alert(date1, "s4", 1, "A", "a", 101, "message1")));
-
-            alertCrud.create(new AlertLog(
-                new Alert(date5, "s5", 4, "DS", "d", 104, Level.ERROR.toString(), "message4")));
-            alertCrud.create(new AlertLog(
-                new Alert(date7, "s5", 5, "EF", "e", 105, Level.ERROR.toString(), "message5")));
-            alertCrud.create(new AlertLog(
-                new Alert(date4, "s6", 3, "CD", "c", 103, Level.DEBUG.toString(), "message3")));
-            alertCrud.create(new AlertLog(
-                new Alert(date3, "s7", 2, "BI", "b", 102, Level.INFO.toString(), "message2")));
-            alertCrud.create(new AlertLog(
-                new Alert(date1, "s8", 1, "AW", "a", 101, Level.WARN.toString(), "message1")));
+            alertCrud.persist(new AlertLog(new Alert(date7, "s1", 5, "E", "e", 5, "message5")));
+            alertCrud.persist(new AlertLog(new Alert(date5, "s1", 4, "D", "d", 4, "message4")));
+            alertCrud.persist(new AlertLog(new Alert(date4, "s2", 3, "C", "c", 3, "message3")));
+            alertCrud.persist(new AlertLog(new Alert(date3, "s3", 2, "B", "b", 2, "message2")));
+            alertCrud.persist(new AlertLog(new Alert(date1, "s4", 1, "A", "a", 1, "message1")));
+
+            alertCrud.persist(new AlertLog(
+                new Alert(date5, "s5", 4, "DS", "d", 4, Level.ERROR.toString(), "message4")));
+            alertCrud.persist(new AlertLog(
+                new Alert(date7, "s5", 5, "EF", "e", 5, Level.ERROR.toString(), "message5")));
+            alertCrud.persist(new AlertLog(
+                new Alert(date4, "s6", 3, "CD", "c", 3, Level.DEBUG.toString(), "message3")));
+            alertCrud.persist(new AlertLog(
+                new Alert(date3, "s7", 2, "BI", "b", 2, Level.INFO.toString(), "message2")));
+            alertCrud.persist(new AlertLog(
+                new Alert(date1, "s8", 1, "AW", "a", 1, Level.WARN.toString(), "message1")));
+            return null;
+        });
+    }
+
+    private void populateInstancesAndTasks() {
+        DatabaseTransactionFactory.performTransaction(() -> {
+
+            PipelineInstance instance1 = new PipelineInstance();
+            PipelineTask task1 = new PipelineTask();
+            task1.setPipelineInstance(instance1);
+            PipelineTask task2 = new PipelineTask();
+            task2.setPipelineInstance(instance1);
+
+            PipelineInstance instance2 = new PipelineInstance();
+            PipelineTask task3 = new PipelineTask();
+            task3.setPipelineInstance(instance2);
+            PipelineTask task4 = new PipelineTask();
+            task4.setPipelineInstance(instance2);
+            PipelineTask task5 = new PipelineTask();
+            task5.setPipelineInstance(instance2);
+
+            PipelineInstanceCrud instanceCrud = new PipelineInstanceCrud();
+            instanceCrud.persist(instance1);
+            instanceCrud.persist(instance2);
+
+            PipelineTaskCrud taskCrud = new PipelineTaskCrud();
+            taskCrud.persist(task1);
+            taskCrud.persist(task2);
+            taskCrud.persist(task3);
+            taskCrud.persist(task4);
+            taskCrud.persist(task5);
             return null;
         });
     }
diff --git a/src/test/java/gov/nasa/ziggy/services/config/ZiggyConfigurationTest.java b/src/test/java/gov/nasa/ziggy/services/config/ZiggyConfigurationTest.java
new file mode 100644
index 0000000..792f934
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/services/config/ZiggyConfigurationTest.java
@@ -0,0 +1,272 @@
+package gov.nasa.ziggy.services.config;
+
+import static gov.nasa.ziggy.services.config.PropertyName.ALLOW_PARTIAL_TASKS;
+import static gov.nasa.ziggy.services.config.PropertyName.DATABASE_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ImmutableConfiguration;
+import org.junit.Rule;
+import org.junit.Test;
+
+import gov.nasa.ziggy.ZiggyPropertyRule;
+
+public class ZiggyConfigurationTest {
+
+    /**
+     * The value of the {@link PropertyName#TEST_FILE} property in $PIPELINE_CONFIG_PATH.
+     */
+    private static final String PIPELINE_CONFIG_PATH_VALUE = "from.envvar.location";
+
+    /** The value of the {@link PropertyName#TEST_FILE} property in ziggy.properties */
+    private static final String ZIGGY_PROPERTIES_VALUE = "from.default.location";
+
+    /** A property that should exist in the properties file. */
+    private static final String EXISTING_PROPERTY = "some.existent.property";
+
+    /** A property that should not exist in the properties file. */
+    private static final String NONEXISTENT_PROPERTY = "some.non-existent.property";
+
+    /** The number of threads accessing a property that exists. */
+    private static final int NUM_EXISTING_PROPERTY_READERS = 4;
+
+    /** The number of threads accessing a property that does not exist. */
+    private static final int NUM_NONEXISTENT_PROPERTY_READERS = 4;
+
+    // DATABASE_PORT is a random property that normally takes numbers.
+    @Rule
+    public ZiggyPropertyRule fooPropertyRule = new ZiggyPropertyRule(DATABASE_PORT, "1");
+
+    private static final String NUMERIC_PROPERTY = DATABASE_PORT.property();
+
+    // ALLOW_PARTIAL_TASKS is a random property that normally takes booleans.
+    @Rule
+    public ZiggyPropertyRule barPropertyRule = new ZiggyPropertyRule(ALLOW_PARTIAL_TASKS, "true");
+
+    private static final String BOOLEAN_PROPERTY = ALLOW_PARTIAL_TASKS.property();
+
+    @Test
+    public void testGetInstance() {
+        ImmutableConfiguration configuration1 = ZiggyConfiguration.getInstance();
+        ImmutableConfiguration configuration2 = ZiggyConfiguration.getInstance();
+        assertNotNull(configuration1);
+        assertTrue(configuration1 == configuration2);
+
+        assertEquals(BigDecimal.ONE, configuration1.getBigDecimal(NUMERIC_PROPERTY));
+        assertEquals(BigInteger.ONE, configuration1.getBigInteger(NUMERIC_PROPERTY));
+        assertEquals(Byte.parseByte("1"), configuration1.getByte(NUMERIC_PROPERTY));
+        assertEquals(1.0, configuration1.getDouble(NUMERIC_PROPERTY), 0.0001);
+        assertEquals(1.0F, configuration1.getFloat(NUMERIC_PROPERTY), 0.0001);
+        assertEquals(1, configuration1.getInt(NUMERIC_PROPERTY));
+        assertEquals(1L, configuration1.getLong(NUMERIC_PROPERTY));
+
+        assertTrue(configuration1.getBoolean(BOOLEAN_PROPERTY));
+    }
+
+    @Test
+    public void testGetMutableInstance() {
+        ImmutableConfiguration configuration1 = ZiggyConfiguration.getMutableInstance();
+        ImmutableConfiguration configuration2 = ZiggyConfiguration.getMutableInstance();
+        assertNotNull(configuration1);
+        assertTrue(configuration1 == configuration2);
+    }
+
+    @Test
+    public void testInterpolate() {
+        assertEquals("foo 1 bar",
+            ZiggyConfiguration.interpolate("foo ${" + NUMERIC_PROPERTY + "} bar"));
+    }
+
+    @Test
+    public void testReset() {
+        ImmutableConfiguration configuration1 = ZiggyConfiguration.getInstance();
+        ImmutableConfiguration configuration2 = ZiggyConfiguration.getMutableInstance();
+        assertTrue(configuration1 != configuration2);
+
+        ZiggyConfiguration.reset();
+
+        ImmutableConfiguration configuration3 = ZiggyConfiguration.getInstance();
+        ImmutableConfiguration configuration4 = ZiggyConfiguration.getMutableInstance();
+        assertTrue(configuration1 != configuration3);
+        assertTrue(configuration2 != configuration4);
+        assertTrue(configuration3 != configuration4);
+    }
+
+    @Test
+    public void testConfigurationThrowIfMissing() {
+        ImmutableConfiguration configuration = ZiggyConfiguration.getInstance();
+
+        try {
+            configuration.getBigDecimal("does-not-exist");
+            fail("Expected a NoSuchElementException");
+        } catch (NoSuchElementException expected) {
+        }
+    }
+
+    // The following tests were previously in ConfigurationServiceFactoryTest.
+
+    @Test
+    public void testSystemProperty() {
+        System.setProperty("my.string.property", "foo");
+        System.setProperty("my.boolean.property", "true");
+        System.setProperty("my.int.property", "42");
+        System.setProperty("my.double.property", "42.42");
+
+        // Force getInstance() to read from system properties.
+        ZiggyConfiguration.reset();
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+
+        assertEquals("foo", config.getString("my.string.property"));
+        assertEquals(true, config.getBoolean("my.boolean.property"));
+        assertEquals(42, config.getInt("my.int.property"));
+        assertEquals(42.42, config.getDouble("my.double.property"), 0);
+
+        System.clearProperty("my.string.property");
+        System.clearProperty("my.boolean.property");
+        System.clearProperty("my.int.property");
+        System.clearProperty("my.double.property");
+    }
+
+    @Test
+    public void testFilePropertyOverride() {
+    }
+
+    @Test
+    public void testSystemPropertyOverride() {
+    }
+
+    @Test
+    public void testDefaultFileProperty() {
+        // Force getInstance() to read from ziggy.properties.
+        ZiggyConfiguration.reset();
+        ZiggyConfiguration.getMutableInstance();
+
+        assertEquals(ZIGGY_PROPERTIES_VALUE,
+            ZiggyConfiguration.getInstance().getString(PropertyName.TEST_FILE.property()));
+    }
+
+    // TODO: can't enable this test because there's no way to set an env var for the current
+    // process. Maybe launch a sub-process?
+    // @Test
+    public void testEnvVarFileProperty() {
+        ImmutableConfiguration config = ZiggyConfiguration.getInstance();
+
+        assertEquals(PIPELINE_CONFIG_PATH_VALUE,
+            config.getString(PropertyName.TEST_FILE.property()));
+    }
+
+    /**
+     * Implements tests of concurrent access to configuration properties.
+     */
+    @Test
+    public void testConcurrentAccess() throws InterruptedException {
+        List<PropertyAccessThread> threads = new ArrayList<>();
+
+        for (int i = 0; i < NUM_EXISTING_PROPERTY_READERS; ++i) {
+            threads.add(new PropertyAccessThread(EXISTING_PROPERTY, 12, 150));
+        }
+        for (int i = 0; i < NUM_NONEXISTENT_PROPERTY_READERS; ++i) {
+            threads.add(new PropertyAccessThread(NONEXISTENT_PROPERTY, 42, 250));
+        }
+
+        for (Thread thread : threads) {
+            thread.start();
+        }
+
+        for (Thread thread : threads) {
+            thread.join();
+        }
+
+        for (PropertyAccessThread thread : threads) {
+            if (thread.isPropertyDiffered()) {
+                fail("Property differed in at least one thread");
+            }
+        }
+    }
+
+    @Test
+    public void testBuildProperty() {
+        assertNotNull(
+            ZiggyConfiguration.getInstance().getString(PropertyName.ZIGGY_VERSION.property()));
+    }
+
+    @Test
+    public void testLogJvmProperties() {
+        // Just ensure that the code is covered and doesn't blow up. If the log output can be easily
+        // checked, do it.
+        ZiggyConfiguration.logJvmProperties();
+    }
+
+    private static class PropertyAccessThread extends Thread {
+
+        private String propertyName;
+        private int defaultValue;
+        private long duration;
+        private boolean propertyDiffered;
+
+        /**
+         * Creates a new instance of a thread that continually accesses a property from the
+         * configuration until a time duration has elapsed. Also records whether the property
+         * differed during the test.
+         *
+         * @param propertyName the property name to access
+         * @param defaultValue a default value for the property if not present
+         * @param duration the length of the access test in milliseconds
+         */
+        public PropertyAccessThread(String propertyName, int defaultValue, long duration) {
+            this.propertyName = propertyName;
+            this.defaultValue = defaultValue;
+            this.duration = duration;
+        }
+
+        @Override
+        public void run() {
+            long start = System.currentTimeMillis();
+            propertyDiffered = false;
+
+            Configuration config = ZiggyConfiguration.getMutableInstance();
+            int lastValue = config.getInt(propertyName, defaultValue);
+            long accesses = 1;
+
+            for (;;) {
+                long now = System.currentTimeMillis();
+                if (now - start > duration) {
+                    break;
+                }
+
+                try {
+                    int newValue = config.getInt(propertyName, defaultValue);
+                    config.setProperty(propertyName, newValue);
+
+                    propertyDiffered |= newValue != lastValue;
+                    lastValue = newValue;
+                } catch (Throwable ex) {
+                    System.err.println("Error accessing property: " + ex.getMessage());
+                }
+
+                ++accesses;
+            }
+
+            System.out.println(String.format("Thread=%s property=%s accesses=%d", getName(),
+                propertyName, accesses));
+        }
+
+        /**
+         * Tests whether the property differed in value during the test.
+         *
+         * @return true, if the property value differed at any time during the test
+         */
+        public boolean isPropertyDiffered() {
+            return propertyDiffered;
+        }
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/services/configuration/ConfigurationServiceFactoryTest.java b/src/test/java/gov/nasa/ziggy/services/configuration/ConfigurationServiceFactoryTest.java
deleted file mode 100644
index f4164fe..0000000
--- a/src/test/java/gov/nasa/ziggy/services/configuration/ConfigurationServiceFactoryTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package gov.nasa.ziggy.services.configuration;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.configuration.Configuration;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import gov.nasa.ziggy.ZiggyPropertyRule;
-import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.services.config.ZiggyConfiguration;
-
-public class ConfigurationServiceFactoryTest {
-
-    /** A property that should exist in the properties file. */
-    private static final String EXISTING_PROPERTY = "pi.worker.numTaskThreads";
-
-    /** A property that should not exist in the properties file. */
-    private static final String NONEXISTENT_PROPERTY = "pi.non.existent.property";
-
-    /** The number of threads accessing a property that exists. */
-    private static final int NUM_EXISTING_PROPERTY_READERS = 4;
-
-    /** The number of threads accessing a property that does not exist. */
-    private static final int NUM_NONEXISTENT_PROPERTY_READERS = 4;
-
-    @Rule
-    public ZiggyPropertyRule myBooleanPropertyRule = new ZiggyPropertyRule("my.boolean.property",
-        (String) null);
-    @Rule
-    public ZiggyPropertyRule myDoublePropertyRule = new ZiggyPropertyRule("my.double.property",
-        (String) null);
-    @Rule
-    public ZiggyPropertyRule myIntPropertyRule = new ZiggyPropertyRule("my.int.property",
-        (String) null);
-    @Rule
-    public ZiggyPropertyRule myStringPropertyRule = new ZiggyPropertyRule("my.string.property",
-        (String) null);
-
-    @Before
-    public void before() throws PipelineException {
-        ZiggyConfiguration.reset();
-    }
-
-    @Test
-    public void testSystemProperty() throws PipelineException {
-        System.setProperty("my.string.property", "foo");
-        System.setProperty("my.boolean.property", "true");
-        System.setProperty("my.int.property", "42");
-        System.setProperty("my.double.property", "42.42");
-
-        Configuration config = ZiggyConfiguration.getInstance();
-
-        assertEquals("foo", config.getString("my.string.property"));
-        assertEquals(true, config.getBoolean("my.boolean.property"));
-        assertEquals(42, config.getInt("my.int.property"));
-        assertEquals(42.42, config.getDouble("my.double.property"), 0);
-    }
-
-    @Test
-    public void testFilePropertyOverride() throws PipelineException {
-    }
-
-    @Test
-    public void testSystemPropertyOverride() throws PipelineException {
-    }
-
-    @Test
-    public void testDefaultFileProperty() throws PipelineException {
-        Configuration config = ZiggyConfiguration.getInstance();
-
-        assertEquals("from.default.location", config.getString("test.file.property"));
-    }
-
-    // TODO: can't enable this test because there's no way to set an env var for the current
-    // process. Maybe launch a sub-process?
-    // @Test
-    public void testEnvVarFileProperty() throws PipelineException {
-        Configuration config = ZiggyConfiguration.getInstance();
-
-        assertEquals("from.envvar.location", config.getString("test.file.property"));
-    }
-
-    /**
-     * Implements tests of concurrent access to configuration properties.
-     */
-    @Test
-    public void testConcurrentAccess() throws InterruptedException {
-        List<PropertyAccessThread> threads = new ArrayList<>();
-
-        for (int i = 0; i < NUM_EXISTING_PROPERTY_READERS; ++i) {
-            threads.add(new PropertyAccessThread(EXISTING_PROPERTY, 12, 4000));
-        }
-        for (int i = 0; i < NUM_NONEXISTENT_PROPERTY_READERS; ++i) {
-            threads.add(new PropertyAccessThread(NONEXISTENT_PROPERTY, 42, 4000));
-        }
-
-        for (Thread thread : threads) {
-            thread.start();
-        }
-
-        for (Thread thread : threads) {
-            thread.join();
-        }
-
-        for (PropertyAccessThread thread : threads) {
-            if (thread.isPropertyDiffered()) {
-                fail("Property differed in at least one thread");
-            }
-        }
-    }
-
-    private static class PropertyAccessThread extends Thread {
-
-        private String propertyName;
-        private int defaultValue;
-        private long duration;
-        private boolean propertyDiffered;
-
-        /**
-         * Creates a new instance of a thread that continually accesses a property from the
-         * configuration until a time duration has elapsed. Also records whether the property
-         * differed during the test.
-         *
-         * @param propertyName the property name to access
-         * @param defaultValue a default value for the property if not present
-         * @param duration the length of the access test in milliseconds
-         */
-        public PropertyAccessThread(String propertyName, int defaultValue, long duration) {
-            this.propertyName = propertyName;
-            this.defaultValue = defaultValue;
-            this.duration = duration;
-        }
-
-        @Override
-        public void run() {
-            long start = System.currentTimeMillis();
-            propertyDiffered = false;
-
-            Configuration config = ZiggyConfiguration.getInstance();
-            int lastValue = config.getInt(propertyName, defaultValue);
-            long accesses = 1;
-
-            for (;;) {
-                long now = System.currentTimeMillis();
-                if (now - start > duration) {
-                    break;
-                }
-
-                try {
-                    int newValue = config.getInt(propertyName, defaultValue);
-                    config.setProperty(propertyName, newValue);
-
-                    propertyDiffered |= newValue != lastValue;
-                    lastValue = newValue;
-                } catch (Throwable ex) {
-                    System.err.println("Error accessing property: " + ex.getMessage());
-                }
-
-                ++accesses;
-            }
-
-            System.out.println(String.format("Thread=%s property=%s accesses=%d", getName(),
-                propertyName, accesses));
-        }
-
-        /**
-         * Tests whether the property differed in value during the test.
-         *
-         * @return true, if the property value differed at any time during the test
-         */
-        public boolean isPropertyDiffered() {
-            return propertyDiffered;
-        }
-    }
-}
diff --git a/src/test/java/gov/nasa/ziggy/services/configuration/ConfigurationValueTest.java b/src/test/java/gov/nasa/ziggy/services/configuration/ConfigurationValueTest.java
deleted file mode 100644
index b310fcd..0000000
--- a/src/test/java/gov/nasa/ziggy/services/configuration/ConfigurationValueTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package gov.nasa.ziggy.services.configuration;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
-
-import gov.nasa.ziggy.services.config.ConfigurationValue;
-
-/**
- * Implements unit tests for {@link ConfigurationValue}.
- */
-public class ConfigurationValueTest {
-
-    private static final String NON_EXISTENT_PROPERTY = "does-not-exist";
-
-    private static final Object[][] VALUE_ATTRS = { { "value", String.class },
-        { "123", Integer.TYPE }, { "123", Long.TYPE }, { "3.14", Float.TYPE },
-        { "3.14", Double.TYPE }, { "true", Boolean.TYPE }, };
-
-    /**
-     * Tests that access to the value can be performed using the correct accessor methods.
-     */
-    @Test
-    public void testValidAndInvalidAccess() {
-        for (Object[] valueAttr : VALUE_ATTRS) {
-            String valueStr = (String) valueAttr[0];
-            Class<?> type = (Class<?>) valueAttr[1];
-            ConfigurationValue value = new ConfigurationValue(NON_EXISTENT_PROPERTY, valueStr,
-                type);
-
-            if (type == String.class) {
-                assertEquals(valueStr, value.getString());
-            } else if (type == Integer.TYPE) {
-                assertEquals(Integer.parseInt(valueStr), value.getInt());
-            } else if (type == Long.TYPE) {
-                assertEquals(Long.parseLong(valueStr), value.getLong());
-            } else if (type == Float.TYPE) {
-                assertEquals(Float.parseFloat(valueStr), value.getFloat(), Float.MIN_NORMAL);
-            } else if (type == Double.TYPE) {
-                assertEquals(Double.parseDouble(valueStr), value.getDouble(), Double.MIN_NORMAL);
-            } else if (type == Boolean.TYPE) {
-                assertEquals(Boolean.parseBoolean(valueStr), value.getBoolean());
-            }
-        }
-    }
-
-    /**
-     * Tests that calls to the wrong accessor method for a value will throw an exception.
-     */
-    @Test
-    public void testInvalidAccess() {
-        for (Object[] valueAttr : VALUE_ATTRS) {
-            String valueStr = (String) valueAttr[0];
-            Class<?> type = (Class<?>) valueAttr[1];
-            checkIllegalAccess(new ConfigurationValue(NON_EXISTENT_PROPERTY, valueStr, type));
-        }
-    }
-
-    private void checkIllegalAccess(ConfigurationValue value) {
-        Class<?> type = value.getValueClass();
-
-        if (type != String.class) {
-            try {
-                value.getString();
-                fail("Access as a string should have failed");
-            } catch (ConfigurationValue.WrongParameterTypeException ex) {
-                // ignore
-            }
-        }
-        if (type != Integer.TYPE) {
-            try {
-                value.getInt();
-                fail("Access as an int should have failed");
-            } catch (ConfigurationValue.WrongParameterTypeException ex) {
-                // ignore
-            }
-        }
-        if (type != Long.TYPE) {
-            try {
-                value.getLong();
-                fail("Access as a long should have failed");
-            } catch (ConfigurationValue.WrongParameterTypeException ex) {
-                // ignore
-            }
-        }
-        if (type != Float.TYPE) {
-            try {
-                value.getFloat();
-                fail("Access as a float should have failed");
-            } catch (ConfigurationValue.WrongParameterTypeException ex) {
-                // ignore
-            }
-        }
-        if (type != Double.TYPE) {
-            try {
-                value.getDouble();
-                fail("Access as a double should have failed");
-            } catch (ConfigurationValue.WrongParameterTypeException ex) {
-                // ignore
-            }
-        }
-        if (type != Boolean.TYPE) {
-            try {
-                value.getBoolean();
-                fail("Access as a boolean should have failed");
-            } catch (ConfigurationValue.WrongParameterTypeException ex) {
-                // ignore
-            }
-        }
-    }
-
-}
diff --git a/src/test/java/gov/nasa/ziggy/services/database/DatabaseTransactionTest.java b/src/test/java/gov/nasa/ziggy/services/database/DatabaseTransactionTest.java
index 675ba64..a54a77d 100644
--- a/src/test/java/gov/nasa/ziggy/services/database/DatabaseTransactionTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/database/DatabaseTransactionTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -36,7 +37,7 @@ public void teardown() {
     }
 
     /**
-     * Tests DatabaseTransaction functionality in current thread.
+     * Tests DatabaseTransaction functionality.
      */
     @Test
     public void testTransaction() throws Exception {
@@ -56,35 +57,10 @@ public void testTransaction() throws Exception {
         // verify the calls that we DO NOT want to see in this use case
         verify(dbService, times(0)).rollbackTransactionIfActive();
         verify(spyDtw, times(0)).catchBlock(any(Throwable.class));
-
     }
 
     /**
-     * Tests DatabaseTransaction functionality in a new thread.
-     */
-    @Test
-    public void testTransactionNewThread() throws Exception {
-
-        // construct a DatabaseTransaction object
-        DatabaseTransaction<Void> dtw = new TestDatabaseTransaction(false, false);
-        DatabaseTransaction<Void> spyDtw = spy(dtw);
-        DatabaseTransactionFactory.performTransactionInThread(spyDtw);
-
-        // verify function calls
-        verify(dbService).beginTransaction();
-        verify(spyDtw).transaction();
-        verify(dbService).commitTransaction();
-        verify(dbService).closeCurrentSession();
-        verify(spyDtw).finallyBlock();
-
-        // verify the calls that we DO NOT want to see in this use case
-        verify(dbService, times(0)).rollbackTransactionIfActive();
-        verify(spyDtw, times(0)).catchBlock(any(Throwable.class));
-
-    }
-
-    /**
-     * Tests DatabaseTransaction functionality with a returned value in the calling thread.
+     * Tests DatabaseTransaction functionality with a returned value.
      */
     @Test
     public void testTransactionWithReturnValue() throws Exception {
@@ -105,32 +81,6 @@ public void testTransactionWithReturnValue() throws Exception {
         // verify the calls that we DO NOT want to see in this use case
         verify(dbService, times(0)).rollbackTransactionIfActive();
         verify(spyDtw, times(0)).catchBlock(any(Throwable.class));
-
-    }
-
-    /**
-     * Tests DatabaseTransaction functionality with a returned value in a new thread.
-     */
-    @Test
-    public void testTransactionWithReturnValueNewThread() throws Exception {
-
-        // construct a DatabaseTransaction object
-        DatabaseTransaction<Integer> dtw = new TestDatabaseTransactionWithReturn();
-        DatabaseTransaction<Integer> spyDtw = spy(dtw);
-        int retval = (Integer) DatabaseTransactionFactory.performTransactionInThread(spyDtw);
-        assertEquals(5, retval);
-
-        // verify function calls
-        verify(dbService).beginTransaction();
-        verify(spyDtw).transaction();
-        verify(dbService).commitTransaction();
-        verify(dbService).closeCurrentSession();
-        verify(spyDtw).finallyBlock();
-
-        // verify the calls that we DO NOT want to see in this use case
-        verify(dbService, times(0)).rollbackTransactionIfActive();
-        verify(spyDtw, times(0)).catchBlock(any(Throwable.class));
-
     }
 
     /**
@@ -160,7 +110,6 @@ public void testErrorExecution() throws Exception {
 
         // verify the things we don't want to see called
         verify(dbService, times(0)).commitTransaction();
-
     }
 
     @Test
@@ -182,7 +131,12 @@ public void testErrorExecutionWithoutPipelineException() throws Exception {
 
         // verify the things we don't want to see called
         verify(dbService, times(0)).commitTransaction();
+    }
 
+    @Test
+    public void testCaller() {
+        assertTrue(DatabaseTransactionFactory.callerTest()
+            .matches("DatabaseTransactionTest.testCaller: [0-9]+"));
     }
 
     private static class TestDatabaseTransaction implements DatabaseTransaction<Void> {
@@ -215,6 +169,5 @@ private static class TestDatabaseTransactionWithReturn implements DatabaseTransa
         public Integer transaction() throws Exception {
             return 5;
         }
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/services/database/HsqldbController.java b/src/test/java/gov/nasa/ziggy/services/database/HsqldbController.java
deleted file mode 100644
index 4e284d9..0000000
--- a/src/test/java/gov/nasa/ziggy/services/database/HsqldbController.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package gov.nasa.ziggy.services.database;
-
-import java.nio.file.Path;
-import java.sql.SQLException;
-
-import gov.nasa.ziggy.module.PipelineException;
-
-/**
- * Implementation of {@link DatabaseController} for HSQLDB databases. At the moment, HSQLDB is used
- * only for unit tests that require a database (we don't want to use the same RDBMS as what's used
- * in production, as that could potentially lead to damage to a production database when unit tests
- * are run). For this reason most of the methods are stubs. If and when a use-case arises that
- * requires a more complete implementation, we'll make one.
- *
- * @author PT
- */
-public class HsqldbController extends ScriptedDatabaseController {
-
-    private static final String SCHEMA_CREATE_FILE = "ddl.hsqldb-create.sql";
-    private static final String SCHEMA_DROP_FILE = "ddl.hsqldb-drop.sql";
-    private static final String DRIVER_CLASS_NAME = "org.hsqldb.jdbcDriver";
-
-    @Override
-    protected SqlRunner initializeSqlRunner() {
-        try {
-            return SqlRunner.newInstance(driver());
-        } catch (Exception e) {
-            throw new PipelineException("Unable to initialize SqlRunner", e);
-        }
-    }
-
-    @Override
-    protected String createScript() {
-        return SCHEMA_CREATE_FILE;
-    }
-
-    @Override
-    protected String dropScript() {
-        return SCHEMA_DROP_FILE;
-    }
-
-    @Override
-    public Path dataDir() {
-        return null;
-    }
-
-    @Override
-    public Path logDir() {
-        return null;
-    }
-
-    @Override
-    public Path logFile() {
-        return null;
-    }
-
-    @Override
-    public SqlDialect sqlDialect() {
-        return SqlDialect.HSQLDB;
-    }
-
-    @Override
-    public String driver() {
-        return DRIVER_CLASS_NAME;
-    }
-
-    @Override
-    public void createDatabase() {
-        try {
-            initDB();
-        } catch (SQLException e) {
-            throw new PipelineException("Unable to create database", e);
-        }
-    }
-
-    @Override
-    public void dropDatabase() {
-        cleanDb();
-    }
-
-    @Override
-    public boolean dbExists() {
-        return false;
-    }
-
-    @Override
-    public int start() {
-        return 0;
-    }
-
-    @Override
-    public int stop() {
-        return 0;
-    }
-
-    @Override
-    public int status() {
-        return 0;
-    }
-}
diff --git a/src/test/java/gov/nasa/ziggy/services/database/ScriptedDatabaseController.java b/src/test/java/gov/nasa/ziggy/services/database/ScriptedDatabaseController.java
deleted file mode 100644
index a07a98d..0000000
--- a/src/test/java/gov/nasa/ziggy/services/database/ScriptedDatabaseController.java
+++ /dev/null
@@ -1,386 +0,0 @@
-package gov.nasa.ziggy.services.database;
-
-import java.io.File;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import gov.nasa.ziggy.module.PipelineException;
-
-/**
- * Intermediate abstract class that provides support for {@link DatabaseController} implementations
- * that make use of a script and an {@link SqlRunner} instance to perform their initializations.
- * This is a reinterpretation of the now-obsolete ScriptedDdlInitializer into the context of the
- * {@link DatabaseController}.
- *
- * @author PT
- */
-public abstract class ScriptedDatabaseController extends DatabaseController {
-
-    private static final Logger log = LoggerFactory.getLogger(ScriptedDatabaseController.class);
-
-    static final String INIT_TABLE_NAME = "DDL_INITIALIZER_CREATED";
-    private static final String TABLE_COUNT = "select count(*) from INFORMATION_SCHEMA.tables where TABLE_SCHEMA = 'PUBLIC' and table_name != '%s'";
-    private static final String TABLE_EXISTS = "select count(*) from INFORMATION_SCHEMA.tables where TABLE_SCHEMA = 'PUBLIC' and table_name = '%s'";
-    static final String DROP_TABLE_SQL = "drop table %s";
-    static final String SELECT_COUNT_SQL = "select count(*) from %s";
-    private static final String CREATE_INIT_TABLE_SQL = "create memory table PUBLIC.%s ( message varchar(256) )";
-    private static final String TABLE_NAMES = "select table_name from INFORMATION_SCHEMA.tables where TABLE_SCHEMA = 'PUBLIC' and table_name != '%s'";
-    private static final String INSERT_INIT_TABLE_SQL = "insert into %s values('This database schema was automatically created on %s.')";
-
-    protected SqlRunner sqlRunner;
-
-    protected SqlRunner sqlRunner() {
-        if (sqlRunner == null) {
-            sqlRunner = initializeSqlRunner();
-        }
-        return sqlRunner;
-    }
-
-    protected abstract SqlRunner initializeSqlRunner();
-
-    protected abstract String createScript();
-
-    protected abstract String dropScript();
-
-    protected void executeScript(String scriptName, boolean continueOnError) {
-        if (scriptName == null) {
-            throw new NullPointerException("scriptName can't be null");
-        }
-
-        String path = null;
-        try {
-            path = "build/schema/" + scriptName;
-
-            File scriptFile = new File(path);
-            log.info("scriptFile: " + scriptFile.getAbsolutePath());
-            log.info("Script exists: " + scriptFile.exists());
-            sqlRunner().executeSql(scriptFile, continueOnError);
-            sqlRunner().getCachedConnection().commit();
-        } catch (SQLException sqle) {
-            log.error("failed to execute: " + path, sqle);
-            throw new PipelineException(sqle.getMessage(), sqle);
-        }
-    }
-
-    public synchronized void initDB() throws SQLException {
-        sqlRunner().connect();
-
-        long tableCount = tableCount();
-        if (tableCount > 0) {
-            try {
-                // Try to run the drop script (ignoring errors), just in
-                // case someone didn't clean up after themselves...
-                log.info("trying clean script: " + dropScript());
-                cleanDbInternal();
-            } catch (Throwable t) {
-                log.warn(t.getMessage(), t);
-            }
-            tableCount = tableCount();
-            if (tableCount > 0) {
-                log.warn("Failed to clean database");
-            }
-        }
-
-        if (tableCount <= 1) {
-            log.info("executing create script: " + createScript());
-            executeScript(createScript(), false);
-
-            if (!tableExists(INIT_TABLE_NAME)) {
-                createInitTable();
-            }
-
-            if (tableExists(INIT_TABLE_NAME)) {
-                updateInitTable();
-            }
-        } else {
-            log.error("Failed to create database");
-        }
-    }
-
-    public void cleanDb() {
-        if (sqlRunner().getCachedConnection() == null) {
-            sqlRunner().connect();
-        }
-        cleanDbInternal();
-    }
-
-    /**
-     * Make best effort to run drop script (errors are ignored)
-     */
-    private void cleanDbInternal() {
-        if (sqlRunner().getCachedConnection() == null) {
-            return;
-        }
-
-        long rowCount = -1;
-        long tableCount = -1;
-        try {
-            rowCount = rowCount();
-            if (rowCount == 0) {
-                log.info("No rows in any tables!");
-            } else {
-                log.warn("Database contains data.");
-            }
-
-            tableCount = tableCount();
-            if (tableCount > 0) {
-                boolean initTableExists = tableExists(INIT_TABLE_NAME);
-
-                if (!initTableExists) {
-                    throw new PipelineException("Database was not created by DDLInitalizer."
-                        + " Refusing to clean a potential live database.");
-                }
-            } else {
-                log.info("Database contains no tables!");
-            }
-        } catch (SQLException sqle) {
-            throw new PipelineException("Database may not have been created by DDLInitalizer.",
-                sqle);
-        }
-
-        if (tableCount > 0) {
-            try {
-                log.info("executing clean script: " + dropScript());
-                executeScript(dropScript(), true);
-            } catch (Exception e) {
-                throw new PipelineException("clean script failed: ", e);
-            }
-        }
-    }
-
-    public void createInitTable() throws SQLException {
-        String sqlString = String.format(CREATE_INIT_TABLE_SQL, INIT_TABLE_NAME);
-        if (sqlRunner().getCachedConnection() == null) {
-            sqlRunner().connect();
-        }
-
-        Statement stmt = null;
-        try {
-            log.debug("executing SQL: " + sqlString);
-            stmt = sqlRunner().getCachedConnection().createStatement();
-            stmt.executeUpdate(sqlString);
-        } catch (Throwable ignore) {
-            log.debug(String.format("create %s table failed", INIT_TABLE_NAME), ignore);
-        } finally {
-            stmt.getConnection().commit();
-            close(stmt);
-        }
-    }
-
-    public void updateInitTable() throws SQLException {
-        String sqlString = String.format(INSERT_INIT_TABLE_SQL, INIT_TABLE_NAME, new Date());
-        if (sqlRunner().getCachedConnection() == null) {
-            sqlRunner().connect();
-        }
-
-        Statement stmt = null;
-        try {
-            log.debug("executing SQL: " + sqlString);
-            stmt = sqlRunner().getCachedConnection().createStatement();
-            stmt.executeUpdate(sqlString);
-        } catch (Throwable ignore) {
-            log.debug(String.format("insert into %s table failed", INIT_TABLE_NAME), ignore);
-        } finally {
-            stmt.getConnection().commit();
-            close(stmt);
-        }
-    }
-
-    public boolean tableExists(String tableNameMixedCase) {
-        String tableName = tableNameMixedCase.trim().toUpperCase();
-        String sqlString = String.format(TABLE_EXISTS, tableName);
-        if (sqlString == null) {
-            throw new NullPointerException("sqlString can't be null");
-        }
-        if (tableName == null) {
-            throw new NullPointerException("tableName can't be null");
-        }
-
-        if (sqlRunner().getCachedConnection() == null) {
-            sqlRunner().connect();
-        }
-
-        Statement stmt = null;
-        ResultSet rs = null;
-        int count = -1;
-        try {
-            log.debug("executing SQL: " + sqlString);
-            stmt = sqlRunner().getCachedConnection().createStatement();
-            rs = stmt.executeQuery(sqlString);
-            if (rs.next()) {
-                log.debug(String.format("%s => %d", rs.getStatement().toString(), rs.getLong(1)));
-                count = rs.getInt(1);
-            } else {
-                log.warn(String.format("cannot determine if the '%s' table exists in the database!",
-                    tableName));
-            }
-        } catch (SQLException sqle) {
-            log.warn(String.format("cannot determine if the '%s' table exists in the database: ",
-                tableName), sqle);
-        } finally {
-            close(rs);
-            close(stmt);
-        }
-
-        return count == 1;
-    }
-
-    public long tableCount() {
-        String sqlString = String.format(TABLE_COUNT, INIT_TABLE_NAME);
-        if (sqlString == null) {
-            throw new NullPointerException("sqlString can't be null");
-        }
-
-        if (sqlRunner().getCachedConnection() == null) {
-            sqlRunner().connect();
-        }
-
-        int tableCount = -1;
-        Statement stmt = null;
-        ResultSet rs = null;
-        try {
-            log.debug("executing SQL: " + sqlString);
-            stmt = sqlRunner().getCachedConnection().createStatement();
-            rs = stmt.executeQuery(sqlString);
-            if (rs.next()) {
-                log.debug(String.format("%s => %d", rs.getStatement().toString(), rs.getLong(1)));
-                tableCount = rs.getInt(1);
-            } else {
-                log.warn("cannot determine the number of tables in the database!");
-            }
-        } catch (Throwable t) {
-            log.warn("cannot determine the number of tables in the database: ", t);
-        } finally {
-            close(rs);
-            close(stmt);
-        }
-
-        return tableCount;
-    }
-
-    @SuppressFBWarnings(value = "SQL_INJECTION_JDBC", justification = """
-        This class is used only by unit tests, thus the production database
-        cannot be compromised by SQL injection.
-        """)
-    public List<String> tableNames() throws SQLException {
-        String sqlString = String.format(TABLE_NAMES, INIT_TABLE_NAME);
-        if (sqlString == null) {
-            throw new NullPointerException("sqlString can't be null");
-        }
-
-        if (sqlRunner().getCachedConnection() == null) {
-            sqlRunner().connect();
-        }
-
-        List<String> tableNames = new ArrayList<>();
-        Statement stmt = null;
-        ResultSet rs = null;
-        try {
-            log.debug("executing SQL: " + sqlString);
-            stmt = sqlRunner().getCachedConnection().createStatement();
-            rs = stmt.executeQuery(sqlString);
-            while (rs.next()) {
-                String tableName = rs.getString(1);
-                tableNames.add(tableName);
-            }
-
-            return tableNames;
-        } finally {
-            close(rs);
-            close(stmt);
-        }
-    }
-
-    @SuppressFBWarnings(value = "SQL_INJECTION_JDBC", justification = """
-        This class is used only by unit tests, thus the production database
-        cannot be compromised by SQL injection.
-        """)
-    public long rowCount() throws SQLException {
-        List<String> tableNamesList = tableNames();
-        if (sqlRunner().getCachedConnection() == null) {
-            sqlRunner().connect();
-        }
-
-        Statement stmt = null;
-        ResultSet rs = null;
-        long rowCount = 0;
-        try {
-            for (String tableName : tableNamesList) {
-                String sqlString = String.format(SELECT_COUNT_SQL, tableName);
-                stmt = sqlRunner().getCachedConnection().createStatement();
-                rs = stmt.executeQuery(sqlString);
-                if (rs.next()) {
-                    rowCount += rs.getLong(1);
-                }
-            }
-
-            return rowCount;
-        } catch (SQLException sqle) {
-            throw sqle;
-        } finally {
-            close(rs);
-            close(stmt);
-        }
-    }
-
-    @SuppressFBWarnings(value = "SQL_INJECTION_JDBC", justification = """
-        This class is used only by unit tests, thus the production database
-        cannot be compromised by SQL injection.
-        """)
-    protected boolean dropTable(String tableName) throws SQLException {
-        if (tableName == null) {
-            throw new NullPointerException("tableName can't be null");
-        }
-
-        if (sqlRunner().getCachedConnection() == null) {
-            sqlRunner().connect();
-        }
-
-        if (!tableExists(tableName)) {
-            throw new IllegalArgumentException("No such table: " + tableName);
-        }
-
-        String sqlString = String.format(DROP_TABLE_SQL, tableName);
-        Statement stmt = null;
-        try {
-            log.debug("executing SQL: " + sqlString);
-            stmt = sqlRunner().getCachedConnection().createStatement();
-            stmt.executeUpdate(sqlString);
-            return true;
-        } catch (Throwable ignore) {
-            log.debug(String.format("drop %s table failed", tableName), ignore);
-        } finally {
-            stmt.getConnection().commit();
-            close(stmt);
-        }
-
-        return false;
-    }
-
-    protected static void close(ResultSet resultSet) {
-        if (resultSet != null) {
-            try {
-                resultSet.close();
-            } catch (SQLException ignore) {
-            }
-        }
-    }
-
-    protected static void close(Statement statement) {
-        if (statement != null) {
-            try {
-                statement.close();
-            } catch (SQLException ignore) {
-            }
-        }
-    }
-
-}
diff --git a/src/test/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerTest.java b/src/test/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerTest.java
index 9ebd7de..080b94a 100644
--- a/src/test/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/events/ZiggyEventHandlerTest.java
@@ -3,8 +3,8 @@
 import static gov.nasa.ziggy.XmlUtils.assertContains;
 import static gov.nasa.ziggy.XmlUtils.complexTypeContent;
 import static gov.nasa.ziggy.ZiggyUnitTestUtils.TEST_DATA;
-import static gov.nasa.ziggy.services.config.PropertyNames.DATA_RECEIPT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.ZIGGY_HOME_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATA_RECEIPT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.ZIGGY_HOME_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -17,14 +17,15 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.configuration.CompositeConfiguration;
 import org.hibernate.Hibernate;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 import org.xml.sax.SAXException;
@@ -32,6 +33,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 
+import gov.nasa.ziggy.TestEventDetector;
 import gov.nasa.ziggy.ZiggyDatabaseRule;
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
@@ -44,8 +46,6 @@
 import gov.nasa.ziggy.pipeline.PipelineOperations;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.ParameterSet;
-import gov.nasa.ziggy.pipeline.definition.ParameterSetName;
-import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionOperations;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
@@ -57,11 +57,14 @@
 import gov.nasa.ziggy.pipeline.xml.ValidatingXmlManager;
 import gov.nasa.ziggy.services.alert.AlertService;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
+import gov.nasa.ziggy.supervisor.PipelineSupervisor;
 import gov.nasa.ziggy.uow.DataReceiptUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.DirectoryUnitOfWorkGenerator;
 import gov.nasa.ziggy.uow.UnitOfWork;
 import gov.nasa.ziggy.uow.UnitOfWorkGenerator;
+import gov.nasa.ziggy.util.io.FileUtil;
 import jakarta.xml.bind.JAXBException;
 
 /**
@@ -77,34 +80,35 @@ public class ZiggyEventHandlerTest {
 
     private Path testDataDir;
     private ZiggyEventHandler ziggyEventHandler;
-    private PipelineDefinitionName pipelineName = new PipelineDefinitionName("sample");
+    private String pipelineName = "sample";
     private String testInstanceName = "test-instance-name";
     private Path readyIndicator1, readyIndicator2a, readyIndicator2b;
     private PipelineOperations pipelineOperations = Mockito.spy(PipelineOperations.class);
     private PipelineExecutor pipelineExecutor = Mockito.spy(PipelineExecutor.class);
 
-    @Rule
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
     @Rule
     public ZiggyDatabaseRule databaseRule = new ZiggyDatabaseRule();
 
     @Rule
-    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(
-        ZIGGY_HOME_DIR_PROP_NAME, DirectoryProperties.ziggyCodeBuildDir().toString());
+    public ZiggyPropertyRule ziggyHomeDirPropertyRule = new ZiggyPropertyRule(ZIGGY_HOME_DIR,
+        DirectoryProperties.ziggyCodeBuildDir().toString());
+
+    public ZiggyPropertyRule dataReceiptDirPropertyRule = new ZiggyPropertyRule(DATA_RECEIPT_DIR,
+        directoryRule, TEST_DATA_DIR);
 
     @Rule
-    public ZiggyPropertyRule dataReceiptDirPropertyRule = new ZiggyPropertyRule(
-        DATA_RECEIPT_DIR_PROP_NAME, TEST_DATA_DIR);
+    public RuleChain ruleChain = RuleChain.outerRule(directoryRule)
+        .around(dataReceiptDirPropertyRule);
 
     @Before
     public void setUp() throws IOException {
-        testDataDir = directoryRule.directory().resolve(TEST_DATA_DIR);
+        testDataDir = Paths.get(dataReceiptDirPropertyRule.getProperty());
         testDataDir.toFile().mkdirs();
         readyIndicator1 = testDataDir.resolve("gazelle.READY.mammal.1");
         readyIndicator2a = testDataDir.resolve("psittacus.READY.bird.2");
         readyIndicator2b = testDataDir.resolve("archosaur.READY.bird.2");
-        System.setProperty(DATA_RECEIPT_DIR_PROP_NAME, testDataDir.toString());
 
         // Create the directories: they need to be there to get the DR UOW generator to
         // do the right thing.
@@ -122,7 +126,6 @@ public void setUp() throws IOException {
         Mockito.doReturn(testInstanceName).when(ziggyEventHandler).instanceName();
         Mockito.doReturn(100L).when(ziggyEventHandler).readyFileCheckIntervalMillis();
         Mockito.doReturn(Mockito.mock(AlertService.class)).when(ziggyEventHandler).alertService();
-        Mockito.doReturn(new CompositeConfiguration()).when(ziggyEventHandler).configuration();
 
         // Mock out the machinery that returns a PipelineExecutor so that we can substitute
         // our own UOW generator retrieval; for some reason the test fails when retrieving the
@@ -133,11 +136,6 @@ public void setUp() throws IOException {
             .when(pipelineExecutor)
             .unitOfWorkGenerator(ArgumentMatchers.any(PipelineDefinitionNode.class));
 
-        // Don't allow the event handler to actually send tasks for the worker to start.
-        Mockito.doNothing()
-            .when(ziggyEventHandler)
-            .sendWorkerMessageForTasks(ArgumentMatchers.anyList());
-
         ziggyEventHandler.setPipelineName(pipelineName);
         ziggyEventHandler.setDirectory(testDataDir.toString());
         ziggyEventHandler.setName("test-event");
@@ -150,18 +148,23 @@ public void setUp() throws IOException {
                 ImmutableList.of(new File(TEST_DATA_SRC, "pt-event.xml").toString()), false)
                     .importFromFiles();
             new PipelineModuleDefinitionCrud()
-                .createOrUpdate(DataReceiptPipelineModule.createDataReceiptPipelineForDb());
+                .merge(DataReceiptPipelineModule.createDataReceiptPipelineForDb());
             new PipelineDefinitionOperations().importPipelineConfiguration(
                 ImmutableList.of(new File(TEST_DATA_SRC, "pd-event.xml")));
             return null;
         });
+
+        // Construct the PipelineSupervisor just so that we have a value set for the
+        // number of workers
+        new PipelineSupervisor(1, 1000);
     }
 
     @Test
     public void testSchema() throws IOException {
-        Path schemaPath = Paths.get(System.getProperty(ZIGGY_HOME_DIR_PROP_NAME), "schema", "xml",
+        Path schemaPath = Paths.get(
+            ZiggyConfiguration.getInstance().getString(ZIGGY_HOME_DIR.property()), "schema", "xml",
             new ZiggyEventHandlerFile().getXmlSchemaFilename());
-        List<String> schemaContent = Files.readAllLines(schemaPath);
+        List<String> schemaContent = Files.readAllLines(schemaPath, FileUtil.ZIGGY_CHARSET);
 
         assertContains(schemaContent,
             "<xs:element name=\"pipelineEventDefinition\" type=\"ziggyEventHandlerFile\"/>");
@@ -206,8 +209,7 @@ public void testStartPipeline() throws IOException, InterruptedException {
             assertTrue(new ZiggyEventCrud().retrieveAllEvents().isEmpty());
             assertTrue(new PipelineInstanceCrud().retrieveAll().isEmpty());
             assertTrue(new PipelineTaskCrud().retrieveAll().isEmpty());
-            assertNull(new ParameterSetCrud()
-                .retrieveLatestVersionForName(new ParameterSetName("test-event mammal")));
+            assertNull(new ParameterSetCrud().retrieveLatestVersionForName("test-event mammal"));
             return null;
         });
 
@@ -220,7 +222,7 @@ public void testStartPipeline() throws IOException, InterruptedException {
         assertEquals(1, events.size());
         ZiggyEvent event = events.get(0);
         assertEquals(1L, event.getPipelineInstanceId());
-        assertEquals("sample", event.getPipelineName().getName());
+        assertEquals("sample", event.getPipelineName());
         assertEquals("test-event", event.getEventHandlerName());
         assertTrue(event.getEventTime() != null);
 
@@ -236,8 +238,7 @@ public void testStartPipeline() throws IOException, InterruptedException {
         assertEquals(1, instance.getPipelineParameterSets().size());
         ParameterSet parameterSet = instance.getPipelineParameterSets()
             .get(new ClassWrapper<>(ZiggyEventLabels.class));
-        ZiggyEventLabels eventLabels = (ZiggyEventLabels) parameterSet.getParameters()
-            .getInstance();
+        ZiggyEventLabels eventLabels = (ZiggyEventLabels) parameterSet.parametersInstance();
         assertEquals("test-event", eventLabels.getEventHandlerName());
         assertEquals("mammal", eventLabels.getEventName());
         assertEquals(1, eventLabels.getEventLabels().length);
@@ -245,20 +246,14 @@ public void testStartPipeline() throws IOException, InterruptedException {
 
         // Get the task out of the database and check its values.
         List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
-            .performTransaction(() -> {
-                List<PipelineTask> pipelineTasks = new PipelineTaskCrud()
-                    .retrieveTasksForInstance(1L);
-                Hibernate.initialize(
-                    pipelineTasks.get(0).getPipelineInstanceNode().getModuleParameterSets());
-                return pipelineTasks;
-            });
+            .performTransaction(this::retrievePipelineTasks);
 
         assertEquals(1, tasks.size());
         PipelineTask task = tasks.get(0);
-        UnitOfWork uow = task.getUowTask().getInstance();
+        UnitOfWork uow = task.uowTaskInstance();
         assertEquals("gazelle", DirectoryUnitOfWorkGenerator.directory(uow));
         ParameterSet labelsParamSet = task.getParameterSet(ZiggyEventLabels.class);
-        eventLabels = (ZiggyEventLabels) labelsParamSet.getParameters().getInstance();
+        eventLabels = (ZiggyEventLabels) labelsParamSet.parametersInstance();
         assertEquals("test-event", eventLabels.getEventHandlerName());
         assertEquals("mammal", eventLabels.getEventName());
         assertEquals(1, eventLabels.getEventLabels().length);
@@ -271,9 +266,20 @@ public void testStartPipeline() throws IOException, InterruptedException {
         // fired again
         Files.createFile(readyIndicator1);
         ziggyEventHandler.run();
-        events = (List<ZiggyEvent>) DatabaseTransactionFactory
-            .performTransaction(() -> new ZiggyEventCrud().retrieveAllEvents());
-        assertEquals(2, events.size());
+        DatabaseTransactionFactory.performTransaction(() -> {
+            ZiggyEventCrud crud = new ZiggyEventCrud();
+            TestEventDetector.detectTestEvent(100L, () -> crud.retrieveAllEvents().size() == 2);
+            return null;
+        });
+    }
+
+    private List<PipelineTask> retrievePipelineTasks() {
+        List<PipelineTask> pipelineTasks = new PipelineTaskCrud().retrieveTasksForInstance(1L);
+        for (PipelineTask task : pipelineTasks) {
+            Hibernate.initialize(task.getPipelineInstanceNode().getModuleParameterSets());
+            Hibernate.initialize(task.getUowTaskParameters());
+        }
+        return pipelineTasks;
     }
 
     @Test
@@ -287,8 +293,7 @@ public void testPreExistingReadyFile() throws IOException, InterruptedException
             assertTrue(new ZiggyEventCrud().retrieveAllEvents().isEmpty());
             assertTrue(new PipelineInstanceCrud().retrieveAll().isEmpty());
             assertTrue(new PipelineTaskCrud().retrieveAll().isEmpty());
-            assertNull(new ParameterSetCrud()
-                .retrieveLatestVersionForName(new ParameterSetName("test-event mammal")));
+            assertNull(new ParameterSetCrud().retrieveLatestVersionForName("test-event mammal"));
             return null;
         });
 
@@ -302,10 +307,9 @@ public void testPreExistingReadyFile() throws IOException, InterruptedException
         assertEquals(1, events.size());
         ZiggyEvent event = events.get(0);
         assertEquals(1L, event.getPipelineInstanceId());
-        assertEquals("sample", event.getPipelineName().getName());
+        assertEquals("sample", event.getPipelineName());
         assertEquals("test-event", event.getEventHandlerName());
         assertTrue(event.getEventTime() != null);
-
     }
 
     @Test
@@ -340,8 +344,7 @@ public void testEventWithTwoReadyFiles() throws IOException, InterruptedExceptio
             assertTrue(new ZiggyEventCrud().retrieveAllEvents().isEmpty());
             assertTrue(new PipelineInstanceCrud().retrieveAll().isEmpty());
             assertTrue(new PipelineTaskCrud().retrieveAll().isEmpty());
-            assertNull(new ParameterSetCrud()
-                .retrieveLatestVersionForName(new ParameterSetName("test-event mammal")));
+            assertNull(new ParameterSetCrud().retrieveLatestVersionForName("test-event mammal"));
             return null;
         });
 
@@ -355,7 +358,7 @@ public void testEventWithTwoReadyFiles() throws IOException, InterruptedExceptio
         assertEquals(1, events.size());
         ZiggyEvent event = events.get(0);
         assertEquals(1L, event.getPipelineInstanceId());
-        assertEquals("sample", event.getPipelineName().getName());
+        assertEquals("sample", event.getPipelineName());
         assertEquals("test-event", event.getEventHandlerName());
         assertTrue(event.getEventTime() != null);
 
@@ -371,8 +374,7 @@ public void testEventWithTwoReadyFiles() throws IOException, InterruptedExceptio
         assertEquals(1, instance.getPipelineParameterSets().size());
         ParameterSet parameterSet = instance.getPipelineParameterSets()
             .get(new ClassWrapper<>(ZiggyEventLabels.class));
-        ZiggyEventLabels eventLabels = (ZiggyEventLabels) parameterSet.getParameters()
-            .getInstance();
+        ZiggyEventLabels eventLabels = (ZiggyEventLabels) parameterSet.parametersInstance();
         assertEquals("test-event", eventLabels.getEventHandlerName());
         assertEquals("bird", eventLabels.getEventName());
         Set<String> labels = Sets.newHashSet(eventLabels.getEventLabels());
@@ -383,21 +385,15 @@ public void testEventWithTwoReadyFiles() throws IOException, InterruptedExceptio
         // Get the tasks out of the database and check their values.
         @SuppressWarnings("unchecked")
         List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
-            .performTransaction(() -> {
-                List<PipelineTask> pipelineTasks = new PipelineTaskCrud()
-                    .retrieveTasksForInstance(1L);
-                Hibernate.initialize(
-                    pipelineTasks.get(0).getPipelineInstanceNode().getModuleParameterSets());
-                return pipelineTasks;
-            });
+            .performTransaction(this::retrievePipelineTasks);
 
         assertEquals(2, tasks.size());
         List<String> uowStrings = new ArrayList<>();
         for (PipelineTask task : tasks) {
-            UnitOfWork uow = task.getUowTask().getInstance();
+            UnitOfWork uow = task.uowTaskInstance();
             uowStrings.add(DirectoryUnitOfWorkGenerator.directory(uow));
             ParameterSet labelsParamSet = task.getParameterSet(ZiggyEventLabels.class);
-            eventLabels = (ZiggyEventLabels) labelsParamSet.getParameters().getInstance();
+            eventLabels = (ZiggyEventLabels) labelsParamSet.parametersInstance();
             assertEquals("test-event", eventLabels.getEventHandlerName());
             assertEquals("bird", eventLabels.getEventName());
             labels = Sets.newHashSet(eventLabels.getEventLabels());
@@ -407,7 +403,6 @@ public void testEventWithTwoReadyFiles() throws IOException, InterruptedExceptio
         }
         assertTrue(uowStrings.contains("psittacus"));
         assertTrue(uowStrings.contains("archosaur"));
-
     }
 
     @Test
@@ -425,6 +420,38 @@ public void testSimultaneousEvents() throws IOException, InterruptedException {
         assertEquals(2, events.size());
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testRetrieveByInstance() throws IOException, InterruptedException {
+
+        Files.createFile(readyIndicator2a);
+        Files.createFile(readyIndicator2b);
+        Files.createFile(readyIndicator1);
+
+        ziggyEventHandler.run();
+
+        List<PipelineInstance> instances = (List<PipelineInstance>) DatabaseTransactionFactory
+            .performTransaction(() -> new PipelineInstanceCrud().retrieveAll());
+        instances.sort(Comparator.comparing(PipelineInstance::getId));
+        List<ZiggyEvent> events = (List<ZiggyEvent>) DatabaseTransactionFactory
+            .performTransaction(() -> new ZiggyEventCrud().retrieve(List.of(instances.get(0))));
+        assertEquals(1, events.size());
+        assertEquals(1L, events.get(0).getPipelineInstanceId());
+        assertEquals("test-event", events.get(0).getEventHandlerName());
+        events = (List<ZiggyEvent>) DatabaseTransactionFactory
+            .performTransaction(() -> new ZiggyEventCrud().retrieve(List.of(instances.get(1))));
+        assertEquals(1, events.size());
+        assertEquals(2L, events.get(0).getPipelineInstanceId());
+        assertEquals("test-event", events.get(0).getEventHandlerName());
+        events = (List<ZiggyEvent>) DatabaseTransactionFactory
+            .performTransaction(() -> new ZiggyEventCrud().retrieve(instances));
+        assertEquals(2, events.size());
+        assertEquals(1L, events.get(0).getPipelineInstanceId());
+        assertEquals(2L, events.get(1).getPipelineInstanceId());
+        assertEquals("test-event", events.get(0).getEventHandlerName());
+        assertEquals("test-event", events.get(1).getEventHandlerName());
+    }
+
     @Test
     public void testNullEventLabel() throws IOException, InterruptedException {
 
@@ -445,7 +472,7 @@ public void testNullEventLabel() throws IOException, InterruptedException {
         assertEquals(1, events.size());
         ZiggyEvent event = events.get(0);
         assertEquals(1L, event.getPipelineInstanceId());
-        assertEquals("sample", event.getPipelineName().getName());
+        assertEquals("sample", event.getPipelineName());
         assertEquals("test-event", event.getEventHandlerName());
         assertTrue(event.getEventTime() != null);
 
@@ -460,8 +487,7 @@ public void testNullEventLabel() throws IOException, InterruptedException {
         assertEquals(1, instance.getPipelineParameterSets().size());
         ParameterSet parameterSet = instance.getPipelineParameterSets()
             .get(new ClassWrapper<>(ZiggyEventLabels.class));
-        ZiggyEventLabels eventLabels = (ZiggyEventLabels) parameterSet.getParameters()
-            .getInstance();
+        ZiggyEventLabels eventLabels = (ZiggyEventLabels) parameterSet.parametersInstance();
         assertEquals("test-event", eventLabels.getEventHandlerName());
         assertEquals("mammal", eventLabels.getEventName());
         assertEquals(0, eventLabels.getEventLabels().length);
@@ -469,24 +495,17 @@ public void testNullEventLabel() throws IOException, InterruptedException {
         // Get the task out of the database and check its values.
         @SuppressWarnings("unchecked")
         List<PipelineTask> tasks = (List<PipelineTask>) DatabaseTransactionFactory
-            .performTransaction(() -> {
-                List<PipelineTask> pipelineTasks = new PipelineTaskCrud()
-                    .retrieveTasksForInstance(1L);
-                Hibernate.initialize(
-                    pipelineTasks.get(0).getPipelineInstanceNode().getModuleParameterSets());
-                return pipelineTasks;
-            });
+            .performTransaction(this::retrievePipelineTasks);
 
         assertEquals(1, tasks.size());
         PipelineTask task = tasks.get(0);
-        UnitOfWork uow = task.getUowTask().getInstance();
+        UnitOfWork uow = task.uowTaskInstance();
         assertEquals("", DirectoryUnitOfWorkGenerator.directory(uow));
         ParameterSet labelsParamSet = task.getParameterSet(ZiggyEventLabels.class);
-        eventLabels = (ZiggyEventLabels) labelsParamSet.getParameters().getInstance();
+        eventLabels = (ZiggyEventLabels) labelsParamSet.parametersInstance();
         assertEquals("test-event", eventLabels.getEventHandlerName());
         assertEquals("mammal", eventLabels.getEventName());
         assertEquals(0, eventLabels.getEventLabels().length);
-
     }
 
     private void validateEventHandler(ZiggyEventHandler handler) {
@@ -504,17 +523,16 @@ private void validateEventHandler(ZiggyEventHandler handler) {
     }
 
     private void validateDataReceiptHandler(ZiggyEventHandler handler) {
-        assertEquals("pipeline1", handler.getPipelineName().getName());
+        assertEquals("pipeline1", handler.getPipelineName());
         assertTrue(handler.isEnableOnClusterStart());
         assertFalse(handler.isRunning());
         assertEquals("/some/directory/or/other", handler.getDirectory());
     }
 
     private void validateOtherHandler(ZiggyEventHandler handler) {
-        assertEquals("pipeline2", handler.getPipelineName().getName());
+        assertEquals("pipeline2", handler.getPipelineName());
         assertFalse(handler.isEnableOnClusterStart());
         assertFalse(handler.isRunning());
         assertEquals("/yet/another/directory", handler.getDirectory());
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/services/logging/FileAppenderTest.java b/src/test/java/gov/nasa/ziggy/services/logging/FileAppenderTest.java
index d165b19..559d01c 100644
--- a/src/test/java/gov/nasa/ziggy/services/logging/FileAppenderTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/logging/FileAppenderTest.java
@@ -22,6 +22,8 @@
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.util.io.FileUtil;
 
 public class FileAppenderTest {
 
@@ -34,7 +36,7 @@ public class FileAppenderTest {
 
     @Rule
     public ZiggyPropertyRule log4j2ConfigurationFilePropertyRule = new ZiggyPropertyRule(
-        "log4j2.configurationFile", LOG4J_CONFIG_FILE);
+        PropertyName.LOG4J2_CONFIGURATION_FILE, LOG4J_CONFIG_FILE);
 
     @Test
     public void testFileAppender() throws IOException {
@@ -61,7 +63,7 @@ public void testFileAppender() throws IOException {
 
         assertTrue(Files.exists(appenderFile));
 
-        List<String> logLines = Files.readAllLines(appenderFile);
+        List<String> logLines = Files.readAllLines(appenderFile, FileUtil.ZIGGY_CHARSET);
         assertEquals(2, logLines.size());
         assertTrue(logLines.get(0).contains("Here is a test message with INFO level"));
         assertTrue(logLines.get(1).contains("Here is a test message with WARN level"));
diff --git a/src/test/java/gov/nasa/ziggy/services/logging/TaskLogTest.java b/src/test/java/gov/nasa/ziggy/services/logging/TaskLogTest.java
index a69f678..9908d46 100644
--- a/src/test/java/gov/nasa/ziggy/services/logging/TaskLogTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/logging/TaskLogTest.java
@@ -1,7 +1,6 @@
 package gov.nasa.ziggy.services.logging;
 
-import static gov.nasa.ziggy.ZiggyUnitTestUtils.TEST_DATA;
-import static gov.nasa.ziggy.services.config.PropertyNames.RESULTS_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.RESULTS_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -11,6 +10,7 @@
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -34,6 +34,7 @@
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineTask;
 import gov.nasa.ziggy.services.config.DirectoryProperties;
+import gov.nasa.ziggy.services.config.PropertyName;
 import gov.nasa.ziggy.services.logging.TaskLog.LogType;
 
 /**
@@ -43,7 +44,7 @@
  * @author PT
  */
 public class TaskLogTest {
-    private static final String LOG4J_CONFIG_FILE = TEST_DATA.resolve("logging")
+    private static final String LOG4J_CONFIG_FILE = Paths.get("etc")
         .resolve("log4j2.xml")
         .toString();
     private static Logger log;
@@ -54,8 +55,8 @@ public class TaskLogTest {
     private static final int THREAD_NUMBER_1 = 5;
     private static final int THREAD_NUMBER_2 = 6;
 
-    private static final int INSTANCE_ID = 2;
-    private static final int TASK_ID = 42;
+    private static final long INSTANCE_ID = 2;
+    private static final long TASK_ID = 42;
 
     private static final int STEP_INDEX_0 = 0;
     private static final int STEP_INDEX_1 = 1;
@@ -73,9 +74,9 @@ public class TaskLogTest {
 
     @Rule
     public ZiggyPropertyRule log4j2ConfigurationFilePropertyRule = new ZiggyPropertyRule(
-        "log4j2.configurationFile", LOG4J_CONFIG_FILE);
+        PropertyName.LOG4J2_CONFIGURATION_FILE, LOG4J_CONFIG_FILE);
 
-    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR_PROP_NAME,
+    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR,
         directoryRule);
 
     @Rule
@@ -172,7 +173,7 @@ public void testAlgorithmTaskLog() throws IOException {
                 .resolve("logs")
                 .resolve("algorithm")
                 .resolve("2-42-testexename.0-1.log"),
-            THREAD_NUMBER_1, TEST_LOG_MESSAGE_1, THREAD_NUMBER_2, TEST_LOG_MESSAGE_2).toFile();
+            TEST_LOG_MESSAGE_1, THREAD_NUMBER_2, TEST_LOG_MESSAGE_2).toFile();
 
         assertTrue("log file exists", algorithmLog1.exists());
 
@@ -181,7 +182,6 @@ public void testAlgorithmTaskLog() throws IOException {
         assertEquals("log file # lines", 2, logContents.size());
         assertTrue("log file contents", logContents.get(0).contains(TEST_LOG_MESSAGE_1));
         assertTrue("log file contents", logContents.get(1).contains(TEST_LOG_MESSAGE_2));
-
     }
 
     private void checkTaskLogInformationValues(TaskLogInformation taskLogInfo,
@@ -230,14 +230,14 @@ private void checkTaskLogInformationValues(TaskLogInformation taskLogInfo,
         }
     }
 
-    private Path createAndPopulateTaskLog(Path taskFileName, int threadNumber, String message,
-        int altThreadNumber, String altLogMessage) {
+    private Path createAndPopulateTaskLog(Path taskFileName, String message, int altThreadNumber,
+        String altLogMessage) {
         TaskLog taskLog = new TaskLog(taskFileName.toString());
         populateTaskLog(taskLog, message, altThreadNumber, altLogMessage);
         return taskLog.getTaskLogFile();
     }
 
-    private Path createAndPopulateTaskLog(int threadNumber, int instanceId, int taskId,
+    private Path createAndPopulateTaskLog(int threadNumber, long instanceId, long taskId,
         int stepIndex, String message, int altThreadNumber, String altLogMessage) {
         TaskLog taskLog = new TaskLog(threadNumber,
             createPipelineTask(instanceId, taskId, stepIndex));
@@ -259,7 +259,7 @@ private void populateTaskLog(TaskLog taskLog, String message, int altThreadNumbe
         taskLog.endLogging();
     }
 
-    private PipelineTask createPipelineTask(int instanceId, int taskId, int stepIndex) {
+    private PipelineTask createPipelineTask(long instanceId, long taskId, int stepIndex) {
         PipelineTask task = new PipelineTask();
         PipelineInstance instance = new PipelineInstance();
         instance.setId(instanceId);
@@ -273,7 +273,7 @@ private PipelineTask createPipelineTask(int instanceId, int taskId, int stepInde
         return task;
     }
 
-    private File createAlgorithmTaskLog(int instanceId, int taskId, int jobIndex, int stepIndex)
+    private File createAlgorithmTaskLog(long instanceId, long taskId, int jobIndex, int stepIndex)
         throws IOException {
         PipelineTask task = createPipelineTask(instanceId, taskId, stepIndex);
         String algorithmLogFilename = task.logFilename(jobIndex);
@@ -281,10 +281,7 @@ private File createAlgorithmTaskLog(int instanceId, int taskId, int jobIndex, in
         File algorithmLogFile = DirectoryProperties.algorithmLogsDir()
             .resolve(algorithmLogFilename)
             .toFile();
-//        File algorithmLogFile = new File(algorithmDirectory, algorithmLogFilename);
         algorithmLogFile.createNewFile();
         return algorithmLogFile;
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/MessageFromClient.java b/src/test/java/gov/nasa/ziggy/services/messaging/MessageFromClient.java
deleted file mode 100644
index 7af28dd..0000000
--- a/src/test/java/gov/nasa/ziggy/services/messaging/MessageFromClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import gov.nasa.ziggy.services.messages.PipelineMessage;
-
-/**
- * Super-basic message from the RMI client to the server.
- *
- * @author PT
- */
-public class MessageFromClient extends PipelineMessage {
-
-    private static final long serialVersionUID = 20210223L;
-
-    private String payload;
-
-    public MessageFromClient(String payload) {
-        this.payload = payload;
-    }
-
-    public String getPayload() {
-        return payload;
-    }
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        return null;
-    }
-
-}
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/MessageFromServer.java b/src/test/java/gov/nasa/ziggy/services/messaging/MessageFromServer.java
deleted file mode 100644
index a7883ad..0000000
--- a/src/test/java/gov/nasa/ziggy/services/messaging/MessageFromServer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import gov.nasa.ziggy.services.messages.PipelineMessage;
-
-public class MessageFromServer extends PipelineMessage {
-
-    private static final long serialVersionUID = 20210223L;
-
-    private Set<MessageFromClient> messagesFromClient;
-    private String payload;
-
-    public MessageFromServer(Set<MessageFromClient> messagesFromClient) {
-        this.messagesFromClient = messagesFromClient;
-        payload = new String();
-    }
-
-    public MessageFromServer(String payload) {
-        this.payload = payload;
-        messagesFromClient = new HashSet<>();
-    }
-
-    public Set<MessageFromClient> messagesFromClient() {
-        return messagesFromClient;
-    }
-
-    public String getPayload() {
-        return payload;
-    }
-
-    @Override
-    public Object handleMessage(MessageHandler messageHandler) {
-        return null;
-    }
-
-}
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/MessageHandlersForTest.java b/src/test/java/gov/nasa/ziggy/services/messaging/MessageHandlersForTest.java
deleted file mode 100644
index 1de8475..0000000
--- a/src/test/java/gov/nasa/ziggy/services/messaging/MessageHandlersForTest.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import gov.nasa.ziggy.services.messages.PipelineMessage;
-import gov.nasa.ziggy.services.messages.WorkerShutdownMessage;
-import gov.nasa.ziggy.ui.ClusterController;
-import gov.nasa.ziggy.ui.common.ProcessHeartbeatManager;
-import gov.nasa.ziggy.ui.common.ProcessHeartbeatManager.HeartbeatManagerExternalMethods;
-import gov.nasa.ziggy.ui.messaging.ConsoleMessageDispatcher;
-import gov.nasa.ziggy.ui.mon.alerts.AlertMessageTableModel;
-import gov.nasa.ziggy.ui.mon.master.Indicator;
-import gov.nasa.ziggy.ui.mon.master.WorkerStatusPanel;
-import gov.nasa.ziggy.util.SystemTime;
-
-/**
- * Assorted message handling classes for testing purposes.
- *
- * @author PT
- */
-public class MessageHandlersForTest {
-
-    /**
-     * Subclass of {@link ClusterController} that won't bomb when trying to check the state of the
-     * (nonexistent) worker.
-     *
-     * @author PT
-     */
-    public static class ClusterControllerForTest extends ClusterController {
-
-        public ClusterControllerForTest(int workerHeapSize, int workerThreadCount) {
-            super(workerHeapSize, workerThreadCount);
-        }
-
-        @Override
-        public boolean isWorkerRunning() {
-            return true;
-        }
-
-        @Override
-        public boolean isDatabaseRunning() {
-            return true;
-        }
-
-    }
-
-    /**
-     * Subclass of {@link ProcessHeartbeatManager} that provides additional information about the
-     * inner workings of the class. This should only be used in test, as the means by which the
-     * additional information is provided will degrade the long-term performance of the manager.
-     *
-     * @author PT
-     */
-    public static class InstrumentedWorkerHeartbeatManager extends ProcessHeartbeatManager {
-
-        private static final long SYS_TIME_SCALING = 100_000L;
-
-        /**
-         * Allows the timestamps to be returned with their leading digits stripped off. Not strictly
-         * necessary for the tests, but useful for when a human being is looking at the results.
-         */
-        private synchronized static long systemTimeOffset() {
-            long sysTime = SystemTime.currentTimeMillis();
-            long scaledSysTime = sysTime / SYS_TIME_SCALING;
-            return SYS_TIME_SCALING * scaledSysTime;
-        }
-
-        private List<Long> messageHandlerStartTimes = new ArrayList<>();
-        private List<Long> localStartTimes = new ArrayList<>();
-        private List<Long> messageHandlerHeartbeatTimesAtChecks = new ArrayList<>();
-        private List<Long> localHeartbeatTimesAtChecks = new ArrayList<>();
-        private List<Long> actualTimesAtChecks = new ArrayList<>();
-        private List<Boolean> checkStatus = new ArrayList<>();
-        private long systemTimeOffset = systemTimeOffset();
-
-        public InstrumentedWorkerHeartbeatManager(MessageHandler messageHandler) {
-            super(messageHandler, new ExternalMethodsMock(), new ClusterControllerForTest(100, 1));
-        }
-
-        @Override
-        public void initialize() throws NoHeartbeatException {
-            super.initialize();
-            messageHandlerStartTimes
-                .add(getMessageHandler().getLastHeartbeatTimeMillis() - systemTimeOffset);
-            localStartTimes.add(getLastHeartbeatTime() - systemTimeOffset);
-        }
-
-        @Override
-        protected void checkForHeartbeat() {
-            messageHandlerHeartbeatTimesAtChecks
-                .add(getMessageHandler().getLastHeartbeatTimeMillis() - systemTimeOffset);
-            localHeartbeatTimesAtChecks.add(getLastHeartbeatTime() - systemTimeOffset);
-            actualTimesAtChecks.add(System.currentTimeMillis() - systemTimeOffset);
-            try {
-                super.checkForHeartbeat();
-                checkStatus.add(true);
-            } catch (NoHeartbeatException e) {
-                checkStatus.add(false);
-            }
-        }
-
-        public List<Long> getMessageHandlerStartTimes() {
-            return messageHandlerStartTimes;
-        }
-
-        public List<Long> getLocalStartTimes() {
-            return localStartTimes;
-        }
-
-        public List<Long> getMessageHandlerHeartbeatTimesAtChecks() {
-            return messageHandlerHeartbeatTimesAtChecks;
-        }
-
-        public List<Long> getlocalHeartbeatTimesAtChecks() {
-            return localHeartbeatTimesAtChecks;
-        }
-
-        public List<Long> getActualTimesAtChecks() {
-            return actualTimesAtChecks;
-        }
-
-        public List<Boolean> getCheckStatus() {
-            return checkStatus;
-        }
-    }
-
-    /**
-     * Subclass of {@link HeartbeatManagerExternalMethods} that does nothing.
-     *
-     * @author PT
-     */
-    public static class ExternalMethodsMock extends HeartbeatManagerExternalMethods {
-
-        @Override
-        public void setRmiIndicator(Indicator.State state) {
-        }
-
-        @Override
-        public void setWorkerIndicator(Indicator.State state) {
-        }
-
-        @Override
-        public void setDatabaseIndicator(Indicator.State state) {
-        }
-    }
-
-    /**
-     * Performs message handling in unit tests for the "client". Specifically, all messages of
-     * {@link MessageFromServer} are saved in a Set; all messages of other classes are ignored.
-     *
-     * @author PT
-     */
-    public static class ClientSideMessageHandlerForTest extends MessageHandler {
-
-        private Set<MessageFromServer> messagesFromServer = new HashSet<>();
-
-        public ClientSideMessageHandlerForTest() {
-            super(new ConsoleMessageDispatcher(null, null, false));
-        }
-
-        @Override
-        public Object handleMessage(PipelineMessage message) {
-            if (message instanceof MessageFromServer) {
-                messagesFromServer.add((MessageFromServer) message);
-            }
-            return null;
-        }
-
-        public Set<MessageFromServer> getMessagesFromServer() {
-            return messagesFromServer;
-        }
-    }
-
-    /**
-     * Subclass of {@link PigMessageDispatcher} that doesn't try to shut down the console (because
-     * it's not actually running in the console).
-     *
-     * @author PT
-     */
-    public static class ConsoleMessageDispatcherForTest extends ConsoleMessageDispatcher {
-
-        public ConsoleMessageDispatcherForTest(AlertMessageTableModel tableModel,
-            WorkerStatusPanel statusPanel, boolean shutdownEnabled) {
-            super(tableModel, statusPanel, shutdownEnabled);
-        }
-
-        @Override
-        public void handleShutdownMessage(WorkerShutdownMessage message) {
-
-        }
-    }
-
-    /**
-     * Performs message handling in unit tests for messages sent to the server (worker). It stores
-     * all {@link MessageFromClient} instances in a Set and ignores all other kinds of messages.
-     * Once a specified number of messages have been received, it replies with a
-     * {@link MessageFromServer}.
-     *
-     * @author PT
-     */
-    public static class ServerSideMessageHandlerForTest implements MessageHandlerService {
-
-        private Set<MessageFromClient> messagesFromClient = new HashSet<>();
-        private int expectedMessageCount = 0;
-
-        @Override
-        public Object handleMessage(PipelineMessage message) throws RemoteException {
-            if (message instanceof MessageFromClient) {
-                messagesFromClient.add((MessageFromClient) message);
-            }
-            if (expectedMessageCount > 0 && messagesFromClient.size() == expectedMessageCount) {
-                WorkerCommunicator.broadcast(new MessageFromServer(messagesFromClient));
-            }
-            return null;
-        }
-
-        public Set<MessageFromClient> getMessagesFromClient() {
-            return messagesFromClient;
-        }
-
-        public void setServerMessages(Set<MessageFromClient> messagesFromClient) {
-            this.messagesFromClient = messagesFromClient;
-        }
-
-        public int getExpectedMessageCount() {
-            return expectedMessageCount;
-        }
-
-        public void setExpectedMessageCount(int expectedMessageCount) {
-            this.expectedMessageCount = expectedMessageCount;
-        }
-    }
-
-}
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/MessagingTestUtils.java b/src/test/java/gov/nasa/ziggy/services/messaging/MessagingTestUtils.java
new file mode 100644
index 0000000..c03e9d2
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/services/messaging/MessagingTestUtils.java
@@ -0,0 +1,204 @@
+package gov.nasa.ziggy.services.messaging;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import gov.nasa.ziggy.services.messages.HeartbeatMessage;
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+import gov.nasa.ziggy.services.messages.SpecifiedRequestorMessage;
+import gov.nasa.ziggy.services.messaging.ProcessHeartbeatManager.HeartbeatManagerAssistant;
+import gov.nasa.ziggy.ui.ClusterController;
+import gov.nasa.ziggy.ui.status.Indicator;
+import gov.nasa.ziggy.util.SystemTime;
+
+/**
+ * Assorted message handling utilities for testing purposes.
+ *
+ * @author PT
+ */
+public class MessagingTestUtils {
+
+    /**
+     * A {@link ClusterController} that won't bomb when trying to check the state of the
+     * (nonexistent) supervisor.
+     *
+     * @author PT
+     */
+    public static class ClusterControllerStub extends ClusterController {
+
+        public ClusterControllerStub(int workerHeapSize, int workerThreadCount) {
+            super(workerHeapSize, workerThreadCount);
+        }
+
+        @Override
+        public boolean isSupervisorRunning() {
+            return true;
+        }
+
+        @Override
+        public boolean isDatabaseAvailable() {
+            return true;
+        }
+    }
+
+    /**
+     * A {@link ProcessHeartbeatManager} that provides additional information about the inner
+     * workings of the class. This should only be used in test, as the means by which the additional
+     * information is provided will degrade the long-term performance of the manager.
+     *
+     * @author PT
+     */
+    public static class InstrumentedWorkerHeartbeatManager extends ProcessHeartbeatManager {
+
+        private static final long SYS_TIME_SCALING = 100_000L;
+
+        /**
+         * Allows the timestamps to be returned with their leading digits stripped off. Not strictly
+         * necessary for the tests, but useful for when a human being is looking at the results.
+         */
+        private synchronized static long systemTimeOffset() {
+            long sysTime = SystemTime.currentTimeMillis();
+            long scaledSysTime = sysTime / SYS_TIME_SCALING;
+            return SYS_TIME_SCALING * scaledSysTime;
+        }
+
+        private List<Long> messageHandlerStartTimes = new ArrayList<>();
+        private List<Long> localStartTimes = new ArrayList<>();
+        private List<Long> messageHandlerHeartbeatTimesAtChecks = new ArrayList<>();
+        private List<Long> localHeartbeatTimesAtChecks = new ArrayList<>();
+        private List<Long> actualTimesAtChecks = new ArrayList<>();
+        private List<Boolean> checkStatus = new ArrayList<>();
+        private long systemTimeOffset = systemTimeOffset();
+
+        public InstrumentedWorkerHeartbeatManager() {
+            super(new MockedHeartbeatManagerAssistant(), new ClusterControllerStub(100, 1));
+        }
+
+        @Override
+        public void initializeHeartbeatManager() throws NoHeartbeatException {
+            super.initializeHeartbeatManager();
+            messageHandlerStartTimes.add(getHeartbeatTime() - systemTimeOffset);
+            localStartTimes.add(getPriorHeartbeatTime() - systemTimeOffset);
+        }
+
+        @Override
+        protected void checkForHeartbeat() {
+            messageHandlerHeartbeatTimesAtChecks.add(getHeartbeatTime() - systemTimeOffset);
+            localHeartbeatTimesAtChecks.add(getPriorHeartbeatTime() - systemTimeOffset);
+            actualTimesAtChecks.add(System.currentTimeMillis() - systemTimeOffset);
+            try {
+                super.checkForHeartbeat();
+                checkStatus.add(true);
+            } catch (NoHeartbeatException e) {
+                checkStatus.add(false);
+            }
+        }
+
+        public List<Long> getMessageHandlerStartTimes() {
+            return messageHandlerStartTimes;
+        }
+
+        public List<Long> getLocalStartTimes() {
+            return localStartTimes;
+        }
+
+        public List<Long> getMessageHandlerHeartbeatTimesAtChecks() {
+            return messageHandlerHeartbeatTimesAtChecks;
+        }
+
+        public List<Long> getlocalHeartbeatTimesAtChecks() {
+            return localHeartbeatTimesAtChecks;
+        }
+
+        public List<Long> getActualTimesAtChecks() {
+            return actualTimesAtChecks;
+        }
+
+        public List<Boolean> getCheckStatus() {
+            return checkStatus;
+        }
+    }
+
+    public static class InstrumentedHeartbeatMessage extends HeartbeatMessage {
+
+        private static final long serialVersionUID = 20230611L;
+
+        public void setHeartbeatTime(long heartbeatTime) {
+            heartbeatTimeMillis = heartbeatTime;
+        }
+    }
+
+    /**
+     * Subclass of {@link HeartbeatManagerAssistant} that does nothing.
+     *
+     * @author PT
+     */
+    public static class MockedHeartbeatManagerAssistant implements HeartbeatManagerAssistant {
+
+        @Override
+        public void setRmiIndicator(Indicator.State state) {
+        }
+
+        @Override
+        public void setSupervisorIndicator(Indicator.State state) {
+        }
+
+        @Override
+        public void setDatabaseIndicator(Indicator.State state) {
+        }
+    }
+
+    /**
+     * Basic message class that gets sent from a client.
+     *
+     * @author PT
+     */
+    public static class Message1 extends PipelineMessage {
+
+        private static final long serialVersionUID = 20230519L;
+        private final String payload;
+
+        public Message1(String payload) {
+            this.payload = payload;
+        }
+
+        public String getPayload() {
+            return payload;
+        }
+    }
+
+    /**
+     * Another basic message that gets sent from a client.
+     *
+     * @author PT
+     */
+    public static class Message2 extends SpecifiedRequestorMessage {
+
+        private static final long serialVersionUID = 20230519L;
+        private final String payload;
+
+        public Message2(String payload) {
+            super(() -> new UUID(1L, 2L));
+            this.payload = payload;
+        }
+
+        public String getPayload() {
+            return payload;
+        }
+    }
+
+    /**
+     * Message sent in reply to an instance of {@link Message2}.
+     *
+     * @author PT
+     */
+    public static class Message2Reply extends SpecifiedRequestorMessage {
+
+        private static final long serialVersionUID = 20230519L;
+
+        public Message2Reply(Message2 originalMessage) {
+            super(originalMessage);
+        }
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/ui/common/ProcessHeartbeatManagerTest.java b/src/test/java/gov/nasa/ziggy/services/messaging/ProcessHeartbeatManagerTest.java
similarity index 54%
rename from src/test/java/gov/nasa/ziggy/ui/common/ProcessHeartbeatManagerTest.java
rename to src/test/java/gov/nasa/ziggy/services/messaging/ProcessHeartbeatManagerTest.java
index 788cfac..a568916 100644
--- a/src/test/java/gov/nasa/ziggy/ui/common/ProcessHeartbeatManagerTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/messaging/ProcessHeartbeatManagerTest.java
@@ -1,7 +1,7 @@
-package gov.nasa.ziggy.ui.common;
+package gov.nasa.ziggy.services.messaging;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATABASE_SOFTWARE_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.HEARTBEAT_INTERVAL_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATABASE_SOFTWARE;
+import static gov.nasa.ziggy.services.config.PropertyName.HEARTBEAT_INTERVAL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -18,15 +18,14 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import gov.nasa.ziggy.ZiggyPropertyRule;
-import gov.nasa.ziggy.services.messages.WorkerHeartbeatMessage;
-import gov.nasa.ziggy.services.messaging.MessageHandler;
+import gov.nasa.ziggy.services.messaging.MessagingTestUtils.InstrumentedHeartbeatMessage;
+import gov.nasa.ziggy.services.messaging.ProcessHeartbeatManager.HeartbeatManagerAssistant;
+import gov.nasa.ziggy.services.messaging.ProcessHeartbeatManager.NoHeartbeatException;
 import gov.nasa.ziggy.ui.ClusterController;
-import gov.nasa.ziggy.ui.common.ProcessHeartbeatManager.HeartbeatManagerExternalMethods;
-import gov.nasa.ziggy.ui.common.ProcessHeartbeatManager.NoHeartbeatException;
-import gov.nasa.ziggy.ui.messaging.ConsoleMessageDispatcher;
-import gov.nasa.ziggy.ui.mon.master.Indicator;
+import gov.nasa.ziggy.ui.status.Indicator;
 import gov.nasa.ziggy.util.SystemTime;
 
 /**
@@ -37,26 +36,25 @@
 public class ProcessHeartbeatManagerTest {
 
     private ProcessHeartbeatManager manager;
-    private MessageHandler messageHandler;
-    private ScheduledThreadPoolExecutor heartbeatGenerator;
-    private HeartbeatManagerExternalMethods externalMethods;
+    private HeartbeatManagerAssistant assistant;
     private ClusterController clusterController;
+    private InstrumentedHeartbeatMessage heartbeatMessage = new InstrumentedHeartbeatMessage();
 
     @Rule
     public ZiggyPropertyRule heartbeatIntervalPropertyRule = new ZiggyPropertyRule(
-        HEARTBEAT_INTERVAL_PROP_NAME, Long.toString(0));
+        HEARTBEAT_INTERVAL, Long.toString(0));
 
     @Rule
-    public ZiggyPropertyRule databaseSoftwarePropertyRule = new ZiggyPropertyRule(
-        DATABASE_SOFTWARE_PROP_NAME, "postgresql");
+    public ZiggyPropertyRule databaseSoftwarePropertyRule = new ZiggyPropertyRule(DATABASE_SOFTWARE,
+        "postgresql");
 
     @Before
     public void setup() {
-        messageHandler = new MessageHandler(new ConsoleMessageDispatcher(null, null, false));
-        externalMethods = mock(HeartbeatManagerExternalMethods.class);
+        assistant = Mockito.mock(HeartbeatManagerAssistant.class);
         clusterController = mock(ClusterController.class);
-        when(clusterController.isDatabaseRunning()).thenReturn(true);
-        when(clusterController.isWorkerRunning()).thenReturn(true);
+        when(clusterController.isDatabaseAvailable()).thenReturn(true);
+        when(clusterController.isSupervisorRunning()).thenReturn(true);
+        ProcessHeartbeatManager.setInitializeInThread(false);
     }
 
     @After
@@ -65,10 +63,6 @@ public void teardown() throws InterruptedException {
         if (s != null) {
             s.shutdownNow();
         }
-        if (heartbeatGenerator != null) {
-            heartbeatGenerator.shutdownNow();
-            heartbeatGenerator = null;
-        }
     }
 
     /**
@@ -78,14 +72,14 @@ public void teardown() throws InterruptedException {
      */
     @Test
     public void testGoodStart() throws InterruptedException, NoHeartbeatException {
-        manager = new ProcessHeartbeatManager(messageHandler, externalMethods, clusterController);
-        messageHandler.setLastHeartbeatTimeMillis(1L);
+        manager = new ProcessHeartbeatManager(assistant, clusterController);
+        manager.setHeartbeatTime(1L);
         SystemTime.setUserTime(5L);
-        manager.initialize();
+        manager.initializeHeartbeatManager();
         assertNotNull(manager.getHeartbeatListener());
         assertFalse(manager.getHeartbeatListener().isShutdown());
-        verify(externalMethods).setRmiIndicator(Indicator.State.GREEN);
-        verify(externalMethods, times(0)).setRmiIndicator(Indicator.State.RED);
+        verify(assistant).setRmiIndicator(Indicator.State.NORMAL);
+        verify(assistant, times(0)).setRmiIndicator(Indicator.State.ERROR);
     }
 
     /**
@@ -95,28 +89,29 @@ public void testGoodStart() throws InterruptedException, NoHeartbeatException {
      */
     @Test
     public void testGoodRunning() throws InterruptedException, NoHeartbeatException {
-        manager = new ProcessHeartbeatManager(messageHandler, externalMethods, clusterController);
+        manager = new ProcessHeartbeatManager(assistant, clusterController);
 
         // Set conditions such that initialization believes that a heartbeat has been detected.
-        messageHandler.setLastHeartbeatTimeMillis(1L);
+        manager.setHeartbeatTime(1L);
         SystemTime.setUserTime(5L);
-        manager.initialize();
+        manager.initializeHeartbeatManager();
 
         // Send 2 additional heartbeats at later times.
         SystemTime.setUserTime(105L);
-        sendHeartbeat();
+        manager.setHeartbeatTime(105L);
         SystemTime.setUserTime(205L);
-        sendHeartbeat();
+        manager.setHeartbeatTime(205L);
         manager.checkForHeartbeat();
-        verify(externalMethods, times(0)).setRmiIndicator(Indicator.State.AMBER);
+        verify(assistant, times(0)).setRmiIndicator(Indicator.State.WARNING);
 
         // Send 2 more heartbeats at even later times.
         SystemTime.setUserTime(305L);
-        sendHeartbeat();
+        manager.setHeartbeatTime(305L);
         SystemTime.setUserTime(405L);
-        sendHeartbeat();
+        manager.setHeartbeatTime(405L);
+        ZiggyMessenger.publish(heartbeatMessage);
         manager.checkForHeartbeat();
-        verify(externalMethods, times(0)).setRmiIndicator(Indicator.State.AMBER);
+        verify(assistant, times(0)).setRmiIndicator(Indicator.State.WARNING);
         assertFalse(manager.getHeartbeatListener().isShutdown());
     }
 
@@ -126,14 +121,13 @@ public void testGoodRunning() throws InterruptedException, NoHeartbeatException
      */
     @Test
     public void testBadStart() {
-        manager = new ProcessHeartbeatManager(messageHandler, externalMethods, clusterController);
+        manager = new ProcessHeartbeatManager(assistant, clusterController);
         try {
-            manager.initialize();
-            assertFalse(true);
+            manager.initializeHeartbeatManager();
         } catch (NoHeartbeatException e) {
             assertNull(manager.getHeartbeatListener());
-            verify(externalMethods).setRmiIndicator(Indicator.State.RED);
-            verify(externalMethods, times(0)).setRmiIndicator(Indicator.State.GREEN);
+            verify(assistant).setRmiIndicator(Indicator.State.ERROR);
+            verify(assistant, times(0)).setRmiIndicator(Indicator.State.NORMAL);
         }
     }
 
@@ -147,23 +141,19 @@ public void testBadStart() {
     @Test
     public void testHeartbeatDetectorHearsNothing()
         throws InterruptedException, NoHeartbeatException {
-        when(externalMethods.getProcessIdiotLightState()).thenReturn(Indicator.State.RED);
 
         // Set conditions such that initialization believes that a heartbeat has been detected.
-        messageHandler.setLastHeartbeatTimeMillis(1L);
         SystemTime.setUserTime(5L);
-        manager = new ProcessHeartbeatManager(messageHandler, externalMethods, clusterController);
-        manager.initialize();
-        try {
-            manager.checkForHeartbeat();
-            assertFalse("NoHeartbeatException not detected", true);
-        } catch (NoHeartbeatException e) {
-        }
+        manager = new ProcessHeartbeatManager(assistant, clusterController);
+        manager.setHeartbeatTime(1L);
+        manager.initializeHeartbeatManager();
+        verify(assistant).setRmiIndicator(Indicator.State.NORMAL);
+        manager.checkForHeartbeat();
         assertNotNull(manager.getHeartbeatListener());
-        verify(externalMethods).restartUiCommunicator();
-        verify(externalMethods).setRmiIndicator(Indicator.State.GREEN);
-        verify(externalMethods).setRmiIndicator(Indicator.State.AMBER);
-        verify(externalMethods).setRmiIndicator(Indicator.State.RED);
+        verify(assistant).restartClientCommunicator();
+        verify(assistant).setRmiIndicator(Indicator.State.NORMAL);
+        verify(assistant).setRmiIndicator(Indicator.State.WARNING);
+        verify(assistant).setRmiIndicator(Indicator.State.ERROR);
         assertTrue(manager.getHeartbeatListener().isShutdown());
     }
 
@@ -176,11 +166,10 @@ public void testHeartbeatDetectorHearsNothing()
     @Test
     public void testHeartbeatDetectorSuccessfulRestart()
         throws InterruptedException, NoHeartbeatException {
-        when(externalMethods.getProcessIdiotLightState()).thenReturn(Indicator.State.GREEN);
-        messageHandler.setLastHeartbeatTimeMillis(1L);
         SystemTime.setUserTime(5L);
-        manager = new ProcessHeartbeatManager(messageHandler, externalMethods, clusterController);
-        manager.initialize();
+        manager = new ProcessHeartbeatManager(assistant, clusterController);
+        manager.setHeartbeatTime(5L);
+        manager.initializeHeartbeatManager();
 
         // Note that we don't want to automatically go to reinitialization. Instead we want to
         // simulate waiting in the initializer for a new heartbeat.
@@ -188,21 +177,17 @@ public void testHeartbeatDetectorSuccessfulRestart()
         assertFalse(manager.getHeartbeatListener().isShutdown());
         SystemTime.setUserTime(205L);
         manager.checkForHeartbeat();
-        assertEquals(0L, messageHandler.getLastHeartbeatTimeMillis());
+        assertEquals(0L, manager.getHeartbeatTime());
         assertFalse(manager.getHeartbeatListener().isShutdown());
         SystemTime.setUserTime(305L);
-        messageHandler.setLastHeartbeatTimeMillis(300L);
+        manager.setHeartbeatTime(300L);
 
         // Here is where we simulate detecting the new heartbeat in the initializer.
-        manager.initialize();
+        manager.initializeHeartbeatManager();
         assertNotNull(manager.getHeartbeatListener());
-        verify(externalMethods).setRmiIndicator(Indicator.State.AMBER);
-        verify(externalMethods, times(0)).setRmiIndicator(Indicator.State.RED);
-        verify(externalMethods, times(2)).setRmiIndicator(Indicator.State.GREEN);
+        verify(assistant).setRmiIndicator(Indicator.State.WARNING);
+        verify(assistant, times(0)).setRmiIndicator(Indicator.State.ERROR);
+        verify(assistant, times(2)).setRmiIndicator(Indicator.State.NORMAL);
         assertFalse(manager.getHeartbeatListener().isShutdown());
     }
-
-    private void sendHeartbeat() {
-        new WorkerHeartbeatMessage().handleMessage(messageHandler);
-    }
 }
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/RmiClientInstantiator.java b/src/test/java/gov/nasa/ziggy/services/messaging/RmiClientInstantiator.java
new file mode 100644
index 0000000..3a088ab
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/services/messaging/RmiClientInstantiator.java
@@ -0,0 +1,59 @@
+package gov.nasa.ziggy.services.messaging;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Instantiates the {@link ZiggyRmiClient} in an external process. This allows multi-client testing
+ * of the RMI communication system.
+ *
+ * @author PT
+ */
+public class RmiClientInstantiator {
+
+    public static final String CLIENT_READY_FILE_NAME = "client-ready";
+    public static final String SERIALIZE_MESSAGE_MAP_COMMAND_FILE_NAME = "serialize";
+    public static final String SERIALIZED_MESSAGE_MAP_FILE_NAME = "message-map.ser";
+
+    public void startClient(int port, String clientReadyDir) throws IOException {
+
+        ZiggyRmiClient.initializeInstance(port, "external process client");
+        ZiggyRmiClient.setUseMessenger(false);
+        if (clientReadyDir == null) {
+            return;
+        }
+        Path clientReadyFile = Paths.get(clientReadyDir).resolve(CLIENT_READY_FILE_NAME);
+        Files.createFile(clientReadyFile);
+
+        // Now we need to have a busy loop. There's no need to check for shutdown conditions,
+        // since we will destroy the client process from the test class that created the
+        // process. We do need to check for the file that tells this method to serialize the
+        // detected messages map.
+        while (true) {
+            if (Files
+                .exists(Paths.get(clientReadyDir).resolve(SERIALIZE_MESSAGE_MAP_COMMAND_FILE_NAME))
+                && ZiggyRmiClient.messagesDetected().size() >= 3) {
+                try (ObjectOutputStream s = new ObjectOutputStream(
+                    new FileOutputStream(Paths.get(clientReadyDir)
+                        .resolve(SERIALIZED_MESSAGE_MAP_FILE_NAME)
+                        .toString()))) {
+                    s.writeObject(ZiggyRmiClient.messagesDetected());
+                    Files.delete(
+                        Paths.get(clientReadyDir).resolve(SERIALIZE_MESSAGE_MAP_COMMAND_FILE_NAME));
+                }
+            }
+        }
+    }
+
+    public static void main(String[] args) throws IOException {
+
+        int port = Integer.parseInt(args[0]);
+        String clientReadyDir = args[1];
+
+        new RmiClientInstantiator().startClient(port, clientReadyDir);
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/RmiInterProcessCommunicationTest.java b/src/test/java/gov/nasa/ziggy/services/messaging/RmiInterProcessCommunicationTest.java
index 75a30ce..c45ae09 100644
--- a/src/test/java/gov/nasa/ziggy/services/messaging/RmiInterProcessCommunicationTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/messaging/RmiInterProcessCommunicationTest.java
@@ -3,16 +3,16 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.rmi.NotBoundException;
 import java.rmi.registry.Registry;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
 
 import org.junit.After;
 import org.junit.Before;
@@ -23,17 +23,17 @@
 import gov.nasa.ziggy.RunByNameTestCategory;
 import gov.nasa.ziggy.TestEventDetector;
 import gov.nasa.ziggy.ZiggyDirectoryRule;
-import gov.nasa.ziggy.services.messaging.MessageHandlersForTest.ClientSideMessageHandlerForTest;
-import gov.nasa.ziggy.services.messaging.MessageHandlersForTest.ConsoleMessageDispatcherForTest;
-import gov.nasa.ziggy.services.messaging.MessageHandlersForTest.InstrumentedWorkerHeartbeatManager;
-import gov.nasa.ziggy.ui.common.ProcessHeartbeatManager;
+import gov.nasa.ziggy.services.messages.HeartbeatMessage;
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+import gov.nasa.ziggy.services.messaging.MessagingTestUtils.Message1;
+import gov.nasa.ziggy.services.messaging.MessagingTestUtils.Message2;
 import gov.nasa.ziggy.util.os.ProcessUtils;
 
 /**
  * Tests the RMI communication classes for Ziggy in the context where the client and server sides
- * (or UI and worker, if you prefer) are running in the different processes and thus different JVMs.
- * The server is always run as the external process.
- * <P>
+ * are running in the different processes and thus different JVMs. The server is always run as the
+ * external process.
+ * <p>
  * The inter- and intra-process tests are in separate classes because of failures that occur when an
  * inter-process test immediately follows an intra-process test.
  *
@@ -44,8 +44,8 @@ public class RmiInterProcessCommunicationTest {
 
     private int port = 4788;
     private Process serverProcess;
+    private Process clientProcess;
     String heartbeatIntervalMillis = "0";
-    private ProcessHeartbeatManager heartbeatManager = mock(ProcessHeartbeatManager.class);
 
     @Rule
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
@@ -53,114 +53,144 @@ public class RmiInterProcessCommunicationTest {
     @Before
     public void setup() {
         serverProcess = null;
+        clientProcess = null;
+        ZiggyRmiClient.clearDetectedMessages();
     }
 
     @After
     public void teardown() throws NotBoundException, InterruptedException, IOException {
 
-        UiCommunicator.stopHeartbeatListener();
-        if (WorkerCommunicator.isInitialized() && WorkerCommunicator.getRegistry() != null) {
-            WorkerCommunicator.shutdown();
+        if (ZiggyRmiServer.isInitialized() && ZiggyRmiServer.getRegistry() != null) {
+            ZiggyRmiServer.shutdown();
         }
-        UiCommunicator.reset();
-        Files.createFile(directoryRule.directory().resolve(ServerTest.SHUT_DOWN_FILE_NAME));
-        TestEventDetector.detectTestEvent(1000L, () -> Files
-            .exists(directoryRule.directory().resolve(ServerTest.SHUT_DOWN_DETECT_FILE_NAME)));
+        ZiggyRmiClient.reset();
+        Files.createFile(
+            directoryRule.directory().resolve(RmiServerInstantiator.SHUT_DOWN_FILE_NAME));
+        TestEventDetector.detectTestEvent(1000L, () -> Files.exists(
+            directoryRule.directory().resolve(RmiServerInstantiator.SHUT_DOWN_DETECT_FILE_NAME)));
         if (serverProcess != null) {
             serverProcess.destroy();
             serverProcess = null;
         }
+        if (clientProcess != null) {
+            clientProcess.destroy();
+            clientProcess = null;
+        }
     }
 
     /**
-     * Tests communication when the worker and UI are in separate JVMs.
+     * Tests communication when the server and client are in separate JVMs.
      */
     @Test
     public void testInterProcessCommunication() throws IOException, InterruptedException {
 
-        // Start the worker in a remote process
+        // Start the server in a remote process
         List<String> args = new ArrayList<>();
         args.add(Integer.toString(port));
         args.add(Integer.toString(2));
         args.add(directoryRule.directory().toString());
 
-        serverProcess = ProcessUtils.runJava(ServerTest.class, args);
-        TestEventDetector.detectTestEvent(1000L, () -> Files
-            .exists(directoryRule.directory().resolve(ServerTest.SERVER_READY_FILE_NAME)));
-        // now start the UiCommunicator with a ClientMessageHandler
+        serverProcess = ProcessUtils.runJava(RmiServerInstantiator.class, args);
+        assertTrue(TestEventDetector.detectTestEvent(1000L, () -> Files.exists(
+            directoryRule.directory().resolve(RmiServerInstantiator.SERVER_READY_FILE_NAME))));
 
-        UiCommunicator.setHeartbeatManager(heartbeatManager);
-        UiCommunicator.initializeInstance(new ClientSideMessageHandlerForTest(), port);
-        UiCommunicator.stopHeartbeatListener();
+        // now start the client.
+        ZiggyRmiClient.initializeInstance(port, "test client");
+        ZiggyRmiClient.setUseMessenger(false);
 
-        Registry registry = UiCommunicator.getRegistry();
+        Registry registry = ZiggyRmiClient.getRegistry();
 
         assertNotNull(registry);
-        assertNotNull(UiCommunicator.getServerMessageHandlerStub());
-        assertNotNull(UiCommunicator.getWorkerService());
+        assertNotNull(ZiggyRmiClient.ziggyRmiServerService());
 
         // send two messages
-        MessageFromClient m1 = new MessageFromClient("telecaster");
-        UiCommunicator.send(m1);
-        MessageFromClient m2 = new MessageFromClient("stratocaster");
-        UiCommunicator.send(m2);
+        Message1 m1 = new Message1("telecaster");
+        ZiggyRmiClient.send(m1, null);
+        Message1 m2 = new Message1("stratocaster");
+        ZiggyRmiClient.send(m2, null);
 
-        ClientSideMessageHandlerForTest messageHandler = (ClientSideMessageHandlerForTest) UiCommunicator
-            .getMessageHandler();
+        Map<Class<? extends PipelineMessage>, List<PipelineMessage>> messagesDetected = ZiggyRmiClient
+            .messagesDetected();
         TestEventDetector.detectTestEvent(1000L,
-            () -> messageHandler.getMessagesFromServer().size() > 0);
-        Set<MessageFromServer> messagesFromServer = messageHandler.getMessagesFromServer();
-        assertEquals(1, messagesFromServer.size());
+            () -> messagesDetected.size() > 0 && messagesDetected.get(Message1.class) != null
+                && messagesDetected.get(Message1.class).size() > 1);
+        assertEquals(2, messagesDetected.size());
+        List<PipelineMessage> messages = messagesDetected.get(Message1.class);
+        assertEquals(2, messages.size());
+        assertTrue(messages.contains(m1));
+        assertTrue(messages.contains(m2));
+        assertTrue(messagesDetected.containsKey(HeartbeatMessage.class));
     }
 
-    /**
-     * Tests heartbeat generation, detection, and handling for the inter-process use-case.
-     */
+    @SuppressWarnings("unchecked")
     @Test
-    public void testHeartbeatManagement() throws InterruptedException, IOException {
+    public void testMultipleClients() throws IOException, ClassNotFoundException {
 
-        // Start the worker in a remote process
+        // Start the worker in a remote process.
         List<String> args = new ArrayList<>();
         args.add(Integer.toString(port));
         args.add(Integer.toString(2));
         args.add(directoryRule.directory().toString());
 
-        serverProcess = ProcessUtils.runJava(ServerTest.class, args);
-        TestEventDetector.detectTestEvent(1000L, () -> Files
-            .exists(directoryRule.directory().resolve(ServerTest.SERVER_READY_FILE_NAME)));
-
-        // Start the heartbeat manager and communicator
-        MessageHandler messageHandler = new MessageHandler(
-            new ConsoleMessageDispatcherForTest(null, null, false));
-        messageHandler.setLastHeartbeatTimeMillis(1L);
-        InstrumentedWorkerHeartbeatManager h = new InstrumentedWorkerHeartbeatManager(
-            messageHandler);
-        UiCommunicator.setHeartbeatManager(h);
-        UiCommunicator.initializeInstance(messageHandler, port);
-
-        // Pause to let 5 heartbeat-check intervals go by
-        Path heartbeatFile = directoryRule.directory().resolve(ServerTest.SEND_HEARTBEAT_FILE_NAME);
-        for (int heartbeatCount = 0; heartbeatCount < 5; heartbeatCount++) {
-            Files.createFile(heartbeatFile);
-            TestEventDetector.detectTestEvent(1000L, () -> !Files.exists(heartbeatFile));
-            h.checkForHeartbeat();
-        }
+        serverProcess = ProcessUtils.runJava(RmiServerInstantiator.class, args);
+        assertTrue(TestEventDetector.detectTestEvent(1000L, () -> Files.exists(
+            directoryRule.directory().resolve(RmiServerInstantiator.SERVER_READY_FILE_NAME))));
 
-        // Start checking to see what the heartbeat handler did:
-        // there should be only 1 start (i.e., no restarts)
-        List<Long> messageHandlerStartTimes = h.getMessageHandlerStartTimes();
-        List<Long> localStartTimes = h.getLocalStartTimes();
-        assertEquals(1, messageHandlerStartTimes.size());
-        assertEquals(1, localStartTimes.size());
-        assertTrue(messageHandlerStartTimes.get(0) > 0);
-
-        // There should be 5 checks after starting, all good
-        List<Boolean> checkStatus = h.getCheckStatus();
-        assertEquals(5, checkStatus.size());
-        for (Boolean status : checkStatus) {
-            assertTrue(status);
+        // Start a client in a remote process.
+        args.clear();
+        args.add(Integer.toString(port));
+        args.add(directoryRule.directory().toString());
+        clientProcess = ProcessUtils.runJava(RmiClientInstantiator.class, args);
+        assertTrue(TestEventDetector.detectTestEvent(1000L, () -> Files.exists(
+            directoryRule.directory().resolve(RmiClientInstantiator.CLIENT_READY_FILE_NAME))));
+
+        ZiggyRmiClient.initializeInstance(port, "test client");
+        ZiggyRmiClient.setUseMessenger(false);
+
+        // Send an instance of Message1
+        ZiggyRmiClient.send(new Message1("payload 1"), null);
+
+        // Send an instance of Message2
+        ZiggyRmiClient.send(new Message2("payload 2"), null);
+
+        // There should be 2 message classes detected for the local client.
+        assertTrue(TestEventDetector.detectTestEvent(1000L,
+            () -> ZiggyRmiClient.messagesDetected().size() > 2));
+        Map<Class<? extends PipelineMessage>, List<PipelineMessage>> messageMap = ZiggyRmiClient
+            .messagesDetected();
+        assertEquals(3, messageMap.size());
+        assertTrue(messageMap.containsKey(Message1.class));
+        List<PipelineMessage> messages = messageMap.get(Message1.class);
+        assertEquals(1, messages.size());
+        assertEquals("payload 1", ((Message1) messages.get(0)).getPayload());
+        assertTrue(messageMap.containsKey(Message2.class));
+        messages = messageMap.get(Message2.class);
+        assertEquals(1, messages.size());
+        assertEquals("payload 2", ((Message2) messages.get(0)).getPayload());
+        assertTrue(messageMap.containsKey(HeartbeatMessage.class));
+
+        // The external process client should have the same 2 messages detected.
+        Files.createFile(directoryRule.directory()
+            .resolve(RmiClientInstantiator.SERIALIZE_MESSAGE_MAP_COMMAND_FILE_NAME));
+        assertTrue(
+            TestEventDetector.detectTestEvent(1000L, () -> !Files.exists(directoryRule.directory()
+                .resolve(RmiClientInstantiator.SERIALIZE_MESSAGE_MAP_COMMAND_FILE_NAME))));
+        try (ObjectInputStream s = new ObjectInputStream(
+            new FileInputStream(directoryRule.directory()
+                .resolve(RmiClientInstantiator.SERIALIZED_MESSAGE_MAP_FILE_NAME)
+                .toString()))) {
+            messageMap = (Map<Class<? extends PipelineMessage>, List<PipelineMessage>>) s
+                .readObject();
         }
-
+        assertEquals(3, messageMap.size());
+        assertTrue(messageMap.containsKey(Message1.class));
+        messages = messageMap.get(Message1.class);
+        assertEquals(1, messages.size());
+        assertEquals("payload 1", ((Message1) messages.get(0)).getPayload());
+        assertTrue(messageMap.containsKey(Message2.class));
+        messages = messageMap.get(Message2.class);
+        assertEquals(1, messages.size());
+        assertEquals("payload 2", ((Message2) messages.get(0)).getPayload());
+        assertTrue(messageMap.containsKey(HeartbeatMessage.class));
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/RmiIntraProcessCommunicationTest.java b/src/test/java/gov/nasa/ziggy/services/messaging/RmiIntraProcessCommunicationTest.java
index b15dfdb..4dcf308 100644
--- a/src/test/java/gov/nasa/ziggy/services/messaging/RmiIntraProcessCommunicationTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/messaging/RmiIntraProcessCommunicationTest.java
@@ -2,18 +2,17 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
-import java.rmi.AccessException;
-import java.rmi.NotBoundException;
 import java.rmi.RemoteException;
 import java.rmi.registry.Registry;
 import java.rmi.server.UnicastRemoteObject;
-import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
 
 import org.junit.After;
 import org.junit.Before;
@@ -22,182 +21,176 @@
 
 import gov.nasa.ziggy.RunByNameTestCategory;
 import gov.nasa.ziggy.TestEventDetector;
-import gov.nasa.ziggy.services.messages.WorkerHeartbeatMessage;
-import gov.nasa.ziggy.services.messaging.MessageHandlersForTest.ClientSideMessageHandlerForTest;
-import gov.nasa.ziggy.services.messaging.MessageHandlersForTest.ConsoleMessageDispatcherForTest;
-import gov.nasa.ziggy.services.messaging.MessageHandlersForTest.InstrumentedWorkerHeartbeatManager;
-import gov.nasa.ziggy.services.messaging.MessageHandlersForTest.ServerSideMessageHandlerForTest;
-import gov.nasa.ziggy.ui.common.ProcessHeartbeatManager;
-import gov.nasa.ziggy.util.SystemTime;
+import gov.nasa.ziggy.services.messages.HeartbeatMessage;
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+import gov.nasa.ziggy.services.messaging.MessagingTestUtils.Message1;
+import gov.nasa.ziggy.services.messaging.ZiggyRmiServer.RmiClientThread;
 
 /**
  * Tests the RMI communication classes for Ziggy in the context where the client and server sides
- * (or UI and worker, if you prefer) are running in the same process and thus the same JVM.
- * <P>
- * Intra-process communication isn't actually a use-case for the production Ziggy systems, but it
- * simplifies some debugging tasks and thus these tests are provided. Also, there seem to be
- * problems when the intra- and inter-process tests are in the same class (specifically, an
- * inter-process test will always fail if immediately preceded by an intra-process test). Moving
- * them to separate classes seems to eliminate this problem, which suggests that the intra-process
- * tests are leaving some state configuration behind that is breaking the inter-process tests.
+ * are running in the same process and thus the same JVM. This is analogous to the use-case in which
+ * the supervisor starts the {@link ZiggyRmiServer} and also has a {@link ZiggyRmiClient} of its
+ * own.
  *
  * @author PT
  */
 @Category(RunByNameTestCategory.class)
 public class RmiIntraProcessCommunicationTest {
 
-    private ServerSideMessageHandlerForTest messageHandler1;
-    private ClientSideMessageHandlerForTest messageHandler2;
     private int port = 4788;
     private Registry registry;
-    private ProcessHeartbeatManager heartbeatManager = mock(ProcessHeartbeatManager.class);
 
     @Before
     public void setup() {
-        messageHandler1 = new ServerSideMessageHandlerForTest();
-        messageHandler2 = new ClientSideMessageHandlerForTest();
         registry = null;
+        ZiggyRmiClient.clearDetectedMessages();
     }
 
     @After
-    public void teardown()
-        throws AccessException, RemoteException, NotBoundException, InterruptedException {
+    public void teardown() throws RemoteException, InterruptedException {
 
-        UiCommunicator.stopHeartbeatListener();
-        if (WorkerCommunicator.isInitialized() && WorkerCommunicator.getRegistry() != null) {
-            WorkerCommunicator.shutdown();
+        if (ZiggyRmiServer.isInitialized() && ZiggyRmiServer.getRegistry() != null) {
+            ZiggyRmiServer.shutdown();
         }
         if (registry != null) {
             UnicastRemoteObject.unexportObject(registry, true);
         }
-        UiCommunicator.reset();
-        messageHandler1 = null;
-        messageHandler2 = null;
+        ZiggyRmiClient.reset();
     }
 
     /**
      * Tests basic initialization of the two classes.
-     *
-     * @throws InterruptedException
      */
     @Test
-    public void testInitialize()
-        throws AccessException, RemoteException, NotBoundException, InterruptedException {
+    public void testInitialize() {
 
-        WorkerCommunicator.initializeInstance(messageHandler1, port);
-        Set<MessageHandlerService> clientStubs = WorkerCommunicator.getClientMessageServiceStubs();
+        ZiggyRmiServer.initializeInstance(port);
+        Set<RmiClientThread> clientStubs = ZiggyRmiServer.getClientServiceStubs();
         assertTrue(clientStubs.isEmpty());
-        assertEquals(messageHandler1, WorkerCommunicator.getMessageHandler());
-        UiCommunicator.setHeartbeatManager(heartbeatManager);
-        UiCommunicator.initializeInstance(messageHandler2, port);
+        ZiggyRmiClient.initializeInstance(port, "test client");
+        ZiggyRmiClient.setUseMessenger(false);
 
-        clientStubs = WorkerCommunicator.getClientMessageServiceStubs();
+        clientStubs = ZiggyRmiServer.getClientServiceStubs();
         assertFalse(clientStubs.isEmpty());
-        assertEquals(messageHandler2, UiCommunicator.getMessageHandler());
+        assertNotNull(ZiggyRmiClient.ziggyRmiServerService());
     }
 
     /**
-     * Tests the case in which the worker crashes and a new WorkerCommunicator needs to be
-     * instantiated.
-     *
-     * @throws InterruptedException
+     * Tests the case in which the server crashes and a new server needs to be instantiated.
      */
     @Test
-    public void testReinitializeWorker() throws InterruptedException {
+    public void testReinitializeServer() {
 
-        WorkerCommunicator.initializeInstance(messageHandler1, port);
+        ZiggyRmiServer.initializeInstance(port);
 
         // Note that for this test we need to preserve a reference to the registry from
-        // the WorkerCommunicator instance that started it; this will be used to shut down
+        // the ZiggyRmiServer instance that started it; this will be used to shut down
         // the registry when the test completes.
-        registry = WorkerCommunicator.getRegistry();
-        WorkerCommunicator.stopHeartbeatExecutor();
-        UiCommunicator.setHeartbeatManager(heartbeatManager);
-        UiCommunicator.initializeInstance(messageHandler2, port);
-        WorkerCommunicator.broadcast(new MessageFromServer("first message"));
-        ClientSideMessageHandlerForTest msg = (ClientSideMessageHandlerForTest) UiCommunicator
-            .getMessageHandler();
-        final ClientSideMessageHandlerForTest msgFinal = msg;
-        TestEventDetector.detectTestEvent(1000L, () -> msgFinal.getMessagesFromServer().size() > 0);
-        assertEquals(1, msg.getMessagesFromServer().size());
-
-        // Emulate a worker crashing and coming back by resetting it and running the
+        registry = ZiggyRmiServer.getRegistry();
+        ZiggyRmiClient.initializeInstance(port, "test client");
+        ZiggyRmiClient.setUseMessenger(false);
+        ZiggyRmiServer.addToBroadcastQueue(new Message1("first message"));
+        Map<Class<? extends PipelineMessage>, List<PipelineMessage>> messagesDetected = ZiggyRmiClient
+            .messagesDetected();
+        TestEventDetector.detectTestEvent(1000L, () -> messagesDetected.size() > 1);
+        assertEquals(1, messagesDetected.get(Message1.class).size());
+
+        // Emulate a server crashing and coming back by resetting it and running the
         // initializer again
-        WorkerCommunicator.reset();
-        WorkerCommunicator.initializeInstance(messageHandler1, port);
-        WorkerCommunicator.stopHeartbeatExecutor();
+        ZiggyRmiServer.reset();
+        ZiggyRmiServer.initializeInstance(port);
+        ZiggyRmiClient.setUseMessenger(false);
 
         // This instance should have no MessageHandler service references from clients
-        assertEquals(0, WorkerCommunicator.getClientMessageServiceStubs().size());
+        assertEquals(0, ZiggyRmiServer.getClientServiceStubs().size());
 
-        // IRL, the UiCommunicator will be restarted by the heartbeat monitor, but since
+        // IRL, the client will be restarted by the heartbeat monitor, but since
         // we're not using that here we have to manually restart it
-        UiCommunicator.restart();
+        ZiggyRmiClient.restart();
+        ZiggyRmiClient.setUseMessenger(false);
         TestEventDetector.detectTestEvent(1000L,
-            () -> WorkerCommunicator.getClientMessageServiceStubs().size() > 0);
+            () -> ZiggyRmiServer.getClientServiceStubs().size() > 0);
 
         // Now the worker should have a MessageHandlerService from the UiCommunicator
-        assertEquals(1, WorkerCommunicator.getClientMessageServiceStubs().size());
+        assertEquals(1, ZiggyRmiServer.getClientServiceStubs().size());
+
+        // The new server can send a message to the client
+        ZiggyRmiServer.addToBroadcastQueue(new Message1("zing!"));
+        TestEventDetector.detectTestEvent(1000L,
+            () -> messagesDetected.get(Message1.class).size() > 1);
+        assertEquals(2, messagesDetected.get(Message1.class).size());
+        assertEquals("zing!",
+            ((Message1) messagesDetected.get(Message1.class).get(1)).getPayload());
+
+        // The client can send a message to the new server, which in turn gets rebroadcast
+        // everywhere.
+        assertEquals(0, ZiggyRmiServer.messagesReceived().size());
+        ZiggyRmiClient.send(new Message1("back at ya!"), null);
+        TestEventDetector.detectTestEvent(1000L,
+            () -> ZiggyRmiServer.messagesReceived().size() > 0);
+        assertEquals(1, ZiggyRmiServer.messagesReceived().size());
+        Integer message1Count = ZiggyRmiServer.messagesReceived().get(Message1.class);
+        assertNotNull(message1Count);
+        assertEquals(1, message1Count.intValue());
 
-        // The new worker can send a message to the UI
-        WorkerCommunicator.broadcast(new MessageFromServer("zing!"));
-        msg = (ClientSideMessageHandlerForTest) UiCommunicator.getMessageHandler();
-        final ClientSideMessageHandlerForTest msgFinal2 = msg;
         TestEventDetector.detectTestEvent(1000L,
-            () -> msgFinal2.getMessagesFromServer().size() > 0);
-        assertEquals(2, msg.getMessagesFromServer().size());
-        ServerSideMessageHandlerForTest msg2 = (ServerSideMessageHandlerForTest) WorkerCommunicator
-            .getMessageHandler();
-
-        // The UI can send a message to the new worker
-        assertEquals(0, msg2.getMessagesFromClient().size());
-        UiCommunicator.send(new MessageFromClient("back at ya!"));
-        msg2 = (ServerSideMessageHandlerForTest) WorkerCommunicator.getMessageHandler();
-        assertEquals(1, msg2.getMessagesFromClient().size());
+            () -> messagesDetected.get(Message1.class).size() > 2);
+        assertEquals(3, messagesDetected.get(Message1.class).size());
+        assertEquals("back at ya!",
+            ((Message1) messagesDetected.get(Message1.class).get(2)).getPayload());
     }
 
     /**
-     * Tests the use-case in which the UI exits and a different one starts up.
+     * Tests the use-case in which the client exits and a different one starts up.
      */
     @Test
-    public void testReinitializeUi() throws InterruptedException {
-        WorkerCommunicator.initializeInstance(messageHandler1, port);
-        WorkerCommunicator.stopHeartbeatExecutor();
-        UiCommunicator.setHeartbeatManager(heartbeatManager);
-        UiCommunicator.initializeInstance(messageHandler2, port);
-        WorkerCommunicator.broadcast(new MessageFromServer("first message"));
-        ClientSideMessageHandlerForTest msg = (ClientSideMessageHandlerForTest) UiCommunicator
-            .getMessageHandler();
-        final ClientSideMessageHandlerForTest msgFinal = msg;
-        TestEventDetector.detectTestEvent(1000L, () -> msgFinal.getMessagesFromServer().size() > 0);
-        assertEquals(1, msg.getMessagesFromServer().size());
-
-        // Emulate the shutdown of a UI by resetting the existing one
-        UiCommunicator.reset();
-
-        // Emulate the start of a new GUI
-        UiCommunicator.setHeartbeatManager(heartbeatManager);
-        UiCommunicator.initializeInstance(messageHandler2, port);
-        UiCommunicator.stopHeartbeatListener();
+    public void testReinitializeClient() {
+        ZiggyRmiServer.initializeInstance(port);
+        ZiggyRmiClient.initializeInstance(port, "test client 1");
+        ZiggyRmiClient.setUseMessenger(false);
+        Map<Class<? extends PipelineMessage>, List<PipelineMessage>> messagesDetected = ZiggyRmiClient
+            .messagesDetected();
+        ZiggyRmiServer.addToBroadcastQueue(new Message1("first message"));
+        TestEventDetector.detectTestEvent(1000L, () -> messagesDetected.size() > 1);
+        assertEquals(2, messagesDetected.size());
+        assertEquals(1, messagesDetected.get(Message1.class).size());
+
+        // This is the heartbeat message that the server sends to a new client.
+        assertEquals(1, messagesDetected.get(HeartbeatMessage.class).size());
+
+        // Emulate the shutdown of a client by resetting the existing one
+        ZiggyRmiClient.reset();
+
+        // Emulate the start of a new client
+        ZiggyRmiClient.initializeInstance(port, "test client 2");
+        ZiggyRmiClient.setUseMessenger(false);
+
+        // There should now be 2 client stubs -- one from the original client, one from the
+        // new client.
         TestEventDetector.detectTestEvent(1000L,
-            () -> WorkerCommunicator.getClientMessageServiceStubs().size() >= 2);
-        // there should now be 2 client services in the worker
-        assertEquals(2, WorkerCommunicator.getClientMessageServiceStubs().size());
+            () -> ZiggyRmiServer.getClientServiceStubs().size() > 1);
+        assertEquals(2, ZiggyRmiServer.getClientServiceStubs().size());
+
+        // The client should have a stub from the server
+        assertNotNull(ZiggyRmiClient.ziggyRmiServerService());
 
         // broadcast a message
-        assertEquals(1, messageHandler2.getMessagesFromServer().size());
-        WorkerCommunicator.broadcast(new MessageFromServer("zing!"));
+        ZiggyRmiServer.addToBroadcastQueue(new Message1("zing!"));
         TestEventDetector.detectTestEvent(1000L,
-            () -> messageHandler2.getMessagesFromServer().size() >= 2);
-        assertEquals(2, messageHandler2.getMessagesFromServer().size());
-
-        // the UI should be able to communicate with the worker as well
-        ServerSideMessageHandlerForTest msg2 = (ServerSideMessageHandlerForTest) WorkerCommunicator
-            .getMessageHandler();
-        assertEquals(0, msg2.getMessagesFromClient().size());
-        UiCommunicator.send(new MessageFromClient("back at ya!"));
-        msg2 = (ServerSideMessageHandlerForTest) WorkerCommunicator.getMessageHandler();
-        assertEquals(1, msg2.getMessagesFromClient().size());
+            () -> messagesDetected.get(Message1.class).size() > 1);
+        assertEquals(2, messagesDetected.get(Message1.class).size());
+
+        // the client should be able to communicate with the server as well
+        ZiggyRmiClient.send(new Message1("from client"), null);
+        TestEventDetector.detectTestEvent(1000L,
+            () -> messagesDetected.get(Message1.class).size() > 2);
+        assertEquals(3, messagesDetected.get(Message1.class).size());
+        TestEventDetector.detectTestEvent(1000L,
+            () -> ZiggyRmiServer.messagesReceived().size() > 0);
+        assertEquals(1, ZiggyRmiServer.messagesReceived().size());
+        Integer message1Count = ZiggyRmiServer.messagesReceived().get(Message1.class);
+        assertNotNull(message1Count);
+        assertEquals(1, message1Count.intValue());
     }
 
     /**
@@ -208,112 +201,76 @@ public void testReinitializeUi() throws InterruptedException {
     @Test
     public void testIntraProcessCommunication() throws IOException {
 
-        ServerTest serverTest = new ServerTest();
+        RmiServerInstantiator serverTest = new RmiServerInstantiator();
         serverTest.startServer(port, 2, null);
-        messageHandler1 = (ServerSideMessageHandlerForTest) WorkerCommunicator.getMessageHandler();
-
-        // broadcast a message before the UiCommunicator has been initialized
-        MessageFromServer m1 = new MessageFromServer("telecaster");
-        WorkerCommunicator.broadcast(m1);
-
-        ClientSideMessageHandlerForTest messageHandler2 = new ClientSideMessageHandlerForTest();
-        UiCommunicator.setHeartbeatManager(heartbeatManager);
-        UiCommunicator.initializeInstance(messageHandler2, port);
-        UiCommunicator.stopHeartbeatListener();
-        assertEquals(0, messageHandler2.getMessagesFromServer().size());
-
-        // broadcast two messages from the worker to the UI
-        MessageFromServer m2 = new MessageFromServer("stratocaster");
-        WorkerCommunicator.broadcast(m2);
-
-        MessageFromServer m3 = new MessageFromServer("mustang");
-        WorkerCommunicator.broadcast(m3);
-
-        Set<MessageFromServer> clientMessages = messageHandler2.getMessagesFromServer();
-        assertEquals(2, clientMessages.size());
-        Set<String> payloads = new HashSet<>();
-        for (MessageFromServer message : clientMessages) {
-            payloads.add(message.getPayload());
-        }
-        assertTrue(payloads.contains("stratocaster"));
-        assertTrue(payloads.contains("mustang"));
-
-        // Now construct a MessageFromClient and send it back
-        assertEquals(0, messageHandler1.getMessagesFromClient().size());
-        MessageFromClient m4 = new MessageFromClient("reply");
-        UiCommunicator.send(m4);
 
-        assertEquals(1, messageHandler1.getMessagesFromClient().size());
-        for (MessageFromClient message : messageHandler1.getMessagesFromClient()) {
-            assertEquals("reply", message.getPayload());
-        }
+        // broadcast a message before the client has been initialized
+        Message1 m1 = new Message1("telecaster");
+        broadcastAndWait(m1);
+
+        ZiggyRmiClient.initializeInstance(port, "test client");
+        ZiggyRmiClient.setUseMessenger(false);
+        Map<Class<? extends PipelineMessage>, List<PipelineMessage>> messagesDetected = ZiggyRmiClient
+            .messagesDetected();
+
+        assertEquals(0, messagesDetected.size());
+
+        // broadcast two messages from the server to the client
+        Message1 m2 = new Message1("stratocaster");
+        ZiggyRmiServer.addToBroadcastQueue(m2);
+
+        Message1 m3 = new Message1("mustang");
+        broadcastAndWait(m3);
+
+        List<PipelineMessage> detectedMessage1Instances = messagesDetected.get(Message1.class);
+        assertEquals(2, detectedMessage1Instances.size());
+        assertTrue(detectedMessage1Instances.contains(m2));
+        assertTrue(detectedMessage1Instances.contains(m3));
+
+        // Now construct a message from the client and send it
+        assertEquals(0, ZiggyRmiServer.messagesReceived().size());
+        Message1 m4 = new Message1("reply");
+        ZiggyRmiClient.send(m4, null);
+        waitForBroadcastCompletion();
+
+        assertEquals(3, detectedMessage1Instances.size());
+        assertTrue(detectedMessage1Instances.contains(m2));
+        assertTrue(detectedMessage1Instances.contains(m3));
+        assertTrue(detectedMessage1Instances.contains(m4));
+        assertEquals(1, ZiggyRmiServer.messagesReceived().size());
+        assertTrue(ZiggyRmiServer.messagesReceived().containsKey(Message1.class));
     }
 
     /**
-     * Tests that heartbeats are properly sent, detected, and handled.
-     *
-     * @throws IOException
+     * Tests that the RMI client decrements a {@link CountDownLatch} as part of its
+     * {@link ZiggyRmiClient#send(PipelineMessage, CountDownLatch)} method.
      */
     @Test
-    public void testHeartbeatManagement() throws InterruptedException, IOException {
-
-        // Start the server
-        ServerTest serverTest = new ServerTest();
+    public void testSendWithCountdownLatch() throws IOException {
+        RmiServerInstantiator serverTest = new RmiServerInstantiator();
         serverTest.startServer(port, 2, null);
+        ZiggyRmiClient.initializeInstance(port, "test client");
+        ZiggyRmiClient.setUseMessenger(false);
+
+        CountDownLatch countdownLatch = new CountDownLatch(1);
+        Message1 m1 = new Message1("telecaster");
+        ZiggyRmiClient.send(m1, countdownLatch);
+        waitForBroadcastCompletion();
+        assertEquals(0, countdownLatch.getCount());
+    }
 
-        // Start the heartbeat manager and communicator
-        MessageHandler messageHandler = new MessageHandler(
-            new ConsoleMessageDispatcherForTest(null, null, false));
-        InstrumentedWorkerHeartbeatManager h = new InstrumentedWorkerHeartbeatManager(
-            messageHandler);
-        UiCommunicator.setHeartbeatManager(h);
-        UiCommunicator.initializeInstance(messageHandler, port);
-        UiCommunicator.stopHeartbeatListener();
-
-        // Simulate 10 heartbeats getting sent, and a detector that runs at 1/2 the rate
-        // of the heartbeat generator.
-        long startTime = SystemTime.currentTimeMillis();
-        long currentTime = startTime;
-        long heartbeatInterval = 100L;
-        for (int heartbeatDetectionCount = 0; heartbeatDetectionCount < 5; heartbeatDetectionCount++) {
-            currentTime += heartbeatInterval;
-            SystemTime.setUserTime(currentTime);
-            WorkerCommunicator.broadcast(new WorkerHeartbeatMessage());
-            currentTime += heartbeatInterval;
-            SystemTime.setUserTime(currentTime);
-            WorkerCommunicator.broadcast(new WorkerHeartbeatMessage());
-            h.checkForHeartbeat();
-        }
-
-        // There should be 5 checks after starting, all good
-        List<Boolean> checkStatus = h.getCheckStatus();
-        assertEquals(5, checkStatus.size());
-        for (Boolean status : checkStatus) {
-            assertTrue(status);
-        }
-
-        // The check times should be within errors of 200 msec apart, and the
-        // manager's last detection time should be set to the message handler's
-        // last detection time from the preceding detection
-        //
-        // Note: the 1st and 2nd local heartbeat times can be significantly
-        // closer in time than 200 msec because the worker sends the UI a
-        // heartbeat immediately when the UI starts up, which can be at any
-        // time in the normal heartbeat cycle
-        List<Long> messageHandlerHeartbeatTimesAtChecks = h
-            .getMessageHandlerHeartbeatTimesAtChecks();
-        List<Long> localTimesAtChecks = h.getlocalHeartbeatTimesAtChecks();
-        assertEquals(5, messageHandlerHeartbeatTimesAtChecks.size());
-        assertEquals(5, localTimesAtChecks.size());
-
-        for (int i = 0; i < 3; i++) {
-            assertEquals(messageHandlerHeartbeatTimesAtChecks.get(i),
-                localTimesAtChecks.get(i + 1));
-            assertTrue(messageHandlerHeartbeatTimesAtChecks.get(i + 1)
-                - messageHandlerHeartbeatTimesAtChecks.get(i) > 199L);
-            assertTrue(messageHandlerHeartbeatTimesAtChecks.get(i + 1)
-                - messageHandlerHeartbeatTimesAtChecks.get(i) < 201L);
-        }
+    private void broadcastAndWait(PipelineMessage pipelineMessage) {
+        ZiggyRmiServer.addToBroadcastQueue(pipelineMessage);
+        waitForBroadcastCompletion();
     }
 
+    /**
+     * Forces the test thread to wait until the {@link ZiggyRmiServer} message broadcasting thread
+     * has completed its work. This corresponds to the message queue being empty and the broadcast
+     * thread in state WAITING.
+     */
+    private void waitForBroadcastCompletion() {
+        assertTrue(
+            TestEventDetector.detectTestEvent(1000L, ZiggyRmiServer::isAllMessagingComplete));
+    }
 }
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/RmiServerInstantiator.java b/src/test/java/gov/nasa/ziggy/services/messaging/RmiServerInstantiator.java
new file mode 100644
index 0000000..4532a3c
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/services/messaging/RmiServerInstantiator.java
@@ -0,0 +1,49 @@
+package gov.nasa.ziggy.services.messaging;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Instantiates the {@link ZiggyRmiServer}, potentially in an external process. This allows testing
+ * of inter-process communication via RMI.
+ *
+ * @author PT
+ */
+public class RmiServerInstantiator {
+
+    public static final String SERVER_READY_FILE_NAME = "server-ready";
+    public static final String SEND_HEARTBEAT_FILE_NAME = "send-heartbeat";
+    public static final String SHUT_DOWN_FILE_NAME = "shutdown";
+    public static final String SHUT_DOWN_DETECT_FILE_NAME = "shutdown-detected";
+
+    public void startServer(int port, int nMessagesExpected, String serverReadyDir)
+        throws IOException {
+        ZiggyRmiServer.initializeInstance(port);
+
+        if (serverReadyDir == null) {
+            return;
+        }
+
+        Paths.get(serverReadyDir).resolve(SEND_HEARTBEAT_FILE_NAME);
+        Path shutdownFile = Paths.get(serverReadyDir).resolve(SHUT_DOWN_FILE_NAME);
+        Path serverReadyFile = Paths.get(serverReadyDir).resolve(SERVER_READY_FILE_NAME);
+        Files.createFile(serverReadyFile);
+        while (!Files.exists(shutdownFile)) {
+        }
+        ZiggyRmiServer.shutdown(true);
+        Files.createFile(Paths.get(serverReadyDir).resolve(SHUT_DOWN_DETECT_FILE_NAME));
+    }
+
+    public static void main(String[] args) throws IOException {
+
+        int port = Integer.parseInt(args[0]);
+        int expectedMessageCount = Integer.parseInt(args[1]);
+        String serverReadyDir = null;
+        if (args.length > 2) {
+            serverReadyDir = args[2];
+        }
+        new RmiServerInstantiator().startServer(port, expectedMessageCount, serverReadyDir);
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/ServerTest.java b/src/test/java/gov/nasa/ziggy/services/messaging/ServerTest.java
deleted file mode 100644
index 1b37995..0000000
--- a/src/test/java/gov/nasa/ziggy/services/messaging/ServerTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package gov.nasa.ziggy.services.messaging;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import gov.nasa.ziggy.services.messages.WorkerHeartbeatMessage;
-import gov.nasa.ziggy.services.messaging.MessageHandlersForTest.ServerSideMessageHandlerForTest;
-import gov.nasa.ziggy.util.SystemTime;
-
-/**
- * Instantiates the {@link WorkerCommunicator}, potentially in an external process. This allows
- * testing of inter-process communication via RMI.
- *
- * @author PT
- */
-public class ServerTest {
-
-    public static final String SERVER_READY_FILE_NAME = "server-ready";
-    public static final String SEND_HEARTBEAT_FILE_NAME = "send-heartbeat";
-    public static final String SHUT_DOWN_FILE_NAME = "shutdown";
-    public static final String SHUT_DOWN_DETECT_FILE_NAME = "shutdown-detected";
-
-    public void startServer(int port, int nMessagesExpected, String serverReadyDir)
-        throws IOException {
-        ServerSideMessageHandlerForTest serverMessageHandler = new ServerSideMessageHandlerForTest();
-        serverMessageHandler.setExpectedMessageCount(nMessagesExpected);
-
-        WorkerCommunicator.initializeInstance(serverMessageHandler, port);
-        WorkerCommunicator.stopHeartbeatExecutor();
-
-        if (serverReadyDir == null) {
-            return;
-        }
-
-        Path heartbeatFile = Paths.get(serverReadyDir).resolve(SEND_HEARTBEAT_FILE_NAME);
-        Path shutdownFile = Paths.get(serverReadyDir).resolve(SHUT_DOWN_FILE_NAME);
-        long startTime = SystemTime.currentTimeMillis();
-        long currentTime = startTime;
-        long heartbeatInterval = 1000L;
-        while (!Files.exists(shutdownFile)) {
-            if (Files.exists(heartbeatFile)) {
-
-                // We need to simulate the passage of time between heartbeat messages
-                // because if the listener sees the same heartbeat time for each
-                // heartbeat it assumes that there's a problem.
-                currentTime += heartbeatInterval;
-                SystemTime.setUserTime(currentTime);
-                WorkerCommunicator.broadcast(new WorkerHeartbeatMessage());
-                Files.delete(heartbeatFile);
-            }
-        }
-        WorkerCommunicator.shutdown(true);
-        Files.createFile(Paths.get(serverReadyDir).resolve(SHUT_DOWN_DETECT_FILE_NAME));
-    }
-
-    public static void main(String[] args) throws IOException {
-
-        int port = Integer.parseInt(args[0]);
-        int expectedMessageCount = Integer.parseInt(args[1]);
-        String serverReadyDir = null;
-        if (args.length > 2) {
-            serverReadyDir = args[2];
-        }
-        new ServerTest().startServer(port, expectedMessageCount, serverReadyDir);
-    }
-
-}
diff --git a/src/test/java/gov/nasa/ziggy/services/messaging/ZiggyMessengerTest.java b/src/test/java/gov/nasa/ziggy/services/messaging/ZiggyMessengerTest.java
new file mode 100644
index 0000000..a49df7b
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/services/messaging/ZiggyMessengerTest.java
@@ -0,0 +1,118 @@
+package gov.nasa.ziggy.services.messaging;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.After;
+import org.junit.Test;
+
+import gov.nasa.ziggy.TestEventDetector;
+import gov.nasa.ziggy.services.messages.PipelineMessage;
+import gov.nasa.ziggy.services.messaging.MessagingTestUtils.Message1;
+import gov.nasa.ziggy.services.messaging.MessagingTestUtils.Message2;
+
+/**
+ * Unit tests for the {@link ZiggyMessenger} class.
+ *
+ * @author PT
+ */
+public class ZiggyMessengerTest {
+
+    private final List<String> stringsFromMessages = new ArrayList<>();
+
+    @After
+    public void tearDown() {
+        stringsFromMessages.clear();
+        ZiggyMessenger.reset();
+    }
+
+    /**
+     * Test that subscriptions are properly managed and that multiple subscriptions for a single
+     * message class is supported.
+     */
+    @Test
+    public void testSubscribe() {
+
+        ZiggyMessenger.subscribe(Message1.class, message -> {
+            // Do nothing.
+        });
+        ZiggyMessenger.subscribe(Message1.class, message -> {
+            // Still do nothing.
+        });
+        ZiggyMessenger.subscribe(Message2.class, message -> {
+            // Even more nothing is done.
+        });
+
+        Map<Class<? extends PipelineMessage>, List<MessageAction<?>>> subscriptions = ZiggyMessenger
+            .getSubscriptions();
+        assertEquals(2, subscriptions.size());
+        assertEquals(2, subscriptions.get(Message1.class).size());
+        assertEquals(1, subscriptions.get(Message2.class).size());
+    }
+
+    /**
+     * Test the basic {@link ZiggyMessenger#publish(PipelineMessage)} method.
+     */
+    @Test
+    public void testPublishNoCountdownLatch() {
+        ZiggyMessenger.initializeInstance();
+        ZiggyMessenger.setStoreMessages(true);
+
+        ZiggyMessenger.publish(new Message1("signed"));
+        TestEventDetector.detectTestEvent(1000L,
+            () -> (ZiggyMessenger.messagesFromOutgoingQueue.size() > 0));
+        assertTrue(ZiggyMessenger.getOutgoingMessageQueue().isEmpty());
+        assertEquals(1, ZiggyMessenger.messagesFromOutgoingQueue.size());
+        assertTrue(ZiggyMessenger.messagesFromOutgoingQueue.get(0) instanceof Message1);
+    }
+
+    /**
+     * Test the {@link ZiggyMessenger#publish(PipelineMessage, CountDownLatch)} method, which allows
+     * the user to pair a {@link CountDownLatch} with the {@link PipelineMessage}, such that the
+     * CountDownLatch gets decremented when the message is acted upon.
+     */
+    @Test
+    public void testPublishWithCountdownLatch() {
+        ZiggyMessenger.initializeInstance();
+        ZiggyMessenger.setStoreMessages(true);
+
+        CountDownLatch latch = new CountDownLatch(1);
+        ZiggyMessenger.publish(new Message1("signed"), latch);
+        assertTrue(TestEventDetector.detectTestEvent(1000L,
+            () -> (ZiggyMessenger.messagesFromOutgoingQueue.size() > 0)));
+        assertTrue(TestEventDetector.detectTestEvent(1000L, () -> (latch.getCount() == 0)));
+        assertTrue(ZiggyMessenger.getOutgoingMessageQueue().isEmpty());
+        assertEquals(1, ZiggyMessenger.messagesFromOutgoingQueue.size());
+        assertTrue(ZiggyMessenger.messagesFromOutgoingQueue.get(0) instanceof Message1);
+    }
+
+    @Test
+    public void testTakeAction() {
+        ZiggyMessenger.initializeInstance();
+        ZiggyMessenger.setStoreMessages(true);
+
+        ZiggyMessenger.subscribe(Message1.class, message -> {
+            stringsFromMessages.add(message.getPayload());
+        });
+        ZiggyMessenger.subscribe(Message1.class, message -> {
+            stringsFromMessages.add("sealed");
+        });
+        ZiggyMessenger.subscribe(Message2.class, message -> {
+            stringsFromMessages.add(message.getPayload());
+        });
+
+        ZiggyMessenger.publish(new Message1("signed"));
+        ZiggyMessenger.publish(new Message2("delivered"));
+        TestEventDetector.detectTestEvent(1000L, () -> (stringsFromMessages.size() > 2));
+        assertEquals(2, ZiggyMessenger.messagesFromOutgoingQueue.size());
+        assertEquals(3, stringsFromMessages.size());
+        assertTrue(stringsFromMessages.contains("signed"));
+        assertTrue(stringsFromMessages.contains("sealed"));
+        assertTrue(stringsFromMessages.contains("delivered"));
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/services/metrics/MetricsFileParserTest.java b/src/test/java/gov/nasa/ziggy/services/metrics/MetricsFileParserTest.java
index d647f27..a0f2abc 100644
--- a/src/test/java/gov/nasa/ziggy/services/metrics/MetricsFileParserTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/metrics/MetricsFileParserTest.java
@@ -4,7 +4,6 @@
 import static org.junit.Assert.assertFalse;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Date;
@@ -47,7 +46,7 @@ public void testParse() throws Exception {
 
         MetricsFileParser parser = new MetricsFileParser(new File("bogus")) {
             @Override
-            protected Reader openReader() throws IOException {
+            protected Reader openReader() {
                 return new StringReader(testInput.toString());
             }
         };
diff --git a/src/test/java/gov/nasa/ziggy/services/process/ExternalProcessTest.java b/src/test/java/gov/nasa/ziggy/services/process/ExternalProcessTest.java
index e5ed6a2..8510bd1 100644
--- a/src/test/java/gov/nasa/ziggy/services/process/ExternalProcessTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/process/ExternalProcessTest.java
@@ -8,6 +8,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Paths;
 
 import org.apache.commons.exec.CommandLine;
@@ -16,7 +17,6 @@
 import org.junit.Test;
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
-import gov.nasa.ziggy.module.PipelineException;
 import gov.nasa.ziggy.services.logging.PlainTextLogOutputStream;
 import gov.nasa.ziggy.services.logging.WriterLogOutputStream;
 
@@ -69,7 +69,6 @@ public void testExeException() throws Exception {
 
         int rc = p.run(true, 1000);
         assertTrue(rc != 0);
-
     }
 
     @Test
@@ -81,7 +80,6 @@ public void testExeFail() throws Exception {
 
         int rc = p.run(true, 1000);
         assertEquals(1, rc);
-
     }
 
     @Test
@@ -204,10 +202,9 @@ public void testLogOutputStreamClasses() throws IOException {
         p.execute();
         assertNull(p.errorLogClass());
         assertNull(p.outputLogClass());
-
     }
 
-    @Test(expected = PipelineException.class)
+    @Test(expected = UncheckedIOException.class)
     public void testBadExeName() {
         File dir = new File("build/bin");
         File exe = new File(dir.getAbsoluteFile(), "testpro");
@@ -231,7 +228,7 @@ public void testExeInPath() {
         assertEquals(0, p.execute());
     }
 
-    @Test(expected = PipelineException.class)
+    @Test(expected = UncheckedIOException.class)
     public void testExeNotInPath() {
         ExternalProcess p = ExternalProcess.simpleExternalProcess(new CommandLine("lssssss"));
         assertEquals(0, p.execute());
diff --git a/src/test/java/gov/nasa/ziggy/services/security/UserCrudTest.java b/src/test/java/gov/nasa/ziggy/services/security/UserCrudTest.java
index 625b0be..12a5b92 100644
--- a/src/test/java/gov/nasa/ziggy/services/security/UserCrudTest.java
+++ b/src/test/java/gov/nasa/ziggy/services/security/UserCrudTest.java
@@ -112,7 +112,6 @@ public void testCreateRetrieve() throws Exception {
             assertTrue("AfterCommit: contains maryMonitor", users.contains(maryMonitor));
             return null;
         });
-
     }
 
     @Test
diff --git a/src/test/java/gov/nasa/ziggy/worker/PipelineInstanceManagerTest.java b/src/test/java/gov/nasa/ziggy/supervisor/PipelineInstanceManagerTest.java
similarity index 80%
rename from src/test/java/gov/nasa/ziggy/worker/PipelineInstanceManagerTest.java
rename to src/test/java/gov/nasa/ziggy/supervisor/PipelineInstanceManagerTest.java
index 8c277f2..8860c19 100644
--- a/src/test/java/gov/nasa/ziggy/worker/PipelineInstanceManagerTest.java
+++ b/src/test/java/gov/nasa/ziggy/supervisor/PipelineInstanceManagerTest.java
@@ -1,4 +1,4 @@
-package gov.nasa.ziggy.worker;
+package gov.nasa.ziggy.supervisor;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
@@ -14,9 +14,7 @@
 import org.mockito.Mockito;
 
 import gov.nasa.ziggy.module.ModuleFatalProcessingException;
-import gov.nasa.ziggy.pipeline.InstanceAndTasks;
 import gov.nasa.ziggy.pipeline.PipelineOperations;
-import gov.nasa.ziggy.pipeline.definition.ModuleName;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinition;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
@@ -24,7 +22,7 @@
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineDefinitionCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineInstanceCrud;
 import gov.nasa.ziggy.services.database.DatabaseService;
-import gov.nasa.ziggy.services.messages.WorkerFireTriggerRequest;
+import gov.nasa.ziggy.services.messages.FireTriggerRequest;
 
 /**
  * Unit test class for PipelineInstanceManager.
@@ -45,7 +43,6 @@ public class PipelineInstanceManagerTest {
     private PipelineInstanceManager pipelineInstanceManager;
     private PipelineDefinition pipelineDefinition;
     private PipelineDefinitionNode startNode, endNode;
-    private ModuleName startNodeName, endNodeName;
     private PipelineInstance instance0, instance1, instance2, instance3;
     private PipelineTask task0 = new PipelineTask();
     private List<PipelineTask> taskList = new ArrayList<>();
@@ -69,14 +66,10 @@ public void setup() {
         pipelineDefinition = Mockito.mock(PipelineDefinition.class);
 
         startNode = Mockito.mock(PipelineDefinitionNode.class);
-        startNodeName = Mockito.mock(ModuleName.class);
-        Mockito.when(startNode.getModuleName()).thenReturn(startNodeName);
-        Mockito.when(startNodeName.getName()).thenReturn(START_NODE_NAME);
+        Mockito.when(startNode.getModuleName()).thenReturn(START_NODE_NAME);
 
         endNode = Mockito.mock(PipelineDefinitionNode.class);
-        endNodeName = Mockito.mock(ModuleName.class);
-        Mockito.when(endNode.getModuleName()).thenReturn(endNodeName);
-        Mockito.when(endNodeName.getName()).thenReturn(END_NODE_NAME);
+        Mockito.when(endNode.getModuleName()).thenReturn(END_NODE_NAME);
 
         Mockito.when(pipelineDefinitionCrud.retrieveLatestVersionForName(PIPELINE_NAME))
             .thenReturn(pipelineDefinition);
@@ -104,7 +97,6 @@ public void setup() {
         Mockito.when(pipelineInstanceCrud.retrieve(25L)).thenReturn(instance3);
 
         taskList.add(task0);
-
     }
 
     @After
@@ -120,8 +112,8 @@ public void teardown() {
     public void testInitialize() {
 
         // Finite number of repeats
-        WorkerFireTriggerRequest wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME,
-            startNode, endNode, 50, 100);
+        FireTriggerRequest wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode,
+            endNode, 50, 100);
         assertEquals(PIPELINE_NAME, wftr.getPipelineName());
         assertEquals(INSTANCE_NAME, wftr.getInstanceName());
         assertEquals(START_NODE_NAME, wftr.getStartNodeName());
@@ -137,8 +129,7 @@ public void testInitialize() {
         assertEquals(100000L, pipelineInstanceManager.getRepeatIntervalMillis());
 
         // Effectively infinite number of repeats
-        wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode, endNode, -1,
-            100);
+        wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode, endNode, -1, 100);
         pipelineInstanceManager.initialize(wftr);
         assertEquals(Integer.MAX_VALUE, pipelineInstanceManager.getMaxRepeats());
     }
@@ -149,15 +140,15 @@ public void testInitialize() {
     @Test
     public void testFireTriggerOnceAndSucceed() {
 
-        WorkerFireTriggerRequest wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME,
-            startNode, endNode, 1, 100);
+        FireTriggerRequest wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode,
+            endNode, 1, 100);
         pipelineInstanceManager.initialize(wftr);
 
         Mockito
             .when(pipelineOperations.fireTrigger(ArgumentMatchers.any(PipelineDefinition.class),
                 ArgumentMatchers.anyString(), ArgumentMatchers.any(PipelineDefinitionNode.class),
-                ArgumentMatchers.any(PipelineDefinitionNode.class)))
-            .thenReturn(new InstanceAndTasks(instance0, taskList));
+                ArgumentMatchers.any(PipelineDefinitionNode.class), ArgumentMatchers.isNull()))
+            .thenReturn(instance0);
         pipelineInstanceManager.fireTrigger();
 
         // Check that the resulting single execution of the fireTrigger() in the PipelineOperations
@@ -166,8 +157,7 @@ public void testFireTriggerOnceAndSucceed() {
         assertEquals(1, pipelineInstanceManager.getRepeats());
         assertEquals(0, pipelineInstanceManager.getStatusChecks());
         Mockito.verify(pipelineOperations, Mockito.times(1))
-            .fireTrigger(pipelineDefinition, INSTANCE_NAME, startNode, endNode);
-        Mockito.verify(pipelineOperations, Mockito.times(1)).sendWorkerMessageForTask(task0);
+            .fireTrigger(pipelineDefinition, INSTANCE_NAME, startNode, endNode, null);
     }
 
     /**
@@ -177,19 +167,19 @@ public void testFireTriggerOnceAndSucceed() {
     @Test
     public void testFireTriggerMultipleTimesAndSucceed() {
 
-        WorkerFireTriggerRequest wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME,
-            startNode, endNode, 4, 0);
+        FireTriggerRequest wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode,
+            endNode, 4, 0);
         pipelineInstanceManager.initialize(wftr);
 
         // Set up the returns from the PipelineOperations fireTrigger() calls
         Mockito
             .when(pipelineOperations.fireTrigger(ArgumentMatchers.any(PipelineDefinition.class),
                 ArgumentMatchers.anyString(), ArgumentMatchers.any(PipelineDefinitionNode.class),
-                ArgumentMatchers.any(PipelineDefinitionNode.class)))
-            .thenReturn(new InstanceAndTasks(instance0, taskList))
-            .thenReturn(new InstanceAndTasks(instance1, taskList))
-            .thenReturn(new InstanceAndTasks(instance2, taskList))
-            .thenReturn(new InstanceAndTasks(instance3, taskList));
+                ArgumentMatchers.any(PipelineDefinitionNode.class), ArgumentMatchers.isNull()))
+            .thenReturn(instance0)
+            .thenReturn(instance1)
+            .thenReturn(instance2)
+            .thenReturn(instance3);
 
         // set the wait states to something tiny so that we don't need hours to run this
         Mockito.when(pipelineInstanceManager.checkAgainIntervalMillis()).thenReturn(10L);
@@ -201,14 +191,13 @@ public void testFireTriggerMultipleTimesAndSucceed() {
         assertEquals(4, pipelineInstanceManager.getRepeats());
         assertEquals(3, pipelineInstanceManager.getStatusChecks());
         Mockito.verify(pipelineOperations, Mockito.times(1))
-            .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-0", startNode, endNode);
+            .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-0", startNode, endNode, null);
         Mockito.verify(pipelineOperations, Mockito.times(1))
-            .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-1", startNode, endNode);
+            .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-1", startNode, endNode, null);
         Mockito.verify(pipelineOperations, Mockito.times(1))
-            .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-2", startNode, endNode);
+            .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-2", startNode, endNode, null);
         Mockito.verify(pipelineOperations, Mockito.times(1))
-            .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-3", startNode, endNode);
-
+            .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-3", startNode, endNode, null);
     }
 
     /**
@@ -217,19 +206,19 @@ public void testFireTriggerMultipleTimesAndSucceed() {
     @Test
     public void testFireTriggerMultipleTimesWithErrorsRunning() {
 
-        WorkerFireTriggerRequest wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME,
-            startNode, endNode, 4, 0);
+        FireTriggerRequest wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode,
+            endNode, 4, 0);
         pipelineInstanceManager.initialize(wftr);
 
         // Set up the returns from the PipelineOperations fireTrigger() calls
         Mockito
             .when(pipelineOperations.fireTrigger(ArgumentMatchers.any(PipelineDefinition.class),
                 ArgumentMatchers.anyString(), ArgumentMatchers.any(PipelineDefinitionNode.class),
-                ArgumentMatchers.any(PipelineDefinitionNode.class)))
-            .thenReturn(new InstanceAndTasks(instance0, taskList))
-            .thenReturn(new InstanceAndTasks(instance1, taskList))
-            .thenReturn(new InstanceAndTasks(instance2, taskList))
-            .thenReturn(new InstanceAndTasks(instance3, taskList));
+                ArgumentMatchers.any(PipelineDefinitionNode.class), ArgumentMatchers.isNull()))
+            .thenReturn(instance0)
+            .thenReturn(instance1)
+            .thenReturn(instance2)
+            .thenReturn(instance3);
 
         // set the wait states to something tiny so that we don't need hours to run this
         Mockito.when(pipelineInstanceManager.checkAgainIntervalMillis()).thenReturn(10L);
@@ -239,7 +228,7 @@ public void testFireTriggerMultipleTimesWithErrorsRunning() {
         Mockito.when(instance1.getState()).thenReturn(PipelineInstance.State.ERRORS_RUNNING);
 
         // Set up to detect the exception
-        assertThrows("Unable to start pipeline repeat 2 due to errored status of pipeline repeat 1",
+        ModuleFatalProcessingException exception = assertThrows(
             ModuleFatalProcessingException.class, () -> {
                 // And -- go!
                 pipelineInstanceManager.fireTrigger();
@@ -247,14 +236,20 @@ public void testFireTriggerMultipleTimesWithErrorsRunning() {
                 assertEquals(2, pipelineInstanceManager.getRepeats());
                 assertEquals(2, pipelineInstanceManager.getStatusChecks());
                 Mockito.verify(pipelineOperations, Mockito.times(1))
-                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-0", startNode, endNode);
+                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-0", startNode, endNode,
+                        null);
                 Mockito.verify(pipelineOperations, Mockito.times(1))
-                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-1", startNode, endNode);
+                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-1", startNode, endNode,
+                        null);
                 Mockito.verify(pipelineOperations, Mockito.times(0))
-                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-2", startNode, endNode);
+                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-2", startNode, endNode,
+                        null);
                 Mockito.verify(pipelineOperations, Mockito.times(0))
-                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-3", startNode, endNode);
+                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-3", startNode, endNode,
+                        null);
             });
+        assertEquals(exception.getMessage(),
+            "Unable to start pipeline repeat 2 due to errored status of pipeline repeat 1");
     }
 
     /**
@@ -263,19 +258,19 @@ public void testFireTriggerMultipleTimesWithErrorsRunning() {
     @Test
     public void testFireTriggerMultipleTimesWithErrorsStalled() {
 
-        WorkerFireTriggerRequest wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME,
-            startNode, endNode, 4, 0);
+        FireTriggerRequest wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode,
+            endNode, 4, 0);
         pipelineInstanceManager.initialize(wftr);
 
         // Set up the returns from the PipelineOperations fireTrigger() calls
         Mockito
             .when(pipelineOperations.fireTrigger(ArgumentMatchers.any(PipelineDefinition.class),
                 ArgumentMatchers.anyString(), ArgumentMatchers.any(PipelineDefinitionNode.class),
-                ArgumentMatchers.any(PipelineDefinitionNode.class)))
-            .thenReturn(new InstanceAndTasks(instance0, taskList))
-            .thenReturn(new InstanceAndTasks(instance1, taskList))
-            .thenReturn(new InstanceAndTasks(instance2, taskList))
-            .thenReturn(new InstanceAndTasks(instance3, taskList));
+                ArgumentMatchers.any(PipelineDefinitionNode.class), ArgumentMatchers.isNull()))
+            .thenReturn(instance0)
+            .thenReturn(instance1)
+            .thenReturn(instance2)
+            .thenReturn(instance3);
 
         // set the wait states to something tiny so that we don't need hours to run this
         Mockito.when(pipelineInstanceManager.checkAgainIntervalMillis()).thenReturn(10L);
@@ -285,7 +280,7 @@ public void testFireTriggerMultipleTimesWithErrorsStalled() {
         Mockito.when(instance1.getState()).thenReturn(PipelineInstance.State.ERRORS_STALLED);
 
         // Set up to detect the exception
-        assertThrows("Unable to start pipeline repeat 2 due to errored status of pipeline repeat 1",
+        ModuleFatalProcessingException exception = assertThrows(
             ModuleFatalProcessingException.class, () -> {
 
                 // And -- go!
@@ -294,14 +289,20 @@ public void testFireTriggerMultipleTimesWithErrorsStalled() {
                 assertEquals(2, pipelineInstanceManager.getRepeats());
                 assertEquals(2, pipelineInstanceManager.getStatusChecks());
                 Mockito.verify(pipelineOperations, Mockito.times(1))
-                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-0", startNode, endNode);
+                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-0", startNode, endNode,
+                        null);
                 Mockito.verify(pipelineOperations, Mockito.times(1))
-                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-1", startNode, endNode);
+                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-1", startNode, endNode,
+                        null);
                 Mockito.verify(pipelineOperations, Mockito.times(0))
-                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-2", startNode, endNode);
+                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-2", startNode, endNode,
+                        null);
                 Mockito.verify(pipelineOperations, Mockito.times(0))
-                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-3", startNode, endNode);
+                    .fireTrigger(pipelineDefinition, INSTANCE_NAME + ":-3", startNode, endNode,
+                        null);
             });
+        assertEquals("Unable to start pipeline repeat 2 due to errored status of pipeline repeat 1",
+            exception.getMessage());
     }
 
     /**
@@ -312,27 +313,25 @@ public void testIntervals() {
 
         // For a long requested interval, the check again and log message intervals should be 15
         // minutes
-        WorkerFireTriggerRequest wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME,
-            startNode, endNode, 4, 10000);
+        FireTriggerRequest wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode,
+            endNode, 4, 10000);
         pipelineInstanceManager.initialize(wftr);
         assertEquals(15 * 60 * 1000, pipelineInstanceManager.checkAgainIntervalMillis());
         assertEquals(15 * 60 * 1000, pipelineInstanceManager.keepAliveLogMsgIntervalMillis());
 
         // For a short requested interval, the check again and log message intervals should be
         // equal to the requested interval
-        wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode, endNode, 4,
-            60);
+        wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode, endNode, 4, 60);
         pipelineInstanceManager.initialize(wftr);
         assertEquals(60 * 1000, pipelineInstanceManager.checkAgainIntervalMillis());
         assertEquals(60 * 1000, pipelineInstanceManager.keepAliveLogMsgIntervalMillis());
 
         // For a zero requested interval the check again and log message intervals should be
         // equal to 1 second
-        wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode, endNode, 4, 0);
+        wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode, endNode, 4, 0);
         pipelineInstanceManager.initialize(wftr);
         assertEquals(1000, pipelineInstanceManager.checkAgainIntervalMillis());
         assertEquals(1000, pipelineInstanceManager.keepAliveLogMsgIntervalMillis());
-
     }
 
     /**
@@ -341,8 +340,8 @@ public void testIntervals() {
      */
     @Test
     public void testWaiting() {
-        WorkerFireTriggerRequest wftr = new WorkerFireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME,
-            startNode, endNode, 2, 0);
+        FireTriggerRequest wftr = new FireTriggerRequest(PIPELINE_NAME, INSTANCE_NAME, startNode,
+            endNode, 2, 0);
         pipelineInstanceManager.initialize(wftr);
 
         // We want to have a 75 millisecond interval between runs, plus a 10 millisecond interval
@@ -360,9 +359,9 @@ public void testWaiting() {
         Mockito
             .when(pipelineOperations.fireTrigger(ArgumentMatchers.any(PipelineDefinition.class),
                 ArgumentMatchers.anyString(), ArgumentMatchers.any(PipelineDefinitionNode.class),
-                ArgumentMatchers.any(PipelineDefinitionNode.class)))
-            .thenReturn(new InstanceAndTasks(instance0, taskList))
-            .thenReturn(new InstanceAndTasks(instance1, taskList));
+                ArgumentMatchers.any(PipelineDefinitionNode.class), ArgumentMatchers.isNull()))
+            .thenReturn(instance0)
+            .thenReturn(instance1);
 
         long startTimeMillis = System.currentTimeMillis();
         pipelineInstanceManager.fireTrigger();
@@ -371,7 +370,5 @@ public void testWaiting() {
 
         // Make the interval long enough to tolerate some overhead time
         assertTrue(dt > 85 && dt <= 105);
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/worker/TaskFileCopyTest.java b/src/test/java/gov/nasa/ziggy/supervisor/TaskFileCopyTest.java
similarity index 94%
rename from src/test/java/gov/nasa/ziggy/worker/TaskFileCopyTest.java
rename to src/test/java/gov/nasa/ziggy/supervisor/TaskFileCopyTest.java
index 56c09c8..ce92a5e 100644
--- a/src/test/java/gov/nasa/ziggy/worker/TaskFileCopyTest.java
+++ b/src/test/java/gov/nasa/ziggy/supervisor/TaskFileCopyTest.java
@@ -1,7 +1,7 @@
-package gov.nasa.ziggy.worker;
+package gov.nasa.ziggy.supervisor;
 
 import static gov.nasa.ziggy.ZiggyUnitTestUtils.TEST_DATA;
-import static gov.nasa.ziggy.services.config.PropertyNames.RESULTS_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.RESULTS_DIR;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -26,8 +26,8 @@ public class TaskFileCopyTest {
         .resolve("src")
         .toString();
 
-    private static final int PIPELINE_INSTANCE_ID = 17;
-    private static final int PIPELINE_TASK_ID = 65;
+    private static final long PIPELINE_INSTANCE_ID = 17;
+    private static final long PIPELINE_TASK_ID = 65;
 
     private static final String TASK_DIR_NAME = PIPELINE_INSTANCE_ID + "-" + PIPELINE_TASK_ID
         + "-debug";
@@ -39,7 +39,7 @@ public class TaskFileCopyTest {
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
-    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR_PROP_NAME,
+    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR,
         directoryRule);
 
     @Rule
@@ -125,6 +125,5 @@ public void doTestCopy(String[] excludeWildcards, boolean deleteAfterCopy) throw
         } else {
             assertTrue("workingDir exist = TRUE", workingDir.exists());
         }
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/supervisor/TaskRequestHandlerLifecycleManagerTest.java b/src/test/java/gov/nasa/ziggy/supervisor/TaskRequestHandlerLifecycleManagerTest.java
new file mode 100644
index 0000000..40688a5
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/supervisor/TaskRequestHandlerLifecycleManagerTest.java
@@ -0,0 +1,314 @@
+package gov.nasa.ziggy.supervisor;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+
+import gov.nasa.ziggy.TestEventDetector;
+import gov.nasa.ziggy.pipeline.PipelineExecutor;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance;
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.Priority;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
+import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrud;
+import gov.nasa.ziggy.services.alert.AlertService;
+import gov.nasa.ziggy.services.database.DatabaseService;
+import gov.nasa.ziggy.services.messages.TaskRequest;
+import gov.nasa.ziggy.services.messages.WorkerResources;
+
+/**
+ * Unit tests for {@link TaskRequestHandlerLifecycleManager} class.
+ *
+ * @author PT
+ */
+public class TaskRequestHandlerLifecycleManagerTest {
+
+    private InstrumentedTaskRequestHandlerLifecycleManager lifecycleManager;
+    private Thread taskRequestLoopThread;
+
+    @Before
+    public void setUp() throws InterruptedException {
+        DatabaseService.setInstance(Mockito.mock(DatabaseService.class));
+
+        // Use the InstrumentedTaskRequestHandlerLifecycleManager class so we can supply a desired
+        // worker count directly.
+        lifecycleManager = new InstrumentedTaskRequestHandlerLifecycleManager();
+        lifecycleManager.setMaxWorkers(1);
+        taskRequestLoopThread = new Thread(() -> {
+            lifecycleManager.start();
+        });
+        taskRequestLoopThread.setDaemon(true);
+    }
+
+    @After
+    public void tearDown() throws InterruptedException {
+        lifecycleManager.shutdown();
+        taskRequestLoopThread.interrupt();
+        TestEventDetector.detectTestEvent(500L,
+            () -> lifecycleManager.getTaskRequestThreadPool() == null);
+        lifecycleManager = null;
+        DatabaseService.reset();
+    }
+
+    /**
+     * Tests that the constructor and startup work correctly, to wit:
+     * <ol>
+     * <li>The executor service and loop thread start correctly.
+     * <li>The executor service has the correct number of task request handler threads.
+     * <li>The correct pipeline definition node ID is stored.
+     * <li>The countdown latch is present and in the correct state.
+     * <li>The loop thread is waiting for new task requests.
+     * </ol>
+     */
+    @Test
+    public void testStart() {
+
+        List<List<TaskRequestHandler>> allTaskRequestHandlers = lifecycleManager
+            .getTaskRequestHandlers();
+        taskRequestLoopThread.start();
+
+        // Right out of the box there should be no task request handlers and no executor
+        // for handlers.
+        assertEquals(0, allTaskRequestHandlers.size());
+        assertNull(lifecycleManager.getTaskRequestThreadCountdownLatch());
+        assertEquals(0, lifecycleManager.taskRequestSize());
+        assertNull(lifecycleManager.getPipelineDefinitionNodeId());
+
+        // Add a task to the queue and wait for it to get handled.
+        lifecycleManager.addTaskRequestToQueue(new TaskRequest(1L, 1L, -1L, 1L,
+            PipelineInstance.Priority.NORMAL, false, PipelineModule.RunMode.STANDARD));
+        TestEventDetector.detectTestEvent(500L, () -> allTaskRequestHandlers.size() > 0);
+        // There should be one set of task request handlers constructed, with 1 handler in the set.
+        assertEquals(1, allTaskRequestHandlers.size());
+        List<TaskRequestHandler> taskRequestHandlers = allTaskRequestHandlers.get(0);
+        assertEquals(1, taskRequestHandlers.size());
+        TaskRequestHandler taskRequestHandler = taskRequestHandlers.get(0);
+
+        // The handler should have handled 1 task request.
+
+        TestEventDetector.detectTestEvent(500L,
+            () -> taskRequestHandler.getTaskRequests().size() > 0);
+        Set<TaskRequest> taskRequests = taskRequestHandler.getTaskRequests();
+        assertEquals(1, taskRequests.size());
+        TaskRequest taskRequest = taskRequests.iterator().next();
+        assertEquals(-1L, taskRequest.getPipelineDefinitionNodeId());
+
+        // The manager should have the correct pipeline instance ID.
+        assertEquals(-1L, lifecycleManager.getPipelineDefinitionNodeId().longValue());
+
+        // The countdown latch itself should still have a nonzero count.
+        CountDownLatch countdownLatch = lifecycleManager.getTaskRequestThreadCountdownLatch();
+        assertNotNull(countdownLatch);
+        assertEquals(1, countdownLatch.getCount());
+
+        // There should still be a running executor service.
+        assertNotNull(lifecycleManager.getTaskRequestThreadPool());
+        assertFalse(lifecycleManager.getTaskRequestThreadPool().isShutdown());
+    }
+
+    /**
+     * Tests that the shutdown system for the manager works correctly, to wit:
+     * <ol>
+     * <li>The thread pool is shut down and nullified.
+     * </ol>
+     */
+    @Test
+    public void testShutdown() {
+
+        taskRequestLoopThread.start();
+        lifecycleManager.addTaskRequestToQueue(new TaskRequest(1L, 1L, -1L, 1L,
+            PipelineInstance.Priority.NORMAL, false, PipelineModule.RunMode.STANDARD));
+        TestEventDetector.detectTestEvent(500L,
+            () -> lifecycleManager.getTaskRequestHandlers().size() > 0);
+        ExecutorService executorService = lifecycleManager.getTaskRequestThreadPool();
+        lifecycleManager.shutdown();
+
+        // The thread pool should be shut down and nullified.
+        assertTrue(TestEventDetector.detectTestEvent(500L,
+            () -> lifecycleManager.getTaskRequestThreadPool() == null));
+        assertTrue(executorService.isShutdown());
+    }
+
+    /**
+     * Tests the transition from one pipeline definition node ID to another. Specifically:
+     * <ol>
+     * <li>The original thread pool is shut down and replaced.
+     * <li>The new thread pool has the correct number of threads.
+     * <li>All the task requests have been picked up by a task request handler.
+     * <li>Each task is picked up by the correct task request handler.
+     * <li>The lifecycle manager's pipeline definition node ID is updated.
+     * <ol>
+     */
+    @Test
+    public void testDefinitionNodeTransition() {
+
+        taskRequestLoopThread.start();
+        List<List<TaskRequestHandler>> allTaskRequestHandlers = lifecycleManager
+            .getTaskRequestHandlers();
+
+        lifecycleManager.addTaskRequestToQueue(new TaskRequest(1L, 1L, -1L, 1L,
+            PipelineInstance.Priority.NORMAL, false, PipelineModule.RunMode.STANDARD));
+        TestEventDetector.detectTestEvent(500L, () -> allTaskRequestHandlers.size() > 0);
+
+        ExecutorService threadPool = lifecycleManager.getTaskRequestThreadPool();
+        assertTrue(TestEventDetector.detectTestEvent(500L,
+            () -> lifecycleManager.getPipelineDefinitionNodeId() == -1L));
+
+        // Create some task requests
+        TaskRequest t1 = new TaskRequest(0, 0, -2, 1, Priority.NORMAL, false, RunMode.STANDARD);
+        TaskRequest t2 = new TaskRequest(0, 0, -2, 2, Priority.NORMAL, false, RunMode.STANDARD);
+        TaskRequest t3 = new TaskRequest(0, 0, -2, 3, Priority.NORMAL, false, RunMode.STANDARD);
+
+        lifecycleManager.setMaxWorkers(2);
+
+        // Pop the task requests into the queue
+        lifecycleManager.addTaskRequestToQueue(t1);
+        lifecycleManager.addTaskRequestToQueue(t2);
+        lifecycleManager.addTaskRequestToQueue(t3);
+
+        // Wait for all the tasks to get pulled into task request dispatchers
+        assertTrue(
+            TestEventDetector.detectTestEvent(500L, () -> lifecycleManager.taskRequestSize() == 0));
+
+        // The definition node ID should have changed.
+        assertTrue(TestEventDetector.detectTestEvent(500L,
+            () -> lifecycleManager.getPipelineDefinitionNodeId() != null
+                && lifecycleManager.getPipelineDefinitionNodeId() == -2L));
+
+        // The thread pool executor should be different.
+        assertTrue(TestEventDetector.detectTestEvent(100L,
+            () -> threadPool != lifecycleManager.getTaskRequestThreadPool()));
+
+        // Get the ensemble of TaskRequestHandler instances.
+        assertTrue(
+            TestEventDetector.detectTestEvent(500L, () -> allTaskRequestHandlers.size() == 2));
+
+        // The first list should have 1 handler which handled 1 task request,
+        // the first request.
+        List<TaskRequestHandler> handlers = allTaskRequestHandlers.get(0);
+        assertEquals(1, handlers.size());
+        Set<TaskRequest> taskRequests = handlers.get(0).getTaskRequests();
+        assertEquals(1, taskRequests.size());
+        TaskRequest taskRequest = taskRequests.iterator().next();
+        assertEquals(-1L, taskRequest.getPipelineDefinitionNodeId());
+
+        // The second list should have 2 handlers which between them handled 3 task
+        // requests, the ones for pipeline definition node ID == -2.
+        handlers = allTaskRequestHandlers.get(1);
+        assertEquals(2, handlers.size());
+        final List<TaskRequestHandler> finalHandlers = new ArrayList<>(handlers);
+        assertTrue(
+            TestEventDetector.detectTestEvent(500L, () -> taskRequestCount(finalHandlers) == 3));
+
+        taskRequests = new HashSet<>(handlers.get(0).getTaskRequests());
+        taskRequests.addAll(handlers.get(1).getTaskRequests());
+        assertTrue(taskRequests.contains(t1));
+        assertTrue(taskRequests.contains(t2));
+        assertTrue(taskRequests.contains(t3));
+    }
+
+    private int taskRequestCount(List<TaskRequestHandler> taskRequestHandlers) {
+        int taskRequestCount = 0;
+        for (TaskRequestHandler handler : taskRequestHandlers) {
+            taskRequestCount += handler.getTaskRequests().size();
+        }
+        return taskRequestCount;
+    }
+
+    /**
+     * Tests removal of task requests from the queue:
+     * <ol>
+     * <li>Task IDs in the request list that aren't in the task request queue are ignored.
+     * <li>Only tasks that are common to the task request queue and the task ID list are removed
+     * from the queue.
+     * </ol>
+     */
+    @Test
+    public void testRemoveRequestsFromQueue() {
+
+        // Shut off the task request handler threads so that the tasks don't instantly fly
+        // out of the queue.
+        assertTrue(
+            TestEventDetector.detectTestEvent(500L, () -> lifecycleManager.taskRequestSize() == 0));
+
+        // Put some tasks into the queue.
+        lifecycleManager.addTaskRequestToQueue(
+            new TaskRequest(0, 0, -2, 1, Priority.NORMAL, false, RunMode.STANDARD));
+        lifecycleManager.addTaskRequestToQueue(
+            new TaskRequest(0, 0, -2, 2, Priority.NORMAL, false, RunMode.STANDARD));
+        lifecycleManager.addTaskRequestToQueue(
+            new TaskRequest(0, 0, -2, 3, Priority.NORMAL, false, RunMode.STANDARD));
+
+        // Check that the tasks stayed put
+        assertEquals(3, lifecycleManager.taskRequestSize());
+
+        // Remove two of the tasks, and try to remove one that isn't even in there.
+        lifecycleManager.killQueuedTasksAction(List.of(1L, 3L, 4L));
+        assertEquals(1, lifecycleManager.taskRequestSize());
+        assertEquals(2, lifecycleManager.taskRequestQueuePeek().getTaskId());
+    }
+
+    /**
+     * Subclass of {@link TaskRequestHandlerLifecycleManager} that allows the user to set the number
+     * of workers to be provided the next time the workers get destroyed and recreated.
+     *
+     * @author PT
+     */
+    public static class InstrumentedTaskRequestHandlerLifecycleManager
+        extends TaskRequestHandlerLifecycleManager {
+
+        private int maxWorkers;
+        private boolean taskRequestSent;
+
+        public InstrumentedTaskRequestHandlerLifecycleManager() {
+            super(true);
+            taskRequestSent = true;
+        }
+
+        public void setMaxWorkers(int maxWorkers) {
+            this.maxWorkers = maxWorkers;
+        }
+
+        @Override
+        WorkerResources workerResources(TaskRequest taskRequest) {
+            return new WorkerResources(maxWorkers, 1);
+        }
+
+        public boolean isTaskRequestSent() {
+            return taskRequestSent;
+        }
+
+        @Override
+        protected PipelineTaskCrud pipelineTaskCrud() {
+            PipelineTaskCrud pipelineTaskCrud = Mockito.mock(PipelineTaskCrud.class);
+            Mockito.when(pipelineTaskCrud.retrieveAll(ArgumentMatchers.<Long> anyList()))
+                .thenReturn(new ArrayList<>());
+            return pipelineTaskCrud;
+        }
+
+        @Override
+        protected PipelineExecutor pipelineExecutor() {
+            return Mockito.mock(PipelineExecutor.class);
+        }
+
+        @Override
+        protected AlertService alertService() {
+            return Mockito.mock(AlertService.class);
+        }
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/supervisor/WorkerTaskPriorityTest.java b/src/test/java/gov/nasa/ziggy/supervisor/WorkerTaskPriorityTest.java
new file mode 100644
index 0000000..54cd7e8
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/supervisor/WorkerTaskPriorityTest.java
@@ -0,0 +1,44 @@
+package gov.nasa.ziggy.supervisor;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.concurrent.PriorityBlockingQueue;
+
+import org.junit.Test;
+
+import gov.nasa.ziggy.pipeline.definition.PipelineInstance.Priority;
+import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
+import gov.nasa.ziggy.services.messages.TaskRequest;
+
+/**
+ * Tests to ensure that task priority is correctly managed.
+ *
+ * @author PT
+ */
+public class WorkerTaskPriorityTest {
+
+    @Test
+    public void testTaskPrioritization() throws InterruptedException {
+
+        PriorityBlockingQueue<TaskRequest> queue = new PriorityBlockingQueue<>();
+        TaskRequest w1 = new TaskRequest(100, 100, 70, 5, Priority.LOWEST, false, RunMode.STANDARD);
+        TaskRequest w2 = new TaskRequest(100, 100, 70, 7, Priority.HIGHEST, false,
+            RunMode.STANDARD);
+        TaskRequest w3 = new TaskRequest(100, 100, 70, 6, Priority.LOWEST, false, RunMode.STANDARD);
+        TaskRequest w4 = new TaskRequest(100, 100, 69, 10, Priority.LOWEST, false,
+            RunMode.STANDARD);
+
+        // Add the tasks in inverse-task-ID order
+        queue.add(w4);
+        queue.add(w2);
+        queue.add(w3);
+        queue.add(w1);
+
+        // Retrieve the tasks and check their ordering
+
+        assertEquals(w4, queue.take());
+        assertEquals(w2, queue.take());
+        assertEquals(w1, queue.take());
+        assertEquals(w3, queue.take());
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/ui/status/WorkerStatusTableModelTest.java b/src/test/java/gov/nasa/ziggy/ui/status/WorkerStatusTableModelTest.java
new file mode 100644
index 0000000..444c313
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/ui/status/WorkerStatusTableModelTest.java
@@ -0,0 +1,197 @@
+package gov.nasa.ziggy.ui.status;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+
+import java.util.Iterator;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import gov.nasa.ziggy.services.messages.WorkerStatusMessage;
+import gov.nasa.ziggy.ui.status.WorkerStatusPanel.WorkerStatusTableModel;
+
+/**
+ * Unit tests for {@link WorkerStatusTableModel} class.
+ *
+ * @author PT
+ */
+public class WorkerStatusTableModelTest {
+
+    private WorkerStatusTableModel tableModel;
+
+    @Before
+    public void setUp() {
+
+        // Set up a table model that doesn't try to redraw the (non existent) table.
+        tableModel = Mockito.spy(WorkerStatusTableModel.class);
+        Mockito.doNothing().when(tableModel).redrawTable();
+    }
+
+    @Test
+    public void testAddMessage() {
+
+        // The model starts out empty.
+        assertTrue(tableModel.statusMessages().isEmpty());
+        assertTrue(tableModel.messageSet().isEmpty());
+
+        // Add a not-final-message message.
+        WorkerStatusMessage message = new WorkerStatusMessage(1, "awesome", "2", "3", "dummy",
+            "single", 1234L, false);
+        tableModel.updateModel(message);
+
+        // There should be a message in the Map and in the Set.
+        assertEquals(1, tableModel.statusMessages().size());
+        assertEquals(1, tableModel.messageSet().size());
+
+        // The Map message should be up to date.
+        assertTrue(tableModel.statusMessages().get(message));
+
+        // The model should have called the redrawTable() method once.
+        Mockito.verify(tableModel, times(1)).redrawTable();
+    }
+
+    @Test
+    public void testReplaceMessage() {
+
+        // Add a not-final-message message.
+        WorkerStatusMessage message = new WorkerStatusMessage(1, "awesome", "2", "3", "dummy",
+            "single", 1234L, false);
+        tableModel.updateModel(message);
+
+        // Add another message for the same task
+        message = new WorkerStatusMessage(1, "more awesome", "2", "3", "dummy", "single", 5678L,
+            false);
+        tableModel.updateModel(message);
+
+        // There should be a message in the Map and in the Set.
+        assertEquals(1, tableModel.statusMessages().size());
+        assertEquals(1, tableModel.messageSet().size());
+
+        // The second message should be the one that's in the Map and the Set
+        Iterator<WorkerStatusMessage> messageIterator = tableModel.statusMessages()
+            .keySet()
+            .iterator();
+        message = messageIterator.next();
+        assertEquals("more awesome", message.getState());
+        messageIterator = tableModel.messageSet().iterator();
+        message = messageIterator.next();
+        assertEquals("more awesome", message.getState());
+
+        // There should be two calls to redraw the table
+        Mockito.verify(tableModel, times(2)).redrawTable();
+    }
+
+    @Test
+    public void testFinalMessage() {
+
+        // Add a not-final-message message.
+        WorkerStatusMessage message = new WorkerStatusMessage(1, "awesome", "2", "3", "dummy",
+            "single", 1234L, false);
+        tableModel.updateModel(message);
+
+        // Send a final message for the same task.
+        message = new WorkerStatusMessage(1, "more awesome", "2", "3", "dummy", "single", 5678L,
+            true);
+        tableModel.updateModel(message);
+
+        // The model should now be empty.
+        assertTrue(tableModel.statusMessages().isEmpty());
+        assertTrue(tableModel.messageSet().isEmpty());
+
+        // There should be two calls to redraw the table.
+        Mockito.verify(tableModel, times(2)).redrawTable();
+    }
+
+    @Test
+    public void testMessageOrdering() {
+
+        // Add a not-final-message message.
+        WorkerStatusMessage message = new WorkerStatusMessage(1, "awesome", "2", "3", "dummy",
+            "single", 1234L, false);
+        tableModel.updateModel(message);
+
+        // Add a message for a task with a lower number.
+        message = new WorkerStatusMessage(1, "awesome", "2", "2", "dummy", "single", 1234L, false);
+        tableModel.updateModel(message);
+
+        // There should be 2 messages in the model.
+        assertEquals(2, tableModel.statusMessages().size());
+        assertEquals(2, tableModel.messageSet().size());
+
+        // The second message to be added should be first when iterating over the model.
+        Iterator<WorkerStatusMessage> messageIterator = tableModel.messageSet().iterator();
+        message = messageIterator.next();
+        assertEquals("2", message.getTaskId());
+        message = messageIterator.next();
+        assertEquals("3", message.getTaskId());
+    }
+
+    @Test
+    public void testMessageOutdating() {
+
+        // Add a not-final-message message.
+        WorkerStatusMessage message = new WorkerStatusMessage(1, "awesome", "2", "3", "dummy",
+            "single", 1234L, false);
+        tableModel.updateModel(message);
+
+        // On the first call, the message should be marked as outdated.
+        tableModel.removeOutdatedMessages();
+        assertEquals(1, tableModel.statusMessages().size());
+        assertFalse(tableModel.statusMessages().get(message));
+
+        // On the second call, the message should be gone.
+        tableModel.removeOutdatedMessages();
+        assertTrue(tableModel.statusMessages().isEmpty());
+        assertTrue(tableModel.messageSet().isEmpty());
+
+        // There should be two calls to redraw the table.
+        Mockito.verify(tableModel, times(2)).redrawTable();
+    }
+
+    @Test
+    public void testMessageLifeCycle() {
+
+        // Add a not-final-message message.
+        WorkerStatusMessage message = new WorkerStatusMessage(1, "awesome", "2", "3", "dummy",
+            "single", 1234L, false);
+        tableModel.updateModel(message);
+
+        assertEquals(1, tableModel.statusMessages().size());
+        assertTrue(tableModel.statusMessages().get(message));
+        Mockito.verify(tableModel, times(1)).redrawTable();
+
+        // Update the message up-to-date flag (emulates a reaction to heartbeat detection).
+        // Note that we don't redraw the table when we're just marking messages as out of date.
+        tableModel.removeOutdatedMessages();
+        assertEquals(1, tableModel.statusMessages().size());
+        assertFalse(tableModel.statusMessages().get(message));
+        Mockito.verify(tableModel, times(1)).redrawTable();
+
+        // Send a new message from the same task.
+        message = new WorkerStatusMessage(1, "more awesome", "2", "3", "dummy", "single", 1234L,
+            false);
+        tableModel.updateModel(message);
+        assertEquals(1, tableModel.statusMessages().size());
+        assertTrue(tableModel.statusMessages().get(message));
+        Mockito.verify(tableModel, times(2)).redrawTable();
+        Iterator<WorkerStatusMessage> messageIterator = tableModel.messageSet().iterator();
+        assertEquals("more awesome", messageIterator.next().getState());
+
+        // Update the message-up-to-date flag.
+        tableModel.removeOutdatedMessages();
+        assertEquals(1, tableModel.statusMessages().size());
+        assertFalse(tableModel.statusMessages().get(message));
+        Mockito.verify(tableModel, times(2)).redrawTable();
+
+        // Send a final message.
+        message = new WorkerStatusMessage(1, "more awesome", "2", "3", "dummy", "single", 1234L,
+            true);
+        tableModel.updateModel(message);
+        assertTrue(tableModel.statusMessages().isEmpty());
+        Mockito.verify(tableModel, times(3)).redrawTable();
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/ui/util/HtmlBuilderTest.java b/src/test/java/gov/nasa/ziggy/ui/util/HtmlBuilderTest.java
new file mode 100644
index 0000000..c37150f
--- /dev/null
+++ b/src/test/java/gov/nasa/ziggy/ui/util/HtmlBuilderTest.java
@@ -0,0 +1,63 @@
+package gov.nasa.ziggy.ui.util;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class HtmlBuilderTest {
+
+    @Test
+    public void testAppend() {
+        assertEquals("<html>foo bar</html>", new HtmlBuilder("foo ").append("bar").toString());
+    }
+
+    @Test
+    public void testAppendBold() {
+        assertEquals("<html>foo <b>bar</b></html>",
+            new HtmlBuilder("foo ").appendBold("bar").toString());
+    }
+
+    @Test
+    public void testAppendItalic() {
+        assertEquals("<html>foo <i>bar</i></html>",
+            new HtmlBuilder("foo ").appendItalic("bar").toString());
+    }
+
+    @Test
+    public void testAppendColor() {
+        assertEquals("<html>foo <font color=red>bar</font></html>",
+            new HtmlBuilder("foo ").appendColor("bar", "red").toString());
+    }
+
+    @Test
+    public void testAppendBoldColor() {
+        assertEquals("<html>foo <b><font color=red>bar</font></b></html>",
+            new HtmlBuilder("foo ").appendBoldColor("bar", "red").toString());
+    }
+
+    @Test
+    public void testAppendSize() {
+        assertEquals("<html>foo <font size=10>bar</font></html>",
+            new HtmlBuilder("foo ").appendSize("bar", 10).toString());
+    }
+
+    @Test
+    public void testAppendBreak() {
+        assertEquals("<html>foo <br/>bar</html>",
+            new HtmlBuilder("foo ").appendBreak().append("bar").toString());
+    }
+
+    @Test
+    public void testAppendCustomHtml() {
+        assertEquals("<html>foo <p>bar</p></html>",
+            new HtmlBuilder("foo ").appendCustomHtml("<p>", "bar", "</p>").toString());
+    }
+
+    @Test
+    public void testBuilderFactory() {
+        assertEquals("<html>foo bar</html>",
+            HtmlBuilder.htmlBuilder().append("foo bar").toString());
+        assertEquals("<html>foo bar</html>",
+            HtmlBuilder.htmlBuilder("foo ").append("bar").toString());
+    }
+}
diff --git a/src/test/java/gov/nasa/ziggy/uow/DataReceiptUnitOfWorkGeneratorTest.java b/src/test/java/gov/nasa/ziggy/uow/DataReceiptUnitOfWorkGeneratorTest.java
index f6569e1..7ea0458 100644
--- a/src/test/java/gov/nasa/ziggy/uow/DataReceiptUnitOfWorkGeneratorTest.java
+++ b/src/test/java/gov/nasa/ziggy/uow/DataReceiptUnitOfWorkGeneratorTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.uow;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATA_RECEIPT_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATA_RECEIPT_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -21,7 +21,7 @@
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.services.events.ZiggyEventLabels;
 
 /**
@@ -32,13 +32,13 @@
 public class DataReceiptUnitOfWorkGeneratorTest {
 
     private Path dataImporterPath;
-    Map<Class<? extends Parameters>, Parameters> parametersMap;
+    Map<Class<? extends ParametersInterface>, ParametersInterface> parametersMap;
     TaskConfigurationParameters taskConfig;
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
-    public ZiggyPropertyRule dataReceiptDirPropertyRule = new ZiggyPropertyRule(
-        DATA_RECEIPT_DIR_PROP_NAME, directoryRule, "data-import");
+    public ZiggyPropertyRule dataReceiptDirPropertyRule = new ZiggyPropertyRule(DATA_RECEIPT_DIR,
+        directoryRule, "data-import");
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
@@ -106,6 +106,5 @@ public void testEmptyEventLabels() {
             .generateTasks(parametersMap);
         assertEquals(1, unitsOfWork.size());
         assertEquals("", unitsOfWork.get(0).getParameter("directory").getString());
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/uow/DatastoreDirectoryUnitOfWorkTest.java b/src/test/java/gov/nasa/ziggy/uow/DatastoreDirectoryUnitOfWorkTest.java
index 3de7b99..1ee89f4 100644
--- a/src/test/java/gov/nasa/ziggy/uow/DatastoreDirectoryUnitOfWorkTest.java
+++ b/src/test/java/gov/nasa/ziggy/uow/DatastoreDirectoryUnitOfWorkTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.uow;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -19,7 +19,7 @@
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 
 /**
  * Unit test class for DefaultUnitOfWork.
@@ -29,13 +29,13 @@
 public class DatastoreDirectoryUnitOfWorkTest {
 
     private Path datastoreRoot;
-    private Map<Class<? extends Parameters>, Parameters> parametersMap;
+    private Map<Class<? extends ParametersInterface>, ParametersInterface> parametersMap;
     private TaskConfigurationParameters taskConfigurationParameters;
 
     public ZiggyDirectoryRule directoryRule = new ZiggyDirectoryRule();
 
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, directoryRule);
+        DATASTORE_ROOT_DIR, directoryRule);
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule(directoryRule)
@@ -116,7 +116,6 @@ public void testGenerateUnitsOfWork() {
         assertEquals("sector-0001,1:2", uowMap.get("sector-0001/cal/ccd-1:2"));
         assertTrue(uowKeys.contains("sector-0002/cal/ccd-1:2"));
         assertEquals("sector-0002,1:2", uowMap.get("sector-0002/cal/ccd-1:2"));
-
     }
 
     /**
@@ -131,7 +130,6 @@ public void testGenerateTasksSingleSubtask() {
         for (UnitOfWork uow : uowList) {
             assertTrue(DatastoreDirectoryUnitOfWorkGenerator.singleSubtask(uow));
         }
-
     }
 
     /**
@@ -162,7 +160,5 @@ public void testGenerateFullBriefState() {
         assertEquals("sector-0001/cal/ccd-1:2", uowMap.get("sector-0001/cal/ccd-1:2"));
         assertTrue(uowKeys.contains("sector-0002/cal/ccd-1:2"));
         assertEquals("sector-0002/cal/ccd-1:2", uowMap.get("sector-0002/cal/ccd-1:2"));
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/uow/UnitOfWorkGeneratorTest.java b/src/test/java/gov/nasa/ziggy/uow/UnitOfWorkGeneratorTest.java
index d2e2ce7..8cbd0ad 100644
--- a/src/test/java/gov/nasa/ziggy/uow/UnitOfWorkGeneratorTest.java
+++ b/src/test/java/gov/nasa/ziggy/uow/UnitOfWorkGeneratorTest.java
@@ -1,6 +1,6 @@
 package gov.nasa.ziggy.uow;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.PIPELINE_DEFAULT_UOW_IDENTIFIER_CLASS_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.PIPELINE_DEFAULT_UOW_IDENTIFIER_CLASS;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
@@ -15,13 +15,14 @@
 import gov.nasa.ziggy.data.management.DataReceiptPipelineModule;
 import gov.nasa.ziggy.module.ExternalProcessPipelineModule;
 import gov.nasa.ziggy.module.PipelineException;
-import gov.nasa.ziggy.parameters.Parameters;
+import gov.nasa.ziggy.parameters.ParametersInterface;
 import gov.nasa.ziggy.pipeline.definition.ClassWrapper;
 import gov.nasa.ziggy.pipeline.definition.PipelineDefinitionNode;
 import gov.nasa.ziggy.pipeline.definition.PipelineModule;
 import gov.nasa.ziggy.pipeline.definition.PipelineModuleDefinition;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineModuleDefinitionCrud;
 import gov.nasa.ziggy.pipeline.definition.crud.PipelineTaskCrudTest;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 import gov.nasa.ziggy.services.database.DatabaseTransactionFactory;
 
 /**
@@ -36,7 +37,8 @@ public class UnitOfWorkGeneratorTest {
 
     @Rule
     public ZiggyPropertyRule pipelineDefaultUowIdentifierClassPropertyRule = new ZiggyPropertyRule(
-        PIPELINE_DEFAULT_UOW_IDENTIFIER_CLASS_PROP_NAME, (String) null);
+        PIPELINE_DEFAULT_UOW_IDENTIFIER_CLASS,
+        "gov.nasa.ziggy.uow.UnitOfWorkGeneratorTest$SampleUnitOfWorkIdentifier");
 
     /**
      * Tests that units of work are correctly generated; in particular, that the UOW generator and
@@ -72,6 +74,8 @@ public void testDefaultUnitOfWorkGenerator() {
      */
     @Test(expected = PipelineException.class)
     public void testNoDefaultGenerator() {
+        // Clear property set in property rule.
+        ZiggyConfiguration.reset();
         UnitOfWorkGenerator.defaultUnitOfWorkGenerator(PipelineTaskCrudTest.TestModule.class);
     }
 
@@ -80,14 +84,11 @@ public void testNoDefaultGenerator() {
      */
     @Test
     public void testExternalDefaultIdentifier() {
-        System.setProperty(PIPELINE_DEFAULT_UOW_IDENTIFIER_CLASS_PROP_NAME,
-            "gov.nasa.ziggy.uow.UnitOfWorkGeneratorTest$SampleUnitOfWorkIdentifier");
         Class<?> generator = UnitOfWorkGenerator
             .defaultUnitOfWorkGenerator(PipelineTaskCrudTest.TestModule.class);
         assertEquals(SingleUnitOfWorkGenerator.class, generator);
         generator = UnitOfWorkGenerator.defaultUnitOfWorkGenerator(DataReceiptPipelineModule.class);
         assertEquals(DataReceiptUnitOfWorkGenerator.class, generator);
-
     }
 
     /**
@@ -97,20 +98,18 @@ public void testExternalDefaultIdentifier() {
     public void testUowGeneratorFromNodeDefinition() {
 
         PipelineDefinitionNode node = new PipelineDefinitionNode();
-        node.setUnitOfWorkGenerator(
-            new ClassWrapper<UnitOfWorkGenerator>(SingleUnitOfWorkGenerator.class));
+        node.setUnitOfWorkGenerator(new ClassWrapper<>(SingleUnitOfWorkGenerator.class));
         ClassWrapper<UnitOfWorkGenerator> generator = UnitOfWorkGenerator.unitOfWorkGenerator(node);
         assertEquals("gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator", generator.getClassName());
 
         // Now test a node with no UOW generator specified and ensure that the default is retrieved.
         node.setUnitOfWorkGenerator(null);
         PipelineModuleDefinition modDef = new PipelineModuleDefinition("the-module");
-        modDef.setPipelineModuleClass(
-            new ClassWrapper<PipelineModule>(ExternalProcessPipelineModule.class));
+        modDef.setPipelineModuleClass(new ClassWrapper<>(ExternalProcessPipelineModule.class));
         node.setModuleName(modDef.getName());
         DatabaseTransactionFactory.performTransaction(() -> {
             PipelineModuleDefinitionCrud crud = new PipelineModuleDefinitionCrud();
-            crud.create(modDef);
+            crud.persist(modDef);
             return null;
         });
         generator = UnitOfWorkGenerator.unitOfWorkGenerator(node);
@@ -126,13 +125,13 @@ public void testUowGeneratorFromNodeDefinition() {
     private static class SampleUnitOfWorkGenerator implements UnitOfWorkGenerator {
 
         @Override
-        public List<Class<? extends Parameters>> requiredParameterClasses() {
+        public List<Class<? extends ParametersInterface>> requiredParameterClasses() {
             return new ArrayList<>();
         }
 
         @Override
         public List<UnitOfWork> generateTasks(
-            Map<Class<? extends Parameters>, Parameters> parameters) {
+            Map<Class<? extends ParametersInterface>, ParametersInterface> parameters) {
             UnitOfWork uow = new UnitOfWork();
             List<UnitOfWork> uowList = new ArrayList<>();
             uowList.add(uow);
@@ -143,7 +142,6 @@ public List<UnitOfWork> generateTasks(
         public String briefState(UnitOfWork uow) {
             return "sample brief state";
         }
-
     }
 
     /**
@@ -166,6 +164,5 @@ public Class<? extends UnitOfWorkGenerator> defaultUnitOfWorkGeneratorForClass(
             }
             return defaultUowGenerator;
         }
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/ui/IntegerFormatterTest.java b/src/test/java/gov/nasa/ziggy/util/IntegerFormatterTest.java
similarity index 92%
rename from src/test/java/gov/nasa/ziggy/ui/IntegerFormatterTest.java
rename to src/test/java/gov/nasa/ziggy/util/IntegerFormatterTest.java
index ce24acb..1cd67f8 100644
--- a/src/test/java/gov/nasa/ziggy/ui/IntegerFormatterTest.java
+++ b/src/test/java/gov/nasa/ziggy/util/IntegerFormatterTest.java
@@ -1,11 +1,9 @@
-package gov.nasa.ziggy.ui;
+package gov.nasa.ziggy.util;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import gov.nasa.ziggy.util.IntegerFormatter;
-
 public class IntegerFormatterTest {
 
     @Test
@@ -20,6 +18,5 @@ public void testEngineeringNotation() {
         assertEquals("223 T", IntegerFormatter.engineeringNotation(223000000000000L));
         assertEquals("223 P", IntegerFormatter.engineeringNotation(223000000000000000L));
         assertEquals("2.23 E", IntegerFormatter.engineeringNotation(2230000000000000000L));
-
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/util/StringUtilsTest.java b/src/test/java/gov/nasa/ziggy/util/StringUtilsTest.java
index 1bf6d06..07fea56 100644
--- a/src/test/java/gov/nasa/ziggy/util/StringUtilsTest.java
+++ b/src/test/java/gov/nasa/ziggy/util/StringUtilsTest.java
@@ -91,7 +91,7 @@ public void testConvertStringArray() {
         assertArrayEquals(new String[] { "a", "b", "c" }, array);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = NullPointerException.class)
     public void testConvertStringArrayWithNullString() {
         StringUtils.convertStringArray(null);
     }
@@ -114,7 +114,7 @@ public void testConstantToAcronymWithEmptyString() {
         assertEquals("", acronym);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = NullPointerException.class)
     public void testConstantToAcronymWithNullString() {
         StringUtils.constantToAcronym(null);
     }
@@ -149,7 +149,7 @@ public void testConstantToCamelWithEmptyString() {
         assertEquals("", camel);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = NullPointerException.class)
     public void testConstantToCamelWithNullString() {
         StringUtils.constantToCamel(null);
     }
@@ -181,11 +181,37 @@ public void testConstantToCamelWithSpacesWithEmptyString() {
         assertEquals("", camel);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = NullPointerException.class)
     public void testConstantToCamelWithSpacesWithNullString() {
         StringUtils.constantToCamelWithSpaces(null);
     }
 
+    @Test
+    public void testConstantToSentenceWithSpacesWithLeadingUnderscore() {
+        String sentence = StringUtils.constantToSentenceWithSpaces("_FOO_BAR");
+        assertEquals("Foo bar", sentence);
+    }
+
+    @Test
+    public void testConstantToSentenceWithSpacesWithUnderscoreDigit() {
+        String sentence = StringUtils.constantToSentenceWithSpaces("FOO_BAR_1_2");
+        assertEquals("Foo bar 1 2", sentence);
+
+        sentence = StringUtils.constantToSentenceWithSpaces("FOO_BAR_1ABC_2");
+        assertEquals("Foo bar 1abc 2", sentence);
+    }
+
+    @Test
+    public void testConstantToSentenceWithSpacesWithEmptyString() {
+        String sentence = StringUtils.constantToSentenceWithSpaces("");
+        assertEquals("", sentence);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testConstantToSentenceWithSpacesWithNullString() {
+        StringUtils.constantToSentenceWithSpaces(null);
+    }
+
     @Test
     public void testElapsedTime() {
         String elapsedTime = StringUtils.elapsedTime(1000, 2000);
@@ -212,12 +238,12 @@ public void testElapsedTimeWithDates() {
         assertEquals("00:00:01", elapsedTime);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = NullPointerException.class)
     public void testElapsedTimeWithDatesWithNullStartTime() {
         StringUtils.elapsedTime(null, new Date(2000));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = NullPointerException.class)
     public void testElapsedTimeWithDatesWithNullEndTime() {
         StringUtils.elapsedTime(new Date(1000), null);
     }
diff --git a/src/test/java/gov/nasa/ziggy/util/TestBean.java b/src/test/java/gov/nasa/ziggy/util/TestBean.java
deleted file mode 100644
index 0ffd359..0000000
--- a/src/test/java/gov/nasa/ziggy/util/TestBean.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package gov.nasa.ziggy.util;
-
-import gov.nasa.ziggy.parameters.Parameters;
-
-public class TestBean implements Parameters {
-    private int anInt = 1;
-    private float aFloat = 2.0f;
-    private String aString = "Ja Ja Ja";
-    private int[] anIntArray = { 1, 2, 3 };
-    private float[] aFloatArray = { 1.0f, 2.0f, 3.0f };
-    private float[] aFloatArray2 = { 4.0f, 5.0f, 6.0f };
-    private String[] aStringArray = { "one", "two", "three" };
-    private String[] aStringArrayNull;
-
-    public TestBean() {
-    }
-
-    public int getAnInt() {
-        return anInt;
-    }
-
-    public void setAnInt(int anInt) {
-        this.anInt = anInt;
-    }
-
-    public float getAFloat() {
-        return aFloat;
-    }
-
-    public void setAFloat(float float1) {
-        aFloat = float1;
-    }
-
-    public String getAString() {
-        return aString;
-    }
-
-    public void setAString(String string) {
-        aString = string;
-    }
-
-    public int[] getAnIntArray() {
-        return anIntArray;
-    }
-
-    public void setAnIntArray(int[] anIntArray) {
-        this.anIntArray = anIntArray;
-    }
-
-    public float[] getAFloatArray() {
-        return aFloatArray;
-    }
-
-    public void setAFloatArray(float[] floatArray) {
-        aFloatArray = floatArray;
-    }
-
-    public String[] getAStringArray() {
-        return aStringArray;
-    }
-
-    public void setAStringArray(String[] stringArray) {
-        aStringArray = stringArray;
-    }
-
-    public float[] getAFloatArray2() {
-        return aFloatArray2;
-    }
-
-    public void setAFloatArray2(float[] floatArray2) {
-        aFloatArray2 = floatArray2;
-    }
-
-    /**
-     * @return the aStringArrayNull
-     */
-    public String[] getAStringArrayNull() {
-        return aStringArrayNull;
-    }
-
-    /**
-     * @param stringArrayNull the aStringArrayNull to set
-     */
-    public void setAStringArrayNull(String[] stringArrayNull) {
-        aStringArrayNull = stringArrayNull;
-    }
-}
diff --git a/src/test/java/gov/nasa/ziggy/util/io/FileUtilTest.java b/src/test/java/gov/nasa/ziggy/util/io/FileUtilTest.java
index 405a721..6ad2e14 100644
--- a/src/test/java/gov/nasa/ziggy/util/io/FileUtilTest.java
+++ b/src/test/java/gov/nasa/ziggy/util/io/FileUtilTest.java
@@ -1,7 +1,7 @@
 package gov.nasa.ziggy.util.io;
 
-import static gov.nasa.ziggy.services.config.PropertyNames.DATASTORE_ROOT_DIR_PROP_NAME;
-import static gov.nasa.ziggy.services.config.PropertyNames.RESULTS_DIR_PROP_NAME;
+import static gov.nasa.ziggy.services.config.PropertyName.DATASTORE_ROOT_DIR;
+import static gov.nasa.ziggy.services.config.PropertyName.RESULTS_DIR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -10,6 +10,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -23,6 +24,8 @@
 
 import gov.nasa.ziggy.ZiggyDirectoryRule;
 import gov.nasa.ziggy.ZiggyPropertyRule;
+import gov.nasa.ziggy.services.config.PropertyName;
+import gov.nasa.ziggy.services.config.ZiggyConfiguration;
 
 /**
  * Tests the {@link FileUtil} class.
@@ -41,10 +44,10 @@ public class FileUtilTest {
 
     @Rule
     public ZiggyPropertyRule datastoreRootDirPropertyRule = new ZiggyPropertyRule(
-        DATASTORE_ROOT_DIR_PROP_NAME, "/dev/null");
+        DATASTORE_ROOT_DIR, "/dev/null");
 
     @Rule
-    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR_PROP_NAME,
+    public ZiggyPropertyRule resultsDirPropertyRule = new ZiggyPropertyRule(RESULTS_DIR,
         "/path/to/pipeline-results");
 
     @Before
@@ -67,7 +70,8 @@ public void testRegularFilesInDirTree() throws IOException {
         // Get a file to find size of
         Path testDirPath = testDir.toPath();
         Path testSubdirPath = testSubdir.toPath();
-        Path codeRoot = Paths.get(System.getProperty("user.dir"));
+        Path codeRoot = Paths
+            .get(ZiggyConfiguration.getInstance().getString(PropertyName.WORKING_DIR.property()));
         Path testSrcFile = codeRoot
             .resolve(Paths.get("test", "data", "configuration", "pipeline-definition.xml"));
         Path testFile = testDir.toPath().resolve("pipeline-definition.xml");
@@ -128,7 +132,6 @@ public void testRegularFilesInDirTree() throws IOException {
             .relativize(symlinkSubdir.resolve(Paths.get("pipeline-definition-symlink.xml"))));
         assertNotNull(valuePath);
         assertEquals(testSrcFile.toAbsolutePath(), valuePath);
-
     }
 
     @Test
@@ -146,7 +149,6 @@ public void testModeToPosix() {
         assertEquals("---------", FileUtil.modeToPosixFileString(0));
 
         assertEquals("rwxr----x", FileUtil.modeToPosixFileString(714));
-
     }
 
     @Test
@@ -164,7 +166,6 @@ public void testSetPosixPermissionsRecursively() throws IOException {
             PosixFilePermissions.toString(Files.getPosixFilePermissions(testRegularFile.toPath())));
         assertEquals("r--------", PosixFilePermissions
             .toString(Files.getPosixFilePermissions(testSubdirRegularFile.toPath())));
-
     }
 
     @Test
@@ -203,14 +204,97 @@ public void testReadOnlyPermissions() throws IOException {
             PosixFilePermissions.toString(Files.getPosixFilePermissions(testRegularFile.toPath())));
         assertEquals(FileUtil.FILE_READONLY_PERMISSIONS, PosixFilePermissions
             .toString(Files.getPosixFilePermissions(testSubdirRegularFile.toPath())));
-
     }
 
     @Test
     public void testCleanDirectoryTree() throws IOException {
-        FileUtil.cleanDirectoryTree(testDir.toPath());
-        assertTrue(testDir.exists());
-        assertFalse(archiveDir.exists());
-        assertFalse(testSubdir.exists());
+
+        // Create a sub-directory to the test subdir with a regular file in it.
+        File testSubSubDir = new File(testSubdir, "sub-sub-dir");
+        testSubSubDir.mkdir();
+        File subSubDirRegularFile = new File(testSubSubDir, "sub-sub-dir-regular-file.txt");
+        FileUtils.touch(subSubDirRegularFile);
+
+        // Add a new directory at the same "level" as testSubdir, with a regular file in it.
+        File testNeighborDir = new File(testDir, "neighbor-dir");
+        testNeighborDir.mkdir();
+        File neighborDirRegularFile = new File(testNeighborDir, "neighbor-regular-file.txt");
+        FileUtils.touch(neighborDirRegularFile);
+
+        // Create a symbolic link in the testSubdir to the "neighbor" dir (thus a symlink to
+        // a directory with a regular file).
+        Path neighborDirLink = testSubdir.toPath().resolve("neighbor-dir-link");
+        Files.createSymbolicLink(neighborDirLink, testNeighborDir.toPath());
+
+        // Create a symbolic link to the regular file in the testDir
+        Path regularFileLink = testSubdir.toPath().resolve("regular-file-link");
+        Files.createSymbolicLink(regularFileLink, testRegularFile.toPath());
+
+        // Write-protect everything inside of testDir
+        FileUtil.writeProtectDirectoryTree(testDir.toPath());
+
+        // Clean the testSubdir
+        FileUtil.cleanDirectoryTree(testSubdir.toPath(), true);
+        assertTrue(testSubdir.exists());
+        assertFalse(testSubSubDir.exists());
+        assertFalse(neighborDirLink.toFile().exists());
+        assertFalse(regularFileLink.toFile().exists());
+
+        // The neighbor directory should still be present and should still have content
+        assertTrue(testNeighborDir.exists());
+        assertTrue(neighborDirRegularFile.exists());
+
+        // The regular file that was symlinked should still exist
+        assertTrue(testRegularFile.exists());
+
+        // Check the file permissions
+        assertEquals(FileUtil.DIR_OVERWRITE_PERMISSIONS,
+            PosixFilePermissions.toString(Files.getPosixFilePermissions(testSubdir.toPath())));
+        assertEquals(FileUtil.DIR_READONLY_PERMISSIONS,
+            PosixFilePermissions.toString(Files.getPosixFilePermissions(testNeighborDir.toPath())));
+        assertEquals(FileUtil.FILE_READONLY_PERMISSIONS, PosixFilePermissions
+            .toString(Files.getPosixFilePermissions(neighborDirRegularFile.toPath())));
+        assertEquals(FileUtil.FILE_READONLY_PERMISSIONS,
+            PosixFilePermissions.toString(Files.getPosixFilePermissions(testRegularFile.toPath())));
+    }
+
+    @Test(expected = UncheckedIOException.class)
+    public void testUnforcedCleanOfWriteProtectedDirTree() throws IOException {
+        // Create a sub-directory to the test subdir with a regular file in it.
+        File testSubSubDir = new File(testSubdir, "sub-sub-dir");
+        testSubSubDir.mkdir();
+        File subSubDirRegularFile = new File(testSubSubDir, "sub-sub-dir-regular-file.txt");
+        FileUtils.touch(subSubDirRegularFile);
+
+        // Add a new directory at the same "level" as testSubdir, with a regular file in it.
+        File testNeighborDir = new File(testDir, "neighbor-dir");
+        testNeighborDir.mkdir();
+        File neighborDirRegularFile = new File(testNeighborDir, "neighbor-regular-file.txt");
+        FileUtils.touch(neighborDirRegularFile);
+
+        // Create a symbolic link in the testSubdir to the "neighbor" dir (thus a symlink to
+        // a directory with a regular file).
+        Path neighborDirLink = testSubdir.toPath().resolve("neighbor-dir-link");
+        Files.createSymbolicLink(neighborDirLink, testNeighborDir.toPath());
+
+        // Create a symbolic link to the regular file in the testDir
+        Path regularFileLink = testSubdir.toPath().resolve("regular-file-link");
+        Files.createSymbolicLink(regularFileLink, testRegularFile.toPath());
+
+        // Write-protect everything inside of testDir
+        FileUtil.writeProtectDirectoryTree(testDir.toPath());
+
+        // Clean the testSubdir
+        FileUtil.cleanDirectoryTree(testSubdir.toPath());
+    }
+
+    @Test
+    public void testDeleteNonexistentDirectory() throws IOException {
+        FileUtil.deleteDirectoryTree(testDir.toPath().resolve("non-existent-dir"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testDeleteNonDirectoryFile() throws IOException {
+        FileUtil.deleteDirectoryTree(testRegularFile.toPath());
     }
 }
diff --git a/src/test/java/gov/nasa/ziggy/util/io/LockManagerTest.java b/src/test/java/gov/nasa/ziggy/util/io/LockManagerTest.java
index 1e1ba8d..5b644e7 100644
--- a/src/test/java/gov/nasa/ziggy/util/io/LockManagerTest.java
+++ b/src/test/java/gov/nasa/ziggy/util/io/LockManagerTest.java
@@ -147,7 +147,6 @@ public void testNonBlockingWriteLockReturnValue() throws InterruptedException {
         task.start();
         task.join();
         assertTrue(task.isLockObtained());
-
     }
 
     /**
@@ -211,7 +210,6 @@ public boolean isLockAttempted() {
         public boolean isDoneTryingLock() {
             return doneTryingLock;
         }
-
     }
 
     /**
@@ -235,7 +233,6 @@ protected void getLock() throws IOException {
         protected void releaseLock() throws IOException {
             LockManager.releaseReadLock(getLockFile().toFile());
         }
-
     }
 
     /**
@@ -271,7 +268,6 @@ protected void releaseLock() throws IOException {
                 LockManager.releaseWriteLock(getLockFile().toFile());
             }
         }
-
     }
 
     /**
@@ -295,7 +291,5 @@ protected void getLock() throws IOException {
         protected void releaseLock() throws IOException {
             LockManager.releaseWriteLock(getLockFile().toFile());
         }
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/util/os/ProcInfoTest.java b/src/test/java/gov/nasa/ziggy/util/os/ProcInfoTest.java
index 6e7c4e7..b1e202c 100644
--- a/src/test/java/gov/nasa/ziggy/util/os/ProcInfoTest.java
+++ b/src/test/java/gov/nasa/ziggy/util/os/ProcInfoTest.java
@@ -6,14 +6,18 @@
 import java.util.List;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import gov.nasa.ziggy.IntegrationTestCategory;
+
 /**
  * Tests the OS-specific implementation of the {@link ProcInfo} class.
  *
  * @author Forrest Girouard
  */
+@Category(IntegrationTestCategory.class)
 public class ProcInfoTest {
     private static final Logger log = LoggerFactory.getLogger(ProcInfoTest.class);
 
diff --git a/src/test/java/gov/nasa/ziggy/util/os/ProcessUtilsTest.java b/src/test/java/gov/nasa/ziggy/util/os/ProcessUtilsTest.java
index eb1a892..f9c2058 100644
--- a/src/test/java/gov/nasa/ziggy/util/os/ProcessUtilsTest.java
+++ b/src/test/java/gov/nasa/ziggy/util/os/ProcessUtilsTest.java
@@ -93,7 +93,5 @@ public void testChildProcesses() throws InterruptedException {
         TestEventDetector.detectTestEvent(500L,
             () -> ProcessUtils.descendantProcessIds().size() == 0);
         assertEquals(0, ProcessUtils.descendantProcessIds().size());
-
     }
-
 }
diff --git a/src/test/java/gov/nasa/ziggy/util/pojo/FieldAccessException.java b/src/test/java/gov/nasa/ziggy/util/pojo/FieldAccessException.java
index b8e6956..50e3124 100644
--- a/src/test/java/gov/nasa/ziggy/util/pojo/FieldAccessException.java
+++ b/src/test/java/gov/nasa/ziggy/util/pojo/FieldAccessException.java
@@ -4,7 +4,7 @@
  * @author Miles Cote
  */
 public class FieldAccessException extends RuntimeException {
-    private static final long serialVersionUID = -3062830623810561643L;
+    private static final long serialVersionUID = 20230511L;
 
     public FieldAccessException(String message) {
         super(message);
diff --git a/src/test/java/gov/nasa/ziggy/util/pojo/FieldNameException.java b/src/test/java/gov/nasa/ziggy/util/pojo/FieldNameException.java
index a58f46d..77c4286 100644
--- a/src/test/java/gov/nasa/ziggy/util/pojo/FieldNameException.java
+++ b/src/test/java/gov/nasa/ziggy/util/pojo/FieldNameException.java
@@ -4,7 +4,7 @@
  * @author Miles Cote
  */
 public class FieldNameException extends RuntimeException {
-    private static final long serialVersionUID = 1093779775281200056L;
+    private static final long serialVersionUID = 20230511L;
 
     public FieldNameException(String message) {
         super(message);
diff --git a/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterExistenceException.java b/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterExistenceException.java
index 76b4100..a793b36 100644
--- a/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterExistenceException.java
+++ b/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterExistenceException.java
@@ -4,7 +4,7 @@
  * @author Miles Cote
  */
 public class GetterSetterExistenceException extends RuntimeException {
-    private static final long serialVersionUID = 7966376937636165077L;
+    private static final long serialVersionUID = 20230511L;
 
     public GetterSetterExistenceException(String message) {
         super(message);
diff --git a/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterNameException.java b/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterNameException.java
index 0e44f36..0b7f8f3 100644
--- a/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterNameException.java
+++ b/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterNameException.java
@@ -4,7 +4,7 @@
  * @author Miles Cote
  */
 public class GetterSetterNameException extends RuntimeException {
-    private static final long serialVersionUID = 1093779775281200056L;
+    private static final long serialVersionUID = 20230511L;
 
     public GetterSetterNameException(String message) {
         super(message);
diff --git a/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterTypeException.java b/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterTypeException.java
index 4741b0c..e77532a 100644
--- a/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterTypeException.java
+++ b/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterTypeException.java
@@ -4,7 +4,7 @@
  * @author Miles Cote
  */
 public class GetterSetterTypeException extends RuntimeException {
-    private static final long serialVersionUID = -7489561143977590533L;
+    private static final long serialVersionUID = 20230511L;
 
     public GetterSetterTypeException(String message) {
         super(message);
diff --git a/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterValueException.java b/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterValueException.java
index cd214e8..cc53790 100644
--- a/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterValueException.java
+++ b/src/test/java/gov/nasa/ziggy/util/pojo/GetterSetterValueException.java
@@ -4,7 +4,7 @@
  * @author Miles Cote
  */
 public class GetterSetterValueException extends RuntimeException {
-    private static final long serialVersionUID = 1274460955158509708L;
+    private static final long serialVersionUID = 20230511L;
 
     public GetterSetterValueException(String message) {
         super(message);
diff --git a/src/test/java/gov/nasa/ziggy/worker/WorkerTaskPriorityTest.java b/src/test/java/gov/nasa/ziggy/worker/WorkerTaskPriorityTest.java
deleted file mode 100644
index 8d8df31..0000000
--- a/src/test/java/gov/nasa/ziggy/worker/WorkerTaskPriorityTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package gov.nasa.ziggy.worker;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.concurrent.PriorityBlockingQueue;
-
-import org.junit.Test;
-
-import gov.nasa.ziggy.pipeline.definition.PipelineModule.RunMode;
-import gov.nasa.ziggy.services.messages.WorkerTaskRequest;
-
-/**
- * Tests to ensure that task priority is correctly managed.
- *
- * @author PT
- */
-public class WorkerTaskPriorityTest {
-
-    @Test
-    public void testTaskPrioritization() throws InterruptedException {
-
-        PriorityBlockingQueue<WorkerTaskRequest> queue = new PriorityBlockingQueue<>();
-        WorkerTaskRequest w1 = new WorkerTaskRequest(100, 100, 5, 4, false, RunMode.STANDARD);
-        WorkerTaskRequest w2 = new WorkerTaskRequest(100, 100, 7, 0, false, RunMode.STANDARD);
-        WorkerTaskRequest w3 = new WorkerTaskRequest(100, 100, 6, 4, false, RunMode.STANDARD);
-
-        // Add the tasks in inverse-task-ID order
-        queue.add(w2);
-        queue.add(w3);
-        queue.add(w1);
-
-        // Retrieve the tasks and check their ordering
-
-        assertEquals(w2, queue.take());
-        assertEquals(w1, queue.take());
-        assertEquals(w3, queue.take());
-    }
-}
diff --git a/test/data/EventPipeline/pl-event.xml b/test/data/EventPipeline/pl-event.xml
index 35c296f..b0a45aa 100644
--- a/test/data/EventPipeline/pl-event.xml
+++ b/test/data/EventPipeline/pl-event.xml
@@ -66,7 +66,7 @@
     <!-- This emulates a parameter set that's used by the algorithms. In this case, we're
          telling the algorithms whether to emulate an exception that occurs in processing, 
          and whether to emulate a processing action that runs successfully but produces
-         no output. This uses Ziggy's DefaultParameters class. Because it's the default
+         no output. This uses Ziggy's class. Because it's the default
          parameter class, the user doesn't need to specify any Java class for the 
          parameter set, and any combination of parameter types and parameter names can
          be used. The tradeoff is that the user has to provide the data type for each
@@ -80,4 +80,4 @@
     </parameter-set>
    
 
-</parameterLibrary>
\ No newline at end of file
+</parameterLibrary>
diff --git a/test/data/classwrapper/pl-two-default-param-sets.xml b/test/data/classwrapper/pl-two-default-param-sets.xml
index 1514dd4..a66279d 100644
--- a/test/data/classwrapper/pl-two-default-param-sets.xml
+++ b/test/data/classwrapper/pl-two-default-param-sets.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <parameterLibrary>
 
-    <parameter-set name="Sample classless parameter set" locked="false">
+    <parameter-set name="Sample classless parameter set">
         <parameter name="z1" value="100" type="int"/>
         <parameter name="z2" value="28.56, 57.12" type="floatarray"/>
         <parameter name="z3" value="some text" type="string"/>
     </parameter-set>
     
-    <parameter-set name="ISOFIT module parameters" locked="false">
+    <parameter-set name="ISOFIT module parameters">
         <parameter name="n_cores" value="4" type="int"/>
         <parameter name="use_hyperthreading" value="false" type="boolean"/>
         <parameter name="presolve" value="true" type="boolean"/>
diff --git a/test/data/configuration/invalid-pipeline-definition.xml b/test/data/configuration/invalid-pipeline-definition.xml
index da65e91..1b903f4 100644
--- a/test/data/configuration/invalid-pipeline-definition.xml
+++ b/test/data/configuration/invalid-pipeline-definition.xml
@@ -14,7 +14,7 @@
             exeTimeoutSecs="2000000" minMemoryMegaBytes="0" />
 
         <pipeline name="hyperion" description="Hyperion pipeline" rootNodeNames="importer"
-            instancePriority="5">
+            instancePriority="LOWEST">
             <node moduleName="importer" startNewUow="true" 
                 uowClass="gov.nasa.sbg.hyperion.common.ImporterUnitOfWork"
                 childNodeNames="modelimporter"/>
diff --git a/test/data/configuration/mixed-pipeline-config.xml b/test/data/configuration/mixed-pipeline-config.xml
index 291b597..96388c4 100644
--- a/test/data/configuration/mixed-pipeline-config.xml
+++ b/test/data/configuration/mixed-pipeline-config.xml
@@ -5,7 +5,7 @@
 
   <pipelines>
     <pipeline name="sampleipeline" description="A sample pipeline" rootNodeNames="samplemodule"
-        instancePriority="1">
+        instancePriority="HIGH">
         <node moduleName="samplemodule" uowClass="gov.nasa.ziggy.uow.SingleUowTask" 
             startNewUow="true" childNodeNames=""/>
     </pipeline>
diff --git a/test/data/configuration/pd-hyperion.xml b/test/data/configuration/pd-hyperion.xml
index 3266aa4..d055ecd 100644
--- a/test/data/configuration/pd-hyperion.xml
+++ b/test/data/configuration/pd-hyperion.xml
@@ -2,21 +2,8 @@
 
 <pipelineDefinition>
 
-        <module name="importer" description="Hyperion importer" 
-            exeTimeoutSecs="2000000" minMemoryMegaBytes="0" 
-            pipelineModuleClass="gov.nasa.sbg.hyperion.importer.HyperionImporterPipelineModule" />
-        <module name="modelimporter" description="Hyperion model importer"
-            exeTimeoutSecs="2000000" minMemoryMegaBytes="0" 
-            pipelineModuleClass="gov.nasa.sbg.hyperion.importer.HyperionModelImporterPipelineModule"/>
-
-        <pipeline name="hyperion" description="Hyperion pipeline" rootNodeNames="importer"
-            instancePriority="5">
-            <node moduleName="importer" startNewUow="true" 
-                uowGenerator="gov.nasa.sbg.hyperion.common.ImporterUnitOfWork"
-                childNodeNames="modelimporter"/>
-            <node moduleName="modelimporter" startNewUow="true"
-                uowGenerator="gov.nasa.ziggy.uow.SingleUowTask"
-                childNodeNames="level0"/>
+        <pipeline name="hyperion" description="Hyperion pipeline" rootNodeNames="level0"
+            instancePriority="LOWEST">
             <node moduleName="level0" startNewUow="true"
                 childNodeNames="level1">
                 <moduleParameter name="New Remote Hyperion L0"/>
diff --git a/test/data/configuration/pipeline-definition.xml b/test/data/configuration/pipeline-definition.xml
index ca10ca2..0eeab0c 100644
--- a/test/data/configuration/pipeline-definition.xml
+++ b/test/data/configuration/pipeline-definition.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <pipeline description="first pipeline" name="pipeline 1" instancePriority="2" rootNodeNames="module 1">
+    <pipeline description="first pipeline" name="pipeline 1" instancePriority="LOW" rootNodeNames="module 1">
         <pipelineParameter name="Pipeline parameters"/>
         <node startNewUow="true" moduleName="module 2" childNodeNames="module 4">
             <moduleParameter name="Convergence criteria"/>
@@ -19,7 +19,7 @@
             <outputDataFileType name="flight L2 data"/>
             <modelType name="Temperature references"/>
         </node>
-        <node startNewUow="true" uowGenerator="gov.nasa.ziggy.uow.SingleUowTaskGenerator" 
+        <node startNewUow="true" uowGenerator="gov.nasa.ziggy.uow.SingleUnitOfWorkGenerator" 
                 moduleName="module 1" childNodeNames="module 2, module 3">
             <moduleParameter name="Convergence criteria"/>
             <moduleParameter name="Remote execution"/>
diff --git a/test/data/configuration/single-pipeline.xml b/test/data/configuration/single-pipeline.xml
index 23cb241..8e2391b 100644
--- a/test/data/configuration/single-pipeline.xml
+++ b/test/data/configuration/single-pipeline.xml
@@ -5,7 +5,7 @@
 
   <pipelines>
       <pipeline name="samplePipeline" description="A sample pipeline" rootNodeNames="10" 
-            instancePriority="1"/>
+            instancePriority="HIGH"/>
   </pipelines>
     
 </def:pipelineDefinition>
diff --git a/test/data/logging/log4j2.xml b/test/data/logging/log4j2.xml
deleted file mode 100644
index b11ad6a..0000000
--- a/test/data/logging/log4j2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-
-    <Properties>
-        <Property name="pattern">%d %-5p [%t:%C{1}.%M] %X{logStreamIdentifier} %m%n</Property>
-        <Property name="filename">${sys:cli.logfile:-/dev/null}</Property>
-    </Properties>
-    <Appenders>
-        <Console name="console"> <!-- Console wants to be plain because wrapper formats for us -->
-            <PatternLayout pattern="[%C{1}.%M] %m%n"/>
-        </Console>
-        <File name="cli" filename="${filename}">
-            <PatternLayout pattern="${pattern}"/>
-        </File>
-    </Appenders>
-    
-    <Loggers>
-    
-        <Logger name="gov.nasa.ziggy" level="info"/>
-        <Logger name="org.hibernate" level="warn"/>
-    
-        <Root level="info">
-            <AppenderRef ref="console"/>
-            <AppenderRef ref="cli"/>
-        </Root>
-        
-    </Loggers>
-
-</Configuration>
\ No newline at end of file
diff --git a/test/data/paramlib/pl-replacement-param-sets.xml b/test/data/paramlib/pl-replacement-param-sets.xml
index ff735ec..e5e66b4 100644
--- a/test/data/paramlib/pl-replacement-param-sets.xml
+++ b/test/data/paramlib/pl-replacement-param-sets.xml
@@ -1,21 +1,21 @@
 <parameterLibrary>
 
-    <parameter-set name="Remote Hyperion L1" locked="false"
+    <parameter-set name="Remote Hyperion L1" 
         classname="gov.nasa.ziggy.module.remote.RemoteParameters">
         <parameter name="gigsPerSubtask" value="3.0" />  
     </parameter-set>
 
-    <parameter-set name="Sample classless parameter set" locked="false">
+    <parameter-set name="Sample classless parameter set" >
         <parameter name="z1" value="100" type="string"/>
     </parameter-set>
     
-    <parameter-set name="ISOFIT module parameters" locked="false">
+    <parameter-set name="ISOFIT module parameters" >
         <parameter name="n_cores" value="4" type="int"/>
         <parameter name="presolve" value="true" type="boolean"/>
         <parameter name="empirical_line" value="true" type="boolean"/>
     </parameter-set>
 
-    <parameter-set name="All-new parameters" locked="false">
+    <parameter-set name="All-new parameters" >
         <parameter name="parameter" value="4" type="int"/>
     </parameter-set>
 
diff --git a/test/data/paramlib/test.xml b/test/data/paramlib/test.xml
index 4a98bb0..de2a320 100644
--- a/test/data/paramlib/test.xml
+++ b/test/data/paramlib/test.xml
@@ -1,6 +1,6 @@
 <parameterLibrary>
 
-    <parameter-set name="Remote Hyperion L1" locked="false"
+    <parameter-set name="Remote Hyperion L1" 
         classname="gov.nasa.ziggy.module.remote.RemoteParameters">
         <parameter name="enabled" value="false" />
         <parameter name="gigsPerSubtask" value="0.1" />  
@@ -9,13 +9,13 @@
         <parameter name="optimizer" value="COST" />
     </parameter-set>
 
-    <parameter-set name="Sample classless parameter set" locked="false">
+    <parameter-set name="Sample classless parameter set" >
         <parameter name="z1" value="100" type="int"/>
         <parameter name="z2" value="28.56, 57.12" type="floatarray"/>
         <parameter name="z3" value="some text" type="string"/>
     </parameter-set>
     
-    <parameter-set name="ISOFIT module parameters" locked="false">
+    <parameter-set name="ISOFIT module parameters" >
         <parameter name="n_cores" value="4" type="int"/>
         <parameter name="presolve" value="true" type="boolean"/>
         <parameter name="empirical_line" value="true" type="boolean"/>
diff --git a/test/etc/envvar.ziggy.properties b/test/etc/envvar.ziggy.properties
index 48201ee..15c1f34 100644
--- a/test/etc/envvar.ziggy.properties
+++ b/test/etc/envvar.ziggy.properties
@@ -1,2 +1,2 @@
 
-test.file.property=from.envvar.location
+ziggy.test.file.property=from.envvar.location
diff --git a/test/etc/sysprop.ziggy.properties b/test/etc/sysprop.ziggy.properties
index 381c0b9..045c397 100644
--- a/test/etc/sysprop.ziggy.properties
+++ b/test/etc/sysprop.ziggy.properties
@@ -1,2 +1,2 @@
 
-test.file.property=from.sysprop.location
+ziggy.test.file.property=from.sysprop.location