diff --git a/covidseq/resources/schemas/covidseq.xml b/covidseq/resources/schemas/covidseq.xml
index d5228a2d7..6de4c263e 100644
--- a/covidseq/resources/schemas/covidseq.xml
+++ b/covidseq/resources/schemas/covidseq.xml
@@ -23,7 +23,7 @@
         <tableTitle>Samples</tableTitle>
 <!--        <javaCustomizer class="org.labkey.laboratory.query.SamplesCustomizer" />-->
         <insertUrl></insertUrl>
-        <importUrl>/covidseq/sampleImport.view</importUrl>
+        <importUrl>covidseq/sampleImport.view</importUrl>
         <auditLogging>DETAILED</auditLogging>
         <pkColumnName>rowid</pkColumnName>
         <titleColumn>samplename</titleColumn>
@@ -134,7 +134,7 @@
         <javaCustomizer class="org.labkey.ldk.query.DefaultTableCustomizer" />
         <auditLogging>DETAILED</auditLogging>
         <pkColumnName>patientId</pkColumnName>
-        <titleColumn>rowid</titleColumn>
+        <titleColumn>identifier</titleColumn>
         <columns>
             <column columnName="rowid">
                 <isAutoInc>true</isAutoInc>
@@ -148,7 +148,7 @@
                 <columnTitle>Patient Identifier</columnTitle>
             </column>
             <column columnName="patientid">
-                <nullable>true</nullable>
+                <nullable>false</nullable>
                 <columnTitle>Patient Id</columnTitle>
                 <phi>PHI</phi>
             </column>
@@ -169,6 +169,10 @@
                 <nullable>true</nullable>
                 <columnTitle>Age (years)</columnTitle>
             </column>
+            <column columnName="ageQualifier">
+                <nullable>true</nullable>
+                <columnTitle>Age Qualifier</columnTitle>
+            </column>
             <column columnName="gender">
                 <columnTitle>Gender</columnTitle>
             </column>
diff --git a/covidseq/resources/schemas/dbscripts/sqlserver/covidseq-21.002-21.003.sql b/covidseq/resources/schemas/dbscripts/sqlserver/covidseq-21.002-21.003.sql
new file mode 100644
index 000000000..434c460ad
--- /dev/null
+++ b/covidseq/resources/schemas/dbscripts/sqlserver/covidseq-21.002-21.003.sql
@@ -0,0 +1 @@
+ALTER TABLE covidseq.patients ADD ageQualifier varchar(200);
\ No newline at end of file
diff --git a/covidseq/resources/web/covidseq/panel/SampleImportPanel.js b/covidseq/resources/web/covidseq/panel/SampleImportPanel.js
index 5e0e1f1ff..772477723 100644
--- a/covidseq/resources/web/covidseq/panel/SampleImportPanel.js
+++ b/covidseq/resources/web/covidseq/panel/SampleImportPanel.js
@@ -14,6 +14,11 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
         alwaysShow: true,
         allowBlank: false,
         transform: 'samplename'
+    },{
+        name: 'patientid',
+        labels: ['Patient Id', 'Patient_Id', 'Individual_ID'],
+        alwaysShow: true,
+        allowBlank: true
     },{
         name: 'cdna_plate_location',
         labels: ['Well', 'Well Id', 'cDNA_Plate_Location'],
@@ -47,32 +52,48 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
     },{
         name: 'n1_or_s',
         labels: ['N1_or_S', 'S'],
-        allowBlank: true
+        allowBlank: true,
+        transform: 'ct'
     },{
         name: 'n2_orn',
         labels: ['N2_orN', 'N/N2'],
-        allowBlank: true
+        allowBlank: true,
+        transform: 'ct'
     },{
         name: 'rp_or_orf1ab',
         labels: ['RP_or_ORF1ab'],
-        allowBlank: true
+        allowBlank: true,
+        transform: 'ct'
     },{
         name: 'ms2',
         labels: ['MS2/Control', 'MS2'],
-        allowBlank: true
+        allowBlank: true,
+        transform: 'ct'
     },{
         name: 'age',
         labels: ['Age'],
+        allowBlank: true,
+        transform: 'age'
+    },{
+        name: 'ageQualifier',
+        labels: ['Age Qualifier'],
         allowBlank: true
     },{
         name: 'sampledate',
         labels: ['Sample Date', 'Collection Date', 'CollectionDate', 'SampleDate', 'Collection_Date'],
         alwaysShow: true,
-        allowBlank: true
+        allowBlank: true,
+        transform: 'sampledate'
     },{
         name: 'assayType',
         labels: ['Assay Type', 'Assay_Type'],
+        transform: 'assayType',
         allowBlank: true
+    },{
+        name: 'sampleType',
+        labels: ['Sample Type', 'Sample_Type', 'Type'],
+        allowBlank: true,
+        transform: 'sampleType'
     },{
         name: 'comment',
         labels: ['Comment'],
@@ -106,7 +127,7 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
             return val || 'USA'
         },
 
-        gender: function(val, panel, row, rowIdx, messages) {
+        gender: function(val, panel, row, rowIdx) {
             if (!val) {
                 return val;
             }
@@ -120,7 +141,68 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
             }
 
             if (val === 'unknown' || val === 'unk') {
-                return 'Unknown'
+                return 'unknown'
+            }
+
+            return val;
+        },
+
+        sampledate: function(val) {
+            if (val && val.toLowerCase() === 'unknown') {
+                val = null;
+            }
+
+            return(val);
+        },
+
+        ct: function(val, panel, row, rowIdx, errorMessages, infoMessages) {
+            if (val) {
+                if (String(val).toLowerCase() === 'undetermined') {
+                    val = null;
+                }
+                else if (String(val).toLowerCase() === 'na') {
+                    val = null;
+                }
+                else if (!Ext4.isNumeric(val)) {
+                    errorMessages.push('Non-numeric CT: ' + val + ' at row: ' + rowIdx);
+                    return val;
+                }
+            }
+
+            return(val);
+        },
+
+        age: function(val, panel, row) {
+            if (val && String(val).toLowerCase() === 'unknown') {
+                val = null;
+            }
+            else if (val && String(val).match('>')) {
+                row.ageQualifier = '>';
+                val = String(val).replaceAll('>', '');
+            }
+            else if (val && String(val).match('<')) {
+                row.ageQualifier = '<';
+                val = String(val).replaceAll('<', '');
+            }
+
+            return(val);
+        },
+
+        assayType: function(val) {
+            if (val) {
+                if ('x' === val.toLowerCase() || 'tp' === val.toLowerCase()) {
+                    val = 'TaqPath';
+                }
+            }
+
+            return val;
+        },
+
+        sampleType: function(val) {
+            if (val) {
+                if ('np' === val.toLowerCase()) {
+                    val = 'Nasopharyngeal swab';
+                }
             }
 
             return val;
@@ -138,20 +220,25 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
                 return 'Not Applicable'
             }
 
-            if (val === 'unknown' || val === 'unk') {
-                return 'Unknown'
+            if (val === 'unknown' || val === 'unk' || val === '?') {
+                return 'unknown'
             }
 
             if (panel.COUNTY_MAP[val]) {
                 if (row.state) {
+                    if (panel.STATE_ABBREV[val.toLowerCase()]) {
+                        row.state = panel.STATE_ABBREV[row.state.toLowerCase()]
+                    }
+
                     if (panel.COUNTY_MAP[val].states.indexOf(row.state) === -1) {
                         var updated = false;
+                        var inputState = row.state;
                         if (panel.AUTO_UPDATE_STATE && panel.COUNTY_MAP[val].states.length === 1){
                             updated = true;
                             row.state = panel.COUNTY_MAP[val].states[0];
                         }
 
-                        infoMessages.push('State doesnt match for county: ' + val + ', input value: '  + row.state + ', expected: ' + panel.COUNTY_MAP[val].states.join(',') + ', at row: ' + (rowIdx + 1) + (updated ? '. This was corrected.' : '. This was not automatically changed.'));
+                        infoMessages.push('State doesnt match for county: ' + val + ', input value: '  + inputState + ', expected: ' + panel.COUNTY_MAP[val].states.join(',') + ', at row: ' + (rowIdx + 1) + (updated ? '. This was corrected.' : '. This was not automatically changed.'));
 
                     }
                 } else {
@@ -181,11 +268,13 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
             if (!val) {
                 data.comment = data.comment ? data.comment + '. State auto-assigned to OR' : 'State auto-assigned to OR';
                 return 'OR';
-
             }
 
             val = val.toLowerCase();
-            if (['or', 'oregon'].indexOf(val) > -1) {
+            if (panel.STATE_ABBREV[val]) {
+                return panel.STATE_ABBREV[val];
+            }
+            else if (['or', 'oregon'].indexOf(val) > -1) {
                 return 'OR'
             }
             else if (['wa', 'washington'].indexOf(val) > -1) {
@@ -196,9 +285,11 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
         },
     },
 
-    DEFAULT_HEADER: ['cDNA_Plate_ID','cDNA_Plate_Location','CODED_ID','RQG_alt_ID','Collection_Date','Gender','State','County','N1_or_S','N2_orN','RP_or_ORF1ab','Assay_Type','MS2','Age'],
+    DEFAULT_HEADER: ['cDNA_Plate_ID','cDNA_Plate_Location','CODED_ID','RQG_alt_ID','Collection_Date','Gender','State','County','N1_or_S','N2_orN','RP_or_ORF1ab','Assay_Type','MS2','SampleType','Age'],
 
     initComponent: function () {
+        Ext4.QuickTips.init();
+
         this.COLUMN_MAP = {};
         Ext4.Array.forEach(this.COLUMNS, function(col){
             this.COLUMN_MAP[col.name.toLowerCase()] = col;
@@ -415,9 +506,15 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
             return;
         }
 
+        var patientRows = this.inferPatientRows(parsedRows)
         console.log(parsedRows)
+        console.log(patientRows)
+        this.reviewPatients(colArray, parsedRows, patientRows)
+    },
 
-        this.renderPreview(colArray, parsedRows);
+    reviewPatients: function(colArray, parsedRows, patientRows) {
+        // TODO: consider querying the patients table to look for existing records?
+        this.renderPreview(colArray, parsedRows, patientRows);
     },
 
     parseHeader: function(headerRow){
@@ -543,6 +640,7 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
 
             // CT of record is N for taqpath, N1 for CDC?
 
+            data._patientid = data.patientid || data.state + '-OHSU-' + data.samplename.replaceAll('CV', '');
             ret.push(data);
         }, this);
 
@@ -559,7 +657,7 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
         return error ? null : ret;
     },
 
-    renderPreview: function(colArray, parsedRows){
+    renderPreview: function(colArray, parsedRows, patientRows){
         var previewArea = this.down('#previewArea');
         previewArea.removeAll();
 
@@ -608,6 +706,7 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
                 rowData: {
                     colArray: colArray,
                     parsedRows: parsedRows,
+                    patientRows: patientRows,
                     panel: this
                 }
             }],
@@ -622,9 +721,85 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
     },
 
     onSubmit: function(e, dt, node, config){
-        //Ext4.Msg.wait('Saving...');
+        Ext4.Msg.wait('Saving...');
+
+        config.rowData.parsedRows.forEach(function(row){
+            if (row.patientidGUID) {
+                row.patientid = row.patientidGUID;
+            }
+        });
+
+        LABKEY.Query.saveRows({
+            commands: [{
+                command: 'insert',
+                schemaName: 'covidseq',
+                queryName: 'samples',
+                rows: config.rowData.parsedRows
+            },{
+                command: 'insert',
+                schemaName: 'covidseq',
+                queryName: 'patients',
+                rows: config.rowData.patientRows
+            }],
+            scope: this,
+            failure: LDK.Utils.getErrorCallback(),
+            success: this.onRequestSuccess
+        });
+    },
+
+    inferPatientRows: function(sampleRows) {
+        var patientRows = [];
+        var patientsEncountered = {};
+        var patientToGUID = {};
+
+        var patientColumns = ['state', 'county', 'country', 'age', 'gender'];
+        sampleRows.forEach(function(row) {
+            if (row._patientid) {
+                var newRow = {};
+
+                patientColumns.forEach(function(colName){
+                    newRow[colName] = row[colName]
+                });
+
+                var rowKey = Object.values(newRow).join('<>');
+                var doSave = true;
+                if (patientsEncountered[row._patientid]) {
+                    var oldRowKey = patientsEncountered[row._patientid];
+                    if (rowKey !== oldRowKey) {
+                        console.error("Mismatch: " + row._patientid);
+                        console.error(newRow);
+                        console.error(oldRowKey);
+                    }
+
+                    doSave = false;
+                    console.log('skipping second patient row: ' + row._patientid);
+                }
+                else {
+                    patientsEncountered[row._patientid] = rowKey;
+                    patientToGUID[row._patientid] = LABKEY.Utils.generateUUID();
+                }
 
-        //TODO
+                // Create GUID to manage relationship:
+                newRow.patientid = patientToGUID[row._patientid];
+                newRow.identifier = row._patientid;
+
+                // update original row:
+                row.patientidGUID = patientToGUID[row._patientid];
+
+                if (doSave) {
+                    patientRows.push(newRow);
+                }
+            }
+        });
+
+        return patientRows;
+    },
+
+    onRequestSuccess: function(){
+        Ext4.Msg.hide();
+        Ext4.Msg.alert('Success', 'Data Imported', function(){
+            window.location = LABKEY.ActionURL.buildURL('query', 'executeQuery.view', Laboratory.Utils.getQueryContainerPath(), {'query.queryName': 'samples', schemaName: 'covidseq', 'query.sort': '-created'})
+        }, this);
     },
 
     COUNTY_LIST: [
@@ -889,6 +1064,7 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
         ['Custer County','Custer','CO'],
         ['Delta County','Delta','CO'],
         ['Denver','Denver','CO'],
+        ['Denver','Denver County','CO'],
         ['Dolores County','Dolores','CO'],
         ['Douglas County','Douglas','CO'],
         ['Eagle County','Eagle','CO'],
@@ -990,6 +1166,8 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
         ['Marion County','Marion','FL'],
         ['Martin County','Martin','FL'],
         ['Miami-Dade County','Miami-Dade','FL'],
+        ['Miami-Dade County','MiamiDade','FL'],
+        ['Miami-Dade County','MiamiDade County','FL'],
         ['Monroe County','Monroe','FL'],
         ['Nassau County','Nassau','FL'],
         ['Okaloosa County','Okaloosa','FL'],
@@ -1006,6 +1184,7 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
         ['Seminole County','Seminole','FL'],
         ['St. Johns County','St. Johns','FL'],
         ['St. Lucie County','St. Lucie','FL'],
+        ['St. Lucie County','Saint Lucie County','FL'],
         ['Sumter County','Sumter','FL'],
         ['Suwannee County','Suwannee','FL'],
         ['Taylor County','Taylor','FL'],
@@ -1789,6 +1968,7 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
         ['St. James Parish','St. James','LA'],
         ['St. John the Baptist Parish','St. John the Baptist','LA'],
         ['St. Landry Parish','St. Landry','LA'],
+        ['St. Landry Parish','Saint Landry Parish','LA'],
         ['St. Martin Parish','St. Martin','LA'],
         ['St. Mary Parish','St. Mary','LA'],
         ['St. Tammany Parish','St. Tammany','LA'],
@@ -3853,5 +4033,61 @@ Ext4.define('CovidSeq.panel.SampleImportPanel', {
         ['Villalba','Villalba','PR'],
         ['Yabucoa','Yabucoa','PR'],
         ['Yauco','Yauco','PR'],
-    ]
+    ],
+
+    STATE_ABBREV: {
+        'alabama': 'AL',
+        'alaska': 'AK',
+        'arizona': 'AZ',
+        'arkansas': 'AR',
+        'california': 'CA',
+        'colorado': 'CO',
+        'connecticut': 'CT',
+        'delaware': 'DE',
+        'district of columbia': 'DC',
+        'florida': 'FL',
+        'georgia': 'GA',
+        'hawaii': 'HI',
+        'idaho': 'ID',
+        'illinois': 'IL',
+        'indiana': 'IN',
+        'iowa': 'IA',
+        'kansas': 'KS',
+        'kentucky': 'KY',
+        'louisiana': 'LA',
+        'maine': 'ME',
+        'maryland': 'MD',
+        'massachusetts': 'MA',
+        'michigan': 'MI',
+        'minnesota': 'MN',
+        'mississippi': 'MS',
+        'missouri': 'MO',
+        'montana': 'MT',
+        'nebraska': 'NE',
+        'nevada': 'NV',
+        'new hampshire': 'NH',
+        'new jersey': 'NJ',
+        'new mexico': 'NM',
+        'new york': 'NY',
+        'north carolina': 'NC',
+        'north dakota': 'ND',
+        'ohio': 'OH',
+        'oklahoma': 'OK',
+        'oregon': 'OR',
+        'pennsylvania': 'PA',
+        'puerto rico': 'PR',
+        'rhode island': 'RI',
+        'south carolina': 'SC',
+        'south dakota': 'SD',
+        'tennessee': 'TN',
+        'texas': 'TX',
+        'utah': 'UT',
+        'vermont': 'VT',
+        'virginia': 'VA',
+        'virgin islands': 'VI',
+        'washington': 'WA',
+        'west virginia': 'WV',
+        'wisconsin': 'WI',
+        'wyoming': 'WY'
+    }
 });
