diff --git a/.gitignore b/.gitignore
index 07f7b0c567..0130575096 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,10 +77,10 @@ var/
 .installed.cfg
 *.egg
 webpack-stats.json
-api-tests/.envrc
-functional-tests/.envrc
+app/backend/*.sh
 app/backend/.env
 *.secret_env
+app/backend/.pip
 
 # PyInstaller and Pip install files
 #  Usually these files are written by a python script from a template
@@ -133,9 +133,12 @@ functional-tests/src/test/groovy/testtamplet.txt
 
 #virtual env
 /deactivate
+venv
 .venv
 venv
 .direnv
+app/backend/.env
+*.secret_env
 
 # Frontend files
 frontend/webpack-stats.json
diff --git a/Jenkinsfile b/Jenkinsfile
index 0d92e57f1e..f1c0bf682d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,565 +1,458 @@
-// Jenkinsfile (Scripted Pipeline)
-
-/* Gotchas:
-    - PodTemplate name/label has to be unique to ensure proper caching/validation
-    - https://gist.github.com/matthiasbalke/3c9ecccbea1d460ee4c3fbc5843ede4a
-
-   Libraries:
-    - https://github.com/BCDevOps/jenkins-pipeline-shared-lib
-    - http://github-api.kohsuke.org/apidocs/index.html
-*/
-import hudson.model.Result;
-import jenkins.model.CauseOfInterruption.UserInterruption;
-import org.kohsuke.github.*
-import bcgov.OpenShiftHelper
-import bcgov.GitHubHelper
-
-
-// Print stack trace of error
-@NonCPS
-private static String stackTraceAsString(Throwable t) {
-    StringWriter sw = new StringWriter();
-    t.printStackTrace(new PrintWriter(sw));
-    return sw.toString()
-}
-
-
-// Notify stage status and pass to Jenkins-GitHub library
-void notifyStageStatus (Map context, String name, String status) {
-    GitHubHelper.createCommitStatus(
-        this,
-        context.pullRequest.head,
-        status,
-        "${env.BUILD_URL}",
-        "Stage '${name}'",
-        "stages/${name.toLowerCase()}"
-    )
-}
-
-
-// Check if a stage is enabled (true|false in context)
-boolean isEnabled (Map context, String stageName) {
-    def stageOpt =(context?.stages?:[:])[stageName]
-    return (stageOpt == null || stageOpt == true)
-}
+#!groovy
 
+import groovy.json.JsonOutput
+import bcgov.GitHubHelper
 
-// Python tests can run early an in the container if Code Quality is disabled
-void unitTestsPython (Map context, boolean isQuick=false) {
-    boolean doCodeQuality = isEnabled( context, 'Code Quality' )
-    if (doCodeQuality && !isQuick) {
-        try {
-            echo "Running tests with artifact stash for SonarQube"
-            sh script: '''#!/usr/bin/container-entrypoint /bin/sh
-                cd /opt/app-root/src/backend
-                DATABASE_ENGINE=sqlite DEBUG=False TEMPLATE_DEBUG=False python manage.py test -c nose.cfg
-            '''
-            sh script: '''#!/usr/bin/container-entrypoint /bin/sh
-                cp /opt/app-root/src/backend/nosetests.xml ./
-                cp /opt/app-root/src/backend/coverage.xml ./
-            '''
-            stash includes: 'nosetests.xml,coverage.xml', name: 'coverage'
-        } finally {
-            stash includes: 'nosetests.xml,coverage.xml', name: 'coverage'
-            junit 'nosetests.xml'
-        }
-    } else if (!doCodeQuality && isQuick){
-        echo "Running short tests w/o artifact stash since SonarQube is disabled"
-        String deploymentConfigName = "gwells${context.deployments['dev'].dcSuffix}"
-        String projectName = context.deployments['dev'].projectName
-        String podName = openshift.withProject(projectName){
-            return openshift.selector('pod', ['deploymentconfig':deploymentConfigName]).objects()[1].metadata.name
+pipeline {
+  environment {
+
+    APP_NAME = "gwells"
+    REPOSITORY = 'https://www.github.com/bcgov/gwells.git'
+
+    // TOOLS_PROJECT is where images are built
+    TOOLS_PROJECT = "moe-gwells-tools"
+
+    // DEV_PROJECT is the project where individual development environments are spun up
+    // for example: a pull request PR-999 will result in gwells-dev-pr-999.pathfinder.gov.bc.ca
+    DEV_PROJECT = "moe-gwells-dev"
+    DEV_SUFFIX = "dev"
+
+    // TEST_PROJECT contains the test deployment. The test image is a candidate for promotion to prod.
+    TEST_PROJECT = "moe-gwells-test"
+    TEST_SUFFIX = "staging"
+
+    // PROD_PROJECT is the prod deployment.
+    // New production images can be deployed by tagging an existing "test" image as "prod".
+    PROD_PROJECT = "moe-gwells-prod"
+    PROD_SUFFIX= "production"
+
+    // PR_NUM is the pull request number e.g. 'pr-4'
+    PR_NUM = "${env.JOB_BASE_NAME}".toLowerCase()
+  }
+  agent any
+  stages {
+
+    // the Start Pipeline stage will process and apply OpenShift build templates which will create
+    // buildconfigs and an imagestream for built images.
+    // each pull request gets its own buildconfig but all new builds are pushed to a single imagestream,
+    // to be tagged with the pull request number.
+    // e.g.:  gwells-app:pr-999
+    stage('Prepare Templates') {
+      steps {
+        script {
+          echo "Cancelling previous builds..."
+          timeout(10) {
+            abortAllPreviousBuildInProgress(currentBuild)
+          }
+          echo "Previous builds cancelled"
+
+          openshift.withCluster() {
+            openshift.withProject(TOOLS_PROJECT) {
+
+              // Process db and app template into list objects
+              //  - variable substitution
+              echo "Processing build templates"
+              def dbtemplate = openshift.process("-f",
+                "openshift/postgresql.bc.json",
+                "ENV_NAME=${DEV_SUFFIX}"
+              )
+              //
+              def buildtemplate = openshift.process("-f",
+                "openshift/backend.bc.json",
+                "ENV_NAME=${DEV_SUFFIX}",
+                "NAME_SUFFIX=-${DEV_SUFFIX}-${PR_NUM}",
+                "APP_IMAGE_TAG=${PR_NUM}",
+                "SOURCE_REPOSITORY_URL=${REPOSITORY}",
+                "SOURCE_REPOSITORY_REF=pull/${CHANGE_ID}/head"
+              )
+
+              // Apply oc list objects
+              //  - add docker image reference as tag in gwells-postgresql
+              echo "Preparing database imagestream"
+              echo " \$ oc process -f openshift/postgresql.bc.json -p ENV_NAME=${DEV_SUFFIX} | oc apply -n moe-gwells-tools -f -"
+              openshift.apply(dbtemplate)
+              //  - add docker image reference as tag in gwells-application
+              //  - create build config
+              echo "Preparing backend imagestream and buildconfig"
+              echo " \$ oc process -f openshift/backend.bc.json -p ENV_NAME=${DEV_SUFFIX} -p NAME_SUFFIX=-${DEV_SUFFIX}-${PR_NUM} -p APP_IMAGE_TAG=${PR_NUM} -p SOURCE_REPOSITORY_URL=${REPOSITORY} -p SOURCE_REPOSITORY_REF=pull/${CHANGE_ID}/head | oc apply -n moe-gwells-tools -f -"
+              openshift.apply(buildtemplate)
+            }
+          }
         }
-        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
-            cd /opt/app-root/src/backend; \
-            DATABASE_ENGINE=sqlite DEBUG=False TEMPLATE_DEBUG=False python manage.py test -c nose.cfg \
-        '"
-    } else {
-        echo "Python unit tests are being skipped at this stage"
-        echo "doCodeQuality = ${doCodeQuality}"
-        echo "isQuick = ${isQuick}"
+      }
     }
-}
-void unitTestsPythonQuick (Map context) {unitTestsPython (context, true)}
-void unitTestsPythonFull (Map context) {unitTestsPython (context, false)}
-
-
-/* _Stage wrapper:
-    - runs stages against true|false in map context
-    - receives stages defined separately in closures (body)
-    - catches errors and provides output
-*/
-def _stage(String name, Map context, boolean retry=0, boolean withCommitStatus=true, Closure body) {
-    timestamps {
-        echo "Running Stage '${name}'"
-        if (isEnabled(context,name)){
-            stage(name) {
-                waitUntil {
-                    notifyStageStatus(context, name, 'PENDING')
-                    boolean isDone=false
-                    try{
-                        body()
-                        isDone=true
-                        notifyStageStatus(context, name, 'SUCCESS')
-                        echo "Completed Stage '${name}'"
-                    }catch (ex){
-                        notifyStageStatus(context, name, 'FAILURE')
-                        echo "${stackTraceAsString(ex)}"
-                        def inputAction = input(
-                            message: "This step (${name}) has failed. See error above.",
-                            ok: 'Confirm',
-                            parameters: [
-                                choice(
-                                    name: 'action',
-                                    choices: 'Re-run\nIgnore',
-                                    description: 'What would you like to do?'
-                                )
-                            ]
-                        )
-                        if ('Ignore'.equalsIgnoreCase(inputAction)){
-                            isDone=true
-                        }
-                    }
-                    return isDone
-                } //end waitUntil
-            } //end Stage
-        }else{
-            stage(name) {
-                echo 'Skipping'
+
+    // the Build stage runs unit tests and builds files. an image will be outputted to the app's imagestream
+    // builds use the source to image strategy. See /app/.s2i/assemble for image build script
+    stage('Build (with tests)') {
+      steps {
+        script {
+          openshift.withCluster() {
+            openshift.withProject(TOOLS_PROJECT) {
+              echo "Running unit tests and building images..."
+              echo "This may take several minutes. Logs are not forwarded to Jenkins by default (at this time)."
+              echo "Additional logs can be found by monitoring builds in ${TOOLS_PROJECT}"
+
+              // Select appropriate buildconfig
+              def appBuild = openshift.selector("bc", "${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}")
+              // temporarily set ENABLE_DATA_ENTRY=True during testing because False currently leads to a failing unit test
+              echo "Building"
+              echo " \$ oc start-build -n moe-gwells-tools ${APP_NAME}-${DEV_SUFFIX}-${PR_NUM} --wait --env=ENABLE_DATA_ENTRY=true --follow=true"
+              appBuild.startBuild("--wait", "--env=ENABLE_DATA_ENTRY=True").logs("-f")
             }
+          }
         }
+      }
     }
-}
-
-
-/* Project and build settings
-   Includes:
-    - build (*.bc) and config templates (*.dc)
-    - stage names and enabled status (true|false)
-*/
-Map context = [
-    'name': 'gwells',
-    'uuid' : "${env.JOB_BASE_NAME}-${env.BUILD_NUMBER}-${env.CHANGE_ID}",
-    'env': [
-        'dev':[:],
-        'test':[
-            'params':[
-                'host':'gwells-test.pathfinder.gov.bc.ca',
-                'DB_PVC_SIZE':'5Gi'
-            ]
-        ],
-        'prod':[
-            'params':[
-                'host':'gwells-prod.pathfinder.gov.bc.ca',
-                'DB_PVC_SIZE':'5Gi'
-            ]
-        ]
-    ],
-    'templates': [
-        'build':[
-            ['file':'openshift/postgresql.bc.json'],
-            ['file':'openshift/backend.bc.json']
-        ],
-        'deployment':[
-            [
-                'file':'openshift/postgresql.dc.json',
-                'params':[
-                    'DATABASE_SERVICE_NAME':'gwells-pgsql${deploy.dcSuffix}',
-                    'IMAGE_STREAM_NAMESPACE':'',
-                    'IMAGE_STREAM_NAME':'gwells-postgresql${deploy.dcSuffix}',
-                    'IMAGE_STREAM_VERSION':'${deploy.envName}',
-                    'POSTGRESQL_DATABASE':'gwells',
-                    'VOLUME_CAPACITY':'${env[DEPLOY_ENV_NAME]?.params?.DB_PVC_SIZE?:"1Gi"}'
-                ]
-            ],
-            [
-                'file':'openshift/backend.dc.json',
-                'params':[
-                    'HOST':'${env[DEPLOY_ENV_NAME]?.params?.host?:("gwells" + deployments[DEPLOY_ENV_NAME].dcSuffix + "-" + deployments[DEPLOY_ENV_NAME].projectName + ".pathfinder.gov.bc.ca")}'
-                ]
-            ]
-        ]
-    ],
-    stages:[
-        'Load Fixtures': true,
-        'API Tests': true,
-        'Functional Tests': true,
-        'Unit Tests': true,
-        'Code Quality': false,
-        'ZAP Security Scan': false
-    ],
-    pullRequest:[
-        'id': env.CHANGE_ID,
-        'head': GitHubHelper.getPullRequestLastCommitId(this)
-    ]
-]
-
-
-/* Jenkins properties can be set on a pipeline-by-pipeline basis
-    See Jenkins' Pipeline Systax for generation
-    Globally equivalent to Jenkins > Manage Jenkins > Configure System
-    https://jenkins.io/doc/pipeline/steps/workflow-multibranch/#properties-set-job-properties
-*/
-properties([
-    buildDiscarder(
-        logRotator(
-            artifactDaysToKeepStr: '',
-            artifactNumToKeepStr: '',
-            daysToKeepStr: '',
-            numToKeepStr: '5'
-        )
-    ),
-    durabilityHint(
-        'PERFORMANCE_OPTIMIZED'
-    ),
-    disableResume()
-])
-
-
-/* Prepare stage
-    - abort any existing builds
-    - echo pull request number
-*/
-stage('Prepare') {
-    abortAllPreviousBuildInProgress(currentBuild)
-}
 
 
-/* Build stage
-    - applying OpenShift build configs
-    - creating OpenShift imagestreams, annotations and builds
-    - build time optimizations (e.g. image reuse, build scheduling/readiness)
-*/
-_stage('Build', context) {
-    node('master') {
-        checkout scm
-        new OpenShiftHelper().build(this, context)
-        if ("master".equalsIgnoreCase(env.CHANGE_TARGET)) {
-            new OpenShiftHelper().prepareForCD(this, context)
-            new OpenShiftHelper().waitUntilEnvironmentIsReady(this, context, 'dev')
-        }
-        deleteDir()
-    }
-} //end stage
-
-
-/* Continuous Integration (CI)
-   For feature branches merging into a release branch
-    || Deploy and Load Fixtures (sets isDeployed and isFixtured=true)
-    || Unit tests (sets isUnitTested=true)
-    -> || Python tests
-       || Node tests
-    || ZAP Security Scan (executes on isDeployed)
-    || Functional tests (executes on isFixtured)
-    || API tests (executes on isFixtured)
-    || Code quality (executes on isUnitTested)
-*/
-boolean isDeployed = false
-boolean isFixtured = false
-boolean isUnitTested = false
-parallel (
-    "Deploy and Load Fixtures" : {
-
-        _stage('Deploy', context) {
-            node('master') {
-                new OpenShiftHelper().deploy(this, context, 'dev')
-                String deploymentConfigName = "gwells${context.deployments['dev'].dcSuffix}"
-                String projectName = context.deployments['dev'].projectName
-                openshift.withProject(projectName) {
-                    // get list of pods for the new deployment
-                    def latestDeployment = openshift.selector('dc', deploymentConfigName).object().status.latestVersion
-                    def pods = openshift.selector('pod', [deployment: "${deploymentConfigName}-${latestDeployment}"])
-
-                    pods.untilEach(1) {
-                        return it.object().status.containerStatuses.every {
-                            it.ready
-                        }
-                    }
+    // the Deploy to Dev stage creates a new dev environment for the pull request (if necessary), tags the newly built
+    // application image into that environment, and monitors the newest deployment for pods/containers to
+    // report back as ready.
+    stage('Deploy to dev') {
+      steps {
+        script {
+          openshift.withCluster() {
+            openshift.withProject(DEV_PROJECT) {
+              // Process postgres deployment config (sub in vars, create list items)
+              echo " \$ oc process -f openshift/postgresql.dc.json -p DATABASE_SERVICE_NAME=gwells-pgsql-${DEV_SUFFIX}-${PR_NUM} -p IMAGE_STREAM_NAMESPACE='' -p IMAGE_STREAM_NAME=gwells-postgresql-${DEV_SUFFIX}-${PR_NUM} -p IMAGE_STREAM_VERSION=${DEV_SUFFIX} -p NAME_SUFFIX=-${DEV_SUFFIX}-${PR_NUM} -p POSTGRESQL_DATABASE=gwells -p VOLUME_CAPACITY=1Gi | oc apply -n moe-gwells-dev -f -"
+              def deployDBTemplate = openshift.process("-f",
+                "openshift/postgresql.dc.json",
+                "DATABASE_SERVICE_NAME=gwells-pgsql-${DEV_SUFFIX}-${PR_NUM}",
+                "IMAGE_STREAM_NAMESPACE=''",
+                "IMAGE_STREAM_NAME=gwells-postgresql-${DEV_SUFFIX}-${PR_NUM}",
+                "IMAGE_STREAM_VERSION=${DEV_SUFFIX}",
+                "NAME_SUFFIX=-${DEV_SUFFIX}-${PR_NUM}",
+                "POSTGRESQL_DATABASE=gwells",
+                "VOLUME_CAPACITY=1Gi"
+              )
+
+              // Process postgres deployment config (sub in vars, create list items)
+              echo " \$ oc process -f openshift/backend.dc.json -p ENV_NAME=${DEV_SUFFIX} -p NAME_SUFFIX=-${DEV_SUFFIX}-${PR_NUM} | oc apply -n moe-gwells-dev -f -"
+              echo "Processing deployment config for pull request ${PR_NUM}"
+              def deployTemplate = openshift.process("-f",
+                "openshift/backend.dc.json",
+                "ENV_NAME=${DEV_SUFFIX}",
+                "HOST=${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}.pathfinder.gov.bc.ca",
+                "NAME_SUFFIX=-${DEV_SUFFIX}-${PR_NUM}"
+              )
+
+              // some objects need to be copied from a base secret or configmap
+              // these objects have an annotation "as-copy-of" in their object spec (e.g. an object in backend.dc.json)
+              echo "Creating configmaps and secrets objects"
+              List newObjectCopies = []
+
+              for (o in (deployTemplate + deployDBTemplate)) {
+
+                // only perform this operation on objects with 'as-copy-of'
+                def sourceName = o.metadata && o.metadata.annotations && o.metadata.annotations['as-copy-of']
+                if (sourceName && sourceName.length() > 0) {
+                  def selector = openshift.selector("${o.kind}/${sourceName}")
+                  if (selector.count() == 1) {
+
+                    // create a copy of the object and add it to the new list of objects to be applied
+                    Map copiedModel = selector.object(exportable:true)
+                    copiedModel.metadata.name = o.metadata.name
+                    echo "[as-copy-of] Copying ${o.kind} ${o.metadata.name}"
+                    newObjectCopies.add(copiedModel)
+                  }
+                }
+              }
+
+
+              echo "Applying deployment config for pull request ${PR_NUM} on ${DEV_PROJECT}"
+
+              // apply the templates, which will create new objects or modify existing ones as necessary.
+              // the copies of base objects (secrets, configmaps) are also applied.
+              openshift.apply(deployTemplate).label(['app':"gwells-${DEV_SUFFIX}-${PR_NUM}", 'app-name':"${APP_NAME}", 'env-name':"${DEV_SUFFIX}"], "--overwrite")
+              openshift.apply(deployDBTemplate).label(['app':"gwells-${DEV_SUFFIX}-${PR_NUM}", 'app-name':"${APP_NAME}", 'env-name':"${DEV_SUFFIX}"], "--overwrite")
+              openshift.apply(newObjectCopies).label(['app':"gwells-${DEV_SUFFIX}-${PR_NUM}", 'app-name':"${APP_NAME}", 'env-name':"${DEV_SUFFIX}"], "--overwrite")
+              echo "Successfully applied deployment configs for ${PR_NUM}"
+
+              // promote the newly built image to DEV
+              echo "Tagging new image to DEV imagestream."
+              openshift.tag("${TOOLS_PROJECT}/gwells-application:${PR_NUM}", "${DEV_PROJECT}/gwells-${DEV_SUFFIX}-${PR_NUM}:dev")  // todo: clean up labels/tags
+              openshift.tag("${TOOLS_PROJECT}/gwells-postgresql:dev", "${DEV_PROJECT}/gwells-postgresql-${DEV_SUFFIX}-${PR_NUM}:dev")  // todo: clean up labels/tags
+
+              // post a notification to Github that this pull request is being deployed
+              def targetURL = "https://${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}.pathfinder.gov.bc.ca/gwells"
+              def ghDeploymentId = new GitHubHelper().createDeployment(this, "pull/${env.CHANGE_ID}/head", ['environment':"${DEV_SUFFIX}", 'task':"deploy:pull:${env.CHANGE_ID}"])
+              new GitHubHelper().createDeploymentStatus(this, ghDeploymentId, 'PENDING', ['targetUrl':"${targetURL}"])
+
+              // monitor the deployment status and wait until deployment is successful
+              echo "Waiting for deployment to dev..."
+              def newVersion = openshift.selector("dc", "${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}").object().status.latestVersion
+              def pods = openshift.selector('pod', [deployment: "${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}-${newVersion}"])
+
+              // wait until each container in this deployment's pod reports as ready
+              timeout(15) {
+                pods.untilEach(2) {
+                  return it.object().status.containerStatuses.every {
+                    it.ready
+                  }
                 }
-                isDeployed = true
+              }
+
+              echo "Deployment successful!"
+              echo "Loading fixtures"
+              def firstPod = pods.objects()[0].metadata.name
+              openshift.exec(firstPod, "--", "bash -c '\
+                cd /opt/app-root/src/backend; \
+                python manage.py loaddata \
+                  gwells-codetables.json \
+                  wellsearch-codetables.json \
+                  registries-codetables.json \
+                  registries.json \
+                  aquifers.json \
+                  wellsearch.json.gz; \
+                python manage.py createinitialrevisions'")
+
+                new GitHubHelper().createDeploymentStatus(this, ghDeploymentId, 'SUCCESS', ['targetUrl':"${targetURL}"])
+
             }
+          }
         }
+      }
+    }
 
-        _stage('Load Fixtures', context) {
-            node('master'){
-                parallel (
-                    "Load Fixtures": {
-                        String deploymentConfigName = "gwells${context.deployments['dev'].dcSuffix}"
-                        String projectName = context.deployments['dev'].projectName
-                        String podName = openshift.withProject(projectName){
-                            return openshift.selector('pod', ['deploymentconfig':deploymentConfigName]).objects()[0].metadata.name
-                        }
-
-                        /* All of these commands could be run in one go, and be more performant, but then
-                        it becomes difficult to see which on of the steps failed. Instead, each step is
-                        executed by itself. */
-                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
-                            cd /opt/app-root/src/backend; \
-                            python manage.py migrate \
-                        '"
-                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
-                            cd /opt/app-root/src/backend; \
-                            python manage.py loaddata gwells-codetables.json \
-                        '"
-                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
-                            cd /opt/app-root/src/backend; \
-                            python manage.py loaddata wellsearch-codetables.json registries-codetables.json \
-                        '"
-                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
-                            cd /opt/app-root/src/backend; \
-                            python manage.py loaddata wellsearch.json.gz registries.json \
-                        '"
-                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
-                            cd /opt/app-root/src/backend; \
-                            python manage.py loaddata aquifers.json \
-                        '"
-                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
-                            cd /opt/app-root/src/backend; \
-                            python manage.py createinitialrevisions \
-                        '"
-                        isFixtured = true
-                    },
-                    "Unit Tests: Python": {
-                        unitTestsPythonQuick (context)
-                    }
-                )
-            }
-        } //end stage
-    }, //end branch
-    "Unit Tests" : {
-        /* Unit test stage
-            - use Django's manage.py to run python unit tests (w/ nose.cfg)
-            - use 'npm run unit' to run JavaScript unit tests
-            - stash test results for code quality stage
-        */
-        _stage('Unit Tests', context) {
-            podTemplate(
-                label: "node-${context.uuid}",
-                name:"node-${context.uuid}",
+    stage('API Tests') {
+      steps {
+        script {
+          podTemplate(
+                label: "nodejs-${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}",
+                name: "nodejs-${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}",
                 serviceAccount: 'jenkins',
                 cloud: 'openshift',
+                activeDeadlineSeconds: 1800,
                 containers: [
                     containerTemplate(
                         name: 'jnlp',
-                        image: 'jenkins/jnlp-slave:3.10-1-alpine',
-                        args: '${computer.jnlpmac} ${computer.name}',
-                        resourceRequestCpu: '100m',
-                        resourceLimitCpu: '100m'
-                    ),
-                    containerTemplate(
-                        name: 'app',
-                        image: "docker-registry.default.svc:5000/moe-gwells-tools/gwells${context.buildNameSuffix}:${context.buildEnvName}",
-                        ttyEnabled: true,
-                        command: 'cat',
-                        resourceRequestCpu: '2',
-                        resourceLimitCpu: '2',
-                        resourceRequestMemory: '2.5Gi',
-                        resourceLimitMemory: '2.5Gi'
-                    )
-                ]
-            ) {
-                node("node-${context.uuid}") {
-                    container('app') {
-                        sh script: '''#!/usr/bin/container-entrypoint /bin/sh
-                            printf "Python version: "&& python --version
-                            printf "Pip version:    "&& pip --version
-                            printf "Node version:   "&& node --version
-                            printf "NPM version:    "&& npm --version
-                        '''
-
-                        parallel (
-                            "Unit Tests: Python (w/ ZAP)": {
-                                unitTestsPythonFull (context)
-                            },
-                            "Unit Tests: Node": {
-                                try {
-                                    sh script: '''#!/usr/bin/container-entrypoint /bin/sh
-                                        cd /opt/app-root/src/frontend
-                                        npm test
-                                    '''
-                                } finally {
-                                    if (isEnabled( context, 'Code Quality' )) {
-                                        sh script: '''#!/usr/bin/container-entrypoint /bin/sh
-                                            mkdir -p frontend/test/
-                                            cp -R /opt/app-root/src/frontend/test/unit ./frontend/test/
-                                            cp /opt/app-root/src/frontend/junit.xml ./frontend/
-                                        '''
-                                        archiveArtifacts allowEmptyArchive: true, artifacts: 'frontend/test/unit/**/*'
-                                        stash includes: 'frontend/test/unit/coverage/clover.xml', name: 'nodecoverage'
-                                        stash includes: 'frontend/junit.xml', name: 'nodejunit'
-                                        junit 'frontend/junit.xml'
-                                        publishHTML (
-                                            target: [
-                                                allowMissing: false,
-                                                alwaysLinkToLastBuild: false,
-                                                keepAll: true,
-                                                reportDir: 'frontend/test/unit/coverage/lcov-report/',
-                                                reportFiles: 'index.html',
-                                                reportName: "Node Coverage Report"
-                                            ]
-                                        )
-                                    }
-                                }
-                            } //end branch
-                        ) //end parallel
-                        isUnitTested=true
-                    } //end container
-                } //end node
-            } //end podTemplate
-        } //end stage
-    }, //end branch
-    "ZAP Security Scan": {
-        _stage('ZAP Security Scan', context) {
-            podTemplate(
-                label: "zap-${context.uuid}",
-                name: "zap-${context.uuid}",
-                serviceAccount: "jenkins",
-                cloud: "openshift",
-                containers: [
-                    containerTemplate(
-                        name: 'jnlp',
-                        image: 'docker-registry.default.svc:5000/moe-gwells-dev/owasp-zap-openshift',
-                        resourceRequestCpu: '1',
-                        resourceLimitCpu: '1',
-                        resourceRequestMemory: '4Gi',
-                        resourceLimitMemory: '4Gi',
-                        workingDir: '/home/jenkins',
+                        image: 'registry.access.redhat.com/openshift3/jenkins-agent-nodejs-8-rhel7',
+                        resourceRequestCpu: '800m',
+                        resourceLimitCpu: '800m',
+                        resourceRequestMemory: '1Gi',
+                        resourceLimitMemory: '1Gi',
+                        workingDir: '/tmp',
                         command: '',
-                        args: '${computer.jnlpmac} ${computer.name}'
+                        args: '${computer.jnlpmac} ${computer.name}',
+                        envVars: [
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_USER',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'username'
+                            ),
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_PASSWORD',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'password'
+                            ),
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_AUTH_SERVER',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'auth_server'
+                            ),
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_CLIENT_ID',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'client_id'
+                            ),
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_CLIENT_SECRET',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'client_secret'
+                            )
+                        ]
                     )
                 ]
             ) {
-                node("zap-${context.uuid}") {
-                    //the checkout is mandatory
-                    echo "checking out source"
-                    echo "Build: ${BUILD_ID}"
+                node("nodejs-${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}") {
                     checkout scm
-                    dir('zap') {
-                        waitUntil {
-                            sleep 5
-                            return isDeployed
-                        }
-                        def retVal = sh (
-                            script: """
-                                set -eux
-                                ./runzap.sh
-                            """
-                        )
-                        publishHTML(
-                            target: [
-                                allowMissing: false,
-                                alwaysLinkToLastBuild: false,
-                                keepAll: true,
-                                reportDir: '/zap/wrk',
-                                reportFiles: 'index.html',
-                                reportName: 'ZAP Full Scan',
-                                reportTitles: 'ZAP Full Scan'
-                            ]
-                        )
-                        echo "Return value is: ${retVal}"
-                    }
-                } //end node
-            } //end podTemplate
-        } //end stage
-    }, //end branch
-    "Functional Tests":{
-        waitUntil {
-            sleep 5
-            return isDeployed
-        }
-        _stage('Functional Tests', context){
-            String baseURL = context.deployments['dev'].environmentUrl.substring(
-                0,
-                context.deployments['dev'].environmentUrl.indexOf('/', 8) + 1
-            )
-            podTemplate(
-                label: "bddstack-${context.uuid}",
-                name: "bddstack-${context.uuid}",
-                serviceAccount: 'jenkins',
-                cloud: 'openshift',
-                containers: [
-                  containerTemplate(
-                     name: 'jnlp',
-                     image: 'docker-registry.default.svc:5000/openshift/jenkins-slave-bddstack',
-                     resourceRequestCpu: '800m',
-                     resourceLimitCpu: '800m',
-                     resourceRequestMemory: '3Gi',
-                     resourceLimitMemory: '3Gi',
-                     workingDir: '/home/jenkins',
-                     command: '',
-                     args: '${computer.jnlpmac} ${computer.name}',
-                     envVars: [
-                         envVar(key:'BASEURL', value: baseURL),
-                         envVar(key:'GRADLE_USER_HOME', value: '/var/cache/artifacts/gradle')
-                     ]
-                  )
-                ],
-                volumes: [
-                    persistentVolumeClaim(
-                        mountPath: '/var/cache/artifacts',
-                        claimName: 'cache',
-                        readOnly: false
-                    )
-                ]
-            ){
-                node("bddstack-${context.uuid}") {
-                    echo "Build: ${BUILD_ID}"
-                    echo "baseURL: ${baseURL}"
-                    checkout scm
-                    dir('functional-tests') {
-                        waitUntil {
-                            sleep 5
-                            return isFixtured
-                        }
-                        String gradleExitCode = "0"
+                    dir('api-tests') {
+                        sh 'npm install -g newman'
+                        String BASEURL = "https://${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}.pathfinder.gov.bc.ca/gwells"
                         try {
-                            gradleExitCode = sh([
-                                script: "./gradlew chromeHeadlessTest",
-                                returnStdout: true
-                            ]).trim()
+                            sh """
+                                newman run ./registries_api_tests.json \
+                                    --global-var test_user=\$GWELLS_API_TEST_USER \
+                                    --global-var test_password=\$GWELLS_API_TEST_PASSWORD \
+                                    --global-var base_url=${BASEURL} \
+                                    --global-var auth_server=\$GWELLS_API_TEST_AUTH_SERVER \
+                                    --global-var client_id=\$GWELLS_API_TEST_CLIENT_ID \
+                                    --global-var client_secret=\$GWELLS_API_TEST_CLIENT_SECRET \
+                                    -r cli,junit,html
+                                newman run ./wells_api_tests.json \
+                                    --global-var test_user=\$GWELLS_API_TEST_USER \
+                                    --global-var test_password=\$GWELLS_API_TEST_PASSWORD \
+                                    --global-var base_url=${BASEURL} \
+                                    --global-var auth_server=\$GWELLS_API_TEST_AUTH_SERVER \
+                                    --global-var client_id=\$GWELLS_API_TEST_CLIENT_ID \
+                                    --global-var client_secret=\$GWELLS_API_TEST_CLIENT_SECRET \
+                                    -r cli,junit,html
+                                newman run ./submissions_api_tests.json \
+                                    --global-var test_user=\$GWELLS_API_TEST_USER \
+                                    --global-var test_password=\$GWELLS_API_TEST_PASSWORD \
+                                    --global-var base_url=${BASEURL} \
+                                    --global-var auth_server=\$GWELLS_API_TEST_AUTH_SERVER \
+                                    --global-var client_id=\$GWELLS_API_TEST_CLIENT_ID \
+                                    --global-var client_secret=\$GWELLS_API_TEST_CLIENT_SECRET \
+                                    -r cli,junit,html
+                                newman run ./aquifers_api_tests.json \
+                                    --global-var test_user=\$GWELLS_API_TEST_USER \
+                                    --global-var test_password=\$GWELLS_API_TEST_PASSWORD \
+                                    --global-var base_url=${BASEURL} \
+                                    --global-var auth_server=\$GWELLS_API_TEST_AUTH_SERVER \
+                                    --global-var client_id=\$GWELLS_API_TEST_CLIENT_ID \
+                                    --global-var client_secret=\$GWELLS_API_TEST_CLIENT_SECRET \
+                                    -r cli,junit,html
+                            """
                         } finally {
-                            echo "gradleExitCode: ${gradleExitCode}"
-                            if (gradleExitCode != "0" ) {
-                                archiveArtifacts allowEmptyArchive: true, artifacts: 'build/reports/geb/**/*'
-                                junit testResults:'build/test-results/**/*.xml', allowEmptyResults:true
-                                publishHTML (
-                                    target: [
-                                        allowMissing: true,
-                                        alwaysLinkToLastBuild: false,
-                                        keepAll: true,
-                                        reportDir: 'build/reports/spock',
-                                        reportFiles: 'index.html',
-                                        reportName: "Test: BDD Spock Report"
-                                    ]
-                                )
-                                publishHTML (
-                                    target: [
-                                        allowMissing: true,
-                                        alwaysLinkToLastBuild: false,
-                                        keepAll: true,
-                                        reportDir: 'build/reports/tests/chromeHeadlessTest',
-                                        reportFiles: 'index.html',
-                                        reportName: "Test: Full Test Report"
-                                    ]
-                                )
-                            }
+                          junit 'newman/*.xml'
+                          publishHTML (
+                              target: [
+                                  allowMissing: false,
+                                  alwaysLinkToLastBuild: false,
+                                  keepAll: true,
+                                  reportDir: 'newman',
+                                  reportFiles: 'newman*.html',
+                                  reportName: "API Test Report"
+                              ]
+                          )
+                          stash includes: 'newman/*.xml', name: 'api-tests'
                         }
-                    } //end dir
-                } //end node
-            } //end podTemplate
-        } //end stage
-    }, //end branch
-    "API Tests": {
-        _stage('API Tests', context) {
-            waitUntil {
-                sleep 5
-                return isDeployed
+                    }
+                }
             }
-            podTemplate(
-                label: "nodejs-${context.uuid}",
-                name: "nodejs-${context.uuid}",
+        }
+      }
+    }
+
+    // the Promote to Test stage allows approving the tagging of the newly built image into the test environment,
+    // which will trigger an automatic deployment of that image.
+    // The deployment configs in the openshift folder are applied first in case there are any changes to the templates.
+    // this stage should only occur when the pull request is being made against the master branch.
+    stage('Deploy image to staging') {
+      when {
+        expression { env.CHANGE_TARGET == 'master' }
+      }
+      steps {
+        script {
+          openshift.withCluster() {
+            openshift.withProject(TEST_PROJECT) {
+              input "Deploy to staging?"
+
+              echo "Preparing..."
+
+              // Process db and app template into list objects
+              //  - variable substitution
+              echo "Processing build templates"
+              def dbtemplate = openshift.process("-f",
+                "openshift/postgresql.bc.json",
+                "ENV_NAME=${TEST_SUFFIX}"
+              )
+              openshift.apply(dbtemplate)
+
+              echo "Updating staging deployment..."
+
+              def deployDBTemplate = openshift.process("-f",
+                "openshift/postgresql.dc.json",
+                "NAME_SUFFIX=-${TEST_SUFFIX}",
+                "DATABASE_SERVICE_NAME=gwells-pgsql-${TEST_SUFFIX}",
+                "IMAGE_STREAM_NAMESPACE=''",
+                "IMAGE_STREAM_NAME=gwells-postgresql-${TEST_SUFFIX}",
+                "IMAGE_STREAM_VERSION=${TEST_SUFFIX}",
+                "POSTGRESQL_DATABASE=gwells",
+                "VOLUME_CAPACITY=5Gi"
+              )
+
+              def deployTemplate = openshift.process("-f",
+                "openshift/backend.dc.json",
+                "NAME_SUFFIX=-${TEST_SUFFIX}",
+                "ENV_NAME=${TEST_SUFFIX}",
+                "HOST=${APP_NAME}-${TEST_SUFFIX}.pathfinder.gov.bc.ca",
+              )
+
+              // some objects need to be copied from a base secret or configmap
+              // these objects have an annotation "as-copy-of" in their object spec (e.g. an object in backend.dc.json)
+              echo "Creating configmaps and secrets objects"
+              List newObjectCopies = []
+
+              // todo: refactor to explicitly copy the objects we need
+              for (o in (deployTemplate + deployDBTemplate)) {
+
+                // only perform this operation on objects with 'as-copy-of'
+                def sourceName = o.metadata && o.metadata.annotations && o.metadata.annotations['as-copy-of']
+                if (sourceName && sourceName.length() > 0) {
+                  def selector = openshift.selector("${o.kind}/${sourceName}")
+                  if (selector.count() == 1) {
+
+                    // create a copy of the object and add it to the new list of objects to be applied
+                    Map copiedModel = selector.object(exportable:true)
+                    copiedModel.metadata.name = o.metadata.name
+                    echo "Copying ${o.kind} ${o.metadata.name}"
+                    newObjectCopies.add(copiedModel)
+                  }
+                }
+              }
+
+              // apply the templates, which will create new objects or modify existing ones as necessary.
+              // the copies of base objects (secrets, configmaps) are also applied.
+              echo "Applying deployment config for pull request ${PR_NUM} on ${TEST_PROJECT}"
+
+              openshift.apply(deployTemplate).label(['app':"gwells-${TEST_SUFFIX}", 'app-name':"${APP_NAME}", 'env-name':"${TEST_SUFFIX}"], "--overwrite")
+              openshift.apply(deployDBTemplate).label(['app':"gwells-${TEST_SUFFIX}", 'app-name':"${APP_NAME}", 'env-name':"${TEST_SUFFIX}"], "--overwrite")
+              openshift.apply(newObjectCopies).label(['app':"gwells-${TEST_SUFFIX}", 'app-name':"${APP_NAME}", 'env-name':"${TEST_SUFFIX}"], "--overwrite")
+              echo "Successfully applied TEST deployment config"
+
+              // promote the newly built image to DEV
+              echo "Tagging new image to TEST imagestream."
+
+              // Application/database images are tagged in the tools imagestream as the new test/prod image
+              openshift.tag("${TOOLS_PROJECT}/gwells-application:${PR_NUM}", "${TOOLS_PROJECT}/gwells-application:${TEST_SUFFIX}")  // todo: clean up labels/tags
+              // openshift.tag("${TOOLS_PROJECT}/gwells-postgresql:test", "${TOOLS_PROJECT}/gwells-postgresql:${TEST_SUFFIX}")
+
+              // Images are then tagged into the target environment namespace (test or prod)
+              openshift.tag("${TOOLS_PROJECT}/gwells-application:${TEST_SUFFIX}", "${TEST_PROJECT}/gwells-${TEST_SUFFIX}:${TEST_SUFFIX}")  // todo: clean up labels/tags
+              openshift.tag("${TOOLS_PROJECT}/gwells-postgresql:test", "${TEST_PROJECT}/gwells-postgresql-${TEST_SUFFIX}:${TEST_SUFFIX}")  // todo: clean up labels/tags
+
+              def targetTestURL = "https://${APP_NAME}-${TEST_SUFFIX}.pathfinder.gov.bc.ca/gwells"
+              def ghDeploymentId = new GitHubHelper().createDeployment(this, "pull/${env.CHANGE_ID}/head", ['environment':"${TEST_SUFFIX}", 'task':"deploy:pull:${env.CHANGE_ID}"])
+              new GitHubHelper().createDeploymentStatus(this, ghDeploymentId, 'PENDING', ['targetUrl':"${targetTestURL}"])
+
+              // monitor the deployment status and wait until deployment is successful
+              echo "Waiting for deployment to TEST..."
+              def newVersion = openshift.selector("dc", "gwells-${TEST_SUFFIX}").object().status.latestVersion
+              def pods = openshift.selector('pod', [deployment: "gwells-${TEST_SUFFIX}-${newVersion}"])
+
+              // wait until at least one pod reports as ready
+              timeout(15) {
+                pods.untilEach(2) {
+                  return it.object().status.containerStatuses.every {
+                    it.ready
+                  }
+                }
+              }
+
+              new GitHubHelper().createDeploymentStatus(this, ghDeploymentId, 'SUCCESS', ['targetUrl':"${targetTestURL}"])
+
+              echo "TEST deployment successful."
+            }
+          }
+        }
+      }
+    }
+
+    stage('API Tests against Staging') {
+      when {
+        expression { env.CHANGE_TARGET == 'master' }
+      }
+      steps {
+        script {
+          podTemplate(
+                label: "nodejs-${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}-${env.CHANGE_ID}",
+                name: "nodejs-${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}-${env.CHANGE_ID}",
                 serviceAccount: 'jenkins',
                 cloud: 'openshift',
+                activeDeadlineSeconds: 1800,
                 containers: [
                     containerTemplate(
                         name: 'jnlp',
@@ -601,16 +494,11 @@ parallel (
                     )
                 ]
             ) {
-                node("nodejs-${context.uuid}") {
+                node("nodejs-${APP_NAME}-${DEV_SUFFIX}-${PR_NUM}-${env.CHANGE_ID}") {
                     checkout scm
                     dir('api-tests') {
                         sh 'npm install -g newman'
-                        waitUntil {
-                            sleep 5
-                            return isFixtured
-                        }
-                        String BASEURL = context.deployments['dev'].environmentUrl.substring(0, context.deployments['dev'].environmentUrl.indexOf('/', 8) + 1)
-                        BASEURL += "gwells"
+                        String BASEURL = "https://gwells-${TEST_SUFFIX}.pathfinder.gov.bc.ca/gwells"
                         try {
                             sh """
                                 newman run ./registries_api_tests.json \
@@ -647,263 +535,146 @@ parallel (
                                     -r cli,junit,html
                             """
                         } finally {
-                                junit 'newman/*.xml'
-                                publishHTML (
-                                    target: [
-                                        allowMissing: false,
-                                        alwaysLinkToLastBuild: false,
-                                        keepAll: true,
-                                        reportDir: 'newman',
-                                        reportFiles: 'newman*.html',
-                                        reportName: "API Test Report"
-                                    ]
-                                )
-                                stash includes: 'newman/*.xml', name: 'api-tests'
+                          junit 'newman/*.xml'
+                          publishHTML (
+                              target: [
+                                  allowMissing: false,
+                                  alwaysLinkToLastBuild: false,
+                                  keepAll: true,
+                                  reportDir: 'newman',
+                                  reportFiles: 'newman*.html',
+                                  reportName: "API Test Report"
+                              ]
+                          )
+                          stash includes: 'newman/*.xml', name: 'api-tests'
                         }
-                    } // end dir
-                } //end node
-            } //end podTemplate
-        } //end stage
-    }, //end branch
-    "Code Quality": {
-        /* Code quality stage - pipeline step/closure
-        - unstash unit test results (previous stage)
-        - use SonarQube to consume results (*.xml)
-        */
-        _stage('Code Quality', context) {
-            podTemplate(
-                name: "sonar-runner${context.uuid}",
-                label: "sonar-runner${context.uuid}",
-                serviceAccount: 'jenkins',
-                cloud: 'openshift',
-                containers:[
-                    containerTemplate(
-                        name: 'jnlp',
-                        resourceRequestMemory: '4Gi',
-                        resourceLimitMemory: '4Gi',
-                        resourceRequestCpu: '4000m',
-                        resourceLimitCpu: '4000m',
-                        image: 'registry.access.redhat.com/openshift3/jenkins-slave-maven-rhel7:v3.7',
-                        workingDir: '/tmp',
-                        args: '${computer.jnlpmac} ${computer.name}',
-                        envVars: [
-                            envVar(key:'GRADLE_USER_HOME', value: '/var/cache/artifacts/gradle')
-                        ]
-                    )
-                ],
-                volumes: [
-                    persistentVolumeClaim(
-                        mountPath: '/var/cache/artifacts',
-                        claimName: 'cache',
-                        readOnly: false
-                    )
-                ]
-            ){
-                node("sonar-runner${context.uuid}") {
-                    //the checkout is mandatory, otherwise code quality check would fail
-                    echo "checking out source"
-                    echo "Build: ${BUILD_ID}"
-                    checkout scm
-
-                    String SONARQUBE_URL = 'https://sonarqube-moe-gwells-tools.pathfinder.gov.bc.ca'
-                    echo "SONARQUBE_URL: ${SONARQUBE_URL}"
-                    waitUntil {
-                        sleep 5
-                        return isUnitTested
-                    }
-                    dir('app') {
-                        unstash 'nodejunit'
-                        unstash 'nodecoverage'
                     }
-                    dir('sonar-runner') {
-                        unstash 'coverage'
-                        sh script:
-                            """
-                                ./gradlew -q dependencies
-                                ./gradlew sonarqube -Dsonar.host.url=${SONARQUBE_URL} -Dsonar.verbose=true \
-                                    --stacktrace --info  -Dsonar.sources=..
-                            """,
-                            returnStdout: true
-                    }
-                } //end node
-            } //end podTemplate
-        } //end stage
-    } //end branch
-) //end parallel
-
-
-/* Continuous Deployment (CD)
-   For PRs to the master branch, reserved for release branches and hotfixes
-   Iterates through DEV (skipped), TEST and PROD environments
-    - [prompt/stop]
-      || deployment to persistent TEST environment (sets isDeployed=true)
-      || smoke tests (executes on isDeployed)
-    - [prompt/stop]
-      - deployment to persistent PROD environment
-      - GitHub tasks (merge, close PR, deleteproduction branch)
-*/
-for(String envKeyName: context.env.keySet() as String[]){
-    String stageDeployName=envKeyName.toUpperCase()
-
-    if (!"DEV".equalsIgnoreCase(stageDeployName) && "master".equalsIgnoreCase(env.CHANGE_TARGET)) {
-        _stage("Approve - ${stageDeployName}", context) {
-            node('master') {
-                new OpenShiftHelper().waitUntilEnvironmentIsReady(this, context, envKeyName)
-            }
-            def inputResponse = null;
-            try{
-                inputResponse = input(
-                    id: "deploy_${stageDeployName.toLowerCase()}",
-                    message: "Deploy to ${stageDeployName}?",
-                    ok: 'Approve',
-                    submitterParameter: 'approved_by'
-                )
-            }catch(ex){
-                error "Pipeline has been aborted. - ${ex}"
+                }
             }
-            GitHubHelper.getPullRequest(this).comment(
-                "User '${inputResponse}' has approved deployment to '${stageDeployName}'"
-            )
         }
+      }
+    }
 
-        isDeployed = false
-        parallel (
-            "Deploy - ${stageDeployName}": {
-                _stage("Deploy - ${stageDeployName}", context) {
-                    node('master') {
-                        new OpenShiftHelper().deploy(this, context, envKeyName)
-                        isDeployed = true
-                    }
+
+    stage('Deploy image to Production') {
+      when {
+        expression { env.CHANGE_TARGET == 'master' }
+      }
+      steps {
+        script {
+          openshift.withCluster() {
+            openshift.withProject(PROD_PROJECT) {
+              input "Deploy to production?"
+
+              echo "Updating production deployment..."
+              def deployTemplate = openshift.process("-f",
+                "openshift/backend.dc.json",
+                "NAME_SUFFIX=-${PROD_SUFFIX}",
+                "ENV_NAME=${PROD_SUFFIX}",
+                "HOST=${APP_NAME}-${PROD_SUFFIX}.pathfinder.gov.bc.ca",
+              )
+
+              def deployDBTemplate = openshift.process("-f",
+                "openshift/postgresql.dc.json",
+                "NAME_SUFFIX=-${PROD_SUFFIX}",
+                "DATABASE_SERVICE_NAME=gwells-pgsql-${PROD_SUFFIX}",
+                "IMAGE_STREAM_NAMESPACE=''",
+                "IMAGE_STREAM_NAME=gwells-postgresql-${PROD_SUFFIX}",
+                "IMAGE_STREAM_VERSION=${PROD_SUFFIX}",
+                "POSTGRESQL_DATABASE=gwells",
+                "VOLUME_CAPACITY=20Gi"
+              )
+
+              // some objects need to be copied from a base secret or configmap
+              // these objects have an annotation "as-copy-of" in their object spec (e.g. an object in backend.dc.json)
+              echo "Creating configmaps and secrets objects"
+              List newObjectCopies = []
+
+              for (o in (deployTemplate + deployDBTemplate)) {
+
+                // only perform this operation on objects with 'as-copy-of'
+                def sourceName = o.metadata && o.metadata.annotations && o.metadata.annotations['as-copy-of']
+                if (sourceName && sourceName.length() > 0) {
+                  def selector = openshift.selector("${o.kind}/${sourceName}")
+                  if (selector.count() == 1) {
+
+                    // create a copy of the object and add it to the new list of objects to be applied
+                    Map copiedModel = selector.object(exportable:true)
+                    copiedModel.metadata.name = o.metadata.name
+                    echo "Copying ${o.kind} ${o.metadata.name}"
+                    newObjectCopies.add(copiedModel)
+                  }
                 }
-            },
-            "Smoke Test - ${stageDeployName}": {
-                waitUntil {
-                    sleep 5
-                    return isDeployed
+              }
+
+              // apply the templates, which will create new objects or modify existing ones as necessary.
+              // the copies of base objects (secrets, configmaps) are also applied.
+              echo "Applying deployment config for pull request ${PR_NUM} on ${PROD_PROJECT}"
+
+              openshift.apply(deployTemplate).label(['app':"gwells-${PROD_SUFFIX}", 'app-name':"${APP_NAME}", 'env-name':"${PROD_SUFFIX}"], "--overwrite")
+              openshift.apply(deployDBTemplate).label(['app':"gwells-${PROD_SUFFIX}", 'app-name':"${APP_NAME}", 'env-name':"${PROD_SUFFIX}"], "--overwrite")
+              openshift.apply(newObjectCopies).label(['app':"gwells-${PROD_SUFFIX}", 'app-name':"${APP_NAME}", 'env-name':"${PROD_SUFFIX}"], "--overwrite")
+              echo "Successfully applied production deployment config"
+
+              // promote the newly built image to DEV
+              echo "Tagging new image to production imagestream."
+
+              // Application/database images are tagged in the tools imagestream as the new prod image
+              openshift.tag("${TOOLS_PROJECT}/gwells-application:${PR_NUM}", "${TOOLS_PROJECT}/gwells-application:${PROD_SUFFIX}")  // todo: clean up labels/tags
+
+              // TODO: determine best way to manage database images (at the moment they never change, but we don't want an unforeseen change to impact prod)
+              // openshift.tag("${TOOLS_PROJECT}/gwells-postgresql:prod", "${TOOLS_PROJECT}/gwells-postgresql:${PROD_SUFFIX}")
+
+              // Images are then tagged into the target environment namespace (prod)
+              openshift.tag("${TOOLS_PROJECT}/gwells-application:${PROD_SUFFIX}", "${PROD_PROJECT}/gwells-${PROD_SUFFIX}:${PROD_SUFFIX}")  // todo: clean up labels/tags
+              openshift.tag("${TOOLS_PROJECT}/gwells-postgresql:prod", "${PROD_PROJECT}/gwells-postgresql-${PROD_SUFFIX}:${PROD_SUFFIX}")  // todo: clean up labels/tags
+
+              def targetProdURL = "https://apps.nrs.gov.bc.ca/gwells/"
+              def ghDeploymentId = new GitHubHelper().createDeployment(this, "pull/${env.CHANGE_ID}/head", ['environment':"${PROD_SUFFIX}", 'task':"deploy:pull:${env.CHANGE_ID}"])
+              new GitHubHelper().createDeploymentStatus(this, ghDeploymentId, 'PENDING', ['targetUrl':"${targetProdURL}"])
+
+              // monitor the deployment status and wait until pgsql-${ deployment is successful
+              echo "Waiting for deployment to production..."
+              def newVersion = openshift.selector("dc", "gwells-${PROD_SUFFIX}").object().status.latestVersion
+              def pods = openshift.selector('pod', [deployment: "gwells-${PROD_SUFFIX}-${newVersion}"])
+
+              // wait until pods reports as ready
+              timeout(15) {
+                pods.untilEach(2) {
+                  return it.object().status.containerStatuses.every {
+                    it.ready
+                  }
                 }
-                _stage("Smoke Test - ${stageDeployName}", context){
-                    String baseURL = context.deployments[envKeyName].environmentUrl.substring(
-                        0,
-                        context.deployments[envKeyName].environmentUrl.indexOf('/', 8) + 1
-                    )
-                    podTemplate(
-                        label: "bddstack-${context.uuid}",
-                        name: "bddstack-${context.uuid}",
-                        serviceAccount: 'jenkins',
-                        cloud: 'openshift',
-                        containers: [
-                          containerTemplate(
-                             name: 'jnlp',
-                             image: 'docker-registry.default.svc:5000/openshift/jenkins-slave-bddstack',
-                             resourceRequestCpu: '800m',
-                             resourceLimitCpu: '800m',
-                             resourceRequestMemory: '3Gi',
-                             resourceLimitMemory: '3Gi',
-                             workingDir: '/home/jenkins',
-                             command: '',
-                             args: '${computer.jnlpmac} ${computer.name}',
-                             envVars: [
-                                 envVar(key:'BASEURL', value: baseURL),
-                                 envVar(key:'GRADLE_USER_HOME', value: '/var/cache/artifacts/gradle')
-                             ]
-                          )
-                        ],
-                        volumes: [
-                            persistentVolumeClaim(
-                                mountPath: '/var/cache/artifacts',
-                                claimName: 'cache',
-                                readOnly: false
-                            )
-                        ]
-                    ){
-                        node("bddstack-${context.uuid}") {
-                            echo "Build: ${BUILD_ID}"
-                            echo "baseURL: ${baseURL}"
-                            checkout scm
-                            dir('functional-tests') {
-                                try {
-                                    sh './gradlew -DchromeHeadlessTest.single=WellDetails chromeHeadlessTest'
-                                } finally {
-                                    archiveArtifacts allowEmptyArchive: true, artifacts: 'build/reports/geb/**/*'
-                                    junit testResults:'build/test-results/**/*.xml', allowEmptyResults:true
-                                    publishHTML (
-                                        target: [
-                                            allowMissing: true,
-                                            alwaysLinkToLastBuild: false,
-                                            keepAll: true,
-                                            reportDir: 'build/reports/spock',
-                                            reportFiles: 'index.html',
-                                            reportName: "Test: BDD Spock Report"
-                                        ]
-                                    )
-                                    publishHTML (
-                                        target: [
-                                            allowMissing: true,
-                                            alwaysLinkToLastBuild: false,
-                                            keepAll: true,
-                                            reportDir: 'build/reports/tests/chromeHeadlessTest',
-                                            reportFiles: 'index.html',
-                                            reportName: "Test: Full Test Report"
-                                        ]
-                                    )
-                                }
-                            } //end dir
-                        } //end node
-                    } //end podTemplate
-                } //end stage
-            }
-        )
-    } //end if
-} // end for
-
-
-/* Cleanup stage - pipeline step/closure
-    - Prompt user to continue
-    - Remove temporary OpenShift resources (moe-gwells-dev)
-    - Merge and delete branches
-*/
-stage('Cleanup') {
-
-    def inputResponse = null
-    String mergeMethod='merge'
-
-    waitUntil {
-        boolean isDone=false
-        try{
-            inputResponse=input(
-                id: 'close_pr',
-                message: "Ready to Accept/Merge (using '${mergeMethod}' method), and Close pull-request #${env.CHANGE_ID}?",
-                ok: 'Yes',
-                submitter: 'authenticated',
-                submitterParameter: 'approver'
-            )
-            echo "inputResponse:${inputResponse}"
-
-            echo "Merging and Closing PR"
-            GitHubHelper.mergeAndClosePullRequest(this, mergeMethod)
-
-            echo "Clearing OpenShift resources"
-            new OpenShiftHelper().cleanup(this, context)
-
-            isDone=true
-        }catch (ex){
-            echo "${stackTraceAsString(ex)}"
-            def inputAction = input(
-                message: "This 'Cleanup' stage has failed. See error above.",
-                ok: 'Confirm',
-                submitter: 'authenticated',
-                parameters: [
-                    choice(
-                        name: 'action',
-                        choices: 'Re-run\nIgnore',
-                        description: 'What would you like to do?'
-                    )
-                ]
-            )
-            if ('Ignore'.equalsIgnoreCase(inputAction)){
-                isDone=true
+              }
+
+              echo "Production deployment successful."
+              // slack & github notifications that a new deployment is ready
+
+              new GitHubHelper().createDeploymentStatus(this, ghDeploymentId, 'SUCCESS', ['targetUrl':"${targetProdURL}"])
+
+              openshift.withProject(TOOLS_PROJECT) {
+
+                // get a slack token
+                def token = openshift.selector("secret", "slack").object().data.token.decodeBase64()
+                token = new String(token)
+
+                // build a message to send to the channel
+                def message = [:]
+                message.channel = "#gwells"
+                message.text = "A new production deployment was rolled out at https://apps.nrs.gov.bc.ca/gwells/"
+                payload = JsonOutput.toJson(message)
+
+                // Approve script here: https://jenkins-moe-gwells-tools.pathfinder.gov.bc.ca/scriptApproval/
+                sh (
+                  script: """curl -X POST -H "Content-Type: application/json" --data \'${payload}\' https://devopspathfinder.slack.com/services/hooks/jenkins-ci?token=${token}""",
+                  returnStdout: true
+                ).trim()
+
+              }
             }
+          }
         }
-        return isDone
-    } //end waitUntil
+      }
+    }
+  }
 }
diff --git a/Jenkinsfile.backup b/Jenkinsfile.backup
new file mode 100644
index 0000000000..0d92e57f1e
--- /dev/null
+++ b/Jenkinsfile.backup
@@ -0,0 +1,909 @@
+// Jenkinsfile (Scripted Pipeline)
+
+/* Gotchas:
+    - PodTemplate name/label has to be unique to ensure proper caching/validation
+    - https://gist.github.com/matthiasbalke/3c9ecccbea1d460ee4c3fbc5843ede4a
+
+   Libraries:
+    - https://github.com/BCDevOps/jenkins-pipeline-shared-lib
+    - http://github-api.kohsuke.org/apidocs/index.html
+*/
+import hudson.model.Result;
+import jenkins.model.CauseOfInterruption.UserInterruption;
+import org.kohsuke.github.*
+import bcgov.OpenShiftHelper
+import bcgov.GitHubHelper
+
+
+// Print stack trace of error
+@NonCPS
+private static String stackTraceAsString(Throwable t) {
+    StringWriter sw = new StringWriter();
+    t.printStackTrace(new PrintWriter(sw));
+    return sw.toString()
+}
+
+
+// Notify stage status and pass to Jenkins-GitHub library
+void notifyStageStatus (Map context, String name, String status) {
+    GitHubHelper.createCommitStatus(
+        this,
+        context.pullRequest.head,
+        status,
+        "${env.BUILD_URL}",
+        "Stage '${name}'",
+        "stages/${name.toLowerCase()}"
+    )
+}
+
+
+// Check if a stage is enabled (true|false in context)
+boolean isEnabled (Map context, String stageName) {
+    def stageOpt =(context?.stages?:[:])[stageName]
+    return (stageOpt == null || stageOpt == true)
+}
+
+
+// Python tests can run early an in the container if Code Quality is disabled
+void unitTestsPython (Map context, boolean isQuick=false) {
+    boolean doCodeQuality = isEnabled( context, 'Code Quality' )
+    if (doCodeQuality && !isQuick) {
+        try {
+            echo "Running tests with artifact stash for SonarQube"
+            sh script: '''#!/usr/bin/container-entrypoint /bin/sh
+                cd /opt/app-root/src/backend
+                DATABASE_ENGINE=sqlite DEBUG=False TEMPLATE_DEBUG=False python manage.py test -c nose.cfg
+            '''
+            sh script: '''#!/usr/bin/container-entrypoint /bin/sh
+                cp /opt/app-root/src/backend/nosetests.xml ./
+                cp /opt/app-root/src/backend/coverage.xml ./
+            '''
+            stash includes: 'nosetests.xml,coverage.xml', name: 'coverage'
+        } finally {
+            stash includes: 'nosetests.xml,coverage.xml', name: 'coverage'
+            junit 'nosetests.xml'
+        }
+    } else if (!doCodeQuality && isQuick){
+        echo "Running short tests w/o artifact stash since SonarQube is disabled"
+        String deploymentConfigName = "gwells${context.deployments['dev'].dcSuffix}"
+        String projectName = context.deployments['dev'].projectName
+        String podName = openshift.withProject(projectName){
+            return openshift.selector('pod', ['deploymentconfig':deploymentConfigName]).objects()[1].metadata.name
+        }
+        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
+            cd /opt/app-root/src/backend; \
+            DATABASE_ENGINE=sqlite DEBUG=False TEMPLATE_DEBUG=False python manage.py test -c nose.cfg \
+        '"
+    } else {
+        echo "Python unit tests are being skipped at this stage"
+        echo "doCodeQuality = ${doCodeQuality}"
+        echo "isQuick = ${isQuick}"
+    }
+}
+void unitTestsPythonQuick (Map context) {unitTestsPython (context, true)}
+void unitTestsPythonFull (Map context) {unitTestsPython (context, false)}
+
+
+/* _Stage wrapper:
+    - runs stages against true|false in map context
+    - receives stages defined separately in closures (body)
+    - catches errors and provides output
+*/
+def _stage(String name, Map context, boolean retry=0, boolean withCommitStatus=true, Closure body) {
+    timestamps {
+        echo "Running Stage '${name}'"
+        if (isEnabled(context,name)){
+            stage(name) {
+                waitUntil {
+                    notifyStageStatus(context, name, 'PENDING')
+                    boolean isDone=false
+                    try{
+                        body()
+                        isDone=true
+                        notifyStageStatus(context, name, 'SUCCESS')
+                        echo "Completed Stage '${name}'"
+                    }catch (ex){
+                        notifyStageStatus(context, name, 'FAILURE')
+                        echo "${stackTraceAsString(ex)}"
+                        def inputAction = input(
+                            message: "This step (${name}) has failed. See error above.",
+                            ok: 'Confirm',
+                            parameters: [
+                                choice(
+                                    name: 'action',
+                                    choices: 'Re-run\nIgnore',
+                                    description: 'What would you like to do?'
+                                )
+                            ]
+                        )
+                        if ('Ignore'.equalsIgnoreCase(inputAction)){
+                            isDone=true
+                        }
+                    }
+                    return isDone
+                } //end waitUntil
+            } //end Stage
+        }else{
+            stage(name) {
+                echo 'Skipping'
+            }
+        }
+    }
+}
+
+
+/* Project and build settings
+   Includes:
+    - build (*.bc) and config templates (*.dc)
+    - stage names and enabled status (true|false)
+*/
+Map context = [
+    'name': 'gwells',
+    'uuid' : "${env.JOB_BASE_NAME}-${env.BUILD_NUMBER}-${env.CHANGE_ID}",
+    'env': [
+        'dev':[:],
+        'test':[
+            'params':[
+                'host':'gwells-test.pathfinder.gov.bc.ca',
+                'DB_PVC_SIZE':'5Gi'
+            ]
+        ],
+        'prod':[
+            'params':[
+                'host':'gwells-prod.pathfinder.gov.bc.ca',
+                'DB_PVC_SIZE':'5Gi'
+            ]
+        ]
+    ],
+    'templates': [
+        'build':[
+            ['file':'openshift/postgresql.bc.json'],
+            ['file':'openshift/backend.bc.json']
+        ],
+        'deployment':[
+            [
+                'file':'openshift/postgresql.dc.json',
+                'params':[
+                    'DATABASE_SERVICE_NAME':'gwells-pgsql${deploy.dcSuffix}',
+                    'IMAGE_STREAM_NAMESPACE':'',
+                    'IMAGE_STREAM_NAME':'gwells-postgresql${deploy.dcSuffix}',
+                    'IMAGE_STREAM_VERSION':'${deploy.envName}',
+                    'POSTGRESQL_DATABASE':'gwells',
+                    'VOLUME_CAPACITY':'${env[DEPLOY_ENV_NAME]?.params?.DB_PVC_SIZE?:"1Gi"}'
+                ]
+            ],
+            [
+                'file':'openshift/backend.dc.json',
+                'params':[
+                    'HOST':'${env[DEPLOY_ENV_NAME]?.params?.host?:("gwells" + deployments[DEPLOY_ENV_NAME].dcSuffix + "-" + deployments[DEPLOY_ENV_NAME].projectName + ".pathfinder.gov.bc.ca")}'
+                ]
+            ]
+        ]
+    ],
+    stages:[
+        'Load Fixtures': true,
+        'API Tests': true,
+        'Functional Tests': true,
+        'Unit Tests': true,
+        'Code Quality': false,
+        'ZAP Security Scan': false
+    ],
+    pullRequest:[
+        'id': env.CHANGE_ID,
+        'head': GitHubHelper.getPullRequestLastCommitId(this)
+    ]
+]
+
+
+/* Jenkins properties can be set on a pipeline-by-pipeline basis
+    See Jenkins' Pipeline Systax for generation
+    Globally equivalent to Jenkins > Manage Jenkins > Configure System
+    https://jenkins.io/doc/pipeline/steps/workflow-multibranch/#properties-set-job-properties
+*/
+properties([
+    buildDiscarder(
+        logRotator(
+            artifactDaysToKeepStr: '',
+            artifactNumToKeepStr: '',
+            daysToKeepStr: '',
+            numToKeepStr: '5'
+        )
+    ),
+    durabilityHint(
+        'PERFORMANCE_OPTIMIZED'
+    ),
+    disableResume()
+])
+
+
+/* Prepare stage
+    - abort any existing builds
+    - echo pull request number
+*/
+stage('Prepare') {
+    abortAllPreviousBuildInProgress(currentBuild)
+}
+
+
+/* Build stage
+    - applying OpenShift build configs
+    - creating OpenShift imagestreams, annotations and builds
+    - build time optimizations (e.g. image reuse, build scheduling/readiness)
+*/
+_stage('Build', context) {
+    node('master') {
+        checkout scm
+        new OpenShiftHelper().build(this, context)
+        if ("master".equalsIgnoreCase(env.CHANGE_TARGET)) {
+            new OpenShiftHelper().prepareForCD(this, context)
+            new OpenShiftHelper().waitUntilEnvironmentIsReady(this, context, 'dev')
+        }
+        deleteDir()
+    }
+} //end stage
+
+
+/* Continuous Integration (CI)
+   For feature branches merging into a release branch
+    || Deploy and Load Fixtures (sets isDeployed and isFixtured=true)
+    || Unit tests (sets isUnitTested=true)
+    -> || Python tests
+       || Node tests
+    || ZAP Security Scan (executes on isDeployed)
+    || Functional tests (executes on isFixtured)
+    || API tests (executes on isFixtured)
+    || Code quality (executes on isUnitTested)
+*/
+boolean isDeployed = false
+boolean isFixtured = false
+boolean isUnitTested = false
+parallel (
+    "Deploy and Load Fixtures" : {
+
+        _stage('Deploy', context) {
+            node('master') {
+                new OpenShiftHelper().deploy(this, context, 'dev')
+                String deploymentConfigName = "gwells${context.deployments['dev'].dcSuffix}"
+                String projectName = context.deployments['dev'].projectName
+                openshift.withProject(projectName) {
+                    // get list of pods for the new deployment
+                    def latestDeployment = openshift.selector('dc', deploymentConfigName).object().status.latestVersion
+                    def pods = openshift.selector('pod', [deployment: "${deploymentConfigName}-${latestDeployment}"])
+
+                    pods.untilEach(1) {
+                        return it.object().status.containerStatuses.every {
+                            it.ready
+                        }
+                    }
+                }
+                isDeployed = true
+            }
+        }
+
+        _stage('Load Fixtures', context) {
+            node('master'){
+                parallel (
+                    "Load Fixtures": {
+                        String deploymentConfigName = "gwells${context.deployments['dev'].dcSuffix}"
+                        String projectName = context.deployments['dev'].projectName
+                        String podName = openshift.withProject(projectName){
+                            return openshift.selector('pod', ['deploymentconfig':deploymentConfigName]).objects()[0].metadata.name
+                        }
+
+                        /* All of these commands could be run in one go, and be more performant, but then
+                        it becomes difficult to see which on of the steps failed. Instead, each step is
+                        executed by itself. */
+                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
+                            cd /opt/app-root/src/backend; \
+                            python manage.py migrate \
+                        '"
+                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
+                            cd /opt/app-root/src/backend; \
+                            python manage.py loaddata gwells-codetables.json \
+                        '"
+                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
+                            cd /opt/app-root/src/backend; \
+                            python manage.py loaddata wellsearch-codetables.json registries-codetables.json \
+                        '"
+                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
+                            cd /opt/app-root/src/backend; \
+                            python manage.py loaddata wellsearch.json.gz registries.json \
+                        '"
+                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
+                            cd /opt/app-root/src/backend; \
+                            python manage.py loaddata aquifers.json \
+                        '"
+                        sh "oc exec '${podName}' -n '${projectName}' -- bash -c '\
+                            cd /opt/app-root/src/backend; \
+                            python manage.py createinitialrevisions \
+                        '"
+                        isFixtured = true
+                    },
+                    "Unit Tests: Python": {
+                        unitTestsPythonQuick (context)
+                    }
+                )
+            }
+        } //end stage
+    }, //end branch
+    "Unit Tests" : {
+        /* Unit test stage
+            - use Django's manage.py to run python unit tests (w/ nose.cfg)
+            - use 'npm run unit' to run JavaScript unit tests
+            - stash test results for code quality stage
+        */
+        _stage('Unit Tests', context) {
+            podTemplate(
+                label: "node-${context.uuid}",
+                name:"node-${context.uuid}",
+                serviceAccount: 'jenkins',
+                cloud: 'openshift',
+                containers: [
+                    containerTemplate(
+                        name: 'jnlp',
+                        image: 'jenkins/jnlp-slave:3.10-1-alpine',
+                        args: '${computer.jnlpmac} ${computer.name}',
+                        resourceRequestCpu: '100m',
+                        resourceLimitCpu: '100m'
+                    ),
+                    containerTemplate(
+                        name: 'app',
+                        image: "docker-registry.default.svc:5000/moe-gwells-tools/gwells${context.buildNameSuffix}:${context.buildEnvName}",
+                        ttyEnabled: true,
+                        command: 'cat',
+                        resourceRequestCpu: '2',
+                        resourceLimitCpu: '2',
+                        resourceRequestMemory: '2.5Gi',
+                        resourceLimitMemory: '2.5Gi'
+                    )
+                ]
+            ) {
+                node("node-${context.uuid}") {
+                    container('app') {
+                        sh script: '''#!/usr/bin/container-entrypoint /bin/sh
+                            printf "Python version: "&& python --version
+                            printf "Pip version:    "&& pip --version
+                            printf "Node version:   "&& node --version
+                            printf "NPM version:    "&& npm --version
+                        '''
+
+                        parallel (
+                            "Unit Tests: Python (w/ ZAP)": {
+                                unitTestsPythonFull (context)
+                            },
+                            "Unit Tests: Node": {
+                                try {
+                                    sh script: '''#!/usr/bin/container-entrypoint /bin/sh
+                                        cd /opt/app-root/src/frontend
+                                        npm test
+                                    '''
+                                } finally {
+                                    if (isEnabled( context, 'Code Quality' )) {
+                                        sh script: '''#!/usr/bin/container-entrypoint /bin/sh
+                                            mkdir -p frontend/test/
+                                            cp -R /opt/app-root/src/frontend/test/unit ./frontend/test/
+                                            cp /opt/app-root/src/frontend/junit.xml ./frontend/
+                                        '''
+                                        archiveArtifacts allowEmptyArchive: true, artifacts: 'frontend/test/unit/**/*'
+                                        stash includes: 'frontend/test/unit/coverage/clover.xml', name: 'nodecoverage'
+                                        stash includes: 'frontend/junit.xml', name: 'nodejunit'
+                                        junit 'frontend/junit.xml'
+                                        publishHTML (
+                                            target: [
+                                                allowMissing: false,
+                                                alwaysLinkToLastBuild: false,
+                                                keepAll: true,
+                                                reportDir: 'frontend/test/unit/coverage/lcov-report/',
+                                                reportFiles: 'index.html',
+                                                reportName: "Node Coverage Report"
+                                            ]
+                                        )
+                                    }
+                                }
+                            } //end branch
+                        ) //end parallel
+                        isUnitTested=true
+                    } //end container
+                } //end node
+            } //end podTemplate
+        } //end stage
+    }, //end branch
+    "ZAP Security Scan": {
+        _stage('ZAP Security Scan', context) {
+            podTemplate(
+                label: "zap-${context.uuid}",
+                name: "zap-${context.uuid}",
+                serviceAccount: "jenkins",
+                cloud: "openshift",
+                containers: [
+                    containerTemplate(
+                        name: 'jnlp',
+                        image: 'docker-registry.default.svc:5000/moe-gwells-dev/owasp-zap-openshift',
+                        resourceRequestCpu: '1',
+                        resourceLimitCpu: '1',
+                        resourceRequestMemory: '4Gi',
+                        resourceLimitMemory: '4Gi',
+                        workingDir: '/home/jenkins',
+                        command: '',
+                        args: '${computer.jnlpmac} ${computer.name}'
+                    )
+                ]
+            ) {
+                node("zap-${context.uuid}") {
+                    //the checkout is mandatory
+                    echo "checking out source"
+                    echo "Build: ${BUILD_ID}"
+                    checkout scm
+                    dir('zap') {
+                        waitUntil {
+                            sleep 5
+                            return isDeployed
+                        }
+                        def retVal = sh (
+                            script: """
+                                set -eux
+                                ./runzap.sh
+                            """
+                        )
+                        publishHTML(
+                            target: [
+                                allowMissing: false,
+                                alwaysLinkToLastBuild: false,
+                                keepAll: true,
+                                reportDir: '/zap/wrk',
+                                reportFiles: 'index.html',
+                                reportName: 'ZAP Full Scan',
+                                reportTitles: 'ZAP Full Scan'
+                            ]
+                        )
+                        echo "Return value is: ${retVal}"
+                    }
+                } //end node
+            } //end podTemplate
+        } //end stage
+    }, //end branch
+    "Functional Tests":{
+        waitUntil {
+            sleep 5
+            return isDeployed
+        }
+        _stage('Functional Tests', context){
+            String baseURL = context.deployments['dev'].environmentUrl.substring(
+                0,
+                context.deployments['dev'].environmentUrl.indexOf('/', 8) + 1
+            )
+            podTemplate(
+                label: "bddstack-${context.uuid}",
+                name: "bddstack-${context.uuid}",
+                serviceAccount: 'jenkins',
+                cloud: 'openshift',
+                containers: [
+                  containerTemplate(
+                     name: 'jnlp',
+                     image: 'docker-registry.default.svc:5000/openshift/jenkins-slave-bddstack',
+                     resourceRequestCpu: '800m',
+                     resourceLimitCpu: '800m',
+                     resourceRequestMemory: '3Gi',
+                     resourceLimitMemory: '3Gi',
+                     workingDir: '/home/jenkins',
+                     command: '',
+                     args: '${computer.jnlpmac} ${computer.name}',
+                     envVars: [
+                         envVar(key:'BASEURL', value: baseURL),
+                         envVar(key:'GRADLE_USER_HOME', value: '/var/cache/artifacts/gradle')
+                     ]
+                  )
+                ],
+                volumes: [
+                    persistentVolumeClaim(
+                        mountPath: '/var/cache/artifacts',
+                        claimName: 'cache',
+                        readOnly: false
+                    )
+                ]
+            ){
+                node("bddstack-${context.uuid}") {
+                    echo "Build: ${BUILD_ID}"
+                    echo "baseURL: ${baseURL}"
+                    checkout scm
+                    dir('functional-tests') {
+                        waitUntil {
+                            sleep 5
+                            return isFixtured
+                        }
+                        String gradleExitCode = "0"
+                        try {
+                            gradleExitCode = sh([
+                                script: "./gradlew chromeHeadlessTest",
+                                returnStdout: true
+                            ]).trim()
+                        } finally {
+                            echo "gradleExitCode: ${gradleExitCode}"
+                            if (gradleExitCode != "0" ) {
+                                archiveArtifacts allowEmptyArchive: true, artifacts: 'build/reports/geb/**/*'
+                                junit testResults:'build/test-results/**/*.xml', allowEmptyResults:true
+                                publishHTML (
+                                    target: [
+                                        allowMissing: true,
+                                        alwaysLinkToLastBuild: false,
+                                        keepAll: true,
+                                        reportDir: 'build/reports/spock',
+                                        reportFiles: 'index.html',
+                                        reportName: "Test: BDD Spock Report"
+                                    ]
+                                )
+                                publishHTML (
+                                    target: [
+                                        allowMissing: true,
+                                        alwaysLinkToLastBuild: false,
+                                        keepAll: true,
+                                        reportDir: 'build/reports/tests/chromeHeadlessTest',
+                                        reportFiles: 'index.html',
+                                        reportName: "Test: Full Test Report"
+                                    ]
+                                )
+                            }
+                        }
+                    } //end dir
+                } //end node
+            } //end podTemplate
+        } //end stage
+    }, //end branch
+    "API Tests": {
+        _stage('API Tests', context) {
+            waitUntil {
+                sleep 5
+                return isDeployed
+            }
+            podTemplate(
+                label: "nodejs-${context.uuid}",
+                name: "nodejs-${context.uuid}",
+                serviceAccount: 'jenkins',
+                cloud: 'openshift',
+                containers: [
+                    containerTemplate(
+                        name: 'jnlp',
+                        image: 'registry.access.redhat.com/openshift3/jenkins-agent-nodejs-8-rhel7',
+                        resourceRequestCpu: '800m',
+                        resourceLimitCpu: '800m',
+                        resourceRequestMemory: '1Gi',
+                        resourceLimitMemory: '1Gi',
+                        workingDir: '/tmp',
+                        command: '',
+                        args: '${computer.jnlpmac} ${computer.name}',
+                        envVars: [
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_USER',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'username'
+                            ),
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_PASSWORD',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'password'
+                            ),
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_AUTH_SERVER',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'auth_server'
+                            ),
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_CLIENT_ID',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'client_id'
+                            ),
+                            secretEnvVar(
+                                key: 'GWELLS_API_TEST_CLIENT_SECRET',
+                                secretName: 'apitest-secrets',
+                                secretKey: 'client_secret'
+                            )
+                        ]
+                    )
+                ]
+            ) {
+                node("nodejs-${context.uuid}") {
+                    checkout scm
+                    dir('api-tests') {
+                        sh 'npm install -g newman'
+                        waitUntil {
+                            sleep 5
+                            return isFixtured
+                        }
+                        String BASEURL = context.deployments['dev'].environmentUrl.substring(0, context.deployments['dev'].environmentUrl.indexOf('/', 8) + 1)
+                        BASEURL += "gwells"
+                        try {
+                            sh """
+                                newman run ./registries_api_tests.json \
+                                    --global-var test_user=\$GWELLS_API_TEST_USER \
+                                    --global-var test_password=\$GWELLS_API_TEST_PASSWORD \
+                                    --global-var base_url=${BASEURL} \
+                                    --global-var auth_server=\$GWELLS_API_TEST_AUTH_SERVER \
+                                    --global-var client_id=\$GWELLS_API_TEST_CLIENT_ID \
+                                    --global-var client_secret=\$GWELLS_API_TEST_CLIENT_SECRET \
+                                    -r cli,junit,html
+                                newman run ./wells_api_tests.json \
+                                    --global-var test_user=\$GWELLS_API_TEST_USER \
+                                    --global-var test_password=\$GWELLS_API_TEST_PASSWORD \
+                                    --global-var base_url=${BASEURL} \
+                                    --global-var auth_server=\$GWELLS_API_TEST_AUTH_SERVER \
+                                    --global-var client_id=\$GWELLS_API_TEST_CLIENT_ID \
+                                    --global-var client_secret=\$GWELLS_API_TEST_CLIENT_SECRET \
+                                    -r cli,junit,html
+                                newman run ./submissions_api_tests.json \
+                                    --global-var test_user=\$GWELLS_API_TEST_USER \
+                                    --global-var test_password=\$GWELLS_API_TEST_PASSWORD \
+                                    --global-var base_url=${BASEURL} \
+                                    --global-var auth_server=\$GWELLS_API_TEST_AUTH_SERVER \
+                                    --global-var client_id=\$GWELLS_API_TEST_CLIENT_ID \
+                                    --global-var client_secret=\$GWELLS_API_TEST_CLIENT_SECRET \
+                                    -r cli,junit,html
+                                newman run ./aquifers_api_tests.json \
+                                    --global-var test_user=\$GWELLS_API_TEST_USER \
+                                    --global-var test_password=\$GWELLS_API_TEST_PASSWORD \
+                                    --global-var base_url=${BASEURL} \
+                                    --global-var auth_server=\$GWELLS_API_TEST_AUTH_SERVER \
+                                    --global-var client_id=\$GWELLS_API_TEST_CLIENT_ID \
+                                    --global-var client_secret=\$GWELLS_API_TEST_CLIENT_SECRET \
+                                    -r cli,junit,html
+                            """
+                        } finally {
+                                junit 'newman/*.xml'
+                                publishHTML (
+                                    target: [
+                                        allowMissing: false,
+                                        alwaysLinkToLastBuild: false,
+                                        keepAll: true,
+                                        reportDir: 'newman',
+                                        reportFiles: 'newman*.html',
+                                        reportName: "API Test Report"
+                                    ]
+                                )
+                                stash includes: 'newman/*.xml', name: 'api-tests'
+                        }
+                    } // end dir
+                } //end node
+            } //end podTemplate
+        } //end stage
+    }, //end branch
+    "Code Quality": {
+        /* Code quality stage - pipeline step/closure
+        - unstash unit test results (previous stage)
+        - use SonarQube to consume results (*.xml)
+        */
+        _stage('Code Quality', context) {
+            podTemplate(
+                name: "sonar-runner${context.uuid}",
+                label: "sonar-runner${context.uuid}",
+                serviceAccount: 'jenkins',
+                cloud: 'openshift',
+                containers:[
+                    containerTemplate(
+                        name: 'jnlp',
+                        resourceRequestMemory: '4Gi',
+                        resourceLimitMemory: '4Gi',
+                        resourceRequestCpu: '4000m',
+                        resourceLimitCpu: '4000m',
+                        image: 'registry.access.redhat.com/openshift3/jenkins-slave-maven-rhel7:v3.7',
+                        workingDir: '/tmp',
+                        args: '${computer.jnlpmac} ${computer.name}',
+                        envVars: [
+                            envVar(key:'GRADLE_USER_HOME', value: '/var/cache/artifacts/gradle')
+                        ]
+                    )
+                ],
+                volumes: [
+                    persistentVolumeClaim(
+                        mountPath: '/var/cache/artifacts',
+                        claimName: 'cache',
+                        readOnly: false
+                    )
+                ]
+            ){
+                node("sonar-runner${context.uuid}") {
+                    //the checkout is mandatory, otherwise code quality check would fail
+                    echo "checking out source"
+                    echo "Build: ${BUILD_ID}"
+                    checkout scm
+
+                    String SONARQUBE_URL = 'https://sonarqube-moe-gwells-tools.pathfinder.gov.bc.ca'
+                    echo "SONARQUBE_URL: ${SONARQUBE_URL}"
+                    waitUntil {
+                        sleep 5
+                        return isUnitTested
+                    }
+                    dir('app') {
+                        unstash 'nodejunit'
+                        unstash 'nodecoverage'
+                    }
+                    dir('sonar-runner') {
+                        unstash 'coverage'
+                        sh script:
+                            """
+                                ./gradlew -q dependencies
+                                ./gradlew sonarqube -Dsonar.host.url=${SONARQUBE_URL} -Dsonar.verbose=true \
+                                    --stacktrace --info  -Dsonar.sources=..
+                            """,
+                            returnStdout: true
+                    }
+                } //end node
+            } //end podTemplate
+        } //end stage
+    } //end branch
+) //end parallel
+
+
+/* Continuous Deployment (CD)
+   For PRs to the master branch, reserved for release branches and hotfixes
+   Iterates through DEV (skipped), TEST and PROD environments
+    - [prompt/stop]
+      || deployment to persistent TEST environment (sets isDeployed=true)
+      || smoke tests (executes on isDeployed)
+    - [prompt/stop]
+      - deployment to persistent PROD environment
+      - GitHub tasks (merge, close PR, deleteproduction branch)
+*/
+for(String envKeyName: context.env.keySet() as String[]){
+    String stageDeployName=envKeyName.toUpperCase()
+
+    if (!"DEV".equalsIgnoreCase(stageDeployName) && "master".equalsIgnoreCase(env.CHANGE_TARGET)) {
+        _stage("Approve - ${stageDeployName}", context) {
+            node('master') {
+                new OpenShiftHelper().waitUntilEnvironmentIsReady(this, context, envKeyName)
+            }
+            def inputResponse = null;
+            try{
+                inputResponse = input(
+                    id: "deploy_${stageDeployName.toLowerCase()}",
+                    message: "Deploy to ${stageDeployName}?",
+                    ok: 'Approve',
+                    submitterParameter: 'approved_by'
+                )
+            }catch(ex){
+                error "Pipeline has been aborted. - ${ex}"
+            }
+            GitHubHelper.getPullRequest(this).comment(
+                "User '${inputResponse}' has approved deployment to '${stageDeployName}'"
+            )
+        }
+
+        isDeployed = false
+        parallel (
+            "Deploy - ${stageDeployName}": {
+                _stage("Deploy - ${stageDeployName}", context) {
+                    node('master') {
+                        new OpenShiftHelper().deploy(this, context, envKeyName)
+                        isDeployed = true
+                    }
+                }
+            },
+            "Smoke Test - ${stageDeployName}": {
+                waitUntil {
+                    sleep 5
+                    return isDeployed
+                }
+                _stage("Smoke Test - ${stageDeployName}", context){
+                    String baseURL = context.deployments[envKeyName].environmentUrl.substring(
+                        0,
+                        context.deployments[envKeyName].environmentUrl.indexOf('/', 8) + 1
+                    )
+                    podTemplate(
+                        label: "bddstack-${context.uuid}",
+                        name: "bddstack-${context.uuid}",
+                        serviceAccount: 'jenkins',
+                        cloud: 'openshift',
+                        containers: [
+                          containerTemplate(
+                             name: 'jnlp',
+                             image: 'docker-registry.default.svc:5000/openshift/jenkins-slave-bddstack',
+                             resourceRequestCpu: '800m',
+                             resourceLimitCpu: '800m',
+                             resourceRequestMemory: '3Gi',
+                             resourceLimitMemory: '3Gi',
+                             workingDir: '/home/jenkins',
+                             command: '',
+                             args: '${computer.jnlpmac} ${computer.name}',
+                             envVars: [
+                                 envVar(key:'BASEURL', value: baseURL),
+                                 envVar(key:'GRADLE_USER_HOME', value: '/var/cache/artifacts/gradle')
+                             ]
+                          )
+                        ],
+                        volumes: [
+                            persistentVolumeClaim(
+                                mountPath: '/var/cache/artifacts',
+                                claimName: 'cache',
+                                readOnly: false
+                            )
+                        ]
+                    ){
+                        node("bddstack-${context.uuid}") {
+                            echo "Build: ${BUILD_ID}"
+                            echo "baseURL: ${baseURL}"
+                            checkout scm
+                            dir('functional-tests') {
+                                try {
+                                    sh './gradlew -DchromeHeadlessTest.single=WellDetails chromeHeadlessTest'
+                                } finally {
+                                    archiveArtifacts allowEmptyArchive: true, artifacts: 'build/reports/geb/**/*'
+                                    junit testResults:'build/test-results/**/*.xml', allowEmptyResults:true
+                                    publishHTML (
+                                        target: [
+                                            allowMissing: true,
+                                            alwaysLinkToLastBuild: false,
+                                            keepAll: true,
+                                            reportDir: 'build/reports/spock',
+                                            reportFiles: 'index.html',
+                                            reportName: "Test: BDD Spock Report"
+                                        ]
+                                    )
+                                    publishHTML (
+                                        target: [
+                                            allowMissing: true,
+                                            alwaysLinkToLastBuild: false,
+                                            keepAll: true,
+                                            reportDir: 'build/reports/tests/chromeHeadlessTest',
+                                            reportFiles: 'index.html',
+                                            reportName: "Test: Full Test Report"
+                                        ]
+                                    )
+                                }
+                            } //end dir
+                        } //end node
+                    } //end podTemplate
+                } //end stage
+            }
+        )
+    } //end if
+} // end for
+
+
+/* Cleanup stage - pipeline step/closure
+    - Prompt user to continue
+    - Remove temporary OpenShift resources (moe-gwells-dev)
+    - Merge and delete branches
+*/
+stage('Cleanup') {
+
+    def inputResponse = null
+    String mergeMethod='merge'
+
+    waitUntil {
+        boolean isDone=false
+        try{
+            inputResponse=input(
+                id: 'close_pr',
+                message: "Ready to Accept/Merge (using '${mergeMethod}' method), and Close pull-request #${env.CHANGE_ID}?",
+                ok: 'Yes',
+                submitter: 'authenticated',
+                submitterParameter: 'approver'
+            )
+            echo "inputResponse:${inputResponse}"
+
+            echo "Merging and Closing PR"
+            GitHubHelper.mergeAndClosePullRequest(this, mergeMethod)
+
+            echo "Clearing OpenShift resources"
+            new OpenShiftHelper().cleanup(this, context)
+
+            isDone=true
+        }catch (ex){
+            echo "${stackTraceAsString(ex)}"
+            def inputAction = input(
+                message: "This 'Cleanup' stage has failed. See error above.",
+                ok: 'Confirm',
+                submitter: 'authenticated',
+                parameters: [
+                    choice(
+                        name: 'action',
+                        choices: 'Re-run\nIgnore',
+                        description: 'What would you like to do?'
+                    )
+                ]
+            )
+            if ('Ignore'.equalsIgnoreCase(inputAction)){
+                isDone=true
+            }
+        }
+        return isDone
+    } //end waitUntil
+}
diff --git a/Makefile b/Makefile
index 780b16dc5b..268132d12a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,13 @@
 default: vue
 
 vue: prep
-	NPM_CMD=dev docker-compose up; docker-compose down
+	NPM_CMD=dev docker-compose up -d
 
 api: prep
-	NPM_CMD=build docker-compose up; docker-compose down
+	NPM_CMD=build docker-compose up -d
 
 django: prep
-	NPM_CMD=watch docker-compose up; docker-compose down
+	NPM_CMD=watch docker-compose up -d
 
 
 ###################
@@ -23,6 +23,21 @@ prep:
 	@	docker-compose pull
 	@	docker-compose build
 
+fixtures:
+	@	docker exec -ti gwells_api_1 bash -c " \
+			cd /app/backend; \
+			python manage.py migrate; \
+			python manage.py loaddata gwells-codetables.json; \
+			python manage.py loaddata wellsearch-codetables.json registries-codetables.json; \
+			python manage.py loaddata wellsearch.json.gz registries.json; \
+			python manage.py loaddata aquifers.json; \
+			python manage.py createinitialrevisions \
+		" || \
+			echo "Failed.  Please make sure the API container has had time to start."
+
+down:
+	@	docker-compose down
+
 db-clean:
 	@	docker-compose down || true
 	@	rm -rf ./.tmp/psql-dev
diff --git a/api-tests/.envrc b/api-tests/.envrc
new file mode 100644
index 0000000000..5c931dcb22
--- /dev/null
+++ b/api-tests/.envrc
@@ -0,0 +1,10 @@
+
+# Set variables required for newman api tests
+#export GWELLS_API_BASE_URL=https://gwells-dev-pr-862-moe-gwells-dev.pathfinder.gov.bc.ca/gwells
+#export GWELLS_API_BASE_URL=https://gwells-dev-pr-860-moe-gwells-dev.pathfinder.gov.bc.ca/gwells
+export GWELLS_API_BASE_URL=http://127.0.0.1:8000/gwells
+export GWELLS_API_TEST_USER=testuser
+export GWELLS_API_TEST_AUTH_SERVER=https://sso-test.pathfinder.gov.bc.ca/auth/realms/gwells/protocol/openid-connect/token
+export GWELLS_API_TEST_CLIENT_ID=gwells-api-test
+
+dotenv .secret_env
\ No newline at end of file
diff --git a/api-tests/aquifers_api_tests.json b/api-tests/aquifers_api_tests.json
index 7246833962..f3b73244f7 100644
--- a/api-tests/aquifers_api_tests.json
+++ b/api-tests/aquifers_api_tests.json
@@ -43,6 +43,272 @@
 			},
 			"response": []
 		},
+		{
+			"name": "Aquifer Codes / Materials List",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "85664ee3-92d9-4510-b7d8-6bd6c44ec870",
+						"type": "text/javascript",
+						"exec": [
+							"var jsonData = pm.response.json()",
+							"",
+							"pm.test(\"Status code is 200\", function () {",
+							"    pm.expect(pm.response.code).to.equal(200);",
+							"})",
+							""
+						]
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {},
+				"url": {
+					"raw": "{{base_url}}/api/v1/aquifer-codes/materials",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"v1",
+						"aquifer-codes",
+						"materials"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Aquifer Codes / Quality Concerns List",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "85664ee3-92d9-4510-b7d8-6bd6c44ec870",
+						"type": "text/javascript",
+						"exec": [
+							"var jsonData = pm.response.json()",
+							"",
+							"pm.test(\"Status code is 200\", function () {",
+							"    pm.expect(pm.response.code).to.equal(200);",
+							"})",
+							""
+						]
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {},
+				"url": {
+					"raw": "{{base_url}}/api/v1/aquifer-codes/quality-concerns",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"v1",
+						"aquifer-codes",
+						"quality-concerns"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Aquifer Codes / Vulnerability List",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "85664ee3-92d9-4510-b7d8-6bd6c44ec870",
+						"type": "text/javascript",
+						"exec": [
+							"var jsonData = pm.response.json()",
+							"",
+							"pm.test(\"Status code is 200\", function () {",
+							"    pm.expect(pm.response.code).to.equal(200);",
+							"})",
+							""
+						]
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {},
+				"url": {
+					"raw": "{{base_url}}/api/v1/aquifer-codes/vulnerability",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"v1",
+						"aquifer-codes",
+						"vulnerability"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Aquifer Codes / Subtypes List",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "85664ee3-92d9-4510-b7d8-6bd6c44ec870",
+						"type": "text/javascript",
+						"exec": [
+							"var jsonData = pm.response.json()",
+							"",
+							"pm.test(\"Status code is 200\", function () {",
+							"    pm.expect(pm.response.code).to.equal(200);",
+							"})",
+							""
+						]
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {},
+				"url": {
+					"raw": "{{base_url}}/api/v1/aquifer-codes/subtypes",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"v1",
+						"aquifer-codes",
+						"subtypes"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Aquifer Codes / Productivity List",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "85664ee3-92d9-4510-b7d8-6bd6c44ec870",
+						"type": "text/javascript",
+						"exec": [
+							"var jsonData = pm.response.json()",
+							"",
+							"pm.test(\"Status code is 200\", function () {",
+							"    pm.expect(pm.response.code).to.equal(200);",
+							"})",
+							""
+						]
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {},
+				"url": {
+					"raw": "{{base_url}}/api/v1/aquifer-codes/productivity",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"v1",
+						"aquifer-codes",
+						"productivity"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Aquifer Codes / Demand List",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "85664ee3-92d9-4510-b7d8-6bd6c44ec870",
+						"type": "text/javascript",
+						"exec": [
+							"var jsonData = pm.response.json()",
+							"",
+							"pm.test(\"Status code is 200\", function () {",
+							"    pm.expect(pm.response.code).to.equal(200);",
+							"})",
+							""
+						]
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {},
+				"url": {
+					"raw": "{{base_url}}/api/v1/aquifer-codes/demand",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"v1",
+						"aquifer-codes",
+						"demand"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Aquifer Codes / Water Use List",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "85664ee3-92d9-4510-b7d8-6bd6c44ec870",
+						"type": "text/javascript",
+						"exec": [
+							"var jsonData = pm.response.json()",
+							"",
+							"pm.test(\"Status code is 200\", function () {",
+							"    pm.expect(pm.response.code).to.equal(200);",
+							"})",
+							""
+						]
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {},
+				"url": {
+					"raw": "{{base_url}}/api/v1/aquifer-codes/water-use",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"v1",
+						"aquifer-codes",
+						"water-use"
+					]
+				}
+			},
+			"response": []
+		},
 		{
 			"name": "Aquifers Search",
 			"event": [
@@ -130,6 +396,44 @@
 				}
 			},
 			"response": []
+		},
+		{
+			"name": "Aquifer Retrieve",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "768133b0-7dd6-4197-97ca-ddca5cb1743f",
+						"type": "text/javascript",
+						"exec": [
+							"var jsonData = pm.response.json()",
+							"",
+							"pm.test(\"Status code is 200\", function () {",
+							"    pm.expect(pm.response.code).to.equal(200);",
+							"})",
+							""
+						]
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {},
+				"url": {
+					"raw": "{{base_url}}/api/v1/aquifers/1",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"v1",
+						"aquifers",
+						"1"
+					]
+				}
+			},
+			"response": []
 		}
 	]
 }
\ No newline at end of file
diff --git a/api-tests/local_aquifers.sh b/api-tests/local_aquifers.sh
new file mode 100755
index 0000000000..b3c2060b28
--- /dev/null
+++ b/api-tests/local_aquifers.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# 
+# Usage:
+# - Set env variables (choose any username and password):
+#   GWELLS_API_TEST_USER:  test account username
+#   GWELLS_API_TEST_PASSWORD:  test account password
+#   GWELLS_API_BASE_URL:   URL for testing (API tests will make requests here)
+#   GWELLS_API_TEST_AUTH_SERVER:  SSO auth server (GWELLS realm)
+#   GWELLS_API_TEST_CLIENT_ID:   SSO test client ID (the client set up on the GWELLS realm for testing)
+#   GWELLS_API_TEST_CLIENT_SECRET:   SSO test client secret
+# - Install newman:
+#     npm install -g newman
+# - Run script:
+#     ./local_newman.sh
+
+
+ENV_VARS=(
+    "GWELLS_API_TEST_USER"
+    "GWELLS_API_TEST_PASSWORD"
+    "GWELLS_API_BASE_URL"
+    "GWELLS_API_TEST_AUTH_SERVER"
+    "GWELLS_API_TEST_CLIENT_ID"
+    "GWELLS_API_TEST_CLIENT_SECRET"
+)
+
+for env_var in ${ENV_VARS[@]}
+do
+    if [ -z ${!env_var+x} ]; then 
+        echo "$env_var is unset"
+        exit
+    fi
+done
+
+echo "Remember to install newman (npm install -g newman) and set GWELLS_API_TEST_USER,"
+echo "GWELLS_API_TEST_PASSWORD, GWELLS_API_BASE_URL and Keycloak credentials"
+newman run ./aquifers_api_tests.json --global-var test_user=$GWELLS_API_TEST_USER --global-var test_password=$GWELLS_API_TEST_PASSWORD --global-var base_url=$GWELLS_API_BASE_URL --global-var auth_server=$GWELLS_API_TEST_AUTH_SERVER --global-var client_id=$GWELLS_API_TEST_CLIENT_ID --global-var client_secret=$GWELLS_API_TEST_CLIENT_SECRET
diff --git a/api-tests/submissions_api_tests.json b/api-tests/submissions_api_tests.json
index a337e36057..0c7b0abd61 100644
--- a/api-tests/submissions_api_tests.json
+++ b/api-tests/submissions_api_tests.json
@@ -95,859 +95,1718 @@
 			"name": "Activity Submissions",
 			"item": [
 				{
-					"name": "Submission form Options",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "20837dbe-0390-4709-b8dc-4ac3b22153f4",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json()",
-									"",
-									"pm.test(\"Status code is 200\", function () {",
-									"    pm.expect(pm.response.code).to.equal(200);",
-									"})",
-									""
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "GET",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/options/?format=json",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"api",
-								"v1",
-								"submissions",
-								"options",
-								""
-							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
-								}
-							]
-						},
-						"description": "Get form submission options"
-					},
-					"response": []
-				},
-				{
-					"name": "Submission list",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "20837dbe-0390-4709-b8dc-4ac3b22153f4",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json()",
-									"",
-									"pm.test(\"Status code is 200\", function () {",
-									"    pm.expect(pm.response.code).to.equal(200);",
-									"})",
-									""
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "GET",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"api",
-								"v1",
-								"submissions",
-								""
-							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
-								}
-							]
-						},
-						"description": "Request a list of wells"
-					},
-					"response": []
-				},
-				{
-					"name": "Create new driller for submission",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "05a0005d-cae7-447a-b666-63de221afd22",
-								"type": "text/javascript",
-								"exec": [
-									"( function() {",
-									"    pm.test(\"Successful POST request\", function () {",
-									"        pm.expect(pm.response.code).to.be.oneOf([201,202]);",
-									"    });",
-									"    ",
-									"    var jsonData = pm.response.json()",
-									"    pm.environment.set(\"created_driller_guid\", jsonData.person_guid);",
-									"    pm.environment.set(\"driller_audit_name\", jsonData.create_user);",
-									"    ",
-									"    pm.test(\"The record's identifier is in UUID format\", function () {",
-									"        var uuid_re = /\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}/;",
-									"        var match = uuid_re.exec(jsonData.person_guid);",
-									"        pm.expect(match).to.be.ok;",
-									"        pm.expect(match.length).to.be.ok;",
-									"        pm.expect(match[0]).to.eql(jsonData.person_guid);",
-									"    });",
-									"    ",
-									"    pm.test(\"Person first name equals name supplied in request\", function () {",
-									"        pm.expect(jsonData.first_name).to.eql(\"Bobby\");",
-									"    });",
-									"    ",
-									"    pm.test(\"Last name equals value supplied in request\", function () {",
-									"        pm.expect(jsonData.surname).to.eql(\"Driller\");",
-									"    });",
-									"    ",
-									"    pm.test(\"Audit fields (create_user, create_date) were filled in by backend\", function () {",
-									"        pm.expect(jsonData.create_user.length).to.be.ok;",
-									"        pm.expect(jsonData.create_date.length).to.be.ok;",
-									"    });",
-									"})();",
-									""
-								]
-							}
-						}
-					],
-					"request": {
-						"auth": {
-							"type": "noauth"
-						},
-						"method": "POST",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							}
-						],
-						"body": {
-							"mode": "formdata",
-							"formdata": [
-								{
-									"key": "first_name",
-									"value": "Bobby",
-									"type": "text"
-								},
-								{
-									"key": "surname",
-									"value": "Driller",
-									"type": "text"
-								}
-							]
-						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/drillers/?format=json",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"api",
-								"v1",
-								"drillers",
-								""
-							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
-								}
-							]
-						},
-						"description": "Create a new driller to be registered"
-					},
-					"response": []
-				},
-				{
-					"name": "Submission",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "465f6140-5cef-4ee6-b5ff-8135e63f1903",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.environment.set(\"well_tag_number\", jsonData.well);",
-									"",
-									"pm.test(\"Status code is 201\", function () {",
-									"   pm.expect(pm.response.code).to.equal(201);",
-									"})",
-									"",
-									"pm.test(\"Expect well record to be created\", function() {",
-									"    pm.expect(jsonData.well).to.be.ok;",
-									"})",
-									""
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							},
-							{
-								"key": "Content-Type",
-								"value": "application/x-www-form-urlencoded"
-							}
-						],
-						"body": {
-							"mode": "urlencoded",
-							"urlencoded": [
-								{
-									"key": "well_activity_type",
-									"value": "CON",
-									"type": "text"
-								},
-								{
-									"key": "driller_responsible",
-									"value": "{{created_driller_guid}}",
-									"type": "text"
-								},
-								{
-									"key": "work_end_date",
-									"value": "2018-07-02",
-									"type": "text"
-								},
-								{
-									"key": "owner_full_name",
-									"value": "Holly Homeowner",
-									"type": "text"
-								},
-								{
-									"key": "work_start_date",
-									"value": "2018-07-01",
-									"type": "text"
-								},
-								{
-									"key": "owner_province_state",
-									"value": "BC",
-									"type": "text"
-								},
-								{
-									"key": "owner_mailing_address",
-									"value": "321 Main Street",
-									"type": "text"
-								},
-								{
-									"key": "owner_city",
-									"value": "Anytown",
-									"type": "text"
-								}
-							]
-						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"api",
-								"v1",
-								"submissions",
-								""
-							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
-								}
-							]
-						},
-						"description": "Submit a submission"
-					},
-					"response": []
-				},
-				{
-					"name": "Check submission - created well",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "8cda82f1-4f66-419a-9d79-636186a44b6c",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.test(\"Status code is 200\", function () {",
-									"   pm.expect(pm.response.code).to.equal(200);",
-									"})",
-									"",
-									"pm.test(\"Expect casing list to be empty\", function() {",
-									"    pm.expect(jsonData.casing_set.length).to.equal(0);",
-									"})",
-									"",
-									"pm.test(\"Expect screen list empty\", function() {",
-									"    pm.expect(jsonData.screen_set.length).to.equal(0);",
-									"})",
-									"",
-									"pm.test(\"Expect linerperforation to be empty\", function() {",
-									"    pm.expect(jsonData.linerperforation_set.length).to.equal(0);",
-									"})"
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "GET",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							},
-							{
-								"key": "Content-Type",
-								"value": "application/x-www-form-urlencoded"
-							}
-						],
-						"body": {
-							"mode": "urlencoded",
-							"urlencoded": [
-								{
-									"key": "well_activity_type",
-									"value": "CON",
-									"type": "text"
-								},
-								{
-									"key": "driller_responsible",
-									"value": "{{created_driller_guid}}",
-									"type": "text"
-								},
-								{
-									"key": "work_end_date",
-									"value": "2018-07-02",
-									"type": "text"
-								},
-								{
-									"key": "owner_full_name",
-									"value": "Holly Homeowner",
-									"type": "text"
-								},
-								{
-									"key": "work_start_date",
-									"value": "2018-07-01",
-									"type": "text"
-								},
-								{
-									"key": "owner_province_state",
-									"value": "BC",
-									"type": "text"
-								},
-								{
-									"key": "owner_mailing_address",
-									"value": "321 Main Street",
-									"type": "text"
-								},
-								{
-									"key": "owner_city",
-									"value": "Anytown",
-									"type": "text"
+					"name": "General",
+					"item": [
+						{
+							"name": "Submission form Options",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "20837dbe-0390-4709-b8dc-4ac3b22153f4",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json()",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"    pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											""
+										]
+									}
 								}
-							]
-						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
-							"host": [
-								"{{base_url}}"
 							],
-							"path": [
-								"api",
-								"v1",
-								"wells",
-								"{{well_tag_number}}"
-							]
-						},
-						"description": "Check if the created well matched submission"
-					},
-					"response": []
-				},
-				{
-					"name": "Submission - casings",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "c6ccd3af-884d-45fb-93f4-21294aa25b3a",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.environment.set(\"well_tag_number\", jsonData.well);",
-									"",
-									"pm.test(\"Status code is 201\", function () {",
-									"   pm.expect(pm.response.code).to.equal(201);",
-									"})",
-									"",
-									"pm.test(\"Expect casings records to be created\", function() {",
-									"    pm.expect(jsonData.casing_set.length).to.equal(2);",
-									"})",
-									"",
-									""
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/options/?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"options",
+										""
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Get form submission options"
 							},
-							{
-								"key": "Content-Type",
-								"value": "application/json"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"1\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"1\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t},\n\t\t{\n\t\t\t\"casing_code\":\"SURFACE\",\n\t\t\t\"start\":\"2\",\n\t\t\t\"casing_material\":\"STEEL\",\n\t\t\t\"end\":\"2\",\n\t\t\t\"diameter\":\"2\",\n\t\t\t\"drive_shoe\":\"True\",\n\t\t\t\"id\":1,\n\t\t\t\"wall_thickness\":\"7\"\n\t\t}\n\t]\n}"
+							"response": []
 						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"api",
-								"v1",
-								"submissions",
-								""
-							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
+						{
+							"name": "Submission list",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "20837dbe-0390-4709-b8dc-4ac3b22153f4",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json()",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"    pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											""
+										]
+									}
 								}
-							]
+							],
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										""
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Request a list of wells"
+							},
+							"response": []
 						},
-						"description": "Request a list of wells"
-					},
-					"response": []
-				},
-				{
-					"name": "Submission - casings - empty",
-					"event": [
 						{
-							"listen": "test",
-							"script": {
-								"id": "bf57abbb-38dd-41f5-a5bc-b8b85d729ade",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.test(\"Status code is 400\", function () {",
-									"   pm.expect(pm.response.code).to.equal(400);",
-									"})",
-									""
-								]
-							}
+							"name": "Create new driller for submission",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "05a0005d-cae7-447a-b666-63de221afd22",
+										"type": "text/javascript",
+										"exec": [
+											"( function() {",
+											"    pm.test(\"Successful POST request\", function () {",
+											"        pm.expect(pm.response.code).to.be.oneOf([201,202]);",
+											"    });",
+											"    ",
+											"    var jsonData = pm.response.json()",
+											"    pm.environment.set(\"created_driller_guid\", jsonData.person_guid);",
+											"    pm.environment.set(\"driller_audit_name\", jsonData.create_user);",
+											"    ",
+											"    pm.test(\"The record's identifier is in UUID format\", function () {",
+											"        var uuid_re = /\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}/;",
+											"        var match = uuid_re.exec(jsonData.person_guid);",
+											"        pm.expect(match).to.be.ok;",
+											"        pm.expect(match.length).to.be.ok;",
+											"        pm.expect(match[0]).to.eql(jsonData.person_guid);",
+											"    });",
+											"    ",
+											"    pm.test(\"Person first name equals name supplied in request\", function () {",
+											"        pm.expect(jsonData.first_name).to.eql(\"Bobby\");",
+											"    });",
+											"    ",
+											"    pm.test(\"Last name equals value supplied in request\", function () {",
+											"        pm.expect(jsonData.surname).to.eql(\"Driller\");",
+											"    });",
+											"    ",
+											"    pm.test(\"Audit fields (create_user, create_date) were filled in by backend\", function () {",
+											"        pm.expect(jsonData.create_user.length).to.be.ok;",
+											"        pm.expect(jsonData.create_date.length).to.be.ok;",
+											"    });",
+											"})();",
+											""
+										]
+									}
+								}
+							],
+							"request": {
+								"auth": {
+									"type": "noauth"
+								},
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									}
+								],
+								"body": {
+									"mode": "formdata",
+									"formdata": [
+										{
+											"key": "first_name",
+											"value": "Bobby",
+											"type": "text"
+										},
+										{
+											"key": "surname",
+											"value": "Driller",
+											"type": "text"
+										}
+									]
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/drillers/?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"drillers",
+										""
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Create a new driller to be registered"
+							},
+							"response": []
 						}
 					],
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							},
-							{
-								"key": "Content-Type",
-								"value": "application/json"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"casing_set\": [\n\t\t{\n\t\t},\n\t\t{\n\t\t}\n\t]\n}"
-						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"api",
-								"v1",
-								"submissions",
-								""
-							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
-								}
-							]
-						},
-						"description": "Request a list of wells"
-					},
-					"response": []
+					"_postman_isSubFolder": true
 				},
 				{
-					"name": "Check submission - created well casings",
-					"event": [
+					"name": "Construction",
+					"item": [
 						{
-							"listen": "test",
-							"script": {
-								"id": "31a610c9-915e-4873-931a-613c8b1cfde4",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.test(\"Status code is 200\", function () {",
-									"   pm.expect(pm.response.code).to.equal(200);",
-									"})",
-									"",
-									"pm.test(\"Expect casing list to contain two entries\", function() {",
-									"    pm.expect(jsonData.casing_set.length).to.equal(2);",
-									"})",
-									"",
-									"pm.test(\"Expect screen list empty\", function() {",
-									"    pm.expect(jsonData.screen_set.length).to.equal(0);",
-									"})",
-									"",
-									"pm.test(\"Expect linerperforation to be empty\", function() {",
-									"    pm.expect(jsonData.linerperforation_set.length).to.equal(0);",
-									"})"
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "GET",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							},
-							{
-								"key": "Content-Type",
-								"value": "application/x-www-form-urlencoded"
-							}
-						],
-						"body": {
-							"mode": "urlencoded",
-							"urlencoded": [
-								{
-									"key": "well_activity_type",
-									"value": "CON",
-									"type": "text"
-								},
-								{
-									"key": "driller_responsible",
-									"value": "{{created_driller_guid}}",
-									"type": "text"
-								},
-								{
-									"key": "work_end_date",
-									"value": "2018-07-02",
-									"type": "text"
-								},
-								{
-									"key": "owner_full_name",
-									"value": "Holly Homeowner",
-									"type": "text"
+							"name": "Construction Submission",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "74cf621d-6689-43e8-be83-f6b1cb4d5d0a",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.environment.set(\"well_tag_number\", jsonData.well);",
+											"pm.environment.set('filing_number', jsonData.filing_number)",
+											"",
+											"pm.test(\"Status code is 201\", function () {",
+											"   pm.expect(pm.response.code).to.equal(201);",
+											"})",
+											"",
+											"pm.test(\"Expect well record to be created\", function() {",
+											"    pm.expect(jsonData.well).to.be.ok;",
+											"})",
+											""
+										]
+									}
+								}
+							],
+							"request": {
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
 								},
-								{
-									"key": "work_start_date",
-									"value": "2018-07-01",
-									"type": "text"
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/construction?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"construction"
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
 								},
-								{
-									"key": "owner_province_state",
-									"value": "BC",
-									"type": "text"
+								"description": "Submit a submission"
+							},
+							"response": []
+						},
+						{
+							"name": "Check submission - created well",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "8cda82f1-4f66-419a-9d79-636186a44b6c",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"   pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											"",
+											"pm.test(\"Expect casing list to be empty\", function() {",
+											"    pm.expect(jsonData.casing_set.length).to.equal(0);",
+											"})",
+											"",
+											"pm.test(\"Expect screen list empty\", function() {",
+											"    pm.expect(jsonData.screen_set.length).to.equal(0);",
+											"})",
+											"",
+											"pm.test(\"Expect linerperforation to be empty\", function() {",
+											"    pm.expect(jsonData.linerperforation_set.length).to.equal(0);",
+											"})"
+										]
+									}
+								}
+							],
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "well_activity_type",
+											"value": "CON",
+											"type": "text"
+										},
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
 								},
-								{
-									"key": "owner_mailing_address",
-									"value": "321 Main Street",
-									"type": "text"
+								"url": {
+									"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"wells",
+										"{{well_tag_number}}"
+									]
 								},
-								{
-									"key": "owner_city",
-									"value": "Anytown",
-									"type": "text"
-								}
-							]
+								"description": "Check if the created well matched submission"
+							},
+							"response": []
 						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
-							"host": [
-								"{{base_url}}"
+						{
+							"name": "Check submission - created construction submission",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "8cda82f1-4f66-419a-9d79-636186a44b6c",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"   pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											"",
+											"pm.test(\"Expect casing list to be empty\", function() {",
+											"    pm.expect(jsonData.casing_set.length).to.equal(0);",
+											"})",
+											"",
+											"pm.test(\"Expect screen list empty\", function() {",
+											"    pm.expect(jsonData.screen_set.length).to.equal(0);",
+											"})",
+											"",
+											"pm.test(\"Expect linerperforation to be empty\", function() {",
+											"    pm.expect(jsonData.linerperforation_set.length).to.equal(0);",
+											"})"
+										]
+									}
+								}
 							],
-							"path": [
-								"api",
-								"v1",
-								"wells",
-								"{{well_tag_number}}"
-							]
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "well_activity_type",
+											"value": "CON",
+											"type": "text"
+										},
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/{{filing_number}}",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"{{filing_number}}"
+									]
+								},
+								"description": "Check if the submission was created correctly."
+							},
+							"response": []
 						},
-						"description": "Check if the created well matched submission"
-					},
-					"response": []
-				},
-				{
-					"name": "Submission - screen",
-					"event": [
 						{
-							"listen": "test",
-							"script": {
-								"id": "eaf2d1fa-c857-4c87-b7a5-bab319649826",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.environment.set(\"well_tag_number\", jsonData.well);",
-									"",
-									"pm.test(\"Status code is 201\", function() {",
-									"    pm.expect(pm.response.code).to.equal(201);",
-									"})"
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
+							"name": "Construction Submission - casings",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "c6ccd3af-884d-45fb-93f4-21294aa25b3a",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.environment.set(\"well_tag_number\", jsonData.well);",
+											"",
+											"pm.test(\"Status code is 201\", function () {",
+											"   pm.expect(pm.response.code).to.equal(201);",
+											"})",
+											"",
+											"pm.test(\"Expect casings records to be created\", function() {",
+											"    pm.expect(jsonData.casing_set.length).to.equal(2);",
+											"})",
+											"",
+											""
+										]
+									}
+								}
+							],
+							"request": {
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"1\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"1\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t},\n\t\t{\n\t\t\t\"casing_code\":\"SURFACE\",\n\t\t\t\"start\":\"2\",\n\t\t\t\"casing_material\":\"STEEL\",\n\t\t\t\"end\":\"2\",\n\t\t\t\"diameter\":\"2\",\n\t\t\t\"drive_shoe\":\"True\",\n\t\t\t\"id\":1,\n\t\t\t\"wall_thickness\":\"7\"\n\t\t}\n\t]\n}"
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/construction?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"construction"
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Request a list of wells"
 							},
-							{
-								"key": "Content-Type",
-								"value": "application/json"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"liner_diameter\": 1,\n\t\"liner_from\": 0,\n\t\"liner_material\": \"PVC\",\n\t\"liner_thickness\": 2,\n\t\"liner_to\": 3,\n\t\"screen_set\": [\n\t\t{\n\t\t\t\"start\": 10,\n\t\t\t\"end\": 20,\n\t\t\t\"assembly_type\": \"SCREEN\"\n\t\t}\n\t]\n}"
+							"response": []
 						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
-							"host": [
-								"{{base_url}}"
+						{
+							"name": "Construction Submission - casings - empty",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "bf57abbb-38dd-41f5-a5bc-b8b85d729ade",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 400\", function () {",
+											"   pm.expect(pm.response.code).to.equal(400);",
+											"})",
+											""
+										]
+									}
+								}
 							],
-							"path": [
-								"api",
-								"v1",
-								"submissions",
-								""
+							"request": {
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"casing_set\": [\n\t\t{\n\t\t},\n\t\t{\n\t\t}\n\t]\n}"
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/construction?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"construction"
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Request a list of wells"
+							},
+							"response": []
+						},
+						{
+							"name": "Check submission - created well casings",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "31a610c9-915e-4873-931a-613c8b1cfde4",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"   pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											"",
+											"pm.test(\"Expect casing list to contain two entries\", function() {",
+											"    pm.expect(jsonData.casing_set.length).to.equal(2);",
+											"})",
+											"",
+											"pm.test(\"Expect screen list empty\", function() {",
+											"    pm.expect(jsonData.screen_set.length).to.equal(0);",
+											"})",
+											"",
+											"pm.test(\"Expect linerperforation to be empty\", function() {",
+											"    pm.expect(jsonData.linerperforation_set.length).to.equal(0);",
+											"})"
+										]
+									}
+								}
 							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "well_activity_type",
+											"value": "CON",
+											"type": "text"
+										},
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"wells",
+										"{{well_tag_number}}"
+									]
+								},
+								"description": "Check if the created well matched submission"
+							},
+							"response": []
+						},
+						{
+							"name": "Construction Submission - screen",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "eaf2d1fa-c857-4c87-b7a5-bab319649826",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.environment.set(\"well_tag_number\", jsonData.well);",
+											"",
+											"pm.test(\"Status code is 201\", function() {",
+											"    pm.expect(pm.response.code).to.equal(201);",
+											"})"
+										]
+									}
 								}
-							]
+							],
+							"request": {
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"liner_diameter\": 1,\n\t\"liner_from\": 0,\n\t\"liner_material\": \"PVC\",\n\t\"liner_thickness\": 2,\n\t\"liner_to\": 3,\n\t\"screen_set\": [\n\t\t{\n\t\t\t\"start\": 10,\n\t\t\t\"end\": 20,\n\t\t\t\"assembly_type\": \"SCREEN\"\n\t\t}\n\t]\n}"
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/construction?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"construction"
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Request a list of wells"
+							},
+							"response": []
 						},
-						"description": "Request a list of wells"
-					},
-					"response": []
-				},
-				{
-					"name": "Submission - screen empty",
-					"event": [
 						{
-							"listen": "test",
-							"script": {
-								"id": "78582a37-9917-4d5c-a736-a0db198978ef",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.test(\"Status code is 400\", function() {",
-									"    pm.expect(pm.response.code).to.equal(400);",
-									"})"
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
+							"name": "Construction Submission - screen empty",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "78582a37-9917-4d5c-a736-a0db198978ef",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 400\", function() {",
+											"    pm.expect(pm.response.code).to.equal(400);",
+											"})"
+										]
+									}
+								}
+							],
+							"request": {
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"liner_diameter\": 1,\n\t\"liner_from\": 0,\n\t\"liner_material\": \"PVC\",\n\t\"liner_thickness\": 2,\n\t\"liner_to\": 3,\n\t\"screen_set\": [\n\t\t{\n\t\t}\n\t]\n}"
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/construction?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"construction"
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Request a list of wells"
 							},
-							{
-								"key": "Content-Type",
-								"value": "application/json"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"liner_diameter\": 1,\n\t\"liner_from\": 0,\n\t\"liner_material\": \"PVC\",\n\t\"liner_thickness\": 2,\n\t\"liner_to\": 3,\n\t\"screen_set\": [\n\t\t{\n\t\t}\n\t]\n}"
+							"response": []
 						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
-							"host": [
-								"{{base_url}}"
+						{
+							"name": "Check submission - created well screens",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "8d6d5f99-b61a-48a5-b3e3-c793a81a5622",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"   pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											"",
+											"pm.test(\"Expect casing list to contain two entries\", function() {",
+											"    pm.expect(jsonData.casing_set.length).to.equal(0);",
+											"})",
+											"",
+											"pm.test(\"Expect screen list empty\", function() {",
+											"    pm.expect(jsonData.screen_set.length).to.equal(1);",
+											"})",
+											"",
+											"pm.test(\"Expect linerperforation to be empty\", function() {",
+											"    pm.expect(jsonData.linerperforation_set.length).to.equal(0);",
+											"})"
+										]
+									}
+								}
 							],
-							"path": [
-								"api",
-								"v1",
-								"submissions",
-								""
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "well_activity_type",
+											"value": "CON",
+											"type": "text"
+										},
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"wells",
+										"{{well_tag_number}}"
+									]
+								},
+								"description": "Check if the created well matched submission"
+							},
+							"response": []
+						},
+						{
+							"name": "Construction Submission - liner",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "af2703e6-b88c-41e0-a74f-14fdd2b1f927",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.environment.set(\"well_tag_number\", jsonData.well);",
+											"",
+											"pm.test(\"Status code is 201\", function () {",
+											"   pm.expect(pm.response.code).to.equal(201);",
+											"})",
+											""
+										]
+									}
+								}
 							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
+							"request": {
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"liner_diameter\": 1,\n\t\"liner_from\": 0,\n\t\"liner_material\": \"PVC\",\n\t\"liner_thickness\": 2,\n\t\"liner_to\": 3,\n\t\"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 0,\n\t\t\t\"end\": 10\n\t\t}\n\t]\n}"
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/construction?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"construction"
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Request a list of wells"
+							},
+							"response": []
+						},
+						{
+							"name": "Construction Submission - liner empty",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "3737032f-d35f-4597-a306-133d74120ae4",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 400\", function () {",
+											"   pm.expect(pm.response.code).to.equal(400);",
+											"})",
+											""
+										]
+									}
 								}
-							]
+							],
+							"request": {
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"liner_diameter\": 1,\n\t\"liner_from\": 0,\n\t\"liner_material\": \"PVC\",\n\t\"liner_thickness\": 2,\n\t\"liner_to\": 3,\n\t\"linerperforation_set\": [\n\t\t{\n\t\t}\n\t]\n}"
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/construction?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"construction"
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Request a list of wells"
+							},
+							"response": []
 						},
-						"description": "Request a list of wells"
-					},
-					"response": []
-				},
-				{
-					"name": "Check submission - created well screens",
-					"event": [
 						{
-							"listen": "test",
-							"script": {
-								"id": "8d6d5f99-b61a-48a5-b3e3-c793a81a5622",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.test(\"Status code is 200\", function () {",
-									"   pm.expect(pm.response.code).to.equal(200);",
-									"})",
-									"",
-									"pm.test(\"Expect casing list to contain two entries\", function() {",
-									"    pm.expect(jsonData.casing_set.length).to.equal(0);",
-									"})",
-									"",
-									"pm.test(\"Expect screen list empty\", function() {",
-									"    pm.expect(jsonData.screen_set.length).to.equal(1);",
-									"})",
-									"",
-									"pm.test(\"Expect linerperforation to be empty\", function() {",
-									"    pm.expect(jsonData.linerperforation_set.length).to.equal(0);",
-									"})"
-								]
-							}
+							"name": "Check submission - created well liners",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "77ba3bf1-a4ad-476e-bd9a-c67bf0e7a34c",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"   pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											"",
+											"pm.test(\"Expect casing list to contain two entries\", function() {",
+											"    pm.expect(jsonData.casing_set.length).to.equal(0);",
+											"})",
+											"",
+											"pm.test(\"Expect screen list empty\", function() {",
+											"    pm.expect(jsonData.screen_set.length).to.equal(0);",
+											"})",
+											"",
+											"pm.test(\"Expect linerperforation to be empty\", function() {",
+											"    pm.expect(jsonData.linerperforation_set.length).to.equal(1);",
+											"})"
+										]
+									}
+								}
+							],
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "well_activity_type",
+											"value": "CON",
+											"type": "text"
+										},
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"wells",
+										"{{well_tag_number}}"
+									]
+								},
+								"description": "Check if the created well matched submission"
+							},
+							"response": []
 						}
 					],
-					"request": {
-						"method": "GET",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							},
-							{
-								"key": "Content-Type",
-								"value": "application/x-www-form-urlencoded"
-							}
-						],
-						"body": {
-							"mode": "urlencoded",
-							"urlencoded": [
-								{
-									"key": "well_activity_type",
-									"value": "CON",
-									"type": "text"
-								},
-								{
-									"key": "driller_responsible",
-									"value": "{{created_driller_guid}}",
-									"type": "text"
+					"_postman_isSubFolder": true
+				},
+				{
+					"name": "Alteration",
+					"item": [
+						{
+							"name": "Alteration for unknown well",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "5cb93a2d-3c82-4504-9f6f-c68857e2f8d4",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.environment.set(\"well_tag_number\", jsonData.well);",
+											"pm.environment.set('filing_number', jsonData.filing_number)",
+											"",
+											"pm.test(\"Status code is 201\", function () {",
+											"   pm.expect(pm.response.code).to.equal(201);",
+											"})",
+											"",
+											""
+										]
+									}
+								}
+							],
+							"request": {
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"well_activity_type\": \"ALT\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"ALT_WELL_TEST_CITY\",\n\t\"owner_province_state\": \"BC\",\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"10\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"20\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t}\n\t],\n    \"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 10,\n\t\t\t\"end\": 20\n\t\t}\n\t]\n}"
 								},
-								{
-									"key": "work_end_date",
-									"value": "2018-07-02",
-									"type": "text"
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/alteration?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"alteration"
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
 								},
-								{
-									"key": "owner_full_name",
-									"value": "Holly Homeowner",
-									"type": "text"
+								"description": "Request a list of wells"
+							},
+							"response": []
+						},
+						{
+							"name": "Check submission - well created - Alteration report on unknown well",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "758668aa-93ed-4341-9c01-1eb1c25985dd",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"   pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											"",
+											"pm.test(\"Expected well owner city to match the submitted alteration report\", function() {",
+											"    pm.expect(jsonData.owner_city).to.equal(\"ALT_WELL_TEST_CITY\");",
+											"})",
+											""
+										]
+									}
+								}
+							],
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "well_activity_type",
+											"value": "CON",
+											"type": "text"
+										},
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
 								},
-								{
-									"key": "work_start_date",
-									"value": "2018-07-01",
-									"type": "text"
+								"url": {
+									"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"wells",
+										"{{well_tag_number}}"
+									]
 								},
-								{
-									"key": "owner_province_state",
-									"value": "BC",
-									"type": "text"
+								"description": "Check if the created well matched submission"
+							},
+							"response": []
+						},
+						{
+							"name": "Check submission - created alteration submission",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "758668aa-93ed-4341-9c01-1eb1c25985dd",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"   pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											"",
+											"pm.test(\"Expected well owner city to match the submitted alteration report\", function() {",
+											"    pm.expect(jsonData.owner_city).to.equal(\"ALT_WELL_TEST_CITY\");",
+											"})",
+											""
+										]
+									}
+								}
+							],
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "well_activity_type",
+											"value": "CON",
+											"type": "text"
+										},
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
 								},
-								{
-									"key": "owner_mailing_address",
-									"value": "321 Main Street",
-									"type": "text"
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/{{filing_number}}",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"{{filing_number}}"
+									]
 								},
-								{
-									"key": "owner_city",
-									"value": "Anytown",
-									"type": "text"
+								"description": "Check if the submission was created correclty."
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				},
+				{
+					"name": "Decommission",
+					"item": [
+						{
+							"name": "Decommission well",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "b89b1daf-40de-46c1-9567-608d995d0702",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 201\", function () {",
+											"   pm.expect(pm.response.code).to.equal(201);",
+											"})",
+											"",
+											"pm.environment.set(\"well_tag_number\", jsonData.well);",
+											"pm.environment.set('filing_number', jsonData.filing_number)",
+											""
+										]
+									}
 								}
-							]
+							],
+							"request": {
+								"method": "POST",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/json"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"well_activity_type\": \"DEC\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"ALT_WELL_TEST_CITY\",\n\t\"owner_province_state\": \"BC\",\n\t\"work_start_date\": \"2018-01-01\",\n\t\"work_end_date\": \"2018-01-01\",\n\t\"decommission_description_set\": [\n\t\t{\n\t\t\t\"start\": 0,\n\t\t\t\"end\": 1,\n\t\t\t\"material\": \"CONCRETE\",\n\t\t\t\"observations\": \"It worked!\"\n\t\t}\n\t],\n\t\"decommission_details\": \"Test\"\n}"
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/decommission?format=json",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"decommission"
+									],
+									"query": [
+										{
+											"key": "format",
+											"value": "json"
+										}
+									]
+								},
+								"description": "Request a list of wells"
+							},
+							"response": []
 						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
-							"host": [
-								"{{base_url}}"
+						{
+							"name": "Check decommission",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "6071dbc1-9a9a-4806-b276-9ea94186a23c",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"   pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											"",
+											"pm.test(\"Expected well owner city to match the submitted alteration report\", function() {",
+											"    pm.expect(jsonData.owner_city).to.equal(\"ALT_WELL_TEST_CITY\");",
+											"})",
+											"",
+											"pm.test(\"Well status is 'closure'\", function() {",
+											"    pm.expect(jsonData.well_status).to.equal(\"CLOSURE\");",
+											"})"
+										]
+									}
+								}
 							],
-							"path": [
-								"api",
-								"v1",
-								"wells",
-								"{{well_tag_number}}"
-							]
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "well_activity_type",
+											"value": "CON",
+											"type": "text"
+										},
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"wells",
+										"{{well_tag_number}}"
+									]
+								},
+								"description": "Check if the created well matched submission"
+							},
+							"response": []
 						},
-						"description": "Check if the created well matched submission"
-					},
-					"response": []
-				},
+						{
+							"name": "Check decommission - created decommission submission",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"id": "c0ec586c-6de3-424e-b7cc-67f2b63a32c0",
+										"type": "text/javascript",
+										"exec": [
+											"var jsonData = pm.response.json();",
+											"",
+											"pm.test(\"Status code is 200\", function () {",
+											"   pm.expect(pm.response.code).to.equal(200);",
+											"})",
+											"",
+											"pm.test(\"Expected well owner city to match the submitted alteration report\", function() {",
+											"    pm.expect(jsonData.owner_city).to.equal(\"ALT_WELL_TEST_CITY\");",
+											"})",
+											"",
+											"pm.test(\"Expect linerperforation to be undefined\", function() {",
+											"    pm.expect(jsonData.linerperforation_set).to.equal(undefined);",
+											"})",
+											""
+										]
+									}
+								}
+							],
+							"request": {
+								"method": "GET",
+								"header": [
+									{
+										"key": "Authorization",
+										"value": "JWT {{token}}"
+									},
+									{
+										"key": "Content-Type",
+										"value": "application/x-www-form-urlencoded"
+									}
+								],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "well_activity_type",
+											"value": "CON",
+											"type": "text"
+										},
+										{
+											"key": "driller_responsible",
+											"value": "{{created_driller_guid}}",
+											"type": "text"
+										},
+										{
+											"key": "work_end_date",
+											"value": "2018-07-02",
+											"type": "text"
+										},
+										{
+											"key": "owner_full_name",
+											"value": "Holly Homeowner",
+											"type": "text"
+										},
+										{
+											"key": "work_start_date",
+											"value": "2018-07-01",
+											"type": "text"
+										},
+										{
+											"key": "owner_province_state",
+											"value": "BC",
+											"type": "text"
+										},
+										{
+											"key": "owner_mailing_address",
+											"value": "321 Main Street",
+											"type": "text"
+										},
+										{
+											"key": "owner_city",
+											"value": "Anytown",
+											"type": "text"
+										}
+									]
+								},
+								"url": {
+									"raw": "{{base_url}}/api/v1/submissions/{{filing_number}}",
+									"host": [
+										"{{base_url}}"
+									],
+									"path": [
+										"api",
+										"v1",
+										"submissions",
+										"{{filing_number}}"
+									]
+								},
+								"description": "Check if the submission was created correclty."
+							},
+							"response": []
+						}
+					],
+					"_postman_isSubFolder": true
+				}
+			]
+		},
+		{
+			"name": "Stacking",
+			"item": [
 				{
-					"name": "Submission - liner",
+					"name": "Submission - construction submission",
 					"event": [
 						{
 							"listen": "test",
 							"script": {
-								"id": "af2703e6-b88c-41e0-a74f-14fdd2b1f927",
+								"id": "f43f719e-73c7-4508-a64a-5caeb226bfd5",
 								"type": "text/javascript",
 								"exec": [
 									"var jsonData = pm.response.json();",
@@ -957,6 +1816,8 @@
 									"pm.test(\"Status code is 201\", function () {",
 									"   pm.expect(pm.response.code).to.equal(201);",
 									"})",
+									"",
+									"",
 									""
 								]
 							}
@@ -976,10 +1837,10 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"liner_diameter\": 1,\n\t\"liner_from\": 0,\n\t\"liner_material\": \"PVC\",\n\t\"liner_thickness\": 2,\n\t\"liner_to\": 3,\n\t\"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 0,\n\t\t\t\"end\": 10\n\t\t}\n\t]\n}"
+							"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"0\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"10\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t}\n\t],\n\t\"screen_set\": [\n        {\n            \"start\": \"0.00\",\n            \"end\": \"10.00\",\n            \"internal_diameter\": null,\n            \"assembly_type\": null,\n            \"slot_size\": null\n        }\n    ],\n    \"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 0,\n\t\t\t\"end\": 10\n\t\t}\n\t],\n\t\"well_class\": \"GEOTECH\",\n\t\"driller_name\": \"Bob\",\n\t\"consultant_name\": \"Lois\",\n\t\"consultant_company\": \"Lois Consulting\",\n\t\"work_start_date\": \"2018-01-01\",\n\t\"work_end_date\": \"2018-01-01\",\n\t\"legal_pid\": \"123132\",\n\t\"well_location_description\": \"At the top of the hill\",\n\t\"latitude\": 48.420133,\n\t\"longitude\": -123.370083,\n\t\"ground_elevation\": 1,\n\t\"drilling_method\": \"AUGER\",\n\t\"well_orientation\": \"False\",\n\t\"water_supply_system_name\": \"Pond\",\n\t\"water_supply_system_well_name\": \"1\",\n\t\"surface_seal_material\": \"BNTITE_CLY\",\n\t\"surface_seal_depth\": 1,\n\t\"surface_seal_method\": \"OTHER\",\n\t\"liner_material\": \"PVC\",\n\t\"screen_material\": \"PLASTIC\",\n\t\"development_method\": \"BAIL\",\n\t\"well_yield\": \"5.22\",\n\t\"finished_well_depth\": \"55\",\n\t\"total_depth_drilled\": \"58\",\n\t\"final_casing_stick_up\": \"3\",\n\t\"static_water_level\": \"12\",\n\t\"artesian_flow\": \"6.55\",\n\t\"well_disinfected\": \"True\",\n\t\"comments\": \"This is a well\",\n\t\"diameter\": \"3\"\n}"
 						},
 						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
+							"raw": "{{base_url}}/api/v1/submissions/construction?format=json",
 							"host": [
 								"{{base_url}}"
 							],
@@ -987,7 +1848,7 @@
 								"api",
 								"v1",
 								"submissions",
-								""
+								"construction"
 							],
 							"query": [
 								{
@@ -1001,19 +1862,24 @@
 					"response": []
 				},
 				{
-					"name": "Submission - liner empty",
+					"name": "Submission - alteration",
 					"event": [
 						{
 							"listen": "test",
 							"script": {
-								"id": "3737032f-d35f-4597-a306-133d74120ae4",
+								"id": "6956eea7-3dca-43a2-9357-0a7198a62da4",
 								"type": "text/javascript",
 								"exec": [
 									"var jsonData = pm.response.json();",
 									"",
-									"pm.test(\"Status code is 400\", function () {",
-									"   pm.expect(pm.response.code).to.equal(400);",
+									"pm.test(\"Status code is 201\", function () {",
+									"   pm.expect(pm.response.code).to.equal(201);",
+									"})",
+									"",
+									"pm.test(\"Well tag number to persist\", function() {",
+									"    pm.expect(jsonData.well).to.equal(pm.environment.get('well_tag_number'))",
 									"})",
+									"",
 									""
 								]
 							}
@@ -1033,10 +1899,10 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"liner_diameter\": 1,\n\t\"liner_from\": 0,\n\t\"liner_material\": \"PVC\",\n\t\"liner_thickness\": 2,\n\t\"liner_to\": 3,\n\t\"linerperforation_set\": [\n\t\t{\n\t\t}\n\t]\n}"
+							"raw": "{\n\t\"well_activity_type\": \"ALT\",\n\t\"well\": {{well_tag_number}},\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"work_start_date\": \"2018-01-02\",\n\t\"work_end_date\": \"2018-01-02\",\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"10\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"20\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t}\n\t],\n\t\"screen_set\": [\n        {\n            \"start\": \"10.00\",\n            \"end\": \"20.00\",\n            \"internal_diameter\": null,\n            \"assembly_type\": null,\n            \"slot_size\": null\n        }\n    ],\n    \"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 10,\n\t\t\t\"end\": 20\n\t\t}\n\t]\n}"
 						},
 						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
+							"raw": "{{base_url}}/api/v1/submissions/alteration?format=json",
 							"host": [
 								"{{base_url}}"
 							],
@@ -1044,7 +1910,7 @@
 								"api",
 								"v1",
 								"submissions",
-								""
+								"alteration"
 							],
 							"query": [
 								{
@@ -1058,12 +1924,12 @@
 					"response": []
 				},
 				{
-					"name": "Check submission - created well liners",
+					"name": "Check submission - well updated",
 					"event": [
 						{
 							"listen": "test",
 							"script": {
-								"id": "77ba3bf1-a4ad-476e-bd9a-c67bf0e7a34c",
+								"id": "2f7c420c-60ea-4dc8-bb99-4fa4bd6b59b1",
 								"type": "text/javascript",
 								"exec": [
 									"var jsonData = pm.response.json();",
@@ -1073,171 +1939,20 @@
 									"})",
 									"",
 									"pm.test(\"Expect casing list to contain two entries\", function() {",
-									"    pm.expect(jsonData.casing_set.length).to.equal(0);",
+									"    pm.expect(jsonData.casing_set.length).to.equal(2);",
 									"})",
 									"",
 									"pm.test(\"Expect screen list empty\", function() {",
-									"    pm.expect(jsonData.screen_set.length).to.equal(0);",
+									"    pm.expect(jsonData.screen_set.length).to.equal(2);",
 									"})",
 									"",
 									"pm.test(\"Expect linerperforation to be empty\", function() {",
-									"    pm.expect(jsonData.linerperforation_set.length).to.equal(1);",
-									"})"
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "GET",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							},
-							{
-								"key": "Content-Type",
-								"value": "application/x-www-form-urlencoded"
-							}
-						],
-						"body": {
-							"mode": "urlencoded",
-							"urlencoded": [
-								{
-									"key": "well_activity_type",
-									"value": "CON",
-									"type": "text"
-								},
-								{
-									"key": "driller_responsible",
-									"value": "{{created_driller_guid}}",
-									"type": "text"
-								},
-								{
-									"key": "work_end_date",
-									"value": "2018-07-02",
-									"type": "text"
-								},
-								{
-									"key": "owner_full_name",
-									"value": "Holly Homeowner",
-									"type": "text"
-								},
-								{
-									"key": "work_start_date",
-									"value": "2018-07-01",
-									"type": "text"
-								},
-								{
-									"key": "owner_province_state",
-									"value": "BC",
-									"type": "text"
-								},
-								{
-									"key": "owner_mailing_address",
-									"value": "321 Main Street",
-									"type": "text"
-								},
-								{
-									"key": "owner_city",
-									"value": "Anytown",
-									"type": "text"
-								}
-							]
-						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/wells/{{well_tag_number}}",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"api",
-								"v1",
-								"wells",
-								"{{well_tag_number}}"
-							]
-						},
-						"description": "Check if the created well matched submission"
-					},
-					"response": []
-				},
-				{
-					"name": "Alteration for unknown well",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "94e81347-a6a8-4f14-825a-bfa24db3099a",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.test(\"Status code is 201\", function () {",
-									"   pm.expect(pm.response.code).to.equal(201);",
-									"})",
-									"",
-									"pm.environment.set(\"well_tag_number\", jsonData.well);",
-									""
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							},
-							{
-								"key": "Content-Type",
-								"value": "application/json"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"ALT\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"ALT_WELL_TEST_CITY\",\n\t\"owner_province_state\": \"BC\",\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"10\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"20\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t}\n\t],\n    \"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 10,\n\t\t\t\"end\": 20\n\t\t}\n\t]\n}"
-						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"api",
-								"v1",
-								"submissions",
-								""
-							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
-								}
-							]
-						},
-						"description": "Request a list of wells"
-					},
-					"response": []
-				},
-				{
-					"name": "Check submission - Alteration report on unknown well",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "758668aa-93ed-4341-9c01-1eb1c25985dd",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.test(\"Status code is 200\", function () {",
-									"   pm.expect(pm.response.code).to.equal(200);",
+									"    pm.expect(jsonData.linerperforation_set.length).to.equal(2);",
 									"})",
 									"",
-									"pm.test(\"Expected well owner city to match the submitted alteration report\", function() {",
-									"    pm.expect(jsonData.owner_city).to.equal(\"ALT_WELL_TEST_CITY\");",
-									"})",
-									""
+									"pm.test(\"Well status is 'NEW'\", function() {",
+									"    pm.expect(jsonData.well_status).to.equal(\"ALTERATION\");",
+									"})"
 								]
 							}
 						}
@@ -1314,75 +2029,9 @@
 						"description": "Check if the created well matched submission"
 					},
 					"response": []
-				}
-			]
-		},
-		{
-			"name": "Stacking",
-			"item": [
-				{
-					"name": "Submission - construction submission",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "f43f719e-73c7-4508-a64a-5caeb226bfd5",
-								"type": "text/javascript",
-								"exec": [
-									"var jsonData = pm.response.json();",
-									"",
-									"pm.environment.set(\"well_tag_number\", jsonData.well);",
-									"",
-									"pm.test(\"Status code is 201\", function () {",
-									"   pm.expect(pm.response.code).to.equal(201);",
-									"})",
-									"",
-									"",
-									""
-								]
-							}
-						}
-					],
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "JWT {{token}}"
-							},
-							{
-								"key": "Content-Type",
-								"value": "application/json"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"CON\",\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"0\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"10\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t}\n\t],\n\t\"screen_set\": [\n        {\n            \"start\": \"0.00\",\n            \"end\": \"10.00\",\n            \"internal_diameter\": null,\n            \"assembly_type\": null,\n            \"slot_size\": null\n        }\n    ],\n    \"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 0,\n\t\t\t\"end\": 10\n\t\t}\n\t]\n}"
-						},
-						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"api",
-								"v1",
-								"submissions",
-								""
-							],
-							"query": [
-								{
-									"key": "format",
-									"value": "json"
-								}
-							]
-						},
-						"description": "Request a list of wells"
-					},
-					"response": []
 				},
 				{
-					"name": "Submission - alteration",
+					"name": "Submission - alteration - intersecting data",
 					"event": [
 						{
 							"listen": "test",
@@ -1419,10 +2068,10 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"ALT\",\n\t\"well\": {{well_tag_number}},\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"10\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"20\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t}\n\t],\n\t\"screen_set\": [\n        {\n            \"start\": \"10.00\",\n            \"end\": \"20.00\",\n            \"internal_diameter\": null,\n            \"assembly_type\": null,\n            \"slot_size\": null\n        }\n    ],\n    \"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 10,\n\t\t\t\"end\": 20\n\t\t}\n\t]\n}"
+							"raw": "{\n\t\"well_activity_type\": \"ALT\",\n\t\"well\": {{well_tag_number}},\n\t\"work_start_date\": \"2018-01-03\",\n\t\"work_end_date\": \"2018-01-03\",\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"10\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"15\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t},\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"15\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"20\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t}\n\t],\n\t\"screen_set\": [\n        {\n            \"start\": \"10.00\",\n            \"end\": \"15.00\",\n            \"internal_diameter\": null,\n            \"assembly_type\": null,\n            \"slot_size\": null\n        },\n        {\n            \"start\": \"15.00\",\n            \"end\": \"20.00\",\n            \"internal_diameter\": null,\n            \"assembly_type\": null,\n            \"slot_size\": null\n        }\n    ],\n    \"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 10,\n\t\t\t\"end\": 15\n\t\t},\n\t\t{\n\t\t\t\"start\": 15,\n\t\t\t\"end\": 20\n\t\t}\n\t]\n}"
 						},
 						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
+							"raw": "{{base_url}}/api/v1/submissions/alteration?format=json",
 							"host": [
 								"{{base_url}}"
 							],
@@ -1430,7 +2079,7 @@
 								"api",
 								"v1",
 								"submissions",
-								""
+								"alteration"
 							],
 							"query": [
 								{
@@ -1444,12 +2093,12 @@
 					"response": []
 				},
 				{
-					"name": "Check submission - well updated",
+					"name": "Check submission - well stacked",
 					"event": [
 						{
 							"listen": "test",
 							"script": {
-								"id": "d5ca9d15-a49a-4128-bfdc-cdd37d2e77c4",
+								"id": "f7640140-774f-4486-ac95-94a38719dd4d",
 								"type": "text/javascript",
 								"exec": [
 									"var jsonData = pm.response.json();",
@@ -1459,15 +2108,15 @@
 									"})",
 									"",
 									"pm.test(\"Expect casing list to contain two entries\", function() {",
-									"    pm.expect(jsonData.casing_set.length).to.equal(2);",
+									"    pm.expect(jsonData.casing_set.length).to.equal(3);",
 									"})",
 									"",
 									"pm.test(\"Expect screen list empty\", function() {",
-									"    pm.expect(jsonData.screen_set.length).to.equal(2);",
+									"    pm.expect(jsonData.screen_set.length).to.equal(3);",
 									"})",
 									"",
 									"pm.test(\"Expect linerperforation to be empty\", function() {",
-									"    pm.expect(jsonData.linerperforation_set.length).to.equal(2);",
+									"    pm.expect(jsonData.linerperforation_set.length).to.equal(3);",
 									"})"
 								]
 							}
@@ -1542,17 +2191,17 @@
 								"{{well_tag_number}}"
 							]
 						},
-						"description": "Check if the created well matched submission"
+						"description": "Check if the created well has stacked data"
 					},
 					"response": []
 				},
 				{
-					"name": "Submission - alteration - intersecting data",
+					"name": "Decommission well Copy",
 					"event": [
 						{
 							"listen": "test",
 							"script": {
-								"id": "6956eea7-3dca-43a2-9357-0a7198a62da4",
+								"id": "b89b1daf-40de-46c1-9567-608d995d0702",
 								"type": "text/javascript",
 								"exec": [
 									"var jsonData = pm.response.json();",
@@ -1561,10 +2210,8 @@
 									"   pm.expect(pm.response.code).to.equal(201);",
 									"})",
 									"",
-									"pm.test(\"Well tag number to persist\", function() {",
-									"    pm.expect(jsonData.well).to.equal(pm.environment.get('well_tag_number'))",
-									"})",
-									"",
+									"pm.environment.set(\"well_tag_number\", jsonData.well);",
+									"pm.environment.set('filing_number', jsonData.filing_number)",
 									""
 								]
 							}
@@ -1584,10 +2231,10 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n\t\"well_activity_type\": \"ALT\",\n\t\"well\": {{well_tag_number}},\n\t\"casing_set\": [\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"10\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"15\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t},\n\t\t{\n\t\t\t\"casing_code\": \"SURFACE\",\n\t\t\t\"start\":\"15\",\n\t\t\t\"casing_material\":\"STL_PUL_OT\",\n\t\t\t\"end\":\"20\",\n\t\t\t\"diameter\":\"1\",\n\t\t\t\"drive_shoe\":\"False\",\n\t\t\t\"id\":0,\n\t\t\t\"wall_thickness\":\"87\"\n\t\t}\n\t],\n\t\"screen_set\": [\n        {\n            \"start\": \"10.00\",\n            \"end\": \"15.00\",\n            \"internal_diameter\": null,\n            \"assembly_type\": null,\n            \"slot_size\": null\n        },\n        {\n            \"start\": \"15.00\",\n            \"end\": \"20.00\",\n            \"internal_diameter\": null,\n            \"assembly_type\": null,\n            \"slot_size\": null\n        }\n    ],\n    \"linerperforation_set\": [\n\t\t{\n\t\t\t\"start\": 10,\n\t\t\t\"end\": 15\n\t\t},\n\t\t{\n\t\t\t\"start\": 15,\n\t\t\t\"end\": 20\n\t\t}\n\t]\n}"
+							"raw": "{\n\t\"well_activity_type\": \"ALT\",\n\t\"well\": {{well_tag_number}},\n\t\"owner_full_name\": \"Bob\",\n\t\"owner_mailing_address\": \"123 Place\",\n\t\"owner_city\": \"Victoria\",\n\t\"owner_province_state\": \"BC\",\n\t\"work_start_date\": \"2018-01-04\",\n\t\"work_end_date\": \"2018-01-04\",\n\t\"decommission_description_set\": [\n\t\t{\n\t\t\t\"start\": 0,\n\t\t\t\"end\": 1,\n\t\t\t\"material\": \"CONCRETE\",\n\t\t\t\"observations\": \"It worked!\"\n\t\t}\n\t],\n\t\"decommission_details\": \"Test\"\n}"
 						},
 						"url": {
-							"raw": "{{base_url}}/api/v1/submissions/?format=json",
+							"raw": "{{base_url}}/api/v1/submissions/decommission?format=json",
 							"host": [
 								"{{base_url}}"
 							],
@@ -1595,7 +2242,7 @@
 								"api",
 								"v1",
 								"submissions",
-								""
+								"decommission"
 							],
 							"query": [
 								{
@@ -1609,12 +2256,12 @@
 					"response": []
 				},
 				{
-					"name": "Check submission - well stacked",
+					"name": "Check well - decommissioned",
 					"event": [
 						{
 							"listen": "test",
 							"script": {
-								"id": "f7640140-774f-4486-ac95-94a38719dd4d",
+								"id": "0cf6450c-2d27-4794-9349-bf1276139cb8",
 								"type": "text/javascript",
 								"exec": [
 									"var jsonData = pm.response.json();",
@@ -1633,6 +2280,15 @@
 									"",
 									"pm.test(\"Expect linerperforation to be empty\", function() {",
 									"    pm.expect(jsonData.linerperforation_set.length).to.equal(3);",
+									"})",
+									"",
+									"pm.test(\"Well status is 'closure'\", function() {",
+									"    pm.expect(jsonData.well_status).to.equal(\"CLOSURE\");",
+									"})",
+									"",
+									"pm.test(\"Latitude/Longitude is same as the initial construction report\", function() {",
+									"    pm.expect(jsonData.latitude).to.equal(\"48.420133\");",
+									"    pm.expect(jsonData.longitude).to.equal(\"-123.370083\");",
 									"})"
 								]
 							}
diff --git a/app/.s2i/bin/assemble b/app/.s2i/bin/assemble
index 562612b66d..f909a7dae3 100644
--- a/app/.s2i/bin/assemble
+++ b/app/.s2i/bin/assemble
@@ -55,10 +55,10 @@ fi
 cd ..
 cd frontend
 npm install
-npm run build
+# npm run build
 # Run unit tests in build stage with the code below
-#echo "--> testing and building frontend files"
-#npm run unit -- --runInBand && npm run build
+echo "--> testing and building frontend files"
+npm run unit -- --runInBand && npm run build
 cd ..
 
 if should_collectstatic; then
@@ -91,9 +91,10 @@ fi
 
 # Run unit tests in build stage with the code below
 #echo "--> running Django unit tests"
-#cd backend
-#python manage.py test -c nose.cfg
-#cd ..
+pushd backend
+python manage.py test -c nose.cfg
+popd backend
+
 
 # set permissions for any installed artifacts
 fix-permissions /opt/app-root
diff --git a/app/backend/.envrc b/app/backend/.envrc
index 57e654da5b..464569fabd 100644
--- a/app/backend/.envrc
+++ b/app/backend/.envrc
@@ -45,6 +45,7 @@ export REQUIRE_ENV_VARIABLES=True
 export S3_HOST=s3.ca-central-1.amazonaws.com
 export S3_ROOT_BUCKET=gwells-docs
 export SSO_IDP_HINT=idir
+export ENABLE_AQUIFERS_SEARCH=True
 
 dotenv .secret_env
 
diff --git a/app/backend/aquifers/permissions.py b/app/backend/aquifers/permissions.py
new file mode 100644
index 0000000000..6379f30593
--- /dev/null
+++ b/app/backend/aquifers/permissions.py
@@ -0,0 +1,28 @@
+"""
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+from rest_framework.permissions import BasePermission, SAFE_METHODS
+from gwells.roles import AQUIFERS_EDIT_ROLE
+
+class HasAquiferEditRoleOrReadOnly(BasePermission):
+    """
+    Grants permission to users with Aquifer Edit Roles, or is a read-only request
+    """
+
+    def has_permission(self, request, view):
+        return (
+            request.method in SAFE_METHODS or
+            request.user and
+            request.user.is_authenticated and
+            request.user.groups.filter(name=AQUIFERS_EDIT_ROLE).exists()
+        )
diff --git a/app/backend/aquifers/serializers.py b/app/backend/aquifers/serializers.py
index 72cd25168e..6a73ffd495 100644
--- a/app/backend/aquifers/serializers.py
+++ b/app/backend/aquifers/serializers.py
@@ -14,33 +14,113 @@
 
 from rest_framework import serializers
 
-from aquifers.models import Aquifer
+from aquifers import models
 
-class AquiferListSerializer(serializers.ModelSerializer):
+
+class AquiferSerializer(serializers.ModelSerializer):
     """Serialize a aquifer list"""
-    demand_description = serializers.SlugRelatedField(source='demand', read_only=True, slug_field='description')
-    material_description = serializers.SlugRelatedField(source='material', read_only=True, slug_field='description')
-    productivity_description = serializers.SlugRelatedField(source='productivity', read_only=True, slug_field='description')
-    subtype_description = serializers.SlugRelatedField(source='subtype', read_only=True, slug_field='description')
-    vulnerability_description = serializers.SlugRelatedField(source='vulnerability', read_only=True, slug_field='description')
+    demand_description = serializers.SlugRelatedField(
+        source='demand', read_only=True, slug_field='description')
+    material_description = serializers.SlugRelatedField(
+        source='material', read_only=True, slug_field='description')
+    productivity_description = serializers.SlugRelatedField(
+        source='productivity', read_only=True, slug_field='description')
+    subtype_description = serializers.StringRelatedField(
+        source='subtype', read_only=True)
+    vulnerability_description = serializers.SlugRelatedField(
+        source='vulnerability', read_only=True, slug_field='description')
+    quality_concern_description = serializers.SlugRelatedField(
+        source='quality_concern', read_only=True, slug_field='description')
+    known_water_use_description = serializers.SlugRelatedField(
+        source='known_water_use', read_only=True, slug_field='description')
 
     class Meta:
-        model = Aquifer
+        model = models.Aquifer
         fields = (
             'aquifer_id',
             'aquifer_name',
             'area',
             'demand_description',
             'demand',
+            'known_water_use_description',
+            'known_water_use',
             'litho_stratographic_unit',
             'location_description',
             'mapping_year',
             'material_description',
             'material',
+            'notes',
             'productivity_description',
             'productivity',
+            'quality_concern_description',
+            'quality_concern',
             'subtype_description',
             'subtype',
             'vulnerability_description',
             'vulnerability'
-        )
\ No newline at end of file
+        )
+
+
+class AquiferMaterialSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.AquiferMaterial
+        fields = (
+            'code',
+            'description'
+        )
+
+
+class QualityConcernSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.QualityConcern
+        fields = (
+            'code',
+            'description'
+        )
+
+
+class AquiferVulnerabilitySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.AquiferVulnerabilityCode
+        fields = (
+            'code',
+            'description'
+        )
+
+
+class AquiferSubtypeSerializer(serializers.ModelSerializer):
+    description = serializers.CharField(source='__str__')
+
+    class Meta:
+        model = models.AquiferSubtype
+        fields = (
+            'code',
+            'description'
+        )
+
+
+class AquiferProductivitySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.AquiferProductivity
+        fields = (
+            'code',
+            'description'
+        )
+
+
+class AquiferDemandSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.AquiferDemand
+        fields = (
+            'code',
+            'description'
+        )
+
+
+class WaterUseSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.WaterUse
+        fields = (
+            'code',
+            'description'
+        )
diff --git a/app/backend/aquifers/templates/aquifers/aquifers.html b/app/backend/aquifers/templates/aquifers/aquifers.html
index 0f6db4b906..84b4418a58 100644
--- a/app/backend/aquifers/templates/aquifers/aquifers.html
+++ b/app/backend/aquifers/templates/aquifers/aquifers.html
@@ -1,7 +1,6 @@
 {% extends 'gwells/base_spa.html' %}
 {% load render_bundle from webpack_loader %}
-{% block meta %}Search for registered well drillers and well pump installers who are authorized to work on water wells in B.C.
-{% endblock %}
+{% block meta %}Search for and access details on over 1,000 mapped aquifers in British Columbia.{% endblock %}
 {% block title %}Aquifers{% endblock %}
 {% block body_block %}
     <div id="app"></div>
diff --git a/app/backend/aquifers/tests.py b/app/backend/aquifers/tests.py
index 7ce503c2dd..7902932370 100644
--- a/app/backend/aquifers/tests.py
+++ b/app/backend/aquifers/tests.py
@@ -1,3 +1,29 @@
 from django.test import TestCase
+from django.urls import reverse
+from django.contrib.auth.models import User
+
+from rest_framework.test import APITestCase
+from rest_framework import status
+
+from aquifers.models import Aquifer
+from gwells.roles import roles_to_groups, AQUIFERS_EDIT_ROLE
 
 # Create your tests here.
+
+class TestPostNotAuthenticated(APITestCase):
+    def test_not_authenticated_attempts_patch(self):
+        url = reverse('aquifer-retrieve-update', kwargs={'aquifer_id': 1})
+        response = self.client.patch(url, {}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
+
+class TestAquifersEditRole(APITestCase):
+    def setUp(self):
+        user, _created = User.objects.get_or_create(username='test')
+        roles_to_groups(user, [AQUIFERS_EDIT_ROLE])
+        self.client.force_authenticate(user)
+        Aquifer(aquifer_id=1).save()
+
+    def test_patch(self):
+        url = reverse('aquifer-retrieve-update', kwargs={'aquifer_id': 1})
+        response = self.client.patch(url, {}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
diff --git a/app/backend/aquifers/urls.py b/app/backend/aquifers/urls.py
index 4fb36ae58f..94360a306e 100644
--- a/app/backend/aquifers/urls.py
+++ b/app/backend/aquifers/urls.py
@@ -21,8 +21,48 @@
     url(r'^api/v1/aquifers/$',
         never_cache(views.AquiferListAPIView.as_view()),
         name='aquifers-list'
-    ),
+        ),
+
+    url(r'^api/v1/aquifers/(?P<aquifer_id>[0-9]+)/$',
+        never_cache(views.AquiferRetrieveUpdateAPIView.as_view()),
+        name='aquifer-retrieve-update'
+        ),
+
+    url(r'^api/v1/aquifer-codes/materials/$',
+        never_cache(views.AquiferMaterialListAPIView.as_view()),
+        name='aquifer-material-list'
+        ),
+
+    url(r'^api/v1/aquifer-codes/quality-concerns/$',
+        never_cache(views.QualityConcernListAPIView.as_view()),
+        name='quality-concern-list'
+        ),
+
+    url(r'^api/v1/aquifer-codes/vulnerability/$',
+        never_cache(views.AquiferVulnerabilityListAPIView.as_view()),
+        name='aquifer-vulnerability-code-list'
+        ),
+
+    url(r'^api/v1/aquifer-codes/subtypes/$',
+        never_cache(views.AquiferSubtypeListAPIView.as_view()),
+        name='aquifer-subtype-list'
+        ),
+
+    url(r'^api/v1/aquifer-codes/productivity/$',
+        never_cache(views.AquiferProductivityListAPIView.as_view()),
+        name='aquifer-productivity-code-list'
+        ),
+
+    url(r'^api/v1/aquifer-codes/demand/$',
+        never_cache(views.AquiferDemandListAPIView.as_view()),
+        name='aquifer-demand-list'
+        ),
+
+    url(r'^api/v1/aquifer-codes/water-use/$',
+        never_cache(views.WaterUseListAPIView.as_view()),
+        name='aquifer-water-use-code-list'
+        ),
 
     # Aquifers home (loads aquifers application)
     url(r'^aquifers/', views.AquiferHomeView.as_view(), name='aquifers-home')
-]
\ No newline at end of file
+]
diff --git a/app/backend/aquifers/views.py b/app/backend/aquifers/views.py
index c7dac8fa32..e545356067 100644
--- a/app/backend/aquifers/views.py
+++ b/app/backend/aquifers/views.py
@@ -16,23 +16,99 @@
 from django_filters import rest_framework as filters
 from django.views.generic import TemplateView
 
-from rest_framework.filters import SearchFilter
-from rest_framework.generics import ListAPIView
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.filters import SearchFilter, OrderingFilter
+from rest_framework.generics import ListAPIView, RetrieveUpdateAPIView
 
-from aquifers.models import Aquifer
-from aquifers.serializers import AquiferListSerializer
+from aquifers import models
+from aquifers import serializers
+from aquifers.permissions import HasAquiferEditRoleOrReadOnly
+
+
+class AquiferRetrieveUpdateAPIView(RetrieveUpdateAPIView):
+    """List aquifers
+    get: return details of aquifers
+    patch: update aquifer
+    """
+
+    permission_classes = (HasAquiferEditRoleOrReadOnly,)
+    queryset = models.Aquifer.objects.all()
+    lookup_field = 'aquifer_id'
+    serializer_class = serializers.AquiferSerializer
 
 class AquiferListAPIView(ListAPIView):
     """List aquifers
     get: return a list of aquifers
     """
 
-    queryset = Aquifer.objects.all()
-    serializer_class = AquiferListSerializer
-    filter_backends = (filters.DjangoFilterBackend,SearchFilter)
+    queryset = models.Aquifer.objects.all()
+    serializer_class = serializers.AquiferSerializer
+    filter_backends = (filters.DjangoFilterBackend, OrderingFilter, SearchFilter)
     filter_fields = ('aquifer_id',)
     search_fields = ('aquifer_name',)
+    ordering_fields = '__all__'
+    ordering = ('aquifer_id',)
+
+class AquiferMaterialListAPIView(ListAPIView):
+    """List aquifer materials codes
+    get: return a list of aquifer material codes
+    """
+
+    queryset = models.AquiferMaterial.objects.all()
+    serializer_class = serializers.AquiferMaterialSerializer
+
+
+class QualityConcernListAPIView(ListAPIView):
+    """List aquifer materials codes
+    get: return a list of quality concern codes
+    """
+
+    queryset = models.QualityConcern.objects.all()
+    serializer_class = serializers.QualityConcernSerializer
+
+
+class AquiferVulnerabilityListAPIView(ListAPIView):
+    """List aquifer vulnerability codes
+    get: return a list of aquifer vulnerability codes
+    """
+
+    queryset = models.AquiferVulnerabilityCode.objects.all()
+    serializer_class = serializers.AquiferVulnerabilitySerializer
+
+
+class AquiferSubtypeListAPIView(ListAPIView):
+    """List aquifer subtypes codes
+    get: return a list of aquifer subtype codes
+    """
+
+    queryset = models.AquiferSubtype.objects.all()
+    serializer_class = serializers.AquiferSubtypeSerializer
+
+class AquiferProductivityListAPIView(ListAPIView):
+    """List aquifer productivity codes
+    get: return a list of aquifer productivity codes
+    """
+
+    queryset = models.AquiferProductivity.objects.all()
+    serializer_class = serializers.AquiferProductivitySerializer
+
+class AquiferDemandListAPIView(ListAPIView):
+    """List aquifer demand codes
+    get: return a list of aquifer demand codes
+    """
+
+    queryset = models.AquiferDemand.objects.all()
+    serializer_class = serializers.AquiferDemandSerializer
+
+class WaterUseListAPIView(ListAPIView):
+    """List Water Use Codes
+    get: return a list of water use codes
+    """
+
+    queryset = models.WaterUse.objects.all()
+    serializer_class = serializers.WaterUseSerializer
 
 class AquiferHomeView(TemplateView):
     """Loads the html file containing the Aquifer web app"""
-    template_name = 'aquifers/aquifers.html'
\ No newline at end of file
+    template_name = 'aquifers/aquifers.html'
diff --git a/app/backend/gwells/roles.py b/app/backend/gwells/roles.py
index eadda1367f..2acd7f88f9 100644
--- a/app/backend/gwells/roles.py
+++ b/app/backend/gwells/roles.py
@@ -20,43 +20,20 @@
 logger = logging.getLogger(__name__)
 
 
-# TODO: Change this section to match what's been done in Vue.js; We shouldn't have a concept of what
-#       and adjudicator/admin/etc. is here. We should only be concerned with what actions can be taken.
-#       Roles should be assigned appropriately to groups with keycloak.
-#       On the Django level, a keycloak role, such as "registries_edit", should translate to a django_group
-#       with the same name, that has the appropriate permissions set.
-#       In order to affect this change, code has to be changed in this module, and a migration creating the
-#       appropriate groups needs to be made.
-
-# Keycloak/SSO roles:
+# Keycloak/SSO roles - these map to Django groups.
 ADMIN_ROLE = 'gwells_admin'
+# TODO: The ADJUDICATOR and AUTHORITY role should be removed. These concepts should exist as groups in
+#           keycloak, and the underlying actions should be defined as roles seperate from business rules.
+#           e.g.: an adjudicator may view and edit registries.
 REGISTRIES_ADJUDICATOR_ROLE = 'registries_adjudicator'
 REGISTRIES_AUTHORITY_ROLE = 'registries_statutory_authority'
 REGISTRIES_VIEWER_ROLE = 'registries_viewer'
 WELLS_VIEWER_ROLE = 'wells_viewer'
 WELLS_EDIT_ROLE = 'wells_edit'
+AQUIFERS_VIEWER_ROLE = 'aquifers_view'
+AQUIFERS_EDIT_ROLE = 'aquifers_edit'
 
-# Roles relating to registries.
-REGISTRIES_ROLES = (
-    ADMIN_ROLE,
-    REGISTRIES_ADJUDICATOR_ROLE,
-    REGISTRIES_AUTHORITY_ROLE,
-    REGISTRIES_VIEWER_ROLE,
-)
-
-# Roles relating to wells view.
-WELLS_VIEW_ROLES = (
-    ADMIN_ROLE,
-    WELLS_VIEWER_ROLE,
-)
-
-# Roles leating to wells edit.
-WELLS_EDIT_ROLES = (
-    ADMIN_ROLE,
-    WELLS_VIEWER_ROLE,
-    WELLS_EDIT_ROLE,
-)
-
+# These roles are excluded, as they cannot be mapped to any particular useful groups.
 EXCLUDE = ('idir', 'offline_access', 'admin', 'uma_authorization')
 
 
@@ -91,11 +68,14 @@ def roles_to_groups(user, roles: Tuple[str] = None):
     for role in roles:
         # if user is not in their role group, add them
         if role not in user_group_names and role not in EXCLUDE:
-            try:
-                group = Group.objects.get(name=role)
-                group.user_set.add(user)
-            except Group.DoesNotExist:
-                logger.error('Group does not exist: {}'.format(role))
+            group = Group.objects.filter(name=role).first()
+            if not group:
+                # From time to time, a new role will be added to keycloak, and this role will not yet
+                # exist in the django database as a group. When this happens, we create it.
+                logger.info('Group "{}" does not exist. Creating it....'.format(role))
+                group = Group(name=role)
+                group.save()
+            group.user_set.add(user)
 
     # check if user has been removed from their SSO (Keycloak) group
     for group in user_group_names:
diff --git a/app/backend/gwells/settings/__init__.py b/app/backend/gwells/settings/__init__.py
index 3128cfee0d..27ec39da03 100644
--- a/app/backend/gwells/settings/__init__.py
+++ b/app/backend/gwells/settings/__init__.py
@@ -206,7 +206,8 @@
             'format': '%(levelname)s %(message)s'
         },
         'debug': {
-            'format': '%(levelname)s %(asctime)s %(filename)s[%(lineno)d]:%(module)s::%(funcName)s %(message)s'
+            'format':
+                '%(levelname)s %(asctime)s %(filename)s[%(lineno)d]:%(module)s::%(funcName)s %(message)s'
         }
     },
     'handlers': {
@@ -290,3 +291,19 @@
     CORS_ORIGIN_WHITELIST = ('localhost:8080', '127.0.0.1:8080')
 
 ADD_REVERSION_ADMIN = True
+
+
+# It can be very useful to disable migrations when testing. This piece of code allows one to disable
+# migrations by specifying an environemnt variable DISABLE_MIGRATIONS. Used in conjunction with
+# --keepdb, a developer can run mosts unit tests, and run them fast.
+#
+# e.g.: DATABASE_ENGINE=sqlite DISABLE_MIGRATIONS=DISABLE_MIGRATIONS python manage.py test\
+#  submissions.tests.TestWellSubmissionListSerializer --keepdb
+class DisableMigrations(object):
+    def __contains__(self, item):
+        return True
+
+    def __getitem__(self, item):
+        return None
+if get_env_variable('DISABLE_MIGRATIONS', None, strict=False, warn=False) == 'DISABLE_MIGRATIONS':
+    MIGRATION_MODULES = DisableMigrations()
diff --git a/app/backend/gwells/templates/gwells/groundwater_information.html b/app/backend/gwells/templates/gwells/groundwater_information.html
index b99d3bc08c..377be49723 100644
--- a/app/backend/gwells/templates/gwells/groundwater_information.html
+++ b/app/backend/gwells/templates/gwells/groundwater_information.html
@@ -11,7 +11,7 @@
 {% block body_block %}
 
     <p>
-	Learn more about <a href="http://www2.gov.bc.ca/gov/content/environment/air-land-water/water/groundwater-wells">groundwater wells in B.C.</a>:
+	Learn more about <a href="https://www2.gov.bc.ca/gov/content?id=5647FB2696344FA29304B8A19768299B">groundwater wells in B.C.</a>:
     &nbsp;<p>
     <ul>
 		<li>Groundwater protection regulation</li>
diff --git a/app/backend/gwells/views/api.py b/app/backend/gwells/views/api.py
index 887ead997e..8bfa180046 100644
--- a/app/backend/gwells/views/api.py
+++ b/app/backend/gwells/views/api.py
@@ -26,6 +26,7 @@ def get(self, request):
         config = {
             "enable_data_entry": get_env_variable("ENABLE_DATA_ENTRY") == "True",
             "enable_google_analytics": get_env_variable("ENABLE_GOOGLE_ANALYTICS") == "True",
+            "enable_aquifers_search": get_env_variable("ENABLE_AQUIFERS_SEARCH") == "True",
             "sso_idp_hint": get_env_variable("SSO_IDP_HINT", "idir")
         }
         return Response(config)
diff --git a/app/backend/registries/permissions.py b/app/backend/registries/permissions.py
index be3142beca..49ea918e32 100644
--- a/app/backend/registries/permissions.py
+++ b/app/backend/registries/permissions.py
@@ -2,8 +2,10 @@
 Registries view permission classes
 """
 
-from rest_framework.permissions import BasePermission, IsAdminUser, SAFE_METHODS, DjangoModelPermissions
-from gwells.roles import REGISTRIES_ROLES
+from django.db.models import Q
+from rest_framework.permissions import BasePermission, IsAdminUser, SAFE_METHODS, BasePermission
+
+from gwells.roles import REGISTRIES_ADJUDICATOR_ROLE, REGISTRIES_AUTHORITY_ROLE
 
 
 class IsAdminOrReadOnly(IsAdminUser):
@@ -16,11 +18,9 @@ def has_permission(self, request, view):
         return is_admin or request.method in SAFE_METHODS
 
 
-# TODO: Rename this to RegistriesPermissions!
-class GwellsPermissions(DjangoModelPermissions):
+class RegistriesPermissions(BasePermission):
     """
-    Grants permissions to users based on Django model permissions, with additional check for
-    user's status as GWELLS staff
+    Grants permissions to users based on Django model permissions
     """
 
     def has_permission(self, request, view):
@@ -28,7 +28,5 @@ def has_permission(self, request, view):
         Refuse permission entirely if user is not GWELLS staff, else continue to check model-level permissions
         This is used to refuse permission for viewing data for non-staff (but authenticated) users
         """
-        if not request.user or not request.user.is_authenticated or not request.user.groups.filter(
-                name__in=REGISTRIES_ROLES).exists():
-            return False
-        return super(GwellsPermissions, self).has_permission(request, view)
+        return request.user and request.user.is_authenticated and request.user.groups.filter(
+                Q(name=REGISTRIES_ADJUDICATOR_ROLE) | Q(name=REGISTRIES_AUTHORITY_ROLE)).exists()
diff --git a/app/backend/registries/tests.py b/app/backend/registries/tests.py
index 61d38d18b2..3e7d52ccd8 100644
--- a/app/backend/registries/tests.py
+++ b/app/backend/registries/tests.py
@@ -61,7 +61,8 @@ def setUp(self):
         self.user.save()
         self.user.profile.save()
 
-        roles_to_groups(self.user, ['gwells_admin'])
+        roles_to_groups(self.user, [REGISTRIES_ADJUDICATOR_ROLE, REGISTRIES_AUTHORITY_ROLE,
+                                    REGISTRIES_VIEWER_ROLE])
         self.client.force_authenticate(self.user)
 
 
diff --git a/app/backend/registries/views.py b/app/backend/registries/views.py
index 27ab78ea25..44a28ca6e3 100644
--- a/app/backend/registries/views.py
+++ b/app/backend/registries/views.py
@@ -28,7 +28,7 @@
 from rest_framework.mixins import CreateModelMixin, UpdateModelMixin
 from rest_framework.views import APIView
 from drf_multiple_model.views import ObjectMultipleModelAPIView
-from gwells.roles import REGISTRIES_ROLES
+from gwells.roles import REGISTRIES_VIEWER_ROLE
 from gwells.models import ProvinceStateCode
 from gwells.pagination import APILimitOffsetPagination
 from reversion.models import Version
@@ -46,7 +46,7 @@
     RegistriesRemovalReason,
     SubactivityCode,
     WellClassCode)
-from registries.permissions import IsAdminOrReadOnly, GwellsPermissions
+from registries.permissions import IsAdminOrReadOnly, RegistriesPermissions
 from registries.serializers import (
     ApplicationAdminSerializer,
     ApplicationStatusCodeSerializer,
@@ -110,7 +110,7 @@ class OrganizationListView(RevisionMixin, AuditCreateMixin, ListCreateAPIView):
     Creates a new drilling organization record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = OrganizationListSerializer
     pagination_class = None
 
@@ -148,7 +148,7 @@ class OrganizationDetailView(RevisionMixin, AuditUpdateMixin, RetrieveUpdateDest
     Removes the specified drilling organization record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
 
     # 'pk' and 'id' have been replaced by 'org_guid' as primary key for Organization model
     lookup_field = "org_guid"
@@ -252,7 +252,7 @@ class PersonListView(RevisionMixin, AuditCreateMixin, ListCreateAPIView):
     )
 
     # fetch related companies and registration applications (prevent duplicate database trips)
-    queryset = Person.objects.all()
+    queryset = Person.objects.filter(expired_date__isnull=True)
 
     def get_queryset(self):
         """ Returns Person queryset, removing non-active and unregistered drillers for anonymous users """
@@ -274,8 +274,7 @@ def get_queryset(self):
         activity = self.request.query_params.get('activity', None)
         status = self.request.query_params.get('status', None)
 
-        user_is_staff = self.request.user.groups.filter(
-            name__in=REGISTRIES_ROLES).exists()
+        user_is_staff = self.request.user.groups.filter(name=REGISTRIES_VIEWER_ROLE).exists()
 
         if activity:
             if (status == 'P' or not status) and user_is_staff:
@@ -317,7 +316,9 @@ def get_queryset(self):
             # Only show active drillers to non-admin users and public
             qs = qs.filter(
                 Q(registrations__applications__current_status__code='A'),
-                Q(registrations__applications__removal_date__isnull=True))
+                Q(registrations__applications__removal_date__isnull=True),
+                Q()
+            )
 
             registrations_qs = registrations_qs.filter(
                 Q(applications__current_status__code='A'),
@@ -392,7 +393,7 @@ class PersonDetailView(RevisionMixin, AuditUpdateMixin, RetrieveUpdateDestroyAPI
     Removes the specified person record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = PersonAdminSerializer
 
     # pk field has been replaced by person_guid
@@ -422,7 +423,7 @@ def get_queryset(self):
         Returns only registered people (i.e. drillers with active registration) to anonymous users
         """
         qs = self.queryset
-        if not self.request.user.groups.filter(name__in=REGISTRIES_ROLES).exists():
+        if not self.request.user.groups.filter(name=REGISTRIES_VIEWER_ROLE).exists():
             qs = qs.filter(Q(applications__current_status__code='A'),
                            Q(applications__removal_date__isnull=True))
         return qs
@@ -465,7 +466,7 @@ def get_queryset(self):
         will filter for that activity
         """
         qs = self.queryset
-        if not self.request.user.groups.filter(name__in=REGISTRIES_ROLES).exists():
+        if not self.request.user.groups.filter(name=REGISTRIES_VIEWER_ROLE).exists():
             qs = qs.filter(
                 Q(applications__current_status__code='A'),
                 Q(applications__removal_date__isnull=True))
@@ -485,7 +486,7 @@ class RegistrationListView(RevisionMixin, AuditCreateMixin, ListCreateAPIView):
     Create a new well driller or well pump installer registration record for a person
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = RegistrationAdminSerializer
     queryset = Register.objects.all() \
         .select_related(
@@ -518,7 +519,7 @@ class RegistrationDetailView(RevisionMixin, AuditUpdateMixin, RetrieveUpdateDest
     Removes the specified registration record from the database
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = RegistrationAdminSerializer
     lookup_field = 'register_guid'
     queryset = Register.objects.all() \
@@ -546,7 +547,7 @@ class ApplicationListView(RevisionMixin, AuditCreateMixin, ListCreateAPIView):
     Creates a new registries application
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = ApplicationAdminSerializer
     queryset = RegistriesApplication.objects.all() \
         .select_related(
@@ -570,7 +571,7 @@ class ApplicationDetailView(RevisionMixin, AuditUpdateMixin, RetrieveUpdateDestr
     Removes the specified drilling application record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = ApplicationAdminSerializer
     queryset = RegistriesApplication.objects.all() \
         .select_related(
@@ -585,7 +586,7 @@ class OrganizationNameListView(ListAPIView):
     Simple list of organizations with only organization names
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = OrganizationNameListSerializer
     queryset = Organization.objects \
         .filter(expired_date__isnull=True) \
@@ -603,7 +604,7 @@ class PersonNoteListView(AuditCreateMixin, ListCreateAPIView):
     Adds a note record to the specified Person record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = PersonNoteSerializer
     swagger_schema = None
 
@@ -635,7 +636,7 @@ class PersonNoteDetailView(AuditUpdateMixin, RetrieveUpdateDestroyAPIView):
     Removes a PersonNote record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = PersonNoteSerializer
     swagger_schema = None
 
@@ -653,7 +654,7 @@ class OrganizationNoteListView(AuditCreateMixin, ListCreateAPIView):
     Adds a note record to the specified Organization record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = OrganizationNoteSerializer
     swagger_schema = None
 
@@ -685,7 +686,7 @@ class OrganizationNoteDetailView(AuditUpdateMixin, RetrieveUpdateDestroyAPIView)
     Removes a OrganizationNote record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     serializer_class = OrganizationNoteSerializer
     swagger_schema = None
 
@@ -699,7 +700,7 @@ class OrganizationHistory(APIView):
     get: returns a history of changes to an Organization model record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     queryset = Organization.objects.all()
     swagger_schema = None
 
@@ -723,7 +724,7 @@ class PersonHistory(APIView):
     get: returns a history of changes to a Person model record
     """
 
-    permission_classes = (GwellsPermissions,)
+    permission_classes = (RegistriesPermissions,)
     queryset = Person.objects.all()
     swagger_schema = None
 
diff --git a/app/backend/submissions/models.py b/app/backend/submissions/models.py
index dd8df87a9c..e2392e3c2a 100644
--- a/app/backend/submissions/models.py
+++ b/app/backend/submissions/models.py
@@ -34,6 +34,9 @@ def decommission(self):
     def alteration(self):
         return self.get_queryset().get(code='ALT')
 
+    def staff_edit(self):
+        return self.get_queryset().get(code='STAFF_EDIT')
+
 
 class WellActivityCode(AuditModel):
     """
diff --git a/app/backend/submissions/serializers.py b/app/backend/submissions/serializers.py
index 00244b3b9f..adfb6535de 100644
--- a/app/backend/submissions/serializers.py
+++ b/app/backend/submissions/serializers.py
@@ -19,7 +19,7 @@
 from gwells.serializers import AuditModelSerializer
 from django.db import transaction
 import wells.stack
-from wells.models import Well, ActivitySubmission
+from wells.models import Well, ActivitySubmission, WellActivityCode
 from wells.serializers import (
     CasingSerializer,
     DecommissionDescriptionSerializer,
@@ -59,143 +59,339 @@
     YieldEstimationMethodCode,
 )
 
-from submissions.models import WellActivityCode
-
 logger = logging.getLogger(__name__)
 
 
-class WellSubmissionSerializer(serializers.ModelSerializer):
-    """Serializes a well activity submission"""
+class WellSubmissionListSerializer(serializers.ModelSerializer):
+    """ Class used for listing well submissions.
+    """
 
     casing_set = CasingSerializer(many=True, required=False)
-    decommission_description_set = DecommissionDescriptionSerializer(many=True, required=False)
+    decommission_description_set = DecommissionDescriptionSerializer(
+        many=True, required=False)
     screen_set = ScreenSerializer(many=True, required=False)
-    linerperforation_set = LinerPerforationSerializer(many=True, required=False)
+    linerperforation_set = LinerPerforationSerializer(
+        many=True, required=False)
 
     class Meta:
+        fields = '__all__'
         model = ActivitySubmission
-        fields = (
-            "filing_number",
-            "activity_submission_guid",
-            "well",
-            "well_activity_type",
-            "well_class",
-            "well_subclass",
-            "intended_water_use",
-            "driller_responsible",
-            "driller_name",
-            "consultant_name",
-            "consultant_company",
-            "work_start_date",
-            "work_end_date",
-            "owner_full_name",
-            "owner_mailing_address",
-            "owner_city",
-            "owner_province_state",
-            "owner_postal_code",
-            "street_address",
-            "city",
-            "legal_lot",
-            "legal_plan",
-            "legal_district_lot",
-            "legal_block",
-            "legal_section",
-            "legal_township",
-            "legal_range",
-            "land_district",
-            "legal_pid",
-            "well_location_description",
-            "identification_plate_number",
-            "well_plate_attached",
-            "latitude",
-            "longitude",
-            "ground_elevation",
-            "ground_elevation_method",
-            "drilling_method",
-            "other_drilling_method",
-            "water_supply_system_name",
-            "water_supply_system_well_name",
-            "surface_seal_material",
-            "surface_seal_depth",
-            "surface_seal_thickness",
-            "surface_seal_method",
-            "backfill_above_surface_seal",
-            "backfill_above_surface_seal_depth",
-            "liner_material",
-            "liner_diameter",
-            "liner_thickness",
-            "liner_from",
-            "liner_to",
-            "screen_intake_method",
-            "screen_type",
-            "screen_material",
-            "other_screen_material",
-            "screen_opening",
-            "screen_bottom",
-            "other_screen_bottom",
-            "filter_pack_from",
-            "filter_pack_to",
-            "filter_pack_thickness",
-            "filter_pack_material",
-            "filter_pack_material_size",
-            "development_method",
-            "development_hours",
-            "development_notes",
-            "water_quality_characteristics",
-            "water_quality_colour",
-            "water_quality_odour",
-            "total_depth_drilled",
-            "finished_well_depth",
-            "final_casing_stick_up",
-            "bedrock_depth",
-            "static_water_level",
-            "well_yield",
-            "artesian_flow",
-            "artesian_pressure",
-            "well_cap_type",
-            "well_disinfected",
-            "comments",
-            "alternative_specs_submitted",
-            "well_yield_unit",
-            "diameter",
-            "casing_set",
-            "linerperforation_set",
-            "screen_set",
-            "decommission_reason",
-            "decommission_method",
-            "sealant_material",
-            "backfill_material",
-            "decommission_details",
-            'decommission_description_set',
-        )
+
+
+class WellSubmissionSerializerBase(serializers.ModelSerializer):
+    """ Bass class for well submission serialisation. """
+
+    def get_foreign_keys(self):
+        raise NotImplementedError()  # Implement in base class!
+
+    def get_well_activity_type(self):
+        raise NotImplementedError()  # Implement in base class!
 
     @transaction.atomic
     def create(self, validated_data):
-        # Pop foreign key records
-        FOREIGN_KEYS = {
-            'casing_set': Casing,
-            'screen_set': Screen,
-            'linerperforation_set': LinerPerforation,
-            'decommission_description_set': DecommissionDescription,
-        }
+        # Pop foreign key records from validated data (we need to create them ourselves).
+        foreign_keys = self.get_foreign_keys()
         foreign_keys_data = {}
-        for key in FOREIGN_KEYS.keys():
+        for key in foreign_keys.keys():
             foreign_keys_data[key] = validated_data.pop(key, None)
-        # Create submission
+        # Create submission.
+        validated_data['well_activity_type'] = self.get_well_activity_type()
         instance = super().create(validated_data)
-        # Create foreign key records
+        # Create foreign key records.
         for key, value in foreign_keys_data.items():
             if value:
                 for data in value:
-                    FOREIGN_KEYS[key].objects.create(activity_submission=instance, **data)
-        # Update the well record
+                    thing = foreign_keys[key].objects.create(
+                        activity_submission=instance, **data)
+        # Update the well record.
         stacker = wells.stack.StackWells()
         stacker.process(instance.filing_number)
-        # The instance may have been updated with a well tag number
+        # The instance may have been updated with a well tag number, so we refresh.
         instance.refresh_from_db()
         return instance
 
 
+class WellSubmissionStackerSerializer(WellSubmissionSerializerBase):
+    """ Class with no validation, and all possible fields, used by stacker to serialize. """
+
+    casing_set = CasingSerializer(many=True, required=False)
+    screen_set = ScreenSerializer(many=True, required=False)
+    linerperforation_set = LinerPerforationSerializer(
+        many=True, required=False)
+    decommission_description_set = DecommissionDescriptionSerializer(
+        many=True, required=False)
+
+    def get_foreign_keys(self):
+        return {
+            'casing_set': Casing,
+            'screen_set': Screen,
+            'linerperforation_set': LinerPerforation,
+            'decommission_description_set': DecommissionDescription,
+        }
+
+    class Meta:
+        model = ActivitySubmission
+        fields = '__all__'
+
+
+class WellSubmissionLegacySerializer(WellSubmissionSerializerBase):
+    """ Class with no validation, and all possible fields, used by stacker to create legacy records """
+
+    casing_set = CasingSerializer(many=True, required=False)
+    screen_set = ScreenSerializer(many=True, required=False)
+    linerperforation_set = LinerPerforationSerializer(
+        many=True, required=False)
+    decommission_description_set = DecommissionDescriptionSerializer(
+        many=True, required=False)
+
+    def get_well_activity_type(self):
+        return WellActivityCode.types.legacy()
+
+    def get_foreign_keys(self):
+        return {
+            'casing_set': Casing,
+            'screen_set': Screen,
+            'linerperforation_set': LinerPerforation,
+            'decommission_description_set': DecommissionDescription,
+        }
+
+    class Meta:
+        model = ActivitySubmission
+        extra_kwargs = {
+            'lithologydescription_set': {'required': False},
+            # This field might not be present
+            'create_user': {'required': False},
+            # This is autopopulated during create
+            'well_activity_type': {'required': False},
+        }
+        fields = '__all__'
+
+
+class WellConstructionSubmissionSerializer(WellSubmissionSerializerBase):
+    """ Serializes a well construction submission. """
+
+    casing_set = CasingSerializer(many=True, required=False)
+    screen_set = ScreenSerializer(many=True, required=False)
+    linerperforation_set = LinerPerforationSerializer(
+        many=True, required=False)
+
+    def get_foreign_keys(self):
+        return {
+            'casing_set': Casing,
+            'screen_set': Screen,
+            'linerperforation_set': LinerPerforation,
+        }
+
+    def get_well_activity_type(self):
+        return WellActivityCode.types.construction()
+
+    class Meta:
+        model = ActivitySubmission
+        fields = ('filing_number', 'well_activity_type', 'well', 'well_class', 'well_subclass',
+                  'intended_water_use', 'identification_plate_number', 'well_plate_attached',
+                  'work_start_date', 'work_end_date', 'owner_full_name', 'owner_mailing_address',
+                  'owner_province_state', 'owner_city', 'owner_postal_code', 'street_address', 'city',
+                  'legal_lot', 'legal_plan', 'legal_district_lot', 'legal_block', 'legal_section',
+                  'legal_township', 'legal_range', 'land_district', 'legal_pid', 'well_location_description',
+                  'latitude', 'longitude', 'ground_elevation', 'ground_elevation_method', 'drilling_method',
+                  'other_drilling_method', 'well_orientation', 'lithologydescription_set', 'casing_set',
+                  'surface_seal_material', 'surface_seal_depth', 'surface_seal_thickness',
+                  'surface_seal_method', 'backfill_above_surface_seal', 'backfill_above_surface_seal_depth',
+                  'liner_material', 'liner_diameter', 'liner_thickness', 'liner_from', 'liner_to',
+                  'linerperforation_set', 'screen_intake_method', 'screen_type', 'screen_material',
+                  'other_screen_material', 'screen_opening', 'screen_bottom', 'other_screen_bottom',
+                  'screen_set', 'filter_pack_from', 'filter_pack_to', 'filter_pack_thickness',
+                  'filter_pack_material', 'filter_pack_material_size', 'development_method',
+                  'development_hours', 'development_notes', 'water_quality_characteristics',
+                  'water_quality_colour', 'water_quality_odour', 'ems_id', 'total_depth_drilled',
+                  'finished_well_depth', 'final_casing_stick_up', 'bedrock_depth', 'static_water_level',
+                  'well_yield', 'artesian_flow', 'artesian_pressure', 'well_cap_type', 'well_disinfected',
+                  'comments', 'alternative_specs_submitted')
+        extra_kwargs = {
+            # TODO: reference appropriate serializer as above
+            'lithologydescription_set': {'required': False},
+            'well_activity_type': {'required': False}
+        }
+
+
+class WellAlterationSubmissionSerializer(WellSubmissionSerializerBase):
+    """ Serializes a well alteration submission. """
+
+    casing_set = CasingSerializer(many=True, required=False)
+    screen_set = ScreenSerializer(many=True, required=False)
+    linerperforation_set = LinerPerforationSerializer(
+        many=True, required=False)
+
+    def get_foreign_keys(self):
+        return {
+            'casing_set': Casing,
+            'screen_set': Screen,
+            'linerperforation_set': LinerPerforation,
+        }
+
+    def get_well_activity_type(self):
+        return WellActivityCode.types.alteration()
+
+    class Meta:
+        model = ActivitySubmission
+        fields = (
+            'filing_number',
+            'well_activity_type',
+            'well',
+            'well_class',
+            'well_subclass',
+            'intended_water_use',
+            'identification_plate_number',
+            'well_plate_attached',
+            'work_start_date',
+            'work_end_date',
+            'owner_full_name',
+            'owner_mailing_address',
+            'owner_province_state',
+            'owner_city',
+            'owner_postal_code',
+            'street_address',
+            'city',
+            'legal_lot',
+            'legal_plan',
+            'legal_district_lot',
+            'legal_block',
+            'legal_section',
+            'legal_township',
+            'legal_range',
+            'land_district',
+            'legal_pid',
+            'well_location_description',
+            'latitude',
+            'longitude',
+            'ground_elevation',
+            'ground_elevation_method',
+            'drilling_method',
+            'other_drilling_method',
+            'well_orientation',
+            'lithologydescription_set',
+            'casing_set',
+            'surface_seal_material',
+            'surface_seal_depth',
+            'surface_seal_thickness',
+            'surface_seal_method',
+            'backfill_above_surface_seal',
+            'backfill_above_surface_seal_depth',
+            'liner_material',
+            'liner_diameter',
+            'liner_thickness',
+            'liner_from',
+            'liner_to',
+            'linerperforation_set',
+            'screen_intake_method',
+            'screen_type',
+            'screen_material',
+            'other_screen_material',
+            'screen_opening',
+            'screen_bottom',
+            'other_screen_bottom',
+            'screen_set',
+            'filter_pack_from',
+            'filter_pack_to',
+            'filter_pack_thickness',
+            'filter_pack_material',
+            'filter_pack_material_size',
+            'development_method',
+            'development_hours',
+            'development_notes',
+            'water_quality_characteristics',
+            'water_quality_colour',
+            'water_quality_odour',
+            'ems_id',
+            'total_depth_drilled',
+            'finished_well_depth',
+            'final_casing_stick_up',
+            'bedrock_depth',
+            'static_water_level',
+            'well_yield',
+            'artesian_flow',
+            'artesian_pressure',
+            'well_cap_type',
+            'well_disinfected',
+            'comments',
+            'alternative_specs_submitted',
+        )
+        extra_kwargs = {
+            # TODO: reference appropriate serializer as above
+            'lithologydescription_set': {'required': False},
+            'well_activity_type': {'required': False}
+        }
+
+
+class WellDecommissionSubmissionSerializer(WellSubmissionSerializerBase):
+    """ Serializes a well decommission submission. """
+
+    casing_set = CasingSerializer(many=True, required=False)
+    decommission_description_set = DecommissionDescriptionSerializer(
+        many=True, required=False)
+
+    def get_well_activity_type(self):
+        return WellActivityCode.types.decommission()
+
+    def get_foreign_keys(self):
+        return {
+            'casing_set': Casing,
+            'decommission_description_set': DecommissionDescription,
+        }
+
+    class Meta:
+        model = ActivitySubmission
+        # Decommission has fewer fields
+        fields = (
+            'filing_number',
+            'well_activity_type',
+            'well',
+            'well_class',
+            'well_subclass',
+            'intended_water_use',
+            'identification_plate_number',
+            'well_plate_attached',
+            'work_start_date',
+            'work_end_date',
+            'owner_full_name',
+            'owner_mailing_address',
+            'owner_province_state',
+            'owner_city',
+            'owner_postal_code',
+            'street_address',
+            'city',
+            'legal_lot',
+            'legal_plan',
+            'legal_district_lot',
+            'legal_block',
+            'legal_section',
+            'legal_township',
+            'legal_range',
+            'land_district',
+            'legal_pid',
+            'well_location_description',
+            'latitude',
+            'longitude',
+            'ground_elevation',
+            'ground_elevation_method',
+            'drilling_method',
+            'other_drilling_method',
+            'well_orientation',
+            'decommission_reason',
+            'decommission_method',
+            'sealant_material',
+            'backfill_material',
+            'decommission_details',
+            'casing_set',
+            'decommission_description_set',
+            'comments',
+            'alternative_specs_submitted',
+        )
+        extra_kwargs = {
+            'well_activity_type': {'required': False}
+        }
+
+
 class WellActivityCodeSerializer(serializers.ModelSerializer):
     """Serializes well activity codes"""
 
diff --git a/app/backend/submissions/tests.py b/app/backend/submissions/tests.py
index 742e648a6d..5ba46e3679 100644
--- a/app/backend/submissions/tests.py
+++ b/app/backend/submissions/tests.py
@@ -6,14 +6,16 @@
 from rest_framework import status
 
 from gwells.roles import roles_to_groups, WELLS_EDIT_ROLE, WELLS_VIEWER_ROLE
+from submissions.serializers import (WellSubmissionListSerializer, WellConstructionSubmissionSerializer,
+                                     WellAlterationSubmissionSerializer, WellDecommissionSubmissionSerializer)
 
 
 class TestPermissionsNotAuthenticated(APITestCase):
 
-    def test_no_authenticated_attemps_submit(self):
-        # As an unauthenticated user, I should not be authorised to submit anything.
+    def test_not_authenticated_attemps_submit(self):
+        # As an unauthenticated user, I should not be authorised to get a submission list.
         url = reverse('submissions-list')
-        response = self.client.post(url, {}, format='json')
+        response = self.client.get(url, {}, format='json')
         self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
 
 
@@ -24,10 +26,10 @@ def setUp(self):
         roles_to_groups(user, [])
         self.client.force_authenticate(user)
 
-    def test_no_rights_attempts_submit(self):
-        # As a user with no rights, I should not be able to make a submission.
+    def test_no_rights_attempts_list(self):
+        # As a user with no rights, I should not be able get a list of submissions.
         url = reverse('submissions-list')
-        response = self.client.post(url, {}, format='json')
+        response = self.client.get(url, {}, format='json')
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
 
@@ -38,33 +40,75 @@ def setUp(self):
         roles_to_groups(user, [WELLS_VIEWER_ROLE, ])
         self.client.force_authenticate(user)
 
-    def test_view_rights_attempts_submit(self):
-        # As a user with view rights, I should not be able to make a submission.
+    def test_view_rights_attempts_get_submission_list(self):
+        # As a user with view rights, I should not be able to get a submission list.
         url = reverse('submissions-list')
+        response = self.client.get(url, {}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+    def test_view_rights_attempts_construction_submission(self):
+        # As a user with view rights, I should not be able to create a construction submission.
+        url = reverse('CON')
+        response = self.client.post(url, {}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+    def test_view_rights_attempts_alteration_submission(self):
+        # As a user with view rights, I should not be able to create an alteration submission.
+        url = reverse('ALT')
+        response = self.client.post(url, {}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+    def test_view_rights_attempts_alteration_submission(self):
+        # As a user with view rights, I should not be able to create a decommission submission.
+        url = reverse('DEC')
         response = self.client.post(url, {}, format='json')
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
 
-class TestPermissionsEditRights(APITestCase):
+class TestPermissionsSubmissionRights(APITestCase):
 
-    fixtures = ['gwells-codetables.json', ]
+    fixtures = ['gwells-codetables.json', 'wellsearch-codetables.json' ]
 
     def setUp(self):
         user, created = User.objects.get_or_create(username='edit_rights')
         roles_to_groups(user, [WELLS_EDIT_ROLE, ])
         self.client.force_authenticate(user)
 
-    def test_edit_rights_attempts_submit(self):
-        url = reverse('submissions-list')
-        # As a user with edit rights, I should be able to make a submission.
+    def test_edit_rights_attempts_construction_submition(self):
+        url = reverse('CON')
+        # As a user with edit rights, I should be able to make a construction submission.
+        data = {
+            'owner_full_name': 'molly',
+            'owner_mailing_address': 'somewhere',
+            'owner_city': 'somewhere',
+            'owner_province_state': 'BC',
+            'casing_set': []
+        }
+        response = self.client.post(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
+    def test_edit_rights_attempts_alteration_submition(self):
+        url = reverse('ALT')
+        # As a user with edit rights, I should be able to make an alteration submission.
+        data = {
+            'owner_full_name': 'molly',
+            'owner_mailing_address': 'somewhere',
+            'owner_city': 'somewhere',
+            'owner_province_state': 'BC',
+            'casing_set': []
+        }
+        response = self.client.post(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
+    def test_edit_rights_attempts_decommission_submition(self):
+        url = reverse('DEC')
+        # As a user with edit rights, I should be able to make a decommission submission.
         data = {
             'owner_full_name': 'molly',
             'owner_mailing_address': 'somewhere',
             'owner_city': 'somewhere',
             'owner_province_state': 'BC',
-            'well_activity_type': 'CON',
             'casing_set': []
         }
         response = self.client.post(url, data, format='json')
-        print(response)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
diff --git a/app/backend/submissions/urls.py b/app/backend/submissions/urls.py
index 39fa99eac5..dc3fb273d7 100644
--- a/app/backend/submissions/urls.py
+++ b/app/backend/submissions/urls.py
@@ -14,19 +14,36 @@
 from django.conf.urls import url
 from django.views.decorators.cache import never_cache
 
-from submissions import views
+from submissions.views import (SubmissionsOptions, SubmissionListAPIView, SubmissionConstructionAPIView,
+                               SubmissionAlterationAPIView, SubmissionDecommissionAPIView,
+                               SubmissionsHomeView, SubmissionGetAPIView, SubmissionStaffEditAPIView
+                               )
 
 
 urlpatterns = [
 
     # Submissions form options
     url(r'^api/v1/submissions/options/$',
-        never_cache(views.SubmissionsOptions.as_view()), name='submissions-options'),
+        never_cache(SubmissionsOptions.as_view()), name='submissions-options'),
 
     # Submissions list
     url(r'^api/v1/submissions/$',
-        never_cache(views.SubmissionListAPIView.as_view()), name='submissions-list'),
+        never_cache(SubmissionListAPIView.as_view()), name='submissions-list'),
+    # Submission
+    url(r'^api/v1/submissions/(?P<filing_number>[0-9]+)$',
+        never_cache(SubmissionGetAPIView.as_view()), name='submissions-get'),
+    # Construction submission
+    url(r'^api/v1/submissions/construction',
+        never_cache(SubmissionConstructionAPIView.as_view()), name='CON'),
+    # Alteration submission
+    url(r'^api/v1/submissions/alteration',
+        never_cache(SubmissionAlterationAPIView.as_view()), name='ALT'),
+    # Decommission submission
+    url(r'^api/v1/submissions/decommission',
+        never_cache(SubmissionDecommissionAPIView.as_view()), name='DEC'),
+    # Edit submission
+    url(r'^api/v1/submissions/staff_edit', never_cache(SubmissionStaffEditAPIView()), name='STAFF_EDIT'),
 
     # Submissions home (loads Submissions application)
-    url(r'^submissions/', views.SubmissionsHomeView.as_view(), name='submissions-home')
+    url(r'^submissions/', SubmissionsHomeView.as_view(), name='submissions-home')
 ]
diff --git a/app/backend/submissions/views.py b/app/backend/submissions/views.py
index 2bdb7011a0..48f409a3c5 100644
--- a/app/backend/submissions/views.py
+++ b/app/backend/submissions/views.py
@@ -13,10 +13,13 @@
 """
 
 from rest_framework.response import Response
+from posixpath import join as urljoin
 from django.views.generic import TemplateView
-from rest_framework.generics import ListCreateAPIView
+from django.urls import reverse
+from rest_framework.generics import ListAPIView, ListCreateAPIView, RetrieveUpdateAPIView, RetrieveAPIView
 from rest_framework.views import APIView
 
+from gwells.urls import app_root
 from gwells.pagination import APILimitOffsetPagination
 from wells.permissions import WellsEditPermissions
 from gwells.models import ProvinceStateCode
@@ -77,7 +80,10 @@
     ScreenAssemblyTypeCodeSerializer,
     WaterQualityCharacteristicSerializer,
     WaterQualityColourSerializer,
-    WellSubmissionSerializer,
+    WellConstructionSubmissionSerializer,
+    WellAlterationSubmissionSerializer,
+    WellDecommissionSubmissionSerializer,
+    WellSubmissionListSerializer,
     WellActivityCodeSerializer,
     WellClassCodeSerializer,
     WellSubclassCodeSerializer,
@@ -85,23 +91,8 @@
 )
 
 
-class SubmissionListAPIView(ListCreateAPIView):
-    """List and create submissions
-
-    get: returns a list of well activity submissions
-    post: adds a new submission
-    """
-
-    permission_classes = (WellsEditPermissions,)
-    model = ActivitySubmission
-    queryset = ActivitySubmission.objects.all()
-    pagination_class = APILimitOffsetPagination
-    serializer_class = WellSubmissionSerializer
-
-    def get_queryset(self):
-        qs = self.queryset
-        qs = qs \
-            .select_related(
+def get_submission_queryset(qs):
+    return qs.select_related(
                 "well_class",
                 "well_subclass",
                 "intended_water_use",
@@ -120,9 +111,45 @@ def get_queryset(self):
                 "productiondata_set",
                 "casing_set",
                 "screen_set",
+                "decommission_description_set",
             ) \
             .order_by("filing_number")
-        return qs
+
+
+class SubmissionGetAPIView(RetrieveAPIView):
+    """Get a submission"""
+
+    permission_classes = (WellsEditPermissions,)
+    queryset = ActivitySubmission.objects.all()
+    model = ActivitySubmission
+    lookup_field = 'filing_number'
+
+    def get_serializer(self, data):
+        if data.well_activity_type.code == WellActivityCode.types.construction().code:
+            return WellConstructionSubmissionSerializer(data)
+        elif data.well_activity_type.code == WellActivityCode.types.alteration().code:
+            return WellAlterationSubmissionSerializer(data)
+        elif data.well_activity_type.code == WellActivityCode.types.decommission().code:
+            return WellDecommissionSubmissionSerializer(data)
+        else:
+            return WellSubmissionListSerializer(data)
+
+
+class SubmissionListAPIView(ListAPIView):
+    """List and create submissions
+
+    get: returns a list of well activity submissions
+    post: adds a new submission
+    """
+
+    permission_classes = (WellsEditPermissions,)
+    model = ActivitySubmission
+    queryset = ActivitySubmission.objects.all()
+    pagination_class = APILimitOffsetPagination
+    serializer_class = WellSubmissionListSerializer
+
+    def get_queryset(self):
+        return get_submission_queryset(self.queryset)
 
     def list(self, request):
         """ List activity submissions with pagination """
@@ -131,13 +158,68 @@ def list(self, request):
 
         page = self.paginate_queryset(filtered_queryset)
         if page is not None:
-            serializer = WellSubmissionSerializer(page, many=True)
+            serializer = WellSubmissionListSerializer(page, many=True)
             return self.get_paginated_response(serializer.data)
 
-        serializer = WellSubmissionSerializer(filtered_queryset, many=True)
+        serializer = WellSubmissionListSerializer(filtered_queryset, many=True)
         return Response(serializer.data)
 
 
+class SubmissionConstructionAPIView(ListCreateAPIView):
+    """Create a construction submission
+
+    """
+    model = ActivitySubmission
+    serializer_class = WellConstructionSubmissionSerializer
+    permission_classes = (WellsEditPermissions,)
+    queryset = ActivitySubmission.objects.all()
+
+    def get_queryset(self):
+        return get_submission_queryset(self.queryset)\
+            .filter(well_activity_type=WellActivityCode.types.construction())
+
+
+class SubmissionAlterationAPIView(ListCreateAPIView):
+    """Create an alteration submission
+
+    """
+    model = ActivitySubmission
+    serializer_class = WellAlterationSubmissionSerializer
+    permission_classes = (WellsEditPermissions,)
+    queryset = ActivitySubmission.objects.all()
+
+    def get_queryset(self):
+        return get_submission_queryset(self.queryset)\
+            .filter(well_activity_type=WellActivityCode.types.alteration())
+
+
+class SubmissionDecommissionAPIView(ListCreateAPIView):
+    """Create an decommission submission
+
+    """
+    model = ActivitySubmission
+    serializer_class = WellDecommissionSubmissionSerializer
+    permission_classes = (WellsEditPermissions,)
+    queryset = ActivitySubmission.objects.all()
+
+    def get_queryset(self):
+        return get_submission_queryset(self.queryset)\
+            .filter(well_activity_type=WellActivityCode.types.decommission())
+
+
+class SubmissionStaffEditAPIView(ListCreateAPIView):
+    """ Create a staff edit submission
+    TODO: Implement this class fully
+    """
+    model = ActivitySubmission
+    permission_classes = (WellsEditPermissions,)
+    queryset = ActivitySubmission.objects.all()
+
+    def get_queryset(self):
+        return get_submission_queryset(self.queryset)\
+            .filter(well_activity_type=WellActivityCode.types.staff_edit())
+
+
 class SubmissionsOptions(APIView):
     """Options required for submitting activity report forms"""
 
@@ -195,6 +277,11 @@ def get(self, request):
         water_quality_colours = WaterQualityColourSerializer(
             instance=WaterQualityColour.objects.all(), many=True)
 
+        root = urljoin('/', app_root, 'api/v1/')
+        for item in activity_codes.data:
+            if item['code'] not in ('LEGACY'):
+                item['path'] = reverse(item['code'])[len(root):]
+
         options["province_codes"] = province_codes.data
         options["activity_types"] = activity_codes.data
         options["well_classes"] = well_class_codes.data
diff --git a/app/backend/wells/models.py b/app/backend/wells/models.py
index dccfcc696e..21c6bc735b 100644
--- a/app/backend/wells/models.py
+++ b/app/backend/wells/models.py
@@ -376,6 +376,28 @@ def __str__(self):
         return self.description
 
 
+class WellStatusCodeTypeManager(models.Manager):
+    """
+    Provides additional methods for returning well status codes that correspond
+    to activity submissions
+    """
+
+    # Construction reports correspond to "NEW" status
+    def construction(self):
+        return self.get_queryset().get(well_status_code='NEW')
+
+    # Decommission reports trigger a "CLOSURE" status
+    def decommission(self):
+        return self.get_queryset().get(well_status_code='CLOSURE')
+
+    # Alteration reports trigger an "ALTERATION" status
+    def alteration(self):
+        return self.get_queryset().get(well_status_code='ALTERATION')
+    
+    def other(self):
+        return self.get_queryset().get(well_status_code='OTHER')
+
+
 class WellStatusCode(AuditModel):
     """
     Well Status.
@@ -388,6 +410,9 @@ class WellStatusCode(AuditModel):
     effective_date = models.DateTimeField(blank=True, null=True)
     expiry_date = models.DateTimeField(blank=True, null=True)
 
+    objects = models.Manager()
+    types = WellStatusCodeTypeManager()
+
     class Meta:
         db_table = 'well_status_code'
         ordering = ['display_order', 'well_status_code']
diff --git a/app/backend/wells/permissions.py b/app/backend/wells/permissions.py
index a695b69926..1781d7a825 100644
--- a/app/backend/wells/permissions.py
+++ b/app/backend/wells/permissions.py
@@ -11,35 +11,30 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 """
-from rest_framework.permissions import DjangoModelPermissions, BasePermission
-from gwells.roles import WELLS_VIEW_ROLES, WELLS_EDIT_ROLES
+from rest_framework.permissions import BasePermission
+from gwells.roles import WELLS_VIEWER_ROLE, WELLS_EDIT_ROLE
 
 
 class WellsDocumentViewPermissions(BasePermission):
     """
-    Grants permission to view documents to users in a Wells staff group
+    Grants permission to view documents to users with the wells viewer role.
     """
 
     def has_permission(self, request, view):
-        if request.user and request.user.is_authenticated and request.user.groups.filter(
-                name__in=WELLS_VIEW_ROLES).exists():
-            return True
-        return False
+        return request.user and request.user.is_authenticated and\
+            request.user.groups.filter(name=WELLS_VIEWER_ROLE).exists()
 
 
-class WellsEditPermissions(DjangoModelPermissions):
+class WellsEditPermissions(BasePermission):
     """
     Grants permissions to edit wells to users
     """
 
     def has_permission(self, request, view):
         """
-        Refuse permission if user is not in a "Wells" staff group.
-        If user in one of the wells groups, group permissions will dictate (e.g. user is
+        Refuse permission if user is not in an edit group.
+        If user is in the edit group, then group permissions will dictate (e.g. user is
         in a group that has 'add_well' permission)
         """
-        if request.user and request.user.is_authenticated and request.user.groups.filter(
-                name__in=WELLS_EDIT_ROLES).exists():
-            result = super().has_permission(request, view)
-            return result
-        return False
+        return request.user and request.user.is_authenticated and\
+            request.user.groups.filter(name=WELLS_EDIT_ROLE).exists()
diff --git a/app/backend/wells/serializers.py b/app/backend/wells/serializers.py
index c41d49e79e..1cbfe24aae 100644
--- a/app/backend/wells/serializers.py
+++ b/app/backend/wells/serializers.py
@@ -77,7 +77,7 @@ class Meta:
             'start',
             'end',
             'material',
-            'observations',
+            'observations'
         )
         extra_kwargs = {
             'start': {'required': True},
diff --git a/app/backend/wells/stack.py b/app/backend/wells/stack.py
index a1354a9da8..8d3858773f 100644
--- a/app/backend/wells/stack.py
+++ b/app/backend/wells/stack.py
@@ -22,7 +22,7 @@
 from gwells.models import ProvinceStateCode
 from submissions.models import WellActivityCode
 import submissions.serializers
-from wells.models import Well, ActivitySubmission
+from wells.models import Well, ActivitySubmission, WellStatusCode
 from wells.serializers import WellStackerSerializer
 
 
@@ -65,7 +65,7 @@ def _create_legacy_submission(self, well: Well) -> None:
         """
         Using an existing well as a reference, create a legacy well record
         """
-        # TODO: Deal with Lithology, LtsaOwner, LinerPerforation, AquiferWell, Screen etc. (This should
+        # TODO: Deal with Lithology, LtsaOwner, AquiferWell etc. (This should
         # work magically if the serializers are implemented correctly)
         # Serialize the well.
         well_serializer = WellStackerSerializer(well)
@@ -75,12 +75,10 @@ def _create_legacy_submission(self, well: Well) -> None:
         data['work_end_date'] = data.pop('construction_end_date', None)
         # Filter out None and '' values, they can interfere with validation.
         data = {k: v for (k, v) in data.items() if v is not None and v != ''}
-        # Specify the submission type as legacy.
-        data['well_activity_type'] = WellActivityCode.types.legacy().code
         # Retain the well reference.
         data['well'] = well.well_tag_number
         # De-serialize the well into a submission.
-        submission_serializer = submissions.serializers.WellSubmissionSerializer(data=data)
+        submission_serializer = submissions.serializers.WellSubmissionLegacySerializer(data=data)
 
         # Validate the data, throwing an exception on error.
         if submission_serializer.is_valid(raise_exception=True):
@@ -136,9 +134,17 @@ def _stack(self, records, well: Well) -> Well:
         records = records.order_by(F('work_start_date').asc(nulls_first=True), 'create_date')
         FOREIGN_KEYS = ('casing_set', 'screen_set', 'linerperforation_set', 'decommission_description_set')
         composite = {}
+
+        # Well status is set based on the most recent activity submission.
+        well_status_map = {
+            WellActivityCode.types.construction().code: WellStatusCode.types.construction().well_status_code,
+            WellActivityCode.types.alteration().code: WellStatusCode.types.alteration().well_status_code,
+            WellActivityCode.types.decommission().code: WellStatusCode.types.decommission().well_status_code,
+        }
+
         for submission in records:
             source_target_map = activity_type_map.get(submission.well_activity_type.code, {})
-            serializer = submissions.serializers.WellSubmissionSerializer(submission)
+            serializer = submissions.serializers.WellSubmissionStackerSerializer(submission)
             for source_key, value in serializer.data.items():
                 # We only consider items with values, and keys that are in our target
                 if value:
@@ -149,6 +155,10 @@ def _stack(self, records, well: Well) -> Well:
                         else:
                             composite[target_key] = value
 
+            # add a well_status based on the current activity submission
+            composite['well_status'] = well_status_map.get(
+                submission.well_activity_type.code, WellStatusCode.types.other().well_status_code)
+
         # Update the well view
         well_serializer = WellStackerSerializer(well, data=composite, partial=True)
         if well_serializer.is_valid(raise_exception=True):
@@ -162,19 +172,19 @@ def _update_well_record(self, submission: ActivitySubmission) -> Well:
         Used to update an existing well record.
         """
         records = ActivitySubmission.objects.filter(well=submission.well)
-        if records.count() > 1 or self._submission_is_construction(submission):
-            # If there's more than one submission, or this is a construction submission, we don't need to
-            # create a legacy well, we can go ahead, iterate though the submission records and update the
-            # well.
+        if records.count() > 1:
+            # If there's more than one submission we don't need to create a legacy well, we can safely
+            # assume that the 1st submission is either a legacy or construction report submission.
             return self._stack(records, submission.well)
         else:
             # If there aren't prior submissions, we may create a legacy record using the current well
             # record.
+            # Edge case of note:
+            # Re. discussion with Lindsay on Oct 15 2018: There may be an instance, where there is a
+            # pre-existing well, and a construct report is submitted. In this instance, we may end up with a
+            # LEGACY record and a CONSTRUCTION record. This is odd, but we don't want to lose the information
+            # stored in the existing well record. It is imerative that we always create a legacy record.
             self._create_legacy_submission(submission.well)
             # We should now have multiple records
             records = ActivitySubmission.objects.filter(well=submission.well)
             return self._stack(records, submission.well)
-
-    def _submission_is_construction(self, submission):
-        construction_code = WellActivityCode.types.construction().code
-        return submission.well_activity_type.code == construction_code
diff --git a/app/backend/wells/tests/test_stack.py b/app/backend/wells/tests/test_stack.py
index f7aa38bcfa..0761af52c2 100644
--- a/app/backend/wells/tests/test_stack.py
+++ b/app/backend/wells/tests/test_stack.py
@@ -19,13 +19,32 @@
 from gwells.models import ProvinceStateCode
 from wells.models import Well, ActivitySubmission, Casing, Screen, LinerPerforation
 from submissions.models import WellActivityCode
-from wells.stack import StackWells
+from wells.stack import StackWells, overlap
 from registries.models import Person
 
 
 logger = logging.getLogger(__name__)
 
 
+class OverlapTest(TestCase):
+
+    def test_overlap(self):
+        # 0-1 ; 1-2 ; does not overlap.
+        self.assertFalse(overlap((0, 1), (1, 2)))
+
+    def test_overlap(self):
+        # 0-1 ; 0-1 ; does overlap.
+        self.assertTrue(overlap((0, 1), (0, 1)))
+
+    def test_overlap(self):
+        # 0-2 ; 1-2 ; does overlap.
+        self.assertTrue(overlap((0, 2), (1, 2)))
+
+    def test_overlap(self):
+        # 0-2 ; 1-3 ; does overlap.
+        self.assertTrue(overlap((0, 2), (1, 3)))
+
+
 class SeriesMergeTest(TestCase):
 
     def test_new_data(self):
@@ -152,6 +171,9 @@ def test_intersection(self):
 
 class StackTest(TestCase):
 
+    fixtures = ['wellsearch-codetables.json', ]
+
+
     def setUp(self):
         self.driller = Person.objects.create(
             first_name='Bobby',
@@ -303,7 +325,36 @@ def test_construction_submission_to_legacy_well(self):
         submissions = ActivitySubmission.objects.filter(well=well)
         # Load the updated well record.
         well = Well.objects.get(well_tag_number=well.well_tag_number)
-        self.assertEqual(submissions.count(), 1, "It is expected that no legacy submission be created")
+        self.assertEqual(submissions.count(), 2, "It is expected that a legacy submission be created")
+        self.assertEqual(new_full_name, well.owner_full_name)
+
+    def test_decomission_submission_to_legacy_well(self):
+        # The well already exists, and we are applying a decommission submission to it.
+        original_full_name = 'Bob'
+        new_full_name = 'Jimbo'
+        # This is the original well record.
+        well = Well.objects.create(
+            owner_full_name=original_full_name,
+            owner_province_state=self.province)
+        # Create a submission.
+        submission = ActivitySubmission.objects.create(
+            owner_full_name=new_full_name,
+            work_start_date=date(2018, 1, 1),
+            work_end_date=date(2018, 2, 1),
+            driller_responsible=self.driller,
+            owner_province_state=self.province,
+            well_activity_type=WellActivityCode.types.decommission(),
+            well=well
+            )
+
+        stacker = StackWells()
+        stacker.process(submission.filing_number)
+
+        # Load all the submissions.
+        submissions = ActivitySubmission.objects.filter(well=well)
+        # Load the updated well record.
+        well = Well.objects.get(well_tag_number=well.well_tag_number)
+        self.assertEqual(submissions.count(), 2, "It is expected that a legacy submission be created")
         self.assertEqual(new_full_name, well.owner_full_name)
 
     def test_construction_field_mapping(self):
diff --git a/app/backend/wells/views.py b/app/backend/wells/views.py
index 71b5ff0d72..5512344683 100644
--- a/app/backend/wells/views.py
+++ b/app/backend/wells/views.py
@@ -26,7 +26,7 @@
 
 from gwells import settings
 from gwells.models import Survey
-from gwells.roles import WELLS_VIEW_ROLES
+from gwells.roles import WELLS_VIEWER_ROLE
 from gwells.pagination import APILimitOffsetPagination
 
 from wells.models import Well
@@ -72,7 +72,7 @@ class ListFiles(APIView):
     @swagger_auto_schema(auto_schema=None)
     def get(self, request, tag):
         user_is_staff = self.request.user.groups.filter(
-            name__in=WELLS_VIEW_ROLES).exists()
+            name=WELLS_VIEWER_ROLE).exists()
 
         client = MinioClient(
             request=request, disable_private=(not user_is_staff))
diff --git a/app/database/scripts/wellsearch/wells_replication_stored_functions.sql b/app/database/scripts/wellsearch/wells_replication_stored_functions.sql
index d625be02db..b77ed2d264 100644
--- a/app/database/scripts/wellsearch/wells_replication_stored_functions.sql
+++ b/app/database/scripts/wellsearch/wells_replication_stored_functions.sql
@@ -146,7 +146,7 @@ DECLARE
     wells.legal_section AS legal_section                                     ,
     wells.legal_township AS legal_township                                   ,
     wells.legal_range AS legal_range                                         ,
-    to_char(wells.pid,''fm000000000'') AS legal_pid                          ,
+    wells.pid AS legal_pid                                                   ,
     wells.well_location AS well_location_description                         ,
     wells.well_identification_plate_no AS identification_plate_number        ,
     wells.diameter AS diameter                                               ,
@@ -287,7 +287,7 @@ BEGIN
      legal_section                      character varying(10),
      legal_township                     character varying(20),
      legal_range                        character varying(10),
-     legal_pid                          character varying(9),
+     legal_pid                          integer,
      well_location_description          character varying(500),
      identification_plate_number        integer,
      diameter                           character varying(9),
@@ -893,7 +893,7 @@ BEGIN
   FROM wells.gw_aquifer_wells aws INNER JOIN xform_well xform ON aws.well_id = xform.well_id;
 
   -- 2018-SEPT-24 14:59 GW Aquifer app
-  raise notice '...importing gw_aquifer_attrs data';
+  raise notice '...importing gw_aquifer_attrs data (aquifer)';
   INSERT INTO aquifer(
     aquifer_id              
     ,aquifer_name            
@@ -982,7 +982,7 @@ BEGIN
   WHERE  aquifer.aquifer_id = xform.aquifer_id
   AND    xform.mapping_year is not null;
 
-  raise notice '...gw_aquifer_attrs data updated from mapping ';
+  raise notice '...aquifer data updated from mapping spreadsheet';
 
   UPDATE well
   SET    aquifer_id = aws.aquifer_id
@@ -993,6 +993,7 @@ BEGIN
 
   raise notice '...well data updated from gw_aquifer_wells';
 
+  raise notice '...importing hydraulic_property data';
   INSERT INTO hydraulic_property(
     hydraulic_property_guid  
   ,storativity              
@@ -1138,7 +1139,8 @@ BEGIN
   PERFORM populate_xform(_subset_ind);
   TRUNCATE TABLE bcgs_number CASCADE;
   PERFORM migrate_bcgs();
-  TRUNCATE TABLE well CASCADE;
+  -- This truncates 'well' table too
+  TRUNCATE TABLE aquifer CASCADE; 
   PERFORM populate_well();
   PERFORM migrate_screens();
   PERFORM migrate_production();
diff --git a/app/frontend/build/webpack.dev-watch.conf.js b/app/frontend/build/webpack.dev-watch.conf.js
index 371a4b5e9a..a3b714cbad 100755
--- a/app/frontend/build/webpack.dev-watch.conf.js
+++ b/app/frontend/build/webpack.dev-watch.conf.js
@@ -22,7 +22,8 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     registry: './src/registry/main.js',
     documents: './src/wells/documents.js',
     summary: './src/wells/summary.js',
-    submissions: './src/submissions/main.js'
+    submissions: './src/submissions/main.js',
+    aquifers: './src/aquifers/main.js'
   },
   module: {
     rules: utils.styleLoaders({
diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json
index ad9dd70135..cabe13c85c 100644
--- a/app/frontend/package-lock.json
+++ b/app/frontend/package-lock.json
@@ -21,7 +21,7 @@
       "requires": {
         "@babel/types": "7.0.0-beta.44",
         "jsesc": "2.5.1",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "source-map": "0.5.7",
         "trim-right": "1.0.1"
       },
@@ -89,7 +89,7 @@
         "@babel/code-frame": "7.0.0-beta.44",
         "@babel/types": "7.0.0-beta.44",
         "babylon": "7.0.0-beta.44",
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "babylon": {
@@ -115,7 +115,7 @@
         "debug": "3.1.0",
         "globals": "11.7.0",
         "invariant": "2.2.4",
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "babylon": {
@@ -139,7 +139,7 @@
       "dev": true,
       "requires": {
         "esutils": "2.0.2",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "to-fast-properties": "2.0.0"
       },
       "dependencies": {
@@ -151,6 +151,11 @@
         }
       }
     },
+    "@esri/arcgis-to-geojson-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@esri/arcgis-to-geojson-utils/-/arcgis-to-geojson-utils-1.3.0.tgz",
+      "integrity": "sha512-8yPorlHeU63U6aT7RJbgSfXGKTZtnQz7Os8Qw96PW2lXJ+g1CRe5L/G8h5qtYHqt5VM4yCUGIhzHHYxdGzanLQ=="
+    },
     "@types/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -169,7 +174,7 @@
       "integrity": "sha1-70UFNBuALz3hwGs8uGUTeMhzcfo=",
       "dev": true,
       "requires": {
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "abab": {
@@ -503,7 +508,7 @@
       "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "async-each": {
@@ -616,7 +621,7 @@
         "convert-source-map": "1.5.1",
         "debug": "2.6.9",
         "json5": "0.5.1",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "minimatch": "3.0.4",
         "path-is-absolute": "1.0.1",
         "private": "0.1.8",
@@ -674,7 +679,7 @@
         "babel-types": "6.26.0",
         "detect-indent": "4.0.0",
         "jsesc": "1.3.0",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "source-map": "0.5.7",
         "trim-right": "1.0.1"
       },
@@ -730,7 +735,7 @@
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "babel-helper-explode-assignable-expression": {
@@ -807,7 +812,7 @@
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "babel-helper-remap-async-to-generator": {
@@ -1048,7 +1053,7 @@
         "babel-template": "6.26.0",
         "babel-traverse": "6.26.0",
         "babel-types": "6.26.0",
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -1417,7 +1422,7 @@
         "babel-runtime": "6.26.0",
         "core-js": "2.5.7",
         "home-or-tmp": "2.0.0",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "mkdirp": "0.5.1",
         "source-map-support": "0.4.18"
       }
@@ -1448,7 +1453,7 @@
         "babel-traverse": "6.26.0",
         "babel-types": "6.26.0",
         "babylon": "6.18.0",
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "babel-traverse": {
@@ -1465,7 +1470,7 @@
         "debug": "2.6.9",
         "globals": "9.18.0",
         "invariant": "2.2.4",
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "debug": {
@@ -1487,7 +1492,7 @@
       "requires": {
         "babel-runtime": "6.26.0",
         "esutils": "2.0.2",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "to-fast-properties": "1.0.3"
       }
     },
@@ -3914,7 +3919,7 @@
         "js-yaml": "3.12.0",
         "json-stable-stringify-without-jsonify": "1.0.1",
         "levn": "0.3.0",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
         "natural-compare": "1.4.0",
@@ -4124,7 +4129,7 @@
         "eslint-import-resolver-node": "0.3.2",
         "eslint-module-utils": "2.2.0",
         "has": "1.0.3",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "minimatch": "3.0.4",
         "read-pkg-up": "2.0.0",
         "resolve": "1.8.1"
@@ -4289,6 +4294,16 @@
         "estraverse": "4.2.0"
       }
     },
+    "esri-leaflet": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/esri-leaflet/-/esri-leaflet-2.2.3.tgz",
+      "integrity": "sha512-4h+Ygr6jaTsTsuj7fW8JTCft4dkIZ8IPzb/EEkf5W+5PQnXcilwPO0d2MerxcFe2+DTTOV/bPcv9D1eUKiRAfw==",
+      "requires": {
+        "@esri/arcgis-to-geojson-utils": "^1.3.0",
+        "leaflet-virtual-grid": "^1.0.7",
+        "tiny-binary-search": "^1.0.3"
+      }
+    },
     "estraverse": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
@@ -5892,7 +5907,7 @@
       "dev": true,
       "requires": {
         "glob": "7.1.2",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "minimatch": "3.0.4"
       },
       "dependencies": {
@@ -6212,7 +6227,7 @@
         "bluebird": "3.5.1",
         "html-minifier": "3.5.18",
         "loader-utils": "0.2.17",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "pretty-error": "2.1.1",
         "toposort": "1.0.7"
       },
@@ -6321,7 +6336,7 @@
       "requires": {
         "http-proxy": "1.17.0",
         "is-glob": "3.1.0",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "micromatch": "2.3.11"
       },
       "dependencies": {
@@ -6602,7 +6617,7 @@
         "cli-width": "2.2.0",
         "external-editor": "2.2.0",
         "figures": "2.0.0",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "mute-stream": "0.0.7",
         "run-async": "2.3.0",
         "rx": "4.1.0",
@@ -8171,7 +8186,7 @@
       "integrity": "sha512-CZc+m2xZm51J8qSwdODeiiNeqh8CYkKEq6Rw8IkE4i/4yqf2cJhjQPsA6BtAV970ePRNhwEOXhy2U5xc5Jwh9Q==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "webpack-sources": "1.1.0"
       }
     },
@@ -8190,6 +8205,19 @@
         "invert-kv": "1.0.0"
       }
     },
+    "leaflet": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.3.4.tgz",
+      "integrity": "sha512-FYL1LGFdj6v+2Ifpw+AcFIuIOqjNggfoLUwuwQv6+3sS21Za7Wvapq+LhbSE4NDXrEj6eYnW3y7LsaBICpyXtw=="
+    },
+    "leaflet-virtual-grid": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/leaflet-virtual-grid/-/leaflet-virtual-grid-1.0.7.tgz",
+      "integrity": "sha512-sJxWYPcIKwMTewE+z8OFzfZHsbZcniQgTcreVdIQnxSRf+1XpMp+c4QKAWRKTBRmWOhEGyQO0Z90CLANJ9jRUQ==",
+      "requires": {
+        "leaflet": "^1.0.0"
+      }
+    },
     "left-pad": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
@@ -8304,9 +8332,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.10",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
     },
     "lodash._reinterpolate": {
       "version": "3.0.0",
@@ -8343,6 +8371,11 @@
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
       "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
+    "lodash.isempty": {
+      "version": "4.4.0",
+      "resolved": "http://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
+      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4="
+    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -8873,7 +8906,7 @@
       "dev": true,
       "requires": {
         "clone": "2.1.1",
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "clone": {
@@ -16597,7 +16630,7 @@
       "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
       "dev": true,
       "requires": {
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "request-promise-native": {
@@ -16814,7 +16847,7 @@
       "dev": true,
       "requires": {
         "glob": "7.1.2",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "scss-tokenizer": "0.2.3",
         "yargs": "7.1.0"
       },
@@ -17823,7 +17856,7 @@
         "ajv": "5.5.2",
         "ajv-keywords": "2.1.1",
         "chalk": "2.4.1",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "slice-ansi": "1.0.0",
         "string-width": "2.1.1"
       }
@@ -17906,6 +17939,11 @@
         "setimmediate": "1.0.5"
       }
     },
+    "tiny-binary-search": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-binary-search/-/tiny-binary-search-1.0.3.tgz",
+      "integrity": "sha512-STSHX/L5nI9WTLv6wrzJbAPbO7OIISX83KFBh2GVbX1Uz/vgZOU/ANn/8iV6t35yMTpoPzzO+3OQid3mifE0CA=="
+    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -18553,7 +18591,7 @@
         "eslint-visitor-keys": "1.0.0",
         "espree": "3.5.4",
         "esquery": "1.0.1",
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "vue-functional-data-merge": {
@@ -19080,7 +19118,7 @@
         "express": "4.16.3",
         "filesize": "3.6.1",
         "gzip-size": "4.1.0",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "mkdirp": "0.5.1",
         "opener": "1.4.3",
         "ws": "4.1.0"
@@ -19331,7 +19369,7 @@
       "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       }
     },
     "webpack-sources": {
diff --git a/app/frontend/package.json b/app/frontend/package.json
index fa7bed321b..671e4a0980 100644
--- a/app/frontend/package.json
+++ b/app/frontend/package.json
@@ -21,6 +21,7 @@
     "babel-polyfill": "^6.26.0",
     "bootstrap-vue": "^2.0.0-rc.2",
     "keycloak-js": "^4.0.0",
+    "lodash.isempty": "^4.4.0",
     "npm": "^5.6.0",
     "proj4": "^2.4.4",
     "vue": "^2.5.2",
@@ -28,7 +29,9 @@
     "vue-router": "^3.0.1",
     "vue-select": "^2.5.0",
     "vue-smoothscroll": "^0.1.1",
-    "vuex": "^3.0.1"
+    "vuex": "^3.0.1",
+    "leaflet": "^1.3.4",
+    "esri-leaflet": "^2.2.3"
   },
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.16",
diff --git a/app/frontend/src/aquifers/App.vue b/app/frontend/src/aquifers/App.vue
index f41baad74d..3cd72238e7 100644
--- a/app/frontend/src/aquifers/App.vue
+++ b/app/frontend/src/aquifers/App.vue
@@ -16,7 +16,7 @@
   <div>
     <gwells-header/>
     <main role="main" class="p-0 mt-0 mt-sm-4 container container-wide">
-      <aquifer-search/>
+      <router-view/>
     </main>
     <gwells-footer/>
   </div>
@@ -25,21 +25,24 @@
 <script>
 import Header from '@/common/components/Header'
 import Footer from '@/common/components/Footer'
-import AquiferSearch from './components/Search'
 
 export default {
   name: 'App',
   components: {
     'gwells-header': Header,
-    'gwells-footer': Footer,
-    'aquifer-search': AquiferSearch
+    'gwells-footer': Footer
   }
 }
 </script>
 
 <style lang="scss">
-@import '../common/common.scss';
+@import "../common/common.scss";
+
 .container-wide {
-  max-width: 1400px
+  max-width: 1400px;
+}
+
+main a {
+  text-decoration: underline;
 }
 </style>
diff --git a/app/frontend/src/aquifers/components/Edit.vue b/app/frontend/src/aquifers/components/Edit.vue
new file mode 100644
index 0000000000..2fed97556f
--- /dev/null
+++ b/app/frontend/src/aquifers/components/Edit.vue
@@ -0,0 +1,402 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+<template>
+  <div>
+    <b-card no-body class="p-3 mb-4">
+      <api-error v-if="error" :error="error"/>
+      <b-alert variant="success" :show="showSaveSuccess">Record successfully updated</b-alert>
+
+      <b-container>
+        <b-row v-if="!loading" class="border-bottom mb-3 pb-2">
+          <b-col><h5>Aquifer {{record.aquifer_id}} Summary - Edit</h5></b-col>
+        </b-row>
+
+        <b-row v-if="loading" class="border-bottom mb-3 pb-2">
+          <b-col><h5>Loading...</h5></b-col>
+        </b-row>
+
+        <b-row>
+          <b-col md="6">
+            <b-row>
+              <b-col md="4" class="col-form-label">
+                Aquifer number
+              </b-col>
+              <b-col md="8" class="col-form-label">
+                {{record.aquifer_id}}
+              </b-col>
+            </b-row>
+          </b-col>
+
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Year of mapping"
+              label-for="mapping_year"
+              :invalid-feedback="fieldErrorMessages.mapping_year"
+              :state="fieldHasError.mapping_year">
+                <b-form-input
+                  id="mapping_year"
+                  type="text"
+                  v-model="record.mapping_year"
+                  required/>
+            </b-form-group>
+          </b-col>
+        </b-row>
+
+        <b-row>
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Aquifer name"
+              label-for="aquifer_name"
+              :invalid-feedback="fieldErrorMessages.aquifer_name"
+              :state="fieldHasError.aquifer_name">
+                <b-form-input
+                  id="aquifer_name"
+                  type="text"
+                  v-model="record.aquifer_name"
+                  required/>
+            </b-form-group>
+          </b-col>
+
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Litho stratigraphic unit"
+              label-for="litho_stratographic_unit"
+              :invalid-feedback="fieldErrorMessages.litho_stratographic_unit"
+              :state="fieldHasError.litho_stratographic_unit">
+                <b-form-input
+                  id="litho_stratographic_unit"
+                  type="text"
+                  v-model="record.litho_stratographic_unit"
+                  required/>
+            </b-form-group>
+          </b-col>
+        </b-row>
+
+        <b-row>
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Descriptive location"
+              label-for="location_description"
+              :invalid-feedback="fieldErrorMessages.location_description"
+              :state="fieldHasError.location_description">
+                <b-form-input
+                  id="location_description"
+                  type="text"
+                  v-model="record.location_description"
+                  required/>
+            </b-form-group>
+          </b-col>
+
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Vulnerability"
+              label-for="vulnerability"
+              :invalid-feedback="fieldErrorMessages.vulnerability"
+              :state="fieldHasError.vulnerability">
+              <b-form-select
+                :options="vulnerability_codes"
+                id="vulnerability"
+                text-field="description"
+                v-model="record.vulnerability"
+                value-field="code"
+                required/>
+            </b-form-group>
+          </b-col>
+        </b-row>
+
+        <b-row>
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Material type"
+              label-for="material"
+              :invalid-feedback="fieldErrorMessages.material"
+              :state="fieldHasError.material">
+              <b-form-select
+                :options="material_codes"
+                id="material"
+                text-field="description"
+                v-model="record.material"
+                value-field="code"
+                required/>
+            </b-form-group>
+          </b-col>
+
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Subtype"
+              label-for="subtype"
+              :invalid-feedback="fieldErrorMessages.subtype"
+              :state="fieldHasError.subtype">
+              <b-form-select
+                id="subtype"
+                v-model="record.subtype"
+                :options="subtype_codes"
+                value-field="code"
+                text-field="description"
+                required/>
+            </b-form-group>
+          </b-col>
+        </b-row>
+
+        <b-row>
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Quality concerns"
+              label-for="quality_concern"
+              :invalid-feedback="fieldErrorMessages.quality_concern"
+              :state="fieldHasError.quality_concern">
+              <b-form-select
+                id="quality_concern"
+                v-model="record.quality_concern"
+                :options="quality_concern_codes"
+                value-field="code"
+                text-field="description"
+                required/>
+            </b-form-group>
+          </b-col>
+
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Productivity"
+              label-for="productivity"
+              :invalid-feedback="fieldErrorMessages.productivity"
+              :state="fieldHasError.productivity">
+              <b-form-select
+                id="productivity"
+                v-model="record.productivity"
+                :options="productivity_codes"
+                value-field="code"
+                text-field="description"
+                required/>
+            </b-form-group>
+          </b-col>
+        </b-row>
+
+        <b-row>
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Size (km²)"
+              label-for="area"
+              :invalid-feedback="fieldErrorMessages.area"
+              :state="fieldHasError.area">
+              <b-form-input
+                id="area"
+                type="text"
+                v-model="record.area"
+                required/>
+            </b-form-group>
+          </b-col>
+
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Demand"
+              label-for="demand"
+              :invalid-feedback="fieldErrorMessages.demand"
+              :state="fieldHasError.demand">
+              <b-form-select
+                id="demand"
+                v-model="record.demand"
+                :options="demand_codes"
+                value-field="code"
+                text-field="description"
+                required/>
+            </b-form-group>
+          </b-col>
+        </b-row>
+
+        <b-row>
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Type of known water use"
+              label-for="known_water_use"
+              :invalid-feedback="fieldErrorMessages.known_water_use"
+              :state="fieldHasError.known_water_use">
+              <b-form-select
+                id="known_water_use"
+                v-model="record.known_water_use"
+                :options="known_water_use_codes"
+                  value-field="code"
+                text-field="description"
+                required/>
+            </b-form-group>
+          </b-col>
+        </b-row>
+
+        <b-row>
+          <b-col md="6">
+            <b-form-group
+              horizontal
+              label-cols="4"
+              label="Comments"
+              label-for="notes"
+              :invalid-feedback="fieldErrorMessages.notes"
+              :state="fieldHasError.notes">
+              <b-form-textarea
+                rows="4"
+                id="notes"
+                v-model="record.notes"/>
+            </b-form-group>
+          </b-col>
+        </b-row>
+
+        <b-row class="mt-4">
+          <b-col cols="auto">
+            <b-button
+              :disabled="loading"
+              variant="secondary"
+              v-b-modal.confirmSave>
+              Save
+            </b-button>
+
+            <b-button
+              :disabled="loading"
+              variant="secondary"
+              v-b-modal.confirmCancel>
+              Cancel
+            </b-button>
+          </b-col>
+        </b-row>
+      </b-container>
+    </b-card>
+
+    <b-modal
+      v-on:ok="save()"
+      id="confirmSave">
+      <p>Are you sure you would like to save this record?</p>
+    </b-modal>
+
+    <b-modal
+      v-on:ok="view"
+      id="confirmCancel">
+      <p>Are you sure you want to quit editing this record?</p>
+    </b-modal>
+  </div>
+</template>
+
+<script>
+import ApiService from '@/common/services/ApiService.js'
+import APIErrorMessage from '@/common/components/APIErrorMessage'
+import { isEmpty, mapValues } from 'lodash'
+
+export default {
+  components: {
+    'api-error': APIErrorMessage
+  },
+  created () {
+    this.fetch()
+    this.fetchCodes()
+  },
+  computed: {
+    formState:
+    () => isEmpty(this.fieldErrors),
+    fieldErrorMessages () {
+      return mapValues(this.fieldErrors, (messages) => messages.join(', '))
+    },
+    fieldHasError () {
+      return mapValues(this.fieldErrors, (messages) => isEmpty(messages))
+    }
+  },
+  data () {
+    return {
+      demand_codes: [],
+      error: undefined,
+      fieldErrors: {},
+      known_water_use_codes: [],
+      loading: false,
+      material_codes: [],
+      productivity_codes: [],
+      quality_concern_codes: [],
+      record: {},
+      showSaveSuccess: false,
+      subtype_codes: [],
+      vulnerability_codes: []
+    }
+  },
+  methods: {
+    handlePatchError (error) {
+      if (error.response) {
+        if (error.response.status === 400) {
+          this.fieldErrors = error.response.data
+        } else {
+          this.error = error.response
+        }
+      } else {
+        this.error = error.message
+      }
+    },
+    save (id = this.id) {
+      this.showSaveSuccess = false
+      this.fieldErrors = {}
+
+      ApiService.patch('aquifers', id, this.record)
+        .then(() => { this.showSaveSuccess = true })
+        .catch(this.handlePatchError)
+    },
+    view () {
+      this.$router.push({ name: 'view', params: { id: this.id } })
+    },
+    fetch (id = this.id) {
+      this.loading = true
+      this.error = undefined
+
+      ApiService.query(`aquifers/${id}`)
+        .then((response) => {
+          this.record = response.data
+        })
+        .then(() => { this.loading = false })
+        .catch((error) => { this.error = error.response })
+    },
+    fetchCode (code, key) {
+      ApiService.query(code).then((response) => {
+        this[key] = response.data.results
+      })
+    },
+    fetchCodes () {
+      this.fetchCode('aquifer-codes/materials', 'material_codes')
+      this.fetchCode('aquifer-codes/quality-concerns', 'quality_concern_codes')
+      this.fetchCode('aquifer-codes/vulnerability', 'vulnerability_codes')
+      this.fetchCode('aquifer-codes/subtypes', 'subtype_codes')
+      this.fetchCode('aquifer-codes/productivity', 'productivity_codes')
+      this.fetchCode('aquifer-codes/demand', 'demand_codes')
+      this.fetchCode('aquifer-codes/water-use', 'known_water_use_codes')
+    }
+  },
+  props: ['id']
+}
+</script>
diff --git a/app/frontend/src/aquifers/components/Search.vue b/app/frontend/src/aquifers/components/Search.vue
index 82455b796d..dae596f7e1 100644
--- a/app/frontend/src/aquifers/components/Search.vue
+++ b/app/frontend/src/aquifers/components/Search.vue
@@ -16,19 +16,21 @@
   <b-card no-body class="p-3 mb-4">
     <h5>Aquifer Search</h5>
     <b-form
-      v-on:submit.prevent="search(searchParams)"
-      v-on:reset="reset">
+      v-on:submit.prevent="triggerSearch"
+      v-on:reset="triggerReset">
       <b-form-row>
         <b-col cols="12" md="4">
           <b-form-group label="Aquifer name">
             <b-form-input
+              id="search"
               type="text"
-              v-model="searchParams.search"/>
+              v-model="search"/>
           </b-form-group>
           <b-form-group label="Aquifer number">
             <b-form-input
+              id="aquifer_id"
               type="text"
-              v-model="searchParams.aquifer_id"/>
+              v-model="aquifer_id"/>
           </b-form-group>
         </b-col>
       </b-form-row>
@@ -43,53 +45,183 @@
     </b-form>
 
     <b-table
+      :fields="aquiferListFields"
+      :items="aquiferList"
       :show-empty="emptyResults"
+      :sort-by.sync="sortBy"
+      :sort-desc.sync="sortDesc"
       empty-text="No aquifers could be found"
-      :items="aquiferList"
-      :fields="aquiferListFields" />
+      no-local-sorting
+      striped
+      v-if="aquiferList">
+      <template slot="aquifer_id" slot-scope="data">
+        <router-link :to="`${data.value}/`">{{data.value}}</router-link>
+      </template>
+      <template slot="material" slot-scope="row">
+        {{row.item.material_description}}
+      </template>
+      <template slot="subtype" slot-scope="row">
+        {{row.item.subtype_description}}
+      </template>
+      <template slot="vulnerability" slot-scope="row">
+        {{row.item.vulnerability_description}}
+      </template>
+      <template slot="vulnerability" slot-scope="row">
+        {{row.item.vulnerability_description}}
+      </template>
+      <template slot="productivity" slot-scope="row">
+        {{row.item.productivity_description}}
+      </template>
+      <template slot="demand" slot-scope="row">
+        {{row.item.demand_description}}
+      </template>
+    </b-table>
+
+    <b-container v-if="displayPagination">
+      <b-row align-h="end">
+        <b-pagination :total-rows="response.count" :per-page="limit" v-model="currentPage" />
+      </b-row>
+    </b-container>
+
   </b-card>
 </template>
 
+<style>
+table.b-table > thead > tr > th.sorting::before,
+table.b-table > tfoot > tr > th.sorting::before {
+  display: none !important;
+}
+
+table.b-table > thead > tr > th.sorting::after,
+table.b-table > tfoot > tr > th.sorting::after {
+  content: "\f0dc" !important;
+  font-family: "FontAwesome";
+  opacity: 1 !important;
+}
+
+</style>
+
 <script>
-import { SEARCH_AQUIFERS, RESET_RESULTS } from '../store/actions.types'
-import { mapGetters, mapActions } from 'vuex'
+import ApiService from '@/common/services/ApiService.js'
+import isEmpty from 'lodash.isempty'
+
+const LIMIT = 30
+const DEFAULT_ORDERING_STRING = 'aquifer_id'
 
+function orderingQueryStringToData (str) {
+  str = str || DEFAULT_ORDERING_STRING
+
+  return {
+    sortDesc: str.charAt(0) === '-',
+    sortBy: str.replace(/^-/, '')
+  }
+}
 export default {
   data () {
+    let query = this.$route.query || {}
+
     return {
-      searchParams: {},
+      ...orderingQueryStringToData(query.ordering),
+      search: query.search,
+      aquifer_id: query.aquifer_id,
+      limit: LIMIT,
+      currentPage: query.offset && (query.offset / LIMIT + 1),
+      filterParams: Object.assign({}, query),
+      response: {},
       aquiferListFields: [
-        { key: 'aquifer_id', label: 'Aquifer number' },
-        { key: 'aquifer_name', label: 'Aquifer name' },
-        { key: 'location_description', label: 'Descriptive location' },
-        { key: 'material_description', label: 'Material' },
-        { key: 'litho_stratographic_unit', label: 'Litho stratigraphic unit' },
-        { key: 'subtype_description', label: 'Subtype' },
-        { key: 'vulnerability_description', label: 'Vulnerability' },
-        { key: 'area', label: 'Size-km²' },
-        { key: 'productivity_description', label: 'Productivity' },
-        { key: 'demand_description', label: 'Demand' },
-        { key: 'mapping_year', label: 'Year of mapping' },
-        { key: 'publication_status', label: 'Publication status' }
+        { key: 'aquifer_id', label: 'Aquifer number', sortable: true },
+        { key: 'aquifer_name', label: 'Aquifer name', sortable: true },
+        { key: 'location_description', label: 'Descriptive location', sortable: true },
+        { key: 'material', label: 'Material', sortable: true },
+        { key: 'litho_stratographic_unit', label: 'Litho stratigraphic unit', sortable: true },
+        { key: 'subtype', label: 'Subtype', sortable: true },
+        { key: 'vulnerability', label: 'Vulnerability', sortable: true },
+        { key: 'area', label: 'Size-km²', sortable: true },
+        { key: 'productivity', label: 'Productivity', sortable: true },
+        { key: 'demand', label: 'Demand', sortable: true },
+        { key: 'mapping_year', label: 'Year of mapping', sortable: true }
       ]
     }
   },
   computed: {
-    ...mapGetters([
-      'aquiferList',
-      'emptyResults'
-    ])
+    aquiferList () { return this.response && this.response.results },
+    displayPagination () { return this.aquiferList && (this.response.next || this.response.previous) },
+    emptyResults () { return this.response && this.response.count === 0 },
+    query () { return this.$route.query }
   },
   methods: {
-    ...mapActions({
-      search: SEARCH_AQUIFERS,
-      resetResults: RESET_RESULTS
-    }),
-    reset () {
-      this.resetResults()
-      this.searchParams = {}
+    fetchResults () {
+      if (isEmpty(this.query.aquifer_id) && isEmpty(this.query.search)) {
+        this.response = {}
+        return
+      }
+
+      ApiService.query('aquifers/', this.query)
+        .then((response) => {
+          this.response = response.data
+          this.scrollToTableTop()
+        })
+    },
+    scrollToTableTop () {
+      this.$SmoothScroll(this.$el, 100)
     },
-    search () { this.$store.dispatch(SEARCH_AQUIFERS) }
+    triggerPagination () {
+      const i = (this.currentPage || 1) - 1
+
+      delete this.filterParams.limit
+      delete this.filterParams.offset
+
+      if (i > 0) {
+        this.filterParams.limit = LIMIT
+        this.filterParams.offset = i * LIMIT
+      }
+
+      this.updateQueryParams()
+    },
+    triggerReset () {
+      this.response = {}
+      this.filterParams = {}
+      this.search = ''
+      this.aquifer_id = ''
+      this.currentPage = 0
+
+      this.updateQueryParams()
+    },
+    triggerSearch () {
+      delete this.filterParams.aquifer_id
+      delete this.filterParams.search
+
+      if (this.aquifer_id) {
+        this.filterParams.aquifer_id = this.aquifer_id
+      }
+
+      if (this.search) {
+        this.filterParams.search = this.search
+      }
+
+      this.updateQueryParams()
+    },
+    triggerSort () {
+      delete this.filterParams.ordering
+
+      let ordering = `${this.sortDesc ? '-' : ''}${this.sortBy}`
+
+      if (ordering !== DEFAULT_ORDERING_STRING) {
+        this.filterParams.ordering = ordering
+      }
+
+      this.updateQueryParams()
+    },
+    updateQueryParams () {
+      this.$router.replace({ query: this.filterParams })
+    }
+  },
+  mounted () { this.fetchResults() },
+  watch: {
+    query () { this.fetchResults() },
+    currentPage () { this.triggerPagination() },
+    sortDesc () { this.triggerSort() },
+    sortBy () { this.triggerSort() }
   }
 }
 </script>
diff --git a/app/frontend/src/aquifers/components/View.vue b/app/frontend/src/aquifers/components/View.vue
new file mode 100644
index 0000000000..a7555bc4cf
--- /dev/null
+++ b/app/frontend/src/aquifers/components/View.vue
@@ -0,0 +1,110 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+<template>
+  <b-card no-body class="p-3 mb-4">
+    <b-container>
+      <b-row class="border-bottom mb-3 pb-2">
+        <b-col><h5 class="pt-2">Aquifer Summary</h5></b-col>
+        <b-col cols="auto">
+          <b-button
+            variant="default"
+            v-if="userRoles.aquifers.edit"
+            v-on:click.prevent="edit()">
+            <span title="Edit" class="fa fa-edit"/>
+          </b-button>
+          <a class="ml-2 print fa fa-print fa-lg d-print-none"
+            href="#"
+            title="Print"
+            v-on:click.prevent="print()"
+           />
+        </b-col>
+      </b-row>
+
+      <dl class="row">
+        <dt class="col-sm-2">Aquifer number</dt>
+        <dd class="col-sm-4">{{record.aquifer_id}}</dd>
+        <dt class="col-sm-2">Year of mapping</dt>
+        <dd class="col-sm-4">{{record.mapping_year}}</dd>
+
+        <dt class="col-sm-2">Aquifer name</dt>
+        <dd class="col-sm-4">{{record.aquifer_name}}</dd>
+        <dt class="col-sm-2">Litho stratigraphic unit</dt>
+        <dd class="col-sm-4">{{record.litho_stratographic_unit}}</dd>
+
+        <dt class="col-sm-2">Descriptive location</dt>
+        <dd class="col-sm-4">{{record.location_description}}</dd>
+        <dt class="col-sm-2">Vulnerability</dt>
+        <dd class="col-sm-4">{{record.vulnerability_description}}</dd>
+
+        <dt class="col-sm-2">Material type</dt>
+        <dd class="col-sm-4">{{record.material_description}}</dd>
+        <dt class="col-sm-2">Subtype</dt>
+        <dd class="col-sm-4">{{record.subtype_description}}</dd>
+
+        <dt class="col-sm-2">Quality concerns</dt>
+        <dd class="col-sm-4">{{record.quality_concern_description}}</dd>
+        <dt class="col-sm-2">Productivity</dt>
+        <dd class="col-sm-4">{{record.productivity_description}}</dd>
+
+        <dt class="col-sm-2">Size (km²)</dt>
+        <dd class="col-sm-4">{{record.area}}</dd>
+        <dt class="col-sm-2">Demand</dt>
+        <dd class="col-sm-4">{{record.demand_description}}</dd>
+      </dl>
+    </b-container>
+  </b-card>
+</template>
+
+<style>
+.print, .print:hover {
+  color: black;
+  text-decoration: none;
+}
+</style>
+
+<script>
+import ApiService from '@/common/services/ApiService.js'
+import { mapGetters } from 'vuex'
+
+export default {
+  props: ['id'],
+  created () { this.fetch() },
+  data () {
+    return {
+      record: {}
+    }
+  },
+  computed: {
+    ...mapGetters(['userRoles'])
+  },
+  watch: {
+    id () { this.fetch() }
+  },
+  methods: {
+    edit () {
+      this.$router.push({ name: 'edit', params: { id: this.id } })
+    },
+    print () {
+      window.print()
+    },
+    fetch (id = this.id) {
+      ApiService.query(`aquifers/${id}`)
+        .then((response) => {
+          this.record = response.data
+        })
+    }
+  }
+}
+</script>
diff --git a/app/frontend/src/aquifers/main.js b/app/frontend/src/aquifers/main.js
index 09874aa9fe..0cd5fdb1d4 100644
--- a/app/frontend/src/aquifers/main.js
+++ b/app/frontend/src/aquifers/main.js
@@ -12,22 +12,43 @@
     limitations under the License.
 */
 
+import 'babel-polyfill'
+import {mapActions} from 'vuex'
 import Vue from 'vue'
-import App from './App'
 import BootstrapVue from 'bootstrap-vue'
-import '@/common/assets/css/bootstrap-theme.min.css'
 import 'bootstrap-vue/dist/bootstrap-vue.css'
-import store from './store'
+
+import {FETCH_CONFIG} from '@/common/store/config.js'
 import ApiService from '@/common/services/ApiService.js'
+import authenticate from '@/common/authenticate.js'
+import '@/common/assets/css/bootstrap-theme.min.css'
+
+import App from './App'
+import router from './router'
+import store from './store'
+import vueSmoothScroll from 'vue-smoothscroll'
 
 ApiService.init()
 
 Vue.use(BootstrapVue)
+Vue.use(vueSmoothScroll)
 
 /* eslint-disable no-new */
 new Vue({
+  components: { App },
   el: '#app',
+  router,
   store,
-  components: { App },
-  template: '<App/>'
+  template: '<App/>',
+  methods: {
+    ...mapActions([
+      FETCH_CONFIG
+    ])
+  },
+  created () {
+    authenticate.authenticate(store).then(() => {
+      // Auth complete. Do something here if you want.
+    })
+    this.FETCH_CONFIG()
+  }
 })
diff --git a/app/frontend/src/aquifers/router.js b/app/frontend/src/aquifers/router.js
new file mode 100644
index 0000000000..ff4828f912
--- /dev/null
+++ b/app/frontend/src/aquifers/router.js
@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+
+import Search from './components/Search'
+import View from './components/View'
+import Edit from './components/Edit'
+
+Vue.use(VueRouter)
+
+export default new VueRouter({
+  base: '/gwells/aquifers',
+  mode: 'history',
+  routes: [
+    {
+      path: '/',
+      component: Search
+    },
+    {
+      path: '/:id(\\d+)',
+      component: View,
+      name: 'view',
+      props: true
+    },
+    {
+      path: '/:id/edit',
+      component: Edit,
+      name: 'edit',
+      props: true
+    }
+  ]
+})
diff --git a/app/frontend/src/aquifers/store.js b/app/frontend/src/aquifers/store.js
new file mode 100644
index 0000000000..fca50b0d2b
--- /dev/null
+++ b/app/frontend/src/aquifers/store.js
@@ -0,0 +1,10 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import auth from '@/common/store/auth.js'
+import config from '@/common/store/config.js'
+
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+  modules: { auth, config }
+})
diff --git a/app/frontend/src/aquifers/store/actions.types.js b/app/frontend/src/aquifers/store/actions.types.js
deleted file mode 100644
index c750470cc8..0000000000
--- a/app/frontend/src/aquifers/store/actions.types.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-      http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- */
-export const SEARCH_AQUIFERS = 'SEARCH_AQUIFERS'
-export const RESET_RESULTS = 'RESET_RESULTS'
diff --git a/app/frontend/src/aquifers/store/index.js b/app/frontend/src/aquifers/store/index.js
deleted file mode 100644
index 4317a5b1f2..0000000000
--- a/app/frontend/src/aquifers/store/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-      http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- */
-import Vue from 'vue'
-import Vuex from 'vuex'
-import auth from '@/common/store/auth.js'
-import config from '@/common/store/config.js'
-import ApiService from '@/common/services/ApiService.js'
-
-import { SEARCH_AQUIFERS, RESET_RESULTS } from './actions.types'
-import {
-  SET_LOADING,
-  SET_LIST_ERROR,
-  SET_AQUIFER_LIST
-} from './mutations.types'
-
-Vue.use(Vuex)
-
-export default new Vuex.Store({
-  modules: { auth, config },
-  state: {
-    loading: null,
-    error: null,
-    aquifers: null
-  },
-  actions: {
-    [SEARCH_AQUIFERS] ({ commit }, params) {
-      return new Promise((resolve, reject) => {
-        commit(SET_LOADING, true)
-        ApiService.query('aquifers/', params)
-          .then((response) => {
-            commit(SET_LOADING, false)
-            commit(SET_LIST_ERROR, null)
-            commit(SET_AQUIFER_LIST, response.data)
-            resolve()
-          })
-          .catch((error) => {
-            commit(SET_LOADING, false)
-            commit(SET_LIST_ERROR, error.response)
-            reject(error)
-          })
-      })
-    },
-    [RESET_RESULTS] ({ commit }) {
-      commit(SET_LOADING)
-      commit(SET_LIST_ERROR)
-      commit(SET_AQUIFER_LIST)
-    }
-  },
-  mutations: {
-    [SET_LOADING] (state, payload) {
-      state.loading = payload
-    },
-    [SET_LIST_ERROR] (state, payload) {
-      state.error = payload
-    },
-    [SET_AQUIFER_LIST] (state, payload) {
-      state.aquifers = payload
-    }
-  },
-  getters: {
-    aquiferList: state => state.aquifers && state.aquifers.results,
-    emptyResults: state => state.aquifers && state.aquifers.count === 0
-  }
-})
diff --git a/app/frontend/src/aquifers/store/mutations.types.js b/app/frontend/src/aquifers/store/mutations.types.js
deleted file mode 100644
index 4d0ddf35eb..0000000000
--- a/app/frontend/src/aquifers/store/mutations.types.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-      http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- */
-export const SET_LOADING = 'SET_LOADING'
-export const SET_LIST_ERROR = 'SET_LIST_ERROR'
-export const SET_AQUIFER_LIST = 'SET_AQUIFER_LIST'
diff --git a/app/frontend/src/common/codeToDescription.js b/app/frontend/src/common/codeToDescription.js
new file mode 100644
index 0000000000..3528dcd0c3
--- /dev/null
+++ b/app/frontend/src/common/codeToDescription.js
@@ -0,0 +1,28 @@
+const codeToDescription = {
+  methods: {
+    codeToDescription (content, code) {
+      // this requires this.codes to be pulled in from the store.
+      // if not available, default to returning the code
+      if (!this.codes || !this.codes[content] || !code) {
+        return code
+      }
+
+      // find a code/description set that matches the given code
+      const codeDescriptionObject = this.codes[content].find((item) => {
+        return Object.keys(item).some((key) => {
+          return item[key] === code
+        })
+      })
+
+      // if codeDescriptionObject didn't match any of the codes, just return
+      // the original code.
+      if (!codeDescriptionObject) {
+        return code
+      }
+
+      return codeDescriptionObject.description || code
+    }
+  }
+}
+
+export default codeToDescription
diff --git a/app/frontend/src/common/common.scss b/app/frontend/src/common/common.scss
index 7b63984e7b..9b00463ef0 100644
--- a/app/frontend/src/common/common.scss
+++ b/app/frontend/src/common/common.scss
@@ -48,7 +48,7 @@ footer {
   flex: none;
 }
 .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-  font-weight: 700;
+  font-weight: 500!important;
 }
 
 // BC Gov Bootstrap 4 theme override
@@ -60,4 +60,9 @@ footer {
 
 div.dropdown-toggle::after {
   display: none;
+}
+
+.detail-section > legend {
+  border-bottom: 1px solid #e5e5e5;
+  font-size: 21px;
 }
\ No newline at end of file
diff --git a/app/frontend/src/common/components/Auth.vue b/app/frontend/src/common/components/Auth.vue
index b6790dcf80..eef8d4f6cd 100644
--- a/app/frontend/src/common/components/Auth.vue
+++ b/app/frontend/src/common/components/Auth.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <div v-if="!keycloak || (keycloak && !keycloak.authenticated)">
-      <button type="button" id="gwells-sso-login" class="btn btn-light btn-sm" @click="keyCloakLogin()">Log in</button>
+      <button type="button" :id="`${id}-login-button`" class="btn btn-light btn-sm" @click="keyCloakLogin()">Log in</button>
     </div>
     <div v-if="keycloak && keycloak.authenticated">
       <span class="userLoggedInText text-light">{{ keycloak.tokenParsed.name }}</span>
-      <button type="button" class="btn btn-light btn-sm" @click="keyCloakLogout()">Log out</button>
+      <button type="button" :id="`${id}-logout-button`" class="btn btn-light btn-sm" @click="keyCloakLogout()">Log out</button>
     </div>
   </div>
 </template>
@@ -16,6 +16,12 @@ import ApiService from '@/common/services/ApiService.js'
 import { SET_ERROR } from '@/registry/store/mutations.types.js'
 
 export default {
+  props: {
+    id: {
+      type: String,
+      default: 'sso-auth'
+    }
+  },
   data () {
     return {
     }
diff --git a/app/frontend/src/common/components/FormInput.vue b/app/frontend/src/common/components/FormInput.vue
index f1ce92ed02..e56e34c90f 100644
--- a/app/frontend/src/common/components/FormInput.vue
+++ b/app/frontend/src/common/components/FormInput.vue
@@ -34,6 +34,10 @@
         :required="required"
         :class="inputClass"
         :list="list"
+        :step="step"
+        :max="max"
+        :min="min"
+        :maxlength="maxlength"
         @input="updateValue($event)"
         @focus.native="$emit('focus', true)"
         @blur.native="$emit('blur', true)"
@@ -77,6 +81,10 @@ export default {
     groupClass: String, // optional pass-through class (use for formatting the form-group)
     inputClass: String, // optional pass-through input class (use for formatting the input field)
     list: String, // optional pass-through ID of a datalist of suggested inputs
+    step: Number,
+    max: Number,
+    min: Number,
+    maxlength: Number,
     type: { // the type of input (e.g. text, number, email)
       type: String,
       default: 'text'
@@ -102,7 +110,7 @@ export default {
     }
   },
   methods: {
-    updateValue: function (value) {
+    updateValue (value) {
       this.$emit('input', value)
     }
   },
diff --git a/app/frontend/src/common/components/Header.vue b/app/frontend/src/common/components/Header.vue
index 67c23638ef..68c924a295 100644
--- a/app/frontend/src/common/components/Header.vue
+++ b/app/frontend/src/common/components/Header.vue
@@ -73,7 +73,7 @@ export default {
       return {
         dataEntry: (!!this.config && this.config.enable_data_entry === true) && this.userRoles.submissions.edit === true,
         admin: adminMeta ? adminMeta.content === 'true' : false,
-        aquifers: false
+        aquifers: !!this.config && this.config.enable_aquifers_search === true
       }
     },
     ...mapGetters(['userRoles', 'config'])
diff --git a/app/frontend/src/common/convertCoordinatesMixin.js b/app/frontend/src/common/convertCoordinatesMixin.js
new file mode 100644
index 0000000000..45fa89d8c5
--- /dev/null
+++ b/app/frontend/src/common/convertCoordinatesMixin.js
@@ -0,0 +1,85 @@
+import proj4 from 'proj4'
+const convertCoordinatesMixin = {
+  methods: {
+    transformToPositive (value) {
+      // Take a value, if it's a number - make it positive. If it's not a number, leave it alone
+      return value === '' || isNaN(value) || value === null ? value : Math.abs(value)
+    },
+    transformToNegative (value) {
+      // Take a value, if it's a number - make it negative. If it's not a number, leave it alone.
+      return value === '' || isNaN(value) || value === null ? value : Math.abs(value) * -1
+    },
+    convertToUTM (long, lat) {
+      // converts input coordinates and returns an object containing UTM easting, northing, and zone
+      const utm = {
+        easting: null,
+        northing: null,
+        zone: null
+      }
+
+      if (!!long && !!lat) {
+        if (long > 0) {
+          // In B.C. everything is negative by convention, so we have to introduct a minus here to make
+          // the math work.
+          long *= -1
+        }
+        // determine zone
+        const zone = Math.floor((long + 180) / 6) + 1
+
+        // proj4 coordinate system definitions
+        const utmProjection = `+proj=utm +zone=${zone} +ellps=GRS80 +datum=NAD83 +units=m +no_defs`
+        const coords = proj4(utmProjection, [long, lat])
+
+        utm.easting = coords[0]
+        utm.northing = coords[1]
+        utm.zone = zone
+      }
+
+      return utm
+    },
+    convertToWGS84 (easting, northing, zone) {
+      // converts from UTM to WGS84
+
+      // proj4 coordinate system definitions
+      const wgs84Projection = proj4.defs('EPSG:4326')
+      const utmProjection = `+proj=utm +zone=${zone} +ellps=${this.ellps} +datum=${this.datum} +units=m +no_defs`
+
+      const coords = proj4(utmProjection, wgs84Projection, [easting, northing])
+
+      return {
+        longitude: coords[0],
+        latitude: coords[1]
+      }
+    },
+    convertToDMS (degrees) {
+      // converts from decimal degrees to degrees, minutes seconds
+      // returns an object with keys 'deg', 'min', 'sec'
+
+      const angle = Math.abs(degrees)
+      const deg = Math.floor(angle) * Math.sign(degrees)
+      const sec = 3600 * (angle - Math.floor(angle)) % 60
+      const min = Math.floor((3600 * (angle - Math.floor(angle))) / 60)
+
+      return {
+        deg: deg,
+        min: min,
+        sec: this.roundSeconds(sec)
+      }
+    },
+    convertDMStoDeg (dms) {
+      const sign = Math.sign(dms.deg)
+      return this.roundDecimalDegrees(dms.deg + sign * dms.min / 60 + sign * dms.sec / (60 * 60))
+    },
+    roundDecimalDegrees (deg) {
+      // Regulations are specific about how GPS coordinates are to be provided.
+      // DD to at least 5 decimal places.
+      return Math.round(deg * 100000) / 100000
+    },
+    roundSeconds (seconds) {
+      // Regulations are specific about how GPS coordinates are to be provided.
+      // DMS toat least 2 decimal places;
+      return Math.round(seconds * 100) / 100
+    }
+  }
+}
+export default convertCoordinatesMixin
diff --git a/app/frontend/src/common/filterBlankRows.js b/app/frontend/src/common/filterBlankRows.js
new file mode 100644
index 0000000000..55cd48d2c0
--- /dev/null
+++ b/app/frontend/src/common/filterBlankRows.js
@@ -0,0 +1,22 @@
+const filterBlankRowsMixin = {
+  methods: {
+    // filter blank rows from an array (for example, casing_set, lithology_set)
+    // this method will return a new array stripped of blank objects or objects
+    // where all keys have null or empty string values
+    filterBlankRows (set) {
+      if (!set) {
+        return []
+      }
+
+      return set.filter(item => {
+        // check that item is an object, has keys and at least one of those keys
+        // has a value (i.e. not null or empty string)
+        return item.constructor === Object && Object.keys(item).length !== 0 && !Object.keys(item).every((key) => {
+          return !item[key] && item[key] !== 0
+        })
+      })
+    }
+  }
+}
+
+export default filterBlankRowsMixin
diff --git a/app/frontend/src/common/store/auth.js b/app/frontend/src/common/store/auth.js
index 68bc1536d0..4a9db9c4ab 100644
--- a/app/frontend/src/common/store/auth.js
+++ b/app/frontend/src/common/store/auth.js
@@ -35,13 +35,17 @@ const auth = {
             view: state.keycloak.hasRealmRole('wells_viewer'),
             edit: state.keycloak.hasRealmRole('wells_edit'),
             approve: state.keycloak.hasRealmRole('wells_approve')
+          },
+          aquifers: {
+            edit: state.keycloak.hasRealmRole('aquifers_edit')
           }
         }
       } else {
         return {
           registry: {},
           wells: {},
-          submissions: {}
+          submissions: {},
+          aquifers: {}
         }
       }
     }
diff --git a/app/frontend/src/registry/components/people/OrganizationAdd.vue b/app/frontend/src/registry/components/people/OrganizationAdd.vue
index 0016ded9b1..99b6830b18 100644
--- a/app/frontend/src/registry/components/people/OrganizationAdd.vue
+++ b/app/frontend/src/registry/components/people/OrganizationAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <b-modal id="orgModal" title="Add a Company" hide-footer @shown="focusInput()">
+  <b-modal id="orgAddModal" title="Add a Company" hide-footer @shown="focusInput()">
     <div class="col-xs-12" v-if="error">
       <api-error :error="error" resetter="SET_ERROR"></api-error>
     </div>
@@ -8,26 +8,24 @@
           <b-row>
             <b-col cols="12">
               <b-form-group
-                id="orgNameInputGroup"
                 label="Company name:"
-                label-for="orgNameInput">
+                label-for="orgAddNameInput">
                 <b-form-input
-                    id="orgNameInput"
+                    id="orgAddNameInput"
                     type="text"
                     v-model="orgForm.name"
                     required
-                    ref="orgNameInput"/>
+                    ref="orgAddNameInput"/>
               </b-form-group>
             </b-col>
           </b-row>
           <b-row class="mt-3">
             <b-col cols="12">
               <b-form-group
-                id="orgAddressInputGroup"
                 label="Street address:"
-                label-for="orgAddressInput">
+                label-for="orgAddAddressInput">
                 <b-form-input
-                    id="orgAddressInput"
+                    id="orgAddAddressInput"
                     type="text"
                     v-model="orgForm.street_address"/>
               </b-form-group>
@@ -36,21 +34,20 @@
           <b-row>
             <b-col cols="12" md="6">
               <b-form-group
-                id="orgCityInputGroup"
                 label="City:"
-                label-for="orgCityInput">
+                label-for="orgAddCityInput">
                 <b-form-input
-                    id="orgCityInput"
+                    id="orgAddCityInput"
                     type="text"
                     v-model="orgForm.city"/>
               </b-form-group>
             </b-col>
             <b-col cols="12" md="6">
               <b-form-group
-                id="provInputGroup"
                 label="Province/State:"
-                label-for="provInput">
+                label-for="orgAddProvinceInput">
                 <b-form-select
+                  id="orgAddProvinceInput"
                   :options="provinceStateOptions"
                   v-model="orgForm.province_state"
                   :state="validation.province_state"
@@ -59,7 +56,7 @@
                     <option :value="''" disabled>Select a province</option>
                   </template>
                 </b-form-select>
-                <b-form-invalid-feedback id="provInputFeedback">
+                <b-form-invalid-feedback id="orgAddProvinceFeedback">
                   <div v-for="(error, index) in fieldErrors.province_state" :key="`urlInput error ${index}`">
                     {{ error }}
                   </div>
@@ -70,11 +67,10 @@
           <b-row>
             <b-col cols="12" md="6">
               <b-form-group
-                id="postalCodeInputGroup"
                 label="Postal code:"
-                label-for="postalCodeInput">
+                label-for="orgAddPostalInput">
                 <b-form-input
-                    id="postalCodeInput"
+                    id="orgAddPostalInput"
                     type="text"
                     v-model="orgForm.postal_code"/>
               </b-form-group>
@@ -83,11 +79,10 @@
           <b-row class="mt-3">
             <b-col cols="12" md="6">
               <b-form-group
-                id="telInputGroup"
                 label="Telephone:"
-                label-for="telInput">
+                label-for="orgAddPhoneInput">
                 <b-form-input
-                    id="telInput"
+                    id="orgAddPhoneInput"
                     type="text"
                     :formatter="formatTel"
                     lazy-formatter
@@ -96,11 +91,10 @@
             </b-col>
             <b-col cols="12" md="6">
               <b-form-group
-                id="faxInputGroup"
                 label="Fax number:"
-                label-for="faxInput">
+                label-for="orgAddFaxInput">
                 <b-form-input
-                    id="faxInput"
+                    id="orgAddFaxInput"
                     type="text"
                     :formatter="formatTel"
                     lazy-formatter
@@ -111,16 +105,15 @@
           <b-row>
             <b-col cols="12" md="6">
               <b-form-group
-                id="emailInputGroup"
                 label="Email:"
-                label-for="emailInput">
+                label-for="orgAddEmailInput">
                 <b-form-input
-                    id="emailInput"
+                    id="orgAddEmailInput"
                     type="text"
                     :state="validation.email"
-                    aria-describedby="emailInputFeedback"
+                    aria-describedby="orgAddEmailFeedback"
                     v-model="orgForm.email"/>
-                <b-form-invalid-feedback id="emailInputFeedback">
+                <b-form-invalid-feedback>
                   <div v-for="(error, index) in fieldErrors.email" :key="`urlInput error ${index}`">
                     {{ error }}
                   </div>
@@ -129,22 +122,21 @@
             </b-col>
             <b-col cols="12" md="6">
               <b-form-group
-                id="websiteInputGroup"
                 label="Website:"
-                label-for="websiteInput">
+                label-for="orgAddWebsiteInput">
                 <b-form-input
-                    id="websiteInput"
+                    id="orgAddWebsiteInput"
                     type="text"
                     :state="validation.website_url"
-                    aria-describedby="websiteInputFeedback websiteInputHelp"
+                    aria-describedby="orgAddWebsiteFeedback websiteInputHelp"
                     v-model="orgForm.website_url"
                     placeholder="e.g.: http://www.example.com"/>
-                <b-form-invalid-feedback id="websiteInputFeedback">
+                <b-form-invalid-feedback>
                   <div v-for="(error, index) in fieldErrors.website_url" :key="`urlInput error ${index}`">
                     {{ error }}
                   </div>
                 </b-form-invalid-feedback>
-                <b-form-text id="websiteInputHelp">
+                <b-form-text>
                   Use a full website address, including http://
                 </b-form-text>
               </b-form-group>
@@ -153,7 +145,7 @@
           <b-row class="my-3">
             <b-col>
               <b-button type="submit" class="mr-2" variant="primary" :disabled="orgSubmitLoading">Save</b-button>
-              <b-button type="reset" variant="light" id="orgFormResetButton">Cancel</b-button>
+              <b-button type="reset" variant="light" id="orgAddFormResetButton">Cancel</b-button>
             </b-col>
           </b-row>
         </b-form>
@@ -224,7 +216,7 @@ export default {
       }
       ApiService.post('organizations', org).then((response) => {
         this.orgSubmitLoading = false
-        this.$root.$emit('bv::hide::modal', 'orgModal')
+        this.$root.$emit('bv::hide::modal', 'orgAddModal')
         this.$emit('newOrgAdded', response.data.org_guid)
       }).catch((e) => {
         this.orgSubmitLoading = false
@@ -247,10 +239,10 @@ export default {
         fax_tel: '',
         website_url: ''
       })
-      this.$root.$emit('bv::hide::modal', 'orgModal')
+      this.$root.$emit('bv::hide::modal', 'orgAddModal')
     },
     focusInput () {
-      this.$refs.orgNameInput.focus()
+      this.$refs.orgAddNameInput.focus()
     },
     resetFieldErrors () {
       this.fieldErrors = {
diff --git a/app/frontend/src/registry/components/people/OrganizationEdit.vue b/app/frontend/src/registry/components/people/OrganizationEdit.vue
index 945739608a..542b417b3f 100644
--- a/app/frontend/src/registry/components/people/OrganizationEdit.vue
+++ b/app/frontend/src/registry/components/people/OrganizationEdit.vue
@@ -8,9 +8,9 @@
       <!-- Company selector (used to select company to edit) -->
       <b-row>
         <b-col cols="12" md="7">
-          <b-form-group label="Select a company:" label-for="manageCompanySelect">
+          <b-form-group label="Select a company:" label-for="orgEditSelectDropdown">
             <v-select
-                id="manageCompanySelect"
+                id="orgEditSelectDropdown"
                 :options="companies"
                 label="org_verbose_name"
                 v-model="selectedCompany"
@@ -29,9 +29,9 @@
       <b-row>
         <b-col>
           <b-button
-              id="addNewOrgButton"
+              id="orgAddNewButton"
               type="button"
-              v-b-modal.orgModal
+              v-b-modal.orgAddModal
               variant="primary"
               size="sm"
               class="mb-5">
@@ -41,7 +41,7 @@
       </b-row>
       <b-row>
         <b-col>
-          <b-alert variant="success" :show="companyAddSuccess" dismissible @dismissed="companyAddSuccess=false">Company added.</b-alert>
+          <b-alert variant="success" id="orgAddSuccessAlert" :show="companyAddSuccess" dismissible @dismissed="companyAddSuccess=false">Company added.</b-alert>
         </b-col>
       </b-row>
 
@@ -52,24 +52,22 @@
           <b-row>
             <b-col cols="12" md="5">
                 <b-form-group
-                  id="companyNameInputGroup"
                   label="Company name:"
-                  label-for="companyNameInput">
+                  label-for="orgEditNameInput">
                   <b-form-input
                     :disabled="!selectedCompany"
-                    id="companyNameInput"
+                    id="orgEditNameInput"
                     type="text"
                     v-model="companyForm.name"/>
                 </b-form-group>
             </b-col>
               <b-col cols="12" md="5" offset-md="1">
                 <b-form-group
-                  id="companyAddressInputGroup"
                   label="Street address:"
-                  label-for="companyAddressInput">
+                  label-for="orgEditAddressInput">
                   <b-form-input
                     :disabled="!selectedCompany"
-                    id="companyAddressInput"
+                    id="orgEditAddressInput"
                     type="text"
                     v-model="companyForm.street_address"/>
                 </b-form-group>
@@ -78,24 +76,22 @@
           <b-row>
             <b-col cols="12" md="5">
                 <b-form-group
-                  id="companyCityInputGroup"
                   label="City:"
-                  label-for="companyCityInput">
+                  label-for="orgEditCityInput">
                   <b-form-input
                     :disabled="!selectedCompany"
-                    id="companyCityInput"
+                    id="orgEditCityInput"
                     type="text"
                     v-model="companyForm.city"/>
                 </b-form-group>
             </b-col>
               <b-col cols="12" md="5" offset-md="1">
                 <b-form-group
-                  id="companyProvinceInputGroup"
                   label="Province:"
-                  label-for="companyProvinceInput">
+                  label-for="orgEditProvinceInput">
                   <b-form-select
                     :disabled="!selectedCompany"
-                    id="companyProvinceInput"
+                    id="orgEditProvinceInput"
                     :state="validation.province_state"
                     :options="provinceStateOptions"
                     aria-describedby="provInputFeedback"
@@ -113,12 +109,11 @@
           <b-row>
             <b-col cols="12" md="5">
                 <b-form-group
-                  id="postalCodeInputGroup"
                   label="Postal code:"
-                  label-for="postalCodeInput">
+                  label-for="orgEditPostalInput">
                   <b-form-input
                     :disabled="!selectedCompany"
-                    id="postalCodeInput"
+                    id="orgEditPostalInput"
                     type="text"
                     v-model="companyForm.postal_code"/>
                 </b-form-group>
@@ -127,12 +122,11 @@
           <b-row class="mt-4">
             <b-col cols="12" md="5">
               <b-form-group
-                id="companyTelInputGroup"
                 label="Office number:"
-                label-for="companyTelInput">
+                label-for="orgEditPhoneInput">
                 <b-form-input
                   :disabled="!selectedCompany"
-                  id="companyTelInput"
+                  id="orgEditPhoneInput"
                   type="text"
                   :formatter="formatTel"
                   lazy-formatter
@@ -141,12 +135,11 @@
             </b-col>
             <b-col cols="12" md="5" offset-md="1">
                 <b-form-group
-                  id="companyFaxInputGroup"
                   label="Fax number:"
-                  label-for="companyFaxInput">
+                  label-for="orgEditFaxInput">
                   <b-form-input
                     :disabled="!selectedCompany"
-                    id="companyFaxInput"
+                    id="orgEditFaxInput"
                     type="text"
                     :formatter="formatTel"
                     lazy-formatter
@@ -157,17 +150,16 @@
           <b-row>
             <b-col cols="12" md="5">
               <b-form-group
-                id="companyEmailInputGroup"
                 label="Email:"
-                label-for="companyEmailInput">
+                label-for="orgEditEmailInput">
                 <b-form-input
-                    id="companyEmailInput"
+                    id="orgEditEmailInput"
                     type="text"
                     :state="validation.email"
                     :disabled="!selectedCompany"
-                    aria-describedby="companyEmailInputFeedback"
+                    aria-describedby="orgEditEmailFeedback"
                     v-model="companyForm.email"/>
-                <b-form-invalid-feedback id="companyEmailInputFeedback">
+                <b-form-invalid-feedback id="orgEditEmailFeedback">
                   <div v-for="(error, index) in fieldErrors.email" :key="`urlInput error ${index}`">
                     {{ error }}
                   </div>
@@ -176,17 +168,16 @@
             </b-col>
             <b-col cols="12" md="5" offset-md="1">
               <b-form-group
-                id="companyWebsiteInputGroup"
                 label="Website:"
-                label-for="companyWebsiteInput">
+                label-for="orgEditWebsiteInput">
                 <b-form-input
                   :disabled="!selectedCompany"
-                  id="companyWebsiteInput"
+                  id="orgEditWebsiteInput"
                   :state="validation.website_url"
-                  aria-describedby="websiteInputFeedback"
+                  aria-describedby="orgEditWebsiteFeedback"
                   type="text"
                   v-model="companyForm.website_url"/>
-                <b-form-invalid-feedback id="websiteInputFeedback">
+                <b-form-invalid-feedback id="orgEditWebsiteFeedback">
                     <div v-for="(error, index) in fieldErrors.website_url" :key="`websiteInput error ${index}`">
                       {{ error }}
                     </div>
@@ -202,7 +193,7 @@
           </b-row>
           <b-row>
             <b-col>
-              <b-alert class="mt-3" variant="success" :show="companyUpdateSuccess" dismissible @dismissed="companyUpdateSuccess=false">
+              <b-alert class="mt-3" variant="success" id="orgUpdateSuccessAlert" :show="companyUpdateSuccess" dismissible @dismissed="companyUpdateSuccess=false">
                 Successfully updated company information.
               </b-alert>
             </b-col>
@@ -210,9 +201,10 @@
 
           <!-- Modals for confirming update/cancel editing -->
           <b-modal
+              id="orgUpdateModal"
               v-model="confirmSubmitModal"
               centered
-              title="Confirm save"
+              title="Confirm update"
               @shown="focusSubmitModal"
               :return-focus="$refs.orgUpdateSaveBtn">
             Are you sure you want to save these changes?
@@ -285,6 +277,7 @@
             </div>
       </div>
       <b-modal
+          id="orgDeleteModal"
           v-model="companyDeleteModal"
           centered
           title="Confirm delete"
@@ -300,7 +293,7 @@
           </b-btn>
         </div>
       </b-modal>
-      <b-alert variant="success" class="mt-3" :show="!!companyDeleted" dismissible @dismissed="companyDeleted=false">
+      <b-alert variant="success" class="mt-3" id="orgDeleteSuccessAlert" :show="!!companyDeleted" dismissible @dismissed="companyDeleted=false">
           {{ companyDeleted }} removed.
       </b-alert>
     </b-card>
diff --git a/app/frontend/src/registry/components/people/PersonDetail.vue b/app/frontend/src/registry/components/people/PersonDetail.vue
index be16da6cb0..7620f4dbee 100644
--- a/app/frontend/src/registry/components/people/PersonDetail.vue
+++ b/app/frontend/src/registry/components/people/PersonDetail.vue
@@ -294,10 +294,11 @@
                   <b-btn
                       variant="primary"
                       @click="confirmRegisterModal[item.code]=false;submitRegistration(item.code)"
-                      :ref="`confirmRegisterConfirmBtn${item.code}`">
+                      :ref="`confirmRegisterConfirmBtn${item.code}`"
+                      id="register-confirm">
                     Confirm
                   </b-btn>
-                  <b-btn variant="light" @click="confirmRegisterModal[item.code]=false">
+                  <b-btn variant="light" @click="confirmRegisterModal[item.code]=false" id="register-cancel">
                     Cancel
                   </b-btn>
                 </div>
diff --git a/app/frontend/src/registry/components/search/SearchHome.vue b/app/frontend/src/registry/components/search/SearchHome.vue
index e8b9197b55..b405580991 100644
--- a/app/frontend/src/registry/components/search/SearchHome.vue
+++ b/app/frontend/src/registry/components/search/SearchHome.vue
@@ -46,7 +46,7 @@
     <b-card class="container p-1" title="Register of Well Drillers and Well Pump Installers">
       <p>To update contact information or for general enquiries email <a href="mailto:Groundwater@gov.bc.ca">groundwater@gov.bc.ca</a>.</p>
       <p>
-        <a href="https://www2.gov.bc.ca/gov/content/environment/air-land-water/water/groundwater-wells/information-for-well-drillers-well-pump-installers/what-you-need-to-practice-in-bc">
+        <a href="https://www2.gov.bc.ca/gov/content?id=63B6DFF0024949B6867C459C19C23F88">
         Learn more about registering as a well driller or well pump installer in B.C.
         </a>
       </p>
diff --git a/app/frontend/src/submissions/App.vue b/app/frontend/src/submissions/App.vue
index 2de1aaf24e..3086a116b8 100644
--- a/app/frontend/src/submissions/App.vue
+++ b/app/frontend/src/submissions/App.vue
@@ -11,13 +11,11 @@
 <script>
 import Header from '@/common/components/Header'
 import Footer from '@/common/components/Footer'
-import APIErrorMessage from '@/common/components/APIErrorMessage.vue'
 export default {
   name: 'App',
   components: {
     'gwells-header': Header,
-    'gwells-footer': Footer,
-    'api-error': APIErrorMessage
+    'gwells-footer': Footer
   }
 }
 </script>
diff --git a/app/frontend/src/submissions/components/SubmissionForm/ActivityType.vue b/app/frontend/src/submissions/components/SubmissionForm/ActivityType.vue
new file mode 100644
index 0000000000..9e4dd684f9
--- /dev/null
+++ b/app/frontend/src/submissions/components/SubmissionForm/ActivityType.vue
@@ -0,0 +1,36 @@
+<template>
+  <fieldset>
+    <legend>Type of Work</legend>
+    <b-row>
+      <b-col cols="12" md="6">
+        <b-form-group label="Type of Work *">
+          <b-form-radio-group v-model="wellActivityTypeInput"
+                              stacked
+                              name="submissionTypeRadio">
+            <b-form-radio value="CON">Construction</b-form-radio>
+            <b-form-radio value="ALT">Alteration</b-form-radio>
+            <b-form-radio value="DEC">Decommissioning</b-form-radio>
+            <b-form-radio value="STAFF_EDIT" v-if="userRoles.wells.edit">Other Report Types</b-form-radio>
+          </b-form-radio-group>
+        </b-form-group>
+      </b-col>
+    </b-row>
+  </fieldset>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import inputBindingsMixin from '@/common/inputBindingsMixin.js'
+export default {
+  mixins: [inputBindingsMixin],
+  props: {
+    wellActivityType: String
+  },
+  computed: {
+    ...mapGetters(['userRoles'])
+  }
+}
+</script>
+
+<style>
+</style>
diff --git a/app/frontend/src/submissions/components/SubmissionForm/Casings.vue b/app/frontend/src/submissions/components/SubmissionForm/Casings.vue
index a7cac68faa..ce463dd3e8 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/Casings.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/Casings.vue
@@ -37,9 +37,9 @@
             </td>
             <td class="pb-0">
               <b-form-group
-                id="'casingCode_' + index"
+                :id="'casingCode_' + index"
                 class="my-0"
-                aria-describedby="casingCodeInvalidFeedback{index}">
+                :aria-describedby="`casingCodeInvalidFeedback${index}`">
                 <b-form-select
                     v-model="casing.casing_code"
                     :options="codes.casing_codes"
@@ -50,7 +50,7 @@
                     <option :value="null" disabled>Select a type</option>
                   </template>
                 </b-form-select>
-                <b-form-invalid-feedback id="casingCodeInvalidFeedback{index}">
+                <b-form-invalid-feedback :id="`casingCodeInvalidFeedback${index}`">
                   <div v-for="(error, error_index) in getCasingError(index).casing_code" :key="`Casing type input error ${error_index}`">
                     {{ error }}
                   </div>
@@ -61,7 +61,7 @@
               <b-form-group
                 :id="'casingMaterial_' + index"
                 class="my-0"
-                aria-describedby="casingMaterialInvalidFeedback{index}">
+                :aria-describedby="`casingMaterialInvalidFeedback${index}`">
                 <b-form-select
                     v-model="casing.casing_material"
                     :options="codes.casing_materials"
@@ -72,7 +72,7 @@
                     <option :value="null" disabled>Select a material</option>
                   </template>
                 </b-form-select>
-                <b-form-invalid-feedback id="casingCodeInvalidFeedback{index}">
+                <b-form-invalid-feedback :id="`casingCodeInvalidFeedback${index}`">
                   <div v-for="(error, error_index) in getCasingError(index).casing_material" :key="`Material input error ${error_index}`">
                     {{ error }}
                   </div>
@@ -105,13 +105,13 @@
               </b-form-radio-group>
             </td>
             <td class="pt-1 py-0">
-              <b-btn size="sm" variant="primary" @click="removeRowIfOk(casing)" class="mt-2"><i class="fa fa-minus-square-o"></i> Remove</b-btn>
+              <b-btn size="sm" variant="primary" :id="`removeCasingRowBtn${index}`" @click="removeRowIfOk(casing)" class="mt-2"><i class="fa fa-minus-square-o"></i> Remove</b-btn>
             </td>
           </tr>
         </tbody>
       </table>
     </div>
-    <b-btn size="sm" variant="primary" @click="addRow"><i class="fa fa-plus-square-o"></i> Add row</b-btn>
+    <b-btn size="sm" id="addCasingRowBtn" variant="primary" @click="addRow"><i class="fa fa-plus-square-o"></i> Add row</b-btn>
     <b-modal
         v-model="confirmRemoveModal"
         centered
@@ -197,7 +197,7 @@ export default {
     ...mapGetters(['codes'])
   },
   created () {
-    // When component created, add an initial row of lithology.
+    // When component created, add an initial row of casings.
     if (!this.casingsInput.length) {
       this.casingsInput.push({}, {}, {})
     }
diff --git a/app/frontend/src/submissions/components/SubmissionForm/Coords.vue b/app/frontend/src/submissions/components/SubmissionForm/Coords.vue
index ff3c194099..5cd6f6acd7 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/Coords.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/Coords.vue
@@ -3,159 +3,175 @@
     <fieldset>
       <legend>Geographic Coordinates</legend>
       <p>To determine coordinates using a Global Positioning System (GPS), set the datum to North America Datum of 1983 (NAD 83), the current ministry standard for mapping.</p>
-      <b-card no-body class="p-3 m-1 m-md-1">
-        <b-row>
-          <b-col cols="12" sm="6" lg="3">
-            <form-input
-              id="latitude"
-              type="text"
-              label="Latitude"
-              hint="Decimal degrees"
-              @focus="unfreeze('deg')"
-              @blur="freeze('deg')"
-              v-model="latitudeInput"
-              :errors="errors['latitude']"
-              :loaded="fieldsLoaded['latitude']"
-            ></form-input>
-          </b-col>
-          <b-col cols="12" sm="6" lg="3" offset-lg="2">
-            <form-input
-              id="longitude"
-              type="text"
-              @focus="unfreeze('deg')"
-              @blur="freeze('deg')"
-              label="Longitude"
-              hint="Decimal degrees"
-              v-model="longitudeInput"
-              :errors="errors['longitude']"
-              :loaded="fieldsLoaded['longitude']"
-            ></form-input>
-          </b-col>
-        </b-row>
-      </b-card>
-      <b-row><b-col><p class="p-3">OR</p></b-col></b-row>
-      <b-card no-body class="p-3 mx-1 mx-md-1">
-        <b-row>
-          <b-col cols="12" md="6" lg="4">
-            <b-row class="mb-2"><b-col>Latitude</b-col></b-row>
+      <p>After the GPS coordinates are entered, the map pin can be moved by clicking and dragging it on the map. The GPS coordinates will be updated automatically.</p>
+      <b-row>
+        <b-col sm="12" md="6">
+          <b-card no-body class="p-3 m-1 m-md-1">
             <b-row>
-              <b-col cols="12" sm="4">
+              <b-col cols="12" sm="6" lg="3">
                 <form-input
-                  id="latitudeDeg"
-                  @focus="unfreeze('dms')"
-                  @blur="freeze('dms')"
-                  hint="Degrees"
-                  v-model="dms.lat.deg"
-                  :loaded="fieldsLoaded['latitude']"
-                ></form-input>
-              </b-col>
-              <b-col cols="12" sm="4">
-                <form-input
-                  id="latitudeMin"
-                  hint="Minutes"
-                  @focus="unfreeze('dms')"
-                  @blur="freeze('dms')"
-                  v-model="dms.lat.min"
+                  id="latitude"
+                  type="text"
+                  label="Latitude"
+                  hint="Decimal degrees"
+                  @focus="unfreeze('deg')"
+                  @blur="freeze('deg')"
+                  v-model.number="latitudeInput"
                   :errors="errors['latitude']"
                   :loaded="fieldsLoaded['latitude']"
                 ></form-input>
               </b-col>
-              <b-col cols="12" sm="4">
+              <b-col cols="12" sm="6" lg="3" offset-lg="2">
                 <form-input
-                  id="latitudeSec"
+                  id="longitude"
                   type="text"
-                  @focus="unfreeze('dms')"
-                  @blur="freeze('dms')"
-                  hint="Seconds"
-                  v-model="dms.lat.sec"
-                  :errors="errors['latitude']"
-                  :loaded="fieldsLoaded['latitude']"
+                  @focus="unfreeze('deg')"
+                  @blur="freeze('deg')"
+                  label="Longitude"
+                  hint="Decimal degrees"
+                  v-model.number="computedLongitude"
+                  :errors="errors['longitude']"
+                  :loaded="fieldsLoaded['longitude']"
                 ></form-input>
               </b-col>
             </b-row>
-          </b-col>
-          <b-col cols="12" md="6" lg="4" offset-lg="1">
-            <b-row class="mb-2"><b-col>Longitude</b-col></b-row>
+          </b-card>
+          <b-row><b-col><p class="p-3">OR</p></b-col></b-row>
+          <b-card no-body class="p-3 mx-1 mx-md-1">
+            <b-row>
+              <b-col cols="12" md="6" lg="6">
+                <b-row class="mb-2"><b-col>Latitude</b-col></b-row>
+                <b-row>
+                  <b-col cols="12" sm="4" class="px-2">
+                    <form-input
+                      id="latitudeDeg"
+                      @focus="unfreeze('dms')"
+                      @blur="freeze('dms')"
+                      hint="Degrees"
+                      type="text"
+                      v-model.number="dms.lat.deg"
+                      :loaded="fieldsLoaded['latitude']"
+                    ></form-input>
+                  </b-col>
+                  <b-col cols="12" sm="4" class="px-2">
+                    <form-input
+                      id="latitudeMin"
+                      hint="Minutes"
+                      @focus="unfreeze('dms')"
+                      @blur="freeze('dms')"
+                      type="text"
+                      v-model.number="dms.lat.min"
+                      :errors="errors['latitude']"
+                      :loaded="fieldsLoaded['latitude']"
+                    ></form-input>
+                  </b-col>
+                  <b-col cols="12" sm="4" class="px-1">
+                    <form-input
+                      id="latitudeSec"
+                      type="text"
+                      @focus="unfreeze('dms')"
+                      @blur="freeze('dms')"
+                      hint="Seconds"
+                      v-model.number="dms.lat.sec"
+                      :errors="errors['latitude']"
+                      :loaded="fieldsLoaded['latitude']"
+                    ></form-input>
+                  </b-col>
+                </b-row>
+              </b-col>
+              <b-col cols="12" md="6" lg="6" offset-lg="0">
+                <b-row class="mb-2"><b-col>Longitude</b-col></b-row>
+                <b-row>
+                  <b-col cols="12" sm="4" class="px-2">
+                    <form-input
+                      id="longitudeDeg"
+                      type="text"
+                      @focus="unfreeze('dms')"
+                      @blur="freeze('dms')"
+                      hint="Degrees"
+                      v-model.number="computedLongitudeDeg"
+                      :errors="errors['longitude']"
+                      :loaded="fieldsLoaded['longitude']"
+                    ></form-input>
+                  </b-col>
+                  <b-col cols="12" sm="4" class="px-2">
+                    <form-input
+                      id="longitudeMin"
+                      type="text"
+                      @focus="unfreeze('dms')"
+                      @blur="freeze('dms')"
+                      hint="Minutes"
+                      v-model.number="dms.long.min"
+                      :errors="errors['longitude']"
+                      :loaded="fieldsLoaded['longitude']"
+                    ></form-input>
+                  </b-col>
+                  <b-col cols="12" sm="4" class="px-1">
+                    <form-input
+                      id="longitudeSec"
+                      type="text"
+                      @focus="unfreeze('dms')"
+                      @blur="freeze('dms')"
+                      hint="Seconds"
+                      v-model.number="dms.long.sec"
+                      :errors="errors['longitude']"
+                      :loaded="fieldsLoaded['longitude']"
+                    ></form-input>
+                  </b-col>
+                </b-row>
+              </b-col>
+            </b-row>
+          </b-card>
+          <b-row><b-col><p class="p-3">OR</p></b-col></b-row>
+          <b-card no-body class="p-3 mx-1 mx-md-1">
             <b-row>
-              <b-col cols="12" sm="4">
+              <b-col cols="12" sm="4" lg="4">
                 <form-input
-                  id="longitudeDeg"
-                  type="text"
-                  @focus="unfreeze('dms')"
-                  @blur="freeze('dms')"
-                  hint="Degrees"
-                  v-model="dms.long.deg"
-                  :errors="errors['longitude']"
-                  :loaded="fieldsLoaded['longitude']"
+                  id="utmZone"
+                  select
+                  :options="utmZones"
+                  label="Zone"
+                  @focus="unfreeze('utm')"
+                  @blur="freeze('utm')"
+                  v-model="utm.zone"
+                  text-field="name"
+                  value-field="value"
+                  :loaded="fieldsLoaded['utmZone']"
                 ></form-input>
               </b-col>
-              <b-col cols="12" sm="4">
+              <b-col cols="12" sm="4" lg="4">
+                <!-- UTM Easting should only allow 6 digits to be entered. -->
                 <form-input
-                  id="longitudeMin"
-                  @focus="unfreeze('dms')"
-                  @blur="freeze('dms')"
-                  hint="Minutes"
-                  v-model="dms.long.min"
-                  :errors="errors['longitude']"
-                  :loaded="fieldsLoaded['longitude']"
+                  id="utmEasting"
+                  type="text"
+                  label="UTM Easting"
+                  v-model.number="utm.easting"
+                  @focus="unfreeze('utm')"
+                  @blur="freeze('utm')"
+                  :loaded="fieldsLoaded['utmEasting']"
+                  :max="999999"
                 ></form-input>
               </b-col>
-              <b-col cols="12" sm="4">
+              <b-col cols="12" sm="4" lg="4">
+                <!-- UTM Northing should only allow 7 digits to be entered. -->
                 <form-input
-                  id="longitudeSec"
-                  @focus="unfreeze('dms')"
-                  @blur="freeze('dms')"
-                  hint="Seconds"
-                  v-model="dms.long.sec"
-                  :errors="errors['longitude']"
-                  :loaded="fieldsLoaded['longitude']"
+                  id="utmNorthing"
+                  type="text"
+                  label="UTM Northing"
+                  @focus="unfreeze('utm')"
+                  @blur="freeze('utm')"
+                  v-model.number="utm.northing"
+                  :max="9999999"
+                  :loaded="fieldsLoaded['utmNorthing']"
                 ></form-input>
               </b-col>
             </b-row>
-          </b-col>
-        </b-row>
-      </b-card>
-      <b-row><b-col><p class="p-3">OR</p></b-col></b-row>
-      <b-card no-body class="p-3 mx-1 mx-md-1">
-        <b-row>
-          <b-col cols="12" sm="4" lg="2">
-            <form-input
-              id="utmZone"
-              select
-              :options="utmZones"
-              label="Zone"
-              @focus="unfreeze('utm')"
-              @blur="freeze('utm')"
-              v-model="utm.zone"
-              text-field="name"
-              value-field="value"
-              :loaded="fieldsLoaded['utmZone']"
-            ></form-input>
-          </b-col>
-          <b-col cols="12" sm="4" lg="3">
-            <form-input
-              id="utmEasting"
-              type="text"
-              label="UTM Easting"
-              v-model="utm.easting"
-              @focus="unfreeze('utm')"
-              @blur="freeze('utm')"
-              :loaded="fieldsLoaded['utmEasting']"
-            ></form-input>
-          </b-col>
-          <b-col cols="12" sm="4" lg="3">
-            <form-input
-              id="utmNorthing"
-              type="text"
-              label="UTM Northing"
-              @focus="unfreeze('utm')"
-              @blur="freeze('utm')"
-              v-model="utm.northing"
-              :loaded="fieldsLoaded['utmNorthing']"
-            ></form-input>
-          </b-col>
-        </b-row>
-      </b-card>
+          </b-card>
+        </b-col>
+        <b-col sm="12" md="6">
+          <coords-map :latitude="latitudeInput" :longitude="longitudeInput" v-on:coordinate="handleMapCoordinate"/>
+        </b-col>
+      </b-row>
 
       <!-- Error message when coordinates not entered in at least one of the 3 input groups -->
       <b-alert class="mt-3" variant="danger" :show="errorCoordsNotProvided">
@@ -166,14 +182,18 @@
 </template>
 <script>
 import inputBindingsMixin from '@/common/inputBindingsMixin.js'
+import CoordsMap from '@/submissions/components/SubmissionForm/CoordsMap.vue'
 import { mapGetters } from 'vuex'
-import proj4 from 'proj4'
+import convertCoordinatesMixin from '@/common/convertCoordinatesMixin.js'
 export default {
+  components: {
+    'coords-map': CoordsMap
+  },
   name: 'Coords',
-  mixins: [inputBindingsMixin],
+  mixins: [inputBindingsMixin, convertCoordinatesMixin],
   props: {
-    latitude: String,
-    longitude: String,
+    latitude: Number,
+    longitude: Number,
     errors: {
       type: Object,
       default: () => ({})
@@ -184,10 +204,6 @@ export default {
     },
     errorCoordsNotProvided: Boolean
   },
-  fields: {
-    latitudeInput: 'latitude',
-    longitudeInput: 'longitude'
-  },
   data () {
     return {
       ellps: 'GRS80', // UTM config parameters. This does not apply to degrees latitude/longitude
@@ -198,24 +214,24 @@ export default {
         deg: true
       },
       utm: {
-        easting: '',
-        northing: '',
+        easting: null,
+        northing: null,
         zone: ''
       },
       degrees: {
-        latitude: '',
-        longitude: ''
+        latitude: null,
+        longitude: null
       },
       dms: {
         lat: {
-          deg: '',
-          min: '',
-          sec: ''
+          deg: null,
+          min: null,
+          sec: null
         },
         long: {
-          deg: '',
-          min: '',
-          sec: ''
+          deg: null,
+          min: null,
+          sec: null
         }
       },
       latitudeDMSValidation: false
@@ -238,6 +254,25 @@ export default {
 
       return zones
     },
+    // In the background, longitude is stored as a negative number (West == minus). However, our B.C. based
+    // users are used to ommitting the negative, because it's implicit. As such we need a workaround to
+    // transform the longitude.
+    computedLongitude: {
+      get: function () {
+        return this.transformToPositive(this.longitudeInput)
+      },
+      set: function (value) {
+        this.longitudeInput = this.transformToNegative(value)
+      }
+    },
+    computedLongitudeDeg: {
+      get: function () {
+        return this.transformToPositive(this.dms.long.deg)
+      },
+      set: function (value) {
+        this.dms.long.deg = this.transformToNegative(value)
+      }
+    },
     ...mapGetters(['codes'])
   },
   watch: {
@@ -254,12 +289,12 @@ export default {
           }
 
           const dms = Object.assign({}, value)
-          dms.deg = Number(this.parseCoordValue(value.deg)) || 0
-          dms.min = Number(this.parseCoordValue(value.min)) || 0
-          dms.sec = Number(this.parseCoordValue(value.sec)) || 0
+          dms.deg = value.deg
+          dms.min = value.min
+          dms.sec = value.sec
 
           const lat = this.convertDMStoDeg(dms)
-          const { easting, northing, zone } = this.convertToUTM(Number(this.longitudeInput), lat)
+          const { easting, northing, zone } = this.convertToUTM(this.longitudeInput, lat)
           this.updateDegrees(this.longitudeInput, lat)
           this.updateUTM(easting, northing, zone)
         }
@@ -276,13 +311,13 @@ export default {
           }
 
           const dms = Object.assign({}, value)
-          dms.deg = Number(this.parseCoordValue(value.deg)) || 0
-          dms.min = Number(this.parseCoordValue(value.min)) || 0
-          dms.sec = Number(this.parseCoordValue(value.sec)) || 0
+          dms.deg = value.deg
+          dms.min = value.min
+          dms.sec = this.roundSeconds(value.sec)
 
           const long = this.convertDMStoDeg(dms)
 
-          const { easting, northing, zone } = this.convertToUTM(long, Number(this.latitudeInput))
+          const { easting, northing, zone } = this.convertToUTM(long, this.latitudeInput)
           this.updateDegrees(long, this.latitudeInput)
           this.updateUTM(easting, northing, zone)
         }
@@ -290,38 +325,33 @@ export default {
     },
     'latitudeInput': {
       deep: true,
-      handler: function (value) {
-        if (!this.lock.deg) {
-          value = this.parseCoordValue(value)
-          if (!value) {
+      handler: function (latitude) {
+        if (!this.lock.deg && !isNaN(latitude)) {
+          if (!latitude) {
             this.resetUTM()
             this.resetDMS()
             return null
           }
+          const { easting, northing, zone } = this.convertToUTM(this.longitudeInput, latitude)
 
-          const lat = Number(value)
-          const { easting, northing, zone } = this.convertToUTM(Number(this.longitudeInput), lat)
-
-          this.updateDMS(this.convertToDMS(Number(this.longitudeInput)), this.convertToDMS(lat))
+          this.updateDMS(this.convertToDMS(this.longitudeInput), this.convertToDMS(latitude))
           this.updateUTM(easting, northing, zone)
         }
       }
     },
     'longitudeInput': {
       deep: true,
-      handler: function (value) {
-        if (!this.lock.deg) {
-          value = this.parseCoordValue(value)
-          if (!value) {
+      handler: function (long) {
+        if (!this.lock.deg && !isNaN(long)) {
+          if (!long) {
             this.resetUTM()
             this.resetDMS()
             return null
           }
 
-          const long = Number(value)
-          const { easting, northing, zone } = this.convertToUTM(long, Number(this.latitudeInput))
+          const { easting, northing, zone } = this.convertToUTM(long, this.latitudeInput)
 
-          this.updateDMS(this.convertToDMS(long), this.convertToDMS(Number(this.latitudeInput)))
+          this.updateDMS(this.convertToDMS(long), this.convertToDMS(this.latitudeInput))
           this.updateUTM(easting, northing, zone)
         }
       }
@@ -330,7 +360,6 @@ export default {
       deep: true,
       handler: function (value) {
         if (!this.lock.utm) {
-          value = this.parseCoordValue(value)
           if (!value) {
             this.resetDMS()
             this.resetDegrees()
@@ -348,7 +377,6 @@ export default {
       deep: true,
       handler: function (value) {
         if (!this.lock.utm) {
-          value = this.parseCoordValue(value)
           if (!value) {
             this.resetDMS()
             this.resetDegrees()
@@ -381,79 +409,24 @@ export default {
     }
   },
   methods: {
-    convertToUTM (long, lat) {
-      // converts input coordinates and returns an object containing UTM easting, northing, and zone
-      const utm = {
-        easting: '',
-        northing: '',
-        zone: ''
-      }
-
-      lat = Number(lat)
-      long = Number(long)
-
-      // determine zone
-      const zone = Math.floor((long + 180) / 6) + 1
-
-      // proj4 coordinate system definitions
-      const utmProjection = `+proj=utm +zone=${zone} +ellps=GRS80 +datum=NAD83 +units=m +no_defs`
-      const coords = proj4(utmProjection, [long, lat])
-
-      utm.easting = String(coords[0])
-      utm.northing = String(coords[1])
-      utm.zone = zone
-
-      return utm
-    },
-    convertToWGS84 (easting, northing, zone) {
-      // converts from UTM to WGS84
-      northing = Number(northing)
-      easting = Number(easting)
-      zone = Number(zone)
-
-      // proj4 coordinate system definitions
-      const wgs84Projection = proj4.defs('EPSG:4326')
-      const utmProjection = `+proj=utm +zone=${zone} +ellps=${this.ellps} +datum=${this.datum} +units=m +no_defs`
-
-      const coords = proj4(utmProjection, wgs84Projection, [easting, northing])
-
-      return {
-        longitude: String(coords[0]),
-        latitude: String(coords[1])
-      }
-    },
-    convertToDMS (degrees) {
-      // converts from decimal degrees to degrees, minutes seconds
-      // returns an object with keys 'deg', 'min', 'sec'
-
-      degrees = Number(degrees)
-
-      const angle = Math.abs(degrees)
-      const deg = Math.floor(angle) * Math.sign(degrees)
-      const sec = (3600 * (angle - Math.floor(angle)) % 60).toFixed(2)
-      const min = Math.floor((3600 * (angle - Math.floor(angle))) / 60)
-
-      return {
-        deg: String(deg),
-        min: String(min),
-        sec: String(sec)
-      }
+    transformToPositive (value) {
+      // Take a value, if it's a number - make it positive. If it's not a number, leave it alone
+      return value === '' || isNaN(value) || value === null ? value : Math.abs(value)
     },
-    convertDMStoDeg (dms) {
-      const sign = Math.sign(dms.deg)
-
-      return (dms.deg + sign * dms.min / 60 + sign * dms.sec / (60 * 60)).toFixed(6)
+    transformToNegative (value) {
+      // Take a value, if it's a number - make it negative. If it's not a number, leave it alone.
+      return value === '' || isNaN(value) || value === null ? value : Math.abs(value) * -1
     },
     updateUTM (easting, northing, zone) {
-      this.utm.easting = easting
-      this.utm.northing = northing
+      this.utm.easting = Math.round(easting)
+      this.utm.northing = Math.round(northing)
       this.utm.zone = zone
     },
     resetUTM () {
       this.utm = {
-        easting: '',
-        northing: '',
-        zone: ''
+        easting: null,
+        northing: null,
+        zone: null
       }
     },
     updateDMS (longitude = {}, latitude = {}) {
@@ -463,45 +436,26 @@ export default {
     resetDMS () {
       this.dms = {
         lat: {
-          deg: '',
-          min: '',
-          sec: ''
+          deg: null,
+          min: null,
+          sec: null
         },
         long: {
-          deg: '',
-          min: '',
-          sec: ''
+          deg: null,
+          min: null,
+          sec: null
         }
       }
     },
     updateDegrees (longitude, latitude) {
-      this.longitudeInput = longitude
-      this.latitudeInput = latitude
+      this.longitudeInput = this.roundDecimalDegrees(longitude)
+      this.latitudeInput = this.roundDecimalDegrees(latitude)
     },
     resetDegrees () {
       this.degrees = {
-        latitude: '',
-        longitude: ''
-      }
-    },
-    parseCoordValue (value) {
-      // check that the input contains at least one number
-      if (!value.match(/[0-9]/)) {
-        value = '0'
+        latitude: null,
+        longitude: null
       }
-
-      // check that there are no dashes except when at the beginning of the string
-      if (value.length > 1 && value.substr(1).match(/-/)) {
-        value = '0'
-      }
-
-      // check that there is maximum one decimal ('.') character
-      if ((value.match(/\./g) || []).length > 1) {
-        value = '0'
-      }
-
-      value = value.replace(/[^0-9.-]/g, '')
-      return value
     },
     freeze (type) {
       // freeze updates the 'lock' object for the given type
@@ -512,6 +466,14 @@ export default {
     },
     unfreeze (type) {
       this.lock[type] = false
+    },
+    handleMapCoordinate (latlng) {
+      this.updateDegrees(latlng.lng, latlng.lat)
+
+      const { easting, northing, zone } = this.convertToUTM(latlng.lng, latlng.lat)
+
+      this.updateDMS(this.convertToDMS(latlng.lng), this.convertToDMS(latlng.lat))
+      this.updateUTM(easting, northing, zone)
     }
   }
 }
diff --git a/app/frontend/src/submissions/components/SubmissionForm/CoordsMap.vue b/app/frontend/src/submissions/components/SubmissionForm/CoordsMap.vue
new file mode 100644
index 0000000000..f1cb7f041a
--- /dev/null
+++ b/app/frontend/src/submissions/components/SubmissionForm/CoordsMap.vue
@@ -0,0 +1,146 @@
+<template>
+  <div id="map" class="map"/>
+</template>
+
+<script>
+import L from 'leaflet'
+import { tiledMapLayer } from 'esri-leaflet'
+export default {
+  name: 'CoordsMap',
+  props: {
+    latitude: {
+      type: Number
+    },
+    longitude: {
+      type: Number
+    },
+    draggable: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      map: null
+    }
+  },
+  mounted () {
+    // There seems to be an issue loading leaflet immediately on mount, we use nextTick to ensure
+    // that the view has been rendered at least once before injecting the map.
+    this.$nextTick(function () {
+      this.initLeaflet()
+      this.initMap()
+    })
+  },
+  watch: {
+    latitude () {
+      this.updateCoords()
+    },
+    longitude () {
+      this.updateCoords()
+    }
+  },
+  methods: {
+    initLeaflet () {
+      // There is a known issue using leaflet with webpack, this is a workaround
+      // Fix courtesy of: https://github.com/PaulLeCam/react-leaflet/issues/255
+      delete L.Icon.Default.prototype._getIconUrl
+      L.Icon.Default.mergeOptions({
+        iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+        iconUrl: require('leaflet/dist/images/marker-icon.png'),
+        shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+      })
+    },
+    initMap () {
+      // Create map, with default centered and zoomed to show entire BC.
+      this.map = L.map('map').setView([this.latitude ? this.latitude : 54.5, this.getLongitude() ? this.getLongitude() : -126.5], 5)
+      L.control.scale().addTo(this.map)
+
+      // Add map layers.
+      tiledMapLayer({url: 'https://maps.gov.bc.ca/arcserver/rest/services/Province/roads_wm/MapServer'}).addTo(this.map)
+      L.tileLayer.wms('https://openmaps.gov.bc.ca/geo/pub/WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW/ows?', {
+        format: 'image/png',
+        layers: 'pub:WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW',
+        styles: 'PMBC_Parcel_Fabric_Cadastre_Outlined',
+        transparent: true
+      }).addTo(this.map)
+      this.createMarker()
+    },
+    createMarker () {
+      if (this.latitude !== null && this.getLongitude() !== null) {
+        const latlng = L.latLng(this.latitude, this.getLongitude())
+        this.marker = L.marker(latlng, {draggable: this.draggable, autoPan: true})
+        if (this.draggable) {
+          this.marker.on('dragend', (ev) => {
+            this.handleDrag(ev)
+          })
+        }
+        this.marker.addTo(this.map)
+        this.setMarkerPopup(this.latitude, this.longitude)
+        // The 1st time we create a marker, we jump to a different zoom level.
+        this.map.setView(latlng, 13)
+      }
+    },
+    updateMarkerLatLong (latlng) {
+      if (this.marker) {
+        this.setMarkerPopup(latlng.lat, latlng.lng)
+        this.marker.setLatLng(latlng)
+      }
+    },
+    setMarkerPopup (latitude, longitude) {
+      this.marker.bindPopup('Latitude: ' + latitude + ', Longitude: ' + longitude)
+    },
+    updateCoords () {
+      if (!isNaN(this.latitude) && !isNaN(this.getLongitude())) {
+        const latlng = L.latLng(this.latitude, this.getLongitude())
+        if (this.insideBC(latlng)) {
+          if (this.marker) {
+            this.updateMarkerLatLong(latlng)
+            this.map.panTo(latlng)
+          } else {
+            this.createMarker()
+          }
+        } else {
+          if (this.marker) {
+            this.map.removeLayer(this.marker)
+            this.marker = null
+          }
+        }
+      }
+    },
+    handleDrag (ev) {
+      if (this.insideBC(this.marker.getLatLng())) {
+        const markerLatLng = this.marker.getLatLng()
+        // In B.C. that longitude is always negative, so people aren't used to seeing the minus sign - so
+        // we're hiding it away from them.
+        const newLatLng = { lng: markerLatLng.lng > 0 ? markerLatLng.lng : markerLatLng.lng * -1, lat: markerLatLng.lat }
+        this.$emit('coordinate', newLatLng)
+      } else {
+        // We don't allow dragging the marker outside of BC, put it back.
+        const latlng = L.latLng(this.latitude, this.getLongitude())
+        this.updateMarkerLatLong(latlng)
+      }
+    },
+    insideBC (latLng) {
+      // could check this against databc by reverse geocoding change checking that the point is in BC
+      // - https://geocoder.api.gov.bc.ca/addresses.json?locationDescriptor=any&parcelPoint=55%2C-124
+      // Using a very simple, rough bounding box
+      return !!latLng && latLng.lat < 60 && latLng.lat > 48.2 && latLng.lng > -139.07 && latLng.lng < -114
+    },
+    getLongitude () {
+      // In B.C. users are used to omitting the minus sign on longitude, it's always negative. So we're
+      // very forgiving, and just always make sure longitude is negative.
+      return this.longitude > 0 ? this.longitude * -1 : this.longitude
+    }
+  }
+}
+</script>
+<style>
+@import "leaflet/dist/leaflet.css";
+
+.map {
+  width: 550px;
+  height: 500px;
+}
+
+</style>
diff --git a/app/frontend/src/submissions/components/SubmissionForm/DecommissionInformation.vue b/app/frontend/src/submissions/components/SubmissionForm/DecommissionInformation.vue
index 607fc0c9a1..acc8d9065e 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/DecommissionInformation.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/DecommissionInformation.vue
@@ -27,7 +27,7 @@
             <b-form-radio
                 v-for="(method, index) in codes.decommission_methods"
                 :key="`decommissionMethodOption${index}`"
-                :value="method.code">{{method.description}}</b-form-radio>
+                :value="method.decommission_method_code">{{method.description}}</b-form-radio>
           </b-form-radio-group>
         </b-form-group>
       </b-col>
diff --git a/app/frontend/src/submissions/components/SubmissionForm/Liner.vue b/app/frontend/src/submissions/components/SubmissionForm/Liner.vue
index fb22098c96..ca53babeb1 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/Liner.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/Liner.vue
@@ -95,14 +95,14 @@
                     :loaded="getFieldsLoaded(index).end"/>
                 </td>
                 <td class="py-0">
-                  <b-btn size="sm" variant="primary" @click="removeRowIfOk(index)" class="mt-2"><i class="fa fa-minus-square-o"></i> Remove</b-btn>
+                  <b-btn size="sm" :id="`removeLinerPerfRowBtn${index}`" variant="primary" @click="removeRowIfOk(index)" class="mt-2"><i class="fa fa-minus-square-o"></i> Remove</b-btn>
                 </td>
               </tr>
             </thead>
             <tbody>
             </tbody>
           </table>
-          <b-btn size="sm" variant="primary" @click="addRow"><i class="fa fa-plus-square-o"></i> Add row</b-btn>
+          <b-btn size="sm" variant="primary" id="addlinerPerforationRowBtn" @click="addRow"><i class="fa fa-plus-square-o"></i> Add row</b-btn>
           <b-modal
             v-model="confirmRemoveModal"
             centered
diff --git a/app/frontend/src/submissions/components/SubmissionForm/Location.vue b/app/frontend/src/submissions/components/SubmissionForm/Location.vue
index bff7e296f3..4c94c8b63e 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/Location.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/Location.vue
@@ -10,21 +10,15 @@
       </b-row>
       <b-row>
         <b-col cols="12" md="6">
-          <b-form-group label="Street address">
-            <v-select
-              v-model="streetAddressInput"
-              id="wellAddressSelect"
-              :filterable="false"
-              taggable
-              :options="wellAddressHints"
-              @search="onWellAddressSearch"
-              :disabled="sameAsOwnerAddress"
-              >
-              <template slot="no-options">
-                &nbsp;
-              </template>
-            </v-select>
-          </b-form-group>
+          <form-input
+            v-model="streetAddressInput"
+            id="wellStreetAddress"
+            type="text"
+            label="Street address"
+            :errors="errors['street_address']"
+            :loaded="fieldsLoaded['street_address']"
+            :disabled="sameAsOwnerAddress"
+          ></form-input>
         </b-col>
       </b-row>
       <b-row>
@@ -183,8 +177,6 @@
     </fieldset>
 </template>
 <script>
-import debounce from 'lodash.debounce'
-import axios from 'axios'
 import { mapGetters } from 'vuex'
 import inputBindingsMixin from '@/common/inputBindingsMixin.js'
 export default {
@@ -234,30 +226,10 @@ export default {
     ...mapGetters(['codes'])
   },
   watch: {
-    streetAddress (val) {
-      // match against strings that contain two groups of letters/numbers (e.g. "123 Main")
-      if (!(/^(\w+ [ \w]+)/.test(val))) {
-        this.wellAddressHints = []
-      }
-    },
     sameAsOwnerAddress (val) {
       this.streetAddressInput = String(this.ownerMailingAddress)
       this.cityInput = String(this.ownerCity)
     }
-  },
-  methods: {
-    onWellAddressSearch (search, loading) {
-      loading(true)
-      this.wellAddressSearch(loading, search, this)
-    },
-    wellAddressSearch: debounce((loading, search, vm) => {
-      if (/^(\w+ [ \w]+)/.test(search)) {
-        axios.get(`https://geocoder.api.gov.bc.ca/addresses.json?addressString=${escape(search)}&autoComplete=true&maxResults=10&brief=true`).then((response) => {
-          vm.wellAddressHints = response.data.features.map(x => x.properties.fullAddress)
-        })
-      }
-      loading(false)
-    }, 500)
   }
 }
 </script>
diff --git a/app/frontend/src/submissions/components/SubmissionForm/MethodOfDrilling.vue b/app/frontend/src/submissions/components/SubmissionForm/MethodOfDrilling.vue
index e0f7d8b792..4eae20718d 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/MethodOfDrilling.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/MethodOfDrilling.vue
@@ -57,8 +57,8 @@
             <b-form-radio-group v-model="wellOrientationInput"
                                 stacked
                                 name="wellOrientationRadio">
-              <b-form-radio value="VERTICAL">Vertical</b-form-radio>
-              <b-form-radio value="HORIZONTAL">Horizontal</b-form-radio>
+              <b-form-radio value="True">Vertical</b-form-radio>
+              <b-form-radio value="False">Horizontal</b-form-radio>
             </b-form-radio-group>
           </b-form-group>
         </b-col>
diff --git a/app/frontend/src/submissions/components/SubmissionForm/WellType.vue b/app/frontend/src/submissions/components/SubmissionForm/WellType.vue
index 44d0fc88b1..8ca49f5e67 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/WellType.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/WellType.vue
@@ -1,20 +1,6 @@
 <template>
     <fieldset>
-      <legend>Type of Work and Well Class</legend>
-      <b-row>
-        <b-col cols="12" md="6">
-          <b-form-group label="Type of Work *">
-            <b-form-radio-group v-model="wellActivityTypeInput"
-                                stacked
-                                name="submissionTypeRadio">
-              <b-form-radio value="CON">Construction</b-form-radio>
-              <b-form-radio value="ALT">Alteration</b-form-radio>
-              <b-form-radio value="DEC">Decommissioning</b-form-radio>
-              <b-form-radio value="STAFF_EDIT" v-if="userRoles.wells.edit">Staff edit</b-form-radio>
-            </b-form-radio-group>
-          </b-form-group>
-        </b-col>
-      </b-row>
+      <legend>Well Class</legend>
       <b-row>
         <b-col cols="12" md="4">
           <b-form-group
@@ -46,7 +32,7 @@
             <b-form-select
                 v-model="wellSubclassInput"
                 :options="subclasses"
-                value-field="well_subclass_code"
+                value-field="well_subclass_guid"
                 text-field="description"
                 :disabled="!subclasses.length"
                 :state="errors['well_subclass'] ? false : null">
@@ -161,7 +147,6 @@ export default {
     wellTagNumber: Object,
     workStartDate: String,
     workEndDate: String,
-    wellActivityType: String,
     personResponsible: Object,
     drillerName: String,
     idPlateNumber: String,
diff --git a/app/frontend/src/submissions/components/SubmissionForm/Yield.vue b/app/frontend/src/submissions/components/SubmissionForm/Yield.vue
index 5e88dc157a..b4f3db678f 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/Yield.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/Yield.vue
@@ -32,7 +32,7 @@
       <b-row>
         <b-col cols="12" md="4" lg="2">
           <form-input
-              id="staticWaterLevel"
+              id="staticWaterLevelTest"
               label="SWL Before Test"
               v-model="productionData[index].static_level"
               hint="ft (btoc)"></form-input>
diff --git a/app/frontend/src/submissions/components/SubmissionPreview/SubmissionPreview.vue b/app/frontend/src/submissions/components/SubmissionPreview/SubmissionPreview.vue
new file mode 100644
index 0000000000..d2b4ce8ac6
--- /dev/null
+++ b/app/frontend/src/submissions/components/SubmissionPreview/SubmissionPreview.vue
@@ -0,0 +1,459 @@
+<template>
+  <div>
+    <fieldset class="my-3 detail-section">
+      <legend>Type of Work and Well Class</legend>
+      <b-row>
+        <b-col>
+          <span class="font-weight-bold">Report Type:</span> {{ codeToDescription('activity_types', activity) }}
+        </b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Class of Well:</span> {{ codeToDescription('well_classes', form.well_class) }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Subclass:</span> {{ wellSubclass }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Intended Water Use:</span> {{ codeToDescription('intended_water_uses', form.intended_water_use) }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Well Tag Number:</span> {{ form.well ? form.well['well_tag_number']: '' }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Well Identification Plate Number:</span> {{ form.identification_plate_number }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Where Plate Attached:</span> {{ form.well_plate_attached }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Work Start Date:</span> {{ form.work_start_date }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Work End Date:</span> {{ form.work_end_date }}</b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section">
+      <legend>Person Responsible for Work</legend>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Person Responsible for Work:</span> {{ form.driller_responsible ? form.driller_responsible['name'] : '' }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Person Who Performed Work:</span> {{ form.driller_name }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Consultant Name:</span> {{ form.consultant_name }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Consultant Company:</span> {{ form.consultant_company }}</b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section">
+      <legend>Well Owner</legend>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Name:</span> {{ form.owner_full_name }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="3"><span class="font-weight-bold">Mailing address:</span> {{ form.owner_mailing_address }}</b-col>
+        <b-col cols="12" lg="3"><span class="font-weight-bold">City:</span> {{ form.owner_city }}</b-col>
+        <b-col cols="12" lg="3"><span class="font-weight-bold">Province:</span> {{ form.owner_province_state }}</b-col>
+        <b-col cols="12" lg="3"><span class="font-weight-bold">Postal Code:</span> {{ form.owner_postal_code }}</b-col>
+
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section">
+      <legend>Location Information</legend>
+      <b-row>
+        <b-col cols="12" lg="6" xl="4">
+          <b-row>
+            <b-col><span class="font-weight-bold">Street Address:</span> {{ form.street_address }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col><span class="font-weight-bold">Town/City:</span> {{ form.city }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col>
+              <div class="my-3"><span class="font-weight-bold">Legal Description:</span></div>
+              <div class="table-responsive">
+                <table class="table table-sm table-striped table-bordered">
+                  <tbody>
+                    <tr>
+                      <th class="w-50">Lot</th>
+                      <td>{{ form.legal_lot }}</td>
+                    </tr>
+                    <tr>
+                      <th class="w-50">Plan</th>
+                      <td>{{ form.legal_plan }}</td>
+                    </tr>
+                    <tr>
+                      <th class="w-50">District Lot</th>
+                      <td>{{ form.legal_district_lot }}</td>
+                    </tr>
+                    <tr>
+                      <th class="w-50">Block</th>
+                      <td>{{ form.legal_block }}</td>
+                    </tr>
+                    <tr>
+                      <th class="w-50">Section</th>
+                      <td>{{ form.legal_section }}</td>
+                    </tr>
+                    <tr>
+                      <th class="w-50">Township</th>
+                      <td>{{ form.legal_township }}</td>
+                    </tr>
+                    <tr>
+                      <th class="w-50">Range</th>
+                      <td>{{ form.legal_range }}</td>
+                    </tr>
+                    <tr>
+                      <th class="w-50">Land District</th>
+                      <td>{{ form.land_district }}</td>
+                    </tr>
+                    <tr>
+                      <th class="w-50">Property Identification Description (PID)</th>
+                      <td>{{ form.legal_pid }}</td>
+                    </tr>
+                  </tbody>
+                </table>
+                <div>
+                  <span class="font-weight-bold">Description of Well Location:</span> {{ form.well_location_description }}
+                </div>
+              </div>
+            </b-col>
+          </b-row>
+        </b-col>
+        <b-col cols="12" lg="6" xl="6" offset-xl="2">
+          <div>
+            <coords-map :latitude="form.latitude" :longitude="form.longitude" :draggable="false"></coords-map>
+          </div>
+          <div class="my-3">&nbsp;</div>
+          <div><span class="font-weight-bold">Geographic Coordinates - North American Datum of 1983 (NAD 83)</span></div>
+          <b-row>
+            <b-col cols="12" lg="4"><span class="font-weight-bold">Latitude:</span> {{form.latitude}}</b-col>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Longitude:</span> {{form.longitude}}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="12" lg="4"><span class="font-weight-bold">UTM Easting:</span> {{Math.round(UTM.easting)}}</b-col>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">UTM Northing:</span> {{Math.round(UTM.northing)}}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="12" lg="4"><span class="font-weight-bold">Zone:</span> {{UTM.zone}}</b-col>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Location Accuracy Code:</span> {{form.location_accuracy_code}}</b-col>
+          </b-row>
+        </b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section">
+      <legend>Method of Drilling</legend>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Ground elevation:</span> {{ form.ground_elevation }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Method of determining elevation:</span> {{ codeToDescription('ground_elevation_methods', form.ground_elevation_method) }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Drilling method:</span> {{ form.drilling_method }}</b-col>
+        <b-col cols="12" lg="3"><span class="font-weight-bold">Other drilling method:</span> {{ form.other_drilling_method }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Orientation of well:</span> {{ form.well_orientation }}</b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.lithology">
+      <legend>Lithology</legend>
+      <div class="table-responsive">
+        <b-table
+          striped
+          small
+          bordered
+          :items="filterBlankRows(form.lithology_set)"
+          show-empty
+          :fields="[
+            'from',
+            'to',
+            'primary',
+            'secondary',
+            'bedrock',
+            'descriptor',
+            'colour',
+            'hardness',
+            'moisture',
+            'water_bearing_flow',
+            'observations'
+          ]"></b-table>
+      </div>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.closureDescription">
+      <legend>Decommission Description</legend>
+      <div class="table-responsive">
+        <b-table
+          striped
+          small
+          bordered
+          :items="filterBlankRows(form.decommission_description_set)"
+          :fields="['start', 'end', 'material', 'observations']"
+          show-empty
+        ></b-table>
+      </div>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section">
+      <legend>Casing Details</legend>
+      <div class="table-responsive">
+        <b-table
+            striped
+            small
+            bordered
+            :items="filterBlankRows(form.casing_set)"
+            :fields="['from', 'to', 'casing_type', 'casing_material', 'diameter', 'wall_thickness', 'drive_shoe']"
+            show-empty>
+
+          <template slot="from" slot-scope="data">{{data.item.start}} ft</template>
+          <template slot="to" slot-scope="data">{{data.item.end}} ft</template>
+          <template slot="casing_type" slot-scope="data">{{codeToDescription('casing_codes', data.item.casing_code)}}</template>
+          <template slot="casing_material" slot-scope="data">{{codeToDescription('casing_materials', data.item.casing_material)}}</template>
+
+        </b-table>
+      </div>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.backfill">
+      <legend>Surface Seal and Backfill Details</legend>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Surface Seal Material:</span> {{ codeToDescription('surface_seal_materials', form.surface_seal_material) }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Backfill Material Above Surface Seal:</span> {{ codeToDescription('surface_seal_materials', form.backfill_above_surface_seal) }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Surface Seal Installation Method:</span> {{ codeToDescription('surface_seal_methods', form.surface_seal_method) }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Backfill Depth:</span> {{ form.backfill_depth }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Surface Seal Thickness:</span> {{ form.surface_seal_thickness }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Surface Seal Depth:</span> {{ form.surface_seal_depth }}</b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.liner">
+      <legend>Liner Details</legend>
+      <b-row>
+        <b-col cols="12" lg="6">
+          <b-row>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Liner Material:</span> {{ codeToDescription('liner_materials', form.liner_material) }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Liner Diameter:</span> {{ form.liner_diameter }}</b-col>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Liner Thickness:</span> {{ form.liner_thickness }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Liner from:</span> {{ form.liner_from }}</b-col>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Liner to:</span> {{ form.liner_to }}</b-col>
+          </b-row>
+        </b-col>
+        <b-col cols="12" lg="6">
+          <div class="font-weight-bold">Liner perforations</div>
+          <b-table
+              striped
+              small
+              bordered
+              :items="filterBlankRows(form.linerperforation_set)"
+              :fields="['from', 'to']"
+              show-empty
+          >
+            <template slot="from" slot-scope="data">{{data.item.start}} ft</template>
+            <template slot="to" slot-scope="data">{{data.item.end}} ft</template>
+          </b-table>
+        </b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.screens">
+      <legend>Screen Details</legend>
+      <b-row>
+        <b-col cols="12" lg="4">
+          <b-row>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Intake Method:</span> {{ codeToDescription('screen_intake_methods', form.screen_intake_method) }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Type:</span> {{ codeToDescription('screen_types', form.screen_type) }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Material:</span> {{ codeToDescription('screen_materials', form.screen_material) }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Opening:</span> {{ codeToDescription('screen_openings', form.screen_opening) }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="12" lg="6"><span class="font-weight-bold">Bottom:</span> {{ codeToDescription('screen_bottoms', form.screen_bottom) }}</b-col>
+          </b-row>
+        </b-col>
+        <b-col cols="12" lg="8">
+          <div class="font-weight-bold">Installed Screens</div>
+          <b-table
+              striped
+              small
+              bordered
+              :items="filterBlankRows(form.screen_set)"
+              :fields="['from', 'to', 'internal_diameter', 'assembly_type', 'slot_size']"
+              show-empty
+              >
+            <template slot="from" slot-scope="data">{{data.item.start}} ft</template>
+            <template slot="to" slot-scope="data">{{data.item.end}} ft</template>
+            <template slot="assembly_type" slot-scope="data">{{codeToDescription('screen_assemblies', data.item.assembly_type)}}</template>
+          </b-table>
+        </b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.filterPack">
+      <legend>Filter Pack</legend>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Filter pack from:</span> {{ form.filter_pack_from }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Filter pack to:</span> {{ form.filter_pack_to }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Filter pack thickness:</span> {{ form.filter_pack_thickness }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Filter pack material:</span> {{ codeToDescription('filter_pack_material', form.filter_pack_material) }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Filter pack material size:</span> {{ form.filter_pack_material_size }}</b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.wellDevelopment">
+      <legend>Well Development</legend>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Developed by:</span> {{ codeToDescription('development_methods', form.development_method) }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Development Total Duration:</span> {{ form.development_hours }} {{ form.development_hours ? 'hours':'' }}</b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.wellYield">
+      <legend>Well Yield</legend>
+
+      <div v-for="(productionTest, index) in form.production_data_set" :key="`ProductionDataSet${index}`">
+        <b-row>
+          <b-col cols="12" lg="4"><span class="font-weight-bold">Estimation Method:</span> {{codeToDescription('yield_estimation_methods', productionTest.yield_estimation_method)}} </b-col>
+          <b-col cols="12" lg="4"><span class="font-weight-bold">Estimation Rate:</span> {{productionTest.yield_estimation_rate}} </b-col>
+          <b-col cols="12" lg="4"><span class="font-weight-bold">Estimation Duration:</span> {{productionTest.yield_estimation_duration}}</b-col>
+        </b-row>
+        <b-row>
+          <b-col cols="12" lg="4"><span class="font-weight-bold">Static Water Level Before Test:</span> {{productionTest.static_level}}</b-col>
+          <b-col cols="12" lg="4"><span class="font-weight-bold">Drawdown:</span> {{productionTest.drawdown}}</b-col>
+        </b-row>
+        <b-row>
+          <b-col cols="12" lg="4"><span class="font-weight-bold">Hydrofracturing Performed:</span> {{productionTest.hydro_fracturing_performed}}</b-col>
+          <b-col cols="12" lg="4"><span class="font-weight-bold">Increase in Yield Due to Hydrofracturing:</span> {{productionTest.hydro_fracturing_yield_increase}}</b-col>
+        </b-row>
+      </div>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.waterQuality">
+      <legend>Water Quality</legend>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Characteristics:</span>
+          <span v-for="(item, index) in form.water_quality_characteristics" :key="`previewWaterCharacteristic${index}`">
+            <!-- Add a comma before each item except index 0 -->
+            {{ index ? ', ': ''}}{{ codeToDescription('water_quality_characteristics', item) }}
+          </span>
+        </b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Water Quality Colour:</span> {{ codeToDescription('water_quality_colours', form.water_quality_colour) }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="6"><span class="font-weight-bold">Water Quality Odour:</span> {{ form.water_quality_odour }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="6"><span class="font-weight-bold">EMS ID:</span> {{ form.ems_id }}</b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.wellCompletion">
+      <legend>Well Completion Data</legend>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Total Depth Drilled:</span> {{ form.total_depth_drilled }} {{ form.total_depth_drilled ? 'feet':''}}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Static Water Level (BTOC):</span> {{ form.static_water_level }} {{ form.static_water_level ? 'feet': ''}}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Well Cap:</span> {{ form.well_cap_type }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Finished Well Depth:</span> {{ form.finished_well_depth }} {{ form.finished_well_depth ? 'feet':''}}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Estimated Well Yield:</span> {{ form.well_yield }} {{ form.well_yield ? 'USGPM': ''}}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Well Disinfected:</span> {{ form.well_disinfected }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Final Casing Stick Up:</span> {{ form.final_casing_stick_up }} {{ form.final_casing_stick_up ? 'inches':''}}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Artesian Flow:</span> {{ form.artesian_flow }} {{ form.artesian_flow ? 'USGPM': ''}}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Depth to Bedrock:</span> {{ form.bedrock_depth }} {{ form.bedrock_depth ? 'feet':''}}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Artesian Pressure:</span> {{ form.artesian_pressure }} {{ form.artesian_pressure ? 'feet': ''}}</b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section" v-if="sections.decommissionInformation">
+      <legend>Well Decommission Information</legend>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Finished Well Depth:</span> {{ form.finished_well_depth }} {{ form.finished_well_depth ? 'feet':''}}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Sealant Material:</span> {{ form.sealant_material }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Reason for Decommission:</span> {{ form.decommission_reason }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Backfill Material:</span> {{ form.backfill_material }}</b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Method of Decommission:</span> {{ form.decommission_method }}</b-col>
+        <b-col cols="12" lg="4"><span class="font-weight-bold">Decommission Details:</span> {{ form.decommission_details }}</b-col>
+      </b-row>
+    </fieldset>
+
+    <fieldset class="my-3 detail-section">
+      <legend>Comments</legend>
+      <p>
+        {{ form.comments ? form.comments : 'No comments submitted' }}
+      </p>
+      <p>
+        <span class="font-weight-bold">Alternative Specs Submitted:</span> {{ form.alternative_specs_submitted }}
+      </p>
+    </fieldset>
+
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import CoordsMap from '@/submissions/components/SubmissionForm/CoordsMap.vue'
+import convertCoordinatesMixin from '@/common/convertCoordinatesMixin.js'
+import filterBlankRows from '@/common/filterBlankRows'
+import codeToDescription from '@/common/codeToDescription.js'
+
+export default {
+  name: 'SubmissionPreview',
+  components: {
+    CoordsMap
+  },
+  mixins: [filterBlankRows, codeToDescription, convertCoordinatesMixin],
+  props: [
+    'form',
+    'activity',
+    'sections'
+  ],
+  computed: {
+    wellSubclass () {
+      let subclassCodes = []
+      let subclass = null
+
+      // generate a list of subclasses
+      if (this.form.well_subclass && this.form.well_class) {
+        this.codes.well_classes.forEach((item) => {
+          if (item.wellsubclasscode_set) {
+            subclassCodes = subclassCodes.concat(item.wellsubclasscode_set)
+          }
+        })
+
+        // find the subclass to get its description
+        subclass = subclassCodes.find((code) => {
+          return code.well_subclass_guid === this.form.well_subclass
+        })['description']
+      }
+
+      return subclass
+    },
+    UTM () {
+    // converts form lat/long and returns an object containing UTM easting, northing, and zone
+      return this.convertToUTM(Number(this.form.longitude), Number(this.form.latitude))
+    },
+    ...mapGetters(['codes'])
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/app/frontend/src/submissions/main.js b/app/frontend/src/submissions/main.js
index 7f8cc2f43f..da5259a22c 100644
--- a/app/frontend/src/submissions/main.js
+++ b/app/frontend/src/submissions/main.js
@@ -37,6 +37,8 @@ Vue.component('form-input', FormInput)
 ApiService.init()
 
 Vue.config.productionTip = false
+Vue.config.devtools = process.env.NODE_ENV !== 'production'
+Vue.config.performance = process.env.NODE_ENV !== 'production'
 
 /* eslint-disable no-new */
 new Vue({
diff --git a/app/frontend/src/submissions/views/SubmissionsHome.vue b/app/frontend/src/submissions/views/SubmissionsHome.vue
index e8143f3fc1..0b5e3cde37 100644
--- a/app/frontend/src/submissions/views/SubmissionsHome.vue
+++ b/app/frontend/src/submissions/views/SubmissionsHome.vue
@@ -1,253 +1,275 @@
 <template>
   <div class="card">
     <div class="card-body">
-      <h4 class="card-title">
+      <h1 class="card-title">
         <b-row>
-          <b-col lg="8">Well Activity Submission</b-col>
-          <b-col lg="4" class="text-right">
-            <b-btn size="sm" :variant="`${formIsFlat ? 'primary':'outline-primary'}`" @click="formIsFlat=true">Flat form</b-btn>
-            <b-btn size="sm" :variant="`${formIsFlat ? 'outline-primary':'primary'}`" @click="formIsFlat=false">Wizard</b-btn>
+          <b-col cols="12">Well Activity Submission<span v-if="preview"> Preview</span>
+            <b-form-group v-if="!preview">
+              <b-form-radio-group button-variant="outline-primary" size="sm" buttons v-model="formIsFlat" label="Form layout" class="float-right">
+                <b-form-radio v-bind:value="true" id="flat">Single page</b-form-radio>
+                <b-form-radio v-bind:value="false">Multi page</b-form-radio>
+              </b-form-radio-group>
+            </b-form-group>
+            <b-btn class="float-right" v-if="preview" @click="handlePreviewBackButton" variant="primary">Back to Edit</b-btn>
           </b-col>
         </b-row>
-      </h4>
-      <p>Submit activity on a well. <a href="/gwells/">Try a search</a> to see if the well exists in the system before submitting a report.</p>
+      </h1>
+      <p v-if="!preview">Submit activity on a well. <a href="/gwells/">Try a search</a> to see if the well exists in the system before submitting a report.</p>
 
       <!-- Activity submission form -->
       <b-form @submit.prevent="confirmSubmit">
+        <div v-if="!preview">
+          <!-- Form load/save -->
+          <b-row>
+            <b-col class="text-right">
+              <b-btn size="sm" variant="outline-primary" @click="saveForm">
+                Save
+                <transition name="bounce" mode="out-in">
+                    <i v-show="saveFormSuccess" class="fa fa-check text-success"></i>
+                </transition>
+              </b-btn>
+              <b-btn size="sm" variant="outline-primary" @click="loadConfirmation" ref="confirmLoadBtn">
+                Load
+                <transition name="bounce">
+                    <i v-show="loadFormSuccess" class="fa fa-check text-success"></i>
+                </transition>
+              </b-btn>
+            </b-col>
+          </b-row>
+
+          <!-- activity type -->
+          <activity-type
+            v-if="currentStep === 'activityType' || (formIsFlat && displayFormSection.activityType)"
+            :wellActivityType.sync="activityType"
+          ></activity-type>
+
+          <!-- Type of well -->
+          <well-type class="my-3"
+            v-if="currentStep === 'wellType' || (formIsFlat && displayFormSection.wellType)"
+            :wellTagNumber.sync="form.well"
+            :wellActivityType.sync="activityType"
+            :wellClass.sync="form.well_class"
+            :wellSubclass.sync="form.well_subclass"
+            :intendedWaterUse.sync="form.intended_water_use"
+            :units.sync="units"
+            :idPlateNumber.sync="form.identification_plate_number"
+            :wellPlateAttached.sync="form.well_plate_attached"
+            :workStartDate.sync="form.work_start_date"
+            :workEndDate.sync="form.work_end_date"
+            :errors="errors"
+            :fieldsLoaded="fieldsLoaded"
+          />
+
+          <!-- Person responsible for work -->
+          <person-responsible class="my-3"
+            v-if="currentStep === 'personResponsible' || (formIsFlat && displayFormSection.personResponsible)"
+            :drillerName.sync="form.driller_name"
+            :consultantName.sync="form.consultant_name"
+            :consultantCompany.sync="form.consultant_company"
+            :personResponsible.sync="form.driller_responsible"
+            :drillerSameAsPersonResponsible.sync="form.meta.drillerSameAsPersonResponsible"
+            :errors="errors"
+            :fieldsLoaded="fieldsLoaded"
+          />
+
+          <!-- Owner information -->
+          <owner class="my-3"
+            v-if="currentStep === 'wellOwner' || (formIsFlat && displayFormSection.wellOwner)"
+            :ownerFullName.sync="form.owner_full_name"
+            :ownerMailingAddress.sync="form.owner_mailing_address"
+            :ownerProvinceState.sync="form.owner_province_state"
+            :ownerCity.sync="form.owner_city"
+            :ownerPostalCode.sync="form.owner_postal_code"
+            :errors="errors"
+            :fieldsLoaded="fieldsLoaded"
+          />
+
+          <!-- Well location -->
+          <location class="my-3"
+            v-if="currentStep === 'wellLocation' || (formIsFlat && displayFormSection.wellLocation)"
+            :ownerMailingAddress.sync="form.owner_mailing_address"
+            :ownerProvinceState.sync="form.owner_province_state"
+            :ownerCity.sync="form.owner_city"
+            :ownerPostalCode.sync="form.owner_postal_code"
+            :streetAddress.sync="form.street_address"
+            :city.sync="form.city"
+            :legalLot.sync="form.legal_lot"
+            :legalPlan.sync="form.legal_plan"
+            :legalDistrictLot.sync="form.legal_district_lot"
+            :legalBlock.sync="form.legal_block"
+            :legalSection.sync="form.legal_section"
+            :legalTownship.sync="form.legal_township"
+            :legalRange.sync="form.legal_range"
+            :landDistrict.sync="form.land_district"
+            :legalPID.sync="form.legal_pid"
+            :wellLocationDescription.sync="form.well_location_description"
+          />
+
+          <!-- Coords -->
+          <coords class="my-3"
+            v-if="currentStep === 'wellCoords' || (formIsFlat && displayFormSection.wellCoords)"
+            :latitude.sync="form.latitude"
+            :longitude.sync="form.longitude"
+          />
+
+          <!-- Method of Drilling -->
+          <method-of-drilling class="my-3"
+            v-if="currentStep === 'method' || (formIsFlat && displayFormSection.method)"
+
+            :groundElevation.sync="form.ground_elevation"
+            :groundElevationMethod.sync="form.ground_elevation_method"
+            :drillingMethod.sync="form.drilling_method"
+            :otherDrillingMethod.sync="form.other_drilling_method"
+            :wellOrientation.sync="form.well_orientation"
+          />
+
+          <!-- Closure/Decommission Description -->
+          <closure-description class="my-3"
+            v-if="currentStep === 'closureDescription' || (formIsFlat && displayFormSection.closureDescription)"
+            :closureDescriptionSet.sync="form.decommission_description_set">
+
+          </closure-description>
+
+          <!-- Lithology -->
+          <lithology class="my-3"
+            v-if="currentStep === 'lithology' || (formIsFlat && displayFormSection.lithology)"
+            :lithology.sync="form.lithologydescription_set"
+          />
+
+          <!-- Casings -->
+          <casings class="my-3"
+            :key="`casingsComponent${componentUpdateTrigger}`"
+            v-if="currentStep === 'casings' || (formIsFlat && displayFormSection.casings)"
+            :casings.sync="form.casing_set"
+            :errors="errors"
+            :fieldsLoaded="fieldsLoaded"
+          />
+
+          <!-- Surface Seal / Backfill Material -->
+          <backfill class="my-3"
+            v-if="currentStep === 'backfill' || (formIsFlat && displayFormSection.backfill)"
+            :surfaceSealMaterial.sync="form.surface_seal_material"
+            :surfaceSealDepth.sync="form.surface_seal_depth"
+            :surfaceSealThickness.sync="form.surface_seal_thickness"
+            :surfaceSealMethod.sync="form.surface_seal_method"
+            :backfillAboveSurfaceSeal.sync="form.backfill_above_surface_seal"
+            :backfillDepth.sync="form.backfill_above_surface_seal_depth"
+          />
+
+          <!-- Liner Information -->
+          <liner class="my-3"
+            v-if="currentStep === 'liner' || (formIsFlat && displayFormSection.liner)"
+            :linerMaterial.sync="form.liner_material"
+            :linerDiameter.sync="form.liner_diameter"
+            :linerThickness.sync="form.liner_thickness"
+            :linerFrom.sync="form.liner_from"
+            :linerTo.sync="form.liner_to"
+            :linerPerforations.sync="form.linerperforation_set"
+            :errors="errors"
+            :fieldsLoaded="fieldsLoaded"
+          />
+
+          <!-- Screens -->
+          <screens class="my-3"
+            v-if="currentStep === 'screens' || (formIsFlat && displayFormSection.screens)"
+            :screenIntakeMethod.sync="form.screen_intake_method"
+            :screenType.sync="form.screen_type"
+            :screenMaterial.sync="form.screen_material"
+            :otherScreenMaterial.sync="form.other_screen_material"
+            :screenOpening.sync="form.screen_opening"
+            :screenBottom.sync="form.screen_bottom"
+            :screens.sync="form.screen_set"
+            :errors="errors"
+            :fieldsLoaded="fieldsLoaded"
+          />
+
+          <!-- Filter Pack -->
+          <filterPack class="my-3"
+            v-if="currentStep === 'filterPack' || (formIsFlat && displayFormSection.filterPack)"
+            :filterPackFrom.sync="form.filter_pack_from"
+            :filterPackTo.sync="form.filter_pack_to"
+            :filterPackThickness.sync="form.filter_pack_thickness"
+            :filterPackMaterial.sync="form.filter_pack_material"
+            :filterPackMaterialSize.sync="form.filter_pack_material_size"
+          />
+
+          <!-- Well Development -->
+          <development class="my-3"
+            v-if="currentStep === 'wellDevelopment' || (formIsFlat && displayFormSection.wellDevelopment)"
+            :developmentMethod.sync="form.development_method"
+            :developmentHours.sync="form.development_hours"
+            :developmentNotes.sync="form.development_notes"
+          />
+
+          <!-- Yield (Production Data) -->
+          <yield class="my-3"
+            v-if="currentStep === 'wellYield' || (formIsFlat && displayFormSection.wellYield)"
+            :productionData.sync="form.production_data_set"
+          />
+
+          <!-- Water Quality -->
+          <water-quality class="my-3"
+            v-if="currentStep === 'waterQuality' || (formIsFlat && displayFormSection.waterQuality)"
+            :waterQualityCharacteristics.sync="form.water_quality_characteristics"
+            :waterQualityColour.sync="form.water_quality_colour"
+            :waterQualityOdour.sync="form.water_quality_odour"
+            :emsID.sync="form.ems_id"
+          />
+
+          <!-- Well Completion Data -->
+          <completion class="my-3"
+            v-if="currentStep === 'wellCompletion' || (formIsFlat && displayFormSection.wellCompletion)"
+            :totalDepthDrilled.sync="form.total_depth_drilled"
+            :finishedWellDepth.sync="form.finished_well_depth"
+            :finalCasingStickUp.sync="form.final_casing_stick_up"
+            :bedrockDepth.sync="form.bedrock_depth"
+            :staticWaterLevel.sync="form.static_water_level"
+            :wellYield.sync="form.well_yield"
+            :artesianFlow.sync="form.artesian_flow"
+            :artesianPressure.sync="form.artesian_pressure"
+            :wellCapType.sync="form.well_cap_type"
+            :wellDisinfected.sync="form.well_disinfected"
+          />
+
+          <decommission-information class="my-3"
+            v-if="currentStep === 'decommissionInformation' || (formIsFlat && displayFormSection.decommissionInformation)"
+            :finishedWellDepth.sync="form.finished_well_depth"
+            :decommissionReason.sync="form.decommission_reason"
+            :decommissionMethod.sync="form.decommission_method"
+            :sealantMaterial.sync="form.sealant_material"
+            :backfillMaterial.sync="form.backfill_material"
+            :decommissionDetails.sync="form.decommission_details"
+          />
+
+          <!-- Comments -->
+          <comments class="my-3"
+            v-if="currentStep === 'comments' || (formIsFlat && displayFormSection.comments)"
+            :comments.sync="form.comments"
+            :alternativeSpecsSubmitted.sync="form.alternative_specs_submitted"
+          />
+        </div>
 
-        <!-- Form load/save -->
-        <b-row>
-          <b-col class="text-right">
-            <b-btn size="sm" variant="outline-primary" @click="saveForm">
-              Save
-              <transition name="bounce" mode="out-in">
-                  <i v-show="saveFormSuccess" class="fa fa-check text-success"></i>
-              </transition>
-            </b-btn>
-            <b-btn size="sm" variant="outline-primary" @click="loadConfirmation" ref="confirmLoadBtn">
-              Load
-              <transition name="bounce">
-                  <i v-show="loadFormSuccess" class="fa fa-check text-success"></i>
-              </transition>
-            </b-btn>
-          </b-col>
-        </b-row>
-
-        <!-- Type of well -->
-        <well-type class="my-3"
-          v-if="currentStep === 'wellType' || (formIsFlat && flatForm.wellType)"
-          :wellTagNumber.sync="form.well"
-          :wellActivityType.sync="activityType"
-          :wellClass.sync="form.well_class"
-          :wellSubclass.sync="form.well_subclass"
-          :intendedWaterUse.sync="form.intended_water_use"
-          :units.sync="units"
-          :idPlateNumber.sync="form.identification_plate_number"
-          :wellPlateAttached.sync="form.well_plate_attached"
-          :workStartDate.sync="form.work_start_date"
-          :workEndDate.sync="form.work_end_date"
-          :errors="errors"
-          :fieldsLoaded="fieldsLoaded"
-        />
-
-        <!-- Person responsible for work -->
-        <person-responsible class="my-3"
-          v-if="formStep === 2 || formIsFlat"
-          :drillerName.sync="form.driller_name"
-          :consultantName.sync="form.consultant_name"
-          :consultantCompany.sync="form.consultant_company"
-          :personResponsible.sync="form.driller_responsible"
-          :drillerSameAsPersonResponsible.sync="form.meta.drillerSameAsPersonResponsible"
-          :errors="errors"
-          :fieldsLoaded="fieldsLoaded"
-        />
-
-        <!-- Owner information -->
-        <owner class="my-3"
-          v-if="currentStep === 'wellOwner' || (formIsFlat && flatForm.wellOwner)"
-          :ownerFullName.sync="form.owner_full_name"
-          :ownerMailingAddress.sync="form.owner_mailing_address"
-          :ownerProvinceState.sync="form.owner_province_state"
-          :ownerCity.sync="form.owner_city"
-          :ownerPostalCode.sync="form.owner_postal_code"
-          :errors="errors"
-          :fieldsLoaded="fieldsLoaded"
-        />
-
-        <!-- Well location -->
-        <location class="my-3"
-          v-if="currentStep === 'wellLocation' || (formIsFlat && flatForm.wellLocation)"
-          :ownerMailingAddress.sync="form.owner_mailing_address"
-          :ownerProvinceState.sync="form.owner_province_state"
-          :ownerCity.sync="form.owner_city"
-          :ownerPostalCode.sync="form.owner_postal_code"
-          :streetAddress.sync="form.street_address"
-          :city.sync="form.city"
-          :legalLot.sync="form.legal_lot"
-          :legalPlan.sync="form.legal_plan"
-          :legalDistrictLot.sync="form.legal_district_lot"
-          :legalBlock.sync="form.legal_block"
-          :legalSection.sync="form.legal_section"
-          :legalTownship.sync="form.legal_township"
-          :legalRange.sync="form.legal_range"
-          :landDistrict.sync="form.land_district"
-          :legalPID.sync="form.legal_pid"
-          :wellLocationDescription.sync="form.well_location_description"
-        />
-
-        <!-- Coords and Method of Drilling -->
-        <coords class="my-3"
-          v-if="currentStep === 'wellCoords' || (formIsFlat && flatForm.wellCoords)"
-          :latitude.sync="form.latitude"
-          :longitude.sync="form.longitude"
-        />
-
-        <!-- Method of Drilling -->
-        <method-of-drilling class="my-3"
-          v-if="currentStep === 'method' || (formIsFlat && flatForm.method)"
-
-          :groundElevation.sync="form.ground_elevation"
-          :groundElevationMethod.sync="form.ground_elevation_method"
-          :drillingMethod.sync="form.drilling_method"
-          :otherDrillingMethod.sync="form.other_drilling_method"
-          :wellOrientation.sync="form.well_orientation"
-        />
-
-        <!-- Closure/Decommission Description -->
-        <closure-description class="my-3"
-          v-if="currentStep === 'closureDescription' || (formIsFlat && flatForm.closureDescription)"
-          :closureDescriptionSet.sync="form.decommission_description_set">
-
-        </closure-description>
-
-        <!-- Lithology -->
-        <lithology class="my-3"
-          v-if="currentStep === 'lithology' || (formIsFlat && flatForm.lithology)"
-          :lithology.sync="form.lithologydescription_set"
-        />
-
-        <!-- Casings -->
-        <casings class="my-3"
-          :key="`casingsComponent${componentUpdateTrigger}`"
-          v-if="currentStep === 'casings' || (formIsFlat && flatForm.casings)"
-          :casings.sync="form.casing_set"
-          :errors="errors"
-          :fieldsLoaded="fieldsLoaded"
-        />
-
-        <!-- Surface Seal / Backfill Material -->
-        <backfill class="my-3"
-          v-if="currentStep === 'backfill' || (formIsFlat && flatForm.backfill)"
-          :surfaceSealMaterial.sync="form.surface_seal_material"
-          :surfaceSealDepth.sync="form.surface_seal_depth"
-          :surfaceSealThickness.sync="form.surface_seal_thickness"
-          :surfaceSealMethod.sync="form.surface_seal_method"
-          :backfillAboveSurfaceSeal.sync="form.backfill_above_surface_seal"
-          :backfillDepth.sync="form.backfill_above_surface_seal_depth"
-        />
-
-        <!-- Liner Information -->
-        <liner class="my-3"
-          v-if="currentStep === 'liner' || (formIsFlat && flatForm.liner)"
-          :linerMaterial.sync="form.liner_material"
-          :linerDiameter.sync="form.liner_diameter"
-          :linerThickness.sync="form.liner_thickness"
-          :linerFrom.sync="form.liner_from"
-          :linerTo.sync="form.liner_to"
-          :linerPerforations.sync="form.linerperforation_set"
-          :errors="errors"
-          :fieldsLoaded="fieldsLoaded"
-        />
-
-        <!-- Screens -->
-        <screens class="my-3"
-          v-if="currentStep === 'screens' || (formIsFlat && flatForm.screens)"
-          :screenIntakeMethod.sync="form.screen_intake_method"
-          :screenType.sync="form.screen_type"
-          :screenMaterial.sync="form.screen_material"
-          :otherScreenMaterial.sync="form.other_screen_material"
-          :screenOpening.sync="form.screen_opening"
-          :screenBottom.sync="form.screen_bottom"
-          :screens.sync="form.screen_set"
-          :errors="errors"
-          :fieldsLoaded="fieldsLoaded"
-        />
-
-        <!-- Filter Pack -->
-        <filterPack class="my-3"
-          v-if="currentStep === 'filterPack' || (formIsFlat && flatForm.filterPack)"
-          :filterPackFrom.sync="form.filter_pack_from"
-          :filterPackTo.sync="form.filter_pack_to"
-          :filterPackThickness.sync="form.filter_pack_thickness"
-          :filterPackMaterial.sync="form.filter_pack_material"
-          :filterPackMaterialSize.sync="form.filter_pack_material_size"
-        />
-
-        <!-- Well Development -->
-        <development class="my-3"
-          v-if="currentStep === 'wellDevelopment' || (formIsFlat && flatForm.wellDevelopment)"
-          :developmentMethod.sync="form.development_method"
-          :developmentHours.sync="form.development_hours"
-          :developmentNotes.sync="form.development_notes"
-        />
-
-        <!-- Yield (Production Data) -->
-        <yield class="my-3"
-          v-if="currentStep === 'wellYield' || (formIsFlat && flatForm.wellYield)"
-          :productionData.sync="form.production_data_set"
-        />
-
-        <!-- Water Quality -->
-        <water-quality class="my-3"
-          v-if="currentStep === 'waterQuality' || (formIsFlat && flatForm.waterQuality)"
-          :waterQualityCharacteristics.sync="form.water_quality_characteristics"
-          :waterQualityColour.sync="form.water_quality_colour"
-          :waterQualityOdour.sync="form.water_quality_odour"
-          :emsID.sync="form.ems_id"
-        />
-
-        <!-- Well Completion Data -->
-        <completion class="my-3"
-          v-if="currentStep === 'wellCompletion' || (formIsFlat && flatForm.wellCompletion)"
-          :totalDepthDrilled.sync="form.total_depth_drilled"
-          :finishedWellDepth.sync="form.finished_well_depth"
-          :finalCasingStickUp.sync="form.final_casing_stick_up"
-          :bedrockDepth.sync="form.bedrock_depth"
-          :staticWaterLevel.sync="form.static_water_level"
-          :wellYield.sync="form.well_yield"
-          :artesianFlow.sync="form.artesian_flow"
-          :artesianPressure.sync="form.artesian_pressure"
-          :wellCapType.sync="form.well_cap_type"
-          :wellDisinfected.sync="form.well_disinfected"
-        />
-
-        <decommission-information class="my-3"
-          v-if="currentStep === 'decommissionInformation' || (formIsFlat && flatForm.decommissionInformation)"
-          :finishedWellDepth.sync="form.finished_well_depth"
-          :decommissionReason.sync="form.decommission_reason"
-          :decommissionMethod.sync="form.decommission_method"
-          :sealantMaterial.sync="form.sealant_material"
-          :backfillMaterial.sync="form.backfill_material"
-          :decommissionDetails.sync="form.decommission_details"
-        />
-
-        <!-- Comments -->
-        <comments class="my-3"
-          v-if="currentStep === 'comments' || (formIsFlat && flatForm.comments)"
-          :comments.sync="form.comments"
-          :alternativeSpecsSubmitted.sync="form.alternative_specs_submitted"
-        />
-
-        <!-- Back / Next / Submit controls -->
-        <b-row class="mt-5">
-          <b-col v-if="!formIsFlat">
-            <b-btn v-if="step > 1" @click="step > 1 ? step-- : null" variant="primary">Back</b-btn>
-          </b-col>
-          <b-col :class="`pr-4 ${formIsFlat ? '':'text-right'}`">
-            <b-btn v-if="step < maxSteps && !formIsFlat" @click="step++" variant="primary">Next</b-btn>
-            <b-btn v-else id="formSubmitButton" type="submit" variant="primary" ref="activitySubmitBtn" :disabled="formSubmitLoading">Submit</b-btn>
-          </b-col>
-        </b-row>
+        <div v-if="preview">
+          <!-- Preview -->
+          <submission-preview
+            :form="form"
+            :activity="activityType"
+            :sections="displayFormSection"/>
+        </div>
+          <!-- Back / Next / Submit controls -->
+          <b-row class="mt-5">
+            <b-col>
+              <b-btn v-if="step > 1 && !preview && !formIsFlat" @click="step > 1 ? step-- : null" variant="primary">Back</b-btn>
+              <b-btn v-if="preview" @click="handlePreviewBackButton" variant="primary">Back to Edit</b-btn>
+            </b-col>
+            <b-col class="pr-4 text-right">
+              <b-btn v-if="step < maxSteps && !formIsFlat && !preview" @click="step++" variant="primary">Next</b-btn>
+              <span v-else>
+                <b-btn v-if="!preview" variant="primary" @click="handlePreviewButton">Preview &amp; Submit</b-btn>
+                <b-btn v-if="preview" id="formSubmitButton" type="submit" variant="primary" ref="activitySubmitBtn" :disabled="formSubmitLoading">Submit</b-btn>
+              </span>
+            </b-col>
+          </b-row>
       </b-form>
 
       <!-- Form submission success message -->
@@ -256,7 +278,11 @@
           dismissible
           @dismissed="formSubmitSuccess=false"
           variant="success"
-          class="mt-3">Report submitted!</b-alert>
+          class="mt-3">Report submitted!
+        <a v-if="formSubmitSuccessWellTag" :href="`/gwells/well/${formSubmitSuccessWellTag}`">
+          View well details for well {{formSubmitSuccessWellTag}}
+        </a>
+      </b-alert>
 
       <!-- Form submission error message -->
       <b-alert
@@ -316,9 +342,11 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import ApiService from '@/common/services/ApiService.js'
 import { FETCH_CODES } from '../store/actions.types.js'
 import inputFormatMixin from '@/common/inputFormatMixin.js'
+import ActivityType from '@/submissions/components/SubmissionForm/ActivityType.vue'
 import WellType from '@/submissions/components/SubmissionForm/WellType.vue'
 import PersonResponsible from '@/submissions/components/SubmissionForm/PersonResponsible.vue'
 import Owner from '@/submissions/components/SubmissionForm/Owner.vue'
@@ -338,10 +366,13 @@ import Completion from '@/submissions/components/SubmissionForm/Completion.vue'
 import Comments from '@/submissions/components/SubmissionForm/Comments.vue'
 import ClosureDescription from '@/submissions/components/SubmissionForm/ClosureDescription.vue'
 import DecommissionInformation from '@/submissions/components/SubmissionForm/DecommissionInformation.vue'
+import SubmissionPreview from '@/submissions/components/SubmissionPreview/SubmissionPreview.vue'
+import filterBlankRows from '@/common/filterBlankRows.js'
 export default {
   name: 'SubmissionsHome',
-  mixins: [inputFormatMixin],
+  mixins: [inputFormatMixin, filterBlankRows],
   components: {
+    ActivityType,
     WellType,
     PersonResponsible,
     Owner,
@@ -360,18 +391,22 @@ export default {
     Completion,
     Comments,
     ClosureDescription,
-    DecommissionInformation
+    DecommissionInformation,
+    SubmissionPreview
   },
   data () {
     return {
       activityType: 'CON',
-      formIsFlat: true,
+      formIsFlat: false,
+      preview: false,
       units: 'imperial',
       confirmSubmitModal: false,
       formSubmitLoading: false,
       formSubmitSuccess: false,
+      formSubmitSuccessWellTag: null,
       formSubmitError: false,
       saveFormSuccess: false,
+      hasHadSaveFormSuccess: false,
       loadFormSuccess: false,
       confirmLoadModal: false,
       // componentUpdateTrigger can be appended to a component's key. Changing this value will cause
@@ -385,12 +420,13 @@ export default {
       formOptions: {},
       formSteps: {
         CON: [
+          'activityType',
           'wellType',
           'wellOwner',
+          'personResponsible',
           'wellLocation',
           'wellCoords',
           'method',
-          'lithology',
           'casings',
           'backfill',
           'liner',
@@ -403,12 +439,13 @@ export default {
           'comments'
         ],
         ALT: [
+          'activityType',
           'wellType',
           'wellOwner',
+          'personResponsible',
           'wellLocation',
           'wellCoords',
           'method',
-          'lithology',
           'casings',
           'backfill',
           'liner',
@@ -421,8 +458,10 @@ export default {
           'comments'
         ],
         DEC: [
+          'activityType',
           'wellType',
           'wellOwner',
+          'personResponsible',
           'wellLocation',
           'wellCoords',
           'method',
@@ -430,6 +469,9 @@ export default {
           'casings',
           'decommissionInformation',
           'comments'
+        ],
+        STAFF_EDIT: [
+          'activityType'
         ]
       }
     }
@@ -447,9 +489,9 @@ export default {
     currentStep () {
       // the string name of the step corresponding to formStep
       // this will determine which step is currently displayed
-      return this.formSteps[this.activityType][this.formStep - 1]
+      return this.preview ? 'preview' : this.formSteps[this.activityType][this.formStep - 1]
     },
-    flatForm () {
+    displayFormSection () {
       // returns an object describing which components should be displayed
       // when in "flat form" mode
 
@@ -461,7 +503,12 @@ export default {
       })
 
       return components
-    }
+    },
+    isLoadFormDisabled () {
+      // During unit tests, the localStorage object might not exist, so we have to check it's existence.
+      return !window.localStorage || (window.localStorage.getItem('savedFormData') === null && !this.hasHadSaveFormSuccess)
+    },
+    ...mapGetters(['codes'])
   },
   methods: {
     formSubmit () {
@@ -470,8 +517,6 @@ export default {
       // delete "meta" data (form input that need not be submitted) stored within form object
       delete data.meta
 
-      data['well_activity_type'] = this.activityType
-
       // replace the "person responsible" object with the person's guid
       if (data.driller_responsible && data.driller_responsible.person_guid) {
         data.driller_responsible = data.driller_responsible.person_guid
@@ -483,12 +528,24 @@ export default {
 
       this.stripBlankStrings(data)
 
+      data.linerperforation_set = this.filterBlankRows(data.linerperforation_set)
+      data.lithologydescription_set = this.filterBlankRows(data.lithologydescription_set)
+      data.production_data_set = this.filterBlankRows(data.production_data_set)
+      data.screen_set = this.filterBlankRows(data.screen_set)
+      data.casing_set = this.filterBlankRows(data.casing_set)
+      data.decommission_description_set = this.filterBlankRows(data.decommission_description_set)
+
       this.formSubmitLoading = true
       this.formSubmitSuccess = false
       this.formSubmitError = false
+      this.formSubmitSuccessWellTag = null
       this.errors = {}
-      ApiService.post('submissions', data).then(() => {
+      // Depending on the type of submission (construction/decommission/alteration/edit) we post to
+      // different endpoints.
+      const PATH = this.codes.activity_types.find((item) => item.code === this.activityType).path
+      ApiService.post(PATH, data).then((response) => {
         this.formSubmitSuccess = true
+        this.formSubmitSuccessWellTag = response.data.well
         this.resetForm()
       }).catch((error) => {
         this.errors = error.response.data
@@ -537,8 +594,8 @@ export default {
         liner_to: null,
         linerperforation_set: [],
         well_location_description: '',
-        latitude: '',
-        longitude: '',
+        latitude: null,
+        longitude: null,
         ground_elevation: null,
         ground_elevation_method: '',
         drilling_method: '',
@@ -603,7 +660,7 @@ export default {
       const data = JSON.stringify(this.form)
       localStorage.setItem('savedFormData', data)
       setTimeout(() => { this.saveFormSuccess = true }, 10)
-      setTimeout(() => { this.saveFormSuccess = false }, 1000)
+      setTimeout(() => { this.saveFormSuccess = false; this.hasHadSaveFormSuccess = true }, 1000)
     },
     loadForm () {
       this.saveStatusReset()
@@ -650,6 +707,18 @@ export default {
           delete formObject[key]
         }
       })
+    },
+    handlePreviewButton () {
+      this.preview = true
+      this.$nextTick(function () {
+        window.scrollTo(0, 0)
+      })
+    },
+    handlePreviewBackButton () {
+      this.preview = false
+      this.$nextTick(function () {
+        window.scrollTo(0, 0)
+      })
     }
   },
   watch: {
diff --git a/app/frontend/test/unit/__mocks__/fileMock.js b/app/frontend/test/unit/__mocks__/fileMock.js
new file mode 100644
index 0000000000..0e56c5b5f7
--- /dev/null
+++ b/app/frontend/test/unit/__mocks__/fileMock.js
@@ -0,0 +1 @@
+module.exports = 'test-file-stub'
diff --git a/app/frontend/test/unit/jest.conf.js b/app/frontend/test/unit/jest.conf.js
index d9b7938ac4..c47d54b344 100644
--- a/app/frontend/test/unit/jest.conf.js
+++ b/app/frontend/test/unit/jest.conf.js
@@ -8,7 +8,8 @@ module.exports = {
     'vue'
   ],
   moduleNameMapper: {
-    '^@/(.*)$': '<rootDir>/src/$1'
+    '^@/(.*)$': '<rootDir>/src/$1',
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/test/unit/__mocks__/fileMock.js'
   },
   transform: {
     '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
diff --git a/app/frontend/test/unit/specs/aquifers/components/Edit.spec.js b/app/frontend/test/unit/specs/aquifers/components/Edit.spec.js
new file mode 100644
index 0000000000..0f9b36ecea
--- /dev/null
+++ b/app/frontend/test/unit/specs/aquifers/components/Edit.spec.js
@@ -0,0 +1,112 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import EditComponent from '@/aquifers/components/Edit.vue'
+import Vuex from 'vuex'
+import axios from 'axios'
+import auth from '@/common/store/auth.js'
+
+jest.mock('axios')
+
+const localVue = createLocalVue()
+localVue.use(Vuex)
+
+const aquiferFixture = {
+  aquifer_id: '4',
+  aquifer_name: 'Aggasiz',
+  location_description: 'Aggasiz/Sea Bird Island',
+  material_description: 'Sand and Gravel',
+  litho_stratographic_unit: 'Fraser River Sediments',
+  subtype_description: 'Unconfined sand and gravel - large river system',
+  vulnerability_description: 'High',
+  area: '63.3',
+  productivity_description: 'High',
+  demand: 'Low',
+  mapping_year: '1993'
+}
+
+describe('Edit Component', () => {
+  const component = (options) => shallowMount(EditComponent, {
+    localVue,
+    data() {
+      return {
+        record: aquiferFixture
+      }
+    },
+    store: new Vuex.Store({
+      modules: { auth }
+    }),
+    methods: {
+      fetchCode() { },
+      fetch() { }
+    },
+    propsData: {
+      id: 10
+    },
+    ...options
+  })
+
+  it('Matches the snapshot', () => {
+    const wrapper = component()
+
+    expect(wrapper.element).toMatchSnapshot()
+  })
+
+  it('queries aquifer on load', () => {
+    const fetch = jest.fn()
+
+    component({ methods: { fetchCode() { }, fetch } })
+
+    expect(fetch).toHaveBeenCalled()
+  })
+
+  it('displays field errors messages', () => {
+    let errorMessage = 'error message'
+
+    const wrapper = component({
+      data() {
+        return {
+          fieldErrors: {
+            mapping_year: [errorMessage],
+            aquifer_name: [errorMessage],
+            litho_stratographic_unit: [errorMessage],
+            location_description: [errorMessage],
+            vulnerability: [errorMessage],
+            material: [errorMessage],
+            subtype: [errorMessage],
+            quality_concern: [errorMessage],
+            productivity: [errorMessage],
+            area: [errorMessage],
+            demand: [errorMessage],
+            known_water_use: [errorMessage],
+            notes: [errorMessage],
+          }
+        }
+      }
+    })
+
+    expect(wrapper.find('#mapping_year + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#aquifer_name + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#litho_stratographic_unit + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#location_description + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#vulnerability + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#material + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#subtype + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#quality_concern + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#productivity + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#area + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#demand + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#known_water_use + [role="alert"]').text()).toBe(errorMessage)
+    expect(wrapper.find('#notes + [role="alert"]').text()).toBe(errorMessage)
+  })
+
+  describe('save', () => {
+    it('sends a patch with the contents of record on save', () => {
+      const wrapper = component()
+
+      axios.patch.mockResolvedValue(true)
+
+      wrapper.vm.save()
+
+      expect(axios.patch).toHaveBeenCalledWith('aquifers/10/', aquiferFixture)
+    })
+  })
+})
diff --git a/app/frontend/test/unit/specs/aquifers/components/Search.spec.js b/app/frontend/test/unit/specs/aquifers/components/Search.spec.js
index 2139d05775..7432577f2d 100644
--- a/app/frontend/test/unit/specs/aquifers/components/Search.spec.js
+++ b/app/frontend/test/unit/specs/aquifers/components/Search.spec.js
@@ -1,10 +1,14 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils'
 import SearchComponent from '@/aquifers/components/Search.vue'
-import { SEARCH_AQUIFERS, RESET_RESULTS } from '@/aquifers/store/actions.types'
 import Vuex from 'vuex'
+import axios from 'axios'
+import VueRouter from 'vue-router'
+
+jest.mock('axios')
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
+localVue.use(VueRouter)
 
 const aquiferFixture = {
   aquifer_id: '4',
@@ -21,20 +25,25 @@ const aquiferFixture = {
 }
 
 describe('Search Component', () => {
-  const component = ({ getters, actions }) => shallowMount(SearchComponent, {
-    store: new Vuex.Store({
-      getters: Object.assign({
-        aquiferList: () => [],
-        emptyResults: () => false
-      }, getters),
-      actions
-    }),
-    localVue
+  const component = (options) => shallowMount(SearchComponent, {
+    localVue,
+    stubs: ['router-link', 'router-view'],
+    router: new VueRouter(),
+    methods: {
+      scrollToTableTop() {}
+    },
+    ...options
   })
 
   it('Displays a message if no aquifers could be found', () => {
     const wrapper = component({
-      getters: { emptyResults: () => true }
+      computed: {
+        aquiferList() { return [] },
+        emptyResults() { return true }
+      },
+      methods: {
+        fetchResults() {}
+      }
     })
 
     expect(wrapper.text()).toContain('No aquifers could be found')
@@ -42,39 +51,38 @@ describe('Search Component', () => {
 
   it('Matches the snapshot', () => {
     const wrapper = component({
-      getters: { aquiferList: () => [aquiferFixture] }
+      computed: {
+        aquiferList() { return [aquiferFixture] }
+      },
+      methods: {
+        fetchResults() {}
+      }
     })
 
     expect(wrapper.element).toMatchSnapshot()
   })
 
-  it('triggers SEARCH_AQUIFERS when form is submitted', () => {
-    const spy = jest.fn()
-    const wrapper = component({
-      actions: { [SEARCH_AQUIFERS]: spy }
-    })
+  it('search updates route query params', () => {
+    axios.get.mockResolvedValue({})
 
+    const wrapper = component()
+    wrapper.find('#search').setValue('asdf')
     wrapper.find('form').trigger('submit')
-    expect(spy).toHaveBeenCalled()
+
+    expect(axios.get).toHaveBeenCalledWith('aquifers/', {"params": { "search": "asdf" }})
   })
 
-  it('triggers RESET_RESULTS when form is reset', () => {
-    const spy = jest.fn()
-    const wrapper = component({
-      actions: { [RESET_RESULTS]: spy }
-    })
+  it('form reset resets response and query', () => {
+    const wrapper = component()
+    axios.get.mockResolvedValue({})
 
-    wrapper.find('form').trigger('reset')
-    expect(spy).toHaveBeenCalled()
-  })
+    wrapper.find('#search').setValue('asdf')
+    wrapper.find('form').trigger('submit')
 
-  it('resets input values when form is reset', () => {
-    const spy = jest.fn()
-    const wrapper = component({
-      actions: { [RESET_RESULTS]: spy }
-    })
+    expect(wrapper.vm.query.search).toEqual('asdf')
 
     wrapper.find('form').trigger('reset')
-    expect(spy).toHaveBeenCalled()
+
+    expect(wrapper.vm.query.search).toEqual(undefined)
   })
 })
diff --git a/app/frontend/test/unit/specs/aquifers/components/View.spec.js b/app/frontend/test/unit/specs/aquifers/components/View.spec.js
new file mode 100644
index 0000000000..742c739049
--- /dev/null
+++ b/app/frontend/test/unit/specs/aquifers/components/View.spec.js
@@ -0,0 +1,80 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import ViewComponent from '@/aquifers/components/View.vue'
+import Vuex from 'vuex'
+import axios from 'axios'
+import auth from '@/common/store/auth.js'
+
+jest.mock('axios')
+
+const localVue = createLocalVue()
+localVue.use(Vuex)
+
+const aquiferFixture = {
+  aquifer_id: '4',
+  aquifer_name: 'Aggasiz',
+  location_description: 'Aggasiz/Sea Bird Island',
+  material_description: 'Sand and Gravel',
+  litho_stratographic_unit: 'Fraser River Sediments',
+  subtype_description: 'Unconfined sand and gravel - large river system',
+  vulnerability_description: 'High',
+  area: '63.3',
+  productivity_description: 'High',
+  demand: 'Low',
+  mapping_year: '1993'
+}
+
+describe('View Component', () => {
+  const component = (options) => shallowMount(ViewComponent, {
+    localVue,
+    store: new Vuex.Store({
+      modules: { auth }
+    }),
+    ...options
+  })
+
+  it('Matches the snapshot', () => {
+    const wrapper = component({
+      data() {
+        return {
+          record: aquiferFixture
+        }
+      },
+      methods: {
+        fetch() { }
+      }
+    })
+
+    expect(wrapper.element).toMatchSnapshot()
+  })
+
+  it('queries aquifer on load', () => {
+    const fetch = jest.fn()
+
+    component({
+      methods: { fetch }
+    })
+
+    expect(fetch).toHaveBeenCalled()
+  })
+
+  describe('fetch', () => {
+    it('retrieves and assigns the aquifer to record', (done) => {
+      const data = { a: 1 }
+
+      axios.get.mockResolvedValue({ data })
+
+      const wrapper = component({
+        created() { },
+        watch: {}
+      })
+
+      wrapper.vm.fetch(10)
+
+      wrapper.vm.$nextTick(() => {
+        expect(axios.get).toHaveBeenCalledWith('aquifers/10', { "params": undefined })
+        expect(wrapper.vm.record).toEqual(data)
+        done()
+      })
+    })
+  })
+})
diff --git a/app/frontend/test/unit/specs/aquifers/components/__snapshots__/Edit.spec.js.snap b/app/frontend/test/unit/specs/aquifers/components/__snapshots__/Edit.spec.js.snap
new file mode 100644
index 0000000000..a671c012f6
--- /dev/null
+++ b/app/frontend/test/unit/specs/aquifers/components/__snapshots__/Edit.spec.js.snap
@@ -0,0 +1,727 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Edit Component Matches the snapshot 1`] = `
+<div>
+  <div
+    class="card p-3 mb-4"
+  >
+    <!---->
+     
+    <!---->
+     
+    <div
+      class="container"
+    >
+      <div
+        class="row border-bottom mb-3 pb-2"
+      >
+        <div
+          class="col"
+        >
+          <h5>
+            Aquifer 4 Summary - Edit
+          </h5>
+        </div>
+      </div>
+       
+      <!---->
+       
+      <div
+        class="row"
+      >
+        <div
+          class="col-md-6"
+        >
+          <div
+            class="row"
+          >
+            <div
+              class="col-form-label col-md-4"
+            >
+              
+              Aquifer number
+            
+            </div>
+             
+            <div
+              class="col-form-label col-md-8"
+            >
+              
+              4
+            
+            </div>
+          </div>
+        </div>
+         
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__5__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__5"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="mapping_year"
+                id="__BVID__5__BV_label_"
+              >
+                Year of mapping
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <input
+                  aria-required="true"
+                  class="form-control"
+                  id="mapping_year"
+                  required="required"
+                  type="text"
+                  value="1993"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+       
+      <div
+        class="row"
+      >
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__7__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__7"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="aquifer_name"
+                id="__BVID__7__BV_label_"
+              >
+                Aquifer name
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <input
+                  aria-required="true"
+                  class="form-control"
+                  id="aquifer_name"
+                  required="required"
+                  type="text"
+                  value="Aggasiz"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+         
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__9__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__9"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="litho_stratographic_unit"
+                id="__BVID__9__BV_label_"
+              >
+                Litho stratigraphic unit
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <input
+                  aria-required="true"
+                  class="form-control"
+                  id="litho_stratographic_unit"
+                  required="required"
+                  type="text"
+                  value="Fraser River Sediments"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+       
+      <div
+        class="row"
+      >
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__11__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__11"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="location_description"
+                id="__BVID__11__BV_label_"
+              >
+                Descriptive location
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <input
+                  aria-required="true"
+                  class="form-control"
+                  id="location_description"
+                  required="required"
+                  type="text"
+                  value="Aggasiz/Sea Bird Island"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+         
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__13__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__13"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="vulnerability"
+                id="__BVID__13__BV_label_"
+              >
+                Vulnerability
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <select
+                  aria-required="true"
+                  class="form-control custom-select"
+                  id="vulnerability"
+                  required="required"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+       
+      <div
+        class="row"
+      >
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__15__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__15"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="material"
+                id="__BVID__15__BV_label_"
+              >
+                Material type
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <select
+                  aria-required="true"
+                  class="form-control custom-select"
+                  id="material"
+                  required="required"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+         
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__17__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__17"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="subtype"
+                id="__BVID__17__BV_label_"
+              >
+                Subtype
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <select
+                  aria-required="true"
+                  class="form-control custom-select"
+                  id="subtype"
+                  required="required"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+       
+      <div
+        class="row"
+      >
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__19__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__19"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="quality_concern"
+                id="__BVID__19__BV_label_"
+              >
+                Quality concerns
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <select
+                  aria-required="true"
+                  class="form-control custom-select"
+                  id="quality_concern"
+                  required="required"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+         
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__21__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__21"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="productivity"
+                id="__BVID__21__BV_label_"
+              >
+                Productivity
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <select
+                  aria-required="true"
+                  class="form-control custom-select"
+                  id="productivity"
+                  required="required"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+       
+      <div
+        class="row"
+      >
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__23__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__23"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="area"
+                id="__BVID__23__BV_label_"
+              >
+                Size (km²)
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <input
+                  aria-required="true"
+                  class="form-control"
+                  id="area"
+                  required="required"
+                  type="text"
+                  value="63.3"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+         
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__25__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__25"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="demand"
+                id="__BVID__25__BV_label_"
+              >
+                Demand
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <select
+                  aria-required="true"
+                  class="form-control custom-select"
+                  id="demand"
+                  required="required"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+       
+      <div
+        class="row"
+      >
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__27__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__27"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="known_water_use"
+                id="__BVID__27__BV_label_"
+              >
+                Type of known water use
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <select
+                  aria-required="true"
+                  class="form-control custom-select"
+                  id="known_water_use"
+                  required="required"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+       
+      <div
+        class="row"
+      >
+        <div
+          class="col-md-6"
+        >
+          <div
+            aria-labelledby="__BVID__29__BV_label_"
+            class="b-form-group form-group"
+            id="__BVID__29"
+            role="group"
+          >
+            <div
+              class="form-row"
+            >
+              <label
+                class="col-sm-4 col-form-label"
+                for="notes"
+                id="__BVID__29__BV_label_"
+              >
+                Comments
+              </label>
+              <div
+                class="col-sm-8"
+              >
+                <textarea
+                  class="form-control"
+                  id="notes"
+                  rows="4"
+                  wrap="soft"
+                />
+                <!---->
+                <!---->
+                <!---->
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+       
+      <div
+        class="row mt-4"
+      >
+        <div
+          class="col-auto"
+        >
+          <button
+            class="btn btn-secondary"
+            type="button"
+          >
+            
+            Save
+          
+          </button>
+           
+          <button
+            class="btn btn-secondary"
+            type="button"
+          >
+            
+            Cancel
+          
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+   
+  <div>
+    <div
+      id="confirmSave___BV_modal_outer_"
+    >
+      <div
+        aria-hidden="true"
+        class="modal fade"
+        id="confirmSave"
+        role="dialog"
+        style="display: none;"
+      >
+        <div
+          class="modal-dialog modal-md"
+        >
+          <div
+            aria-describedby="confirmSave___BV_modal_body_"
+            aria-labelledby="confirmSave___BV_modal_header_"
+            class="modal-content"
+            role="document"
+            tabindex="-1"
+          >
+            <header
+              class="modal-header"
+              id="confirmSave___BV_modal_header_"
+            >
+              <h5
+                class="modal-title"
+              />
+              <button
+                aria-label="Close"
+                class="close"
+                type="button"
+              >
+                ×
+              </button>
+            </header>
+            <div
+              class="modal-body"
+              id="confirmSave___BV_modal_body_"
+            >
+              <p>
+                Are you sure you would like to save this record?
+              </p>
+            </div>
+            <footer
+              class="modal-footer"
+              id="confirmSave___BV_modal_footer_"
+            >
+              <button
+                class="btn btn-secondary"
+                type="button"
+              >
+                Cancel
+              </button>
+              <button
+                class="btn btn-primary"
+                type="button"
+              >
+                OK
+              </button>
+            </footer>
+          </div>
+        </div>
+      </div>
+      <!---->
+    </div>
+  </div>
+   
+  <div>
+    <div
+      id="confirmCancel___BV_modal_outer_"
+    >
+      <div
+        aria-hidden="true"
+        class="modal fade"
+        id="confirmCancel"
+        role="dialog"
+        style="display: none;"
+      >
+        <div
+          class="modal-dialog modal-md"
+        >
+          <div
+            aria-describedby="confirmCancel___BV_modal_body_"
+            aria-labelledby="confirmCancel___BV_modal_header_"
+            class="modal-content"
+            role="document"
+            tabindex="-1"
+          >
+            <header
+              class="modal-header"
+              id="confirmCancel___BV_modal_header_"
+            >
+              <h5
+                class="modal-title"
+              />
+              <button
+                aria-label="Close"
+                class="close"
+                type="button"
+              >
+                ×
+              </button>
+            </header>
+            <div
+              class="modal-body"
+              id="confirmCancel___BV_modal_body_"
+            >
+              <p>
+                Are you sure you want to quit editing this record?
+              </p>
+            </div>
+            <footer
+              class="modal-footer"
+              id="confirmCancel___BV_modal_footer_"
+            >
+              <button
+                class="btn btn-secondary"
+                type="button"
+              >
+                Cancel
+              </button>
+              <button
+                class="btn btn-primary"
+                type="button"
+              >
+                OK
+              </button>
+            </footer>
+          </div>
+        </div>
+      </div>
+      <!---->
+    </div>
+  </div>
+</div>
+`;
diff --git a/app/frontend/test/unit/specs/aquifers/components/__snapshots__/Search.spec.js.snap b/app/frontend/test/unit/specs/aquifers/components/__snapshots__/Search.spec.js.snap
index 22033d413f..7b088bd3be 100644
--- a/app/frontend/test/unit/specs/aquifers/components/__snapshots__/Search.spec.js.snap
+++ b/app/frontend/test/unit/specs/aquifers/components/__snapshots__/Search.spec.js.snap
@@ -18,25 +18,25 @@ exports[`Search Component Matches the snapshot 1`] = `
         class="col-md-4 col-12"
       >
         <fieldset
-          aria-labelledby="__BVID__14__BV_label_"
+          aria-labelledby="__BVID__10__BV_label_"
           class="b-form-group form-group"
-          id="__BVID__14"
+          id="__BVID__10"
           role="group"
         >
           <legend
             class="col-form-label pt-0"
-            id="__BVID__14__BV_label_"
+            id="__BVID__10__BV_label_"
           >
             Aquifer name
           </legend>
           <div
-            aria-labelledby="__BVID__14__BV_label_"
+            aria-labelledby="__BVID__10__BV_label_"
             class=""
             role="group"
           >
             <input
               class="form-control"
-              id="__BVID__15"
+              id="search"
               type="text"
             />
             <!---->
@@ -46,25 +46,25 @@ exports[`Search Component Matches the snapshot 1`] = `
         </fieldset>
          
         <fieldset
-          aria-labelledby="__BVID__16__BV_label_"
+          aria-labelledby="__BVID__12__BV_label_"
           class="b-form-group form-group"
-          id="__BVID__16"
+          id="__BVID__12"
           role="group"
         >
           <legend
             class="col-form-label pt-0"
-            id="__BVID__16__BV_label_"
+            id="__BVID__12__BV_label_"
           >
             Aquifer number
           </legend>
           <div
-            aria-labelledby="__BVID__16__BV_label_"
+            aria-labelledby="__BVID__12__BV_label_"
             class=""
             role="group"
           >
             <input
               class="form-control"
-              id="__BVID__17"
+              id="aquifer_id"
               type="text"
             />
             <!---->
@@ -83,7 +83,7 @@ exports[`Search Component Matches the snapshot 1`] = `
       >
         <fieldset
           class="b-form-group form-group"
-          id="__BVID__18"
+          id="__BVID__14"
           role="group"
         >
           <!---->
@@ -115,10 +115,10 @@ exports[`Search Component Matches the snapshot 1`] = `
    
   <table
     aria-busy="false"
-    aria-colcount="12"
+    aria-colcount="11"
     aria-rowcount="1"
-    class="table b-table"
-    id="__BVID__19"
+    class="table b-table table-striped"
+    id="__BVID__15"
   >
     <!---->
     <!---->
@@ -128,76 +128,93 @@ exports[`Search Component Matches the snapshot 1`] = `
       <tr>
         <th
           aria-colindex="1"
-          class=""
+          aria-label="Click to sort Descending"
+          aria-sort="ascending"
+          class="sorting sorting_asc"
+          tabindex="0"
         >
           Aquifer number
         </th>
         <th
           aria-colindex="2"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Aquifer name
         </th>
         <th
           aria-colindex="3"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Descriptive location
         </th>
         <th
           aria-colindex="4"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Material
         </th>
         <th
           aria-colindex="5"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Litho stratigraphic unit
         </th>
         <th
           aria-colindex="6"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Subtype
         </th>
         <th
           aria-colindex="7"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Vulnerability
         </th>
         <th
           aria-colindex="8"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Size-km²
         </th>
         <th
           aria-colindex="9"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Productivity
         </th>
         <th
           aria-colindex="10"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Demand
         </th>
         <th
           aria-colindex="11"
-          class=""
+          aria-label="Click to sort Descending"
+          class="sorting"
+          tabindex="0"
         >
           Year of mapping
         </th>
-        <th
-          aria-colindex="12"
-          class=""
-        >
-          Publication status
-        </th>
       </tr>
     </thead>
     <!---->
@@ -212,7 +229,9 @@ exports[`Search Component Matches the snapshot 1`] = `
           aria-colindex="1"
           class=""
         >
-          4
+          <router-link-stub
+            to="4/"
+          />
         </td>
         <td
           aria-colindex="2"
@@ -230,7 +249,9 @@ exports[`Search Component Matches the snapshot 1`] = `
           aria-colindex="4"
           class=""
         >
-          Sand and Gravel
+          
+      Sand and Gravel
+    
         </td>
         <td
           aria-colindex="5"
@@ -242,13 +263,17 @@ exports[`Search Component Matches the snapshot 1`] = `
           aria-colindex="6"
           class=""
         >
-          Unconfined sand and gravel - large river system
+          
+      Unconfined sand and gravel - large river system
+    
         </td>
         <td
           aria-colindex="7"
           class=""
         >
-          High
+          
+      High
+    
         </td>
         <td
           aria-colindex="8"
@@ -260,26 +285,30 @@ exports[`Search Component Matches the snapshot 1`] = `
           aria-colindex="9"
           class=""
         >
-          High
+          
+      High
+    
         </td>
         <td
           aria-colindex="10"
           class=""
-        />
+        >
+          
+      
+    
+        </td>
         <td
           aria-colindex="11"
           class=""
         >
           1993
         </td>
-        <td
-          aria-colindex="12"
-          class=""
-        />
       </tr>
       <!---->
       <!---->
     </tbody>
   </table>
+   
+  <!---->
 </div>
 `;
diff --git a/app/frontend/test/unit/specs/aquifers/components/__snapshots__/View.spec.js.snap b/app/frontend/test/unit/specs/aquifers/components/__snapshots__/View.spec.js.snap
new file mode 100644
index 0000000000..8e23685fdd
--- /dev/null
+++ b/app/frontend/test/unit/specs/aquifers/components/__snapshots__/View.spec.js.snap
@@ -0,0 +1,185 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`View Component Matches the snapshot 1`] = `
+<div
+  class="card p-3 mb-4"
+>
+  <div
+    class="container"
+  >
+    <div
+      class="row border-bottom mb-3 pb-2"
+    >
+      <div
+        class="col"
+      >
+        <h5
+          class="pt-2"
+        >
+          Aquifer Summary
+        </h5>
+      </div>
+       
+      <div
+        class="col-auto"
+      >
+        <!---->
+         
+        <a
+          class="ml-2 print fa fa-print fa-lg d-print-none"
+          href="#"
+          title="Print"
+        />
+      </div>
+    </div>
+     
+    <dl
+      class="row"
+    >
+      <dt
+        class="col-sm-2"
+      >
+        Aquifer number
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        4
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Year of mapping
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        1993
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Aquifer name
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        Aggasiz
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Litho stratigraphic unit
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        Fraser River Sediments
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Descriptive location
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        Aggasiz/Sea Bird Island
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Vulnerability
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        High
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Material type
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        Sand and Gravel
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Subtype
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        Unconfined sand and gravel - large river system
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Quality concerns
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Productivity
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        High
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Size (km²)
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        63.3
+      </dd>
+       
+      <dt
+        class="col-sm-2"
+      >
+        Demand
+      </dt>
+       
+      <dd
+        class="col-sm-4"
+      >
+        
+      </dd>
+    </dl>
+  </div>
+</div>
+`;
diff --git a/app/frontend/test/unit/specs/components/Header.spec.js b/app/frontend/test/unit/specs/components/Header.spec.js
new file mode 100644
index 0000000000..14009d04a5
--- /dev/null
+++ b/app/frontend/test/unit/specs/components/Header.spec.js
@@ -0,0 +1,37 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import Vuex from 'vuex'
+import Header from '@/common/components/Header.vue'
+
+const localVue = createLocalVue()
+localVue.use(Vuex)
+
+describe('Header.vue', () => {
+  let getters
+  let store
+
+  it('the show computed property allows disabling links', () => {
+    getters = {
+      config: () => ({ enable_aquifers_search: false })
+    }
+    store = new Vuex.Store({ getters })
+
+    const wrapper = shallowMount(Header, {
+      store,
+      localVue
+    })
+    expect(wrapper.vm.show.aquifers).toBe(false)
+  })
+  it('the show computed property allows enabling links', () => {
+    getters = {
+      config: () => ({ enable_aquifers_search: true })
+    }
+    store = new Vuex.Store({ getters })
+
+    const wrapper = shallowMount(Header, {
+      store,
+      localVue
+    })
+
+    expect(wrapper.vm.show.aquifers).toBe(true)
+  })
+})
diff --git a/app/frontend/test/unit/specs/people/OrganizationAdd.spec.js b/app/frontend/test/unit/specs/people/OrganizationAdd.spec.js
index 24024196f6..d3ca349a1f 100644
--- a/app/frontend/test/unit/specs/people/OrganizationAdd.spec.js
+++ b/app/frontend/test/unit/specs/people/OrganizationAdd.spec.js
@@ -40,7 +40,7 @@ describe('OrganizationAdd.vue', () => {
     })
     wrapper.vm.orgForm.name = 'Big Drilling Co'
     expect(wrapper.vm.orgForm.name).toEqual('Big Drilling Co')
-    wrapper.find('#orgFormResetButton').trigger('reset')
+    wrapper.find('#orgAddFormResetButton').trigger('reset')
     expect(wrapper.vm.orgForm.name).toEqual('')
   })
 })
diff --git a/app/frontend/test/unit/specs/submissions/Casings.spec.js b/app/frontend/test/unit/specs/submissions/Casings.spec.js
new file mode 100644
index 0000000000..5fae400129
--- /dev/null
+++ b/app/frontend/test/unit/specs/submissions/Casings.spec.js
@@ -0,0 +1,80 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import Vuex from 'vuex'
+import Casings from '@/submissions/components/SubmissionForm/Casings.vue'
+
+const localVue = createLocalVue()
+localVue.use(Vuex)
+
+describe('Casings.vue', () => {
+  let store
+  let getters
+
+  beforeEach(() => {
+    getters = {
+      codes: () => ({})
+    }
+    store = new Vuex.Store({
+      getters
+    })
+  })
+
+  it('starts with 3 blank casing rows', () => {
+    const wrapper = shallowMount(Casings, {
+      localVue,
+      store,
+      propsData: {
+        casings: []
+      }
+    })
+
+    expect(wrapper.vm.casingsInput.length).toBe(3)
+  })
+  it('adds a new Casings row when clicking Add Row', () => {
+    const wrapper = shallowMount(Casings, {
+      localVue,
+      store,
+      propsData: {
+        casings: []
+      }
+    })
+
+    wrapper.find('#addCasingRowBtn').trigger('click')
+    expect(wrapper.vm.casingsInput.length).toBe(4)
+  })
+  it('when clicking the remove button on a row, removes that row', () => {
+    const wrapper = shallowMount(Casings, {
+      localVue,
+      store,
+      sync: false,
+      propsData: {
+        casings: []
+      }
+    })
+
+    wrapper.find('#removeCasingRowBtn0').trigger('click')
+    expect(wrapper.vm.casingsInput.length).toBe(2)
+  })
+  it('Passes errors into the input components', () => {
+    const wrapper = shallowMount(Casings, {
+      localVue,
+      store,
+      sync: true,
+      propsData: {
+        casings: []
+      }
+    })
+    wrapper.setProps({
+      errors: {
+        casing_set: [
+          {
+            start: [
+              'Test error for start field'
+            ]
+          }
+        ]
+      }
+    })
+    const errMsg = wrapper.find('#casing_from_0InvalidFeedback')
+    expect(errMsg.text()).toContain('Test error for start field')
+  })
+})
diff --git a/app/frontend/test/unit/specs/submissions/Coords.spec.js b/app/frontend/test/unit/specs/submissions/Coords.spec.js
index e4fd4de41c..a90b401243 100644
--- a/app/frontend/test/unit/specs/submissions/Coords.spec.js
+++ b/app/frontend/test/unit/specs/submissions/Coords.spec.js
@@ -113,14 +113,14 @@ describe('Coords.vue', () => {
         test: [-144.5099, 48.50112],
         expected: {
           lat: {
-            deg: '48',
-            min: '30',
-            sec: '4.03'
+            deg: 48,
+            min: 30,
+            sec: 4.03
           },
           long: {
-            deg: '-144',
-            min: '30',
-            sec: '35.64'
+            deg: -144,
+            min: 30,
+            sec: 35.64
           }
         }
       }
@@ -165,8 +165,8 @@ describe('Coords.vue', () => {
             sec: 43.01
           }},
         expected: {
-          latitude: '49.415550',
-          longitude: '142.978614'
+          latitude: 49.41555,
+          longitude: 142.97861
         }
       },
       {
@@ -182,8 +182,8 @@ describe('Coords.vue', () => {
             sec: 43.01
           }},
         expected: {
-          latitude: '-49.415550',
-          longitude: '-142.978614'
+          latitude: -49.41555,
+          longitude: -142.97861
         }
       }
     ]
diff --git a/app/frontend/test/unit/specs/submissions/Liner.spec.js b/app/frontend/test/unit/specs/submissions/Liner.spec.js
new file mode 100644
index 0000000000..2acae84dc7
--- /dev/null
+++ b/app/frontend/test/unit/specs/submissions/Liner.spec.js
@@ -0,0 +1,56 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import Vuex from 'vuex'
+import Liner from '@/submissions/components/SubmissionForm/Liner.vue'
+
+const localVue = createLocalVue()
+localVue.use(Vuex)
+
+describe('Liner.vue', () => {
+  let store
+  let getters
+
+  beforeEach(() => {
+    getters = {
+      codes: () => ({})
+    }
+    store = new Vuex.Store({
+      getters
+    })
+  })
+
+  it('starts with 3 blank liner perforation rows', () => {
+    const wrapper = shallowMount(Liner, {
+      localVue,
+      store,
+      propsData: {
+        linerPerforations: []
+      }
+    })
+
+    expect(wrapper.vm.linerPerforationsInput.length).toBe(3)
+  })
+  it('adds a new Liner row when clicking Add Row', () => {
+    const wrapper = shallowMount(Liner, {
+      localVue,
+      store,
+      propsData: {
+        linerPerforations: []
+      }
+    })
+
+    wrapper.find('#addlinerPerforationRowBtn').trigger('click')
+    expect(wrapper.vm.linerPerforationsInput.length).toBe(4)
+  })
+  it('when clicking the remove button on a row, removes that row', () => {
+    const wrapper = shallowMount(Liner, {
+      localVue,
+      store,
+      propsData: {
+        linerPerforations: []
+      }
+    })
+
+    wrapper.find('#removeLinerPerfRowBtn0').trigger('click')
+    expect(wrapper.vm.linerPerforationsInput.length).toBe(2)
+  })
+})
diff --git a/app/frontend/test/unit/specs/submissions/SubmissionPreview.spec.js b/app/frontend/test/unit/specs/submissions/SubmissionPreview.spec.js
new file mode 100644
index 0000000000..ba4e865432
--- /dev/null
+++ b/app/frontend/test/unit/specs/submissions/SubmissionPreview.spec.js
@@ -0,0 +1,58 @@
+import Vuex from 'vuex'
+import SubmissionPreview from '@/submissions/components/SubmissionPreview/SubmissionPreview.vue'
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+
+const localVue = createLocalVue()
+localVue.use(Vuex)
+
+describe('filterBlankRows', () => {
+  let store
+  let getters
+
+  beforeEach(() => {
+    getters = {
+      codes: () => ({})
+    }
+    store = new Vuex.Store({
+      getters
+    })
+  })
+  it('Removes blank rows and objects containing only empty strings for tables', () => {
+    const wrapper = shallowMount(SubmissionPreview, {
+      localVue,
+      store,
+      propsData: {
+        form: {},
+        sections: {}
+      }
+    })
+    let rows = [
+      { data: 123 },
+      { data: '' },
+      {}
+    ]
+
+    const filteredRows = wrapper.vm.filterBlankRows(rows)
+
+    expect(filteredRows.length).toBe(1)
+  })
+  it('Does not remove rows with values for tables', () => {
+    const wrapper = shallowMount(SubmissionPreview, {
+      localVue,
+      store,
+      propsData: {
+        form: {},
+        sections: {}
+      }
+    })
+    let rows = [
+      { data: 123 },
+      { data: 456 },
+      { data: 789 }
+    ]
+
+    const filteredRows = wrapper.vm.filterBlankRows(rows)
+
+    expect(filteredRows.length).toBe(3)
+  })
+})
diff --git a/app/frontend/test/unit/specs/submissions/SubmissionsHome.spec.js b/app/frontend/test/unit/specs/submissions/SubmissionsHome.spec.js
index ef4b184b0f..5f10aece97 100644
--- a/app/frontend/test/unit/specs/submissions/SubmissionsHome.spec.js
+++ b/app/frontend/test/unit/specs/submissions/SubmissionsHome.spec.js
@@ -50,15 +50,28 @@ describe('SubmissionsHome.vue', () => {
     expect(actions[FETCH_CODES]).toHaveBeenCalled()
   })
 
-  it('renders components based on the activity selected (Yield exists on construction report, not on decommission report)', () => {
+  it('renders components based on the activity selected (Yield exists on construction report', (done) => {
     const wrapper = shallowMount(SubmissionsHome, {
       localVue,
       store,
       router
     })
-    wrapper.setData({ activityType: 'CON' })
-    expect(wrapper.find(Yield).exists()).toBe(true)
-    wrapper.setData({ activityType: 'DEC' })
-    expect(wrapper.find(Yield).exists()).toBe(false)
+    wrapper.setData({ activityType: 'CON', formIsFlat: true })
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.find(Yield).exists()).toBe(true)
+      done()
+    })
+  })
+  it('renders components based on the activity selected (Yield does not exist on decommission report)', (done) => {
+    const wrapper = shallowMount(SubmissionsHome, {
+      localVue,
+      store,
+      router
+    })
+    wrapper.setData({ activityType: 'DEC', formIsFlat: true })
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.find(Yield).exists()).toBe(false)
+      done()
+    })
   })
 })
diff --git a/docker-compose.yml b/docker-compose.yml
index 965d53fec5..f65e830266 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres:9.6
+    image: postgres:9.5
     environment:
       POSTGRES_USER: gwells
       POSTGRES_PASSWORD: test1
@@ -10,8 +10,9 @@ services:
     volumes:
       - ./.tmp/psql-dev:/var/lib/postgresql
   webapp:
-    image: node:8
+    image: node:8.9.4
     environment:
+      DEBUG: "True"
       AXIOS_BASE_URL: http://127.0.0.1:8000/gwells/api/v1/
       CHOKIDAR_USEPOLLING: "True"
     command: /bin/bash -c "
@@ -45,10 +46,17 @@ services:
       POSTGRES_SERVICE_PORT: 5432
       DJANGO_ADMIN_URL: admin
       PYTHONUNBUFFERED: "1"
+      SSO_PUBKEY: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh+5Hc4w/PKN04avW1LX/orSyXsJ7nJiEbErMyQqCvYAEKmQUeok7Yy+r6sVuJSyQQMCExk37NY3fUQOK92J83oC/9WGij7bvlWHew810edIisechoKpLuQbw63xlj/5ifQfJ977NM1n1RQgXF4hr4MDuhGbV+PAkQGdSPfufjEFleCwj8mvjUwTFnSwE9I+Rf78DVJzCHZbpFMq9skvrpCzeNsLNNoz+k1DENQ6MKnVnbUYskG+j5NZ3g+kxfkRf2G0tw2KisLYtxUSdfwutieT2Zxglk/kZeMWS7khXWzhwjvWf5a1qM5ebreVVYNhra7MjcrkXSh0v5IBcW+122wIDAQAB
+      SSO_REALM: gwells
+      SSO_AUDIENCE: gwells-test
+      SSO_CLIENT: gwells-test
+      SSO_AUTH_HOST: https://sso-test.pathfinder.gov.bc.ca/auth
+      SSO_IDP_HINT: "undefined"
     command: /bin/bash -c "sleep 3 &&
             set -x &&
             cd /app/backend &&
-            pip3 install -r requirements.txt &&
+            mkdir -p .pip &&
+            pip3 install --cache-dir=.pip -r requirements.txt &&
             python3 manage.py migrate --noinput &&
             echo Loading fixtures, this may take some time... &&
             python3 manage.py loaddata
diff --git a/functional-tests/.env b/functional-tests/.env
new file mode 100644
index 0000000000..7848dbd6e5
--- /dev/null
+++ b/functional-tests/.env
@@ -0,0 +1,5 @@
+BASEURL=http://127.0.0.1:8000/
+GWELLS_USERNAME=bdduser1
+GWELLS_VIEWER_USERNAME=bdd-viewer
+GWELLS_SUBMISSION_USERNAME=bdd-submission
+GWELLS_REGISTRY_USERNAME=bdd-registry
\ No newline at end of file
diff --git a/functional-tests/.envrc b/functional-tests/.envrc
new file mode 100644
index 0000000000..b3df68b590
--- /dev/null
+++ b/functional-tests/.envrc
@@ -0,0 +1,3 @@
+
+dotenv .env
+dotenv .secret_env
diff --git a/functional-tests/build.gradle b/functional-tests/build.gradle
index 60936df44a..69f1ced4ed 100644
--- a/functional-tests/build.gradle
+++ b/functional-tests/build.gradle
@@ -2,6 +2,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
     id "groovy"
+    id "codenarc"
     id "com.energizedwork.webdriver-binaries" version "1.0"
     id "net.foragerr.jmeter" version "1.0.10-3.3"
 }
@@ -11,14 +12,18 @@ ext {
     drivers = ["firefox", "firefoxHeadless", "chrome", "chromeHeadless","ie","edge","safari"]
 
     ext {
-        groovyVersion = '2.4.12'
-        gebVersion = '2.1'
-        seleniumVersion = '3.12.0'
-        chromeDriverVersion = '2.38'
-        geckoDriverVersion = '0.18.0'
-        ieDriverVersion = '3.6'
-        edgeDriverVersion = seleniumVersion
-        safariDriverVersion = seleniumVersion
+        groovyVersion = '2.4.15'
+        gebVersion = '2.2'
+        seleniumVersion = '3.14.0'
+        chromeDriverVersion = '2.41'
+        geckoDriverVersion = '0.21.0'
+        ieDriverVersion = '3.14.0'
+        edgeDriverVersion = '3.14.0'
+        safariDriverVersion = '3.14.0'
+
+        spockCoreVersion = '1.1-groovy-2.4'
+        spockReportsVersion = '1.6.1'
+        slf4jApiVersion = '1.7.25'
     }
 }
 
@@ -31,7 +36,7 @@ repositories {
 dependencies {
     // If using Spock, need to depend on geb-spock
     testCompile "org.gebish:geb-spock:$gebVersion"
-    testCompile("org.spockframework:spock-core:1.1-groovy-2.4") {
+    testCompile("org.spockframework:spock-core:$spockCoreVersion") {
         exclude group: "org.codehaus.groovy"
     }
     testCompile "org.codehaus.groovy:groovy-all:$groovyVersion"
@@ -50,11 +55,11 @@ dependencies {
     testCompile "org.seleniumhq.selenium:selenium-edge-driver:$seleniumVersion"
 
     // Spock reports
-    testCompile( 'com.athaydes:spock-reports:1.4.0' ) {
+    testCompile( "com.athaydes:spock-reports:$spockReportsVersion" ) {
         transitive = false // this avoids affecting your version of Groovy/Spock
     }
-    testCompile 'org.slf4j:slf4j-api:1.7.13'
-    testCompile 'org.slf4j:slf4j-simple:1.7.13'
+    testCompile "org.slf4j:slf4j-api:$slf4jApiVersion"
+    testCompile "org.slf4j:slf4j-simple:$slf4jApiVersion"
 }
 
 webdriverBinaries {
@@ -118,3 +123,24 @@ jmeter {
   //enableReports = true //produce Graphical and CSV reports
   //enableExtendedReports = true //produce Graphical and CSV reports
 }
+
+codenarc {
+    toolVersion = '1.2.1'
+    reportFormat = 'html'
+}
+
+codenarcTest {
+    ignoreFailures = true
+    configFile = file("${projectDir}/codenarc.properties")
+}
+
+sourceSets {
+    test {
+        groovy {
+            srcDirs = ["src/test/groovy"]
+        }
+        resources {
+            srcDirs = ["src/test/resources"]
+        }
+    }
+}
diff --git a/functional-tests/codenarc.properties b/functional-tests/codenarc.properties
new file mode 100644
index 0000000000..ba1a3617d7
--- /dev/null
+++ b/functional-tests/codenarc.properties
@@ -0,0 +1,416 @@
+ruleset {
+
+    description '''
+        A Sample Groovy RuleSet containing all CodeNarc Rules, grouped by category.
+        You can use this as a template for your own custom RuleSet.
+        Just delete or comment out the rules that you don't want to include.
+        '''
+
+    // rulesets/basic.xml
+    AssertWithinFinallyBlock
+    AssignmentInConditional
+    BigDecimalInstantiation
+    BitwiseOperatorInConditional
+    BooleanGetBoolean
+    BrokenNullCheck
+    BrokenOddnessCheck
+    ClassForName
+    ComparisonOfTwoConstants
+    ComparisonWithSelf
+    ConstantAssertExpression
+    ConstantIfExpression
+    ConstantTernaryExpression
+    DeadCode
+    DoubleNegative
+    DuplicateCaseStatement
+    DuplicateMapKey
+    DuplicateSetValue
+    EmptyCatchBlock
+    EmptyClass
+    EmptyElseBlock
+    EmptyFinallyBlock
+    EmptyForStatement
+    EmptyIfStatement
+    EmptyInstanceInitializer
+    EmptyMethod
+    EmptyStaticInitializer
+    EmptySwitchStatement
+    EmptySynchronizedStatement
+    EmptyTryBlock
+    EmptyWhileStatement
+    EqualsAndHashCode
+    EqualsOverloaded
+    ExplicitGarbageCollection
+    ForLoopShouldBeWhileLoop
+    HardCodedWindowsFileSeparator
+    HardCodedWindowsRootDirectory
+    IntegerGetInteger
+    MultipleUnaryOperators
+    RandomDoubleCoercedToZero
+    RemoveAllOnSelf
+    ReturnFromFinallyBlock
+    ThrowExceptionFromFinallyBlock
+
+    // rulesets/braces.xml
+    ElseBlockBraces
+    ForStatementBraces
+    IfStatementBraces
+    WhileStatementBraces
+
+    // rulesets/concurrency.xml
+    BusyWait
+    DoubleCheckedLocking
+    InconsistentPropertyLocking
+    InconsistentPropertySynchronization
+    NestedSynchronization
+    StaticCalendarField
+    StaticConnection
+    StaticDateFormatField
+    StaticMatcherField
+    StaticSimpleDateFormatField
+    SynchronizedMethod
+    SynchronizedOnBoxedPrimitive
+    SynchronizedOnGetClass
+    SynchronizedOnReentrantLock
+    SynchronizedOnString
+    SynchronizedOnThis
+    SynchronizedReadObjectMethod
+    SystemRunFinalizersOnExit
+    ThisReferenceEscapesConstructor
+    ThreadGroup
+    ThreadLocalNotStaticFinal
+    ThreadYield
+    UseOfNotifyMethod
+    VolatileArrayField
+    VolatileLongOrDoubleField
+    WaitOutsideOfWhileLoop
+
+    // rulesets/convention.xml
+    ConfusingTernary
+    CouldBeElvis
+    CouldBeSwitchStatement
+    FieldTypeRequired  { ignoreFieldNames = 'content, url, at' } // dont check common geb static fields
+    HashtableIsObsolete
+    IfStatementCouldBeTernary
+    InvertedCondition
+    InvertedIfElse
+    LongLiteralWithLowerCaseL
+    MethodParameterTypeRequired
+    MethodReturnTypeRequired
+    NoDef
+    NoJavaUtilDate
+    NoTabCharacter
+    ParameterReassignment
+    PublicMethodsBeforeNonPublicMethods
+    StaticFieldsBeforeInstanceFields
+    StaticMethodsBeforeInstanceMethods
+    TernaryCouldBeElvis
+    TrailingComma
+    VariableTypeRequired
+    VectorIsObsolete
+
+    // rulesets/design.xml
+    AbstractClassWithPublicConstructor
+    AbstractClassWithoutAbstractMethod
+    AssignmentToStaticFieldFromInstanceMethod
+    BooleanMethodReturnsNull
+    BuilderMethodWithSideEffects
+    CloneableWithoutClone
+    CloseWithoutCloseable
+    CompareToWithoutComparable
+    ConstantsOnlyInterface
+    EmptyMethodInAbstractClass
+    FinalClassWithProtectedMember
+    ImplementationAsType
+    Instanceof
+    LocaleSetDefault
+    NestedForLoop
+    PrivateFieldCouldBeFinal
+    PublicInstanceField
+    ReturnsNullInsteadOfEmptyArray
+    ReturnsNullInsteadOfEmptyCollection
+    SimpleDateFormatMissingLocale
+    StatelessSingleton
+    ToStringReturnsNull
+
+    // rulesets/dry.xml
+    // DuplicateListLiteral
+    // DuplicateMapLiteral
+    // DuplicateNumberLiteral
+    // DuplicateStringLiteral
+
+    // rulesets/enhanced.xml
+    CloneWithoutCloneable
+    JUnitAssertEqualsConstantActualValue
+    MissingOverrideAnnotation
+    UnsafeImplementationAsMap
+
+    // rulesets/exceptions.xml
+    CatchArrayIndexOutOfBoundsException
+    CatchError
+    CatchException
+    CatchIllegalMonitorStateException
+    CatchIndexOutOfBoundsException
+    CatchNullPointerException
+    CatchRuntimeException
+    CatchThrowable
+    ConfusingClassNamedException
+    ExceptionExtendsError
+    ExceptionExtendsThrowable
+    ExceptionNotThrown
+    MissingNewInThrowStatement
+    ReturnNullFromCatchBlock
+    SwallowThreadDeath
+    ThrowError
+    ThrowException
+    ThrowNullPointerException
+    ThrowRuntimeException
+    ThrowThrowable
+
+    // rulesets/formatting.xml
+    BlankLineBeforePackage
+    BlockEndsWithBlankLine
+    BlockStartsWithBlankLine
+    BracesForClass
+    BracesForForLoop
+    BracesForIfElse
+    BracesForMethod
+    BracesForTryCatchFinally
+    // ClassJavadoc // dont check if super simple classes are missing javadoc
+    ClosureStatementOnOpeningLineOfMultipleLineClosure
+    ConsecutiveBlankLines
+    FileEndsWithoutNewline
+    Indentation { spacesPerIndentLevel = 2 } // default 4
+    LineLength // default 120
+    MissingBlankLineAfterImports
+    MissingBlankLineAfterPackage
+    SpaceAfterCatch
+    SpaceAfterClosingBrace
+    SpaceAfterComma
+    SpaceAfterFor
+    SpaceAfterIf
+    SpaceAfterOpeningBrace
+    SpaceAfterSemicolon
+    SpaceAfterSwitch
+    SpaceAfterWhile
+    SpaceAroundClosureArrow
+    SpaceAroundMapEntryColon
+    SpaceAroundOperator
+    SpaceBeforeClosingBrace
+    SpaceBeforeOpeningBrace
+    TrailingWhitespace
+
+    // rulesets/generic.xml
+    IllegalClassMember
+    IllegalClassReference
+    IllegalPackageReference
+    IllegalRegex
+    IllegalString
+    IllegalSubclass
+    RequiredRegex
+    RequiredString
+    StatelessClass
+
+    // rulesets/grails.xml
+    GrailsDomainHasEquals
+    GrailsDomainHasToString
+    GrailsDomainReservedSqlKeywordName
+    GrailsDomainStringPropertyMaxSize
+    GrailsDomainWithServiceReference
+    GrailsDuplicateConstraint
+    GrailsDuplicateMapping
+    GrailsMassAssignment
+    GrailsPublicControllerMethod
+    GrailsServletContextReference
+    GrailsStatelessService
+
+    // rulesets/groovyism.xml
+    AssignCollectionSort
+    AssignCollectionUnique
+    ClosureAsLastMethodParameter
+    CollectAllIsDeprecated
+    ConfusingMultipleReturns
+    ExplicitArrayListInstantiation
+    ExplicitCallToAndMethod
+    ExplicitCallToCompareToMethod
+    ExplicitCallToDivMethod
+    ExplicitCallToEqualsMethod
+    ExplicitCallToGetAtMethod
+    ExplicitCallToLeftShiftMethod
+    ExplicitCallToMinusMethod
+    ExplicitCallToModMethod
+    ExplicitCallToMultiplyMethod
+    ExplicitCallToOrMethod
+    ExplicitCallToPlusMethod
+    ExplicitCallToPowerMethod
+    ExplicitCallToRightShiftMethod
+    ExplicitCallToXorMethod
+    ExplicitHashMapInstantiation
+    ExplicitHashSetInstantiation
+    ExplicitLinkedHashMapInstantiation
+    ExplicitLinkedListInstantiation
+    ExplicitStackInstantiation
+    ExplicitTreeSetInstantiation
+    GStringAsMapKey
+    GStringExpressionWithinString
+    GetterMethodCouldBeProperty
+    GroovyLangImmutable
+    UseCollectMany
+    UseCollectNested
+
+    // rulesets/imports.xml
+    DuplicateImport
+    ImportFromSamePackage
+    ImportFromSunPackages
+    MisorderedStaticImports
+    NoWildcardImports
+    UnnecessaryGroovyImport
+    UnusedImport
+
+    // rulesets/jdbc.xml
+    DirectConnectionManagement
+    JdbcConnectionReference
+    JdbcResultSetReference
+    JdbcStatementReference
+
+    // rulesets/junit.xml
+    ChainedTest
+    CoupledTestCase
+    JUnitAssertAlwaysFails
+    JUnitAssertAlwaysSucceeds
+    JUnitFailWithoutMessage
+    JUnitLostTest
+    JUnitPublicField
+    // JUnitPublicNonTestMethod // not using junit in functional-tests
+    JUnitPublicProperty
+    JUnitSetUpCallsSuper
+    JUnitStyleAssertions
+    JUnitTearDownCallsSuper
+    JUnitTestMethodWithoutAssert
+    JUnitUnnecessarySetUp
+    JUnitUnnecessaryTearDown
+    JUnitUnnecessaryThrowsException
+    SpockIgnoreRestUsed
+    UnnecessaryFail
+    UseAssertEqualsInsteadOfAssertTrue
+    UseAssertFalseInsteadOfNegation
+    UseAssertNullInsteadOfAssertEquals
+    UseAssertSameInsteadOfAssertTrue
+    UseAssertTrueInsteadOfAssertEquals
+    UseAssertTrueInsteadOfNegation
+
+    // rulesets/logging.xml
+    LoggerForDifferentClass
+    LoggerWithWrongModifiers
+    LoggingSwallowsStacktrace
+    MultipleLoggers
+    PrintStackTrace
+    Println
+    SystemErrPrint
+    SystemOutPrint
+
+    // rulesets/naming.xml
+    AbstractClassName
+    ClassName
+    ClassNameSameAsFilename
+    ClassNameSameAsSuperclass
+    ConfusingMethodName
+    FactoryMethodName
+    FieldName
+    InterfaceName
+    InterfaceNameSameAsSuperInterface
+    // MethodName // spec method names dont always follow conventional method naming rules
+    ObjectOverrideMisspelledMethodName
+    PackageName
+    PackageNameMatchesFilePath
+    ParameterName
+    PropertyName
+    VariableName
+
+    // rulesets/security.xml
+    FileCreateTempFile
+    InsecureRandom
+    JavaIoPackageAccess
+    NonFinalPublicField
+    NonFinalSubclassOfSensitiveInterface
+    ObjectFinalize
+    PublicFinalizeMethod
+    SystemExit
+    UnsafeArrayDeclaration
+
+    // rulesets/serialization.xml
+    EnumCustomSerializationIgnored
+    SerialPersistentFields
+    SerialVersionUID
+    SerializableClassMustDefineSerialVersionUID
+
+    // rulesets/size.xml
+    AbcMetric   // Requires the GMetrics jar
+    ClassSize
+    CrapMetric   // Requires the GMetrics jar and a Cobertura coverage file
+    CyclomaticComplexity   // Requires the GMetrics jar
+    MethodCount
+    MethodSize
+    NestedBlockDepth
+    ParameterCount
+
+    // rulesets/unnecessary.xml
+    AddEmptyString
+    ConsecutiveLiteralAppends
+    ConsecutiveStringConcatenation
+    UnnecessaryBigDecimalInstantiation
+    UnnecessaryBigIntegerInstantiation
+    UnnecessaryBooleanExpression
+    UnnecessaryBooleanInstantiation
+    UnnecessaryCallForLastElement
+    UnnecessaryCallToSubstring
+    UnnecessaryCast
+    UnnecessaryCatchBlock
+    UnnecessaryCollectCall
+    UnnecessaryCollectionCall
+    UnnecessaryConstructor
+    UnnecessaryDefInFieldDeclaration
+    UnnecessaryDefInMethodDeclaration
+    UnnecessaryDefInVariableDeclaration
+    UnnecessaryDotClass
+    UnnecessaryDoubleInstantiation
+    UnnecessaryElseStatement
+    UnnecessaryFinalOnPrivateMethod
+    UnnecessaryFloatInstantiation
+    UnnecessaryGString
+    // UnnecessaryGetter // confuses actual property getters for methods of the form getSomething()
+    UnnecessaryIfStatement
+    UnnecessaryInstanceOfCheck
+    UnnecessaryInstantiationToGetClass
+    UnnecessaryIntegerInstantiation
+    UnnecessaryLongInstantiation
+    UnnecessaryModOne
+    UnnecessaryNullCheck
+    UnnecessaryNullCheckBeforeInstanceOf
+    UnnecessaryObjectReferences
+    UnnecessaryOverridingMethod
+    UnnecessaryPackageReference
+    UnnecessaryParenthesesForMethodCallWithClosure
+    UnnecessaryPublicModifier
+    // UnnecessaryReturnKeyword // use return if you want
+    UnnecessarySafeNavigationOperator
+    UnnecessarySelfAssignment
+    UnnecessarySemicolon
+    // UnnecessarySetter // confuses actual property setters for methods of the form setSomething()
+    UnnecessaryStringInstantiation
+    UnnecessarySubstring
+    UnnecessaryTernaryExpression
+    UnnecessaryToString
+    UnnecessaryTransientModifier
+
+    // rulesets/unused.xml
+    UnusedArray
+    UnusedMethodParameter
+    UnusedObject
+    UnusedPrivateField
+    UnusedPrivateMethod
+    UnusedPrivateMethodParameter
+    UnusedVariable
+
+
+}
diff --git a/functional-tests/readme.md b/functional-tests/readme.md
index 07eee27a56..5b60aaa958 100644
--- a/functional-tests/readme.md
+++ b/functional-tests/readme.md
@@ -18,14 +18,14 @@ The following commands will launch the tests with the individual browsers:
     ./gradlew firefoxHeadlessTest //Will run in pipeline as well
     ./gradlew edgeTest
     ./gradlew ieTest
-    
+
 To run with all, you can run:
 
     ./gradlew test
 
 Replace `./gradlew` with `gradlew.bat` in the above examples if you're on Windows.
 
-    
+
 To run a single class of tests, you can run:
 
     ./gradlew chromeTest --tests <ClassName>
@@ -70,7 +70,7 @@ In order to use a custom directory for jmx files (default is `src/test/jmeter`)
 When working with the default or custom path to scan for jmx files, you can include or exclude specific files with the *ïncludes* and *excludes* properties.
 * E.g. excludes = ["excludeThisTest.jmx"]
 
-(Note that you should provide a list of patterns, not just a String) 
+(Note that you should provide a list of patterns, not just a String)
 
 ### Edit JMeter files
 
@@ -80,16 +80,20 @@ By default the plugin will search for *.jmx files in `src/test/jmeter`. You can
 
 ### Run the tests
 
-You can run the tests by executing 
+You can run the tests by executing
 
 `gradle jmRun`
 
 ### Create Reports
 
-You can run the tests by executing 
+You can run the tests by executing
 
 `gradle jmReport`
 
 By default, extended reports are turned on and HTML reports are turned off
 
 The results of the tests will can be found in(default location, can be overridden) `build/jmeter-report`
+
+## License
+
+Code released under the [Apache License, Version 2.0](https://github.com/bcgov/gwells/blob/master/LICENSE).
diff --git a/functional-tests/src/test/groovy/Admin/AdminSpecs.groovy b/functional-tests/src/test/groovy/Admin/AdminSpecs.groovy
deleted file mode 100644
index c5f8afd417..0000000000
--- a/functional-tests/src/test/groovy/Admin/AdminSpecs.groovy
+++ /dev/null
@@ -1,13 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Screen to allow App Admin to manage user roles")
-@Narrative("""<No Narritive yet>""")
-@See("https://trello.com/c/YV7QgoIl")
-class AdminSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/YV7QgoIl")
-    def "Scenario: 1 - Manage User Roles"(){ }
-}
diff --git a/functional-tests/src/test/groovy/Admin/SurveyAdminSpecs.groovy b/functional-tests/src/test/groovy/Admin/SurveyAdminSpecs.groovy
deleted file mode 100644
index 04e70e89bc..0000000000
--- a/functional-tests/src/test/groovy/Admin/SurveyAdminSpecs.groovy
+++ /dev/null
@@ -1,19 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Screen to allow adding surveys on the GWELLS application")
-@Narrative("""As an application administrator, I need a screen that allows me to easily add surveys on the GWELLS application in order for me to update or add context without having to go through a developer.
-""")
-@See("https://trello.com/c/SZrt0RLt")
-class SurveyAdminSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/SZrt0RLt")
-    def "Scenario: 1 - Add Survey"(){
-        given: "I am an application administrator"
-        and: "I need to add a survey to the GWELLS application screens"
-        when: "I access the GWELLS administration feature"
-        then: "I can add a survey where required."
-     }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/DocumentStorage/DocumentAccessSpecs.groovy b/functional-tests/src/test/groovy/DocumentStorage/DocumentAccessSpecs.groovy
deleted file mode 100644
index e9b773a6aa..0000000000
--- a/functional-tests/src/test/groovy/DocumentStorage/DocumentAccessSpecs.groovy
+++ /dev/null
@@ -1,17 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Document Access - Public")
-@Narrative("""As an application administrator, I need to be able to set user access levels to the documents that are stored and displayed through the GWELLS Application.""")
-@See("https://trello.com/c/mptCm5jj")
-class DocumentAccessSpecs extends GebReportingSpec {
-
-    @Ignore("Verified Manually")
-    @Issue("https://trello.com/c/mptCm5jj")
-    def "Scenario: 1 - Document is Accessible"(){
-        given: "that I have a well record or other document"
-        and: "I want to make the document publicly available to all users"
-        when: "I add the document to the public 'bucket'"
-        then: "all records in this bucket should be made available to all users."
-     }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/DocumentStorage/UploadDocumentSpecs.groovy b/functional-tests/src/test/groovy/DocumentStorage/UploadDocumentSpecs.groovy
deleted file mode 100644
index 8e8ee4f855..0000000000
--- a/functional-tests/src/test/groovy/DocumentStorage/UploadDocumentSpecs.groovy
+++ /dev/null
@@ -1,18 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Upload documents to online repository")
-@Narrative("""As an administrator, I need to save files to the LAN (source of truth) then upload to the public repository.""")
-@See("https://trello.com/c/YEA1EyEs")
-class UploadDocumentsSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("Verified Manually")
-    @Issue("https://trello.com/c/YEA1EyEs")
-    def "Scenario: 1 - Upload Docments"(){
-        given: "I am a GWELLS system administrator"
-        and: "I routinely have new scanned records to add or edit"
-        when: "I upload these files to the public cloud based repository'"
-        then: "they will be added/updated and displayed on the Well Summary page"
-     }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Login/LoginSpecs.groovy b/functional-tests/src/test/groovy/Login/LoginSpecs.groovy
deleted file mode 100644
index af930092c2..0000000000
--- a/functional-tests/src/test/groovy/Login/LoginSpecs.groovy
+++ /dev/null
@@ -1,38 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-import pages.app.RegisterPage
-import pages.external.SSO
-
-@Title("Login")
-@Narrative("""As an authorized groundwater staff, I need a log in link in order to have access to files (e.g., the well driller registry, edit) 
-in order to CRUD my applicable records.""")
-@See("https://trello.com/c/Uz8PvC8k")
-class LoginSpecs extends GebReportingSpec {
-
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/Uz8PvC8k")
-    def "Scenario: 1 - Show Login"(){
-        given: "that I am a GWELLS user"
-        when: "I open the GWELLS application"
-        then: "I should see a sign in link at the top right of the navigation bar."
-     }
-
-    @Ignore("SSO will not accept redirects from our test instances")
-    @Issue("https://trello.com/c/Uz8PvC8k")
-    def "Scenario: 2 - Login"(){
-        given: "that I am an an authorized GWELLS user"
-            to RegisterPage
-        when: "I select the sign in link at the top right if the navigation bar"
-            waitFor { $("#gwells-sso-login").click() }
-        then: "I should sign in using my IDIR."
-            at SSO
-     }
-
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/Uz8PvC8k")
-    def "Scenario: 3 - Login Unauthorized"(){
-        given: "that I am an unauthorized GWELLS user"
-        when: "I select the sign in link at the top right if the navigation bar"
-        then: "I should be directed to the 301 error message page."
-     }     
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Navigation/FlowSpecs.groovy b/functional-tests/src/test/groovy/Navigation/FlowSpecs.groovy
deleted file mode 100644
index 82ac06470b..0000000000
--- a/functional-tests/src/test/groovy/Navigation/FlowSpecs.groovy
+++ /dev/null
@@ -1,68 +0,0 @@
-import geb.spock.GebReportingSpec
-import pages.app.HomePage
-import pages.app.RegisterPage
-import pages.app.SearchPage
-import pages.app.AdditionalInformationPage
-import pages.app.WellDrillerPage
-import pages.external.Accessibility
-import pages.external.Copyright
-import pages.external.Disclaimer
-import pages.external.Privacy
-import pages.external.BCWaterResourceAtlas
-import pages.external.iMapBC
-import pages.external.AboutGov
-import pages.external.GovHome
-import spock.lang.*
-
-@Title("Basic Navigational Tests")
-@Narrative("""As a user I expect all links in the GWELLS application to work.""")
-class FlowSpecs extends GebReportingSpec {
-
-    @Unroll
-    def "Navigate Page from: #startPage, click footer/header Link: #clickLink, Assert Page: #assertPage"(){
-	    given: "I start on the #startPage"
-			to startPage
-        when: "I click on the link #clickLink"
-			waitFor { $("li", id:"$clickLink").$("a").click() }
-        then:
-			at assertPage
-
-        where:
-        startPage                   | clickLink                | clickCount    | timeoutSeconds    || assertPage
-        SearchPage                  | "ribbon-groundwaterinfo" | 1             | 3                 || AdditionalInformationPage
-        AdditionalInformationPage   | "ribbon-search"          | 1             | 3                 || SearchPage
-        SearchPage    		        | "ribbon-search"          | 1             | 3                 || SearchPage
-        SearchPage                  | "ribbon-registry"        | 1             | 3                 || WellDrillerPage
-        //Test Externally Linked Pages
-		SearchPage           | "footer-disclaimer"     | 1             | 3                 || Disclaimer
-        SearchPage           | "footer-privacy"        | 1             | 3                 || Privacy
-        SearchPage           | "footer-accessibility"  | 1             | 3                 || Accessibility
-        SearchPage           | "footer-copyright"      | 1             | 3                 || Copyright
-        SearchPage           | "footer-home"           | 1             | 3                 || GovHome
-        SearchPage           | "footer-about"          | 1             | 3                 || AboutGov
-    }
-
-    @Unroll
-    def "Navigate Page from: #startPage, click Link: #clickLink, Assert Page: #assertPage"(){
-	    given: "I start on the #startPage"
-			to startPage
-        when: "I click on the link #clickLink"
-			waitFor { $("a", id:"$clickLink").click() }
-        then:
-			at assertPage
-
-        where:
-        startPage                   | clickLink                | clickCount    | timeoutSeconds    || assertPage 
-        SearchPage                  | "BCWRAtlas"              | 1             | 3                 || BCWaterResourceAtlas
-        SearchPage                  | "iMapBC"                 | 1             | 3                 || iMapBC
-    }
-
-    def "Check Registries Page"(){
-        given: "I go to the registries start page"
-            to RegisterPage
-        when: "I am on the page"    
-            at RegisterPage
-        then: "title = 'Register of Well Drillers and Well Pump Installers'" 
-            assert titletext == "Register of Well Drillers and Well Pump Installers"   
-    }
-}
diff --git a/functional-tests/src/test/groovy/Other/AppMaintenanceSpecs.groovy b/functional-tests/src/test/groovy/Other/AppMaintenanceSpecs.groovy
deleted file mode 100644
index af84b5c081..0000000000
--- a/functional-tests/src/test/groovy/Other/AppMaintenanceSpecs.groovy
+++ /dev/null
@@ -1,19 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Create an Application Maintenance error message")
-@Narrative("""As an admin, I need a setting which shows the site is down for maintenance when I am doing activities like upgrades 
-and database refreshes so that users know the site isn't broken and will be available again shortly.""")
-@See("https://trello.com/c/qfhKDGxY")
-class AppMaintenanceSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/qfhKDGxY")
-    def "Scenario: 1 - Verify Application Maintenance error message"(){
-        given "I am an application Administrator"
-        and "maintenance activities need to occur that will affect the public site"
-        when "the public application is down"
-        then "an error message is displayed to users indicating 'Site is currently down for maintenance and will be back up shortly'."
-     }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Other/ErrorPageMessageSpecs.groovy b/functional-tests/src/test/groovy/Other/ErrorPageMessageSpecs.groovy
deleted file mode 100644
index b09ef7b7cc..0000000000
--- a/functional-tests/src/test/groovy/Other/ErrorPageMessageSpecs.groovy
+++ /dev/null
@@ -1,19 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Error Page Message")
-@Narrative("""Add capacity in the error pages to consume application generated messages if they are present, and display a default error page 
-if no message has been generated. This would allow better reporting to end users of the application faults they encounter.""")
-@See("https://trello.com/c/R6PqdIEV")
-class ErrorPageMessageSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/R6PqdIEV")
-    def "Scenario: 1 - Error message"(){
-        given "I am regular user"
-        and "an application error occurs"
-        when "the error page shows"
-        then "an application generated error message is displayed."
-     }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Registry/AddRegistrantAdjudicationSpecs.groovy b/functional-tests/src/test/groovy/Registry/AddRegistrantAdjudicationSpecs.groovy
deleted file mode 100644
index 39361bf7f0..0000000000
--- a/functional-tests/src/test/groovy/Registry/AddRegistrantAdjudicationSpecs.groovy
+++ /dev/null
@@ -1,30 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Register of Well Drillers and Well Pump Installers - Add Registrant - Adjudication")
-@Narrative("""As an authorized user, I need to be able to track the adjudication process related to a well
-driller or well pump installer within the registers in order to facilitate better management and processing
-of applications.""")
-@See("https://trello.com/c/vYd6OvhV")
-class AddRegistrantAdjudicationSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/vYd6OvhV")
-    def "Scenario: 1 - Show"(){
-        given "given that I am an adjudicator or statutory authority"
-        and "I need to add another classification"
-       	when "I select the box 'add new classification'"
-       	then "a new classification and qualifications and adjudication section should appear."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/vYd6OvhV")
-    def "Scenario: 2 - Pending"(){
-        given "given that I am an adjudicator or statutory authority"
-        when "I have entered date application received"
-       	then "register status should be defaulted to 'pending'."
-     }
-
-}
diff --git a/functional-tests/src/test/groovy/Registry/AddRegistrantAdjudicationSpecsAge.groovy b/functional-tests/src/test/groovy/Registry/AddRegistrantAdjudicationSpecsAge.groovy
deleted file mode 100644
index 7ee78b5cd3..0000000000
--- a/functional-tests/src/test/groovy/Registry/AddRegistrantAdjudicationSpecsAge.groovy
+++ /dev/null
@@ -1,29 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Register of Well Drillers and Well Pump Installers - Add Registrant - Adjudication")
-@Narrative("""As an authorized user, I need to be able to document that an applicant for registration as a 
-well driller and well pump installer meets the age requirement specified under the GWPR.""")
-@See("https://trello.com/c/YdYXQLw8")
-class AddRegistrantAdjudicationSpecsAge extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/YdYXQLw8")
-    def "Scenario: 1 - Drop Down"(){
-        given "that I am an adjudicator or statutory authority"
-        when "I am reviewing an application for registration"
-        and "I have confirmed that the applicant is 19 years of age or older"
-	    then "I must select a value from the proof of age drop down."
-    }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/vYd6OvhV")
-    def "Scenario: 2 - Drivers,Passport & Birth Certificate"(){
-        given "that I am an adjudicator or statutory authority"
-        and "I have confirmed that the applicant is 19 years of age or older"
-	    then "proof of age values must include driver's licence, passport, birth certificate."
-     }
-
-}
diff --git a/functional-tests/src/test/groovy/Registry/AddRegistrantClassificationQualificationSpecs.groovy b/functional-tests/src/test/groovy/Registry/AddRegistrantClassificationQualificationSpecs.groovy
deleted file mode 100644
index 53392234bf..0000000000
--- a/functional-tests/src/test/groovy/Registry/AddRegistrantClassificationQualificationSpecs.groovy
+++ /dev/null
@@ -1,83 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Register of Well Drillers and Well Pump Installers - Add Registrant - Classification and Qualifications")
-@Narrative("""As an authorized user, I need to be able to track the classification and qualification
-information related to a well driller or well pump installer within the registers in order to facilitate
-better management and processing of applications.""")
-@See("https://trello.com/c/5xbTW0Fz")
-class AddRegistrantClassificationQualificationsSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/5xbTW0Fz")
-    def "Scenario: 1 - Show"(){
-        given "that I am an adjudicator or statutory authority"
-	    when "I select the 'Add new classification' button"
-        then "the Classification and Qualifications section should expand to show me the data entry fields and adjudication section."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/5xbTW0Fz")
-    def "Scenario: 2 - Select"(){
-        given "that I am an adjudicator or statutory authority"
-       	when "I select the appropriate classification"
-       	then "I should only be allowed to select one classification at a time."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/5xbTW0Fz")
-    def "Scenario: 3 - Show"(){
-        given "that I am an adjudicator or statutory authority"
-        when "I select the certification issued by drop down menu"
-        then "I should get options based specific to whether the classification is for a well driller (water well, geotechnical/evironmental, geoexchange) or a well pump installer."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/5xbTW0Fz")
-    def "Scenario: 4 - Multiple"(){
-        given "that I am an adjudicator or statutory authority"
-       	when "I select the 'Add additional certification' button"
-       	then "a new certification issued by dropdown menu and certificate number field should be displayed"
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/5xbTW0Fz")
-    def "Scenario: 5 - Checkboxes"(){
-        given "that I am an adjudicator or statutory authority"
-       	when "I select the classification of water well driller"
-       	then "the appropriate qualified to drill check boxes get automatically populated"
-        and "I have the ability to override those check boxes."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/5xbTW0Fz")
-    def "Scenario: 6 - Auto select"(){
-        given "that I am an adjudicator or statutory authority"
-       	when "I select the classification of water well driller"
-       	then "the following check boxes are selected: water supply well, monitoring well, recharge well, injection well, dewatering well, remediation well, geotechnical well."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/5xbTW0Fz")
-    def "Scenario: 7 - Auto select"(){
-        given "that I am an adjudicator or statutory authority"
-       	when "I select the classification of geotechnical/environmental driller"
-       	then "the following check boxes are selected: monitoring well, remediation well, geotechnical well."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/5xbTW0Fz")
-    def "Scenario: 8 - Auto select"(){
-        given "given that I am an adjudicator or statutory authority"
-       	when "I select the classification of geoexchange driller"
-       	then "the following check boxes are selected: closed-loop geoexchange well."
-     }
-}
diff --git a/functional-tests/src/test/groovy/Registry/AddRegistrantP1Specs.groovy b/functional-tests/src/test/groovy/Registry/AddRegistrantP1Specs.groovy
deleted file mode 100644
index 31c11d1a52..0000000000
--- a/functional-tests/src/test/groovy/Registry/AddRegistrantP1Specs.groovy
+++ /dev/null
@@ -1,47 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Register of Well Drillers and Well Pump Installers - Add Registrant Part 2")
-@Narrative("""As a Groundwater Data Specialist and person assigned to manage the register of well drillers and well pump installers for the comptroller, 
-I need a tool to add new registrant information into the register of well drillers or well pump installers in order to facilitate better management and 
-processing of applications and applicant information.""")
-@See("https://trello.com/c/JESPCA7k")
-class AddRegistrantP2Specs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/JESPCA7k")
-    def "Scenario: 1 - Registration/Approval Error"(){
-       	given "that I am an authorized user"
-        and "the registration status is set to 'Registered'"
-        and "the approval outcome is set to 'Approved'"
-        when "I save the record"
-        and "I have not entered an approval outcome date and/or registration number"
-        then "I should get an error message at the top of the page stating 'Approval date required' OR 'Registration Number Required'."
-     }
-    
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/JESPCA7k")
-    def "Scenario: 2 - Select 'Well Driller'"(){
-       	given "that I am an authorized user"
-        and "I have a new application for registration as a well driller to be entered into the system"
-        and "the type of applicant selected is 'well driller'"
-        when "I view the data entry page"
-        and "I have not entered an approval outcome date and/or registration number"
-        then "I should see the data entry section related to 'Driller Qualifications'."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/JESPCA7k")
-    def "Scenario: 3 - No driller qualification selected"(){
-       	given "that I am an authorized user"
-        and "I have a new application for registration as a well driller or well pump installer to be entered into the system"
-        and "the registration status is set to 'Registered'"
-        and "the approval outcome is set to 'Approved'"
-        when "I save the record"
-        and "I have not selected at least one check box under qualified to drill"
-        then "I should get an error message at the top of the page stating 'At least one driller qualification must be selected'."
-     }
-}
diff --git a/functional-tests/src/test/groovy/Registry/AddRegistrantP2Specs.groovy b/functional-tests/src/test/groovy/Registry/AddRegistrantP2Specs.groovy
deleted file mode 100644
index a5218e7d91..0000000000
--- a/functional-tests/src/test/groovy/Registry/AddRegistrantP2Specs.groovy
+++ /dev/null
@@ -1,44 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Register of Well Drillers and Well Pump Installers - Add Registrant Part 1")
-@Narrative("""As a Groundwater Data Specialist and person assigned to manage the register of well drillers and well pump installers for the comptroller, 
-I need a tool to add new registrant information into the register of well drillers or well pump installers in order to facilitate better management and 
-processing of applications and applicant information.""")
-@See("https://trello.com/c/rtIOyw84")
-class AddRegistrantP1Specs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/rtIOyw84")
-    def "Scenario: 1 - Applicant type selection Error"(){
-       	given "that I am an authorized user"
-        and "I have a new application for registration as a well driller or well pump installer to be entered into the system"
-        when "I save the record"
-        and "I have not selected the type of applicant"
-        then "I should get an error message at the top of the page stating 'Type of applicant must be selected'."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/rtIOyw84")
-    def "Scenario: 2 - Applicant Last name Error"(){
-       	given "that I am an authorized user"
-        and "I have a new application for registration as a well driller or well pump installer to be entered into the system"
-        when "I save the record"
-        and "I have not entered the last name of the applicant"
-        then "I should get an error message at the top of the page stating 'Last name must be completed'"
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/rtIOyw84")
-    def "Scenario: 2 - Applicant First name Error"(){
-       	given "that I am an authorized user"
-        and "I have a new application for registration as a well driller or well pump installer to be entered into the system"
-        when "I save the record"
-        and "I have not entered the first name of the applicant"
-        then "I should get an error message at the top of the page stating 'Last name must be completed'."
-     }
-
-}
diff --git a/functional-tests/src/test/groovy/Registry/AddRegistrantP3Specs.groovy b/functional-tests/src/test/groovy/Registry/AddRegistrantP3Specs.groovy
deleted file mode 100644
index 8384d8bdde..0000000000
--- a/functional-tests/src/test/groovy/Registry/AddRegistrantP3Specs.groovy
+++ /dev/null
@@ -1,30 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Register of Well Drillers and Well Pump Installers - Add Registrant Part 3")
-@Narrative("""As a Groundwater Data Specialist and person assigned to manage the register of well drillers and well pump installers for the comptroller, 
-I need a tool to add new registrant information into the register of well drillers or well pump 
-installers in order to facilitate better management and processing of applications and applicant information.""")
-@See("https://trello.com/c/NYH7yqyJ")
-class AddRegistrantP3Specs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/NYH7yqyJ")
-    def "Scenario: 1 - Save Application"(){
-       	given "that I am an authorized user"
-        and "I have entered all the required information from the application"
-        when "I select 'Save'"
-        then "the record is saved to the database."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/NYH7yqyJ") 
-    def "Scenario: 2 - Cancel Application"(){
-       	given "that I am an authorized user"
-        and "I have entered all the required information from the application"
-        when "I select 'Cancel'"
-        then "a pop-up is displayed confirming that I do in fact want to cancel the record without saving."
-     }
-}
diff --git a/functional-tests/src/test/groovy/Registry/EditCompanySpecs.groovy b/functional-tests/src/test/groovy/Registry/EditCompanySpecs.groovy
deleted file mode 100644
index 911db4dc90..0000000000
--- a/functional-tests/src/test/groovy/Registry/EditCompanySpecs.groovy
+++ /dev/null
@@ -1,40 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Register of Well Drillers and Well Pump Installers - Manage Companies")
-@Narrative("""As an authorized user, I want to be able to update or remove company contact information
-associated with the well driller and well pump installer registers to ensure that the company contact
-information is up-to-date.""")
-@See("https://trello.com/c/JESPCA7k")
-class EditCompanySpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/JESPCA7k")
-    def "Scenario: 1 - Add company"(){
-	given "that I am an adjudicator or statutory authority"
-    and "I need to add a new company to the list of companies"
-	when "I select the 'add new company' button"
-	then "an empty screen for company information is displayed."
-     }
-    
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/JESPCA7k")
-    def "Scenario: 2 - Select Company"(){
-    given "that I am the adjudicator or statutory authority" 
-    and "I want to search for an existing company to update their contact information" 
-	when "I select a company name from the company name dropdown menu" 
-	then "that company information should be displayed in the company information section." 
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/JESPCA7k")
-    def "Scenario: 3 - Delete company"(){
- 	given "that I am the adjudicator or statutory authority" 
-    and "I have accidentally entered a company twice"
-	when "I select the 'Delete' button"  
-	then "I a popup message should be displayed asking me to confirm deletion and warning if there are individuals associated to this company." 
-     }
-}
diff --git a/functional-tests/src/test/groovy/Registry/EditRegistrantEditAdjudicationSpecs.groovy b/functional-tests/src/test/groovy/Registry/EditRegistrantEditAdjudicationSpecs.groovy
deleted file mode 100644
index ea5b8fc557..0000000000
--- a/functional-tests/src/test/groovy/Registry/EditRegistrantEditAdjudicationSpecs.groovy
+++ /dev/null
@@ -1,91 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Register of Well Drillers and Well Pump Installers - Edit Registrant - Classification and Qualifications - Adjudication")
-@Narrative("""As a Groundwater Data Specialist and person assigned to manage the register of well drillers and well pump installers for the comptroller, I need to be able to edit an individuals file related to their registration as a well driller or well pump installer in order to ensure their information is up to date and meets the requirements of the Groundwater Protection Regulation.
-This story excludes functionality relating to the removal from the register.
-""")
-@See("https://trello.com/c/zaa4JSn8")
-class AddRegistrantEditAdjudicationSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/zaa4JSn8")
-    def "Scenario: 1 - Save"(){
-        given "that I am an authorized user"
-	    when "I save the record"
-        then "all my changes will be saved"
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/zaa4JSn8")
-    def "Scenario: 2 - Cancel"(){
-        given "that I am an authorized user"
-       	when "I cancel before saving the record"
-       	then "a popup message should be displayed confirming that I want to cancel."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/zaa4JSn8")
-    def "Scenario: 3 - Select"(){
-        given "that I am an authorized user"
-        when "I enter an approval outcome date"
-        then "approval outcome must be selected."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/zaa4JSn8")
-    def "Scenario: 4 - Reason"(){
-        given "that I am an authorized user"
-       	when "I enter an approval outcome of not approved"
-       	then "reason not approved must be completed."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/zaa4JSn8")
-    def "Scenario: 5 - Publish"(){
-        given "that I am an authorized user"
-       	when "I enter an approval outcome of approved"
-       	then "the record must be publicaly published on the register search page."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/YC7XcY9a")
-    def "Scenario: 6 - Removal Date"(){
-        given "that I am an authorized user"
-       	when "I enter a register removal date"
-       	then "the removal reason must be selected."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/YC7XcY9a")
-    def "Scenario: 7 - Removal Reason"(){
-        given "that I am an authorized user"
-       	when "I enter a register removal date"
-       	then "the removal reason must be selected."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/YC7XcY9a")
-    def "Scenario: 8 - Save"(){
-        given "that I am an authorized user"
-       	when "I save the record"
-       	then "all my changes will be saved."
-     }
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/YC7XcY9a")
-    def "Scenario: 8 - Cancel"(){
-        given "that I am an authorized user"
-       	when "I cancel before saving the record"
-       	then "a popup message should be displayed confirming that I want to cancel."
-     }
-}
diff --git a/functional-tests/src/test/groovy/Registry/MigrateDataSpecs.groovy b/functional-tests/src/test/groovy/Registry/MigrateDataSpecs.groovy
deleted file mode 100644
index 4ff32b3b36..0000000000
--- a/functional-tests/src/test/groovy/Registry/MigrateDataSpecs.groovy
+++ /dev/null
@@ -1,20 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Migrate Existing Data from MS Access into GWELLS")
-@Narrative("""As the Deputy Comptroller and groundwater data specialist , I need the existing well driller and well pump installer registry information 
-to be imported into the GWELLS database in order to ensure a smooth transition between the systems and to ensure that the information 
-is available to the public in a timely manner.""")
-@See("https://trello.com/c/4alSc2bU")
-class MigrateDataSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/4alSc2bU")
-    def "Scenario: 1 - Migrate Data"(){
-        given "that I have data related to the registry of well drillers and well pump installers in an existing MS Access table"
-        and "I want that data imported into the GWELLS database"
-        when "I import the data based on the column mapping spreadsheet"
-        then "the appropriate columns should be populated."
-     }
-}
diff --git a/functional-tests/src/test/groovy/Registry/PrintRegistrationSpecs.groovy b/functional-tests/src/test/groovy/Registry/PrintRegistrationSpecs.groovy
deleted file mode 100644
index 2f26ab5b08..0000000000
--- a/functional-tests/src/test/groovy/Registry/PrintRegistrationSpecs.groovy
+++ /dev/null
@@ -1,14 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Ability for Applicant to Print Registration Card")
-@Narrative("""""")
-@See("https://trello.com/c/K9GSCx0y")
-class PrintRegistrationSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/K9GSCx0y")
-    def "Scenario: 1 - Print Card"(){
-     }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Registry/SearchRegistrySpecs.groovy b/functional-tests/src/test/groovy/Registry/SearchRegistrySpecs.groovy
deleted file mode 100644
index 115c3c97a1..0000000000
--- a/functional-tests/src/test/groovy/Registry/SearchRegistrySpecs.groovy
+++ /dev/null
@@ -1,52 +0,0 @@
-import geb.spock.GebReportingSpec
-import pages.app.RegisterPage
-import spock.lang.*
-
-class SearchRegistrySpecs extends GebReportingSpec {
-
-    @Unroll
-    def "Search Registry: #TestDesc"(){
-       	given: "that I am an general user"
-           to RegisterPage
-        when: "I search for a registered driller/installer"
-            at RegisterPage
-            reset
-            switch ("$SearchType") {
-              case "installer":
-                selectinstaller
-                break
-              case "driller":
-                selectdriller
-                break
-              case "name":
-                selectdriller
-                search.value("$Search")
-                break
-              case "community":
-                selectdriller
-                selectcommunity = ["$Search"]
-                break
-            }
-            submit
-        then: "I should find the result"
-            if ( "$NumberResult" == "none" ) {
-                assert waitFor { noresults.displayed }
-            } else {
-                assert waitFor { result == "$NumberResult" }
-            }
-
-        where:
-        TestDesc 					| Search          	| SearchType      | Results             | NumberResult
-        "Name=John"                 | "John"			| "name"          | ""				    | "18"
-        "Name=Alan"                 | "Alan"			| "name"          | ""				    | "2"
-        "Community=Langley"         | "Langley"			| "community"     | ""				    | "8"
-        "Community=Aldergrove"      | "Aldergrove"		| "community"     | ""				    | "10"
-    }
-}
-/* Mon  7 May 14:03:44 2018 GW at top of list
-
-        "Empty search criteria"     | ""                | ""              | ""                  | "285"
-        "Empty search criteria - Driller"     | ""              | "driller"       | ""          | "285"
-        "Empty search criteria - Installer"     | ""            | "installer"     | ""          | "320"
-
-*/
diff --git a/functional-tests/src/test/groovy/Registry/SubmitRegistrationSpecs.groovy b/functional-tests/src/test/groovy/Registry/SubmitRegistrationSpecs.groovy
deleted file mode 100644
index 03d95c9256..0000000000
--- a/functional-tests/src/test/groovy/Registry/SubmitRegistrationSpecs.groovy
+++ /dev/null
@@ -1,14 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Ability for Applicant to Submit Application For Registration")
-@Narrative("""""")
-@See("https://trello.com/c/ecq5c6AZ")
-class SubmitRegistrationSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/ecq5c6AZ")
-    def "Scenario: 1 - Submit Application"(){
-     }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Registry/UpdateContactInfoSpecs.groovy b/functional-tests/src/test/groovy/Registry/UpdateContactInfoSpecs.groovy
deleted file mode 100644
index afb8b9c171..0000000000
--- a/functional-tests/src/test/groovy/Registry/UpdateContactInfoSpecs.groovy
+++ /dev/null
@@ -1,14 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Ability for Well Driller and Well Pump Installer to Update Contact Information")
-@Narrative("""""")
-@See("https://trello.com/c/TUsItNYN")
-class UpdateContactInfoSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/TUsItNYN")
-    def "Scenario: 1 - Update Contact Info"(){
-     }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Registry/WorkflowSpecs.groovy b/functional-tests/src/test/groovy/Registry/WorkflowSpecs.groovy
deleted file mode 100644
index 7ea1e11c3b..0000000000
--- a/functional-tests/src/test/groovy/Registry/WorkflowSpecs.groovy
+++ /dev/null
@@ -1,14 +0,0 @@
-import geb.spock.GebReportingSpec
-import spock.lang.*
-
-@Title("Workflow Between GW Staff and Comptroller")
-@Narrative("""""")
-@See("https://trello.com/c/cadeg3eb")
-class WorkflowSpecs extends GebReportingSpec {
-
-    @Unroll
-    @Ignore("TODO")
-    @Issue("https://trello.com/c/cadeg3eb")
-    def "Scenario: 1 - Workflow"(){
-     }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Search/SearchResults.groovy b/functional-tests/src/test/groovy/Search/SearchResults.groovy
deleted file mode 100644
index f6ab1d8c6c..0000000000
--- a/functional-tests/src/test/groovy/Search/SearchResults.groovy
+++ /dev/null
@@ -1,313 +0,0 @@
-import geb.spock.GebReportingSpec
-import pages.app.SearchPage
-import geb.Module.*
-
-import spock.lang.Ignore
-import spock.lang.Issue
-import spock.lang.Narrative
-import spock.lang.See
-import spock.lang.Specification
-import spock.lang.Title
-import spock.lang.Unroll    
-
-@Ignore()
-@Narrative('''In order to view search results as a generic user, 
-        I want to be able to see the number of matching search results and have these displayed with minimal scrolling.''')
-@Title('Feature: Search Results')
-class SearchResultsSpecs extends GebReportingSpec {
-
-    @Unroll    
-    def "Scenario 1: #TestDesc"() {
-        given:
-        to SearchPage
-        
-        when: "#TestDesc, this will result in #NumberResult found"
-        
-        SearchWell("$WellId", "$Address","$LegalId","$Owner")
-        at SearchPage
-
-        then: "If 0 results were found: No records message should be shown"
-        if("$ShowError" == "Yes") {
-			assert waitFor { not_found_msg.displayed == true }
-        }
-		
-        then: "If > 1000 results were found: Too many records message should be shown"
-        if("$TooMany" == "Yes") {
-            assert waitFor { too_many_found_msg.displayed == true }
-        }
-
-        then: "If no error, the actual result will be shown."
-        if("$ShowError" == "No" && "$TooMany" == "No") 
-        {
-			assert waitFor { results_info.displayed == true }
-
-			def str = results_info.text().split(' ')
-			assert (str[1] == "1") //From entry
-			//assert (str[3] == "1") // To entry
-            assert (str[5] == "$NumberResult") //Total entries found
-		}
-   
-
-        where:
-        TestDesc 													| WellId          	| Address                  	| LegalId   		| Owner    			| ShowError    | TooMany | NumberResult
-        "No (zero) matching results - No entry"        				| ""				| ""						| ""				| ""				| "Yes"        | "No"    | 0
-        "No (zero) matching results - Well ID 9999999"				| "9999999"			| ""						| ""				| ""				| "Yes"        | "No"    | 0
-        "No (zero) matching results - Address - Random Address"		| ""				| "Random Address"			| ""				| ""				| "Yes"        | "No"    | 0
-        "No (zero) matching results - Legal - 9999999"				| ""				| ""						| "9999999"			| ""				| "Yes"        | "No"    | 0
-        "No (zero) matching results - Owner - Random Owner"			| ""				| ""						| ""				| "Random Owner"	| "Yes"        | "No"    | 0
-        "No (zero) matching results - All Fields"					| "9999999"			| "Random Address"			| "9999999"			| "Random Owner"	| "Yes"        | "No"    | 0
-        "One matching result - Well ID - 107667"					| "107667"			| ""						| ""				| ""				| "No"         | "No"    | 1
-        "One matching result - Address - 218 RD"	     			| ""				| "218 RD"					| ""				| ""				| "No"         | "No"    | 1
-        "One matching result - Legal PID - 005337879"				| ""				| ""						| "005337879"		| ""				| "No"         | "No"    | 1
-        "One matching result - Legal PID - KAP 55997"               | ""                | ""                        | "KAP 55997"       | ""                | "No"         | "No"    | 1
-        "One matching result - Legal PID - KAP61460"                | ""                | ""                        | "KAP61460"        | ""                | "No"         | "No"    | 1
-        "Multiple matching results - Legal PID - KAP61"             | ""                | ""                        | "KAP61"           | ""                | "No"         | "No"    | 5
-        "One matching result - Owner - GARY AKLES"					| ""				| ""						| ""				| "GARY AKLES"		| "No"         | "No"    | 1
-        "One matching result - - All Fields"						| "107667"			| "218 RD"					| "BCP21690"		| "GARY AKLES"		| "No"         | "No"    | 1
-        "Multiple matching results - Well ID 110000"                | "110000"          | ""                        | ""                | ""                | "No"         | "No"    | 1
-        "Too many results - Address 1"                              | ""                | "1"                       | ""                | ""                | "No"         | "Yes"   | 9999
-        "Too many results - Legal PID 1"                            | ""                | ""                        | "1"               | ""                | "No"         | "Yes"   | 9999
-    } 
-
-    // Searches for Longitude and Latitude - typically through the map.
-    def "Scenario 1: Map Search - 0 Results"() {
-        given:
-        to SearchPage
-
-        when: "The selection will results in 0 found"
-        
-        // Need to use jquery.val here because webdriver does not allow you put values in a hidden field
-        start_lat_long.jquery.val("49.112597836986616,-122.57641553878786")
-        end_lat_long.jquery.val("49.109788627999635,-122.57078289985658")
-        submit_button.click()
-
-        then: "No records message should be shown"
-        assert waitFor { not_found_msg.displayed == true }
-    }
-    
-    def "Scenario 1: Map Search - > 0 Results"() {
-        given:
-        to SearchPage
-
-        when: "The selection will results in multiple found"
-
-        // Need to use jquery.val here because webdriver does not allow you put values in a hidden field
-        start_lat_long.jquery.val("48.69566283264445,-123.47697257995607")
-        end_lat_long.jquery.val("48.67299642073175,-123.43191146850587")
-        submit_button.click()
-
-        then: "No error msg is shown"
-            //If you expect the element not to be there (no error), you cannot use the static definition from the page class
-            assert waitFor { results_info.displayed == true }
-
-            def str = results_info.text().split(' ')
-            assert (str[1] == "1") //From entry
-            assert (str[5] > "1") //Total entries found
-    }
-
-    def "Scenario 1: Map Search - > 1000 Results"() {
-        given: "I select a large area on the map and search for wells"
-        to SearchPage
-
-        when: "The selection will result in more than 1000 wells found"
-
-        // Need to use jquery.val here because webdriver does not allow you put values in a hidden field
-        start_lat_long.jquery.val("49.403824657885124,-122.93975830078126")
-        end_lat_long.jquery.val("49.04506962208049,-122.21878051757814")
-        submit_button.click()
-
-        then: "Too many results error msg is shown"
-            assert waitFor { too_many_found_msg.displayed == true }
-    }
-
-
-    @Unroll
-
-    def "Scenario 2: #TestDesc"() {
-        given: "I have <count> search results"
-        to SearchPage
-
-        SearchWell("$WellId", "$Address","$LegalId","$Owner")
-
-        when: "I view all search results"
-
-        then: "I should see <count_message> displayed under the search results"
-
-        if("$ShowError" == "Yes")
-            assert waitFor { not_found_msg.displayed == true }
-        else
-        {
-            assert waitFor {($("div",id:"results_info").displayed == true)}
-
-            assert waitFor { results_info.displayed == true }
-
-            def str = results_info.text().split(' ')
-            if ( "$NumberResult".toInteger() < 10){
-                assert (str[3] == "$NumberResult") // To entry
-            }
-            else {
-                assert (str[3] == "10") // To entry
-            }
-            assert (str[5] == "$NumberResult") //Total entries found
-        }
-        //And the screen should jump (shift focus) to the search results - Not Implemented
-        where:
-        TestDesc                                                    | WellId            | Address                   | LegalId           | Owner             | ShowError    | NumberResult
-        "One matching result - Well ID - 107667"                    | 107667            | ""                        | ""                | ""                | "No"         | 1
-        "One matching result - Address - 218 RD"                    | ""                | "218 RD"                  | ""                | ""                | "No"         | 1
-        "One matching result - Legal PID - 005337879"               | ""                | ""                        | "005337879"       | ""                | "No"         | 1
-        "One matching result - Owner - GARY AKLES"                  | ""                | ""                        | ""                | "GARY AKLES"      | "No"         | 1
-        "One matching result - - All Fields"                        | "107667"          | "218 RD"                  | "BCP21690"       | "GARY AKLES"      | "No"         | 1
-        "Multiple matching results - Address 12"                    | ""                | "12"                     | ""                | ""                | "No"         | 363
-        "Multiple matching results - Owner ROLAND"                  | ""                | ""                        | ""                | "ROLAND"          | "No"         | 12
-    }     
-
-//  As a general public user I want to be able to begin a new search with an easy way to remove previous search criteria.
-    def "Scenario 3: Reset Button"() {
-        given: "that I am a general public user"
-            to SearchPage
-            SearchWell("107667", "218 RD","026737680","GARY AKLES")
-        and: "I want to start a new search"
-        when: "I click on the Reset button"
-            reset_button.click()
-        then: "I should see all previous search criteria removed and the map reset to it's original zoom level"
-            assert ( well_id == ""  ) 
-            assert ( address == ""  )
-            assert ( legal_id == "" )
-            assert ( owner_id == "" )
-            assert ( map_zoomlevel.text() == "500 km" )            
-    }
-
-//  As a general public user I want to be able to zoom in and out of the map so that I can see wells 
-//  both up close and far away.
-    def "Scenario 4: Zoom in/out buttons on map"() {
-        given: "that I am a general public user"
-            to SearchPage
-        and: "I want to zoom in and out on the map"
-        when: "I click on the plus button"
-            // starting position
-            assert waitFor { ( map_zoomlevel.text() == "500 km" ) }
-            zoom_in.click()
-        then: "the map should zoom in"
-            assert waitFor { ( map_zoomlevel.text() == "200 km" ) }
-        when: "I click on the minus button"
-            // starting position
-            assert waitFor { ( map_zoomlevel.text() == "200 km" ) }
-            zoom_out.click()
-        then: "the map should zoom out"
-            assert waitFor { ( map_zoomlevel.text() == "500 km" ) } 
-    }
-
-//  As a general public user, when I have reached the 5km scale, I need a prompt to let me know that I have to search for wells in this area in order to find my well.
-    def "Scenario 5: Zoom Tool Function"() {
-        given: "that I am doing a map based search on the Search tool"
-            to SearchPage
-            assert waitFor { ( map_zoomlevel.text() == "500 km" ) }
-        and: "I have selected the zoom tool box"
-        when: "I zoom to a scale of 5 km"
-            while ( map_zoomlevel.text() != "5 km" ){
-                zoom_in.click()
-                // Slowing down the clicks a bit to allow to system to stay in sync
-                sleepForNSeconds(2)
-            } 
-            assert waitFor { ( map_zoomlevel.text() == "5 km" ) }
-        then: "I should see a box appear on the map that states 'Search Wells In This Area'"
-            assert waitFor { ( map_search_wells.displayed == true )  }
-    }
-//  As a general public user, when I forget to enter any search data in the available text boxes, I want an error message to show me my mistakes so that I can try my search again.
-    def "Scenario 6: No Search Criteria Error Message"() {
-        given: "that I am looking for a welll"
-            to SearchPage
-        and: "I am searching using any of the available text fields"
-        when: "I forget to enter any data"
-            SearchWell("", "","","")
-        then: "I should see a red warning label appear above the well tag number and well identification plate number field that states 'At least 1 search field is required'"
-            assert waitFor { one_search_field_req.displayed == true } 
-        and: "a yellow warning label appear under the Groundwater Well Search that states 'No well records could be found'"
-            assert waitFor { not_found_msg.displayed == true }    
-    }
-
-    @Unroll
-    //As a general public user I want to be able to choose how many search results to display on one page.
-    def "Scenario 7: Choose Number of search results to be displayed."() {
-        given: "As a general public user I want to be able to choose how many search results to display on one page."
-        to SearchPage
-
-        when: "#TestDesc, this will result in #NumberResult found"
-        
-            SearchWell("$WellId", "$Address","$LegalId","$Owner")
-            at SearchPage
-
-            assert waitFor { results_info }
-            assert waitFor { NumberEntryTo() == "10" }
-            
-        and: "I select Show 25 entries,"
-            def select = $(name: "results_length").module(geb.module.Select)
-            select.selected = "25"
-           
-            assert select.selected == "25"
-            assert select.selectedText == "25"
-
-        then: "25 entries will be shown"
-            
-            assert waitFor { results_info }
-            assert waitFor { NumberEntryTo() == "25" }
-
-
-        where:
-        TestDesc                                                    | WellId            | Address                   | LegalId           | Owner             | NumberResult
-        "Multiple matching results - Address 12"             | ""                | "12"                     | ""                | ""                | 363
-        "Multiple matching results - Owner GARY"              | ""                | ""                        | ""                | "GARY"            | 55
-    }
-
-    @Unroll
-    //As a general public user, I want to be able to sort the search results table to be better able 
-    //to organize and see the results of my search in order to help me find my well.
-
-    def "Scenario 8: Sort numeric column"() {
-        given: "I have completed a text search using any criteria."
-                to SearchPage
-                SearchWell("$WellId", "$Address","$LegalId","$Owner")
-            at SearchPage
-        and: "And I have received search results in the table located below the map and text fields"     
-            assert waitFor { results_info }
-
-        when: "I select the sort arrow beside a numeric column name"
-        def original_content = $('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').text().toInteger()
-        $('#results > thead > tr > th:nth-child(1)').click()
-        sleepForNSeconds(2)
-        
-        then: "Then the table should re-sort ascending or descending depending on which column was selected."
-        def new_content = $('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').text().toInteger()
-        assert original_content < new_content
-
-        where:
-        TestDesc                                                    | WellId            | Address                   | LegalId           | Owner             | NumberResult
-        "Multiple matching results - Address 12"             | ""                | "12"                     | ""                | ""                | 363
-        "Multiple matching results - Owner GARY"              | ""                | ""                        | ""                | "GARY"            | 55
-    }
-
-       def "Scenario 9: Sort string column"() {
-        given: "I have completed a text search using any criteria."
-                to SearchPage
-                SearchWell("", "$Address","","$Owner")
-            at SearchPage
-        and: "And I have received search results in the table located below the map and text fields"     
-            assert waitFor { results_info }
-
-        when: "I select the sort arrow beside a numeric column name"
-        def original_content = $('#results > tbody > tr:nth-child(1) > td:nth-child(1)').text()
-        $('#results > thead > tr > th:nth-child(1)').click()
-        sleepForNSeconds(2)
-        
-        then: "Then the table should re-sort ascending or descending depending on which column was selected."
-        def new_content = $('#results > tbody > tr:nth-child(1) > td:nth-child(1)').text()
-
-        assert original_content.toInteger() <= new_content.toInteger()
-
-        where:
-        TestDesc                                                    | WellId            | Address                   | LegalId           | Owner             | NumberResult
-        "Multiple matching results - Address 12"             | ""                | "12"                     | ""                | ""                | 363
-        "Multiple matching results - Owner GARY"              | ""                | ""                        | ""                | "GARY"            | 55
-    }
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Search/SearchResultsPagination.groovy b/functional-tests/src/test/groovy/Search/SearchResultsPagination.groovy
deleted file mode 100644
index c23ce1f12d..0000000000
--- a/functional-tests/src/test/groovy/Search/SearchResultsPagination.groovy
+++ /dev/null
@@ -1,143 +0,0 @@
-import geb.spock.GebReportingSpec
-import pages.app.SearchPage
-import pages.app.WellSummaryPage
-
-import spock.lang.Unroll
-import spock.lang.Ignore
-import spock.lang.Issue
-import spock.lang.Narrative
-//import spock.lang.PendingFeature
-import spock.lang.See
-import spock.lang.Specification
-import spock.lang.Title
-
-@Title("Search Results Pagination")
-@Narrative("""
-In order to view search results as a generic user, I want search results to be paginated when there more than 25 results
-""")
-class SearchResultsPaginationSpecs extends GebReportingSpec {
-
-    @Unroll
-
-/* 	Scenario 1: Page links
-Given I have <count> search results
- When I view all search results from page <page>
-  Then I should see a link to page <target_page>
-
-    Examples:
-      |  count | page | target_page |
-      |   26   |   1  |       1     |
-      |   26   |   1  |       2     |
-      |   26   |   2  |       1     |
-      |   26   |   2  |       2     |
-      |   51   |   1  |       1     |
-      |   51   |   1  |       2     |
-      |   51   |   1  |       3     |
-      |   51   |   2  |       1     |
-      |   51   |   2  |       2     |
-      |   51   |   2  |       3     |
-      |   51   |   3  |       1     |
-      |   51   |   3  |       2     |
-      |   51   |   2  |       3     |
- */
-
-    def "Scenario 1: Page links: #TestDesc"() {
-        given: "I have #NumberResult wells search result"
-          to SearchPage
-
-          SearchWell("", "$Address","","")
-          
-          assert waitFor { results_info.displayed == true }
-      
-        when: "I view all search results from page #Page"
-          assert (NumberOfEntriesFound() == "$NumberResult") //Total entries found
-          assert waitFor {(CheckPageButton("$Page") == true)}
-
-          $("#results_paginate a[data-dt-idx=\"$Page\"]").click()
-          assert waitFor {(NumberEntryFrom().toInteger() == ("$Page".toInteger() - 1) * 10 + 1 )}
-
-        then: "I should see a link to page #TargetPage"
-        	assert waitFor {(CheckPageButton("$TargetPage") == true)}
-
-        	def CalcMax = "$NumberResult".toInteger() / "$TargetPage".toInteger()
-
-        	if ( CalcMax <= 10 ) {
-        		$("#results_paginate a[data-dt-idx=\"7\"]").click()	
-        	}
-        	else {
-        		$("#results_paginate a[data-dt-idx=\"$TargetPage\"]").click()	
-        	}
-        	assert waitFor {(NumberEntryFrom().toInteger() == ("$TargetPage".toInteger() - 1) * 10 + 1 )}
-
-
-        	//$("#results_paginate a[data-dt-idx=\"$TargetPage\"]").click()
-        where:
-		    TestDesc 													                          | WellId          | Address                  	| LegalId   		    | Owner    			    | Page    |TargetPage | NumberResult
-        "Multiple matching results - Address 12 - 1 to Max"        | ""             	| "12"                     | ""                | ""                | 1    	  |3    	    | 363    
-        "Multiple matching results - Address 12 - 1 to 2"          | ""             	| "12"                     | ""                | ""                | 1    	  |2    	    | 363   
-        "Multiple matching results - Address 12 - 2 to 3"          | ""             	| "12"                     | ""                | ""                | 2    	  |3    	    | 363   
-        "Multiple matching results - Address 12 - 1 to 3"          | ""             	| "12"                     | ""                | ""                | 1    	  |3    	    | 363   
-        "Multiple matching results - Address 12 - 3 to 1"          | ""             	| "12"                     | ""                | ""                | 3    	  |1    	    | 363   
-        "Multiple matching results - Address 12 - 3 to 2"          | ""             	| "12"                     | ""                | ""                | 3    	  |2    	    | 363   
-    } 
-        @Unroll
-        def "Scenario 2: Next Page links: #TestDesc#Testresult"() {
-        given: "I have #NumberResult wells search result"
-         to SearchPage
-
-         SearchWell("", "$Address","","")      
-
-         assert waitFor { results_info.displayed == true }
-  
-        when: "I view all search results from page #Page"
-          assert (NumberOfEntriesFound() == "$NumberResult") //Total entries found
-          assert waitFor {(CheckPageButton("$Page") == true)}
-          $("#results_paginate a[data-dt-idx=\"$Page\"]").click()
-
-        then: "I should see \'Next\' is #Testresult"
-          assert waitFor {(next_button.displayed == true)}
-          
-          if ( "$Testresult" == "enabled" )
-          {
-            assert waitFor {(next_button.classes().sort() == ["next", "page-item", "paginate_button"])}
-          }
-          else
-          {
-            assert waitFor {(next_button.classes().sort() == ["disabled", "next", "page-item", "paginate_button"])}
-          }
-        where:
-        TestDesc                                                      | WellId | Address | LegalId | Owner | Page | NumberResult | Testresult
-        "Multiple matching results - Address 123 - Next is "  | ""     | "123"   | ""      | ""    | 3    | 29    | "disabled"
-        "Multiple matching results - Address 123 - Next is " | ""     | "123"   | ""      | ""    | 1    | 29    | "enabled"
-    } 
-
-    @Unroll
-    def "Scenario 3: Previous Page links: #TestDesc#Testresult"() {
-        given: "I have NumberResult wells search result"
-         to SearchPage
-
-         SearchWell("", "$Address","","")
-      
-         assert waitFor { results_info.displayed == true }
-  
-        when: "I view all search results from page #Page"
-          assert (NumberOfEntriesFound() == "$NumberResult") //Total entries found
-          assert waitFor {(CheckPageButton("$Page") == true)}
-          $("#results_paginate a[data-dt-idx=\"$Page\"]").click()
-
-        then: "I should see \'Previous\' is #Testresult."
-          assert waitFor {(previous_button.displayed == true)}  
-        if ( "$Testresult" == "enabled" )
-          {
-            assert waitFor {(previous_button.classes().sort() == ["page-item", "paginate_button", "previous"])}
-          }
-          else
-          {
-            assert waitFor {(previous_button.classes().sort() == ["disabled", "page-item", "paginate_button", "previous"])}
-          }
-        where:
-        TestDesc                                                          | WellId | Address | LegalId | Owner | Page | NumberResult | Testresult
-        "Multiple matching results - Address 123 - Previous is "  | ""     | "123"   | ""      | ""    | 1    | 29           | "disabled"
-        "Multiple matching results - Address 123 - Previous is " | ""     | "123"   | ""      | ""    | 3   | 29            | "enabled"
-    } 
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/Search/WellSearch.groovy b/functional-tests/src/test/groovy/Search/WellSearch.groovy
deleted file mode 100644
index d17684e46f..0000000000
--- a/functional-tests/src/test/groovy/Search/WellSearch.groovy
+++ /dev/null
@@ -1,336 +0,0 @@
-import geb.spock.GebReportingSpec
-import pages.app.SearchPage
-import pages.app.WellSummaryPage
-
-import spock.lang.Ignore
-import spock.lang.Issue
-import spock.lang.Narrative
-import spock.lang.See
-import spock.lang.Specification
-import spock.lang.Title
-import spock.lang.Unroll
-
-@Title("Well Search")
-@Narrative("""
-In order to find a well as a generic user, I want to be able to search for a well using search criteria
-""")
-class WellSearchSpecs extends GebReportingSpec {
-    @Unroll
-
-/* 	Scenario 1: Well Search by Well Tag Number OR Well Identification Plate Number
-	Given I am a generic user
-		And I want to search for a well by Well Tag Number OR Well Identification Plate Number
-	When I enter a valid Well Tag Number or Well Idenification Plate Number in the Well field 
-		And click search
-	Then I should see the wells matching the entered Well Tag Number OR Well Identification Plate Number displayed in the search results
-		And each search result will include a link to the associated well details page
-		And where there are no matching search results the message "No well records could be found." is displayed
- */
-
-    def "Scenario 1: Well Search by Well Tag Number OR Well Identification Plate Number: #TestDesc"() {
-        given: "I am a generic user"
-        
-		and: "I want to search for a well by Well Tag Number OR Well Identification Plate Number"
-			to SearchPage
- 
-        when: "I enter a valid Well Tag Number or Well Idenification Plate Number in the Well field And click search"
-			SearchWell("$WellId", "","","")
-
-        then: "I should see the wells matching the entered Well Tag Number OR Well Identification Plate Number displayed in the search results"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-				assert waitFor { results_info.displayed == true }
-				assert (NumberOfEntriesFound() == "$NumberResult") //Total entries found
-
-           		if ("$TagID" == "tag") {
-           			assert waitFor {  ( CheckResultTable("$WellId") == true ) }
-           			}
-				else {
-					assert waitFor {  ( CheckResultTable("$SecondID") == true ) }
-					}	
-			}
-		
-		and: "each search result will include a link to the associated well details page"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-				assert waitFor { results_info.displayed == true }
-				assert (NumberOfEntriesFound() == "$NumberResult") //Total entries found
-
-           		println "Tag ID: $TagID"
-           		if ("$TagID" == "tag") {
-					//println "$WellId"
-					//println "Well ID: " + $('#results > tbody > tr:nth-child('+ ReturnRow("$WellId").toString() +') > td.sorting_1 > a').text()
-					$('#results > tbody > tr:nth-child('+ ReturnRow("$WellId").toString() +') > td.sorting_1 > a').click()
-       				at WellSummaryPage
-						assert waitFor { ($("span",id:"well_tag_number").text() == "$WellId") }
-					}
-				else {
-					//println "$SecondID"
-					//println "SecondID: " + $('#results > tbody > tr:nth-child('+ ReturnRow("$SecondID").toString() +') > td.sorting_1 > a').text()
-					$('#results > tbody > tr:nth-child('+ ReturnRow("$SecondID").toString() +') > td.sorting_1 > a').click()
-       				at WellSummaryPage
-						assert waitFor { ($("span",id:"well_tag_number").text() == "$SecondID") }
-					}
-			}
-            		
-		and: "And where there are no matching search results the message -No well records could be found.- is displayed"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }		
-
-        where:
-        TestDesc                                                    | WellId           | ShowError    | NumberResult	|TagID 	| SecondID
-        "One matching result - Well Tag - 107667"                   | 107667           | "No"         | 1				|"tag"	|""
-        "One matching result - Well ID 52471"         		        | 52471            | "No"         | 1				|"ID"	|"113308"
-        "No matching results - Well ID 999999"                   	| 999999           | "Yes"        | 0				|"tag"	|""
-    } 
-            @Unroll
-
-/* 	Scenario 2: Well Search by Street Address
-	Given I am a generic user
-	And I want to search for a well by Street Address
- 	When I enter a complete or partial street address in the Address field 
- 	And click search
-  	Then I should see wells containing the entered street address information displayed in the search results
-  	And each search result will include a link to the associated well details page
-  	And where there are no matching search results the message "No well records could be found." is displayed
- */
-
-    def "Scenario 2: Well Search by Street Address: #TestDesc"() {
-        given: "I am a generic user"
-		and: "I want to search for a well by Street Address"
-			to SearchPage
- 
-        when: "I enter a complete or partial street address in the Address field"
-		and: "click search"
-			SearchWell("", "$Address","","")
-
-        then: "I should see wells containing the entered street address information displayed in the search results"
-        
-		
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-	         	//assert results_table.join(",").indexOf("$Address") >= -1
-	         	assert waitFor { results_info.displayed == true }
-	         	assert waitFor { CheckResultTable("$Address") == true }
-	         }	
-
-		and: "each search result will include a link to the associated well details page"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-				assert waitFor { results_info.displayed == true }
-				assert (NumberOfEntriesFound() == "$NumberResult") //Total entries found
-				def value = $('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').text()
-				$('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').click()
-       			at WellSummaryPage
-					assert waitFor { ( $('#well_tag_number').text() == value ) }
-		
-			}
-  		
-		and: "And where there are no matching search results the message -No well records could be found.- is displayed"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }		
-
-        where:
-        TestDesc                        					| Address          | ShowError    | NumberResult
-        "One matching result - Address - 4123 WRIGHT STREET "	| "4123 WRIGHT STREET "| "No"         | 1
-        "Multiple matching results - Address - 123"     	| "123"            | "No"         | 29	
-        "Multiple matching results - Address - 16TH"     	| "16TH"           | "No"         | 18
-        "No matching results - Address - 999999"         	| "999999"         | "Yes"        | 0
-        "No matching results - Address - <null>"         	| ""		       | "Yes"        | 0
-    }
-
-    @Unroll
-
-/* Scenario 3: Well Search by Legal Plan or District Lot or PID
-	Given I am a generic user
-		And I want to search for a well by Legal Plan or District Lot or PID
- 	When I enter a Legal Plan, District Lot or PID information in the Legal Description field
- 		And click search
-  	Then I should see wells containing the entered Legal Plan, District Lot or PID information displayed in the search results
-  		And each search result will include a link to the associated well details page
-  		And where there are no matching search results the message "No well records could be found." is displayed
- */
-
-    def "Scenario 3: Well Search by Plan,Lot or PID - #TestDesc"() {
-        given: "I am a generic user"
-		and: "I want to search for a well by Legal Plan or District Lot or PID"
-			to SearchPage
- 
-        when: "I enter a Legal Plan, District Lot or PID information in the Legal Description field"
-		and: "click search"
-			SearchWell("", "","$LegalId","")
-
-        then: "I should see wells containing the entered Legal Plan, District Lot or PID information displayed in the search results"
-        
-		
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-	         	assert waitFor {($("div",id:"results_info").displayed == true)}
-	         	assert waitFor { CheckResultTable("$LegalId") == true }
-	         }	
-
-		and: "each search result will include a link to the associated well details page"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-				assert waitFor { results_info.displayed == true }
-				assert (NumberOfEntriesFound() == "$NumberResult") //Total entries found
-				def value = $('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').text()
-				$('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').click()
-       			at WellSummaryPage
-					assert waitFor { ($("span",id:"well_tag_number").text() == value) }
-			}
-		
-		and: "And where there are no matching search results the message -No well records could be found.- is displayed"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }		
-
-        where:
-        TestDesc                        					| LegalId	       | ShowError    | NumberResult
-        "Plan - 54433"										| "54433"		   | "No"    	  | 1
-        "Lot - 123"     									| "123"            | "No"         | 116
-        //"PID - 008710902"     								| "008710902"      | "No"         | 1
-        "No matching results - Legal ID - 999999"         	| "999999"         | "Yes"        | 0
-        "No matching results - Legal ID - <null>"         	| ""		       | "Yes"        | 0
-    } 
-
-    @Unroll
-
-/* Scenario 4: Well Search by Owner Name
-	Given I am a generic user
-		And I want to search for a well by Owner Name
- 	When I enter a complete or partial owner name in the Owner Name
- 		And click search
-  	Then I should see wells containing the entered owner name information displayed in the search results
-  		And each search result will include a link to the associated well details page
-  		And where there are no matching search results the message "No well records could be found." is displayed
- */
-
-    def "Scenario 4: Well Search by Owner Name - #TestDesc"() {
-        given: "I am a generic user"
-		and: "And I want to search for a well by Owner Name"
-			to SearchPage
- 
-        when: "I enter a complete or partial owner name in the Owner Name"
-		and: "click search"
-			SearchWell("", "","","$Owner")
-
-        then: "I should see wells containing the entered owner name information displayed in the search result"
-	
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-	         	assert waitFor {($("div",id:"results_info").displayed == true)}
-	         	assert waitFor { CheckResultTable("$Owner") == true }
-	         }	
-
-		and: "each search result will include a link to the associated well details page"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-				assert waitFor { results_info.displayed == true }
-				assert (NumberOfEntriesFound() == "$NumberResult") //Total entries found
- 				def value = $('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').text()
-				$('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').click()
-       			at WellSummaryPage
-					assert waitFor {($("span",id:"well_tag_number").text() == value) }
-			}
-		
-		and: "And where there are no matching search results the message -No well records could be found.- is displayed"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }		
-
-        where:
-        TestDesc                        		| Owner	       	| ShowError    | NumberResult
-        "Multiple Results - Gary"				| "GARY"	   	| "No"     	   | 55
-		"Single Result - Gary Akles"     		| "GARY AKLES" 	| "No"         | 1	
-        "No matching results - Random Owner"    | "Random Owner"| "Yes"        | 0
-        "No matching results - <null>"         	| ""		    | "Yes"        | 0
-    } 
-
-    @Unroll
-
-/* Scenario 5: Well Search using multiple search parameter fields
-	Given I am a generic user
-		And I want to search for a well by Owner Name AND Street Address
- 	When I enter a complete or partial owner name in the Owner Name field
- 		And I enter a complete or partial street address in the Street Address field 
- 	And click Search 
-  	Then I should see wells containing the entered owner name and street address information displayed in the search results
-  		And each search result will include a link to the associated well details page
-  		And where there are no matching search results the message "No well records could be found." is displayed
-
-** Does this need to be enhanced to describe the use of boolean logic (AND vs. OR)?
- */
-
-    def "Scenario 5: Well Search by Owner Name and street address - #TestDesc"() {
-        given: "I am a generic user"
-		and: "I want to search for a well by Owner Name AND Street Address"
-			to SearchPage
- 
-        when: "I enter a complete or partial owner name in the Owner Name field"
-        	//owner_id.value("$Owner")
-        
-        and: "And I enter a complete or partial street address in the Street Address field"
-            //address.value("$Address") 	
-		
-		and: "click search"
-			SearchWell("", "$Address","","$Owner")
-
-        then: "I should see wells containing the entered owner name information displayed in the search result"
-	
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-	         	assert waitFor { results_info.displayed == true }
-	         	assert waitFor { CheckResultTable("$Address") == true }
-	         	assert waitFor { CheckResultTable("$Owner") == true }
-	         }	
-
-		and: "each search result will include a link to the associated well details page"
-			if("$ShowError" == "Yes")
-				assert waitFor { not_found_msg.displayed == true }
-			else
-			{
-				assert waitFor { results_info.displayed == true }
-				assert (NumberOfEntriesFound() == "$NumberResult") //Total entries found
-				def value = $('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').text()
-				$('#results > tbody > tr:nth-child(1) > td.sorting_1 > a').click()
-       			at WellSummaryPage
-					assert waitFor {($("span",id:"well_tag_number").text() == value) }
-			}
-		
-		and: "And where there are no matching search results the message -No well records could be found.- is displayed"
-			if("$ShowError" == "Yes")
-			    assert waitFor { not_found_msg.displayed == true }
-
-        where:
-        TestDesc                                            | Owner         | Address           | ShowError     | NumberResult
-        "Multiple Results - Gary"                           | "GARY"        | ""		        | "No"          | 55
-        "Single Result - Gary Akles"                        | "GARY AKLES"  | ""		        | "No"          | 1	
-        "No matching results - Random Owner"                | "Random Owner"| ""		        | "Yes"         | 0
-        "No matching results - Random Address"              | ""            | "Random Address"  | "Yes"         | 0
-        "No matching results - Random Owner/Address"        | "Random Owner"| "Random Address"  | "Yes"         | 0
-        "No matching results - <null>"                      | ""            | ""		        | "Yes"         | 0
-        "One matching result - Address - 1229 LAKE ROAD "	| ""            | "1229 LAKE ROAD " | "No"          | 1
-        "Multiple matching results - Address - 123"         | ""            | "123"             | "No"          | 29	
-        "Multiple matching results - Address - 16TH"        | ""            | "16TH"            | "No"          | 18
-       	"Partial Owner/Address - Gary/7239"                 | "GARY"        | "7239"		    | "No"          | 1
-        "Full Owner/ partial Address - Ronald/MALAHAT"      | "RONALD"      | "MALAHAT"		    | "No"          | 1
-        "Partial Owner/Full Address - Gary/PILGRIM "        | "GARY"        | "PILGRIM "		| "No"          | 1
-    }         
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/modules/CommonLinkModule.groovy b/functional-tests/src/test/groovy/modules/CommonLinkModule.groovy
new file mode 100644
index 0000000000..4d76eac6b9
--- /dev/null
+++ b/functional-tests/src/test/groovy/modules/CommonLinkModule.groovy
@@ -0,0 +1,34 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package modules
+
+import geb.Module
+import geb.navigator.Navigator
+
+/**
+ * Contains objects and methods for interacting with generic page links.
+ */
+class CommonLinkModule extends Module {
+
+  /**
+   * Attempts to find and click a link on the page.
+   *
+   * @param a map of attributes of the desired anchor tag. eg: [text:'footer link text']. (required)
+   * @param a selector to narrow the search space. (required)
+   */
+  void clickPageLink(Map<String, Object> itemSelector, Navigator parentSelector) {
+    parentSelector.$(itemSelector, 'a').click()
+  }
+}
diff --git a/functional-tests/src/test/groovy/modules/FooterModule.groovy b/functional-tests/src/test/groovy/modules/FooterModule.groovy
new file mode 100644
index 0000000000..eb6cd991de
--- /dev/null
+++ b/functional-tests/src/test/groovy/modules/FooterModule.groovy
@@ -0,0 +1,34 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package modules
+
+import geb.Module
+
+/**
+ * Contains objects and methods for interacting with the global footer bar.
+ */
+class FooterModule extends Module {
+  static content = {
+    footerBar { $('footer') }
+  }
+
+  /**
+   * Clicks footer menu anchor tags based on the displayed text.
+   * @param a map of attributes of the footer menu anchor tag. eg: [text:'footer link text'] (required)
+   */
+  void clickMenuItem(Map<String, Object> itemSelector) {
+    footerBar.$(itemSelector, 'a').click()
+  }
+}
diff --git a/functional-tests/src/test/groovy/modules/HeaderModule.groovy b/functional-tests/src/test/groovy/modules/HeaderModule.groovy
new file mode 100644
index 0000000000..7db76908b6
--- /dev/null
+++ b/functional-tests/src/test/groovy/modules/HeaderModule.groovy
@@ -0,0 +1,49 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package modules
+
+import geb.Module
+import geb.navigator.Navigator
+
+/**
+ * Contains objects and methods for interacting with the global header bar.
+ */
+class HeaderModule extends Module {
+  static content = {
+    bcLogo { $('.navbar-brand') }
+
+    loginButton { $('#keycloak-auth #gwells-sso-login') }
+
+    headerNavigationBar { $('header #navContainer .navbar-nav') }
+  }
+
+  /**
+   * Clicks a header menu anchor tag based on its attributes, typically text.
+   * @param a map of attributes of the header menu anchor tag. eg: [text:'header link text'] (required)
+   */
+  void clickMenuItem(Map<String, Object> itemSelector) {
+    waitFor {
+      getHeaderSelector(itemSelector).click()
+    }
+  }
+
+  /**
+   * Returns the selector for a header menu anchor tag based on its attributes, typically text.
+   * @param a map of attributes of the header menu anchor tag. eg: [text:'header link text'] (required)
+   */
+  Navigator getHeaderSelector(Map<String, Object> itemSelector) {
+    headerNavigationBar.$(itemSelector, 'a')
+  }
+}
diff --git a/functional-tests/src/test/groovy/modules/ModalModule.groovy b/functional-tests/src/test/groovy/modules/ModalModule.groovy
new file mode 100644
index 0000000000..63016dcd94
--- /dev/null
+++ b/functional-tests/src/test/groovy/modules/ModalModule.groovy
@@ -0,0 +1,49 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package modules
+
+import geb.Module
+
+import geb.navigator.Navigator
+
+/**
+ * Contains objects and methods for interacting with modal pages.
+ *
+ * Due to the nature of modal windows opening without a url change, and often with some delay for a smoother user
+ *  experience, it is important to call isOpen() once before interacting with the modal in any way.
+ * Likewise, call isClosed() once after all modal interactions, one of which should close the modal, to ensure the modal
+ *  has fully closed.
+ */
+class ModalModule extends Module {
+  static content = {
+    modalWindow(required:false) { $('.modal') }
+  }
+
+  /**
+   * Wait for the modal window to open (be displayed).
+   * @param a custom modal selector to use instead of the generic default. Necessary if multiple modal windows are
+   *  present on the page. (optional)
+   */
+  boolean isOpen(Navigator modalSelector = modalWindow) {
+    waitFor { modalSelector.displayed }
+  }
+
+  /**
+   * Wait for any modal windows to close (be not displayed).
+   */
+  boolean isClosed(Navigator modalSelector = modalWindow) {
+    waitFor { modalSelector.displayed == false }
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/ActivitySubmissionPage.groovy b/functional-tests/src/test/groovy/pages/app/ActivitySubmissionPage.groovy
deleted file mode 100644
index 6ff5c8ac69..0000000000
--- a/functional-tests/src/test/groovy/pages/app/ActivitySubmissionPage.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-package pages.app
-
-import geb.Page
-
-class ActivitySubmissionPage extends Page {
-    static at = { title == "Groundwater Wells Activity Submission - Province of British Columbia" }
-
-    static url = "gwells/submission/create"
-}
diff --git a/functional-tests/src/test/groovy/pages/app/AdditionalInformationPage.groovy b/functional-tests/src/test/groovy/pages/app/AdditionalInformationPage.groovy
deleted file mode 100644
index f033482000..0000000000
--- a/functional-tests/src/test/groovy/pages/app/AdditionalInformationPage.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-package pages.app
-
-import geb.Page
-
-class AdditionalInformationPage extends Page {
-    static at = { title == "Groundwater Wells Groundwater Information - Province of British Columbia" }
-
-    static url = "gwells/groundwater-information"
-}
diff --git a/functional-tests/src/test/groovy/pages/app/HomePage.groovy b/functional-tests/src/test/groovy/pages/app/HomePage.groovy
index 29b7e3a0da..ee2322c6eb 100644
--- a/functional-tests/src/test/groovy/pages/app/HomePage.groovy
+++ b/functional-tests/src/test/groovy/pages/app/HomePage.groovy
@@ -1,10 +1,58 @@
-package pages.app
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-import geb.Page
+        http://www.apache.org/licenses/LICENSE-2.0
 
-class HomePage extends Page {
-	// NOTE - the title comparison is based on parsed HTML, not an exact character match of the HTML source.  For example "  " becomes " ". 
-	// So even though there are currently two spaces after Wells in the page source, we have to compare against a single space after Wells.
-    static at = { title == "Groundwater Wells - Province of British Columbia" }
-    static url = "gwells"
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+class HomePage extends BaseAppPage {
+  static at = { pageTitle.text() == 'Groundwater Well Search' }
+  static url = ''
+  static content = {
+    pageTitle { $('#main-content h2') }
+
+    bodyContent { $('#main-content') }
+
+    wellTagOrPlateField { $('#id_well') }
+    streetAddressField { $('#id_addr') }
+    legalPlanOrDistrictLotOrPIDField { $('#id_legal') }
+    ownerNameField { $('#id_owner') }
+
+    searchButton { $('input', type:'submit', value:'Search') }
+
+    searchResultsTable(required:false) { $('#results') }
+  }
+
+  void setWellTagOrIdentificationPlateNumber(int value) {
+    wellTagOrPlateField.value(value)
+  }
+
+  void setStreetAddress(String address) {
+    streetAddressField.value(address)
+  }
+
+  void setLegalPlanOrDistrictLotorPID(String value) {
+    legalPlanOrDistrictLotOrPIDField.value(value)
+  }
+
+  void setOwnerName(String name) {
+    ownerNameField.value(name)
+  }
+
+  void clickSearchButton() {
+    searchButton.click()
+  }
+
+  Boolean foundSearchResults() {
+    waitFor { searchResultsTable.$('tbody tr').size() != 0 }
+  }
 }
diff --git a/functional-tests/src/test/groovy/pages/app/InformationPage.groovy b/functional-tests/src/test/groovy/pages/app/InformationPage.groovy
new file mode 100644
index 0000000000..af283db7a5
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/InformationPage.groovy
@@ -0,0 +1,25 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+class InformationPage extends BaseAppPage {
+  static at = { pageTitle.text() == 'Groundwater Information' }
+  static url = 'groundwater-information'
+  static content = {
+    pageTitle { $('#main-content h2') }
+
+    bodyContent { $('#main-content') }
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/OrganizationsPage.groovy b/functional-tests/src/test/groovy/pages/app/OrganizationsPage.groovy
new file mode 100644
index 0000000000..b7230b8b91
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/OrganizationsPage.groovy
@@ -0,0 +1,133 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+class OrganizationsPage extends BaseAppPage {
+  static at = { pageTitle.text() == 'Manage Companies' }
+  static url = ''
+  static content = {
+    pageTitle { $('main h4') }
+
+    addAlert(required:false) { $('#orgAddSuccessAlert') }
+    updateAlert(required:false) { $('#orgUpdateSuccessAlert') }
+    deleteAlert(required:false) { $('#orgDeleteSuccessAlert') }
+
+    // add company
+    addNewCompanyButton(wait:2) { $('#orgAddNewButton') }
+
+    // Update/Delete company
+    selectCompanySearchField { $('#orgEditSelectDropdown').$('input', type:'search') }
+    selectCompanyDropdown(required:false) { $('#orgEditSelectDropdown').$('.dropdown-menu') }
+
+    // Update company
+    companyNameField(required:false) { $('#orgEditNameInput') }
+    streetAddressField(required:false) { $('#orgEditAddressInput') }
+    cityField(required:false) { $('#orgEditCityInput') }
+    provinceDropdown(required:false) { $('#orgEditProvinceInput') }
+    postalCodeField(required:false) { $('#orgEditPostalInput') }
+    telephoneNumberField(required:false) { $('#orgEditPhoneInput') }
+    faxNumberField(required:false) { $('#orgEditFaxInput') }
+    emailField(required:false) { $('#orgEditEmailInput') }
+    websiteField(required:false) { $('#orgEditWebsiteInput') }
+
+    updateButton(required:false) { $('button', type:'submit', text:'Update') }
+
+    // Delete company
+    deleteButton(required:false) { $('button', type:'button', text:'Delete this company') }
+  }
+
+  // Add company
+  void clickAddNewCompanyButton() {
+    addNewCompanyButton.click()
+  }
+
+  Boolean addCompanySuccessAlertDisplayed() {
+    return waitFor {
+      addAlert.displayed == true &&
+      addAlert.text() =~ 'Company added'
+    }
+  }
+
+  // Update/Delete company
+  void selectCompany(String regex) {
+    selectCompanySearchField.click()
+
+    interact {
+      waitFor {
+        moveToElement(selectCompanyDropdown.$('li', text:~"$regex")).click()
+      }
+    }
+  }
+
+  // Update company
+  void setCompanyName(String name) {
+    companyNameField.value(name)
+  }
+
+  void setStreetAddress(String address) {
+    streetAddressField.value(address)
+  }
+
+  void setCity(String city) {
+    cityField.value(city)
+  }
+
+  void setProvince(String province) {
+    provinceDropdown.$('option', text:province).click()
+  }
+
+  void setPostalCode(String postalCode) {
+    postalCodeField.value(postalCode)
+  }
+
+  void setTelephoneNumber(String telephoneNumber) {
+    telephoneNumberField.value(telephoneNumber)
+  }
+
+  void setFaxNumber(String faxNumber) {
+    faxNumberField.value(faxNumber)
+  }
+
+  void setEmail(String email) {
+    emailField.value(email)
+  }
+
+  void setWebsite(String website) {
+    websiteField.value(website)
+  }
+
+  void clickUpdateButton() {
+    updateButton.click()
+  }
+
+  Boolean updateCompanySuccessAlertDisplayed() {
+    return waitFor {
+      updateAlert.displayed == true &&
+      updateAlert.text() =~ 'Successfully updated company information'
+    }
+  }
+
+  // Delete company
+  void clickDeleteButton() {
+    waitFor { deleteButton.click() }
+  }
+
+  Boolean deleteCompanySuccessAlertDisplayed(String name) {
+    return waitFor {
+      deleteAlert.displayed == true &&
+      deleteAlert.text() =~ "$name removed"
+    }
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/RegisterPage.groovy b/functional-tests/src/test/groovy/pages/app/RegisterPage.groovy
deleted file mode 100644
index d8d11c6bf5..0000000000
--- a/functional-tests/src/test/groovy/pages/app/RegisterPage.groovy
+++ /dev/null
@@ -1,23 +0,0 @@
-package pages.app
-
-import geb.Page
-
-class RegisterPage extends Page {
-	// NOTE - the title comparison is based on parsed HTML, not an exact character match of the HTML source.  For example "  " becomes " ". 
-	// So even though there are currently two spaces after Wells in the page source, we have to compare against a single space after Wells.
-    static at = { title == "Groundwater Wells Registry of Well Drillers and Well Pump Installers - Province of British Columbia"}
-    static url = "gwells/registries"
-    
-    static content = {
-        titletext { $("h4").text() }
-        reset { $("#personSearchReset").click() }
-        submit { $("#personSearchSubmit").click() }
-        search { $("#regTypeInput") }
-        firstrow { $("#registry-table-row-0") }
-        result { $("#drillersTotalResults").text() }
-        selectinstaller { $("label[for=activityInstaller]").click() }
-        selectdriller { $("label[for=activityDriller]").click() }
-        noresults { $("div", text:"No results were found.") }
-        selectcommunity { $("#cityOptions") }
-    }
-}
diff --git a/functional-tests/src/test/groovy/pages/app/RegistryAddPage.groovy b/functional-tests/src/test/groovy/pages/app/RegistryAddPage.groovy
new file mode 100644
index 0000000000..259be2c723
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/RegistryAddPage.groovy
@@ -0,0 +1,72 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+class RegistryAddPage extends BaseAppPage {
+  static at = { pageTitle.text() == 'Add new applicant' }
+  static url = 'registries/people/add'
+  static content = {
+    pageTitle { $('main h5') }
+
+    surnameField { $('#surnameInput') }
+    firstnameField { $('#firstnameInput') }
+    telephoneNumberField { $('#contactTelInput') }
+    emailField { $('#contactEmailInput') }
+    wellDrillerORCSFIeld { $('#drillerORCSInput') }
+    pumpInstallerORCSField { $('#pumpORCSInput') }
+
+    registerAsRadioButtons { $('#registrationTypeInput') }
+
+    saveButton { $('button', type:'submit', text:'Save') }
+  }
+
+  void setSurname(String surname) {
+    surnameField.value(surname)
+  }
+
+  void setFirstname(String firstname) {
+    firstnameField.value(firstname)
+  }
+
+  void setTelephoneNumber(String telephoneNumber) {
+    telephoneNumberField.value(telephoneNumber)
+  }
+
+  void setEmail(String email) {
+    emailField.value(email)
+  }
+
+  void setWellDrillerROCS(int orcsNumber) {
+    wellDrillerORCSFIeld.value(orcsNumber)
+  }
+
+  void setPumpInstallerORCS(int orcsNumber) {
+    pumpInstallerORCSField.value(orcsNumber)
+  }
+
+  // TODO
+  void registerAsDriller() {
+    registerAsRadioButtons.$('input', value:'DRILL').click()
+  }
+
+  // TODO
+  void registerAsPumpInstaller() {
+    registerAsRadioButtons.$('input', value:'PUMP').click()
+  }
+
+  void clickSaveButton() {
+    saveButton.click()
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/RegistryManagePage.groovy b/functional-tests/src/test/groovy/pages/app/RegistryManagePage.groovy
new file mode 100644
index 0000000000..ae6fb9af13
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/RegistryManagePage.groovy
@@ -0,0 +1,32 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+class RegistryManagePage extends BaseAppPage {
+  static at = { pageTitle.text() == 'Groundwater Well Search' }
+  static url = 'registries/organizations/manage'
+  static content = {
+    pageTitle { $('#main-content h2') }
+
+    wellTagOrPlateField { $('#id_well') }
+    streetAddressField { $('#id_addr') }
+    legalPlanOrDistrictLotOrPIDField { $('#id_legal') }
+    ownerNameField { $('#id_owner') }
+
+    searchButton { $('input', type:'submit', value:'Search') }
+
+    searchResultsTable(required:false) { $('#results') }
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/RegistryPage.groovy b/functional-tests/src/test/groovy/pages/app/RegistryPage.groovy
new file mode 100644
index 0000000000..cdf5a3d7d3
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/RegistryPage.groovy
@@ -0,0 +1,65 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+class RegistryPage extends BaseAppPage {
+  static at = { pageTitle.text() == 'Register of Well Drillers and Well Pump Installers' }
+  static url = 'registries'
+  static content = {
+    pageTitle { $('main h4') }
+
+    addNewEntryButton(required:false) { $('#addNewEntryButton') }
+    manageCompaniesButton(required:false) { $('#manageCompaniesButton') }
+
+    registrationStatusDropdown(required:false) { $('#manageCompaniesButton') }
+
+    wellDrillerRadioButton { $('#activityDriller') }
+    wellPumpInstallerRadioButton { $('#activityInstaller') }
+
+    individualOrCompanyOrRegistrationSearchField { $('#regTypeInput') }
+
+    searchButton { $('#personSearchSubmit') }
+
+    searchResultsTable(required:false) { $('#registry-table') }
+  }
+
+  void clickAddNewEntryButton() {
+    waitFor { addNewEntryButton.click() }
+  }
+
+  void clickManageCompaniesButton() {
+    waitFor { manageCompaniesButton.click() }
+  }
+
+  void clickSearchButton() {
+    searchButton.click()
+  }
+
+  void clickWellDrillerRadioButton() {
+    wellDrillerRadioButton.parent().click()
+  }
+
+  void clickWellPumpInstallerRadioButton() {
+    wellPumpInstallerRadioButton.parent().click()
+  }
+
+  void setIndividualOrCompanyOrRegistrationSearchField(String value) {
+    individualOrCompanyOrRegistrationSearchField.value(value)
+  }
+
+  Boolean foundSearchResults() {
+    waitFor { searchResultsTable.$('tbody tr').size() != 0 }
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/RegistryProfilePage.groovy b/functional-tests/src/test/groovy/pages/app/RegistryProfilePage.groovy
new file mode 100644
index 0000000000..925fe96ba1
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/RegistryProfilePage.groovy
@@ -0,0 +1,45 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+/**
+ * Well Operator profile page.
+ */
+class RegistryProfilePage extends BaseAppPage {
+  static at = { verifyProfilePage() }
+  static content = {
+    pageTitle { $('main h4') }
+  }
+
+  private final String surname
+  private final String firstname
+
+  /**
+   * Constructor.
+   *
+   * Uses the well oeprator's first and last name to at check the page, as the title is based on the operator's name.
+   *
+   * @param String the well operator surname (required)
+   * @param String the well operator firstname (required)
+   */
+  RegistryProfilePage(String surname, String firstname) {
+    this.surname = surname
+    this.firstname = firstname
+  }
+
+  Boolean verifyProfilePage() {
+    browser.getCurrentUrl() =~ /\/registries\/people\/[a-z0-9\-]+$/ && pageTitle.text() == "$firstname $surname"
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/SearchPage.groovy b/functional-tests/src/test/groovy/pages/app/SearchPage.groovy
deleted file mode 100644
index 30ee37e1e8..0000000000
--- a/functional-tests/src/test/groovy/pages/app/SearchPage.groovy
+++ /dev/null
@@ -1,93 +0,0 @@
-package pages.app
-
-import geb.Page
-import geb.Module
-
-class SearchPage extends Page {
-    static at = { title == "Groundwater Wells Search - Province of British Columbia" }
-    static url = "gwells/search"
-
-    static content = {
-        well_id(wait: true) { $("input", id:"id_well") } 
-        address(wait: true) { $("input", id:"id_addr") }
-        legal_id(wait: true) { $("input", id:"id_legal") }
-		owner_id(wait: true) { $("input", id:"id_owner") }
-        start_lat_long(wait: true) { $("input", name:"start_lat_long", type:"hidden") }
-        end_lat_long(wait: true) { $("input", name:"end_lat_long", type:"hidden") }
-        submit_button(wait: true) { $("input", id:"submit-id-s") }
-        reset_button(wait: true) { $("a", id:"reset-id-s") }
-        not_found_msg { $("div",id:"no-records-found") }
-        too_many_found_msg { $("div",id:"too-many-wells") }
-        one_search_field_req { $('#id-searchForm > div.alert.alert-block.alert-danger > ul > li') }
-        results_info { $("div",id:"results_info") }
-        results_table { $("#results td")*.text() }
-        page_buttons { $("#results_paginate a")*.text() }
-        next_button { $("li",id:"results_next")}
-        previous_button { $("li",id:"results_previous")}
-        next_button_click { $("li",id:"results_next").$("a")}
-        previous_button_click { $("li",id:"results_previous").$("a")}
-        map_zoomlevel { $("div", class: "leaflet-control-scale-line") }
-        zoom_in { $("a", class: "leaflet-control-zoom-in") }
-        zoom_out { $("a", class: "leaflet-control-zoom-out") }
-        map_search_wells { $("div", class: "leaflet-control leaflet-area-search") }
-    }
-    boolean CheckResultTable(String addres_to_check) {
-        if(results_table.join(",").indexOf(addres_to_check) >= -1)
-            return true
-        else
-            return false    
-    }
-    int FindResultIndex(String string_to_check) {
-        def nIndex = results_table.join(",").indexOf(string_to_check)
-
-        return nIndex  
-    }
-
-    boolean CheckPageButton(String page_button_to_check) {
-        if(page_buttons.join(",").indexOf(page_button_to_check) >= -1)
-            return true
-        else
-            return false    
-    }
-    
-    String NumberOfEntriesFound() {
-        def str = results_info.text().split(' ')
-        return str[5]
-    }
-    String NumberEntryFrom() {
-        def str = results_info.text().split(' ')
-        return str[1]
-    }
-    String NumberEntryTo() {
-        def str = results_info.text().split(' ')
-        return str[3]
-    }
-
-    void SearchWell(String s_well_id, String s_address, String s_legal_id, String s_owner) {        
-        if ( s_well_id != "") { waitFor { well_id.value(s_well_id) } }
-        if ( s_address != "") { waitFor { address.value(s_address) } }
-        if ( s_legal_id != "") { waitFor { legal_id.value(s_legal_id) } }
-        if ( s_owner != "") { waitFor { owner_id.value(s_owner) } }
-        submit_button.click()
-    }
-
-    //Use as InjectLibrary('https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js') to inject dependencies
-    void InjectLibrary( String library ){
-       def ok = browser.driver.executeScript("document.body.appendChild(document.createElement(\'script\')).src=\'$library\'")
-    }
-
-    //Returns the row in the result table based on the wellid or tagnumber supplied.
-    int ReturnRow( String s_id ) {
-        def n_index = 0
-        while ( $('#results > tbody > tr:nth-child('+ n_index.toString() +') > td.sorting_1 > a').text() != s_id  || n_index > 9) {
-            n_index++
-        }
-        return (n_index)
-    }
-
-    //Hard wait function, sometimes useful to sync up the application when you cannot use waitFor.
-    void sleepForNSeconds(int n) {
-    def originalMilliseconds = System.currentTimeMillis()
-    waitFor(n + 1, 0.5) { (System.currentTimeMillis() - originalMilliseconds) > (n * 1000) }
-    }    
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/pages/app/SubmissionsPage.groovy b/functional-tests/src/test/groovy/pages/app/SubmissionsPage.groovy
new file mode 100644
index 0000000000..b8cbbef36d
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/SubmissionsPage.groovy
@@ -0,0 +1,23 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+class SubmissionsPage extends BaseAppPage {
+  static at = { pageTitle.text() == 'Well Activity Submission' }
+  static url = 'submissions'
+  static content = {
+    pageTitle { $('.card-title .col-lg-8') } // TODO improve this selector
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/SurevyAdminPage.groovy b/functional-tests/src/test/groovy/pages/app/SurevyAdminPage.groovy
deleted file mode 100644
index 208b0052b3..0000000000
--- a/functional-tests/src/test/groovy/pages/app/SurevyAdminPage.groovy
+++ /dev/null
@@ -1,24 +0,0 @@
-package pages.app
-
-import geb.Page
-import geb.Module
-
-class SurveAdminPage extends Page {
-    static at = { title == "Groundwater Wells Site Admin - Province of British Columbia" }
-    static url = "gwells/site_admin"
-
-    static content = {
-        introtext { $("input", id:"id_survey_introduction_text") }
-        link { $("input", id:"id_survey_link" )}
-        selectpage { $("select", id:"id_survey_page") }
-        enabledcheck { $("checkbox", id:"id_survey_enabled") }
-        addupdatebutton { $("button", type:"submit") }
-        deletebutton { $("#update-survey > div > div:nth-child(6) > button") }
-    }
-
-    //Hard wait function, sometimes useful to sync up the application when you cannot use waitFor.
-    void sleepForNSeconds(int n) {
-    def originalMilliseconds = System.currentTimeMillis()
-    waitFor(n + 1, 0.5) { (System.currentTimeMillis() - originalMilliseconds) > (n * 1000) }
-    }    
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/pages/app/WellDrillerPage.groovy b/functional-tests/src/test/groovy/pages/app/WellDrillerPage.groovy
deleted file mode 100644
index b1455d246b..0000000000
--- a/functional-tests/src/test/groovy/pages/app/WellDrillerPage.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-package pages.app
-
-import geb.Page
-
-class WellDrillerPage extends Page {
-    static at = { title == "Groundwater Wells Registry of Well Drillers and Well Pump Installers - Province of British Columbia" }
-
-    static url = "gwells/registries"
-}
diff --git a/functional-tests/src/test/groovy/pages/app/WellSummaryPage.groovy b/functional-tests/src/test/groovy/pages/app/WellSummaryPage.groovy
deleted file mode 100644
index 38e6c97d29..0000000000
--- a/functional-tests/src/test/groovy/pages/app/WellSummaryPage.groovy
+++ /dev/null
@@ -1,155 +0,0 @@
-package pages.app
-
-import geb.Page
-
-class WellSummaryPage extends Page {
-    static at = { title == "Groundwater Wells Well Summary - Province of British Columbia" }
-//    static url = "/well"
-
-    static content = {
-		summary_information { $( "fieldset", id:"summary_information_fieldset") }
-		well_tag_number { $( "span", id:"well_tag_number") }
-		identification_plate_number { $( "span", id:"identification_plate_number") }
-		owner_full_name { $( "span", id:"owner_full_name") }
-		licenced_status { $( "span", id:"licenced_status") }
-		well_well_status { $( "span", id:"well_well_status") }
-		well_class { $( "span", id:"well_class") }
-		well_subclass { $( "span", id:"well_subclass") }
-		intended_water_use { $( "span", id:"intended_water_use") }
-		obs_well_number { $( "span", id:"obs_well_number") }
-		obs_well_status { $( "span", id:"obs_well_status") }
-		ems_id { $( "span", id:"ems_id") }
-		aquifer_number { $( "span", id:"aquifer_number") }
-		alternate_specs_submitted { $( "span", id:"alternate_specs_submitted") }
-		water_supply_system_name { $( "span", id:"water_supply_system_name") }
-		water_supply_system_well_name { $( "span", id:"water_supply_system_well_name") }
-
-		address { $( "span", id:"address") }
-		city { $( "span", id:"city") }
-		legal { $( "table", id:"legal") }
-		lot { $( "span", id:"lot") }
-		plan { $( "span", id:"plan") }
-		district_lot { $( "span", id:"district_lot") }
-		block { $( "span", id:"block") }
-		section { $( "span", id:"section") }
-		township { $( "span", id:"township") }
-		range { $( "span", id:"range") }
-		land_district { $( "span", id:"land_district") }
-		pid { $( "span", id:"pid") }
-
-		location_desc { $( "span", id:"location_desc") }
-		latitude { $( "span", id:"latitude") }
-		longitude { $( "span", id:"longitude") }
-		utm_zone_code { $( "span", id:"utm_zone_code") }
-		utm_northing { $( "span", id:"utm_northing") }
-		utm_easting { $( "span", id:"utm_easting") }
-		utm_accuracy_code { $( "span", id:"utm_accuracy_code") }
-		bcgs_mapsheet_number { $( "span", id:"bcgs_mapsheet_number") }
-
-		activities { $( "table", id:"activities") }
-		activities_table { $("#activities td")*.text() }
-		construction_end_date { $("#activities td",0) }
-		alteration_end_date { $("#activities td",1) }
-		decommission_end_date { $("#activities td",2) }
-		drilling_company { $("#activities td",3) }
-
-		total_depth_drilled { $( "span", id:"total_depth_drilled") }
-		static_water_level { $( "span", id:"static_water_level") }
-		well_cap_type { $( "span", id:"well_cap_type") }
-		finished_well_depth { $( "span", id:"finished_well_depth") }
-		well_yield { $( "span", id:"well_yield") }
-		well_disinfected { $( "span", id:"well_disinfected") }
-		final_casing_stickup { $( "span", id:"final_casing_stickup") }
-		artesian_flow { $( "span", id:"artesian_flow") }
-		drilling_method { $( "span", id:"drilling_method") }
-		bedrock_depth { $( "span", id:"bedrock_depth") }
-		artesian_pressure { $( "span", id:"artesian_pressure") }
-		orientation_direction { $( "span", id:"orientation2") }
-		ground_elevation { $( "span", id:"ground_elevation") }
-		ground_elevation_method { $( "span", id:"ground_elevation_method") }
-		well_plate_attached { $( "span", id:"well_plate_attached") }
-
-		intake_method { $( "span", id:"intake_method") }
-		screen_type { $( "span", id:"screen_type") }
-		screen_material { $( "span", id:"screen_material") }
-		screen_opening { $( "span", id:"screen_opening") }
-		screen_bottom { $( "span", id:"screen_bottom") }
-		screens { $( "table", id:"screens") }
-		screens_table { $( "#screens td")*.text() }
-
-    no_screen_information { $( "span", id:"no_screen_information" ) }
-
-		screen_from { $("#screens > tbody > tr:nth-child(2) > td:nth-child(1)") }
-        screen_to {  $("#screens > tbody > tr:nth-child(2) > td:nth-child(2)") }
-        internal_diameter {  $("#screens > tbody > tr:nth-child(2) > td:nth-child(3)") }
-        assembly_type {  $("#screens > tbody > tr:nth-child(2) > td:nth-child(4)") }
-        slot_size {  $("#screens > tbody > tr:nth-child(2) > td:nth-child(5)") }
-
-		developed_by { $( "span", id:"developed-by") }
-		devlopment_total_duration { $( "span", id:"devlopment-total-duration") }
-
-		yield_estimation_method { $( "span", id:"yield-estimation-method") }
-		yield_estimation_rate { $( "span", id:"yield_estimation_rate") }
-		yield_estimation_duration { $( "span", id:"yield_estimation_duration") }
-
-		casing_field_set { $( "fieldset", id:"casing_fieldset") }
-		casings { $( "table", id:"casings") }
-		casings_table { $("#casings td")*.text() }
-    no_casing_information { $( "span", id:"no_casing_information" ) }
-		casings_from { $("#casings > tbody > tr:nth-child(1) > td:nth-child(1)") }
-		casings_to { $("#casings > tbody > tr:nth-child(1) > td:nth-child(2)") }
-		casings_diameter { $("#casings > tbody > tr:nth-child(1) > td:nth-child(3)") }
-		casings_material { $("#casings > tbody > tr:nth-child(1) > td:nth-child(4)") }
-		casings_thickness { $("#casings > tbody > tr:nth-child(1) > td:nth-child(5)") }
-		casings_driveshoe { $("#casings > tbody > tr:nth-child(1) > td:nth-child(6)") }
-
-		surface_seal_fieldset { $( "fieldset", id:"surface_seal_fieldset") }
-		surface_seal_method { $( "span", id:"surface_seal_method") }
-		surface_seal_material { $( "span", id:"surface_seal_material") }
-		surface_seal_thickness { $( "span", id:"surface_seal_thickness") }
-		surface_seal_length { $( "span", id:"surface_seal_length") }
-		backfill_type { $( "span", id:"backfill_type") }
-		backfill_depth { $( "span", id:"backfill_depth") }
-
-		perforations_fieldset { $( "fieldset", id:"perforations_fieldset") }
-		liner_details { $( "table", id:"liner_details") }
-    no_liner_details_information { $("span", id:"no_liner_details_information") }
-
-		liner_details_table { $("#liner_details td")*.text() }
-		liner_material { $("#liner_details > tbody > tr:nth-child(1) > td:nth-child(1)") }
-		liner_diameter { $("#liner_details > tbody > tr:nth-child(1) > td:nth-child(2)") }
-		liner_thickness { $("#liner_details > tbody > tr:nth-child(1) > td:nth-child(3)") }
-		liner_from { $("#liner_details > tbody > tr:nth-child(1) > td:nth-child(4)") }
-		liner_to { $("#liner_details > tbody > tr:nth-child(1) > td:nth-child(5)") }
-		liner_perffrom  { $("#liner_details > tbody > tr:nth-child(1) > td:nth-child(6)") }
-		liner_perfto { $("#liner_details > tbody > tr:nth-child(1) > td:nth-child(7)") }
-
-		lithology_fieldset { $( "fieldset", id:"lithology_fieldset") }
-		lithology { $( "table", id:"lithology") }
-    no_lithology_information { $( "span", id:"no_lithology_information" ) }
-		lithology_table { $("#lithology td")*.text() }
-
-		lithology_from { $("#lithology > tbody > tr:nth-child(1) > td:nth-child(1)") }
-        lithology_to { $("#lithology > tbody > tr:nth-child(1) > td:nth-child(2)") }
-        lithology_raw_data { $("#lithology > tbody > tr:nth-child(1) > td:nth-child(3)") }
-        lithology_description { $("#lithology > tbody > tr:nth-child(6) > td:nth-child(4)") }
-        lithology_material_description { $("#lithology > tbody > tr:nth-child(1) > td:nth-child(5)") }
-        lithology_relative_hardness { $("#lithology > tbody > tr:nth-child(1) > td:nth-child(6)") }
-        lithology_colour { $("#lithology > tbody > tr:nth-child(1) > td:nth-child(7)") }
-        lithology_waterbearing_estimated_flow { $("#lithology > tbody > tr:nth-child(3) > td:nth-child(8)") }
-        lithology_observations { $("#lithology > tbody > tr:nth-child(7) > td:nth-child(9)") }
-
-		well_decommissioning { $( "fieldset", id:"well_decommissioning_fieldset") }
-        reason_for_decommission { $( "span", id:"reason_for_decommission") }
-        method_of_closure { $( "span", id:"method_of_closure") }
-        sealant_material { $( "span", id:"sealant_material") }
-        backfill_material { $( "span", id:"backfill_material") }
-        decommission_details { $( "span", id:"decommission_details") }
-
-		comments { $("span", id:"comments") }
-
-		no_document_msg { $("#no_documentation_msg") }
-		documentlink { $("#additional_documentation_table > tbody > tr > td > a") }
-
-	}
-}
diff --git a/functional-tests/src/test/groovy/pages/app/base/BaseAppPage.groovy b/functional-tests/src/test/groovy/pages/app/base/BaseAppPage.groovy
new file mode 100644
index 0000000000..2cae661959
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/base/BaseAppPage.groovy
@@ -0,0 +1,36 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+import geb.Page
+
+import modules.HeaderModule
+import modules.ModalModule
+import modules.CommonLinkModule
+import modules.FooterModule
+
+/**
+ * Base app page where global selectors and modules used by all pages can be added.
+ *
+ * All pages should extend this page.
+ */
+class BaseAppPage extends Page {
+  static content = {
+    headerModule { module(HeaderModule) }
+    modalModule { module(ModalModule) }
+    commonModule { module(CommonLinkModule) }
+    footerModule { module(FooterModule) }
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/modal/ConfirmDeleteModal.groovy b/functional-tests/src/test/groovy/pages/app/modal/ConfirmDeleteModal.groovy
new file mode 100644
index 0000000000..522a9aa8c0
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/modal/ConfirmDeleteModal.groovy
@@ -0,0 +1,22 @@
+package pages
+
+class ConfirmDeleteModal extends BaseAppPage {
+  static at = { modalModule.isOpen(modalSelector) }
+  static content = {
+    modalSelector(wait:true) { $('#orgDeleteModal') }
+
+    saveButton { $('button', type:'button', text:'Delete') }
+    cancelButton { $('button', type:'button', text:'Cancel') }
+  }
+
+  /**
+   * Waits for the modal window to open.
+   * Clicks the 'Delete' button.
+   * Waits for the modal window to close.
+   */
+  void confirmDelete() {
+    modalModule.isOpen(modalSelector)
+    saveButton.click()
+    modalModule.isClosed(modalSelector)
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/modal/ConfirmRegisterAsWellDrillerModal.groovy b/functional-tests/src/test/groovy/pages/app/modal/ConfirmRegisterAsWellDrillerModal.groovy
new file mode 100644
index 0000000000..5e5bf9e674
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/modal/ConfirmRegisterAsWellDrillerModal.groovy
@@ -0,0 +1,22 @@
+package pages
+
+class ConfirmRegisterAsWellDrillerModal extends BaseAppPage {
+  static at = { modalModule.isOpen(modalSelector) }
+  static content = {
+    modalSelector(wait:true) { modalModule.modalWindow.has('h5', text:'Confirm register as Well Driller') } //TODO add id if possible
+
+    confirmButton { modalSelector.$('#register-confirm') }
+    cancelButton { modalSelector.$('#register-cancel') }
+  }
+
+  /**
+   * Waits for the modal window to open.
+   * Clicks the 'Confirm' button.
+   * Waits for the modal window to close.
+   */
+  void confirmRegisterAsWellDriller() {
+    modalModule.isOpen(modalSelector)
+    confirmButton.click()
+    modalModule.isClosed(modalSelector)
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/modal/ConfirmRegisterAsWellPumpInstallerModal.groovy b/functional-tests/src/test/groovy/pages/app/modal/ConfirmRegisterAsWellPumpInstallerModal.groovy
new file mode 100644
index 0000000000..70dfcc2e65
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/modal/ConfirmRegisterAsWellPumpInstallerModal.groovy
@@ -0,0 +1,22 @@
+package pages
+
+class ConfirmRegisterAsPumpInstallerModal extends BaseAppPage {
+  static at = { modalModule.isOpen(modalSelector) }
+  static content = {
+    modalSelector(wait:true) { modalModule.modalWindow.has('h5', text:'Confirm register as Well Pump Installer') } //TODO add id if possible
+
+    confirmButton { modalSelector.$('#register-confirm') }
+    cancelButton { modalSelector.$('#register-cancel') }
+  }
+
+  /**
+   * Waits for the modal window to open.
+   * Clicks the 'Confirm' button.
+   * Waits for the modal window to close.
+   */
+  void confirmRegisterAsWellPumpInstaller() {
+    modalModule.isOpen(modalSelector)
+    confirmButton.click()
+    modalModule.isClosed()
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/modal/ConfirmUpdateModal.groovy b/functional-tests/src/test/groovy/pages/app/modal/ConfirmUpdateModal.groovy
new file mode 100644
index 0000000000..2147d3555c
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/modal/ConfirmUpdateModal.groovy
@@ -0,0 +1,22 @@
+package pages
+
+class ConfirmUpdateModal extends BaseAppPage {
+  static at = { modalModule.isOpen(modalSelector) }
+  static content = {
+    modalSelector(wait:true) { $('#orgUpdateModal') }
+
+    saveButton { $('button', type:'button', text:'Save') }
+    cancelButton { $('button', type:'button', text:'Cancel') }
+  }
+
+  /**
+   * Waits for the modal window to open.
+   * Clicks the 'Save' button.
+   * Waits for the modal window to close.
+   */
+  void confirmSave() {
+    modalModule.isOpen(modalSelector)
+    saveButton.click()
+    modalModule.isClosed(modalSelector)
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/app/modal/OrganizationsAddModal.groovy b/functional-tests/src/test/groovy/pages/app/modal/OrganizationsAddModal.groovy
new file mode 100644
index 0000000000..463c0ee959
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/app/modal/OrganizationsAddModal.groovy
@@ -0,0 +1,60 @@
+package pages
+
+class OrganizationsAddModal extends BaseAppPage {
+  static at = { modalModule.isOpen(modalSelector) }
+  static content = {
+    modalSelector(wait:true) { $('#orgAddModal') }
+
+    companyNameField { $('#orgAddNameInput') }
+    streetAddressField { $('#orgAddAddressInput') }
+    cityField { $('#orgAddCityInput') }
+    provinceDropdown { $('#orgAddProvinceInput') }
+    postalCodeField { $('#orgAddPostalInput') }
+    telephoneNumberField { $('#orgAddPhoneInput') }
+    faxNumberField { $('#orgAddFaxInput') }
+    emailField { $('#orgAddEmailInput') }
+    websiteField { $('#orgAddWebsiteInput') }
+
+    saveButton { $('button', type:'submit', text:'Save') }
+  }
+
+  void setCompanyName(String name) {
+    companyNameField.value(name)
+  }
+
+  void setStreetAddress(String address) {
+    streetAddressField.value(address)
+  }
+
+  void setCity(String city) {
+    cityField.value(city)
+  }
+
+  void setProvince(String province) {
+    provinceDropdown.$('option', text:province).click()
+  }
+
+  void setPostalCode(String postalCode) {
+    postalCodeField.value(postalCode)
+  }
+
+  void setTelephoneNumber(String telephoneNumber) {
+    telephoneNumberField.value(telephoneNumber)
+  }
+
+  void setFaxNumber(String faxNumber) {
+    faxNumberField.value(faxNumber)
+  }
+
+  void setEmail(String email) {
+    emailField.value(email)
+  }
+
+  void setWebsite(String website) {
+    websiteField.value(website)
+  }
+
+  void clickSaveButton() {
+    saveButton.click()
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/external/AboutGov.groovy b/functional-tests/src/test/groovy/pages/external/AboutGov.groovy
deleted file mode 100644
index 6d2a8a4266..0000000000
--- a/functional-tests/src/test/groovy/pages/external/AboutGov.groovy
+++ /dev/null
@@ -1,11 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class AboutGov extends Page {
-    static at = { title == "About gov.bc.ca - Province of British Columbia"}
-    static url = "https://www2.gov.bc.ca/gov/content/about-gov-bc-ca"
-}
-
-
-
diff --git a/functional-tests/src/test/groovy/pages/external/Accessibility.groovy b/functional-tests/src/test/groovy/pages/external/Accessibility.groovy
deleted file mode 100644
index e1af1d9836..0000000000
--- a/functional-tests/src/test/groovy/pages/external/Accessibility.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class Accessibility extends Page {
-    static at = { title == "Web Accessibility - Province of British Columbia"}
-    static url = "https://www2.gov.bc.ca/gov/content/home/accessibility"
-}
-
diff --git a/functional-tests/src/test/groovy/pages/external/AquiferReport.groovy b/functional-tests/src/test/groovy/pages/external/AquiferReport.groovy
deleted file mode 100644
index 2aabac17bc..0000000000
--- a/functional-tests/src/test/groovy/pages/external/AquiferReport.groovy
+++ /dev/null
@@ -1,12 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class AquiferReport extends Page {
-    static String aquiferNumber
-    static at = { title == "Groundwater" }
-    static url = "http://a100.gov.bc.ca/pub/wells/aquiferDetail.do?aquiferNumber=" + aquiferNumber + "&docType=adr"
-}
-
-
-
diff --git a/functional-tests/src/test/groovy/pages/external/BCWaterResourceAtlas.groovy b/functional-tests/src/test/groovy/pages/external/BCWaterResourceAtlas.groovy
deleted file mode 100644
index 26cbc57fbe..0000000000
--- a/functional-tests/src/test/groovy/pages/external/BCWaterResourceAtlas.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class BCWaterResourceAtlas extends Page {
-    static at = { title == "DataBC"}
-    static url = "http://maps.gov.bc.ca/ess/sv/wrbc/"
-}
-
diff --git a/functional-tests/src/test/groovy/pages/external/Copyright.groovy b/functional-tests/src/test/groovy/pages/external/Copyright.groovy
deleted file mode 100644
index d9577f4de9..0000000000
--- a/functional-tests/src/test/groovy/pages/external/Copyright.groovy
+++ /dev/null
@@ -1,8 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class Copyright extends Page {
-    static at = { title == "Copyright - Province of British Columbia" }
-    static url = "https://www2.gov.bc.ca/gov/content/home/copyright"
-}
diff --git a/functional-tests/src/test/groovy/pages/external/Disclaimer.groovy b/functional-tests/src/test/groovy/pages/external/Disclaimer.groovy
deleted file mode 100644
index 3aa7885960..0000000000
--- a/functional-tests/src/test/groovy/pages/external/Disclaimer.groovy
+++ /dev/null
@@ -1,10 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class Disclaimer extends Page {
-    static at = { title == "Disclaimer - Province of British Columbia"}
-    static url = "http://www2.gov.bc.ca/gov/content/home/disclaimer"
-
-    
-}
diff --git a/functional-tests/src/test/groovy/pages/external/ExternalLinkPage.groovy b/functional-tests/src/test/groovy/pages/external/ExternalLinkPage.groovy
new file mode 100644
index 0000000000..3b8abca43d
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/external/ExternalLinkPage.groovy
@@ -0,0 +1,118 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+import org.openqa.selenium.NoSuchWindowException
+
+import geb.Page
+
+/**
+ * Generic page that represents an external page.
+ * This external page may overwrite the current window, or be opened in a new window or tab.
+ * Use a new instance of this class as the parameter to an 'at' call.
+ *
+ * Note: This currently only works when running the tests in headful mode (not headless)!
+ *
+ * Example:
+ *   at new ExternalLinkPage('Fuel Info', 'gov\\.bc\\.ca\\/fuelfacts')
+ */
+class ExternalLinkPage extends Page {
+  static at = {
+    Boolean result
+
+    // covers a rare issue where the main thread can sometimes hang indefinitely when dealing with multiple windows.
+    // with a separate thread, if it hangs, the test will fail but the remaining test execution can continue.
+    Thread thread = Thread.start {
+      result = foundTargetWindow()
+    }
+    thread.join()
+
+    result == true
+  }
+
+  private final String windowTitleRegex
+  private final String urlRegex
+  private final String simpleName
+
+  /**
+   * Constructor.
+   *
+   * @param String windowTitleRegex a regex string that is uniquely contained within the target window title. (required)
+   * @param String urlRegex a regex string that will be asserted is contained in the target window url. (required)
+   * @param String simpleName a string to use in the spock reports for tests utilizing this class. (Optional, default: 'ExternalLinkPage')
+   *
+   * Example:
+   *   The urlRegex 'someMinistry\\.gov\\.bc' would match 'www.someMinistry.gov.bc.ca/otherParameters'
+   */
+  ExternalLinkPage(String windowTitleRegex, String urlRegex, String simpleName='ExternalLinkPage') {
+    this.windowTitleRegex = windowTitleRegex.trim()
+    this.urlRegex = urlRegex.trim()
+    this.simpleName = simpleName
+  }
+
+  /**
+   * Attempts to find the expected window based on the window title and window url.
+   * If a window does not have a title, attempt to find the expected window based on url alone.
+   *
+   * If a new window was opened for this external page, close it.
+   * Otherwise do not close the window, as at least 1 window must remain open for test execution to continue.
+   */
+  Boolean foundTargetWindow() {
+    Boolean foundMatchingWindow = false
+    try {
+      browser.withWindow({ title.trim() =~ windowTitleRegex }, close:shouldCloseWindow()) {
+        if (browser.getCurrentUrl() =~ urlRegex) {
+          foundMatchingWindow = true
+        }
+      }
+    } catch (NoSuchWindowException e) {
+      /**
+       * Unable to find a window based on title.
+       * Either the expected title is incorrect, or the window is rendering a pdf, which depending on the browser type
+       *  may not have a window title.
+       * Loop through all open windows and try to find the expected window based on url only.
+       *
+       * Note: Chrome currently does not expose a window title when rendering PDFs.
+       */
+      browser.getAvailableWindows().each { windowHandle ->
+        browser.withWindow(windowHandle) {
+          if (browser.getCurrentUrl() =~ urlRegex) {
+            if (shouldCloseWindow()) {
+              browser.close()
+            }
+            foundMatchingWindow = true
+          }
+        }
+      }
+    }
+    return foundMatchingWindow
+  }
+
+  /**
+   * Returns true if multiple windows (or tabs) are open, false otherwise.
+   */
+  Boolean shouldCloseWindow() {
+    browser.getAvailableWindows().size() > 1
+  }
+
+  /**
+   * Prevent calling getSimpleName() from throwing an exception during a spock test:
+   *  - Calling getSimpleName() on a class returns just the class name, without any package prefixes.
+   *  - Calling getSimpleName() on an instance of a class throws an exception.
+   */
+  String getSimpleName() {
+    simpleName
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/external/GovHome.groovy b/functional-tests/src/test/groovy/pages/external/GovHome.groovy
deleted file mode 100644
index f820577e13..0000000000
--- a/functional-tests/src/test/groovy/pages/external/GovHome.groovy
+++ /dev/null
@@ -1,8 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class GovHome extends Page {
-    static at = { title == "B.C. Homepage - Province of British Columbia"}
-    static url = "https://www2.gov.bc.ca/"
-}
\ No newline at end of file
diff --git a/functional-tests/src/test/groovy/pages/external/LoginPage.groovy b/functional-tests/src/test/groovy/pages/external/LoginPage.groovy
new file mode 100644
index 0000000000..ed04de9dbb
--- /dev/null
+++ b/functional-tests/src/test/groovy/pages/external/LoginPage.groovy
@@ -0,0 +1,32 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package pages
+
+import geb.Page
+
+class LoginPage extends Page {
+  static at = {
+    title.trim() == 'Log in to Groundwater Wells' &&
+    pageTitle.text().trim() == 'GROUNDWATER WELLS'
+  }
+  static content = {
+    pageTitle { $('#kc-header-wrapper') }
+
+    usernameField { $('#username') }
+    passwordField { $('#password') }
+
+    logInButton { $('input', type:'submit', value:'Log in') }
+  }
+}
diff --git a/functional-tests/src/test/groovy/pages/external/Privacy.groovy b/functional-tests/src/test/groovy/pages/external/Privacy.groovy
deleted file mode 100644
index 6c17dcca17..0000000000
--- a/functional-tests/src/test/groovy/pages/external/Privacy.groovy
+++ /dev/null
@@ -1,8 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class Privacy extends Page {
-    static at = { title == "B.C. Government Website Privacy Statement - Province of British Columbia"}
-    static url = "https://www2.gov.bc.ca/gov/content/home/privacy"
-}
diff --git a/functional-tests/src/test/groovy/pages/external/SSO.groovy b/functional-tests/src/test/groovy/pages/external/SSO.groovy
deleted file mode 100644
index 1f005f0b43..0000000000
--- a/functional-tests/src/test/groovy/pages/external/SSO.groovy
+++ /dev/null
@@ -1,8 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class SSO extends Page {
-    static at = { title == "Government of British Columbia"}
-    static url = "https://logontest.gov.bc.ca/clp-cgi/int/logon.cgi"
-}
diff --git a/functional-tests/src/test/groovy/pages/external/iMapBC.groovy b/functional-tests/src/test/groovy/pages/external/iMapBC.groovy
deleted file mode 100644
index b7254e7e4b..0000000000
--- a/functional-tests/src/test/groovy/pages/external/iMapBC.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-package pages.external
-
-import geb.Page
-
-class iMapBC extends Page {
-    static at = { title == "iMapBC" }
-    static url = "https://maps.gov.bc.ca/ess/hm/imap4m/"
-}
-
diff --git a/functional-tests/src/test/groovy/specs/FlowSpecs.groovy b/functional-tests/src/test/groovy/specs/FlowSpecs.groovy
new file mode 100644
index 0000000000..9f1a062f9d
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/FlowSpecs.groovy
@@ -0,0 +1,90 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package specs
+
+import pages.HomePage
+import pages.InformationPage
+import pages.RegistryPage
+import pages.SubmissionsPage
+import pages.ExternalLinkPage
+
+import spock.lang.Timeout
+import spock.lang.Title
+import spock.lang.Narrative
+import spock.lang.Unroll
+
+@Timeout(60)
+@Title('Groundwater wells Flow Tests')
+@Narrative('''
+As a developer, I want to ensure all page links work, have the correct text, and direct to the correct page.
+''')
+class FlowSpecs extends BaseSpec {
+
+  @Unroll
+  void 'Navigate Page from: HomePage, click header Link: #TextSelector, Assert Page: #AssertPage'() {
+    given: 'I start on the HomePage'
+      to HomePage
+    when: 'I click on the header link with label: #TextSelector.text'
+      headerModule.clickMenuItem(TextSelector)
+    then: 'I arrive on the #AssertPage.getSimpleName()'
+      at AssertPage
+    where:
+      TextSelector                       || AssertPage
+      [ text:'Well Search' ]             || HomePage
+      [ text:'Groundwater Information' ] || InformationPage
+      [ text:'Registry' ]                || RegistryPage
+      //TODO requires being logged - move to auth flow specs? [ text:'Submit Report' ]           || SubmissionsPage
+  }
+
+  @Unroll
+  void 'Navigate Page from: HomePage, click page Link: #TextSelector, Assert Page: #AssertPage'() {
+    given: 'I start on the HomePage'
+      to HomePage
+    when: 'I click on the page link with label: #TextSelector.text'
+      commonModule.clickPageLink(TextSelector, bodyContent)
+    then: 'I arrive on the #AssertPage.getSimpleName()'
+      at AssertPage
+    where:
+      TextSelector                         || AssertPage
+      [ text:'B.C. Water Resource Atlas' ] || new ExternalLinkPage('WRBC', 'maps\\.gov\\.bc\\.ca.*wrbc')
+      [ text:'iMapBC' ]                    || new ExternalLinkPage('iMapBC', 'maps\\.gov\\.bc\\.ca.*imap4m')
+  }
+
+  @Unroll
+  void 'Navigate Page from: HomePage, click footer Link: #TextSelector, Assert Page: #AssertPage'() {
+    given: 'I start on the HomePage'
+      to HomePage
+    when: 'I click on the footer link with label: #TextSelector.text'
+      footerModule.clickMenuItem(TextSelector)
+    then: 'I arrive on the #AssertPage.getSimpleName()'
+      at AssertPage
+    where:
+      TextSelector               || AssertPage
+      [ text:'Home' ]            || new ExternalLinkPage('B\\.C\\. Homepage - Province of British Columbia',
+                                                         'www2\\.gov\\.bc\\.ca')
+      [ text:'About gov.bc.ca' ] || new ExternalLinkPage('About gov.bc.ca - Province of British Columbia',
+                                                         'www2\\.gov\\.bc\\.ca.*about')
+      [ text:'Disclaimer' ]      || new ExternalLinkPage('Disclaimer - Province of British Columbia',
+                                                         'www2\\.gov\\.bc\\.ca.*disclaimer')
+      [ text:'Privacy' ]         || new ExternalLinkPage('B\\.C\\. Government Website Privacy Statement - Province of \
+                                                          British Columbia', 'www2\\.gov\\.bc\\.ca.*privacy')
+      [ text:'Accessibility' ]   || new ExternalLinkPage('Web Accessibility - Province of British Columbia',
+                                                         'www2\\.gov\\.bc\\.ca.*accessibility')
+      [ text:'Copyright' ]       || new ExternalLinkPage('Copyright - Province of British Columbia',
+                                                         'www2\\.gov\\.bc\\.ca.*copyright')
+      [ text:'Contact Us' ]      || new ExternalLinkPage('Contact Us - Province of British Columbia',
+                                                         'www2\\.gov\\.bc\\.ca.*contact')
+  }
+}
diff --git a/functional-tests/src/test/groovy/specs/InformationPageSpecs.groovy b/functional-tests/src/test/groovy/specs/InformationPageSpecs.groovy
new file mode 100644
index 0000000000..34a54ee1fa
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/InformationPageSpecs.groovy
@@ -0,0 +1,50 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package specs
+
+import pages.InformationPage
+import pages.ExternalLinkPage
+
+import spock.lang.Timeout
+import spock.lang.Title
+import spock.lang.Narrative
+import spock.lang.Unroll
+
+@Timeout(60)
+@Title('Groundwater wells Flow Tests')
+@Narrative('''
+As a developer, I want to ensure all page links work, have the correct text, and direct to the correct page.
+''')
+class InformationPageSpecs extends BaseSpec {
+
+  @Unroll
+  void 'Navigate Page from: InformationPage, click page Link: #TextSelector, Assert Page: #AssertPage'() {
+    given: 'I start on the InformationPage'
+      to InformationPage
+    when: 'I click on the page link with label: #TextSelector.text'
+      commonModule.clickPageLink(TextSelector, bodyContent)
+    then: 'I arrive on the #AssertPage.getSimpleName()'
+      at AssertPage
+    where:
+      TextSelector                                                    || AssertPage
+      // TODO this page link is borken [ text:'groundwater wells in B.C.' ]                            || new ExternalLinkPage('WRBC', 'maps\\.gov\\.bc\\.ca.*wrbc')
+      [ text:'Aquifers and the provincial observation well network' ] || new ExternalLinkPage('Understanding Aquifers - Province of British Columbia', 'www2\\.gov\\.bc\\.ca.*understanding-aquifers')
+      [ text:'Data and mapping tools' ]                               || new ExternalLinkPage('Water Data & Tools - Province of British Columbia', 'www2\\.gov\\.bc\\.ca.*water-data-tools')
+      [ text:'B.C. Water Resource Atlas' ]                            || new ExternalLinkPage('WRBC', 'maps\\.gov\\.bc\\.ca.*wrbc')
+      [ text:'iMapBC' ]                                               || new ExternalLinkPage('iMapBC', 'maps\\.gov\\.bc\\.ca.*imap4m')
+      [ text:'DataBC datasets' ]                                      || new ExternalLinkPage('Datasets - Data Catalogue', 'catalogue\\.data\\.gov\\.bc\\.ca')
+      [ text:'FrontCounterBC location' ]                              || new ExternalLinkPage('Locations - Natural Resource Online Services', 'portal\\.nrs\\.gov\\.bc\\.ca.*locations')
+  }
+}
diff --git a/functional-tests/src/test/groovy/specs/OrganizationsSpecs.groovy b/functional-tests/src/test/groovy/specs/OrganizationsSpecs.groovy
new file mode 100644
index 0000000000..f24afd3ffe
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/OrganizationsSpecs.groovy
@@ -0,0 +1,101 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package specs
+
+import pages.RegistryPage
+import pages.OrganizationsPage
+import pages.OrganizationsAddModal
+import pages.ConfirmUpdateModal
+import pages.ConfirmDeleteModal
+
+import spock.lang.Timeout
+import spock.lang.Title
+import spock.lang.Narrative
+import spock.lang.Stepwise
+
+@Timeout(300)
+@Stepwise
+@Title('Groundwater Well Organizations Tests')
+@Narrative('''As an admin user, I want to add, update, and delete organizations (companies).''')
+class OrganizationsSpecs extends LoggedInSpec {
+
+  void setup() {
+    logInAsAdminUser()
+
+    // TODO replace below 3 lines with "to OrganizationsPage" when fixed:
+    // https://trello.com/c/V4iDExNM/1307-epicregistry-cannot-bookmark-urls-in-registry-5
+    to RegistryPage
+    clickManageCompaniesButton()
+    at OrganizationsPage
+  }
+
+  void 'Adding a new company'() {
+    given: 'I am logged in as an admin user'
+    and: 'I click the "Add new company" button'
+      clickAddNewCompanyButton()
+      at OrganizationsAddModal
+    and: 'I populate all required fields for a new company'
+      setCompanyName('bdd company')
+      setStreetAddress('bdd address')
+      setCity('bdd city')
+      setProvince('BC')
+      setPostalCode('1A1 A1A')
+      setTelephoneNumber('1234567890')
+      setFaxNumber('123454321')
+      setEmail('email@bdd.bdd')
+      setWebsite('http://bdd-website.bdd')
+    when: 'I save the company'
+      clickSaveButton()
+    then: 'The company is created'
+      at OrganizationsPage
+      addCompanySuccessAlertDisplayed()
+  }
+
+  void 'Updating a company'() {
+    given: 'I am logged in as an admin user'
+    and: 'I select a company'
+      selectCompany('.*bdd company.*')
+    and: 'I make edits to the company'
+      setCompanyName('edit company')
+      setStreetAddress('edit address')
+      setCity('edit city')
+      setProvince('AB')
+      setPostalCode('2B2 B2B')
+      setTelephoneNumber('0987654321')
+      setFaxNumber('543212345')
+      setEmail('email@edit.edit')
+      setWebsite('http://edit-website.edit')
+    when: 'I save the edits to the company'
+      clickUpdateButton()
+      at ConfirmUpdateModal
+      confirmSave()
+    then: 'The company is updated'
+      at OrganizationsPage
+      updateCompanySuccessAlertDisplayed()
+  }
+
+  void 'Deleting a company'() {
+    given: 'I am logged in as an admin user'
+    and: 'I select a company'
+      selectCompany('.*edit company.*')
+    when: 'I delete the company'
+      clickDeleteButton()
+      at ConfirmDeleteModal
+      confirmDelete()
+    then: 'The company is deleted'
+      at OrganizationsPage
+      deleteCompanySuccessAlertDisplayed('edit company')
+  }
+}
diff --git a/functional-tests/src/test/groovy/specs/RegistryAddSpecs.groovy b/functional-tests/src/test/groovy/specs/RegistryAddSpecs.groovy
new file mode 100644
index 0000000000..430e5a8dfa
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/RegistryAddSpecs.groovy
@@ -0,0 +1,50 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package specs
+
+import pages.RegistryPage
+import pages.RegistryAddPage
+import pages.RegistryProfilePage
+
+import spock.lang.Timeout
+import spock.lang.Title
+import spock.lang.Narrative
+
+@Timeout(300)
+@Title('Groundwater Well Registry Add Tests')
+@Narrative('''As an admin user, I want to register a new well operator.''')
+class RegistryAddSpecs extends LoggedInSpec {
+
+  void 'Register a new well operator'() {
+    given: 'I am logged in as a admin user'
+      logInAsAdminUser()
+      // TODO replace below 3 lines with "to RegistryAddPage" when fixed:
+      // https://trello.com/c/V4iDExNM/1307-epicregistry-cannot-bookmark-urls-in-registry-5
+      to RegistryPage
+      clickAddNewEntryButton()
+      at RegistryAddPage
+    and: 'I populate all required fields to add a new well operator'
+      setSurname('surname')
+      setFirstname('firstname')
+      setTelephoneNumber('123-456-7890')
+      setEmail('email@email.email')
+      setWellDrillerROCS(1234321)
+      setPumpInstallerORCS(5678765)
+    when: 'I click the Save button'
+      clickSaveButton()
+    then: 'The well operator is created and I am taken to the operator profile page'
+      at new RegistryProfilePage('surname', 'firstname')
+  }
+}
diff --git a/functional-tests/src/test/groovy/specs/RegistrySpecs.groovy b/functional-tests/src/test/groovy/specs/RegistrySpecs.groovy
new file mode 100644
index 0000000000..2b773dd960
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/RegistrySpecs.groovy
@@ -0,0 +1,60 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package specs
+
+import pages.RegistryPage
+
+import spock.lang.Timeout
+import spock.lang.Title
+import spock.lang.Narrative
+
+@Timeout(300)
+@Title('Groundwater Well Registry Tests')
+@Narrative('''As a user, I want to search the registry of well operators.''')
+class RegistrySpecs extends LoggedInSpec {
+
+  void 'Search for Well Drillers as a public user'() {
+    given: 'I am a public user on the Registry page'
+      to RegistryPage
+    and: 'I select the "Well Driller" profession type'
+      clickWellDrillerRadioButton()
+    when: 'I click the Search button'
+      clickSearchButton()
+    then: 'The search is executed and a table containing at least 1 matching result is displayed'
+      foundSearchResults()
+  }
+
+  void 'Search for Well Pump Installers as a public user'() {
+    given: 'I am a public user on the Registry page'
+      to RegistryPage
+    and: 'I select the "Well Pump Installer" profession type'
+      clickWellPumpInstallerRadioButton()
+    when: 'I click the Search button'
+      clickSearchButton()
+    then: 'The search is executed and a table containing at least 1 matching result is displayed'
+      foundSearchResults()
+  }
+
+  void 'Search using "Individual, company, or registration number" field as a public user'() {
+    given: 'I am a public user on the Registry page'
+      to RegistryPage
+    and: 'I set the search keywords'
+      setIndividualOrCompanyOrRegistrationSearchField('a')
+    when: 'I click the Search button'
+      clickSearchButton()
+    then: 'The search is executed and a table containing at least 1 matching result is displayed'
+      foundSearchResults()
+  }
+}
diff --git a/functional-tests/src/test/groovy/specs/SearchSpecs.groovy b/functional-tests/src/test/groovy/specs/SearchSpecs.groovy
new file mode 100644
index 0000000000..9cfd1f8928
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/SearchSpecs.groovy
@@ -0,0 +1,67 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package specs
+
+import pages.HomePage
+
+import spock.lang.Timeout
+import spock.lang.Title
+import spock.lang.Narrative
+
+@Timeout(300)
+@Title('Groundwater Well Search Tests')
+@Narrative('''As a public user, I want to search for existing wells.''')
+class SearchSpecs extends BaseSpec {
+
+  void setup() {
+    to HomePage
+  }
+
+  void 'Search by "Well Tag Number or Well Identification Plate Number" field'() {
+    given: 'I populate the "Well Tag Number or Well Identification Plate Number" field'
+      setWellTagOrIdentificationPlateNumber(123)
+    when: 'I click the Search button'
+      clickSearchButton()
+    then: 'The search is executed and a list of results is displayed'
+      foundSearchResults()
+  }
+
+  void 'Search by "Street Address" field'() {
+    given: 'I populate the "Street Address" field'
+      setStreetAddress('a')
+    when: 'I click the Search button'
+      clickSearchButton()
+    then: 'The search is executed and a table containing at least 1 matching result is displayed'
+      foundSearchResults()
+  }
+
+  void 'Search by "Legal Plan or District Lot or Parcel Identification Number PID" field'() {
+    given: 'I populate the "Legal Plan or District Lot or Parcel Identification Number PID" field'
+      setLegalPlanOrDistrictLotorPID('123')
+    when: 'I click the Search button'
+      clickSearchButton()
+    then: 'The search is executed and a table containing at least 1 matching result is displayed'
+      foundSearchResults()
+  }
+
+  void 'Search by "Owner Name" field'() {
+    given: 'I populate the "Owner Name" field'
+      setOwnerName('a')
+    when: 'I click the Search button'
+      clickSearchButton()
+    then: 'The search is executed and a table containing at least 1 matching result is displayed'
+      foundSearchResults()
+  }
+}
diff --git a/functional-tests/src/test/groovy/specs/base/BaseSpec.groovy b/functional-tests/src/test/groovy/specs/base/BaseSpec.groovy
new file mode 100644
index 0000000000..b74efc2983
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/base/BaseSpec.groovy
@@ -0,0 +1,28 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package specs
+
+import geb.spock.GebReportingSpec
+
+import traits.Utils
+
+/**
+ * Base spec.
+ *
+ * All specs should extend this class.
+ */
+abstract class BaseSpec extends GebReportingSpec implements Utils {
+
+}
diff --git a/functional-tests/src/test/groovy/specs/base/LoggedInSpec.groovy b/functional-tests/src/test/groovy/specs/base/LoggedInSpec.groovy
new file mode 100644
index 0000000000..e48fc4d567
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/base/LoggedInSpec.groovy
@@ -0,0 +1,33 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package specs
+
+import traits.Login
+
+/**
+ * Base spec for tests that require being logged in.
+ *
+ * All specs that login should extend this class.
+ */
+abstract class LoggedInSpec extends BaseSpec implements Login {
+  /**
+   * Cleanup that runs after each test.
+   *
+   * Clears and restarts the browser, the next test will open in a new browser.
+   */
+  void cleanup() {
+    clearAndResetBrowser()
+  }
+}
diff --git a/functional-tests/src/test/groovy/specs/traits/Login.groovy b/functional-tests/src/test/groovy/specs/traits/Login.groovy
new file mode 100644
index 0000000000..06a187d503
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/traits/Login.groovy
@@ -0,0 +1,60 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package traits
+
+import pages.HomePage
+import pages.LoginPage
+
+/**
+ * Methods to manage logging in.
+ */
+trait Login implements Users {
+
+  /**
+   * Log a user in.
+   *
+   * @param a Map containing username and password keys. eg: [username:'someUsername', password:'somePassword']
+   */
+  void login(Map user) {
+    to HomePage // TODO 1/2 find way to not hardcode HomePage, if possible, and allow any page
+
+    headerModule.loginButton.click()
+
+    at LoginPage
+
+    usernameField.value(user.username)
+    passwordField.value(user.password)
+
+    logInButton.click()
+
+    at HomePage // TODO 2/2 as above
+  }
+
+  void logInAsAdminUser() {
+    login(getUserOne())
+  }
+
+  void logInAsViewerUser() {
+    login(getViewerUser())
+  }
+
+  void logInAsSubmissionUser() {
+    login(getSubmissionUser())
+  }
+
+  void logInAsRegistryUser() {
+    login(getRegistryUser())
+  }
+}
diff --git a/functional-tests/src/test/groovy/specs/traits/Users.groovy b/functional-tests/src/test/groovy/specs/traits/Users.groovy
new file mode 100644
index 0000000000..3113ba6f96
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/traits/Users.groovy
@@ -0,0 +1,37 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package traits
+
+/**
+ * Methods to manage user credentials.
+ */
+trait Users {
+  Map env = System.getenv()
+  Map getUserOne() {
+    [username:env['GWELLS_USERNAME'], password:env['GWELLS_PASSWORD']]
+  }
+
+  Map getViewerUser() {
+    [username:env['GWELLS_VIEWER_USERNAME'], password:env['GWELLS_PASSWORD']]
+  }
+
+  Map getSubmissionUser() {
+    [username:env['GWELLS_SUBMISSION_USERNAME'], password:env['GWELLS_PASSWORD']]
+  }
+
+  Map getRegistryUser() {
+    [username:env['GWELLS_REGISTRY_USERNAME'], password:env['GWELLS_PASSWORD']]
+  }
+}
diff --git a/functional-tests/src/test/groovy/specs/traits/Utils.groovy b/functional-tests/src/test/groovy/specs/traits/Utils.groovy
new file mode 100644
index 0000000000..f8d21e12f6
--- /dev/null
+++ b/functional-tests/src/test/groovy/specs/traits/Utils.groovy
@@ -0,0 +1,35 @@
+/*
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package traits
+
+import geb.navigator.Navigator
+import geb.driver.CachingDriverFactory
+import geb.waiting.WaitTimeoutException
+
+import java.lang.AssertionError
+
+/**
+ * Generic re-usable utility methods.
+ */
+trait Utils {
+  /**
+   * Clears the browser and closes it.
+   * The next spec to run will open a fresh browser instance.
+   */
+  void clearAndResetBrowser() {
+    resetBrowser()
+    CachingDriverFactory.clearCacheAndQuitDriver()
+  }
+}
diff --git a/functional-tests/src/test/groovy/wellsummary/WellDetails.groovy b/functional-tests/src/test/groovy/wellsummary/WellDetails.groovy
deleted file mode 100644
index 717e76762b..0000000000
--- a/functional-tests/src/test/groovy/wellsummary/WellDetails.groovy
+++ /dev/null
@@ -1,389 +0,0 @@
-import geb.spock.GebReportingSpec
-import geb.Browser
-import pages.app.SearchPage
-import pages.app.WellSummaryPage
-import pages.external.AquiferReport
-
-import spock.lang.Ignore
-import spock.lang.Issue
-import spock.lang.Narrative
-import spock.lang.See
-import spock.lang.Specification
-import spock.lang.Title
-import spock.lang.Unroll
-
-@Title("Well Details")
-@Narrative("""
-As a general public user, I need to be able to access a summary report,
-through Search,  and see relevant information related to my well of interest.
-""")
-class WellDetailsSpecs extends GebReportingSpec {
-    @Unroll
-    def "Basic Field availability checking: #TestDesc #WellId"() {
-        given: "Given that I have found my well"
-			go "gwells/well/$WellId"
- 		when: "I accessed the Well Summary Page"
-			at WellSummaryPage
-			assert  (well_tag_number.text() == "$WellId")
-        then: "Then I see all available information related to the well"
-        	at WellSummaryPage
-			assert summary_information
-			assert well_tag_number
-			assert identification_plate_number
-			assert owner_full_name
-			assert licenced_status
-			assert well_well_status
-			assert well_class
-			assert well_subclass
-			assert intended_water_use
-			assert obs_well_number
-			assert obs_well_status
-			assert ems_id
-			assert aquifer_number
-			assert alternate_specs_submitted
-
-			assert address
-			assert city
-			assert legal
-			assert lot
-			assert plan
-			assert district_lot
-			assert block
-			assert section
-			assert township
-			assert range
-			assert land_district
-			assert pid
-
-			assert location_desc
-			assert latitude
-			assert longitude
-			assert utm_zone_code
-			assert utm_northing
-			assert utm_easting
-			assert utm_accuracy_code
-			assert bcgs_mapsheet_number
-
-			assert activities
- 			assert construction_end_date
-			assert alteration_end_date
-			assert decommission_end_date
-			assert drilling_company
-
-			assert total_depth_drilled
-			assert static_water_level
-			assert well_cap_type
-			assert finished_well_depth
-			assert well_yield
-			assert well_disinfected
-			assert final_casing_stickup
-			assert artesian_flow
-			assert drilling_method
-			assert bedrock_depth
-			assert artesian_pressure
-			assert orientation_direction
-			assert ground_elevation
-			assert ground_elevation_method
-
-			assert intake_method
-			assert screen_type
-			assert screen_material
-			assert screen_opening
-			assert screen_bottom
-			assert screens
-
-			assert developed_by
-			assert devlopment_total_duration
-
-			assert yield_estimation_method
-			assert yield_estimation_rate
-			assert yield_estimation_duration
-
-			assert casing_field_set
-			assert casings
-
-			assert surface_seal_fieldset
-			assert surface_seal_method
-			assert surface_seal_material
-			assert surface_seal_thickness
-			assert surface_seal_length
-			assert backfill_type
-			assert backfill_depth
-
-			assert perforations_fieldset
-			assert no_liner_details_information
-
-			assert lithology_fieldset
-			assert lithology
-
-			assert well_decommissioning
-        	assert reason_for_decommission
-        	assert method_of_closure
-        	assert decommission_details
-
-			assert comments
-			//assert no_document_msg
-
-        where:
-        TestDesc                          | WellId
-        "Well Tag - "                    | 110749
-    }
-
-    @Unroll
-    def "Basic Field availability checking liner details: #TestDesc #WellId"() {
-        given: "Given that I have found my well that has liner details"
-			go "gwells/well/$WellId"
- 		when: "I accessed the Well Summary Page"
-			at WellSummaryPage
-			assert  (well_tag_number.text() == "$WellId")
-        then: "Then I see all the liner details related to the well"
-        	at WellSummaryPage
-
-        assert liner_details_table
-
-        where:
-        TestDesc                          | WellId
-        "Well Tag - "                    | 108027
-      }
-
-    @Unroll
-    def "Basic Field availability checking screen details: #TestDesc #WellId"() {
-        given: "Given that I have found a well with screen details"
-			go "gwells/well/$WellId"
- 		when: "I accessed the Well Summary Page"
-			at WellSummaryPage
-			assert  (well_tag_number.text() == "$WellId")
-        then: "Then I see all screen details related to the well"
-        	at WellSummaryPage
-
-        assert screens
-
-        where:
-        TestDesc                          | WellId
-        "Well Tag - "                    | 108025
-      }
-
-    @Unroll
-    def "Basic Field availability checking screen details: #TestDesc #WellId"() {
-        given: "Given that I have found a well without screen details"
-      go "gwells/well/$WellId"
-    when: "I accessed the Well Summary Page"
-      at WellSummaryPage
-      assert  (well_tag_number.text() == "$WellId")
-        then: "Then I see a notice that tells me there is no screen information for that well"
-          at WellSummaryPage
-
-        assert no_screen_information
-
-        where:
-        TestDesc                          | WellId
-        "Well Tag - "                    | 104671
-      }
-
-    @Unroll
-    def "Basic Field availability checking casing details: #TestDesc #WellId"() {
-        given: "Given that I have found a well with casing details"
-			go "gwells/well/$WellId"
- 		when: "I accessed the Well Summary Page"
-			at WellSummaryPage
-			assert  (well_tag_number.text() == "$WellId")
-        then: "Then I see all casing details related to the well"
-        	at WellSummaryPage
-
-        assert casings
-
-        where:
-        TestDesc                          | WellId
-        "Well Tag - "                    | 108025
-      }
-
-    @Unroll
-    def "Basic Field availability checking casing details: #TestDesc #WellId"() {
-        given: "Given that I have found a well without casing details"
-      go "gwells/well/$WellId"
-    when: "I accessed the Well Summary Page"
-      at WellSummaryPage
-      assert  (well_tag_number.text() == "$WellId")
-        then: "Then I see a notice that tells me there is no casing information for that well"
-          at WellSummaryPage
-
-        assert no_casing_information
-
-        where:
-        TestDesc                          | WellId
-        "Well Tag - "                    | 104671
-      }
-
-
-      @Unroll
-      def "Basic Field availability checking lithology details: #TestDesc #WellId"() {
-          given: "Given that I have found a well with lithology details"
-  			go "gwells/well/$WellId"
-   		when: "I accessed the Well Summary Page"
-  			at WellSummaryPage
-  			assert  (well_tag_number.text() == "$WellId")
-          then: "Then I see all lithology details related to the well"
-          	at WellSummaryPage
-
-          assert lithology
-
-          where:
-          TestDesc                          | WellId
-          "Well Tag - "                    | 105747
-        }
-
-      @Unroll
-      def "Basic Field availability checking lithology details: #TestDesc #WellId"() {
-          given: "Given that I have found a well without lithology details"
-        go "gwells/well/$WellId"
-      when: "I accessed the Well Summary Page"
-        at WellSummaryPage
-        assert  (well_tag_number.text() == "$WellId")
-          then: "Then I see a notice that tells me there is no lithology information for that well"
-            at WellSummaryPage
-
-          assert no_lithology_information
-
-          where:
-          TestDesc                          | WellId
-          "Well Tag - "                    | 104671
-        }
-
-    @Unroll
-    def "Field content checking: #TestDesc - #WellId - #WellFieldContent"() {
-        given: "Given that I have found my well"
-			go "gwells/well/$WellId"
- 	 	when: "I accessed the Well Summary Page"
-			at WellSummaryPage
-        then: "Then I see the expected information(#WellFieldContent) for the #TestDesc field"
-			at WellSummaryPage
-			//println "$TestDesc: " +  page."$TestDesc".text().trim()
-			//assert page."$TestDesc".text().trim() == "$WellFieldContent".trim()
-		where:
-        TestDesc                          | WellFieldContent 	| WellId
-		"well_tag_number"				  | "110749" 			| 110749
-		"identification_plate_number"     | "47948" 			| 110750
-		"owner_full_name"				  | "ROYAL CANADIAN MOUNTED POLICE"		| 110749
-		"licenced_status"				  | "UNLICENSED"		| 110749
-		"well_well_status"				  | "CLOSURE"			| 110749
-		"well_class"	 				  | "Water Supply" 	 | 110749
-		"well_subclass"	 				  | "Domestic" 	 | 110749
-		"intended_water_use"	 		  | "Water Supply System" 	 | 110749
-		"obs_well_number"	 			  | "402" 	 | 102364
-		//"obs_well_number"	 			  | "179" 	 | 4980 //no link
-		"obs_well_status"	    		  | "Active" 	 |  102364
-		"ems_id"	 					  | "E283990" 	 | 102364
-		"aquifer_number"	 			  | "936" 	 | 102364
-		//"aquifer_number"	 			  | "464" 	 | 4980 //no link
-		"alternate_specs_submitted"	 	  | "No" 	 | 110749
-		//"water_supply_system_name"	 	  | "CHETWYND PULP MILL" 	 | 102406
-		//"water_supply_system_well_name"	  | "EAST WELL" 	 | 102406
-		"address"	 					  | "6647 CHRISTENSEN ROAD" 	 | 110749
-		"city"	 						  | "ANAHIM LAKE" 	 | 110749
-		"lot"							  | "A" 	 | 110749
-		"plan"							  | "25014" 	 | 110749
-		"district_lot"	 				  | "405" 	 | 110749
-		"block"	 						  | "19" 	 | 100127
-		"section"	 					  | "28" 	 | 100542
-		"township"	 					  | "21" 	 | 100500
-		"range"	 						  | "3" 	 | 110749
-		"land_district"	 				  | "26 KOOTENAY" 	 | 110750
-		"pid"	 						  | "008048142" 	 | 110749
-		"location_desc"	 				  | "PREVIOUS LEGAL PLAN: 14144" 	 | 110749
-		"latitude"	 					  | "52.465449" 	 | 110749
-		"longitude"	 					  | "-125.300830" 	 | 110749
-		"utm_zone_code"	 				  | "10" 	 | 110749
-		"utm_northing"	 				  | "5815298" 	 | 110749
-		"utm_easting"	             	  | "343701" 	 | 110749
-		"utm_accuracy_code"	 			  | "H" 	 | 110749
-		"bcgs_mapsheet_number"	 		  | "093C044324" 	 | 110749
-		"construction_end_date"	          | "1976-01-29" 	 | 110749
-		"alteration_end_date"	 		  | "2014-11-23" 	 | 110749
-		"decommission_end_date"	 		  | "2014-11-23" 	 | 110749
-		"drilling_company"	  			  | "Industrial Drillers" 	 | 110749
-		"total_depth_drilled"	 		  | "285 feet" 	 | 110749
-		"static_water_level"	 		  | "128 feet" 	 | 106648
-		"well_cap_type"	   				  | "VENT CAST" 	 | 106648
-		"finished_well_depth"	 		  | "100 feet" 	 | 105747
-		"well_yield"	 				  | "15 USGPM" 	 | 110749
-		"well_disinfected"	 			  | "No" 	 | 110749
-		"final_casing_stickup"	 		  | "12 inches" 	 | 106648
-		"artesian_flow"	 				  | "15 USGPM" 	 | 110749
-		"drilling_method"	 			  | "AIR_ROTARY" 	 | 100501
-		"bedrock_depth"	 				  | "60 feet" 	 | 110749
-		"artesian_pressure"	    		  | "11 inches" 	 | 113552
-		"orientation_direction"	 		  | "vertical" 	 | 110749
-		"ground_elevation"	 			  | "378 feet" 	 | 106648
-		"ground_elevation_method"	 	  | "1:10,000 Scale Map" 	 | 104636
-		//"well_plate_attached"	 		  | "CASING" 	 | 106648
-		// "intake_method"	 				  | "Open Bottom" 	 | 110749
-		"screen_type"	 				  | "Pipe size" 	 | 102666
-		"screen_material"	 			  | "Plastic" 	 | 102666
-		"screen_opening"	              | "Perforated Pipe" 	 | 102666
-		"screen_bottom"	 				  | "Other" 	 | 107072
-		"screen_from" 	 				  | "105" 	 | 105508
-		"screen_to"	 					  | "109" 	 | 105508
-		"internal_diameter"	 			  | "6" | 105508
-		"assembly_type"	 				  | "Screen" 	 | 105508
-		"slot_size"	 					  | "15" 	 | 105508
-		"developed_by"	 				  | "Bailing" 	 | 110749
-		"devlopment_total_duration"	 	  | "3 hours" 	 | 110749
-		"yield_estimation_method"	      | "Air Lifting" 	 | 107072
-		"yield_estimation_rate"			  | "15   USGPM" 	 | 110749
-		"yield_estimation_duration"	 	  | "12   hours" 	 | 110749
-		"casings_from"	 				  | "0" 	 | 113503
-		"casings_to"	 				  | "63" 	 | 113503
-		"casings_diameter"	 			  | "12.250" 	 | 112366
-		"casings_material"	 			  | "Steel" 	 | 113503
-		"casings_thickness"	 			  | "0.219" 	 | 113503
-		"casings_driveshoe"	 			  | "Yes" 	 | 113503
-		"surface_seal_method"	 		  | "Poured" 	 | 110627
-		"surface_seal_material"	 		  | "Bentonite clay" 	 | 110627
-		"surface_seal_thickness"	 	  | "2 inches" 	 | 105417
-		"surface_seal_length"	 		  | "18 feet" 	 | 105417
-		"backfill_type"	 				  | "CEMENT & BENTONITE CHIPS" 	 | 105417
-		"backfill_depth"	 			  | "18 feet" 	 |  105417
-		"liner_material"	 			  | "PVC" 	 |  111752
-		"liner_diameter"	 			  | "4" 	 |  111752
-		"liner_thickness"	 			  | "0.250" 	 |  111752
-		"liner_from"	 				  | "8" 	 |  111752
-		"liner_to"	 	  				  | "280" 	 |  111752
-		"liner_perffrom"	 			  | "120" 	 |  111752
-		"liner_perfto"	 				  | "140" 	 |  111752
-		"lithology_from"	 			  | "0" 	 |  110000
-        "lithology_to"	 				  | "2" 	 |  110000
-        "lithology_raw_data"		      | "TOPSOIL, BROWN" 	 |  100001
-        "lithology_description"	 		  | "cemented" 	 |  110000
-        "lithology_material_description"  | "soil" 	 |  110000
-        "lithology_relative_hardness"	  | "Stiff" 	 |  112152
-        "lithology_colour" 	 			  | "dark" 	 |  110000
-        "lithology_waterbearing_estimated_flow"	 | "200 USGPM" 	 |  104533
-        "lithology_observations" 	 	  | "Water-bearing" 	 |  110000
-        "reason_for_decommission" 	 	  | "SITE DEVELOPMENT" 	 |  110749
-        "method_of_closure" 	 		  | "PUMPED" 	 |  110749
-        "sealant_material" 	 			  | "CONCRETE" 	 |  110749
-        "backfill_material" 	 		  | "BENTONITE AND GRAVEL" 	 |  100200
-        "decommission_details"  	 	  | "NO ISSUES WITH CLOSURE. ONLY SLIGHT ARTESIAN FLOW IN NOV. 2014. CASING LEFT IN PLACE, PUMP PULLED." 	 |  110749
-		"comments" 						  | "NOT RESPONSIBLE FOR QUALITY OR QUANTITY" | 110750
-		"documentlink"					  | "WTN 109912_Well Construction.pdf" | 109912
-		"no_document_msg"				  | "No additional documentation currently available for this well." | 100001
-    }
-
-/* 	@Issue("https://trello.com/c/mi3lnU5k")
-	def "Find Aquifer Info"() {
-		given: "I am a public user"
-			go "gwells/well/102364"
-		and: "that I want find out information about the aquifer my well is located in"
-			at WellSummaryPage
-			assert aquifer_number.text().trim() == "936"
-			AquiferReport.aquiferNumber = "936"
-		when: "I select the aquifer number from the Well Summary Page"
-			withNewWindow ({ aquifer_number.click() }, page: AquiferReport, wait: true, close: false) {
-		 		at AquiferReport
-				}
-		then: "a new window in my browser appears displaying the aquifer classification worksheet associated to that aquifer number."
-			assert aquifer_number.text().trim() == "936"
-
-
-	} */
-}
diff --git a/functional-tests/src/test/resources/GebConfig.groovy b/functional-tests/src/test/resources/GebConfig.groovy
index f24e9d546d..10a25d3ae3 100644
--- a/functional-tests/src/test/resources/GebConfig.groovy
+++ b/functional-tests/src/test/resources/GebConfig.groovy
@@ -1,7 +1,7 @@
 /*
-	This is the Geb configuration file.
-	
-	See: http://www.gebish.org/manual/current/#configuration
+  This is the Geb configuration file.
+
+  See: http://www.gebish.org/manual/current/#configuration
 */
 
 import org.openqa.selenium.Dimension
@@ -15,75 +15,80 @@ import org.openqa.selenium.safari.SafariDriver
 import org.openqa.selenium.remote.DesiredCapabilities
 
 waiting {
-	timeout = 5
-	retryInterval = 1
+  timeout = 20
+  retryInterval = 1
 }
 
 //Using default waiting configuration
 atCheckWaiting = true
 
 environments {
-	
-	// run via “./gradlew chromeTest”
-	// See: https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver
-	chrome {
-		driver = { 
-			ChromeOptions o = new ChromeOptions()
-			o.addArguments("start-maximized")
-			new ChromeDriver(o)
-			}
-	}
-
-	// run via “./gradlew chromeHeadlessTest”
-	// See: https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver
-	chromeHeadless {
-		driver = {
-			ChromeOptions o = new ChromeOptions()
-			o.addArguments('headless')
-			o.addArguments('disable-gpu') 
-			o.addArguments('no-sandbox')
-			o.addArguments("window-size=1600,900")
-			new ChromeDriver(o)
-		}
-	}
-	
-	// run via “./gradlew firefoxTest”
-	// See: https://github.com/SeleniumHQ/selenium/wiki/FirefoxDriver
-	firefox {
-		driver = { new FirefoxDriver() }
-	}
-		
-	firefoxHeadless {
-		driver = {
-			FirefoxOptions o = new FirefoxOptions()
-			o.addArguments("-headless")
-			new FirefoxDriver(o)
-		}
-	}
-	
-	// run via “./gradlew ieTest”
-	// See: https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver
-	ie {
-		def d = new DesiredCapabilities();
-		d.setCapability(InternetExplorerDriver.INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS,true);
-		d.setCapability(InternetExplorerDriver.IGNORE_ZOOM_SETTING,true);
-		d.setCapability(InternetExplorerDriver.NATIVE_EVENTS,false);
-		d.setCapability(InternetExplorerDriver.REQUIRE_WINDOW_FOCUS,true);
-		
-		driver = { new InternetExplorerDriver(d) }	
-	}
-
-	// run via “./gradlew edgeTest”
-	// See: https://github.com/SeleniumHQ/selenium/wiki
-	edge {
-		driver = { new EdgeDriver() }
-	}
-
-	// run via “./gradlew safariTest”
-	// See: https://github.com/SeleniumHQ/selenium/wiki
-	safari {
-		driver = { new SafariDriver() }
-	}
+
+  // run via “./gradlew chromeTest”
+  // See: https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver
+  chrome {
+    driver = {
+      ChromeOptions o = new ChromeOptions()
+      o.addArguments("window-size=1600,900")
+      new ChromeDriver(o)
+      }
+  }
+
+  // run via “./gradlew chromeHeadlessTest”
+  // See: https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver
+  chromeHeadless {
+    driver = {
+      ChromeOptions o = new ChromeOptions()
+      o.addArguments('headless')
+      o.addArguments('disable-gpu')
+      o.addArguments('no-sandbox')
+      o.addArguments("window-size=1600,900")
+      new ChromeDriver(o)
+    }
+  }
+
+  // run via “./gradlew firefoxTest”
+  // See: https://github.com/SeleniumHQ/selenium/wiki/FirefoxDriver
+  firefox {
+    driver = {
+      FirefoxOptions o = new FirefoxOptions()
+      o.addArguments("-window-size=1600,900")
+      new FirefoxDriver(o)
+    }
+  }
+
+  firefoxHeadless {
+    driver = {
+      FirefoxOptions o = new FirefoxOptions()
+      o.addArguments("-headless")
+      o.addArguments("-window-size=1600,900")
+      new FirefoxDriver(o)
+    }
+  }
+
+  // run via “./gradlew ieTest”
+  // See: https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver
+  ie {
+    def d = new DesiredCapabilities();
+    d.setCapability(InternetExplorerDriver.INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS,true);
+    d.setCapability(InternetExplorerDriver.IGNORE_ZOOM_SETTING,true);
+    d.setCapability(InternetExplorerDriver.NATIVE_EVENTS,false);
+    d.setCapability(InternetExplorerDriver.REQUIRE_WINDOW_FOCUS,true);
+
+    driver = { new InternetExplorerDriver(d) }
+  }
+
+  // run via “./gradlew edgeTest”
+  // See: https://github.com/SeleniumHQ/selenium/wiki
+  edge {
+    driver = { new EdgeDriver() }
+  }
+
+  // run via “./gradlew safariTest”
+  // See: https://github.com/SeleniumHQ/selenium/wiki
+  safari {
+    driver = { new SafariDriver() }
+  }
 }
 
 // To run the tests with all browsers just run “./gradlew test”
@@ -92,19 +97,17 @@ baseNavigatorWaiting = true
 
 // Allows for setting you baseurl in an environment variable.
 // This is particularly handy for development and the pipeline
-def env = System.getenv()
-baseUrl = env['BASEURL']
+Map env = System.getenv()
+baseUrl = env['BASE_URL']
 if (!baseUrl) {
-	//baseUrl = "http://localhost:8000/"
-	baseUrl = "http://gwells-dev.pathfinder.gov.bc.ca/"
-	//baseUrl = "https://dlvrapps.nrs.gov.bc.ca/" //Dev
-	//baseUrl = "https://testapps.nrs.gov.bc.ca/" //Test
-	//baseUrl = "https://apps.nrs.gov.bc.ca/" //Prod
+  baseUrl = "http://127.0.0.1:8000/gwells/"
 }
 
+println "--------------------------------------"
 println "BaseURL: ${baseUrl}"
-println "--------------------------"
+println "--------------------------------------"
 
+autoClearCookies = true
+autoClearWebStorage = true
 cacheDriverPerThread = true
 quitCachedDriverOnShutdown = true
-
diff --git a/openshift/backend.bc.json b/openshift/backend.bc.json
index ad5eb7dfbf..fcdda33764 100644
--- a/openshift/backend.bc.json
+++ b/openshift/backend.bc.json
@@ -19,6 +19,14 @@
       {
         "name": "ENV_NAME",
         "required": true
+      },
+      {
+        "name": "SOURCE_REPOSITORY_REF",
+        "required": true
+      },
+      {
+          "name": "APP_IMAGE_TAG",
+          "required": true
       }
     ],
     "objects": [
@@ -26,7 +34,10 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "gwells-python-36-rhel7${NAME_SUFFIX}",
+                "name": "gwells-python-36-rhel7",
+                "labels": {
+                    "appver": "gwells-base-image"
+                },
                 "creationTimestamp": null,
                 "annotations": {
                     "description": "Python Base Image"
@@ -56,23 +67,7 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "gwells-python-runtime${NAME_SUFFIX}",
-                "creationTimestamp": null,
-                "annotations": {
-                    "description": "Python Runtime Image"
-                }
-            },
-            "spec": {
-                "lookupPolicy": {
-                    "local": false
-                }
-            }
-        },
-        {
-            "kind": "ImageStream",
-            "apiVersion": "v1",
-            "metadata": {
-                "name": "gwells${NAME_SUFFIX}",
+                "name": "gwells-application",
                 "creationTimestamp": null,
                 "labels": {
                     "base-name":"gwells"
@@ -92,62 +87,11 @@
             "kind": "BuildConfig",
             "apiVersion": "v1",
             "metadata": {
-                "name": "gwells-python-runtime${NAME_SUFFIX}",
+                "name": "gwells${NAME_SUFFIX}",
                 "creationTimestamp": null,
                 "labels": {
-                    "build": "gwells-python-runtime"
+                    "appver": "gwells${NAME_SUFFIX}"
                 },
-                "annotations": {
-
-                }
-            },
-            "spec": {
-                "successfulBuildsHistoryLimit": 3,
-                "failedBuildsHistoryLimit": 3,
-                "triggers": [
-                    {
-                        "type": "ImageChange",
-                        "imageChange": {}
-                    },
-                    {
-                        "type": "ConfigChange"
-                    }
-                ],
-                "runPolicy": "SerialLatestOnly",
-                "source": {
-                    "contextDir": "openshift/docker-images/gwells-python-runtime",
-                    "git": {
-                        "ref": "master",
-                        "uri": "${SOURCE_REPOSITORY_URL}"
-                    },
-                    "type": "Git"
-                },
-                "strategy": {
-                    "type": "Docker",
-                    "dockerStrategy": {
-                        "from": {
-                            "kind": "ImageStreamTag",
-                            "name": "gwells-python-36-rhel7${NAME_SUFFIX}:3.6"
-                        }
-                    }
-                },
-                "output": {
-                    "to": {
-                        "kind": "ImageStreamTag",
-                        "name": "gwells-python-runtime${NAME_SUFFIX}:${ENV_NAME}"
-                    }
-                },
-                "resources": {},
-                "postCommit": {},
-                "nodeSelector": null
-            }
-        },
-        {
-            "kind": "BuildConfig",
-            "apiVersion": "v1",
-            "metadata": {
-                "name": "gwells${NAME_SUFFIX}",
-                "creationTimestamp": null,
                 "annotations": {
                     "description": "Defines how to build the application"
                 }
@@ -168,7 +112,7 @@
                     "type": "Git",
                     "git": {
                         "uri": "${SOURCE_REPOSITORY_URL}",
-                        "ref": "master"
+                        "ref": "${SOURCE_REPOSITORY_REF}"
                     },
                     "contextDir": "app"
                 },
@@ -177,7 +121,7 @@
                     "sourceStrategy": {
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "gwells-python-runtime${NAME_SUFFIX}:${ENV_NAME}"
+                            "name": "gwells-python-36-rhel7:3.6"
                         },
                         "env": [
                             {
@@ -205,7 +149,7 @@
                 "output": {
                     "to": {
                         "kind": "ImageStreamTag",
-                        "name": "gwells${NAME_SUFFIX}:${ENV_NAME}"
+                        "name": "gwells-application:${APP_IMAGE_TAG}"
                     }
                 },
                 "resources": {
diff --git a/openshift/backend.dc.json b/openshift/backend.dc.json
index c28f611d2c..4fa448dc9c 100644
--- a/openshift/backend.dc.json
+++ b/openshift/backend.dc.json
@@ -12,10 +12,6 @@
             "description": "A suffix appended to all objects",
             "required": true
         },
-        {
-            "name": "BUILD_ENV_NAME",
-            "required": true
-        },
         {
             "name": "ENV_NAME",
             "required": true
@@ -34,7 +30,8 @@
                 "name": "gwells${NAME_SUFFIX}",
                 "creationTimestamp": null,
                 "labels": {
-                    "base-name":"gwells"
+                    "base-name":"gwells",
+                    "appver": "gwells${NAME_SUFFIX}"
                 },
                 "annotations": {
                     "description": "Keeps track of changes in the application image"
@@ -102,8 +99,20 @@
         {
             "apiVersion": "v1",
             "data": {
-                "DB_REPLICATE": "None",
-                "DJANGO_DEBUG": "False"
+                "DB_REPLICATE": null,
+                "DJANGO_DEBUG":  null,
+                "ENABLE_ADDITIONAL_DOCUMENTS":  null,
+                "ENABLE_DATA_ENTRY":  null,
+                "ENABLE_GOOGLE_ANALYTICS": null,
+                "S3_PRIVATE_BUCKET": null,
+                "S3_PRIVATE_HOST": null,
+                "SSO_AUDIENCE": null,
+                "SSO_AUTH_HOST":  null,
+                "SSO_CLIENT": null,
+                "SSO_IDP_HINT": null,
+                "SSO_PORT": null,
+                "SSO_PUBKEY": null,
+                "SSO_REALM": null
             },
             "kind": "ConfigMap",
             "metadata": {
@@ -111,6 +120,10 @@
                 "name": "gwells-global-config${NAME_SUFFIX}",
                 "annotations": {
                     "as-copy-of": "gwells-global-config"
+                },
+                "labels": {
+                    "appver":"gwells${NAME_SUFFIX}",
+                    "app": "gwells${NAME_SUFFIX}"
                 }
             }
         },
@@ -120,7 +133,9 @@
             "metadata": {
                 "name": "gwells${NAME_SUFFIX}",
                 "creationTimestamp": null,
-                "labels": null,
+                "labels": {
+                    "appver": "gwells${NAME_SUFFIX}"
+                },
                 "annotations": {
                     "description": "Defines how to deploy the application server"
                 }
@@ -216,7 +231,8 @@
                         "name": "gwells${NAME_SUFFIX}",
                         "creationTimestamp": null,
                         "labels": {
-                            "name": "gwells${NAME_SUFFIX}"
+                            "name": "gwells${NAME_SUFFIX}",
+                            "appver": "gwells${NAME_SUFFIX}"
                         }
                     },
                     "spec": {
@@ -471,6 +487,15 @@
                                             }
                                         }
                                     },
+                                    {
+                                        "name": "ENABLE_AQUIFERS_SEARCH",
+                                        "valueFrom": {
+                                            "configMapKeyRef": {
+                                                "key": "ENABLE_AQUIFERS_SEARCH",
+                                                "name": "gwells-global-config${NAME_SUFFIX}"
+                                            }
+                                        }
+                                    },
                                     {
                                         "name": "APP_CONTEXT_ROOT",
                                         "value": "gwells"
@@ -621,7 +646,9 @@
             "kind": "HorizontalPodAutoscaler",
             "metadata": {
                 "creationTimestamp": null,
-                "labels": { },
+                "labels": {
+                    "appver": "gwells${NAME_SUFFIX}"
+                },
                 "name": "gwells${NAME_SUFFIX}"
             },
             "spec": {
@@ -641,7 +668,9 @@
             "metadata": {
                 "name": "gwells${NAME_SUFFIX}",
                 "creationTimestamp": null,
-                "labels": null,
+                "labels": {
+                    "appver": "gwells${NAME_SUFFIX}"
+                },
                 "annotations": {
                     "description": "Exposes and load balances the application pods"
                 }
@@ -669,7 +698,8 @@
                 "name": "gwells${NAME_SUFFIX}",
                 "creationTimestamp": null,
                 "labels": {
-                    "frontend": "true"
+                    "frontend": "true",
+                    "appver": "gwells${NAME_SUFFIX}"
                 },
                 "annotations": { }
             },
diff --git a/openshift/docker-images/gwells-python-runtime/Dockerfile b/openshift/docker-images/gwells-python-runtime/Dockerfile
deleted file mode 100644
index 4437fcd3da..0000000000
--- a/openshift/docker-images/gwells-python-runtime/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM openshift/python:3.6
-RUN source scl_source enable rh-python36 && \
-source ${APP_ROOT}/bin/activate && \
-pip install -U pip setuptools wheel
diff --git a/openshift/postgresql.bc.json b/openshift/postgresql.bc.json
index 90cd34fc1e..9c82e02126 100644
--- a/openshift/postgresql.bc.json
+++ b/openshift/postgresql.bc.json
@@ -1,17 +1,8 @@
 {
     "kind": "Template",
     "apiVersion": "v1",
-    "metadata": {
-        "name": "gwells-postgresql-bc",
-        "creationTimestamp": null
-    },
+    "metadata": {},
     "parameters": [
-        {
-            "name": "NAME_SUFFIX",
-            "displayName": "Name Suffix",
-            "description": "A suffix appended to all objects",
-            "required": true
-        },
         {
             "name": "ENV_NAME",
             "required": true
@@ -22,10 +13,11 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "gwells-postgresql${NAME_SUFFIX}",
+                "name": "gwells-postgresql",
                 "creationTimestamp": null,
                 "labels": {
-                    "base-name": "gwells-postgresql"
+                    "base-name": "gwells-postgresql",
+                    "appver": "gwells"
                 },
                 "annotations": {}
             },
@@ -35,13 +27,13 @@
                 },
                 "tags":[
                     {
-                        "name": "${ENV_NAME}",
                         "annotations": null,
                         "from": {
                             "kind": "ImageStreamTag",
                             "name": "postgresql-oracle-fdw:9.5-2"
                         },
                         "importPolicy": {},
+                        "name": "${ENV_NAME}",
                         "referencePolicy": {
                             "type": "Source"
                         }
diff --git a/openshift/postgresql.dc.json b/openshift/postgresql.dc.json
index 0d25760dff..4ae42f24f5 100644
--- a/openshift/postgresql.dc.json
+++ b/openshift/postgresql.dc.json
@@ -64,6 +64,10 @@
             "name": "IMAGE_STREAM_VERSION",
             "required": true,
             "value": "9.5"
+        },
+        {
+            "name": "NAME_SUFFIX",
+            "required": true
         }
     ],
     "objects": [
@@ -124,7 +128,8 @@
             "metadata": {
                 "name": "${DATABASE_SERVICE_NAME}",
                 "annotations":{
-                    "template.openshift.io.bcgov/create": "true"
+                    "template.openshift.io.bcgov/create": "true",
+                    "volume.beta.kubernetes.io/storage-provisioner": "kubernetes.io/glusterfs"
                 }
             },
             "spec": {
@@ -135,7 +140,8 @@
                     "requests": {
                         "storage": "${VOLUME_CAPACITY}"
                     }
-                }
+                },
+                "storageClassName": "gluster-file-db"
             }
         },
         {
@@ -145,7 +151,8 @@
                 "name": "${IMAGE_STREAM_NAME}",
                 "creationTimestamp": null,
                 "labels": {
-                    "base-name": "gwells-postgresql"
+                    "base-name": "gwells-postgresql",
+                    "appver": "gwells${NAME_SUFFIX}"
                 },
                 "annotations": {}
             },
@@ -175,7 +182,8 @@
                 "template": {
                     "metadata": {
                         "labels": {
-                            "name": "${DATABASE_SERVICE_NAME}"
+                            "name": "${DATABASE_SERVICE_NAME}",
+                            "appver": "gwells${NAME_SUFFIX}"
                         }
                     },
                     "spec": {
diff --git a/openshift/scripts/local-dump.sh b/openshift/scripts/local-dump.sh
deleted file mode 100644
index dce616254f..0000000000
--- a/openshift/scripts/local-dump.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# Dumps from a GWells database and stores locally.  Project namespace required.
-#
-# NOTE: You need to be logged in with a token, via:
-#       https://console.pathfinder.gov.bc.ca:8443/oauth/token/request
-
-
-# Halt conditions, verbosity and field separator
-#
-set -euo pipefail
-[ "${VERBOSE:-x}" != true ]|| set -x
-IFS=$'\n\t'
-
-
-# Params and env vars
-#
-SAVE_TO=${1:-/var/lib/pgsql/backup/$( date +%Y-%m-%d-%T ).gz}
-BK_COUNT=${BK_COUNT:-10}
-DB_NAME=${DB_NAME:-gwells}
-
-
-# Identify database and take a backup
-#
-mkdir -p $( dirname ${SAVE_TO} )
-pg_dump ${DB_NAME} | gzip > ${SAVE_TO}
-
-
-# Cleanup any more than BK_COUNT backups
-#
-ls /var/lib/pgsql/backup/*.gz -1pr | tail -n +$( expr 1 + ${BK_COUNT} )| xargs -r rm --
-
-
-# Summarize
-#
-echo
-echo "DB:   ${DB_NAME}"
-echo "Size: $( du -h ${SAVE_TO} | awk '{ print $1 }' )"
-echo "Name: ${SAVE_TO}"
-echo
diff --git a/app/database/oc-dump.sh b/openshift/scripts/oc-dump.sh
similarity index 97%
rename from app/database/oc-dump.sh
rename to openshift/scripts/oc-dump.sh
index 1e92c7f75d..95979e3fda 100755
--- a/app/database/oc-dump.sh
+++ b/openshift/scripts/oc-dump.sh
@@ -87,7 +87,7 @@ SAVE_FILE=$( basename ${SAVE_TO} )
 SAVE_PATH=$( dirname ${SAVE_TO} )
 mkdir -p ${SAVE_PATH}
 oc exec ${POD_DB} -n ${PROJECT} -- /bin/bash -c \
-	'pg_dump -U ${POSTGRESQL_USER} -d ${POSTGRESQL_DATABASE} -Fc \
+	'pg_dump -U postgres -d ${POSTGRESQL_DATABASE} -Fc \
 	--no-privileges --no-tablespaces --schema=public > /tmp/'${SAVE_FILE}
 oc rsync ${POD_DB}:/tmp/${SAVE_FILE} ${SAVE_PATH} -n ${PROJECT} --progress=true --no-perms=true
 oc exec ${POD_DB} -n ${PROJECT} -- /bin/bash -c 'rm /tmp/'${SAVE_FILE}