\ No newline at end of file
diff --git a/covidseq/src/org/labkey/covidseq/CovidseqDataProvider.java b/covidseq/src/org/labkey/covidseq/CovidseqDataProvider.java
index e08c45e76..b685df28e 100644
--- a/covidseq/src/org/labkey/covidseq/CovidseqDataProvider.java
+++ b/covidseq/src/org/labkey/covidseq/CovidseqDataProvider.java
@@ -2,6 +2,7 @@
 
 import org.json.JSONObject;
 import org.labkey.api.data.Container;
+import org.labkey.api.data.TableInfo;
 import org.labkey.api.laboratory.AbstractDataProvider;
 import org.labkey.api.laboratory.LaboratoryService;
 import org.labkey.api.laboratory.NavItem;
@@ -52,7 +53,14 @@ public List<NavItem> getSampleNavItems(Container c, User u)
         QueryCache cache = new QueryCache();
 
         return Arrays.asList(
-            new QueryImportNavItem(this, CovidseqSchema.NAME, CovidseqSchema.TABLE_SAMPLES, "COVID Samples", LaboratoryService.NavItemCategory.samples, "Samples", cache)
+            new QueryImportNavItem(this, CovidseqSchema.NAME, CovidseqSchema.TABLE_SAMPLES, "COVID Samples", LaboratoryService.NavItemCategory.samples, "Samples", cache){
+                @Override
+                public ActionURL getImportUrl(Container c, User u)
+                {
+                    TableInfo ti = getTableInfo(c, u);
+                    return ti == null ? null : ti.getImportDataURL(c);
+                }
+            }
         );
     }
 
diff --git a/covidseq/src/org/labkey/covidseq/CovidseqModule.java b/covidseq/src/org/labkey/covidseq/CovidseqModule.java
index a6c186ff4..b5796d777 100644
--- a/covidseq/src/org/labkey/covidseq/CovidseqModule.java
+++ b/covidseq/src/org/labkey/covidseq/CovidseqModule.java
@@ -41,7 +41,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 21.002;
+        return 21.003;
     }
 
     @Override
diff --git a/covidseq/src/org/labkey/covidseq/CovidseqUserSchema.java b/covidseq/src/org/labkey/covidseq/CovidseqUserSchema.java
index 2b7fd7cab..106211c62 100644
--- a/covidseq/src/org/labkey/covidseq/CovidseqUserSchema.java
+++ b/covidseq/src/org/labkey/covidseq/CovidseqUserSchema.java
@@ -7,6 +7,7 @@
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.DbSchemaType;
 import org.labkey.api.data.TableInfo;
+import org.labkey.api.ldk.LDKService;
 import org.labkey.api.ldk.table.ContainerScopedTable;
 import org.labkey.api.module.Module;
 import org.labkey.api.query.DefaultSchema;
@@ -40,8 +41,16 @@ public QuerySchema createSchema(final DefaultSchema schema, Module module)
     protected TableInfo createWrappedTable(String name, @NotNull TableInfo sourceTable, ContainerFilter cf)
     {
         if (CovidseqSchema.TABLE_SAMPLES.equalsIgnoreCase(name))
-            return new ContainerScopedTable<>(this, sourceTable, cf, "sampleName").init();
+        {
+            ContainerScopedTable<?> ret = new ContainerScopedTable<>(this, sourceTable, cf, "sampleName").init();
+            LDKService.get().applyNaturalSort(ret, "samplename");
+            LDKService.get().applyNaturalSort(ret, "patientid");
+
+            return(ret);
+        }
         else
+        {
             return super.createWrappedTable(name, sourceTable, cf);
+        }
     }
 }
diff --git a/mcc/package-lock.json b/mcc/package-lock.json
index 4fe3727bf..439dcafbc 100644
--- a/mcc/package-lock.json
+++ b/mcc/package-lock.json
@@ -8,7 +8,7 @@
       "name": "mcc",
       "version": "0.0.0",
       "dependencies": {
-        "@labkey/api": "^1.7.2",
+        "@labkey/api": "^1.8.0",
         "chart.js": "^3.7.0",
         "nanoid": "^3.2.0",
         "react": "^17.0.2",
@@ -2439,9 +2439,9 @@
       }
     },
     "node_modules/@labkey/api": {
-      "version": "1.7.2",
-      "resolved": "https://artifactory.labkey.com:443/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.7.2.tgz",
-      "integrity": "sha1-2G4KoFl6rLWxGVuh2qPmiwd7RdM=",
+      "version": "1.8.0",
+      "resolved": "https://artifactory.labkey.com:443/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.8.0.tgz",
+      "integrity": "sha1-DiGjCOphC25lFsGwX3BC7kGmhlc=",
       "license": "Apache-2.0"
     },
     "node_modules/@labkey/build": {
@@ -15898,9 +15898,9 @@
       }
     },
     "@labkey/api": {
-      "version": "1.7.2",
-      "resolved": "https://artifactory.labkey.com:443/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.7.2.tgz",
-      "integrity": "sha1-2G4KoFl6rLWxGVuh2qPmiwd7RdM="
+      "version": "1.8.0",
+      "resolved": "https://artifactory.labkey.com:443/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.8.0.tgz",
+      "integrity": "sha1-DiGjCOphC25lFsGwX3BC7kGmhlc="
     },
     "@labkey/build": {
       "version": "5.0.0",
diff --git a/mcc/package.json b/mcc/package.json
index 09ac7175b..5640dced8 100644
--- a/mcc/package.json
+++ b/mcc/package.json
@@ -11,7 +11,7 @@
     "test": "cross-env NODE_ENV=test jest"
   },
   "dependencies": {
-    "@labkey/api": "^1.7.2",
+    "@labkey/api": "^1.8.0",
     "chart.js": "^3.7.0",
     "nanoid": "^3.2.0",
     "react": "^17.0.2",
diff --git a/mcc/resources/folderTypes/MCC.folderType.xml b/mcc/resources/folderTypes/MCC.folderType.xml
new file mode 100644
index 000000000..dc2f8a18d
--- /dev/null
+++ b/mcc/resources/folderTypes/MCC.folderType.xml
@@ -0,0 +1,36 @@
+<folderType xmlns="http://labkey.org/data/xml/folderType">
+    <name>MCC</name>
+    <description>The default folder layout for MCC</description>
+    <folderTabs>
+        <folderTab>
+            <name>mcc</name>
+            <caption>MCC</caption>
+            <selectors>
+                <selector>
+                    <regex>overview</regex>
+                </selector>
+            </selectors>
+            <requiredWebParts>
+
+            </requiredWebParts>
+            <preferredWebParts>
+                <webPart>
+                    <name>MCC Overview</name>
+                    <location>body</location>
+                </webPart>
+                <webPart>
+                    <name>MCC Dashboard Webpart</name>
+                    <location>body</location>
+                </webPart>
+            </preferredWebParts>
+        </folderTab>
+    </folderTabs>
+    <modules>
+        <moduleName>MCC</moduleName>
+        <moduleName>Study</moduleName>
+        <moduleName>Query</moduleName>
+        <moduleName>Pipeline</moduleName>
+        <moduleName>Core</moduleName>
+    </modules>
+    <defaultModule>Core</defaultModule>
+</folderType>
\ No newline at end of file
diff --git a/mcc/resources/module.xml b/mcc/resources/module.xml
index 0b9db0eb7..8de4b41ce 100644
--- a/mcc/resources/module.xml
+++ b/mcc/resources/module.xml
@@ -16,7 +16,14 @@
         </propertyDescriptor>
         <propertyDescriptor name="MCCContactUsers">
             <canSetPerContainer>false</canSetPerContainer>
-            <description>This is a comma separated list of LabKey user names of users that should be notified by email when requests are submitted through MCC.</description>
+            <description>This is a comma separated list of LabKey user names of users that should be notified by email when requests for help or user access are submitted through MCC.</description>
+            <editPermissions>
+                <permission>ADMIN</permission>
+            </editPermissions>
+        </propertyDescriptor>
+        <propertyDescriptor name="MCCRequestNotificationUsers">
+            <canSetPerContainer>false</canSetPerContainer>
+            <description>This is a comma separated list of LabKey user names of users that should be notified by email when requests for help or user access are submitted through MCC.</description>
             <editPermissions>
                 <permission>ADMIN</permission>
             </editPermissions>
diff --git a/mcc/resources/queries/mcc/animalRequests.js b/mcc/resources/queries/mcc/animalRequests.js
index c432ca164..3d00815a7 100644
--- a/mcc/resources/queries/mcc/animalRequests.js
+++ b/mcc/resources/queries/mcc/animalRequests.js
@@ -1,6 +1,8 @@
 var console = require("console");
 var LABKEY = require("labkey");
 
+var triggerHelper = new org.labkey.mcc.query.TriggerHelper(LABKEY.Security.currentUser.id, LABKEY.Security.currentContainer.id);
+
 function beforeInsert(row, errors){
     beforeUpsert(row, null, errors);
 }
@@ -11,4 +13,20 @@ function beforeUpdate(row, oldRow, errors){
 
 function beforeUpsert(row, oldRow, errors) {
     row.status = row.status || 'draft'
+}
+
+function afterInsert(row, errors){
+    afterUpsert(row, null, errors);
+}
+
+function afterUpdate(row, oldRow, errors){
+    afterUpsert(row, oldRow, errors);
+}
+
+function afterUpsert(row, oldRow, errors) {
+    if (row.status === 'submitted') {
+        if (!oldRow || oldRow.status !== 'submitted') {
+            triggerHelper.sendNotification(row.rowid);
+        }
+    }
 }
\ No newline at end of file
diff --git a/mcc/resources/queries/mcc/animalRequests/.qview.xml b/mcc/resources/queries/mcc/animalRequests/.qview.xml
index b52834b46..b87e37920 100644
--- a/mcc/resources/queries/mcc/animalRequests/.qview.xml
+++ b/mcc/resources/queries/mcc/animalRequests/.qview.xml
@@ -6,6 +6,7 @@
         <column name="createdby/email"/>
         <column name="institutionname"/>
         <column name="status"/>
+        <column name="modified"/>
     </columns>
     <sorts>
         <sort column="rowid" descending="true"/>
diff --git a/mcc/resources/queries/mcc/myRequests/.qview.xml b/mcc/resources/queries/mcc/myRequests/.qview.xml
new file mode 100644
index 000000000..bfc40e10e
--- /dev/null
+++ b/mcc/resources/queries/mcc/myRequests/.qview.xml
@@ -0,0 +1,5 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <sorts>
+        <sort column="rowid" descending="true"/>
+    </sorts>
+</customView>
\ No newline at end of file
diff --git a/mcc/resources/referenceStudy/folder.xml b/mcc/resources/referenceStudy/folder.xml
new file mode 100644
index 000000000..e3acbb155
--- /dev/null
+++ b/mcc/resources/referenceStudy/folder.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<folder archiveVersion="22.0" xmlns="http://labkey.org/folder/xml">
+    <study dir="study"/>
+</folder>
\ No newline at end of file
diff --git a/mcc/resources/referenceStudy/README b/mcc/resources/referenceStudy/study/README
similarity index 100%
rename from mcc/resources/referenceStudy/README
rename to mcc/resources/referenceStudy/study/README
diff --git a/mcc/resources/referenceStudy/datasets/PrimateElectronicHealthRecord.dataset b/mcc/resources/referenceStudy/study/datasets/PrimateElectronicHealthRecord.dataset
similarity index 100%
rename from mcc/resources/referenceStudy/datasets/PrimateElectronicHealthRecord.dataset
rename to mcc/resources/referenceStudy/study/datasets/PrimateElectronicHealthRecord.dataset
diff --git a/mcc/resources/referenceStudy/datasets/datasets_manifest.xml b/mcc/resources/referenceStudy/study/datasets/datasets_manifest.xml
similarity index 100%
rename from mcc/resources/referenceStudy/datasets/datasets_manifest.xml
rename to mcc/resources/referenceStudy/study/datasets/datasets_manifest.xml
diff --git a/mcc/resources/referenceStudy/datasets/datasets_metadata.xml b/mcc/resources/referenceStudy/study/datasets/datasets_metadata.xml
similarity index 100%
rename from mcc/resources/referenceStudy/datasets/datasets_metadata.xml
rename to mcc/resources/referenceStudy/study/datasets/datasets_metadata.xml
diff --git a/mcc/resources/referenceStudy/study.xml b/mcc/resources/referenceStudy/study/study.xml
similarity index 66%
rename from mcc/resources/referenceStudy/study.xml
rename to mcc/resources/referenceStudy/study/study.xml
index 8f84d3259..9c6dca671 100644
--- a/mcc/resources/referenceStudy/study.xml
+++ b/mcc/resources/referenceStudy/study/study.xml
@@ -9,10 +9,4 @@
     <definition file="PrimateElectronicHealthRecord.dataset"/>
   </datasets>
   <comments/>
-  <missingValueIndicators>
-    <missingValueIndicator indicator="E" label="Value is estimated."/>
-    <missingValueIndicator indicator="Q" label="Data currently under quality control review."/>
-    <missingValueIndicator indicator="A" label="Data value is abnormal."/>
-    <missingValueIndicator indicator="N" label="Required field marked by site as 'data not available'."/>
-  </missingValueIndicators>
 </study>
diff --git a/mcc/resources/referenceStudy/studyPolicy.xml b/mcc/resources/referenceStudy/study/studyPolicy.xml
similarity index 100%
rename from mcc/resources/referenceStudy/studyPolicy.xml
rename to mcc/resources/referenceStudy/study/studyPolicy.xml
diff --git a/mcc/resources/views/dashboardWebpart.view.xml b/mcc/resources/views/dashboardWebpart.view.xml
index c7ec7befa..08164ec80 100644
--- a/mcc/resources/views/dashboardWebpart.view.xml
+++ b/mcc/resources/views/dashboardWebpart.view.xml
@@ -3,6 +3,6 @@
         <permission name="read"/>
     </permissions>
     <dependencies>
-        <dependency path="mcc/gen/dashboardWebpart"/>
+        <dependency path="gen/dashboardWebpart"/>
     </dependencies>
 </view>
\ No newline at end of file
diff --git a/mcc/resources/views/mccAdmin.html b/mcc/resources/views/mccAdmin.html
new file mode 100644
index 000000000..892620707
--- /dev/null
+++ b/mcc/resources/views/mccAdmin.html
@@ -0,0 +1,24 @@
+<script type="text/javascript">
+
+Ext4.onReady(function (){
+
+if (LABKEY.Security.currentUser.isAdmin){
+    var webpart = <%=webpartContext%>;
+
+    Ext4.create('LDK.panel.NavPanel', {
+        renderTo: webpart.wrapperDivId,
+        width: 350,
+        sections: [
+            {header: 'Folder Initialization',
+                items: [
+                    {name: '1) Load/Create MCC Study', url: '<%=contextPath%>/mcc<%=containerPath%>/importStudy.view?'},
+                    {name: '2) Create Study QC States', url: '<%=contextPath%>/ehr<%=containerPath%>/ensureQcStates.view?'},
+                    {name: '3) Populate Initial Data', url: '<%=contextPath%>/EHR<%=containerPath%>/populateInitialData.view?'},
+                ]
+            }
+        ]
+    });
+}
+});
+
+</script>
\ No newline at end of file
diff --git a/mcc/resources/views/mccAdmin.view.xml b/mcc/resources/views/mccAdmin.view.xml
new file mode 100644
index 000000000..4ed342d30
--- /dev/null
+++ b/mcc/resources/views/mccAdmin.view.xml
@@ -0,0 +1,8 @@
+<view xmlns="http://labkey.org/data/xml/view" title="MCC Administration">
+    <permissions>
+        <permission name="admin"/>
+    </permissions>
+    <dependencies>
+        <dependency path="mcc.context" />
+    </dependencies>
+</view>
\ No newline at end of file
diff --git a/mcc/src/client/AnimalRequest/animal-breeding.tsx b/mcc/src/client/AnimalRequest/animal-breeding.tsx
index 6bea3ec44..05066f3be 100644
--- a/mcc/src/client/AnimalRequest/animal-breeding.tsx
+++ b/mcc/src/client/AnimalRequest/animal-breeding.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 
 import YesNoRadio from './yes-no-radio'
 import TextArea from './text-area'
+import ErrorMessageHandler from './error-message-handler'
 
 import { animalBreedingPlaceholder } from './values'
 
@@ -18,16 +19,16 @@ export default function AnimalBreeding(props) {
     }
 
     return (
-        <>
+        <ErrorMessageHandler isSubmitting={props.isSubmitting}>
             <div className="tw-mb-6">
-                <YesNoRadio id={props.id + "-is-planning-to-breed-animals"} required={props.required} defaultValue={props.defaultValue.isbreedinganimals} 
+                <YesNoRadio id={props.id + "-is-planning-to-breed-animals"} ariaLabel="Planning to breed animals" isSubmitting={props.isSubmitting} required={props.required} defaultValue={props.defaultValue.isbreedinganimals}
                  onChange={(e) => setDisplayPurposeField(e.currentTarget.value)}/>
             </div>
 
             <div className="tw-mb-6">
-                <TextArea id={props.id + "-purpose"} isSubmitting={props.isSubmitting} placeholder={animalBreedingPlaceholder}
+                <TextArea id={props.id + "-purpose"} ariaLabel="Breeding Program Purpose" isSubmitting={props.isSubmitting} placeholder={animalBreedingPlaceholder}
                     display={displayPurpose} required={displayPurpose && props.required} defaultValue={props.defaultValue.breedingpurpose}/>
             </div>
-        </>
+        </ErrorMessageHandler>
     )
 }
diff --git a/mcc/src/client/AnimalRequest/animal-cohort.tsx b/mcc/src/client/AnimalRequest/animal-cohort.tsx
index 6e8d1b359..85c1d9b58 100644
--- a/mcc/src/client/AnimalRequest/animal-cohort.tsx
+++ b/mcc/src/client/AnimalRequest/animal-cohort.tsx
@@ -5,6 +5,7 @@ import InputNumber from './input-number'
 import Select from './select'
 import Title from './title'
 import TextArea from './text-area'
+import ErrorMessageHandler from './error-message-handler'
 
 import { animalSexes, otherCharacteristicsPlaceholder } from './values'
 
@@ -33,6 +34,7 @@ export default function AnimalCohorts(props) {
   return (
     <>
       {[...cohorts].map((cohort, index) => (
+        <ErrorMessageHandler isSubmitting={props.isSubmitting} keyInternal={cohort.uuid} key={cohort.uuid + "-errorHandler"}>
         <div className="tw-flex tw-flex-wrap tw-w-full tw-mx-2 tw-mb-10" key={cohort.uuid}>
           <div className="tw-flex tw-flex-wrap tw-w-full tw-mb-6">
             <div className="tw-w-1/2 md:tw-mb-0">
@@ -48,22 +50,23 @@ export default function AnimalCohorts(props) {
           <div className="tw-w-full tw-px-3 tw-mb-6 md:tw-mb-0">
             <Title text="Number of animals&nbsp;&nbsp;&nbsp;" />
             <div className="tw-mb-4">
-              <InputNumber id={"animal-cohorts-" + index + "-" + "numberofanimals"} isSubmitting={props.isSubmitting} placeholder="Number of animals" required={props.required} defaultValue={cohort.numberofanimals}/>
+              <InputNumber id={"animal-cohorts-" + index + "-" + "numberofanimals"} ariaLabel={"Number of Animals" + "#" + index} isSubmitting={props.isSubmitting} placeholder="Number of animals" required={props.required} defaultValue={cohort.numberofanimals}/>
             </div>
           </div>
 
           <div className="tw-w-full tw-px-3 tw-mb-6 md:tw-mb-0">
             <Title text="Cohort sex&nbsp;&nbsp;&nbsp;" />
             <div className="tw-mb-6">
-              <Select id={"animal-cohorts-" + index + "-" + "sex"} isSubmitting={props.isSubmitting} options={animalSexes} defaultValue={cohort.sex} required={props.required}/>
+              <Select id={"animal-cohorts-" + index + "-" + "sex"} ariaLabel={"Sex" + "#" + index} isSubmitting={props.isSubmitting} options={animalSexes} defaultValue={cohort.sex} required={props.required}/>
             </div>
           </div>
 
           <div className="tw-w-full tw-px-3 tw-mb-6 md:tw-mb-0">
-            <TextArea id={"animal-cohorts-" + index + "-" + "othercharacteristics"} isSubmitting={props.isSubmitting} placeholder={otherCharacteristicsPlaceholder} 
+            <TextArea id={"animal-cohorts-" + index + "-" + "othercharacteristics"} ariaLabel={"Other Characteristics" + "#" + index} isSubmitting={props.isSubmitting} placeholder={otherCharacteristicsPlaceholder}
              required={props.required} defaultValue={cohort.othercharacteristics}/>
           </div>
         </div>
+        </ErrorMessageHandler>
       ))}
 
       <div className="tw-w-full tw-px-3 tw-mb-10 md:tw-mb-0">
diff --git a/mcc/src/client/AnimalRequest/animal-request.tsx b/mcc/src/client/AnimalRequest/animal-request.tsx
index def06335d..3e76fa3a8 100644
--- a/mcc/src/client/AnimalRequest/animal-request.tsx
+++ b/mcc/src/client/AnimalRequest/animal-request.tsx
@@ -16,6 +16,7 @@ import ResearchArea from './research-area'
 import AnimalCohorts from './animal-cohort'
 import Button from './button'
 import SavingOverlay from './saving-overlay'
+import ErrorMessageHandler from './error-message-handler'
 
 import {
     earlyInvestigatorTooltip,
@@ -32,6 +33,33 @@ export function AnimalRequest() {
     const requestId = (new URLSearchParams(window.location.search)).get("requestId")
     const [isSubmitting, setIsSubmitting] = useState(false)
     const [displayOverlay, setDisplayOverlay] = useState(false)
+    const [stateRollbackOnFailure, setStateRollbackOnFailure] = useState({
+        "returned": false,
+        "data": {"status": "draft",
+            middleinitial: undefined,
+            lastname: undefined,
+            firstname: undefined,
+            isprincipalinvestigator: undefined,
+            institutionname: undefined,
+            institutioncity: undefined,
+            institutionstate: undefined,
+            institutioncountry: undefined,
+            officiallastname: undefined,
+            officialfirstname: undefined,
+            officialemail: undefined,
+            experimentalrationale: undefined,
+            methodsproposed: undefined,
+            collaborations: undefined,
+            existingmarmosetcolony: undefined,
+            existingnhpfacilities: undefined,
+            rowid: undefined,
+            certify: false,
+            animalwelfare: undefined,
+            vetlastname: undefined,
+            vetemail: undefined,
+            vetfirstname: undefined
+        }
+    })
 
     // On submit, state is managed by the FormData object in handleSubmit. These hooks are only used to propagate values
     // from the database into the form via fillForm if there is a requestId
@@ -73,8 +101,13 @@ export function AnimalRequest() {
     })
     
 
-    function handleFailure(data) {
-        console.error(data)
+    function handleFailure(response) {
+        alert(response.exception)  //this is probably what you want to show. An example would be to submit data with a long value for middle initial (>14 characters)
+        setDisplayOverlay(false)
+        setAnimalRequests({
+            "returned": stateRollbackOnFailure.returned,
+            "data": { ...stateRollbackOnFailure.data, status: stateRollbackOnFailure.data.status }
+        })
     }
 
     
@@ -111,7 +144,7 @@ export function AnimalRequest() {
             return true
         }
 
-        return "draft" === animalRequests.data.status
+        return "draft" === animalRequests.data.status || "submitting" === animalRequests.data.status
     }
 
     function handleNextStateSubmitButton() {
@@ -158,7 +191,7 @@ export function AnimalRequest() {
 
 
     function handleNextStateSaveButton() {
-        setIsSubmitting(false);
+        setIsSubmitting(false)
 
         if (animalRequests.data.status === "submitting") {
             setAnimalRequests({
@@ -171,7 +204,7 @@ export function AnimalRequest() {
                     "data": { ...animalRequests.data, status:"submitted" }
             });
         } else if (animalRequests.data.status === "under-review") {
-            setIsSubmitting(true);
+            setIsSubmitting(true)
             setAnimalRequests({
                     "returned": true,
                     "data": { ...animalRequests.data, status:"rejecting" }
@@ -281,6 +314,10 @@ export function AnimalRequest() {
     function handleSubmit(e: FormEvent) {
         e.preventDefault()
         setDisplayOverlay(true)
+        setStateRollbackOnFailure({
+            "returned": animalRequests.returned,
+            "data": { ...animalRequests.data, status: animalRequests.data.status }
+        })
 
         if(animalRequests.data.status === "submitting") {
             animalRequests.data.status = "submitted"
@@ -289,7 +326,7 @@ export function AnimalRequest() {
         } else if(animalRequests.data.status === "approving-final") {
             animalRequests.data.status = "approved"
         } else if(animalRequests.data.status === "rejecting") {
-            animalRequests.data.status = "rejected"
+                animalRequests.data.status = "rejected"
         }
 
         const data = new FormData(e.currentTarget as HTMLFormElement)
@@ -346,7 +383,7 @@ export function AnimalRequest() {
                 ...coinvestigatorCommands,
                 ...cohortCommands
             ],
-            success: function(data) {
+            success: function(response) {
                 window.location.href = ActionURL.buildURL('mcc', 'mccRequests.view')
             },
             failure: handleFailure
@@ -478,23 +515,26 @@ export function AnimalRequest() {
         return (
             <>
             <form className="tw-w-full tw-max-w-4xl" onSubmit={handleSubmit} autoComplete="off">
-                <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-10">
+                <ErrorMessageHandler isSubmitting={isSubmitting}>
+                <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-4">
                     <Title text="Principal Investigator*"/>
 
                     <div className="tw-w-full md:tw-w-1/3 tw-px-3 tw-mb-6 md:tw-mb-0">
-                        <Input id="investigator-last-name" isSubmitting={isSubmitting} required={getRequired()} placeholder="Last Name" defaultValue={animalRequests.data.lastname}/>
+                        <Input id="investigator-last-name" ariaLabel="Last Name" isSubmitting={isSubmitting} required={getRequired()} placeholder="Last Name" defaultValue={animalRequests.data.lastname}/>
                     </div>
 
                     <div className="tw-w-full md:tw-w-1/3 tw-px-3 tw-mb-6 md:tw-mb-0">
-                        <Input id="investigator-first-name" isSubmitting={isSubmitting} required={getRequired()} placeholder="First Name" defaultValue={animalRequests.data.firstname}/>
+                        <Input id="investigator-first-name" ariaLabel="First Name" isSubmitting={isSubmitting} required={getRequired()} placeholder="First Name" defaultValue={animalRequests.data.firstname}/>
                     </div>
 
                     <div className="tw-w-full md:tw-w-1/3 tw-px-3 tw-mb-6 md:tw-mb-0">
-                        <Input id="investigator-middle-initial" isSubmitting={isSubmitting} required={false} placeholder="Middle Initial" defaultValue={animalRequests.data.middleinitial}/>
+                        <Input id="investigator-middle-initial" isSubmitting={isSubmitting} required={false} placeholder="Middle Initial" defaultValue={animalRequests.data.middleinitial} maxLength="8"/>
                     </div>
                 </div>
+                </ErrorMessageHandler>
 
-                <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-10">
+                <ErrorMessageHandler isSubmitting={isSubmitting}>
+                <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-4">
                     <div className="tw-relative tw-w-full tw-mb-6 md:tw-mb-0">
                         <Title text="Are you an early-stage investigator?&nbsp;"/>
                         <Tooltip id="early-stage-investigator-helper"
@@ -502,33 +542,36 @@ export function AnimalRequest() {
                         />
                     </div>
 
-
                     <div className="tw-w-full tw-px-3 tw-mt-6">
-                        <YesNoRadio id="is-principal-investigator" required={getRequired()} defaultValue={animalRequests.data.isprincipalinvestigator}/>
+                        <YesNoRadio id="is-principal-investigator" ariaLabel="Principal Investigator" isSubmitting={isSubmitting} required={getRequired()} defaultValue={animalRequests.data.isprincipalinvestigator}/>
                     </div>
                 </div>
+                </ErrorMessageHandler>
 
-                <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-10">
+                <ErrorMessageHandler isSubmitting={isSubmitting}>
+                <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-4">
                     <Title text="Affiliated research institution*"/>
 
                     <div className="tw-w-full tw-px-3 tw-mb-6 md:tw-mb-0">
-                        <Input id="institution-name" isSubmitting={isSubmitting} placeholder="Name" required={getRequired()} defaultValue={animalRequests.data.institutionname}/>
+                        <Input id="institution-name" ariaLabel="Institution Name" isSubmitting={isSubmitting} placeholder="Name" required={getRequired()} defaultValue={animalRequests.data.institutionname}/>
                     </div>
 
                     <div className="tw-w-full md:tw-w-1/3 tw-px-3 tw-mb-6 md:tw-mb-0">
-                        <Input id="institution-city" isSubmitting={isSubmitting} placeholder="City" required={getRequired()} defaultValue={animalRequests.data.institutioncity}/>
+                        <Input id="institution-city" ariaLabel="Institution City" isSubmitting={isSubmitting} placeholder="City" required={getRequired()} defaultValue={animalRequests.data.institutioncity}/>
                     </div>
 
                     <div className="tw-w-full md:tw-w-1/3 tw-px-3 tw-mb-6 md:tw-mb-0">
-                        <Input id="institution-state" isSubmitting={isSubmitting} placeholder="State" required={getRequired()} defaultValue={animalRequests.data.institutionstate}/>
+                        <Input id="institution-state" ariaLabel="Institution State" isSubmitting={isSubmitting} placeholder="State" required={getRequired()} defaultValue={animalRequests.data.institutionstate}/>
                     </div>
 
                     <div className="tw-w-full md:tw-w-1/3 tw-px-3 tw-mb-6 md:tw-mb-0">
-                        <Input id="institution-country" isSubmitting={isSubmitting} placeholder="Country" required={getRequired()} defaultValue={animalRequests.data.institutioncountry}/>
+                        <Input id="institution-country" ariaLabel="Institution Country" isSubmitting={isSubmitting} placeholder="Country" required={getRequired()} defaultValue={animalRequests.data.institutioncountry}/>
                     </div>
                 </div>
+                </ErrorMessageHandler>
 
-                <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-10">
+                <ErrorMessageHandler isSubmitting={isSubmitting}>
+                <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-4">
                     <div className="tw-relative tw-w-full tw-mb-6 md:tw-mb-0">
                         <Title text="Institution Signing Official*&nbsp;"/>
                         <Tooltip id="signing-official-helper"
@@ -539,18 +582,19 @@ export function AnimalRequest() {
 
                     <div className="tw-flex tw-flex-wrap tw-mt-6">
                         <div className="tw-w-full md:tw-w-1/2 tw-px-3 tw-mb-6 md:tw-mb-0">
-                            <Input id="official-last-name" isSubmitting={isSubmitting} placeholder="Last Name" required={getRequired()} defaultValue={animalRequests.data.officiallastname}/>
+                            <Input id="official-last-name" ariaLabel="Last Name" isSubmitting={isSubmitting} placeholder="Last Name" required={getRequired()} defaultValue={animalRequests.data.officiallastname}/>
                         </div>
 
                         <div className="tw-w-full md:tw-w-1/2 tw-px-3 tw-mb-6 md:tw-mb-0">
-                            <Input id="official-first-name" isSubmitting={isSubmitting} placeholder="First Name" required={getRequired()} defaultValue={animalRequests.data.officialfirstname}/>
+                            <Input id="official-first-name" ariaLabel="First Name" isSubmitting={isSubmitting} placeholder="First Name" required={getRequired()} defaultValue={animalRequests.data.officialfirstname}/>
                         </div>
 
                         <div className="tw-w-full tw-px-3 tw-mb-6 md:tw-mb-0">
-                            <Input id="official-email" isSubmitting={isSubmitting} placeholder="Email Address" required={getRequired()} defaultValue={animalRequests.data.officialemail}/>
+                            <Input id="official-email" ariaLabel="Email Address" isSubmitting={isSubmitting} placeholder="Email Address" required={getRequired()} defaultValue={animalRequests.data.officialemail}/>
                         </div>
                     </div>
                 </div>
+                </ErrorMessageHandler>
 
                 <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-10">
                     <Title text="Co-investigators"/>
@@ -558,12 +602,8 @@ export function AnimalRequest() {
                     <CoInvestigators isSubmitting={isSubmitting} defaultValue={coinvestigators.data} required={getRequired()}/>
                 </div>
 
-                <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-10">
-                    <Title text="Existing or proposed funding source*"/>
+                <Funding id="funding" isSubmitting={isSubmitting} defaultValue={animalRequests.data} required={getRequired()}/>
 
-                    <Funding id="funding" isSubmitting={isSubmitting} defaultValue={animalRequests.data} required={getRequired()}/>
-                </div>
-                 
                 <div className="tw-flex tw-flex-wrap tw-mx-2">
                     <div className="tw-relative tw-w-full tw-mb-6 md:tw-mb-0">
                         <Title text="Research Use Statement*&nbsp;"/>
@@ -572,23 +612,29 @@ export function AnimalRequest() {
                         />
                     </div>
 
+                    <ErrorMessageHandler isSubmitting={isSubmitting}>
                     <div className="tw-w-full tw-px-3 tw-mb-6 tw-mt-6">
-                        <TextArea id="experiment-rationale" isSubmitting={isSubmitting} placeholder={experimentalRationalePlaceholder} required={getRequired()} defaultValue={animalRequests.data.experimentalrationale}/>
+                        <TextArea id="experiment-rationale" ariaLabel="Experimental rationale" isSubmitting={isSubmitting} placeholder={experimentalRationalePlaceholder} required={getRequired()} defaultValue={animalRequests.data.experimentalrationale}/>
                     </div>
+                    </ErrorMessageHandler>
 
                     <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-6">
                         <Title text="Animal Cohorts"/>
 
-                        <AnimalCohorts isSubmitting={isSubmitting} defaultValue={animalCohorts.data}/>
+                        <AnimalCohorts isSubmitting={isSubmitting} defaultValue={animalCohorts.data} required={getRequired()}/>
                     </div>
 
-                    <div className="tw-w-full tw-px-3 tw-mb-10">
-                        <TextArea id="methods-proposed" isSubmitting={isSubmitting} placeholder={methodsProposedPlaceholder} required={getRequired()} defaultValue={animalRequests.data.methodsproposed}/>
+                    <ErrorMessageHandler isSubmitting={isSubmitting}>
+                    <div className="tw-w-full tw-px-3 tw-mb-4">
+                        <TextArea id="methods-proposed" ariaLabel="Methods Proposed" isSubmitting={isSubmitting} placeholder={methodsProposedPlaceholder} required={getRequired()} defaultValue={animalRequests.data.methodsproposed}/>
                     </div>
+                    </ErrorMessageHandler>
 
-                    <div className="tw-w-full tw-px-3 tw-mb-10">
-                        <TextArea id="collaborations" isSubmitting={isSubmitting} placeholder={collaborationsPlaceholder} required={getRequired()} defaultValue={animalRequests.data.collaborations}/>
+                    <ErrorMessageHandler isSubmitting={isSubmitting}>
+                    <div className="tw-w-full tw-px-3 tw-mb-4">
+                        <TextArea id="collaborations" ariaLabel="Collaborations" isSubmitting={isSubmitting} placeholder={collaborationsPlaceholder} required={getRequired()} defaultValue={animalRequests.data.collaborations}/>
                     </div>
+                    </ErrorMessageHandler>
 
                     <div className="tw-w-full tw-px-3 tw-mb-4">
                         <div className="tw-mb-6">
@@ -597,64 +643,63 @@ export function AnimalRequest() {
                         <AnimalBreeding id="animal-breeding" isSubmitting={isSubmitting} defaultValue={animalRequests.data} required={getRequired()}/>
                     </div>
 
-                    <div className="tw-w-full tw-px-3 tw-mb-6">
-                        <div className="tw-mb-6">
-                            <Title text="Research Area"/>
-                        </div>
-                        <ResearchArea id="research-area" isSubmitting={isSubmitting} defaultValue={animalRequests.data}/>
-                    </div>
+                    <ResearchArea id="research-area" isSubmitting={isSubmitting} defaultValue={animalRequests.data} required={getRequired()}/>
 
                     <div className="tw-w-full tw-px-3">
                         <div className="tw-mb-6">
                             <Title text="Institutional Animal Facilities and Capabilities"/>
                         </div>
 
-                        <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-10">
+                        <ErrorMessageHandler isSubmitting={isSubmitting}>
+                        <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-4">
                             <Title text="Does your institution have an existing marmoset colony?"/>
-                            <Select id="existing-marmoset-colony" isSubmitting={isSubmitting} options={existingMarmosetColonyOptions} defaultValue={animalRequests.data.existingmarmosetcolony} required={getRequired()}/>
+                            <Select id="existing-marmoset-colony" ariaLabel="Existing Marmoset Colony" isSubmitting={isSubmitting} options={existingMarmosetColonyOptions} defaultValue={animalRequests.data.existingmarmosetcolony} required={getRequired()}/>
                         </div>
+                        </ErrorMessageHandler>
 
-                        <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-10">
+                        <ErrorMessageHandler isSubmitting={isSubmitting}>
+                        <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-4">
                             <Title text="Does your institution have existing NHP facilities?"/>
-                            <Select id="existing-nhp-facilities" isSubmitting={isSubmitting} options={existingNHPFacilityOptions} defaultValue={animalRequests.data.existingnhpfacilities} required={getRequired()}/>
+                            <Select id="existing-nhp-facilities" ariaLabel="Existing NHP Facilities" isSubmitting={isSubmitting} options={existingNHPFacilityOptions} defaultValue={animalRequests.data.existingnhpfacilities} required={getRequired()}/>
                         </div>
+                        </ErrorMessageHandler>
                     </div>
 
                     <div className="tw-w-full tw-px-3 tw-mb-6">
+                        <ErrorMessageHandler isSubmitting={isSubmitting}>
                         <div className="tw-w-full tw-px-3 tw-mb-6">
-                            <TextArea id="animal-welfare" isSubmitting={isSubmitting} placeholder={animalWellfarePlaceholder} required={getRequired()} defaultValue={animalRequests.data.animalwelfare}/>
+                            <TextArea id="animal-welfare" ariaLabel="Animal Welfare" isSubmitting={isSubmitting} placeholder={animalWellfarePlaceholder} required={getRequired()} defaultValue={animalRequests.data.animalwelfare}/>
                         </div>
+                        </ErrorMessageHandler>
 
+                        <ErrorMessageHandler isSubmitting={isSubmitting}>
                         <div className="tw-w-full tw-px-3 tw-mb-6">
-                            <input type="checkbox" id="certify" name="certify" required={getRequired()} defaultChecked={animalRequests.data.certify}/>
+                            <input type="checkbox" name="certify" id="certify" aria-label="Certify" className={(isSubmitting ? "custom-invalid" : "")} required={getRequired()} defaultChecked={animalRequests.data.certify}/>
                             <label className="tw-text-gray-700 ml-1">{certificationLabel}</label>
                         </div>
+                        </ErrorMessageHandler>
                     </div>
 
-                    <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-10">
+                    <ErrorMessageHandler isSubmitting={isSubmitting}>
+                    <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-4">
                         <Title text="Attending veterinarian"/>
 
                         <div className="tw-w-full md:tw-w-1/2 tw-px-3 tw-mb-6 md:tw-mb-0">
-                            <Input id="vet-last-name" isSubmitting={isSubmitting} placeholder="Last Name" required={getRequired()} defaultValue={animalRequests.data.vetlastname}/>
+                            <Input id="vet-last-name" ariaLabel="Last Name" isSubmitting={isSubmitting} placeholder="Last Name" required={getRequired()} defaultValue={animalRequests.data.vetlastname}/>
                         </div>
 
                         <div className="tw-w-full md:tw-w-1/2 tw-px-3 tw-mb-6 md:tw-mb-0">
-                            <Input id="vet-first-name" isSubmitting={isSubmitting} placeholder="First Name" required={getRequired()} defaultValue={animalRequests.data.vetfirstname}/>
+                            <Input id="vet-first-name" ariaLabel="First Name" isSubmitting={isSubmitting} placeholder="First Name" required={getRequired()} defaultValue={animalRequests.data.vetfirstname}/>
                         </div>
 
                         <div className="tw-w-full tw-px-3 tw-mb-6 md:tw-mb-0">
-                            <Input id="vet-email" isSubmitting={isSubmitting} placeholder="Email Address" required={getRequired()} defaultValue={animalRequests.data.vetemail}/>
-                        </div>
-                    </div>
-
-                    <div className="tw-flex tw-flex-wrap tw-mx-2">
-                        <Title text="IACUC Approval"/>
-
-                        <div className="tw-w-full tw-px-3 md:tw-mb-0">
-                            <IACUCProtocol id="iacuc" isSubmitting={isSubmitting} required={getRequired()} defaultValue={animalRequests.data}/>
+                            <Input id="vet-email" ariaLabel="Email" isSubmitting={isSubmitting} placeholder="Email Address" required={getRequired()} defaultValue={animalRequests.data.vetemail}/>
                         </div>
                     </div>
+                    </ErrorMessageHandler>
                 </div>
+                
+                <IACUCProtocol id="iacuc" isSubmitting={isSubmitting} required={getRequired()} defaultValue={animalRequests.data}/>
 
                 <div className="tw-flex tw-flex-wrap tw-mx-2">
                     <button className="tw-ml-auto tw-bg-red-500 hover:tw-bg-red-400 tw-text-white tw-font-bold tw-py-4 tw-mt-2 tw-px-6 tw-border-none tw-rounded" onClick={(e) => {
diff --git a/mcc/src/client/AnimalRequest/co-investigators.tsx b/mcc/src/client/AnimalRequest/co-investigators.tsx
index 188d85576..16d939395 100644
--- a/mcc/src/client/AnimalRequest/co-investigators.tsx
+++ b/mcc/src/client/AnimalRequest/co-investigators.tsx
@@ -3,6 +3,7 @@ import { nanoid } from 'nanoid'
 
 import Input from './input'
 import Title from './title'
+import ErrorMessageHandler from './error-message-handler'
 
 export default function CoInvestigators(props) {
   const [coInvestigators, setCoInvestigators] = useState(new Set(
@@ -27,7 +28,8 @@ export default function CoInvestigators(props) {
   return (
     <>
       {[...coInvestigators].map((coInvestigator, index) => (
-        <div className="tw-flex tw-flex-wrap tw-w-full tw-mx-2 tw-mb-10" key={coInvestigator.uuid}>
+        <ErrorMessageHandler isSubmitting={props.isSubmitting} keyInternal={coInvestigator.uuid} key={coInvestigator.uuid + "-errorHandler"}>
+        <div className="tw-flex tw-flex-wrap tw-w-full tw-mx-2 tw-mb-4" key={coInvestigator.uuid}>
           <div className="tw-flex tw-flex-wrap tw-w-full tw-mb-6">
             <div className="tw-w-1/2 md:tw-mb-0">
               <Title text={ "Co-Investigator " + (index + 1)} />
@@ -39,21 +41,22 @@ export default function CoInvestigators(props) {
           </div>
 
           <div className="tw-w-full md:tw-w-1/3 tw-px-3 md:tw-mb-0">
-            <Input id={"coinvestigators-" + index + "-" + "lastName"} isSubmitting={props.isSubmitting} placeholder="Last Name" required={props.required} defaultValue={coInvestigator.lastname}/>
+            <Input id={"coinvestigators-" + index + "-" + "lastName"} ariaLabel={"Last Name" + "#" + index} isSubmitting={props.isSubmitting} placeholder="Last Name" required={props.required} defaultValue={coInvestigator.lastname}/>
           </div>
 
           <div className="tw-w-full md:tw-w-1/3 tw-px-3 tw-mb-6 md:tw-mb-0">
-            <Input id={"coinvestigators-" + index + "-" + "firstName"} isSubmitting={props.isSubmitting} placeholder="First Name" required={props.required} defaultValue={coInvestigator.firstname}/>
+            <Input id={"coinvestigators-" + index + "-" + "firstName"}  ariaLabel={"First Name" + "#" + index} isSubmitting={props.isSubmitting} placeholder="First Name" required={props.required} defaultValue={coInvestigator.firstname}/>
           </div>
 
           <div className="tw-w-full md:tw-w-1/3 tw-px-3 tw-mb-6 md:tw-mb-0">
-            <Input id={"coinvestigators-" + index + "-" + "middleInitial"} isSubmitting={props.isSubmitting} placeholder="Middle Initial" required={false} defaultValue={coInvestigator.middleinitial}/>
+            <Input id={"coinvestigators-" + index + "-" + "middleInitial"}  ariaLabel={"Middle Initial" + "#" + index} isSubmitting={props.isSubmitting} placeholder="Middle Initial" required={false} defaultValue={coInvestigator.middleinitial} maxLength="8"/>
           </div>
 
           <div className="tw-w-full tw-px-3 tw-mb-6 md:tw-mb-0">
-            <Input id={"coinvestigators-" + index + "-" + "institution"} isSubmitting={props.isSubmitting} placeholder="Institution" required={props.required} defaultValue={coInvestigator.institutionname}/>
+            <Input id={"coinvestigators-" + index + "-" + "institution"}  ariaLabel={"Institution" + "#" + index} isSubmitting={props.isSubmitting} placeholder="Institution" required={props.required} defaultValue={coInvestigator.institutionname}/>
           </div>
         </div>
+        </ErrorMessageHandler>
       ))}
 
       <div className="tw-w-full tw-px-3 tw-mb-6 md:tw-mb-0">
diff --git a/mcc/src/client/AnimalRequest/date.tsx b/mcc/src/client/AnimalRequest/date.tsx
index d51b03316..dcf48618b 100644
--- a/mcc/src/client/AnimalRequest/date.tsx
+++ b/mcc/src/client/AnimalRequest/date.tsx
@@ -9,7 +9,7 @@ export default function Input(props) {
     } else {
         return (
             <input className={"tw-appearance-none tw-block tw-w-full tw-text-gray-700" + (props.isSubmitting && " tw-invalid ") + "tw-rounded tw-py-4 tw-px-6 tw-mb-3 tw-leading-tight focus:tw-outline-none"}
-             name={props.id} id={props.id} type="date" placeholder={props.placeholder} required={props.required} defaultValue={props.defaultValue || (new Date()).toLocaleDateString()}/>
+             name={props.id} aria-label={props.ariaLabel} id={props.id} type="date" placeholder={props.placeholder} required={props.required} defaultValue={props.defaultValue || (new Date()).toLocaleDateString()}/>
         )
     }
 }
diff --git a/mcc/src/client/AnimalRequest/error-message-handler.tsx b/mcc/src/client/AnimalRequest/error-message-handler.tsx
new file mode 100644
index 000000000..018d79bd1
--- /dev/null
+++ b/mcc/src/client/AnimalRequest/error-message-handler.tsx
@@ -0,0 +1,41 @@
+import React from 'react'
+import { nanoid } from 'nanoid'
+
+export default function ErrorMessageHandler(props) {
+  const ref = React.useRef()
+	const [errors, setErrors] = React.useState(new Set())
+
+	React.useEffect(() => {
+    if (ref.current && props.isSubmitting) {
+      const el = ref.current
+      
+      const handleValidationMessages = () => {
+        const tmp = new Set()
+        
+        for (const e of el.querySelectorAll('input, select, textarea')) {
+          if (!e.checkValidity()) {
+            const name = e.getAttribute("aria-label").split("#")[0]
+            const message = e.validationMessage
+            tmp.add(`${name}: ${message}`)
+          }
+        }
+        
+        setErrors(tmp)
+      }
+      
+      el.addEventListener('input', handleValidationMessages)
+      handleValidationMessages()
+    }
+  }, [props.isSubmitting, props.rerender]);
+
+  return (
+    <>
+      <span ref={ref} key={props.id + "-error-message-handler-children"}>
+        {props.children}
+      </span>
+      <ul className="tw-mx-2 tw-mb-6" key={props.id + "-error-message-handler-errors"}>
+        {[...errors].map(txt => <li className="tw-tracking-wide tw-text-red-500" key={nanoid()}>{txt}</li>)}
+      </ul>
+    </>
+  )
+}
diff --git a/mcc/src/client/AnimalRequest/funding.tsx b/mcc/src/client/AnimalRequest/funding.tsx
index d536d0fdc..6c9d678c1 100644
--- a/mcc/src/client/AnimalRequest/funding.tsx
+++ b/mcc/src/client/AnimalRequest/funding.tsx
@@ -4,6 +4,7 @@ import Select from './select'
 import Input from './input'
 import Title from './title'
 import Date from './date'
+import ErrorMessageHandler from './error-message-handler'
 
 import { fundingSourceOptions } from './values'
 
@@ -20,16 +21,19 @@ export default function Funding(props) {
     }
 
     return (
-        <>
-        <div className="tw-w-full tw-px-3 tw-mb-6">
-            <Select id={props.id + "-source"} isSubmitting={props.isSubmitting} options={fundingSourceOptions} onChange={(e) => setDisplayApplicationDateField(e.currentTarget.value)} required={props.required} defaultValue={props.defaultValue.fundingsource} />
-        </div>
+        <ErrorMessageHandler isSubmitting={props.isSubmitting} rerender={displayApplicationDate}>
+        <div className="tw-flex tw-flex-wrap tw-mx-2 tw-mb-4">
+            <Title text="Existing or proposed funding source*"/>
+            <div className="tw-w-full tw-px-3 tw-mb-6">
+                <Select id={props.id + "-source"} ariaLabel="Proposed Funding Source" isSubmitting={props.isSubmitting} options={fundingSourceOptions} onChange={(e) => setDisplayApplicationDateField(e.currentTarget.value)} required={props.required} defaultValue={props.defaultValue.fundingsource} />
+            </div>
 
-        <div className="tw-w-full tw-px-3">
-            <Input id={props.id + "-grant-number"} isSubmitting={props.isSubmitting} placeholder="Grant Number(s)" display={!displayApplicationDate} required={!displayApplicationDate && props.required} defaultValue={props.defaultValue.grantnumber}/>
-            <Title text="Application Date" display={displayApplicationDate}/>
-            <Date id={props.id + "-application-due-date"} isSubmitting={props.isSubmitting} placeholder="Application due date" display={displayApplicationDate} required={displayApplicationDate && props.required} defaultValue={props.defaultValue.applicationduedate}/>
+            <div className="tw-w-full tw-px-3">
+                <Input id={props.id + "-grant-number"} ariaLabel="Grant Number" isSubmitting={props.isSubmitting} placeholder="Grant Number(s)" display={!displayApplicationDate} required={!displayApplicationDate && props.required} defaultValue={props.defaultValue.grantnumber}/>
+                <Title text="Application Date" display={displayApplicationDate}/>
+                <Date id={props.id + "-application-due-date"} ariaLabel="Application Date" isSubmitting={props.isSubmitting} placeholder="Application due date" display={displayApplicationDate} required={displayApplicationDate && props.required} defaultValue={props.defaultValue.applicationduedate}/>
+            </div>
         </div>
-        </>
+        </ErrorMessageHandler>
     )
 }
diff --git a/mcc/src/client/AnimalRequest/iacuc-protocol.tsx b/mcc/src/client/AnimalRequest/iacuc-protocol.tsx
index a5bebc508..2e775c5a2 100644
--- a/mcc/src/client/AnimalRequest/iacuc-protocol.tsx
+++ b/mcc/src/client/AnimalRequest/iacuc-protocol.tsx
@@ -2,6 +2,8 @@ import React, { useState } from 'react';
 
 import Select from './select'
 import Input from './input'
+import Title from './title'
+import ErrorMessageHandler from './error-message-handler'
 
 import { IACUCApprovalOptions } from './values'
 
@@ -18,16 +20,23 @@ export default function IACUCProtocol(props) {
     }
 
     return (
-        <>
-            <div className="tw-w-full tw-mb-6">
-                <Select id={props.id + "-approval"} isSubmitting={props.isSubmitting} options={IACUCApprovalOptions} required={props.required}
-                 defaultValue={props.defaultValue.iacucapproval} onChange={(e) => setDisplayProtocolField(e.currentTarget.value)}/>
-            </div>
+        <ErrorMessageHandler isSubmitting={props.isSubmitting} rerender={displayProtocol}>
+        <div className="tw-flex tw-flex-wrap tw-mx-2">
+            <Title text="IACUC Approval"/>
+
+            <div className="tw-w-full tw-px-3 md:tw-mb-0">
+
+                <div className="tw-w-full tw-mb-6">
+                    <Select id={props.id + "-approval"} ariaLabel="IACUC Approval Status" isSubmitting={props.isSubmitting} options={IACUCApprovalOptions} required={props.required}
+                        defaultValue={props.defaultValue.iacucapproval} onChange={(e) => setDisplayProtocolField(e.currentTarget.value)}/>
+                </div>
 
-            <div className="tw-mb-6">
-                <Input id={props.id + "-protocol"} isSubmitting={props.isSubmitting} placeholder={"IACUC Protocol Number"}
-                    display={displayProtocol} required={displayProtocol && props.required} defaultValue={props.defaultValue.iacucprotocol}/>
+                <div className="tw-mb-6">
+                    <Input id={props.id + "-protocol"} ariaLabel="IACUC Protocol" isSubmitting={props.isSubmitting} placeholder={"IACUC Protocol Number"}
+                        display={displayProtocol} required={displayProtocol && props.required} defaultValue={props.defaultValue.iacucprotocol}/>
+                </div>
             </div>
-        </>
+        </div>
+        </ErrorMessageHandler>
     )
 }
diff --git a/mcc/src/client/AnimalRequest/input-number.tsx b/mcc/src/client/AnimalRequest/input-number.tsx
index 1c54f0f52..963c53099 100644
--- a/mcc/src/client/AnimalRequest/input-number.tsx
+++ b/mcc/src/client/AnimalRequest/input-number.tsx
@@ -3,6 +3,6 @@ import React from 'react';
 export default function InputNumber(props) {
     return (
         <input className={"tw-appearance-none tw-inline tw-w-1/2 tw-text-gray-700 " + (props.isSubmitting && " tw-invalid ") + "tw-border-gray-300 tw-rounded tw-py-4 tw-px-6 tw-mb-3 tw-leading-tight focus:tw-outline-none"}
-         name={props.id} id={props.id} type="number" min="0" max="1000" required={props.required} defaultValue={props.defaultValue}/>
+         name={props.id} aria-label={props.ariaLabel} id={props.id} type="number" min="0" max="1000" required={props.required} defaultValue={props.defaultValue}/>
     )
 }
diff --git a/mcc/src/client/AnimalRequest/input.tsx b/mcc/src/client/AnimalRequest/input.tsx
index 964123cab..788a265f9 100644
--- a/mcc/src/client/AnimalRequest/input.tsx
+++ b/mcc/src/client/AnimalRequest/input.tsx
@@ -9,7 +9,7 @@ export default function Input(props) {
     } else {
         return (
             <input className={"tw-appearance-none tw-block tw-w-full tw-text-gray-700" + (props.isSubmitting && " tw-invalid ") + "tw-rounded tw-py-4 tw-px-6 tw-mb-3 tw-leading-tight focus:tw-outline-none"}
-             name={props.id} id={props.id} type="text" placeholder={props.placeholder} required={props.required} defaultValue={props.defaultValue}/>
+             name={props.id} aria-label={props.ariaLabel} id={props.id} type="text" placeholder={props.placeholder} required={props.required} defaultValue={props.defaultValue} maxLength={props.maxLength}/>
         )
     }
 }
diff --git a/mcc/src/client/AnimalRequest/research-area.tsx b/mcc/src/client/AnimalRequest/research-area.tsx
index 76218d308..27415e873 100644
--- a/mcc/src/client/AnimalRequest/research-area.tsx
+++ b/mcc/src/client/AnimalRequest/research-area.tsx
@@ -2,6 +2,8 @@ import React, { useState } from 'react';
 
 import Select from './select'
 import Input from './input'
+import Title from './title'
+import ErrorMessageHandler from './error-message-handler'
 
 import { researchAreaOptions } from './values'
 
@@ -18,14 +20,19 @@ export default function ResearchArea(props) {
     }
 
     return (
-        <>
+        <ErrorMessageHandler isSubmitting={props.isSubmitting} rerender={displayOther}>
+        <div className="tw-w-full tw-px-3 tw-mb-10">
+            <div className="tw-mb-6">
+                <Title text="Research Area"/>
+            </div>
             <div className="tw-w-full tw-mb-6">
-                <Select id={props.id} options={researchAreaOptions} isSubmitting={props.isSubmitting} onChange={(e) => setDisplayOtherField(e.currentTarget.value)} defaultValue={props.defaultValue.researcharea} required={props.required}/>
+                <Select id={props.id} options={researchAreaOptions} ariaLabel="Research Area" isSubmitting={props.isSubmitting} onChange={(e) => setDisplayOtherField(e.currentTarget.value)} defaultValue={props.defaultValue.researcharea} required={props.required}/>
             </div>
 
             <div className="tw-w-full tw-mb-6">
-                <Input id={props.id + "-other-specify"} isSubmitting={props.isSubmitting} placeholder="Please specify" display={displayOther} required={displayOther && props.required} defaultValue={props.defaultValue.otherjustification}/>
+                <Input id={props.id + "-other-specify"} ariaLabel="Other" isSubmitting={props.isSubmitting} placeholder="Please specify" display={displayOther} required={displayOther && props.required} defaultValue={props.defaultValue.otherjustification}/>
             </div>
-        </>
+        </div>
+        </ErrorMessageHandler>
     )
 }
diff --git a/mcc/src/client/AnimalRequest/select.tsx b/mcc/src/client/AnimalRequest/select.tsx
index 7aaccea6a..27245fab3 100644
--- a/mcc/src/client/AnimalRequest/select.tsx
+++ b/mcc/src/client/AnimalRequest/select.tsx
@@ -12,10 +12,10 @@ export default function Select(props) {
     }
 
     return (
-        <select className={"tw-block tw-border tw-border-gray-300" + (props.isSubmitting && value === "none" && " tw-border-red-500 ") + "tw-text-gray-700 tw-py-3 tw-pr-8 tw-rounded tw-leading-tight focus:tw-outline-none"}
-            name={props.id} id={props.id} required={props.required} defaultValue={props.defaultValue || "none"} onChange={(e) => onChange(e)}>
+        <select className={"tw-block tw-border tw-border-gray-300" + (props.isSubmitting && " tw-invalid ") + "tw-text-gray-700 tw-py-3 tw-pr-8 tw-rounded tw-leading-tight focus:tw-outline-none"}
+          name={props.id} aria-label={props.ariaLabel} id={props.id} required={props.required} defaultValue={props.defaultValue || ""} onChange={(e) => onChange(e)}>
 
-            <option disabled value="none"> -- </option>
+            <option disabled value=""> -- </option>
             {props.options.map(({ value, label }, _) => <option key={value} value={value}>{label}</option>)}
         </select>
     )
diff --git a/mcc/src/client/AnimalRequest/tailwind.css b/mcc/src/client/AnimalRequest/tailwind.css
index 92ee74f45..645edbf9e 100644
--- a/mcc/src/client/AnimalRequest/tailwind.css
+++ b/mcc/src/client/AnimalRequest/tailwind.css
@@ -22,6 +22,10 @@ textarea {
   border:1px solid #ff0000 !important;
 }
 
+.custom-invalid:invalid {
+  outline:#ff0000 solid 1px !important;
+}
+
 @media (min-width: 640px) {
   .tw-container {
     max-width: 640px;
diff --git a/mcc/src/client/AnimalRequest/text-area.tsx b/mcc/src/client/AnimalRequest/text-area.tsx
index a1ff2c865..d7e7b4845 100644
--- a/mcc/src/client/AnimalRequest/text-area.tsx
+++ b/mcc/src/client/AnimalRequest/text-area.tsx
@@ -13,7 +13,7 @@ export default function TextArea(props) {
             <div className="tw-flex tw-flex-wrap">
                 <Title text={props.placeholder}/>
                 <textarea className={"tw-w-full tw-h-36 tw-px-3 tw-py-2 tw-text-base" + (props.isSubmitting && " tw-invalid ") + "tw-text-gray-700 tw-placeholder-gray-600 tw-border tw-rounded-lg focus:tw-shadow-outline"}
-                    name={props.id} id={props.id} placeholder={props.placeholder} required={props.required} defaultValue={props.defaultValue}/>
+                    name={props.id} aria-label={props.ariaLabel} id={props.id} placeholder={props.placeholder} required={props.required} defaultValue={props.defaultValue}/>
             </div>
         )
     }
diff --git a/mcc/src/client/AnimalRequest/yes-no-radio.tsx b/mcc/src/client/AnimalRequest/yes-no-radio.tsx
index 1a2746760..bcf897833 100644
--- a/mcc/src/client/AnimalRequest/yes-no-radio.tsx
+++ b/mcc/src/client/AnimalRequest/yes-no-radio.tsx
@@ -11,7 +11,8 @@ export default function Radio(props) {
         <div id={props.id} className="tw-flex tw-flex-wrap tw-mx-2">
             <div className="tw-w-full md:tw-w-1/6 tw-px-3 tw-mb-6 md:tw-mb-0">
                 <label className="tw-text-gray-700 ml-1">
-                    <input name={props.id} id={props.id + "-yes"} type="radio" value="yes" required={props.required}
+                    <input name={props.id} aria-label={props.ariaLabel} id={props.id + "-yes"} type="radio" value="yes" required={props.required}
+                     className={(props.isSubmitting ? "custom-invalid" : "")}
                      defaultChecked={props.defaultValue === true} onChange={(e) => onChange(e)}/>
                     <p className="tw-inline">Yes</p>
                 </label>
@@ -19,7 +20,8 @@ export default function Radio(props) {
 
             <div className="tw-w-full md:tw-w-1/6 tw-px-3 tw-mb-6 md:tw-mb-0">
                 <label className="tw-text-gray-700 ml-1">
-                    <input name={props.id} id={props.id + "-no"} type="radio" value="no" required={props.required}
+                    <input name={props.id} aria-label={props.ariaLabel} id={props.id + "-no"} type="radio" value="no" required={props.required}
+                     className={(props.isSubmitting ? "custom-invalid" : "")}
                      defaultChecked={props.defaultValue === false} onChange={(e) => onChange(e)}/>
                     <p className="tw-inline">No</p>
                 </label>
diff --git a/mcc/src/org/labkey/mcc/MccController.java b/mcc/src/org/labkey/mcc/MccController.java
index c34b7b076..06259a7f1 100644
--- a/mcc/src/org/labkey/mcc/MccController.java
+++ b/mcc/src/org/labkey/mcc/MccController.java
@@ -32,7 +32,9 @@
 import org.labkey.api.data.Table;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
+import org.labkey.api.ehr.EHRService;
 import org.labkey.api.module.AllowedDuringUpgrade;
+import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.pipeline.PipelineUrls;
 import org.labkey.api.query.DetailsURL;
 import org.labkey.api.query.FieldKey;
@@ -40,17 +42,13 @@
 import org.labkey.api.security.Group;
 import org.labkey.api.security.GroupManager;
 import org.labkey.api.security.IgnoresTermsOfUse;
-import org.labkey.api.security.MutableSecurityPolicy;
 import org.labkey.api.security.RequiresNoPermission;
 import org.labkey.api.security.RequiresPermission;
 import org.labkey.api.security.SecurityManager;
-import org.labkey.api.security.SecurityPolicyManager;
 import org.labkey.api.security.User;
 import org.labkey.api.security.UserManager;
 import org.labkey.api.security.ValidEmail;
 import org.labkey.api.security.permissions.AdminPermission;
-import org.labkey.api.security.permissions.ReadPermission;
-import org.labkey.api.security.roles.ReaderRole;
 import org.labkey.api.settings.AppProps;
 import org.labkey.api.settings.LookAndFeelProperties;
 import org.labkey.api.util.ConfigurationException;
@@ -58,6 +56,7 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.MailHelper;
 import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.util.Path;
 import org.labkey.api.util.URLHelper;
 import org.labkey.api.view.HtmlView;
 import org.labkey.mcc.etl.ZimsImportTask;
@@ -576,4 +575,40 @@ public URLHelper getSuccessURL(Object o)
             return PageFlowUtil.urlProvider(PipelineUrls.class).urlBegin(getContainer());
         }
     }
+
+    @RequiresPermission(AdminPermission.class)
+    public class ImportStudyAction extends ConfirmAction<Object>
+    {
+        @Override
+        public ModelAndView getConfirmView(Object o, BindException errors) throws Exception
+        {
+            setTitle("Import MCC Study");
+
+            StringBuilder sb = new StringBuilder();
+            sb.append("This will import the default MCC study in this folder and create other resources, like QCStates. Do you want to continue?");
+
+            return new HtmlView(HtmlString.unsafe(sb.toString()));
+        }
+
+        @Override
+        public boolean handlePost(Object o, BindException errors) throws Exception
+        {
+            EHRService.get().importFolderDefinition(getContainer(), getUser(), ModuleLoader.getInstance().getModule(MccModule.NAME), new Path("referenceStudy"));
+
+            return true;
+        }
+
+        @Override
+        public void validateCommand(Object o, Errors errors)
+        {
+
+        }
+
+        @NotNull
+        @Override
+        public URLHelper getSuccessURL(Object o)
+        {
+            return PageFlowUtil.urlProvider(PipelineUrls.class).urlBegin(getContainer());
+        }
+    }
 }
diff --git a/mcc/src/org/labkey/mcc/MccManager.java b/mcc/src/org/labkey/mcc/MccManager.java
index 41ae60e6a..25689d5e6 100644
--- a/mcc/src/org/labkey/mcc/MccManager.java
+++ b/mcc/src/org/labkey/mcc/MccManager.java
@@ -38,6 +38,8 @@ public class MccManager
 
     public static final String ContainerPropName = "MCCContainer";
     public static final String NotifyPropName = "MCCContactUsers";
+    public static final String MCCRequestNotificationUsers = "MCCRequestNotificationUsers";
+    public static final String MCCRequestContainer = "MCCRequestContainer";
     public static final String ZIMSImportPath = "ZIMSImportPath";
 
     public static final String MCC_GROUP_NAME = "MCC Users";
@@ -56,6 +58,17 @@ public static MccManager get()
         return _instance;
     }
 
+    public Container getMCCRequestContainer()
+    {
+        Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);
+        ModuleProperty mp = m.getModuleProperties().get(MccManager.MCCRequestContainer);
+        String path = mp.getEffectiveValue(ContainerManager.getRoot());
+        if (path == null)
+            return null;
+
+        return ContainerManager.getForPath(path);
+    }
+
     public Container getMCCContainer()
     {
         Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);
@@ -81,9 +94,19 @@ public File getZimsImportFolder(Container c)
     }
 
     public Set<User> getNotificationUsers()
+    {
+        return getUsersForProp(MccManager.NotifyPropName);
+    }
+
+    public Set<User> getRequestNotificationUsers()
+    {
+        return getUsersForProp(MccManager.MCCRequestNotificationUsers);
+    }
+
+    private Set<User> getUsersForProp(String propName)
     {
         Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);
-        ModuleProperty mp = m.getModuleProperties().get(MccManager.NotifyPropName);
+        ModuleProperty mp = m.getModuleProperties().get(propName);
         String userNames = mp.getEffectiveValue(ContainerManager.getRoot());
         userNames = StringUtils.trimToNull(userNames);
         if (userNames == null)
@@ -107,7 +130,7 @@ public Set<User> getNotificationUsers()
 
             if (u == null)
             {
-                _log.error("Unknown user registered for MCC notifcations: " + username);
+                _log.error("Unknown user registered for MCC notifications: " + username, new Exception());
             }
 
             if (u != null)
diff --git a/mcc/src/org/labkey/mcc/query/TriggerHelper.java b/mcc/src/org/labkey/mcc/query/TriggerHelper.java
index f73c5193f..947e73f51 100644
--- a/mcc/src/org/labkey/mcc/query/TriggerHelper.java
+++ b/mcc/src/org/labkey/mcc/query/TriggerHelper.java
@@ -12,12 +12,22 @@
 import org.labkey.api.data.SimpleFilter;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
+import org.labkey.api.query.DetailsURL;
 import org.labkey.api.query.FieldKey;
-import org.labkey.api.query.QueryService;
 import org.labkey.api.security.User;
 import org.labkey.api.security.UserManager;
+import org.labkey.api.settings.AppProps;
+import org.labkey.api.util.ExceptionUtil;
+import org.labkey.api.util.MailHelper;
+import org.labkey.mcc.MccManager;
 import org.labkey.mcc.MccSchema;
 
+import javax.mail.Address;
+import javax.mail.Message;
+import javax.mail.internet.InternetAddress;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Created by bimber
  */
@@ -60,4 +70,37 @@ public boolean isAliasInUse(String alias)
 
         return new TableSelector(_animalMapping, new SimpleFilter(FieldKey.fromString("externalAlias"), alias), null).exists();
     }
+
+    public void sendNotification(int rowid) {
+        Set<User> users = MccManager.get().getRequestNotificationUsers();
+        if (users == null || users.isEmpty())
+        {
+            _log.error("An MCC request was finalized but there are no notification users");
+            return;
+        }
+
+        try
+        {
+            Set<Address> emails = new HashSet<>();
+            for (User u : users)
+            {
+                emails.add(new InternetAddress(u.getEmail()));
+            }
+
+            MailHelper.MultipartMessage mail = MailHelper.createMultipartMessage();
+            mail.setFrom("mcc-do-not-reply@ohsu.edu");
+            mail.setSubject("MCC Animal Request");
+
+            Container rc = MccManager.get().getMCCRequestContainer();
+            DetailsURL url = DetailsURL.fromString("/mcc/mccRequestAdmin.view", rc);
+            mail.setEncodedHtmlContent("An animal request was submitted on MCC.  <a href=\"" + AppProps.getInstance().getBaseServerUrl() + url.getActionURL().toString()+ "\">Click here to view/approve this request</a>");
+            mail.addRecipients(Message.RecipientType.TO, emails.toArray(new Address[0]));
+
+            MailHelper.send(mail, _user, _container);
+        }
+        catch (Exception e)
+        {
+            _log.error("Unable to send MCC email", e);
+        }
+    }
 }
diff --git a/mcc/src/org/labkey/mcc/security/MccRequesterRole.java b/mcc/src/org/labkey/mcc/security/MccRequesterRole.java
index 076fd8eff..03e6b6d41 100644
--- a/mcc/src/org/labkey/mcc/security/MccRequesterRole.java
+++ b/mcc/src/org/labkey/mcc/security/MccRequesterRole.java
@@ -1,14 +1,16 @@
 package org.labkey.mcc.security;
 
 import org.jetbrains.annotations.NotNull;
+import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.security.permissions.ReadPermission;
+import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.security.roles.AbstractRole;
 
 public class MccRequesterRole extends AbstractRole
 {
     public MccRequesterRole()
     {
-        super("MCCRequestor", "These users can submit animal requests", ReadPermission.class, MccRequestorPermission.class);
+        super("MCCRequestor", "These users can submit animal requests", ReadPermission.class, UpdatePermission.class, InsertPermission.class, MccRequestorPermission.class);
     }
 
     @Override
diff --git a/mcc/test/src/org/labkey/test/tests/mcc/MccTest.java b/mcc/test/src/org/labkey/test/tests/mcc/MccTest.java
index 9794c1861..807252057 100644
--- a/mcc/test/src/org/labkey/test/tests/mcc/MccTest.java
+++ b/mcc/test/src/org/labkey/test/tests/mcc/MccTest.java
@@ -16,20 +16,35 @@
 
 package org.labkey.test.tests.mcc;
 
+import org.apache.commons.io.FileUtils;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.labkey.remoteapi.query.SelectRowsCommand;
+import org.labkey.remoteapi.query.SelectRowsResponse;
+import org.labkey.remoteapi.query.Sort;
 import org.labkey.test.BaseWebDriverTest;
+import org.labkey.test.Locator;
+import org.labkey.test.Locators;
+import org.labkey.test.ModulePropertyValue;
+import org.labkey.test.TestFileUtils;
 import org.labkey.test.TestTimeoutException;
+import org.labkey.test.WebTestHelper;
 import org.labkey.test.categories.External;
 import org.labkey.test.categories.LabModule;
-import org.labkey.test.Locator;
-import org.openqa.selenium.WebElement;
+import org.labkey.test.util.DataRegionTable;
 import org.openqa.selenium.Keys;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 @Category({External.class, LabModule.class})
 public class MccTest extends BaseWebDriverTest
@@ -40,159 +55,246 @@ public void testMccModule() throws Exception
         _containerHelper.enableModule("Mcc");
 
         doRequestFormTest();
+        doRequestFormTestWithFailure();
+    }
+
+    private static class FormElement
+    {
+        String inputType = "input";
+        String databaseFieldName = null;
+        boolean isCheckBox = false;
+
+        final String inputName;
+        final CharSequence sendKeysValue;
+
+        public FormElement(String inputName, CharSequence sendKeysValue)
+        {
+            this.inputName = inputName;
+            this.sendKeysValue = sendKeysValue;
+        }
+
+        public FormElement withDatabaseField(String databaseFieldName)
+        {
+            this.databaseFieldName = databaseFieldName;
+
+            return this;
+        }
+
+        public FormElement isCheckBox()
+        {
+            this.isCheckBox = true;
+            return this;
+        }
+
+        public FormElement withInput(String inputType)
+        {
+            this.inputType = inputType;
+
+            return this;
+        }
+
+        public String getFieldName()
+        {
+            return inputName;
+        }
+
+        public String getInputType()
+        {
+            return inputType;
+        }
+
+        public void waitFor(BaseWebDriverTest test)
+        {
+            Locator loc = Locator.tagWithId(getInputType(), getFieldName());
+            test.waitForElement(loc);
+        }
+
+        public void setFieldValue(BaseWebDriverTest test)
+        {
+            Locator loc = Locator.tagWithId(getInputType(), getFieldName());
+            waitFor(test);
+            if (this.sendKeysValue == null)
+            {
+                test.waitAndClick(loc);
+            }
+            else
+            {
+                loc.findElement(test.getDriver()).sendKeys(this.sendKeysValue);
+            }
+
+        }
+    }
+
+    // Field name / field value:
+    final FormElement[] FORM_DATA = new FormElement[]{
+            new FormElement("investigator-last-name", "last name"),
+            new FormElement("investigator-first-name", "first name"),
+            new FormElement("investigator-middle-initial", "m"),
+            new FormElement("is-principal-investigator-yes", null).isCheckBox(),
+            new FormElement("institution-name", "institution name"),
+            new FormElement("institution-city", "institution city"),
+            new FormElement("institution-state", "institution state"),
+            new FormElement("institution-country", "institution country"),
+            new FormElement("official-last-name", "official last name"),
+            new FormElement("official-first-name", "official first name"),
+            new FormElement("official-email", "official@email.com"),
+            new FormElement("funding-source", Keys.ARROW_DOWN).withInput("select"),
+            new FormElement("funding-grant-number", "grant number"),
+            new FormElement("experiment-rationale", "rationale").withInput("textarea"),
+
+
+            new FormElement("animal-cohorts-0-numberofanimals", "1"),
+            new FormElement("animal-cohorts-0-sex", Keys.ARROW_DOWN).withInput("select"),
+            new FormElement("animal-cohorts-0-othercharacteristics", "characteristics").withInput("textarea"),
+            new FormElement("methods-proposed", "methods").withInput("textarea"),
+            new FormElement("collaborations", "collaborations").withInput("textarea"),
+            new FormElement("animal-breeding-is-planning-to-breed-animals-no", null).isCheckBox(),
+            new FormElement("research-area", Keys.ARROW_DOWN).withInput("select"),
+            new FormElement("existing-marmoset-colony",  Keys.ARROW_DOWN).withInput("select"),
+            new FormElement("existing-nhp-facilities", Keys.ARROW_DOWN).withInput("select"),
+            new FormElement("animal-welfare", "welfare").withInput("textarea"),
+            new FormElement("certify", null).isCheckBox(),
+            new FormElement("vet-last-name", "vet last name"),
+            new FormElement("vet-first-name", "vet first name"),
+            new FormElement("vet-email", "vet@email.com"),
+            new FormElement("iacuc-approval", Keys.ARROW_DOWN).withInput("select")
+    };
+
+    private Locator getButton(String text)
+    {
+        return Locator.tagWithText("button", text);
+    }
+
+    private void goToAnimalRequests()
+    {
+        goToProjectHome();
+        waitAndClickAndWait(Locator.tagContainingText("div", "Animal Requests"));
+
+        waitForElement(Locator.tagWithText("a", "Submit New Animal Request"));
     }
 
     private void doRequestFormTest() throws Exception
     {
-        beginAt("/home/mcc-animalRequest.view");
-
-        Locator investigatorLastName = Locator.tagWithId("input", "investigator-last-name");
-        waitForElement(investigatorLastName);
-        WebElement iLastNameElement = investigatorLastName.findElement(getDriver());
-        iLastNameElement.sendKeys("last name");
-
-        Locator investigatorFirstName = Locator.tagWithId("input", "investigator-first-name");
-        waitForElement(investigatorFirstName);
-        WebElement investigatorFirstNameElement = investigatorFirstName.findElement(getDriver());
-        investigatorFirstNameElement.sendKeys("first name");
-
-        Locator investigatorMiddleInitial = Locator.tagWithId("input", "investigator-middle-initial");
-        waitForElement(investigatorMiddleInitial);
-        WebElement investigatorMiddleInitialElement = investigatorMiddleInitial.findElement(getDriver());
-        investigatorMiddleInitialElement.sendKeys("middle initial");
-
-        Locator isPrincipalInvestigatorYes = Locator.tagWithId("input", "is-principal-investigator-yes");
-        waitForElement(isPrincipalInvestigatorYes);
-        waitAndClick(isPrincipalInvestigatorYes);
-
-        Locator institutionName = Locator.tagWithId("input", "institution-name");
-        waitForElement(institutionName);
-        WebElement institutionNameElement = institutionName.findElement(getDriver());
-        institutionNameElement.sendKeys("institution name");
-
-        Locator institutionCity = Locator.tagWithId("input", "institution-city");
-        waitForElement(institutionCity);
-        WebElement institutionCityElement = institutionCity.findElement(getDriver());
-        institutionCityElement.sendKeys("institution city");
-
-        Locator institutionState = Locator.tagWithId("input", "institution-state");
-        waitForElement(institutionState);
-        WebElement institutionStateElement = institutionState.findElement(getDriver());
-        institutionStateElement.sendKeys("institution state");
-
-        Locator institutionCountry = Locator.tagWithId("input", "institution-country");
-        waitForElement(institutionCountry);
-        WebElement institutionCountryElement = institutionCountry.findElement(getDriver());
-        institutionCountryElement.sendKeys("institution country");
-
-        Locator officialLastName = Locator.tagWithId("input", "official-last-name");
-        waitForElement(officialLastName);
-        WebElement officialLastNameElement = officialLastName.findElement(getDriver());
-        officialLastNameElement.sendKeys("official last name");
-
-        Locator officialFirstName = Locator.tagWithId("input", "official-first-name");
-        waitForElement(officialFirstName);
-        WebElement officialFirstNameElement = officialFirstName.findElement(getDriver());
-        officialFirstNameElement.sendKeys("official first name");
-
-        Locator officialEmail = Locator.tagWithId("input", "official-email");
-        waitForElement(officialEmail);
-        WebElement officialEmailElement = officialEmail.findElement(getDriver());
-        officialEmailElement.sendKeys("official email");
-
-        Locator fundingSource = Locator.tagWithId("select", "funding-source");
-        waitForElement(fundingSource);
-        waitAndClick(fundingSource);
-        WebElement fundingSourceElement = fundingSource.findElement(getDriver());
-        fundingSourceElement.sendKeys(Keys.ARROW_DOWN);
-
-        Locator grantNumber = Locator.tagWithId("input", "funding-grant-number");
-        waitForElement(grantNumber);
-        WebElement grantNumberElement = grantNumber.findElement(getDriver());
-        grantNumberElement.sendKeys("grant number");
-
-        Locator experimentalRationale = Locator.tagWithId("textarea", "experiment-rationale");
-        waitForElement(experimentalRationale);
-        WebElement experimentalRationaleElement = experimentalRationale.findElement(getDriver());
-        experimentalRationaleElement.sendKeys("rationale");
-
-        Locator numberOfAnimals = Locator.tagWithId("input", "animal-cohorts-0-numberofanimals");
-        waitForElement(numberOfAnimals);
-        WebElement numberOfAnimalsElement = numberOfAnimals.findElement(getDriver());
-        numberOfAnimalsElement.sendKeys("1");
-
-        Locator cohortSex = Locator.tagWithId("select", "animal-cohorts-0-sex");
-        waitForElement(cohortSex);
-        waitAndClick(cohortSex);
-        WebElement cohortSexElement = cohortSex.findElement(getDriver());
-        cohortSexElement.sendKeys(Keys.ARROW_DOWN);
-
-        Locator otherCharacteristics = Locator.tagWithId("textarea", "animal-cohorts-0-othercharacteristics");
-        waitForElement(otherCharacteristics);
-        WebElement otherCharacteristicsElement = otherCharacteristics.findElement(getDriver());
-        otherCharacteristicsElement.sendKeys("characteristics");
-
-        Locator methodsProposed = Locator.tagWithId("textarea", "methods-proposed");
-        waitForElement(methodsProposed);
-        WebElement methodsProposedElement = methodsProposed.findElement(getDriver());
-        methodsProposedElement.sendKeys("methods");
-
-        Locator collaborations = Locator.tagWithId("textarea", "collaborations");
-        waitForElement(collaborations);
-        WebElement collaborationsElement = collaborations.findElement(getDriver());
-        collaborationsElement.sendKeys("collaborations");
-
-        Locator isBreedingAnimalsNo = Locator.tagWithId("input", "animal-breeding-is-planning-to-breed-animals-no");
-        waitForElement(isBreedingAnimalsNo);
-        waitAndClick(isBreedingAnimalsNo);
-
-        Locator researchArea = Locator.tagWithId("select", "research-area");
-        waitForElement(researchArea);
-        waitAndClick(researchArea);
-        WebElement researchAreaElement = researchArea.findElement(getDriver());
-        researchAreaElement.sendKeys(Keys.ARROW_DOWN);
-
-        Locator existingMarmosetColony = Locator.tagWithId("select", "existing-marmoset-colony");
-        waitForElement(existingMarmosetColony);
-        waitAndClick(existingMarmosetColony);
-        WebElement existingMarmosetColonyElement = existingMarmosetColony.findElement(getDriver());
-        existingMarmosetColonyElement.sendKeys(Keys.ARROW_DOWN);
-
-        Locator existingNHPFacilities = Locator.tagWithId("select", "existing-nhp-facilities");
-        waitForElement(existingNHPFacilities);
-        waitAndClick(existingNHPFacilities);
-        WebElement existingNHPFacilitiesElement = existingNHPFacilities.findElement(getDriver());
-        existingNHPFacilitiesElement.sendKeys(Keys.ARROW_DOWN);
-
-        Locator animalWelfare = Locator.tagWithId("textarea", "animal-welfare");
-        waitForElement(animalWelfare);
-        WebElement animalWelfareElement = animalWelfare.findElement(getDriver());
-        animalWelfareElement.sendKeys("welfare");
-
-        Locator certifyCheckbox = Locator.tagWithName("input", "certify");
-        waitForElement(certifyCheckbox);
-        waitAndClick(certifyCheckbox);
-
-        Locator vetLastName = Locator.tagWithId("input", "vet-last-name");
-        waitForElement(vetLastName);
-        WebElement vetLastNameElement = vetLastName.findElement(getDriver());
-        vetLastNameElement.sendKeys("vet last name");
-
-        Locator vetFirstName = Locator.tagWithId("input", "vet-first-name");
-        waitForElement(vetFirstName);
-        WebElement vetFirstNameElement = vetFirstName.findElement(getDriver());
-        vetFirstNameElement.sendKeys("vet first name");
-
-        Locator vetEmail = Locator.tagWithId("input", "vet-email");
-        waitForElement(vetEmail);
-        WebElement vetEmailElement = vetEmail.findElement(getDriver());
-        vetEmailElement.sendKeys("vet email");
-
-        Locator iacucApproval = Locator.tagWithId("select", "iacuc-approval");
-        waitForElement(iacucApproval);
-        waitAndClick(iacucApproval);
-        WebElement iacucApprovalElement = iacucApproval.findElement(getDriver());
-        iacucApprovalElement.sendKeys(Keys.ARROW_DOWN);
+        goToAnimalRequests();
+        waitAndClickAndWait(Locator.tagWithText("a", "Submit New Animal Request"));
+        waitForElement(getButton("Submit"));
+
+        setFormValues(null);
+
+        waitAndClickAndWait(getButton("Save"));
+
+        // Verify record created:
+        Map<String, Object> request = getLastModifiedRequestRow();
+        for (FormElement f : FORM_DATA)
+        {
+            //TODO: check data
+        }
+    }
+
+    private Map<String, Object> getLastModifiedRequestRow() throws Exception
+    {
+        SelectRowsCommand sr = new SelectRowsCommand("mcc", "animalrequests");
+        sr.addSort(new Sort("modified", Sort.Direction.DESCENDING));
+        SelectRowsResponse srr = sr.execute(createDefaultConnection(), getProjectName());
+        return srr.getRows().get(0);
+    }
+
+    private void doRequestFormTestWithFailure() throws Exception
+    {
+        goToAnimalRequests();
+
+        waitAndClickAndWait(Locator.tagWithText("a", "Submit New Animal Request"));
+        waitForElement(getButton("Submit"));
+
+        // This omits a required field
+        setFormValues(Arrays.asList("investigator-last-name"));
+        waitAndClick(getButton("Submit"));
+
+        waitForElement(Locator.tagWithText("li", "Last Name: Please fill out this field."));
+
+        // Add Co-I
+        waitAndClick(Locator.tagWithAttribute("input", "value", "Add Co-investigator"));
+        waitForElement(Locator.tagWithText("li", "Institution: Please fill out this field."));
+
+        // To full exercise saving, add a cohort and co-investigator
+        new FormElement("coinvestigators-0-lastName", "coinvestigators-lastName").setFieldValue(this);
+        new FormElement("coinvestigators-0-firstName", "coinvestigators-firstName").setFieldValue(this);
+        new FormElement("coinvestigators-0-institution", "coinvestigators-institution").setFieldValue(this);
+        waitForElementToDisappear(Locator.tagWithText("li", "Institution: Please fill out this field."));
+
+        // Add another, which makes it invalid again
+        waitAndClick(Locator.tagWithAttribute("input", "value", "Add Co-investigator"));
+        waitAndClick(getButton("Submit"));
+        waitForElement(Locator.tagWithText("li", "Institution: Please fill out this field."));
+
+        // Check for error messages. Now remove that Co-I block
+        waitAndClick(Locator.tagWithText("p", "Co-Investigator 2").parent("div").followingSibling("div").index(0).child("input"));
+
+        // Ensure form still in error-reporting state
+        waitForElement(Locator.tagWithText("li", "Last Name: Please fill out this field."));
+
+        // Repeat for Cohorts
+        waitAndClick(Locator.tagWithAttribute("input", "value", "Add Cohort"));
+        Locator removeBtn = Locator.tagWithText("p", "Cohort 2").parent("div").followingSibling("div").index(0).child("input");
+        waitForElement(removeBtn);
+        scrollIntoView(Locator.tagWithAttribute("input", "value", "Add Cohort"));
+
+        // NOTE: this message seems to be browser-dependent. On Chrome is says 'Please fill out this field', but FF says 'Please enter a number'
+        waitForElement(Locator.tagContainingText("li", "Number of Animals: Please"));
+        waitAndClick(removeBtn);
+
+        // Even though last name is missing, it should still be savable:
+        waitAndClickAndWait(getButton("Save"));
+
+        // Now reopen this form:
+        DataRegionTable dr = new DataRegionTable.DataRegionFinder(getDriver()).waitFor();
+        dr.clickEditRow(0);
+
+        getFormElementByName("investigator-last-name").waitFor(this);
+
+        // TODO: make sure the field values are remembered
+        // including cohort and co-investigator
+
+        // Now fill in the missing field:
+        getFormElementByName("investigator-last-name").setFieldValue(this);
+
+        waitAndClickAndWait(getButton("Submit"));
+
+        dr = new DataRegionTable.DataRegionFinder(getDriver()).waitFor();
+        Assert.assertEquals("submitted", dr.getDataAsText(0, "status"));
+
+        dr.clickEditRow(0);
+        getFormElementByName("investigator-last-name").waitFor(this);
+        waitForElement(getButton("Approve Request"));
+        impersonateRoles("Editor", "MCC Requestor");
+        assertElementNotPresent(getButton("Submit"));
+        assertElementNotPresent(getButton("Approve Request"));
+    }
+
+    private FormElement getFormElementByName(String name)
+    {
+        for (FormElement e : FORM_DATA)
+        {
+            if (name.equals(e.getFieldName()))
+            {
+                return e;
+            }
+        }
+
+        throw new IllegalArgumentException("Unknown field: " + name);
+    }
+
+    private void setFormValues(@Nullable Collection<String> fieldsToSkip)
+    {
+        for (FormElement el : FORM_DATA)
+        {
+            if (fieldsToSkip != null && fieldsToSkip.contains(el.getFieldName()))
+            {
+                continue;
+            }
+
+            el.setFieldValue(this);
+        }
     }
 
     @Override
@@ -202,16 +304,39 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException
     }
 
     @BeforeClass
-    public static void setupProject()
+    public static void setupProject() throws Exception
     {
         MccTest init = (MccTest)getCurrentTest();
         init.doSetup();
     }
 
-    private void doSetup()
+    private void doSetup() throws Exception
     {
+        // NOTE: delay setting module properties until the study exists, since dashboard depends on it
         _containerHelper.createProject(getProjectName());
-        _containerHelper.enableModule("MCC");
+        _containerHelper.enableModules(Arrays.asList("MCC", "Study"));
+
+        importStudy();
+
+        _containerHelper.setFolderType("MCC");
+        setModuleProperties(Arrays.asList(
+                new ModulePropertyValue("MCC", "/", "MCCContainer", "/" + getProjectName()),
+                new ModulePropertyValue("MCC", "/", "MCCRequestContainer", "/" + getProjectName()),
+                new ModulePropertyValue("MCC", "/", "MCCContactUsers", getCurrentUserName()),
+                new ModulePropertyValue("MCC", "/", "MCCRequestNotificationUsers", getCurrentUserName())
+        ));
+    }
+
+    private String getModulePath()
+    {
+        return "server/modules/BimberLabKeyModules/mcc";
+    }
+
+    private void importStudy()
+    {
+        beginAt(WebTestHelper.getBaseURL() + "/mcc/" + getProjectName() + "/importStudy.view");
+        clickButton("OK");
+        waitForPipelineJobsToComplete(1, "Study import", false, MAX_WAIT_SECONDS * 2500);
     }
 
     @Before
@@ -223,7 +348,7 @@ public void preTest()
     @Override
     protected String getProjectName()
     {
-        return "MccTest Project";
+        return "MccTestProject";
     }
 
     @Override
diff --git a/primeseq/src/org/labkey/primeseq/PrimeseqController.java b/primeseq/src/org/labkey/primeseq/PrimeseqController.java
index a757d5643..bfca57b2b 100644
--- a/primeseq/src/org/labkey/primeseq/PrimeseqController.java
+++ b/primeseq/src/org/labkey/primeseq/PrimeseqController.java
@@ -431,7 +431,7 @@ public ApiResponse execute(GetResourceSettingsForJobForm form, BindException err
                 }
             }
 
-            Map<String, Set<String>> valueMap = new HashMap<>();
+            Map<String, Set<Object>> valueMap = new HashMap<>();
             for (Integer jobId : form.getJobRowIds())
             {
                 PipelineStatusFile sf = PipelineService.get().getStatusFile(jobId);
@@ -476,7 +476,7 @@ else if (!sf.lookupContainer().hasPermission(getUser(), ReadPermission.class))
                                 valueMap.put(name, new HashSet<>());
                             }
 
-                            valueMap.get(name).add(String.valueOf(jobParams.get(jsonName)));
+                            valueMap.get(name).add(jobParams.get(jsonName));
                         }
                     }
                 }
diff --git a/primeseq/src/org/labkey/primeseq/pipeline/ExacloudResourceSettings.java b/primeseq/src/org/labkey/primeseq/pipeline/ExacloudResourceSettings.java
index 0562c3b67..438512477 100644
--- a/primeseq/src/org/labkey/primeseq/pipeline/ExacloudResourceSettings.java
+++ b/primeseq/src/org/labkey/primeseq/pipeline/ExacloudResourceSettings.java
@@ -33,9 +33,10 @@ public List<ToolParameterDescriptor> getParams()
                 }}, 1028),
                 ToolParameterDescriptor.create("localSSD", "Request Nodes With SSD Scratch", "If selected, -C ssdscratch will be added to the submit script, which limits to node with faster SSD scratch space.  This might be important for I/O intense jobs.", "checkbox", null, null),
                 ToolParameterDescriptor.create("useLustre", "Use Old Lustre Working Space", "If selected, this job will use the older Lustre working space.", "checkbox", null, null),
-                ToolParameterDescriptor.create("useExclusive", "Use Exclusive Flag", "If selected, the job allocation can not share nodes with other running jobs. This should not be selected unless you are sure about this. It can help protect memory-intensive, long-running jobs.", "checkbox", null, null),
+                //ToolParameterDescriptor.create("useExclusive", "Use Exclusive Flag", "If selected, the job allocation can not share nodes with other running jobs. This should not be selected unless you are sure about this. It can help protect memory-intensive, long-running jobs.", "checkbox", null, null),
                 ToolParameterDescriptor.create("requireInfiniband", "Require InfiniBand", "If selected, this job will be flagged as -C IB to force the node to have InfiniBand.", "checkbox", null, null),
-                ToolParameterDescriptor.create("covidRelated", "COVID Related Job", "If selected, this job will be flagged as --comment=COVID to help ACC track these jobs.", "checkbox", null, null)
+                ToolParameterDescriptor.create("covidRelated", "COVID Related Job", "If selected, this job will be flagged as --comment=COVID to help ACC track these jobs.", "checkbox", null, null),
+                ToolParameterDescriptor.create("gpus", "GPUs", "The number of GPUs requested for this job. If non-zero, the gpu partition will be used.", "ldk-integerfield", null, null)
         );
     }
 
diff --git a/primeseq/src/org/labkey/primeseq/pipeline/SequenceJobResourceAllocator.java b/primeseq/src/org/labkey/primeseq/pipeline/SequenceJobResourceAllocator.java
index 700e7bb0b..82ad8d188 100644
--- a/primeseq/src/org/labkey/primeseq/pipeline/SequenceJobResourceAllocator.java
+++ b/primeseq/src/org/labkey/primeseq/pipeline/SequenceJobResourceAllocator.java
@@ -3,6 +3,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import org.json.JSONObject;
 import org.labkey.api.cluster.ClusterResourceAllocator;
 import org.labkey.api.data.ConvertHelper;
 import org.labkey.api.pipeline.PipelineJob;
@@ -277,6 +278,7 @@ public void addExtraSubmitScriptLines(PipelineJob job, RemoteExecutionEngine eng
             possiblyAddHighIO(job, engine, lines);
             possiblyAddDisk(job, engine, lines);
             possiblyAddSSD(job, engine, lines);
+            possiblyAddGpus(job, engine, lines);
             possiblyAddExclusive(job, engine, lines);
             possiblyAddInfiniband(job, engine, lines);
             possiblyAddCOVID(job, lines);
@@ -372,6 +374,64 @@ private void possiblyAddDisk(PipelineJob job, RemoteExecutionEngine engine, List
         lines.add("#SBATCH --gres=disk:" + val);
     }
 
+    private boolean needsGPUs(PipelineJob job)
+    {
+        Map<String, String> params = ((HasJobParams) job).getJobParams();
+        return hasCellBender(job) || StringUtils.trimToNull(params.get("resourceSettings.resourceSettings.gpus")) != null;
+    }
+
+    private boolean hasCellBender(PipelineJob job)
+    {
+        if (!isSequenceSequenceOutputHandlerTask(job))
+        {
+            return false;
+        }
+
+        File jobXml = new File(job.getLogFile().getParentFile(), FileUtil.getBaseName(job.getLogFile()) + ".job.json.txt");
+        if (jobXml.exists())
+        {
+            try (BufferedReader reader = Readers.getReader(jobXml))
+            {
+                String line;
+                while ((line = reader.readLine()) != null)
+                {
+                    if (line.contains("CellBenderLoupeHandler"))
+                    {
+                        job.getLogger().debug("Forcing the GPU partition for CellBenderLoupeHandler");
+                        return true;
+                    }
+                }
+            }
+            catch (IOException e)
+            {
+                job.getLogger().error(e.getMessage(), e);
+            }
+        }
+
+        return false;
+    }
+
+    private void possiblyAddGpus(PipelineJob job, RemoteExecutionEngine engine, List<String> lines)
+    {
+        Map<String, String> params = ((HasJobParams) job).getJobParams();
+        String val = StringUtils.trimToNull(params.get("resourceSettings.resourceSettings.gpus"));
+        if (val == null && hasCellBender(job))
+        {
+            job.getLogger().debug("Setting GPUs to one since cellbender is used");
+            val = "1";
+        }
+
+        if (val == null)
+        {
+            return;
+        }
+
+        lines.removeIf(line -> line.contains("#SBATCH --gres=gpu:"));
+
+        job.getLogger().debug("Adding gpus: " + val);
+        lines.add("#SBATCH --gres=gpu:" + val);
+    }
+
     private void possiblyAddExclusive(PipelineJob job, RemoteExecutionEngine engine, List<String> lines)
     {
         Map<String, String> params = ((HasJobParams)job).getJobParams();
@@ -504,7 +564,7 @@ private void possiblyAddQOS(PipelineJob job, RemoteExecutionEngine engine, List<
                 }
 
                 //then add
-                lines.add("#SBATCH --partition=exacloud");
+                lines.add("#SBATCH --partition=" + getPartition(job));
                 if (qosName != null)
                 {
                     lines.add("#SBATCH --qos=" + qosName);
@@ -519,11 +579,16 @@ private void possiblyAddQOS(PipelineJob job, RemoteExecutionEngine engine, List<
         else
         {
             //otherwise add defaults
-            lines.add("#SBATCH --partition=exacloud");
+            lines.add("#SBATCH --partition=" + getPartition(job));
             lines.add("#SBATCH --time=" + (time == null ? "0-36" : time));
         }
     }
 
+    private String getPartition(PipelineJob job)
+    {
+        return needsGPUs(job) ? "gpu" : "exacloud";
+    }
+
     private Long getFileSize(PipelineJob job)
     {
         if (_totalFileSize != null)