From 6d9076e3dd584e46a26f038d3cfdfdfd16f2e54f Mon Sep 17 00:00:00 2001
From: Justin Littman <justinlittman@stanford.edu>
Date: Tue, 21 Sep 2021 17:57:05 -0400
Subject: [PATCH] Refactors literal input.

closes #3011
---
 Dockerfile                                    |   10 +-
 README.md                                     |    3 +-
 __tests__/GraphBuilder.test.js                |   89 +
 .../loadResource-ADD_SUBJECT.json             | 2119 ++++++++---------
 .../newResourceCopy-ADD_SUBJECT.json          |    4 +-
 __tests__/__resource_fixtures__/test.json     |    6 +-
 __tests__/components/App.test.js              |    9 +-
 __tests__/feature/editing/addRemove.test.js   |   11 +-
 .../feature/editing/changeGroups.test.js      |    2 -
 .../feature/editing/editingLiteral.test.js    |   87 +-
 __tests__/feature/editing/reordering.test.js  |    4 +-
 .../editing/saveAndCopyResource.test.js       |   16 +-
 .../feature/editing/saveResource.test.js      |    2 +-
 __tests__/feature/loadResource.test.js        |    6 +-
 .../feature/searchAndViewResource.test.js     |   23 +-
 __tests__/reducers/resources.test.js          |  179 +-
 __tests__/selectors/resources.test.js         |    7 +
 __tests__/testUtilities/stateUtils.js         |   11 +
 cypress/integration/end2end.spec.js           |    4 +-
 cypress/integration/leftNav.spec.js           |    9 +-
 package-lock.json                             |   13 +
 package.json                                  |    8 +-
 src/GraphBuilder.js                           |    6 +-
 src/actions/resources.js                      |    9 +
 src/components/editor/GroupChoiceModal.jsx    |    2 +-
 .../editor/{property => inputs}/InputLang.jsx |    0
 src/components/editor/inputs/InputLiteral.jsx |   58 +
 .../editor/inputs/InputLiteralValue.jsx       |  140 ++
 .../editor/inputs/LanguageButton.jsx          |   45 +
 .../editor/inputs/ReadOnlyInputLiteral.jsx    |   25 +
 .../editor/property/InputLiteral.jsx          |  157 --
 .../editor/property/InputLookup.jsx           |    2 +-
 .../editor/property/LanguageButton.jsx        |    2 +-
 .../editor/property/NestedPropertyHeader.jsx  |   23 +-
 .../editor/property/PropertyComponent.jsx     |   44 +-
 src/hooks/useDiacritics.js                    |   25 +-
 src/hooks/useDiacriticsLegacy.js              |   88 +
 src/hooks/useNavigableComponent.js            |   13 +-
 src/reducers/index.js                         |    6 +-
 src/reducers/resources.js                     |  108 +-
 src/selectors/groups.js                       |    5 +-
 src/selectors/resources.js                    |    3 +
 src/utilities/Utilities.js                    |    3 +
 43 files changed, 1869 insertions(+), 1517 deletions(-)
 rename src/components/editor/{property => inputs}/InputLang.jsx (100%)
 create mode 100644 src/components/editor/inputs/InputLiteral.jsx
 create mode 100644 src/components/editor/inputs/InputLiteralValue.jsx
 create mode 100644 src/components/editor/inputs/LanguageButton.jsx
 create mode 100644 src/components/editor/inputs/ReadOnlyInputLiteral.jsx
 delete mode 100644 src/components/editor/property/InputLiteral.jsx
 create mode 100644 src/hooks/useDiacriticsLegacy.js

diff --git a/Dockerfile b/Dockerfile
index 05a85998b..072754ecb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,15 +17,15 @@ ENV HONEYBADGER_API_KEY=$HONEYBADGER_API_KEY
 # Set environment variables from the build args
 ENV INDEX_URL ${INDEX_URL}
 
-# Everything that isn't in .dockerignore ships
-COPY --chown=circleci:circleci . .
-
-RUN mkdir dist
-RUN mkdir node_modules
+COPY --chown=circleci:circleci package.json .
+COPY --chown=circleci:circleci package-lock.json .
 
 # Install dependencies
 RUN npm install --no-optional
 
+# Everything that isn't in .dockerignore ships
+COPY --chown=circleci:circleci . .
+
 # Build the app *within* the container because environment variables are fixed at build-time
 RUN npm run build
 
diff --git a/README.md b/README.md
index 67b9bdfc2..394161f1c 100755
--- a/README.md
+++ b/README.md
@@ -311,11 +311,12 @@ The following are only in the resource subject (that is, the base subject).
   -> property: {<property>},
   literal: <literal>,
   lang: <language for literal>,
+  -> langLabel: <label for language>,
   uri: <uri>,
   label: <label for uri>,
   valueSubjectKey: <key for subject for a nested resource>,
   -> valueSubject: {<subject>}
--> index: <1 based index of the value (relative to siblings)>
+  -> index: <1 based index of the value (relative to siblings)>
   rootResourceKey: <key of root resource that this property is descendant of>
   rootPropertyKey: <key of root property that this subject is part of>
 }
diff --git a/__tests__/GraphBuilder.test.js b/__tests__/GraphBuilder.test.js
index c7dc998f0..a1ee45790 100644
--- a/__tests__/GraphBuilder.test.js
+++ b/__tests__/GraphBuilder.test.js
@@ -346,6 +346,95 @@ _:c14n3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://id.loc.gov/ont
       expect(new GraphBuilder(resource).graph.toCanonical()).toMatch(rdf)
     })
 
+    it("builds a graph ignoring empty literals", () => {
+      const resource = {
+        subjectTemplate: {
+          id: "resourceTemplate:testing:uber1",
+          class: "http://id.loc.gov/ontologies/bibframe/Uber1",
+        },
+        properties: [
+          {
+            propertyTemplate: {
+              uri: "http://id.loc.gov/ontologies/bibframe/uber/template1/property2",
+            },
+            values: [
+              {
+                literal: "literal1",
+                lang: "eng",
+                uri: null,
+                // Value references its property.
+                property: {
+                  propertyTemplate: {
+                    type: "literal",
+                  },
+                },
+              },
+              // Empty
+              {
+                literal: "",
+                uri: null,
+                property: {
+                  propertyTemplate: {
+                    type: "literal",
+                  },
+                },
+              },
+            ],
+          },
+        ],
+      }
+
+      const rdf = `<> <http://id.loc.gov/ontologies/bibframe/uber/template1/property2> "literal1"@eng .
+<> <http://sinopia.io/vocabulary/hasResourceTemplate> "resourceTemplate:testing:uber1" .
+<> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://id.loc.gov/ontologies/bibframe/Uber1> .`
+      expect(new GraphBuilder(resource).graph.toCanonical()).toMatch(rdf)
+    })
+
+    it("builds a graph ignoring empty URIs", () => {
+      const resource = {
+        subjectTemplate: {
+          id: "resourceTemplate:testing:uber1",
+          class: "http://id.loc.gov/ontologies/bibframe/Uber1",
+        },
+        properties: [
+          {
+            propertyTemplate: {
+              uri: "http://id.loc.gov/ontologies/bibframe/uber/template1/property8",
+            },
+            values: [
+              // With label
+              {
+                uri: "http://sinopia.io/uri1",
+                label: "URI1",
+                // Value references its property.
+                property: {
+                  propertyTemplate: {
+                    type: "uri",
+                  },
+                },
+              },
+              // Empty
+              {
+                uri: "",
+                label: null,
+                property: {
+                  propertyTemplate: {
+                    type: "uri",
+                  },
+                },
+              },
+            ],
+          },
+        ],
+      }
+
+      const rdf = `<> <http://id.loc.gov/ontologies/bibframe/uber/template1/property8> <http://sinopia.io/uri1> .
+<> <http://sinopia.io/vocabulary/hasResourceTemplate> "resourceTemplate:testing:uber1" .
+<> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://id.loc.gov/ontologies/bibframe/Uber1> .
+<http://sinopia.io/uri1> <http://www.w3.org/2000/01/rdf-schema#label> "URI1" .`
+      expect(new GraphBuilder(resource).graph.toCanonical()).toMatch(rdf)
+    })
+
     it("builds a graph for suppressible nested resource with uri", () => {
       const resource = {
         subjectTemplate: {
diff --git a/__tests__/__action_fixtures__/loadResource-ADD_SUBJECT.json b/__tests__/__action_fixtures__/loadResource-ADD_SUBJECT.json
index 80318a329..a40f79529 100644
--- a/__tests__/__action_fixtures__/loadResource-ADD_SUBJECT.json
+++ b/__tests__/__action_fixtures__/loadResource-ADD_SUBJECT.json
@@ -1,1157 +1,966 @@
 {
-  "type": "ADD_SUBJECT",
-  "payload": {
-    "key": "abc0",
-    "uri": "http://localhost:3000/resource/c7db5404-7d7d-40ac-b38e-c821d2c3ae3f",
-    "subjectTemplate": {
-      "key": "resourceTemplate:testing:uber1",
-      "uri": "http://localhost:3000/resource/resourceTemplate:testing:uber1",
-      "id": "resourceTemplate:testing:uber1",
-      "class": "http://id.loc.gov/ontologies/bibframe/Uber1",
-      "label": "Uber template1",
-      "author": "Justin Littman",
-      "remark": "Template for testing purposes.",
-      "date": "2020-07-27",
-			"group": "stanford",
-			"editGroups": ["cornell"],
-      "suppressible": false,
-      "propertyTemplateKeys": [
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property1",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property2",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property3",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property4",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property5",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property6",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property7",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property8",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property9",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property10",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property11",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property12",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property13",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property14",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property15",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property16",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property17",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property18",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property19",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/adminMetadata",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/hasInstance",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/instanceOf",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/hasItem",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/itemOf",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property20",
-        "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property21"
-      ],
-      "propertyTemplates": [
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property1",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property1",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property1",
-          "required": false,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "Multiple nested, repeatable resource templates.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [
-            "resourceTemplate:testing:uber2",
-            "resourceTemplate:testing:uber3"
-          ],
-          "authorities": [],
-          "type": "resource",
-          "component": "NestedResource"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property2",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property2",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property2",
-          "required": false,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "A repeatable literal.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [],
-          "type": "literal",
-          "component": "InputLiteral"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property3",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property3",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property3",
-          "required": false,
-          "repeatable": false,
-          "ordered": false,
-          "remark": "Multiple nested, non-repeatable resource templates.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [
-            "resourceTemplate:testing:uber2",
-            "resourceTemplate:testing:uber3"
-          ],
-          "authorities": [],
-          "type": "resource",
-          "component": "NestedResource"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property4",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property4",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property4",
-          "required": true,
-          "repeatable": false,
-          "ordered": false,
-          "remark": "A non-repeatable literal.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [],
-          "type": "literal",
-          "component": "InputLiteral"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property5",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property5",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property5",
-          "required": true,
-          "repeatable": false,
-          "ordered": false,
-          "remark": "A non-repeatable URI.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [],
-          "type": "uri",
-          "component": "InputURI"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property6",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property6",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property6",
-          "required": true,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "A repeatable URI.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [],
-          "type": "uri",
-          "component": "InputURI"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property7",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property7",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property7",
-          "required": false,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "A repeatable literal with defaults.",
-          "remarkUrl": null,
-          "defaults": [
-            {
-              "literal": "Default literal1",
-              "lang": null
-            },
-            {
-              "literal": "Default literal2",
-              "lang": null
-            }
-          ],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [],
-          "type": "literal",
-          "component": "InputLiteral"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property8",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property8",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property8",
-          "required": false,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "A repeatable URI with defaults.",
-          "remarkUrl": null,
-          "defaults": [
-            {
-              "uri": "http://sinopia.io/defaultURI1",
-              "label": "Default URI1"
-            },
-            {
-              "uri": "http://sinopia.io/defaultURI2",
-              "label": null
-            }
-          ],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [],
-          "type": "uri",
-          "component": "InputURI"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property9",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property9",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property9",
-          "required": true,
-          "repeatable": false,
-          "ordered": false,
-          "remark": null,
-          "remarkUrl": "http://access.rdatoolkit.org/2.13.html",
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [],
-          "type": "literal",
-          "component": "InputLiteral"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property10",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property10",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property10",
-          "required": true,
-          "repeatable": false,
-          "ordered": false,
-          "remark": "A non-repeatable LOC lookup.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "https://id.loc.gov/vocabulary/mrectype",
-              "label": "type of recording",
-              "nonldLookup": false
-            }
-          ],
-          "type": "uri",
-          "component": "InputList"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property11",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property11",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property11",
-          "required": true,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "A repeatable LOC lookup.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "https://id.loc.gov/vocabulary/mrectype",
-              "label": "type of recording",
-              "nonldLookup": false
-            }
-          ],
-          "type": "uri",
-          "component": "InputList"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property12",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property12",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property12",
-          "required": true,
-          "repeatable": false,
-          "ordered": false,
-          "remark": "A LOC lookup with multiple authorities.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "https://id.loc.gov/vocabulary/mrectype",
-              "label": "type of recording",
-              "nonldLookup": false
-            },
-            {
-              "uri": "https://id.loc.gov/vocabulary/mrecmedium",
-              "label": "recording medium",
-              "nonldLookup": false
-            }
-          ],
-          "type": "uri",
-          "component": "InputList"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property13",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property13",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property13",
-          "required": true,
-          "repeatable": false,
-          "ordered": false,
-          "remark": "A non-repeatable QA lookup.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:qa:agrovoc",
-              "label": "AGROVOC (QA)",
-              "authority": "agrovoc_ld4l_cache",
-              "subauthority": "",
-              "nonldLookup": false
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property14",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property14",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property14",
-          "required": true,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "A repeatable QA lookup.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:qa:agrovoc",
-              "label": "AGROVOC (QA)",
-              "authority": "agrovoc_ld4l_cache",
-              "subauthority": "",
-              "nonldLookup": false
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property15",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property15",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property15",
-          "required": true,
-          "repeatable": false,
-          "ordered": false,
-          "remark": "A QA lookup with multiple authorities.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:qa:agrovoc",
-              "label": "AGROVOC (QA)",
-              "authority": "agrovoc_ld4l_cache",
-              "subauthority": "",
-              "nonldLookup": false
-            },
-            {
-              "uri": "urn:ld4p:qa:geonames:spot",
-              "label": "GEONAMES spot (QA)",
-              "authority": "geonames_ld4l_cache",
-              "subauthority": "spot",
-              "nonldLookup": false
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property16",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property16",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property16",
-          "required": true,
-          "repeatable": false,
-          "ordered": false,
-          "remark": "A non-repeatable Sinopia lookup.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:sinopia:bibframe:instance",
-              "label": "Sinopia BIBFRAME instance resources",
-              "nonldLookup": false,
-              "type": "http://id.loc.gov/ontologies/bibframe/Instance"
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property17",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property17",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property17",
-          "required": true,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "A repeatable Sinopia lookup.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:sinopia:bibframe:instance",
-              "label": "Sinopia BIBFRAME instance resources",
-              "nonldLookup": false,
-              "type": "http://id.loc.gov/ontologies/bibframe/Instance"
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property18",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property18",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property18",
-          "required": true,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "Mandatory nested resource templates.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [
-            "resourceTemplate:testing:uber4"
-          ],
-          "authorities": [],
-          "type": "resource",
-          "component": "NestedResource"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property19",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property19",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property19",
-          "required": false,
-          "repeatable": true,
-          "ordered": true,
-          "remark": "Ordered nested resource templates.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [
-            "resourceTemplate:testing:uber4"
-          ],
-          "authorities": [],
-          "type": "resource",
-          "component": "NestedResource"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/adminMetadata",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Admin metadata",
-          "uri": "http://id.loc.gov/ontologies/bibframe/adminMetadata",
-          "required": false,
-          "repeatable": false,
-          "ordered": false,
-          "remark": null,
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:sinopia:bibframe:adminMetadata",
-              "label": "Sinopia BIBFRAME admin metadata resources",
-              "nonldLookup": false,
-              "type": "http://id.loc.gov/ontologies/bibframe/AdminMetadata"
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/hasInstance",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Has instance",
-          "uri": "http://id.loc.gov/ontologies/bibframe/hasInstance",
-          "required": false,
-          "repeatable": true,
-          "ordered": false,
-          "remark": null,
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:sinopia:bibframe:instance",
-              "label": "Sinopia BIBFRAME instance resources",
-              "nonldLookup": false,
-              "type": "http://id.loc.gov/ontologies/bibframe/Instance"
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/instanceOf",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Instance of",
-          "uri": "http://id.loc.gov/ontologies/bibframe/instanceOf",
-          "required": false,
-          "repeatable": true,
-          "ordered": false,
-          "remark": null,
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:sinopia:bibframe:work",
-              "label": "Sinopia BIBFRAME work resources",
-              "nonldLookup": false,
-              "type": "http://id.loc.gov/ontologies/bibframe/Work"
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/hasItem",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Has item",
-          "uri": "http://id.loc.gov/ontologies/bibframe/hasItem",
-          "required": false,
-          "repeatable": true,
-          "ordered": false,
-          "remark": null,
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:sinopia:bibframe:item",
-              "label": "Sinopia BIBFRAME item resources",
-              "nonldLookup": false,
-              "type": "http://id.loc.gov/ontologies/bibframe/Item"
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/itemOf",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Item of",
-          "uri": "http://id.loc.gov/ontologies/bibframe/itemOf",
-          "required": false,
-          "repeatable": true,
-          "ordered": false,
-          "remark": null,
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [
-            {
-              "uri": "urn:ld4p:sinopia:bibframe:instance",
-              "label": "Sinopia BIBFRAME instance resources",
-              "nonldLookup": false,
-              "type": "http://id.loc.gov/ontologies/bibframe/Instance"
-            }
-          ],
-          "type": "uri",
-          "component": "InputLookup"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property20",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property20",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property20",
-          "required": true,
-          "repeatable": false,
-          "ordered": false,
-          "remark": "A required, repeatable literal with defaults.",
-          "remarkUrl": null,
-          "defaults": [
-            {
-              "literal": "Default required literal1",
-              "lang": null
-            },
-            {
-              "literal": "Default required literal2",
-              "lang": null
-            }
-          ],
-          "valueSubjectTemplateKeys": [],
-          "authorities": [],
-          "type": "literal",
-          "component": "InputLiteral"
-        },
-        {
-          "key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property21",
-          "subjectTemplateKey": "resourceTemplate:testing:uber1",
-          "label": "Uber template1, property21",
-          "uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property21",
-          "required": false,
-          "repeatable": true,
-          "ordered": false,
-          "remark": "Nested, repeatable, suppressible resource template.",
-          "remarkUrl": null,
-          "defaults": [],
-          "valueSubjectTemplateKeys": [
-            "resourceTemplate:testing:uber5"
-          ],
-          "authorities": [],
-          "type": "resource",
-          "component": "NestedResource"
-        }
-      ]
-    },
-    "properties": [
-      {
-        "key": "abc1",
-        "values": [
-          {
-            "key": "abc64",
-            "literal": null,
-            "lang": null,
-            "uri": null,
-            "label": null,
-            "valueSubject": {
-              "key": "abc44",
-              "uri": null,
-              "subjectTemplate": {
-                "key": "resourceTemplate:testing:uber2",
-                "uri": "http://localhost:3000/resource/resourceTemplate:testing:uber2",
-                "id": "resourceTemplate:testing:uber2",
-                "class": "http://id.loc.gov/ontologies/bibframe/Uber2",
-                "label": "Uber template2",
-                "author": null,
-                "remark": "Template for testing purposes with single repeatable literal.",
-                "date": null,
-								"group": "stanford",
-								"editGroups": ["cornell"],
-                "suppressible": false,
-                "propertyTemplateKeys": [
-                  "resourceTemplate:testing:uber2 > http://id.loc.gov/ontologies/bibframe/uber/template2/property1"
-                ],
-                "propertyTemplates": [
-                  {
-                    "key": "resourceTemplate:testing:uber2 > http://id.loc.gov/ontologies/bibframe/uber/template2/property1",
-                    "subjectTemplateKey": "resourceTemplate:testing:uber2",
-                    "label": "Uber template2, property1",
-                    "uri": "http://id.loc.gov/ontologies/bibframe/uber/template2/property1",
-                    "required": false,
-                    "repeatable": true,
-                    "ordered": false,
-                    "remark": "A repeatable literal",
-                    "remarkUrl": null,
-                    "defaults": [],
-                    "valueSubjectTemplateKeys": [],
-                    "authorities": [],
-                    "type": "literal",
-                    "component": "InputLiteral"
-                  }
-                ]
-              },
-              "properties": [
-                {
-                  "key": "abc51",
-                  "values": [
-                    {
-                      "key": "abc58",
-                      "literal": "Uber template2, property1",
-                      "lang": "eng",
-                      "uri": null,
-                      "label": null,
-                      "valueSubject": null
-                    }
-                  ],
-                  "show": false
-                }
-              ]
-            }
-          },
-          {
-            "key": "abc65",
-            "literal": null,
-            "lang": null,
-            "uri": null,
-            "label": null,
-            "valueSubject": {
-              "key": "abc45",
-              "uri": null,
-              "properties": [
-                {
-                  "key": "abc52",
-                  "values": [
-                    {
-                      "key": "abc59",
-                      "literal": "Uber template2, property1b",
-                      "lang": "eng",
-                      "uri": null,
-                      "label": null,
-                      "valueSubject": null
-                    }
-                  ],
-                  "show": false
-                }
-              ]
-            }
-          },
-          {
-            "key": "abc63",
-            "literal": null,
-            "lang": null,
-            "uri": null,
-            "label": null,
-            "valueSubject": {
-              "key": "abc43",
-              "uri": null,
-              "subjectTemplate": {
-                "key": "resourceTemplate:testing:uber3",
-                "uri": "http://localhost:3000/resource/resourceTemplate:testing:uber3",
-                "id": "resourceTemplate:testing:uber3",
-                "class": "http://id.loc.gov/ontologies/bibframe/Uber3",
-                "label": "Uber template3",
-                "author": null,
-                "remark": "Template for testing purposes with multiple literal.",
-                "date": null,
-								"group": "stanford",
-								"editGroups": ["cornell"],
-                "suppressible": false,
-                "propertyTemplateKeys": [
-                  "resourceTemplate:testing:uber3 > http://id.loc.gov/ontologies/bibframe/uber/template3/property1",
-                  "resourceTemplate:testing:uber3 > http://id.loc.gov/ontologies/bibframe/uber/template3/property2"
-                ],
-                "propertyTemplates": [
-                  {
-                    "key": "resourceTemplate:testing:uber3 > http://id.loc.gov/ontologies/bibframe/uber/template3/property1",
-                    "subjectTemplateKey": "resourceTemplate:testing:uber3",
-                    "label": "Uber template3, property1",
-                    "uri": "http://id.loc.gov/ontologies/bibframe/uber/template3/property1",
-                    "required": false,
-                    "repeatable": true,
-                    "ordered": false,
-                    "remark": "A literal",
-                    "remarkUrl": null,
-                    "defaults": [],
-                    "valueSubjectTemplateKeys": [],
-                    "authorities": [],
-                    "type": "literal",
-                    "component": "InputLiteral"
-                  },
-                  {
-                    "key": "resourceTemplate:testing:uber3 > http://id.loc.gov/ontologies/bibframe/uber/template3/property2",
-                    "subjectTemplateKey": "resourceTemplate:testing:uber3",
-                    "label": "Uber template3, property2",
-                    "uri": "http://id.loc.gov/ontologies/bibframe/uber/template3/property2",
-                    "required": false,
-                    "repeatable": true,
-                    "ordered": false,
-                    "remark": null,
-                    "remarkUrl": "http://access.rdatoolkit.org/1.0.html",
-                    "defaults": [],
-                    "valueSubjectTemplateKeys": [],
-                    "authorities": [],
-                    "type": "literal",
-                    "component": "InputLiteral"
-                  }
-                ]
-              },
-              "properties": [
-                {
-                  "key": "abc49",
-                  "values": [
-                    {
-                      "key": "abc56",
-                      "literal": "Uber template3, property1",
-                      "lang": "eng",
-                      "uri": null,
-                      "label": null,
-                      "valueSubject": null
-                    }
-                  ],
-                  "show": false
-                },
-                {
-                  "key": "abc50",
-                  "values": [
-                    {
-                      "key": "abc57",
-                      "literal": "Uber template3, property2",
-                      "lang": "eng",
-                      "uri": null,
-                      "label": null,
-                      "valueSubject": null
-                    }
-                  ],
-                  "show": false
-                }
-              ]
-            }
-          }
-        ],
-        "show": false
-      },
-      {
-        "key": "abc2",
-        "values": [
-          {
-            "key": "abc30",
-            "literal": "Uber template1, property2",
-            "lang": "eng",
-            "uri": null,
-            "label": null,
-            "valueSubject": null
-          }
-        ],
-        "show": false
-      },
-      {
-        "key": "abc3",
-        "values": null,
-        "show": false
-      },
-      {
-        "key": "abc4",
-        "values": [
-          {
-            "key": "abc31",
-            "literal": "Uber template1, property4",
-            "lang": "eng",
-            "uri": null,
-            "label": null,
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc5",
-        "values": [
-          {
-            "key": "abc32",
-            "literal": null,
-            "lang": null,
-            "uri": "ubertemplate1:property5",
-            "label": "ubertemplate1:property5",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc6",
-        "values": [
-          {
-            "key": "abc33",
-            "literal": null,
-            "lang": null,
-            "uri": "ubertemplate1:property6",
-            "label": "ubertemplate1:property6",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc7",
-        "values": null,
-        "show": false
-      },
-      {
-        "key": "abc8",
-        "values": null,
-        "show": false
-      },
-      {
-        "key": "abc9",
-        "values": [
-          {
-            "key": "abc34",
-            "literal": "Uber template1, property9",
-            "lang": "eng",
-            "uri": null,
-            "label": null,
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc10",
-        "values": [
-          {
-            "key": "abc35",
-            "literal": null,
-            "lang": null,
-            "uri": "http://id.loc.gov/vocabulary/mrectype/analog",
-            "label": "analog",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc11",
-        "values": [
-          {
-            "key": "abc36",
-            "literal": null,
-            "lang": null,
-            "uri": "http://id.loc.gov/vocabulary/mrectype/digital",
-            "label": "digital",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc12",
-        "values": [
-          {
-            "key": "abc37",
-            "literal": null,
-            "lang": null,
-            "uri": "http://id.loc.gov/vocabulary/mrecmedium/mag",
-            "label": "magnetic",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc13",
-        "values": [
-          {
-            "key": "abc38",
-            "literal": null,
-            "lang": null,
-            "uri": "http://aims.fao.org/aos/agrovoc/c_35856",
-            "label": "summer squash",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc14",
-        "values": [
-          {
-            "key": "abc39",
-            "literal": null,
-            "lang": null,
-            "uri": "http://aims.fao.org/aos/agrovoc/c_331388",
-            "label": "corn sheller",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc15",
-        "values": [
-          {
-            "key": "abc40",
-            "literal": null,
-            "lang": null,
-            "uri": "http://sws.geonames.org/5098279/",
-            "label": "Freehold Borough High School (US)",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc16",
-        "values": [
-          {
-            "key": "abc41",
-            "literal": null,
-            "lang": null,
-            "uri": "http://localhost:3000/resource/c7db5404-7d7d-40ac-b38e-c821d2c3ae3f",
-            "label": "foo",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc17",
-        "values": [
-          {
-            "key": "abc42",
-            "literal": null,
-            "lang": null,
-            "uri": "http://localhost:3000/resource/c7db5404-7d7d-40ac-b38e-c821d2c3ae3f",
-            "label": "foo",
-            "valueSubject": null
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc18",
-        "values": [
-          {
-            "key": "abc66",
-            "literal": null,
-            "lang": null,
-            "uri": null,
-            "label": null,
-            "valueSubject": {
-              "key": "abc46",
-              "uri": null,
-              "subjectTemplate": {
-                "key": "resourceTemplate:testing:uber4",
-                "uri": "http://localhost:3000/resource/resourceTemplate:testing:uber4",
-                "id": "resourceTemplate:testing:uber4",
-                "class": "http://id.loc.gov/ontologies/bibframe/Uber4",
-                "label": "Uber template4",
-                "author": null,
-                "remark": "Template for testing purposes with single repeatable, required literal.",
-                "date": null,
-								"group": "stanford",
-								"editGroups": ["cornell"],
-                "suppressible": false,
-                "propertyTemplateKeys": [
-                  "resourceTemplate:testing:uber4 > http://id.loc.gov/ontologies/bibframe/uber/template4/property1"
-                ],
-                "propertyTemplates": [
-                  {
-                    "key": "resourceTemplate:testing:uber4 > http://id.loc.gov/ontologies/bibframe/uber/template4/property1",
-                    "subjectTemplateKey": "resourceTemplate:testing:uber4",
-                    "label": "Uber template4, property1",
-                    "uri": "http://id.loc.gov/ontologies/bibframe/uber/template4/property1",
-                    "required": true,
-                    "repeatable": true,
-                    "ordered": false,
-                    "remark": "A repeatable, required literal",
-                    "remarkUrl": null,
-                    "defaults": [],
-                    "valueSubjectTemplateKeys": [],
-                    "authorities": [],
-                    "type": "literal",
-                    "component": "InputLiteral"
-                  }
-                ]
-              },
-              "properties": [
-                {
-                  "key": "abc53",
-                  "values": [
-                    {
-                      "key": "abc60",
-                      "literal": "Uber template4, property1",
-                      "lang": "eng",
-                      "uri": null,
-                      "label": null,
-                      "valueSubject": null
-                    }
-                  ],
-                  "show": true
-                }
-              ]
-            }
-          }
-        ],
-        "show": true
-      },
-      {
-        "key": "abc20",
-        "values": [
-          {
-            "key": "abc67",
-            "literal": null,
-            "lang": null,
-            "uri": null,
-            "label": null,
-            "valueSubject": {
-              "key": "abc47",
-              "uri": null,
-              "properties": [
-                {
-                  "key": "abc54",
-                  "values": [
-                    {
-                      "key": "abc61",
-                      "literal": "Uber template4, property1, first",
-                      "lang": "eng",
-                      "uri": null,
-                      "label": null,
-                      "valueSubject": null
-                    }
-                  ],
-                  "show": true
-                }
-              ]
-            }
-          },
-          {
-            "key": "abc68",
-            "literal": null,
-            "lang": null,
-            "uri": null,
-            "label": null,
-            "valueSubject": {
-              "key": "abc48",
-              "uri": null,
-              "properties": [
-                {
-                  "key": "abc55",
-                  "values": [
-                    {
-                      "key": "abc62",
-                      "literal": "Uber template4, property1, second",
-                      "lang": "eng",
-                      "uri": null,
-                      "label": null,
-                      "valueSubject": null
-                    }
-                  ],
-                  "show": true
-                }
-              ]
-            }
-          }
-        ],
-        "show": false
-      },
-      {
-        "key": "abc21",
-        "values": null,
-        "show": false
-      },
-      {
-        "key": "abc22",
-        "values": null,
-        "show": false
-      },
-      {
-        "key": "abc23",
-        "values": null,
-        "show": false
-      },
-      {
-        "key": "abc24",
-        "values": null,
-        "show": false
-      },
-      {
-        "key": "abc25",
-        "values": null,
-        "show": false
-      },
-      {
-        "key": "abc26",
-        "values": [],
-        "show": true
-      },
-      {
-        "key": "abc27",
-        "values": null,
-        "show": false
-      }
-    ],
-    "group": "stanford",
-    "editGroups": ["cornell"]
-  }
+	"type": "ADD_SUBJECT",
+	"payload": {
+		"key": "abc0",
+		"uri": "http://localhost:3000/resource/c7db5404-7d7d-40ac-b38e-c821d2c3ae3f",
+		"subjectTemplate": {
+			"key": "resourceTemplate:testing:uber1",
+			"uri": "http://localhost:3000/resource/resourceTemplate:testing:uber1",
+			"id": "resourceTemplate:testing:uber1",
+			"class": "http://id.loc.gov/ontologies/bibframe/Uber1",
+			"label": "Uber template1",
+			"author": "Justin Littman",
+			"remark": "Template for testing purposes.",
+			"date": "2020-07-27",
+      "group": "stanford",
+      "editGroups": [
+        "cornell"
+      ],        
+			"suppressible": false,
+			"propertyTemplateKeys": ["resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property1", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property2", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property3", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property4", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property5", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property6", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property7", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property8", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property9", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property10", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property11", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property12", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property13", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property14", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property15", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property16", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property17", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property18", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property19", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/adminMetadata", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/hasInstance", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/instanceOf", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/hasItem", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/itemOf", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property20", "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property21"],
+			"propertyTemplates": [{
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property1",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property1",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property1",
+				"required": false,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "Multiple nested, repeatable resource templates.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": ["resourceTemplate:testing:uber2", "resourceTemplate:testing:uber3"],
+				"authorities": [],
+				"type": "resource",
+				"component": "NestedResource"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property2",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property2",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property2",
+				"required": false,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "A repeatable literal.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [],
+				"type": "literal",
+				"component": "InputLiteral"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property3",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property3",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property3",
+				"required": false,
+				"repeatable": false,
+				"ordered": false,
+				"remark": "Multiple nested, non-repeatable resource templates.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": ["resourceTemplate:testing:uber2", "resourceTemplate:testing:uber3"],
+				"authorities": [],
+				"type": "resource",
+				"component": "NestedResource"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property4",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property4",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property4",
+				"required": true,
+				"repeatable": false,
+				"ordered": false,
+				"remark": "A non-repeatable literal.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [],
+				"type": "literal",
+				"component": "InputLiteral"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property5",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property5",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property5",
+				"required": true,
+				"repeatable": false,
+				"ordered": false,
+				"remark": "A non-repeatable URI.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [],
+				"type": "uri",
+				"component": "InputURI"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property6",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property6",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property6",
+				"required": true,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "A repeatable URI.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [],
+				"type": "uri",
+				"component": "InputURI"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property7",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property7",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property7",
+				"required": false,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "A repeatable literal with defaults.",
+				"remarkUrl": null,
+				"defaults": [{
+					"literal": "Default literal1",
+					"lang": null
+				}, {
+					"literal": "Default literal2",
+					"lang": null
+				}],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [],
+				"type": "literal",
+				"component": "InputLiteral"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property8",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property8",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property8",
+				"required": false,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "A repeatable URI with defaults.",
+				"remarkUrl": null,
+				"defaults": [{
+					"uri": "http://sinopia.io/defaultURI1",
+					"label": "Default URI1"
+				}, {
+					"uri": "http://sinopia.io/defaultURI2",
+					"label": null
+				}],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [],
+				"type": "uri",
+				"component": "InputURI"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property9",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property9",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property9",
+				"required": true,
+				"repeatable": false,
+				"ordered": false,
+				"remark": null,
+				"remarkUrl": "http://access.rdatoolkit.org/2.13.html",
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [],
+				"type": "literal",
+				"component": "InputLiteral"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property10",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property10",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property10",
+				"required": true,
+				"repeatable": false,
+				"ordered": false,
+				"remark": "A non-repeatable LOC lookup.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "https://id.loc.gov/vocabulary/mrectype",
+					"label": "type of recording",
+					"nonldLookup": false
+				}],
+				"type": "uri",
+				"component": "InputList"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property11",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property11",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property11",
+				"required": true,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "A repeatable LOC lookup.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "https://id.loc.gov/vocabulary/mrectype",
+					"label": "type of recording",
+					"nonldLookup": false
+				}],
+				"type": "uri",
+				"component": "InputList"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property12",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property12",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property12",
+				"required": true,
+				"repeatable": false,
+				"ordered": false,
+				"remark": "A LOC lookup with multiple authorities.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "https://id.loc.gov/vocabulary/mrectype",
+					"label": "type of recording",
+					"nonldLookup": false
+				}, {
+					"uri": "https://id.loc.gov/vocabulary/mrecmedium",
+					"label": "recording medium",
+					"nonldLookup": false
+				}],
+				"type": "uri",
+				"component": "InputList"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property13",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property13",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property13",
+				"required": true,
+				"repeatable": false,
+				"ordered": false,
+				"remark": "A non-repeatable QA lookup.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:qa:agrovoc",
+					"label": "AGROVOC (QA)",
+					"authority": "agrovoc_ld4l_cache",
+					"subauthority": "",
+					"nonldLookup": false
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property14",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property14",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property14",
+				"required": true,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "A repeatable QA lookup.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:qa:agrovoc",
+					"label": "AGROVOC (QA)",
+					"authority": "agrovoc_ld4l_cache",
+					"subauthority": "",
+					"nonldLookup": false
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property15",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property15",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property15",
+				"required": true,
+				"repeatable": false,
+				"ordered": false,
+				"remark": "A QA lookup with multiple authorities.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:qa:agrovoc",
+					"label": "AGROVOC (QA)",
+					"authority": "agrovoc_ld4l_cache",
+					"subauthority": "",
+					"nonldLookup": false
+				}, {
+					"uri": "urn:ld4p:qa:geonames:spot",
+					"label": "GEONAMES spot (QA)",
+					"authority": "geonames_ld4l_cache",
+					"subauthority": "spot",
+					"nonldLookup": false
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property16",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property16",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property16",
+				"required": true,
+				"repeatable": false,
+				"ordered": false,
+				"remark": "A non-repeatable Sinopia lookup.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:sinopia:bibframe:instance",
+					"label": "Sinopia BIBFRAME instance resources",
+					"nonldLookup": false,
+					"type": "http://id.loc.gov/ontologies/bibframe/Instance"
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property17",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property17",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property17",
+				"required": true,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "A repeatable Sinopia lookup.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:sinopia:bibframe:instance",
+					"label": "Sinopia BIBFRAME instance resources",
+					"nonldLookup": false,
+					"type": "http://id.loc.gov/ontologies/bibframe/Instance"
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property18",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property18",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property18",
+				"required": true,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "Mandatory nested resource templates.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": ["resourceTemplate:testing:uber4"],
+				"authorities": [],
+				"type": "resource",
+				"component": "NestedResource"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property19",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property19",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property19",
+				"required": false,
+				"repeatable": true,
+				"ordered": true,
+				"remark": "Ordered nested resource templates.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": ["resourceTemplate:testing:uber4"],
+				"authorities": [],
+				"type": "resource",
+				"component": "NestedResource"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/adminMetadata",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Admin metadata",
+				"uri": "http://id.loc.gov/ontologies/bibframe/adminMetadata",
+				"required": false,
+				"repeatable": false,
+				"ordered": false,
+				"remark": null,
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:sinopia:bibframe:adminMetadata",
+					"label": "Sinopia BIBFRAME admin metadata resources",
+					"nonldLookup": false,
+					"type": "http://id.loc.gov/ontologies/bibframe/AdminMetadata"
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/hasInstance",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Has instance",
+				"uri": "http://id.loc.gov/ontologies/bibframe/hasInstance",
+				"required": false,
+				"repeatable": true,
+				"ordered": false,
+				"remark": null,
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:sinopia:bibframe:instance",
+					"label": "Sinopia BIBFRAME instance resources",
+					"nonldLookup": false,
+					"type": "http://id.loc.gov/ontologies/bibframe/Instance"
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/instanceOf",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Instance of",
+				"uri": "http://id.loc.gov/ontologies/bibframe/instanceOf",
+				"required": false,
+				"repeatable": true,
+				"ordered": false,
+				"remark": null,
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:sinopia:bibframe:work",
+					"label": "Sinopia BIBFRAME work resources",
+					"nonldLookup": false,
+					"type": "http://id.loc.gov/ontologies/bibframe/Work"
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/hasItem",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Has item",
+				"uri": "http://id.loc.gov/ontologies/bibframe/hasItem",
+				"required": false,
+				"repeatable": true,
+				"ordered": false,
+				"remark": null,
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:sinopia:bibframe:item",
+					"label": "Sinopia BIBFRAME item resources",
+					"nonldLookup": false,
+					"type": "http://id.loc.gov/ontologies/bibframe/Item"
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/itemOf",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Item of",
+				"uri": "http://id.loc.gov/ontologies/bibframe/itemOf",
+				"required": false,
+				"repeatable": true,
+				"ordered": false,
+				"remark": null,
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [{
+					"uri": "urn:ld4p:sinopia:bibframe:instance",
+					"label": "Sinopia BIBFRAME instance resources",
+					"nonldLookup": false,
+					"type": "http://id.loc.gov/ontologies/bibframe/Instance"
+				}],
+				"type": "uri",
+				"component": "InputLookup"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property20",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property20",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property20",
+				"required": true,
+				"repeatable": false,
+				"ordered": false,
+				"remark": "A required, repeatable literal with defaults.",
+				"remarkUrl": null,
+				"defaults": [{
+					"literal": "Default required literal1",
+					"lang": null
+				}, {
+					"literal": "Default required literal2",
+					"lang": null
+				}],
+				"valueSubjectTemplateKeys": [],
+				"authorities": [],
+				"type": "literal",
+				"component": "InputLiteral"
+			}, {
+				"key": "resourceTemplate:testing:uber1 > http://id.loc.gov/ontologies/bibframe/uber/template1/property21",
+				"subjectTemplateKey": "resourceTemplate:testing:uber1",
+				"label": "Uber template1, property21",
+				"uri": "http://id.loc.gov/ontologies/bibframe/uber/template1/property21",
+				"required": false,
+				"repeatable": true,
+				"ordered": false,
+				"remark": "Nested, repeatable, suppressible resource template.",
+				"remarkUrl": null,
+				"defaults": [],
+				"valueSubjectTemplateKeys": ["resourceTemplate:testing:uber5"],
+				"authorities": [],
+				"type": "resource",
+				"component": "NestedResource"
+			}]
+		},
+		"properties": [{
+			"key": "abc1",
+			"values": [{
+				"key": "abc65",
+				"literal": null,
+				"lang": null,
+				"uri": null,
+				"label": null,
+				"valueSubject": {
+					"key": "abc44",
+					"uri": null,
+					"subjectTemplate": {
+						"key": "resourceTemplate:testing:uber2",
+						"uri": "http://localhost:3000/resource/resourceTemplate:testing:uber2",
+						"id": "resourceTemplate:testing:uber2",
+						"class": "http://id.loc.gov/ontologies/bibframe/Uber2",
+						"label": "Uber template2",
+						"author": null,
+						"remark": "Template for testing purposes with single repeatable literal.",
+						"date": null,
+            "group": "stanford",
+            "editGroups": [
+              "cornell"
+            ],      
+						"suppressible": false,
+						"propertyTemplateKeys": ["resourceTemplate:testing:uber2 > http://id.loc.gov/ontologies/bibframe/uber/template2/property1"],
+						"propertyTemplates": [{
+							"key": "resourceTemplate:testing:uber2 > http://id.loc.gov/ontologies/bibframe/uber/template2/property1",
+							"subjectTemplateKey": "resourceTemplate:testing:uber2",
+							"label": "Uber template2, property1",
+							"uri": "http://id.loc.gov/ontologies/bibframe/uber/template2/property1",
+							"required": false,
+							"repeatable": true,
+							"ordered": false,
+							"remark": "A repeatable literal",
+							"remarkUrl": null,
+							"defaults": [],
+							"valueSubjectTemplateKeys": [],
+							"authorities": [],
+							"type": "literal",
+							"component": "InputLiteral"
+						}]
+					},
+					"properties": [{
+						"key": "abc51",
+						"values": [{
+							"key": "abc59",
+							"literal": "Uber template2, property1",
+							"lang": "eng",
+							"uri": null,
+							"label": null,
+							"valueSubject": null
+						}],
+						"show": false
+					}]
+				}
+			}, {
+				"key": "abc66",
+				"literal": null,
+				"lang": null,
+				"uri": null,
+				"label": null,
+				"valueSubject": {
+					"key": "abc45",
+					"uri": null,
+					"properties": [{
+						"key": "abc52",
+						"values": [{
+							"key": "abc60",
+							"literal": "Uber template2, property1b",
+							"lang": "eng",
+							"uri": null,
+							"label": null,
+							"valueSubject": null
+						}],
+						"show": false
+					}]
+				}
+			}, {
+				"key": "abc64",
+				"literal": null,
+				"lang": null,
+				"uri": null,
+				"label": null,
+				"valueSubject": {
+					"key": "abc43",
+					"uri": null,
+					"subjectTemplate": {
+						"key": "resourceTemplate:testing:uber3",
+						"uri": "http://localhost:3000/resource/resourceTemplate:testing:uber3",
+						"id": "resourceTemplate:testing:uber3",
+						"class": "http://id.loc.gov/ontologies/bibframe/Uber3",
+						"label": "Uber template3",
+						"author": null,
+						"remark": "Template for testing purposes with multiple literal.",
+						"date": null,
+            "group": "stanford",
+            "editGroups": [
+              "cornell"
+            ],      
+						"suppressible": false,
+						"propertyTemplateKeys": ["resourceTemplate:testing:uber3 > http://id.loc.gov/ontologies/bibframe/uber/template3/property1", "resourceTemplate:testing:uber3 > http://id.loc.gov/ontologies/bibframe/uber/template3/property2"],
+						"propertyTemplates": [{
+							"key": "resourceTemplate:testing:uber3 > http://id.loc.gov/ontologies/bibframe/uber/template3/property1",
+							"subjectTemplateKey": "resourceTemplate:testing:uber3",
+							"label": "Uber template3, property1",
+							"uri": "http://id.loc.gov/ontologies/bibframe/uber/template3/property1",
+							"required": false,
+							"repeatable": true,
+							"ordered": false,
+							"remark": "A literal",
+							"remarkUrl": null,
+							"defaults": [],
+							"valueSubjectTemplateKeys": [],
+							"authorities": [],
+							"type": "literal",
+							"component": "InputLiteral"
+						}, {
+							"key": "resourceTemplate:testing:uber3 > http://id.loc.gov/ontologies/bibframe/uber/template3/property2",
+							"subjectTemplateKey": "resourceTemplate:testing:uber3",
+							"label": "Uber template3, property2",
+							"uri": "http://id.loc.gov/ontologies/bibframe/uber/template3/property2",
+							"required": false,
+							"repeatable": true,
+							"ordered": false,
+							"remark": null,
+							"remarkUrl": "http://access.rdatoolkit.org/1.0.html",
+							"defaults": [],
+							"valueSubjectTemplateKeys": [],
+							"authorities": [],
+							"type": "literal",
+							"component": "InputLiteral"
+						}]
+					},
+					"properties": [{
+						"key": "abc49",
+						"values": [{
+							"key": "abc56",
+							"literal": "Uber template3, property1",
+							"lang": "eng",
+							"uri": null,
+							"label": null,
+							"valueSubject": null
+						}],
+						"show": false
+					}, {
+						"key": "abc50",
+						"values": [{
+							"key": "abc57",
+							"literal": "Uber template3, property2, value1",
+							"lang": "eng",
+							"uri": null,
+							"label": null,
+							"valueSubject": null
+						}, {
+							"key": "abc58",
+							"literal": "Uber template3, property2, value2",
+							"lang": "eng",
+							"uri": null,
+							"label": null,
+							"valueSubject": null
+						}],
+						"show": false
+					}]
+				}
+			}],
+			"show": false
+		}, {
+			"key": "abc2",
+			"values": [{
+				"key": "abc30",
+				"literal": "Uber template1, property2",
+				"lang": "eng",
+				"uri": null,
+				"label": null,
+				"valueSubject": null
+			}],
+			"show": false
+		}, {
+			"key": "abc3",
+			"values": null,
+			"show": false
+		}, {
+			"key": "abc4",
+			"values": [{
+				"key": "abc31",
+				"literal": "Uber template1, property4",
+				"lang": "eng",
+				"uri": null,
+				"label": null,
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc5",
+			"values": [{
+				"key": "abc32",
+				"literal": null,
+				"lang": null,
+				"uri": "ubertemplate1:property5",
+				"label": "ubertemplate1:property5",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc6",
+			"values": [{
+				"key": "abc33",
+				"literal": null,
+				"lang": null,
+				"uri": "ubertemplate1:property6",
+				"label": "ubertemplate1:property6",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc7",
+			"values": null,
+			"show": false
+		}, {
+			"key": "abc8",
+			"values": null,
+			"show": false
+		}, {
+			"key": "abc9",
+			"values": [{
+				"key": "abc34",
+				"literal": "Uber template1, property9",
+				"lang": "eng",
+				"uri": null,
+				"label": null,
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc10",
+			"values": [{
+				"key": "abc35",
+				"literal": null,
+				"lang": null,
+				"uri": "http://id.loc.gov/vocabulary/mrectype/analog",
+				"label": "analog",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc11",
+			"values": [{
+				"key": "abc36",
+				"literal": null,
+				"lang": null,
+				"uri": "http://id.loc.gov/vocabulary/mrectype/digital",
+				"label": "digital",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc12",
+			"values": [{
+				"key": "abc37",
+				"literal": null,
+				"lang": null,
+				"uri": "http://id.loc.gov/vocabulary/mrecmedium/mag",
+				"label": "magnetic",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc13",
+			"values": [{
+				"key": "abc38",
+				"literal": null,
+				"lang": null,
+				"uri": "http://aims.fao.org/aos/agrovoc/c_35856",
+				"label": "summer squash",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc14",
+			"values": [{
+				"key": "abc39",
+				"literal": null,
+				"lang": null,
+				"uri": "http://aims.fao.org/aos/agrovoc/c_331388",
+				"label": "corn sheller",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc15",
+			"values": [{
+				"key": "abc40",
+				"literal": null,
+				"lang": null,
+				"uri": "http://sws.geonames.org/5098279/",
+				"label": "Freehold Borough High School (US)",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc16",
+			"values": [{
+				"key": "abc41",
+				"literal": null,
+				"lang": null,
+				"uri": "http://localhost:3000/resource/c7db5404-7d7d-40ac-b38e-c821d2c3ae3f",
+				"label": "foo",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc17",
+			"values": [{
+				"key": "abc42",
+				"literal": null,
+				"lang": null,
+				"uri": "http://localhost:3000/resource/c7db5404-7d7d-40ac-b38e-c821d2c3ae3f",
+				"label": "foo",
+				"valueSubject": null
+			}],
+			"show": true
+		}, {
+			"key": "abc18",
+			"values": [{
+				"key": "abc67",
+				"literal": null,
+				"lang": null,
+				"uri": null,
+				"label": null,
+				"valueSubject": {
+					"key": "abc46",
+					"uri": null,
+					"subjectTemplate": {
+						"key": "resourceTemplate:testing:uber4",
+						"uri": "http://localhost:3000/resource/resourceTemplate:testing:uber4",
+						"id": "resourceTemplate:testing:uber4",
+						"class": "http://id.loc.gov/ontologies/bibframe/Uber4",
+						"label": "Uber template4",
+						"author": null,
+						"remark": "Template for testing purposes with single repeatable, required literal.",
+						"date": null,
+            "group": "stanford",
+            "editGroups": [
+              "cornell"
+            ],      
+						"suppressible": false,
+						"propertyTemplateKeys": ["resourceTemplate:testing:uber4 > http://id.loc.gov/ontologies/bibframe/uber/template4/property1"],
+						"propertyTemplates": [{
+							"key": "resourceTemplate:testing:uber4 > http://id.loc.gov/ontologies/bibframe/uber/template4/property1",
+							"subjectTemplateKey": "resourceTemplate:testing:uber4",
+							"label": "Uber template4, property1",
+							"uri": "http://id.loc.gov/ontologies/bibframe/uber/template4/property1",
+							"required": true,
+							"repeatable": true,
+							"ordered": false,
+							"remark": "A repeatable, required literal",
+							"remarkUrl": null,
+							"defaults": [],
+							"valueSubjectTemplateKeys": [],
+							"authorities": [],
+							"type": "literal",
+							"component": "InputLiteral"
+						}]
+					},
+					"properties": [{
+						"key": "abc53",
+						"values": [{
+							"key": "abc61",
+							"literal": "Uber template4, property1",
+							"lang": "eng",
+							"uri": null,
+							"label": null,
+							"valueSubject": null
+						}],
+						"show": true
+					}]
+				}
+			}],
+			"show": true
+		}, {
+			"key": "abc20",
+			"values": [{
+				"key": "abc68",
+				"literal": null,
+				"lang": null,
+				"uri": null,
+				"label": null,
+				"valueSubject": {
+					"key": "abc47",
+					"uri": null,
+					"properties": [{
+						"key": "abc54",
+						"values": [{
+							"key": "abc62",
+							"literal": "Uber template4, property1, first",
+							"lang": "eng",
+							"uri": null,
+							"label": null,
+							"valueSubject": null
+						}],
+						"show": true
+					}]
+				}
+			}, {
+				"key": "abc69",
+				"literal": null,
+				"lang": null,
+				"uri": null,
+				"label": null,
+				"valueSubject": {
+					"key": "abc48",
+					"uri": null,
+					"properties": [{
+						"key": "abc55",
+						"values": [{
+							"key": "abc63",
+							"literal": "Uber template4, property1, second",
+							"lang": "eng",
+							"uri": null,
+							"label": null,
+							"valueSubject": null
+						}],
+						"show": true
+					}]
+				}
+			}],
+			"show": false
+		}, {
+			"key": "abc21",
+			"values": null,
+			"show": false
+		}, {
+			"key": "abc22",
+			"values": null,
+			"show": false
+		}, {
+			"key": "abc23",
+			"values": null,
+			"show": false
+		}, {
+			"key": "abc24",
+			"values": null,
+			"show": false
+		}, {
+			"key": "abc25",
+			"values": null,
+			"show": false
+		}, {
+			"key": "abc26",
+			"values": [],
+			"show": true
+		}, {
+			"key": "abc27",
+			"values": null,
+			"show": false
+		}],
+		"group": "stanford",
+		"editGroups": ["cornell"]
+	}
 }
diff --git a/__tests__/__action_fixtures__/newResourceCopy-ADD_SUBJECT.json b/__tests__/__action_fixtures__/newResourceCopy-ADD_SUBJECT.json
index 77f31a59d..7f11e0811 100644
--- a/__tests__/__action_fixtures__/newResourceCopy-ADD_SUBJECT.json
+++ b/__tests__/__action_fixtures__/newResourceCopy-ADD_SUBJECT.json
@@ -62,10 +62,12 @@
                 "rootSubjectKey": "t9zVwg2zO",
                 "literal": "foo",
                 "lang": "eng",
+                "langLabel": "English",
                 "uri": null,
                 "label": null,
                 "valueSubject": null,
-                "rootPropertyKey": "JQEtq-vmq8"
+                "rootPropertyKey": "JQEtq-vmq8",
+                "errors": []
               }
             ]
           }
diff --git a/__tests__/__resource_fixtures__/test.json b/__tests__/__resource_fixtures__/test.json
index d12a4d092..0998af675 100644
--- a/__tests__/__resource_fixtures__/test.json
+++ b/__tests__/__resource_fixtures__/test.json
@@ -12,7 +12,11 @@
       ],
       "http://id.loc.gov/ontologies/bibframe/uber/template3/property2": [
         {
-          "@value": "Uber template3, property2",
+          "@value": "Uber template3, property2, value1",
+          "@language": "eng"
+        },
+        {
+          "@value": "Uber template3, property2, value2",
           "@language": "eng"
         }
       ]
diff --git a/__tests__/components/App.test.js b/__tests__/components/App.test.js
index 7cbffedac..40c0f9bae 100644
--- a/__tests__/components/App.test.js
+++ b/__tests__/components/App.test.js
@@ -2,14 +2,12 @@
 import { fireEvent, waitFor, screen } from "@testing-library/react"
 import { createStore, renderApp, createHistory } from "testUtils"
 import { createState } from "stateUtils"
-import Config from "Config"
 import Auth from "@aws-amplify/auth"
 import fetchMock from "fetch-mock-jest"
+import { featureSetup } from "featureUtils"
 
 jest.mock("@aws-amplify/auth")
 
-jest.spyOn(Config, "useResourceTemplateFixtures", "get").mockReturnValue(true)
-
 beforeEach(() => {
   fetchMock.mockReset()
   fetchMock.mock(
@@ -30,10 +28,7 @@ beforeEach(() => {
   )
 })
 
-// Mock out document.elementFromPoint used by useNavigableComponent.
-global.document.elementFromPoint = jest.fn()
-// Mock out scrollIntoView used by useNavigableComponent. See https://github.com/jsdom/jsdom/issues/1695
-Element.prototype.scrollIntoView = jest.fn()
+featureSetup()
 
 describe("<App />", () => {
   beforeEach(() => {
diff --git a/__tests__/feature/editing/addRemove.test.js b/__tests__/feature/editing/addRemove.test.js
index 3651ae9b9..19ac08772 100644
--- a/__tests__/feature/editing/addRemove.test.js
+++ b/__tests__/feature/editing/addRemove.test.js
@@ -129,14 +129,11 @@ describe("adding and removing properties", () => {
     expect(screen.queryAllByText("Default literal2")).toHaveLength(1)
 
     // Enter a new literal value
-    const input = screen.getByPlaceholderText("Uber template1, property7")
+    fireEvent.click(screen.getByTestId("Add another Uber template1, property7"))
+    const inputs = screen.queryAllByPlaceholderText("Uber template1, property7")
+    expect(inputs).toHaveLength(3)
+    const input = inputs[2]
     fireEvent.change(input, { target: { value: literalText } })
-    fireEvent.keyDown(input, { key: "Enter", code: 13, charCode: 13 })
-
-    // Bogus literal is there
-    await waitFor(() =>
-      expect(screen.getByText(literalText)).toHaveClass("rbt-token")
-    )
 
     // Now remove property7.
     fireEvent.click(screen.getByTestId("Remove Uber template1, property7"))
diff --git a/__tests__/feature/editing/changeGroups.test.js b/__tests__/feature/editing/changeGroups.test.js
index 510971265..a8e13e9cd 100644
--- a/__tests__/feature/editing/changeGroups.test.js
+++ b/__tests__/feature/editing/changeGroups.test.js
@@ -47,8 +47,6 @@ describe("user that can edit, but not an owner, can view groups", () => {
     // A modal for group choice and save appears
     const modalSave = screen.getByRole("button", { name: "Save Group" })
     fireEvent.click(modalSave)
-    // screen.debug(container.querySelector('#resourceTemplate'))
-    // await screen.findByText(/URI for this resource/)
     await screen.findByText("Saved")
   }, 15000)
 })
diff --git a/__tests__/feature/editing/editingLiteral.test.js b/__tests__/feature/editing/editingLiteral.test.js
index 4cfeab478..5d80f520e 100644
--- a/__tests__/feature/editing/editingLiteral.test.js
+++ b/__tests__/feature/editing/editingLiteral.test.js
@@ -25,59 +25,26 @@ describe("editing a literal property", () => {
       { key: "Enter", code: 13, charCode: 13 }
     )
 
-    // There is foo text. Perhaps check css.
+    // There is foo text.
     await waitFor(() =>
-      expect(screen.getByText("foo")).toHaveClass("rbt-token")
+      expect(screen.getByText("foo")).toHaveClass("form-control")
     )
     // There is remove button
-    expect(screen.getByTestId("Remove foo")).toHaveTextContent("×")
-    // There is edit button.
-    const editBtn = screen.getByTestId("Edit foo")
-    expect(editBtn).toHaveTextContent("Edit")
+    screen.getByTestId("Remove foo")
     // There is language button.
     expect(screen.getByTestId("Change language for foo")).toHaveTextContent(
-      "Language: English"
+      "English"
     )
-    // Input is disabled and empty
-    expect(
-      screen.getByPlaceholderText("Uber template1, property4")
-    ).toBeDisabled()
-    expect(
-      screen.getByPlaceholderText("Uber template1, property4")
-    ).toHaveValue("")
-
-    // Clicking edit
-    fireEvent.click(editBtn)
-    expect(
-      screen.getByPlaceholderText("Uber template1, property4")
-    ).not.toBeDisabled()
-    expect(
-      screen.getByPlaceholderText("Uber template1, property4")
-    ).toHaveValue("foo")
-    expect(screen.queryAllByText("foo").length).toBeLessThan(2)
 
     // Clicking remove
     fireEvent.change(screen.getByPlaceholderText("Uber template1, property4"), {
       target: { value: "foobar" },
     })
-    fireEvent.keyDown(
-      screen.getByPlaceholderText("Uber template1, property4"),
-      { key: "Enter", code: 13, charCode: 13 }
-    )
 
-    await waitFor(() =>
-      expect(screen.getByText("foobar")).toHaveClass("rbt-token")
-    )
     const removeBtn = screen.getByTestId("Remove foobar")
     fireEvent.click(removeBtn)
 
     expect(screen.queryAllByText("foobar")).toHaveLength(0)
-    expect(
-      screen.getByPlaceholderText("Uber template1, property4")
-    ).not.toBeDisabled()
-    expect(
-      screen.getByPlaceholderText("Uber template1, property4")
-    ).toHaveValue("")
   }, 15000)
 
   it("allows entering a repeatable literal", async () => {
@@ -88,39 +55,31 @@ describe("editing a literal property", () => {
     // Add two values
     const input = screen.getByPlaceholderText("Uber template1, property2")
     fireEvent.change(input, { target: { value: "foo" } })
+    fireEvent.click(screen.getByTestId("Add another Uber template1, property2"))
     fireEvent.keyDown(input, { key: "Enter", code: 13, charCode: 13 })
-    fireEvent.change(input, { target: { value: "bar" } })
-    fireEvent.keyDown(input, { key: "Enter", code: 13, charCode: 13 })
+    const inputs = screen.queryAllByPlaceholderText("Uber template1, property2")
+    expect(inputs).toHaveLength(2)
+    fireEvent.change(inputs[1], { target: { value: "bar" } })
+    fireEvent.keyDown(inputs[1], { key: "Enter", code: 13, charCode: 13 })
 
-    // There is foo text.
-    await waitFor(() =>
-      expect(screen.getByText("foo")).toHaveClass("rbt-token")
-    )
     // There is remove button
-    expect(screen.getByTestId("Remove foo")).toHaveTextContent("×")
-    // There is edit button.
-    expect(screen.getByTestId("Edit foo")).toHaveTextContent("Edit")
+    screen.getByTestId("Remove foo")
     // There is language button.
     expect(screen.getByTestId("Change language for foo")).toHaveTextContent(
-      "Language: English"
+      "English"
     )
 
     // And bar text.
-    await waitFor(() =>
-      expect(screen.getByText("bar")).toHaveClass("rbt-token")
-    )
     // There is remove button
-    expect(screen.getByTestId("Remove bar")).toHaveTextContent("×")
-    // There is edit button.
-    expect(screen.getByTestId("Edit bar")).toHaveTextContent("Edit")
+    screen.getByTestId("Remove bar")
     // There is language button.
     expect(screen.getByTestId("Change language for bar")).toHaveTextContent(
-      "Language: English"
+      "English"
     )
+    // An add another
+    screen.getByTestId("Add another Uber template1, property2")
 
     // Input is not disabled and empty
-    expect(input).not.toBeDisabled()
-    expect(input).toHaveValue("")
   }, 15000)
 
   it("allows entering diacritics", async () => {
@@ -138,9 +97,7 @@ describe("editing a literal property", () => {
 
     // Click diacritic button
     expect(screen.queryAllByText("Latin")).toHaveLength(0)
-    const diacriticBtn = screen.getByTestId(
-      "Select diacritics for Uber template1, property4"
-    )
+    const diacriticBtn = screen.getByTestId("Select diacritics for Fo")
     fireEvent.click(diacriticBtn)
 
     // Click a diacritic
@@ -176,11 +133,11 @@ describe("editing a literal property", () => {
 
     // There is foo text.
     await waitFor(() =>
-      expect(screen.getByText("foo")).toHaveClass("rbt-token")
+      expect(screen.getByText("foo")).toHaveClass("form-control")
     )
     // There is language button.
     const langBtn = screen.getByTestId("Change language for foo")
-    expect(langBtn).toHaveTextContent("Language: English")
+    expect(langBtn).toHaveTextContent("English")
 
     fireEvent.click(langBtn)
     // Using getByRole here and below because it limits to the visible modal.
@@ -200,7 +157,7 @@ describe("editing a literal property", () => {
         screen.queryAllByRole("heading", { name: "Languages" }).length
       ).toBeFalsy()
     )
-    expect(langBtn).toHaveTextContent("Language: Tai languages")
+    expect(langBtn).toHaveTextContent("Tai languages")
   }, 25000)
 
   it("allows selecting no language", async () => {
@@ -215,11 +172,11 @@ describe("editing a literal property", () => {
 
     // There is foo text.
     await waitFor(() =>
-      expect(screen.getByText("foo")).toHaveClass("rbt-token")
+      expect(screen.getByText("foo")).toHaveClass("form-control")
     )
     // There is language button.
     const langBtn = screen.getByTestId("Change language for foo")
-    expect(langBtn).toHaveTextContent("Language: English")
+    expect(langBtn).toHaveTextContent("English")
 
     fireEvent.click(langBtn)
     screen.getByRole("heading", { name: "Languages" })
@@ -233,6 +190,6 @@ describe("editing a literal property", () => {
         screen.queryAllByRole("heading", { name: "Languages" })
       ).toHaveLength(0)
     )
-    expect(langBtn).toHaveTextContent("Language: No language specified")
+    expect(langBtn).toHaveTextContent("No language specified")
   }, 15000)
 })
diff --git a/__tests__/feature/editing/reordering.test.js b/__tests__/feature/editing/reordering.test.js
index 37bdfd7a4..f25701f78 100644
--- a/__tests__/feature/editing/reordering.test.js
+++ b/__tests__/feature/editing/reordering.test.js
@@ -69,14 +69,14 @@ describe("reordering properties", () => {
 
     // Move "b" up
     nestedResources1[1].querySelector(".btn-moveup").click()
-    const values1 = panel.querySelectorAll("div.rbt-token")
+    const values1 = panel.querySelectorAll(".form-control")
     expect(values1[0]).toHaveTextContent(/b/)
     expect(values1[1]).toHaveTextContent(/a/)
     expect(values1[2]).toHaveTextContent(/c/)
 
     // Move "a" down
     nestedResources1[0].querySelector(".btn-movedown").click()
-    const values2 = panel.querySelectorAll("div.rbt-token")
+    const values2 = panel.querySelectorAll(".form-control")
     expect(values2[0]).toHaveTextContent(/b/)
     expect(values2[1]).toHaveTextContent(/c/)
     expect(values2[2]).toHaveTextContent(/a/)
diff --git a/__tests__/feature/editing/saveAndCopyResource.test.js b/__tests__/feature/editing/saveAndCopyResource.test.js
index 5a411ea32..89d9dbff6 100644
--- a/__tests__/feature/editing/saveAndCopyResource.test.js
+++ b/__tests__/feature/editing/saveAndCopyResource.test.js
@@ -1,5 +1,5 @@
 import { renderApp, createHistory } from "testUtils"
-import { fireEvent, waitFor, screen } from "@testing-library/react"
+import { fireEvent, screen } from "@testing-library/react"
 import * as sinopiaApi from "sinopiaApi"
 
 import { featureSetup } from "featureUtils"
@@ -32,21 +32,12 @@ describe("saving a resource", () => {
       fireEvent.change(input, { target: { value: "foo" } })
       fireEvent.keyDown(input, { key: "Enter", code: 13, charCode: 13 })
 
-      // There is foo text. Perhaps check css.
-      await waitFor(() =>
-        expect(screen.getByText("foo")).toHaveClass("rbt-token")
-      )
       // There is remove button
-      expect(screen.getByTestId("Remove foo")).toHaveTextContent("×")
-      // There is edit button.
-      const editBtn = screen.getByTestId("Edit foo")
-      expect(editBtn).toHaveTextContent("Edit")
+      screen.getByTestId("Remove foo")
       // There is language button.
       expect(screen.getByTestId("Change language for foo")).toHaveTextContent(
-        "Language: English"
+        "English"
       )
-      // Input is Empty
-      expect(input).toHaveValue("")
 
       expect(saveBtn).not.toBeDisabled()
       fireEvent.click(saveBtn)
@@ -71,7 +62,6 @@ describe("saving a resource", () => {
       await screen.findAllByText("Title note", {
         selector: ".nav-item:not(.active) .nav-link",
       })
-      expect(editBtn).toHaveTextContent("Edit")
     })
   })
 })
diff --git a/__tests__/feature/editing/saveResource.test.js b/__tests__/feature/editing/saveResource.test.js
index 195755d92..c06bc132c 100644
--- a/__tests__/feature/editing/saveResource.test.js
+++ b/__tests__/feature/editing/saveResource.test.js
@@ -28,7 +28,7 @@ describe("saving a resource", () => {
 
       // There is foo text.
       await waitFor(() =>
-        expect(screen.getByText("foo")).toHaveClass("rbt-token")
+        expect(screen.getByText("foo")).toHaveClass("form-control")
       )
 
       expect(screen.queryByText("Permissions")).not.toBeInTheDocument()
diff --git a/__tests__/feature/loadResource.test.js b/__tests__/feature/loadResource.test.js
index 0246487df..9882b6381 100644
--- a/__tests__/feature/loadResource.test.js
+++ b/__tests__/feature/loadResource.test.js
@@ -54,7 +54,7 @@ describe("loading saved resource", () => {
       screen.getAllByText("Uber template3", { selector: "h5" })
       // Length is the heading and the value.
       expect(screen.getAllByText("Uber template3, property1")).toHaveLength(3)
-      expect(screen.getAllByText("Uber template3, property2")).toHaveLength(3)
+      expect(screen.getAllByText("Uber template3, property2")).toHaveLength(2)
       expect(screen.getAllByText("Uber template1, property2")).toHaveLength(3)
       // Heading appears twice, value once.
       expect(screen.getAllByText("Uber template2, property1")).toHaveLength(5)
@@ -66,7 +66,9 @@ describe("loading saved resource", () => {
         screen.getAllByTestId("Hide Uber template2, property1")
       ).toHaveLength(2)
       screen.getByPlaceholderText("Uber template3, property1")
-      screen.getByPlaceholderText("Uber template3, property2")
+      expect(
+        screen.getAllByPlaceholderText("Uber template3, property2")
+      ).toHaveLength(2)
       screen.getByPlaceholderText("Uber template1, property2")
 
       // confirm that the input field has an accessible label
diff --git a/__tests__/feature/searchAndViewResource.test.js b/__tests__/feature/searchAndViewResource.test.js
index a418fa854..26267f26d 100644
--- a/__tests__/feature/searchAndViewResource.test.js
+++ b/__tests__/feature/searchAndViewResource.test.js
@@ -75,22 +75,15 @@ describe("searching and viewing a resource", () => {
       })
     ).toHaveLength(1)
 
-    // Edit controls are disabled in view modal
-    screen
-      .getAllByTestId("Remove Uber template3, property1")
-      .forEach((removeButton) => {
-        expect(removeButton).toBeDisabled()
-      })
-    screen.getAllByText("ä").forEach((languageButton) => {
-      expect(languageButton).toBeDisabled()
+    // Literals are rendered
+    screen.findByText("Uber template3, property2, value1 [English]", {
+      selector: "p",
     })
-    expect(
-      screen.getByPlaceholderText("Uber template3, property1")
-    ).toBeDisabled()
-    expect(screen.getByTestId("Edit Uber template3, property1")).toBeDisabled()
-    expect(
-      screen.getByTestId("Change language for Uber template3, property1")
-    ).toBeDisabled()
+    screen.findByText("Uber template3, property2, value2 [English]", {
+      selector: "p",
+    })
+
+    // Edit controls are disabled in view modal
     expect(screen.getByTestId("Remove analog")).toBeDisabled()
     screen.getAllByTestId(/Submit lookup/).forEach((lookupValueControl) => {
       expect(lookupValueControl).toBeDisabled()
diff --git a/__tests__/reducers/resources.test.js b/__tests__/reducers/resources.test.js
index f8349e6c1..c3b43608e 100644
--- a/__tests__/reducers/resources.test.js
+++ b/__tests__/reducers/resources.test.js
@@ -19,6 +19,7 @@ import {
   setValueOrder,
   clearResourceFromEditor,
   saveResourceFinishedEditor,
+  updateLiteralValue,
 } from "reducers/resources"
 
 import { createState } from "stateUtils"
@@ -38,6 +39,7 @@ const reducers = {
   SET_RESOURCE_GROUP: setResourceGroup,
   SET_VALUE_ORDER: setValueOrder,
   SHOW_PROPERTY: showProperty,
+  UPDATE_LITERAL_VALUE: updateLiteralValue,
 }
 
 const reducer = createReducer(reducers)
@@ -183,18 +185,18 @@ describe("addProperty()", () => {
 
   describe("property with validation error", () => {
     it("adds error", () => {
-      const oldState = createState({ hasResourceWithLiteral: true })
+      const oldState = createState({ hasResourceWithUri: true })
       oldState.entities.propertyTemplates[
-        "ld4p:RT:bf2:Title:AbbrTitle > http://id.loc.gov/ontologies/bibframe/mainTitle"
+        "test:resource:SinopiaLookup > http://id.loc.gov/ontologies/bibframe/instanceOf"
       ].required = true
 
       const action = {
         type: "ADD_PROPERTY",
         payload: {
           key: "vmq88891",
-          subject: { key: "t9zVwg2zO" },
+          subject: { key: "wihOjn-0Z" },
           propertyTemplate: {
-            key: "ld4p:RT:bf2:Title:AbbrTitle > http://id.loc.gov/ontologies/bibframe/mainTitle",
+            key: "test:resource:SinopiaLookup > http://id.loc.gov/ontologies/bibframe/instanceOf",
           },
           values: [],
           show: true,
@@ -204,10 +206,10 @@ describe("addProperty()", () => {
       const newState = reducer(oldState.entities, action)
       expect(newState.properties.vmq88891).toStrictEqual({
         key: "vmq88891",
-        subjectKey: "t9zVwg2zO",
-        rootSubjectKey: "t9zVwg2zO",
+        subjectKey: "wihOjn-0Z",
+        rootSubjectKey: "wihOjn-0Z",
         propertyTemplateKey:
-          "ld4p:RT:bf2:Title:AbbrTitle > http://id.loc.gov/ontologies/bibframe/mainTitle",
+          "test:resource:SinopiaLookup > http://id.loc.gov/ontologies/bibframe/instanceOf",
         valueKeys: [],
         show: true,
         errors: ["Required"],
@@ -216,9 +218,9 @@ describe("addProperty()", () => {
         descWithErrorPropertyKeys: ["vmq88891"],
       })
 
-      expect(newState.subjects.t9zVwg2zO.descWithErrorPropertyKeys).toContain(
-        "vmq88891"
-      )
+      expect(
+        newState.subjects["wihOjn-0Z"].descWithErrorPropertyKeys
+      ).toContain("vmq88891")
     })
   })
 })
@@ -398,6 +400,7 @@ describe("addValue()", () => {
         uri: null,
         label: null,
         valueSubjectKey: null,
+        errors: [],
       })
       expect(newState.properties["JQEtq-vmq8"].valueKeys).toContain("DxGx7WMh3")
       expect(newState.properties["JQEtq-vmq8"].show).toBe(true)
@@ -410,6 +413,75 @@ describe("addValue()", () => {
     })
   })
 
+  describe("new blank literal value for required property", () => {
+    it("updates state", () => {
+      const oldState = createState({
+        hasResourceWithLiteral: true,
+        hasError: true,
+      })
+      oldState.entities.properties = {
+        "JQEtq-vmq8": {
+          key: "JQEtq-vmq8",
+          subjectKey: "t9zVwg2zO",
+          rootSubjectKey: "t9zVwg2zO",
+          rootPropertyKey: "JQEtq-vmq8",
+          propertyTemplateKey:
+            "ld4p:RT:bf2:Title:AbbrTitle > http://id.loc.gov/ontologies/bibframe/mainTitle",
+          valueKeys: [],
+          show: true,
+          errors: [],
+          descUriOrLiteralValueKeys: [],
+          descWithErrorPropertyKeys: [],
+        },
+      }
+      oldState.entities.values = []
+
+      const action = {
+        type: "ADD_VALUE",
+        payload: {
+          value: {
+            key: "DxGx7WMh3",
+            property: { key: "JQEtq-vmq8" },
+            literal: "",
+            lang: null,
+            uri: null,
+            label: null,
+            valueSubjectKey: null,
+          },
+        },
+      }
+
+      const newState = reducer(oldState.entities, action)
+
+      expect(newState.values.DxGx7WMh3).toStrictEqual({
+        key: "DxGx7WMh3",
+        propertyKey: "JQEtq-vmq8",
+        rootSubjectKey: "t9zVwg2zO",
+        rootPropertyKey: "JQEtq-vmq8",
+        literal: "",
+        lang: null,
+        uri: null,
+        label: null,
+        valueSubjectKey: null,
+        errors: ["Required"],
+      })
+      expect(newState.properties["JQEtq-vmq8"].valueKeys).toContain("DxGx7WMh3")
+      expect(newState.properties["JQEtq-vmq8"].show).toBe(true)
+      expect(
+        newState.properties["JQEtq-vmq8"].descUriOrLiteralValueKeys
+      ).not.toContain("DxGx7WMh3")
+      expect(
+        newState.subjects.t9zVwg2zO.descUriOrLiteralValueKeys
+      ).not.toContain("DxGx7WMh3")
+      expect(
+        newState.properties["JQEtq-vmq8"].descWithErrorPropertyKeys
+      ).toContain("JQEtq-vmq8")
+      expect(newState.subjects.t9zVwg2zO.descWithErrorPropertyKeys).toContain(
+        "JQEtq-vmq8"
+      )
+    })
+  })
+
   describe("new literal value with siblingValueKey", () => {
     it("updates state", () => {
       const oldState = createState({ hasResourceWithLiteral: true })
@@ -478,6 +550,7 @@ describe("addValue()", () => {
         uri: null,
         label: null,
         valueSubjectKey: "YPb8jaPW1",
+        errors: [],
       })
       // Replaces subjects
       expect(newState.subjects.YPb8jaPW1).not.toBeUndefined()
@@ -501,6 +574,7 @@ describe("addValue()", () => {
         uri: "http://localhost:3000/resource/85770f92-f8cf-48ee-970a-aefc97843749",
         label: null,
         valueSubjectKey: null,
+        errors: [],
       })
       expect(newState.properties["i0SAJP-Zhd"].valueKeys).toContain("DxGx7WMh3")
       expect(newState.properties["i0SAJP-Zhd"].show).toBe(true)
@@ -922,3 +996,88 @@ describe("setValueOrder()", () => {
     ])
   })
 })
+
+describe("updateLiteralValue()", () => {
+  describe("update literal value", () => {
+    it("updates state", () => {
+      const oldState = createState({ hasResourceWithLiteral: true })
+
+      const action = {
+        type: "UPDATE_LITERAL_VALUE",
+        payload: {
+          valueKey: "CxGx7WMh2",
+          literal: "bar",
+          lang: "tai",
+        },
+      }
+
+      const newState = reducer(oldState.entities, action)
+
+      expect(newState.values.CxGx7WMh2).toStrictEqual({
+        key: "CxGx7WMh2",
+        propertyKey: "JQEtq-vmq8",
+        rootSubjectKey: "t9zVwg2zO",
+        rootPropertyKey: "JQEtq-vmq8",
+        literal: "bar",
+        lang: "tai",
+        uri: null,
+        label: null,
+        valueSubjectKey: null,
+        errors: [],
+      })
+      expect(newState.properties["JQEtq-vmq8"].valueKeys).toContain("CxGx7WMh2")
+      expect(
+        newState.properties["JQEtq-vmq8"].descUriOrLiteralValueKeys
+      ).toContain("CxGx7WMh2")
+      expect(newState.subjects.t9zVwg2zO.descUriOrLiteralValueKeys).toContain(
+        "CxGx7WMh2"
+      )
+    })
+  })
+
+  describe("update literal value with validation error", () => {
+    it("updates state", () => {
+      const oldState = createState({ hasResourceWithLiteral: true })
+      oldState.entities.propertyTemplates[
+        "ld4p:RT:bf2:Title:AbbrTitle > http://id.loc.gov/ontologies/bibframe/mainTitle"
+      ].required = true
+
+      const action = {
+        type: "UPDATE_LITERAL_VALUE",
+        payload: {
+          valueKey: "CxGx7WMh2",
+          literal: "",
+          lang: null,
+        },
+      }
+
+      const newState = reducer(oldState.entities, action)
+
+      expect(newState.values.CxGx7WMh2).toStrictEqual({
+        key: "CxGx7WMh2",
+        propertyKey: "JQEtq-vmq8",
+        rootSubjectKey: "t9zVwg2zO",
+        rootPropertyKey: "JQEtq-vmq8",
+        literal: "",
+        lang: null,
+        uri: null,
+        label: null,
+        valueSubjectKey: null,
+        errors: ["Required"],
+      })
+      expect(newState.properties["JQEtq-vmq8"].valueKeys).toContain("CxGx7WMh2")
+      expect(
+        newState.properties["JQEtq-vmq8"].descUriOrLiteralValueKeys
+      ).not.toContain("CxGx7WMh2")
+      expect(
+        newState.subjects.t9zVwg2zO.descUriOrLiteralValueKeys
+      ).not.toContain("CxGx7WMh2")
+      expect(
+        newState.properties["JQEtq-vmq8"].descWithErrorPropertyKeys
+      ).toContain("JQEtq-vmq8")
+      expect(newState.subjects.t9zVwg2zO.descWithErrorPropertyKeys).toContain(
+        "JQEtq-vmq8"
+      )
+    })
+  })
+})
diff --git a/__tests__/selectors/resources.test.js b/__tests__/selectors/resources.test.js
index 2331061d0..9dd3cf2c4 100644
--- a/__tests__/selectors/resources.test.js
+++ b/__tests__/selectors/resources.test.js
@@ -45,6 +45,13 @@ describe("selectValue()", () => {
     const value = selectValue(state, "VDOeQCnFA8")
     expect(value).toBeValue("VDOeQCnFA8")
   })
+
+  it("adds langLabel to value", () => {
+    const state = createState({ hasResourceWithLiteral: true })
+    const value = selectValue(state, "CxGx7WMh2")
+    expect(value).toBeValue("CxGx7WMh2")
+    expect(value.langLabel).toEqual("English")
+  })
 })
 
 describe("selectCurrentResourceIsReadOnly()", () => {
diff --git a/__tests__/testUtilities/stateUtils.js b/__tests__/testUtilities/stateUtils.js
index c0064930b..5b5b637fa 100644
--- a/__tests__/testUtilities/stateUtils.js
+++ b/__tests__/testUtilities/stateUtils.js
@@ -182,6 +182,7 @@ const buildTemplateWithLiteral = (state, options) => {
       label: null,
       propertyKey: "mLi9ZqIjjx",
       valueSubjectKey: null,
+      errors: [],
     },
   }
 }
@@ -270,6 +271,7 @@ const buildResourceWithLiteral = (state, options) => {
       uri: null,
       label: null,
       valueSubjectKey: null,
+      errors: [],
     },
   }
 }
@@ -405,6 +407,7 @@ const buildTwoLiteralResources = (state, options) => {
       uri: null,
       label: null,
       valueSubjectKey: null,
+      errors: [],
     },
     DyHy8XNi3: {
       key: "DyHy8XNi3",
@@ -416,6 +419,7 @@ const buildTwoLiteralResources = (state, options) => {
       uri: null,
       label: null,
       valueSubjectKey: null,
+      errors: [],
     },
   }
 }
@@ -519,6 +523,7 @@ const buildResourceWithUri = (state, options) => {
       label: "foo",
       propertyKey: "i0SAJP-Zhd",
       valueSubjectKey: null,
+      errors: [],
     },
   }
 }
@@ -731,6 +736,7 @@ const buildResourceWithNestedResource = (state, options) => {
       uri: null,
       label: null,
       valueSubjectKey: "XPb8jaPWo",
+      errors: [],
     },
     "pRJ0lO_mT-": {
       key: "pRJ0lO_mT-",
@@ -742,6 +748,7 @@ const buildResourceWithNestedResource = (state, options) => {
       uri: null,
       label: null,
       valueSubjectKey: null,
+      errors: [],
     },
   }
 }
@@ -993,6 +1000,7 @@ const buildResourceWithTwoNestedResources = (state, options) => {
       uri: null,
       label: null,
       valueSubjectKey: "XPb8jaPWo",
+      errors: [],
     },
     VDOeQCnFA9: {
       key: "VDOeQCnFA9",
@@ -1003,6 +1011,7 @@ const buildResourceWithTwoNestedResources = (state, options) => {
       uri: null,
       label: null,
       valueSubjectKey: "XPb8jaPWp",
+      errors: [],
     },
     "pRJ0lO_mT-": {
       key: "pRJ0lO_mT-",
@@ -1013,6 +1022,7 @@ const buildResourceWithTwoNestedResources = (state, options) => {
       uri: null,
       label: null,
       valueSubjectKey: null,
+      errors: [],
     },
     "pRJ0lO_mU-": {
       key: "pRJ0lO_mU-",
@@ -1023,6 +1033,7 @@ const buildResourceWithTwoNestedResources = (state, options) => {
       uri: null,
       label: null,
       valueSubjectKey: null,
+      errors: [],
     },
   }
 }
diff --git a/cypress/integration/end2end.spec.js b/cypress/integration/end2end.spec.js
index 77ba0698e..286255581 100644
--- a/cypress/integration/end2end.spec.js
+++ b/cypress/integration/end2end.spec.js
@@ -96,7 +96,7 @@ describe("End-to-end test", () => {
     cy.get('textarea[placeholder="Preferred Title for Work"]').type(
       `${title}{enter}`
     )
-    cy.get("div.rbt-token").contains(title)
+    cy.get('textarea[placeholder="Preferred Title for Work"]').contains(title)
   })
 
   it("Previews the RDF", () => {
@@ -147,7 +147,7 @@ describe("End-to-end test", () => {
 
     cy.contains("h3", "Work Title")
     cy.contains("URI for this resource")
-    cy.get("div.rbt-token").contains(title)
+    cy.get(".form-control").contains(title)
   })
 
   it("Logs out", () => {
diff --git a/cypress/integration/leftNav.spec.js b/cypress/integration/leftNav.spec.js
index bae1b6ea5..842f069f0 100644
--- a/cypress/integration/leftNav.spec.js
+++ b/cypress/integration/leftNav.spec.js
@@ -201,7 +201,7 @@ describe("Left-nav test", () => {
 
   it("Marks properties with errors", () => {
     cy.get(".left-nav-header.text-danger").should("not.exist")
-    cy.get("button.editor-save").first().click()
+    cy.get("button.editor-save").first().scrollIntoView().click({ force: true })
     cy.get(".left-nav-header.text-danger").should(
       "contain",
       "Uber template1, property4"
@@ -249,7 +249,7 @@ describe("Left-nav test", () => {
 })
 
 const addResourceTemplate = (fixture, fixtureUri) => {
-  cy.get("a").contains("Load RDF").click()
+  cy.get("a").contains("Load RDF").scrollIntoView().click({ force: true })
   cy.url().should("include", "/load")
   cy.contains("Load RDF into Editor")
   cy.fixture(fixture).then((json) => {
@@ -266,7 +266,10 @@ const addResourceTemplate = (fixture, fixtureUri) => {
 
     // Now on editor
     cy.url().should("include", "/editor")
-    cy.get("button.editor-save").contains("Save").click()
+    cy.get("button.editor-save")
+      .contains("Save")
+      .scrollIntoView()
+      .click({ force: true })
 
     // Group choice modal
     cy.contains("Who owns this?")
diff --git a/package-lock.json b/package-lock.json
index 1fb937263..dc210663d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -92,6 +92,7 @@
         "jest-localstorage-mock": "^2.4.17",
         "jest-mock-console": "^1.1.0",
         "jest-prop-type-error": "^1.1.0",
+        "jest-summarizing-reporter": "^1.1.4",
         "jsdom": "^17.0.0",
         "jsdom-global": "3.0.2",
         "postcss-loader": "^6.1.1",
@@ -14632,6 +14633,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/jest-summarizing-reporter": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/jest-summarizing-reporter/-/jest-summarizing-reporter-1.1.4.tgz",
+      "integrity": "sha512-PFX/NjTXUUuMhe37CWjQU0sNFgI1XcrzFCoQF91ZSHdCARngHFgQWuCyhCKIRBEjo54daKvs+jYTihCKf7uMDA==",
+      "dev": true
+    },
     "node_modules/jest-util": {
       "version": "27.2.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.0.tgz",
@@ -35514,6 +35521,12 @@
         }
       }
     },
+    "jest-summarizing-reporter": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/jest-summarizing-reporter/-/jest-summarizing-reporter-1.1.4.tgz",
+      "integrity": "sha512-PFX/NjTXUUuMhe37CWjQU0sNFgI1XcrzFCoQF91ZSHdCARngHFgQWuCyhCKIRBEjo54daKvs+jYTihCKf7uMDA==",
+      "dev": true
+    },
     "jest-util": {
       "version": "27.2.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.0.tgz",
diff --git a/package.json b/package.json
index 956b3ce08..2f75ad223 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "pretty": "prettier --check .",
     "pretty-fix": "prettier --write .",
     "fix": "npm run pretty-fix && npm run eslint-fix",
-    "lint": "npm run pretty && npm run eslint",    
+    "lint": "npm run pretty && npm run eslint",
     "start": "npx babel-node server.js",
     "test": "jest --colors --silent --runInBand",
     "test-verbose": "jest --colors --runInBand",
@@ -139,10 +139,11 @@
     "jest-localstorage-mock": "^2.4.17",
     "jest-mock-console": "^1.1.0",
     "jest-prop-type-error": "^1.1.0",
+    "jest-summarizing-reporter": "^1.1.4",
     "jsdom": "^17.0.0",
     "jsdom-global": "3.0.2",
-    "prettier": "2.4.0",
     "postcss-loader": "^6.1.1",
+    "prettier": "2.4.0",
     "raw-loader": "^4.0.2",
     "redux-mock-store": "^1.5.3",
     "sass-loader": "^12.1.0",
@@ -189,6 +190,9 @@
     "collectCoverage": true,
     "coverageReporters": [
       "lcov"
+    ],
+    "reporters": [
+      ["jest-summarizing-reporter", {"diffs": true}]
     ]
   },
   "optionalDependencies": {
diff --git a/src/GraphBuilder.js b/src/GraphBuilder.js
index 24f433155..09f32e3dd 100644
--- a/src/GraphBuilder.js
+++ b/src/GraphBuilder.js
@@ -97,7 +97,11 @@ export default class GraphBuilder {
         )
       })
     } else {
-      property.values.forEach((value) =>
+      const values = property.values.filter((value) =>
+        this.checkValueHasValue(value)
+      )
+
+      values.forEach((value) =>
         this.buildValue(
           value,
           subjectTerm,
diff --git a/src/actions/resources.js b/src/actions/resources.js
index cd27e5d39..8e1917bbb 100644
--- a/src/actions/resources.js
+++ b/src/actions/resources.js
@@ -69,6 +69,15 @@ export const addValue = (value, siblingValueKey) => ({
   },
 })
 
+export const updateLiteralValue = (valueKey, literal, lang) => ({
+  type: "UPDATE_LITERAL_VALUE",
+  payload: {
+    valueKey,
+    literal,
+    lang,
+  },
+})
+
 export const removeValue = (valueKey) => ({
   type: "REMOVE_VALUE",
   payload: valueKey,
diff --git a/src/components/editor/GroupChoiceModal.jsx b/src/components/editor/GroupChoiceModal.jsx
index acda55f84..5fdd832b5 100644
--- a/src/components/editor/GroupChoiceModal.jsx
+++ b/src/components/editor/GroupChoiceModal.jsx
@@ -23,7 +23,7 @@ const groupsToGroupValues = (groupIds, groupMap, ownerGroupId = null) =>
   groupIds
     .filter((groupId) => ownerGroupId !== groupId)
     .sort((groupId1, groupId2) =>
-      groupMap[groupId1].localeCompare(groupMap[groupId2])
+      groupMap[groupId1]?.localeCompare(groupMap[groupId2])
     )
     .map((groupId) => ({
       value: groupId,
diff --git a/src/components/editor/property/InputLang.jsx b/src/components/editor/inputs/InputLang.jsx
similarity index 100%
rename from src/components/editor/property/InputLang.jsx
rename to src/components/editor/inputs/InputLang.jsx
diff --git a/src/components/editor/inputs/InputLiteral.jsx b/src/components/editor/inputs/InputLiteral.jsx
new file mode 100644
index 000000000..317746f21
--- /dev/null
+++ b/src/components/editor/inputs/InputLiteral.jsx
@@ -0,0 +1,58 @@
+import React, { useEffect } from "react"
+import { useDispatch } from "react-redux"
+import PropTypes from "prop-types"
+import _ from "lodash"
+import InputLiteralValue from "./InputLiteralValue"
+import { addValue } from "actions/resources"
+import { newLiteralValue } from "utilities/valueFactory"
+import { defaultLanguageId } from "utilities/Utilities"
+
+const InputLiteral = ({ property, propertyTemplate, displayValidations }) => {
+  const dispatch = useDispatch()
+
+  const inputValues = property.valueKeys.map((valueKey) => (
+    <InputLiteralValue
+      key={valueKey}
+      valueKey={valueKey}
+      propertyTemplate={propertyTemplate}
+      displayValidations={displayValidations}
+      shouldFocus={property.valueKeys.length > 1}
+    />
+  ))
+  const canAddAnother = propertyTemplate.repeatable
+
+  useEffect(() => {
+    if (_.isEmpty(property.valueKeys))
+      dispatch(addValue(newLiteralValue(property, "", defaultLanguageId)))
+  }, [property, dispatch])
+
+  const handleAddAnotherClick = (event) => {
+    dispatch(addValue(newLiteralValue(property, "", defaultLanguageId)))
+    event.preventDefault()
+  }
+
+  return (
+    <React.Fragment>
+      {inputValues}
+      {canAddAnother && (
+        <button
+          type="button"
+          className="btn btn-outline-primary"
+          aria-label={`Add another ${propertyTemplate.label}`}
+          data-testid={`Add another ${propertyTemplate.label}`}
+          onClick={handleAddAnotherClick}
+        >
+          + Add another
+        </button>
+      )}
+    </React.Fragment>
+  )
+}
+
+InputLiteral.propTypes = {
+  property: PropTypes.object.isRequired,
+  propertyTemplate: PropTypes.object.isRequired,
+  displayValidations: PropTypes.bool.isRequired,
+}
+
+export default InputLiteral
diff --git a/src/components/editor/inputs/InputLiteralValue.jsx b/src/components/editor/inputs/InputLiteralValue.jsx
new file mode 100644
index 000000000..403f12c4b
--- /dev/null
+++ b/src/components/editor/inputs/InputLiteralValue.jsx
@@ -0,0 +1,140 @@
+import React, { useRef, useEffect, useState } from "react"
+import { useSelector, useDispatch } from "react-redux"
+import PropTypes from "prop-types"
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
+import { faTrashAlt } from "@fortawesome/free-solid-svg-icons"
+import TextareaAutosize from "react-textarea-autosize"
+import { selectNormValue } from "selectors/resources"
+import { updateLiteralValue, removeValue } from "actions/resources"
+import LanguageButton from "./LanguageButton"
+import DiacriticsSelection from "components/editor/diacritics/DiacriticsSelection"
+import useDiacritics from "hooks/useDiacritics"
+import _ from "lodash"
+
+const InputLiteralValue = ({
+  valueKey,
+  propertyTemplate,
+  displayValidations,
+  shouldFocus,
+}) => {
+  const dispatch = useDispatch()
+  const value = useSelector((state) => selectNormValue(state, valueKey))
+  const inputLiteralRef = useRef(null)
+  const [focusHasBeenSet, setFocusHasBeenSet] = useState(false)
+  const id = `inputliteral-${valueKey}`
+  const diacriticsId = `diacritics-${valueKey}`
+  const diacriticsBtnId = `diacritics-btn-${valueKey}`
+  const {
+    showDiacritics,
+    toggleDiacritics,
+    closeDiacritics,
+    handleBlurDiacritics,
+    currentContent,
+    handleChangeDiacritics,
+    handleKeyDownDiacritics,
+    handleAddCharacter,
+    handleClickDiacritics,
+  } = useDiacritics(
+    inputLiteralRef,
+    id,
+    diacriticsId,
+    diacriticsBtnId,
+    value.literal
+  )
+
+  useEffect(() => {
+    if (value.literal === "" && !focusHasBeenSet && shouldFocus) {
+      inputLiteralRef.current.focus()
+      setFocusHasBeenSet(true)
+    }
+  }, [focusHasBeenSet, shouldFocus, value.literal])
+
+  const handleBlur = (event) => {
+    if (handleBlurDiacritics(event)) {
+      dispatch(updateLiteralValue(valueKey, currentContent, value.lang))
+      event.preventDefault()
+    }
+  }
+
+  const handleRemoveClick = (event) => {
+    dispatch(removeValue(valueKey))
+    event.preventDefault()
+  }
+
+  const handleKeyDown = (event) => {
+    if (event.key === "Enter") {
+      dispatch(updateLiteralValue(valueKey, currentContent, value.lang))
+      event.preventDefault()
+    }
+    // Handle any position changing
+    handleKeyDownDiacritics(event)
+  }
+
+  const controlClasses = ["form-control"]
+  if (displayValidations && !_.isEmpty(value.errors))
+    controlClasses.push("is-invalid")
+
+  return (
+    <React.Fragment>
+      <div className="row my-2">
+        <div className="col">
+          <TextareaAutosize
+            required={propertyTemplate.required}
+            className={controlClasses.join(" ")}
+            placeholder={propertyTemplate.label}
+            aria-label={propertyTemplate.label}
+            onChange={handleChangeDiacritics}
+            onKeyDown={handleKeyDown}
+            onBlur={handleBlur}
+            onClick={handleClickDiacritics}
+            value={currentContent}
+            ref={inputLiteralRef}
+            id={id}
+          />
+          <div className="invalid-feedback">{value.errors.join(", ")}</div>
+        </div>
+        <div className="col-md-auto">
+          <button
+            className="btn btn-link fs-4 py-0"
+            id={diacriticsBtnId}
+            aria-label={`Select diacritics for ${currentContent}`}
+            data-testid={`Select diacritics for ${currentContent}`}
+            onClick={toggleDiacritics}
+            onBlur={handleBlur}
+          >
+            &auml;
+          </button>
+          <LanguageButton value={value} />
+        </div>
+        <div className="col-sm-1">
+          <button
+            type="button"
+            className="btn btn-sm"
+            aria-label={`Remove ${currentContent}`}
+            data-testid={`Remove ${currentContent}`}
+            onClick={handleRemoveClick}
+          >
+            <FontAwesomeIcon className="trash-icon" icon={faTrashAlt} />
+          </button>
+        </div>
+      </div>
+      <div className="row">
+        <DiacriticsSelection
+          id={diacriticsId}
+          handleAddCharacter={handleAddCharacter}
+          closeDiacritics={closeDiacritics}
+          showDiacritics={showDiacritics}
+        />
+      </div>
+    </React.Fragment>
+  )
+}
+
+InputLiteralValue.propTypes = {
+  valueKey: PropTypes.string.isRequired,
+  propertyTemplate: PropTypes.object.isRequired,
+  displayValidations: PropTypes.bool.isRequired,
+  shouldFocus: PropTypes.bool.isRequired,
+}
+
+export default InputLiteralValue
diff --git a/src/components/editor/inputs/LanguageButton.jsx b/src/components/editor/inputs/LanguageButton.jsx
new file mode 100644
index 000000000..2f96e75bc
--- /dev/null
+++ b/src/components/editor/inputs/LanguageButton.jsx
@@ -0,0 +1,45 @@
+// Copyright 2019 Stanford University see LICENSE for license
+
+import React from "react"
+import PropTypes from "prop-types"
+import { useDispatch, connect } from "react-redux"
+import InputLang from "./InputLang"
+import { showModal } from "actions/modals"
+import { selectLanguageLabel } from "selectors/languages"
+
+const LanguageButton = (props) => {
+  const dispatch = useDispatch()
+
+  const handleClick = (event) => {
+    event.preventDefault()
+    dispatch(showModal(`LanguageModal-${props.value.key}`))
+  }
+
+  const languageLabel = props.language || "No language specified"
+
+  return (
+    <React.Fragment>
+      <button
+        id="language"
+        onClick={handleClick}
+        aria-label={`Change language for ${props.value.literal}`}
+        data-testid={`Change language for ${props.value.literal}`}
+        className="btn btn-link"
+      >
+        {languageLabel}
+      </button>
+      <InputLang value={props.value} />
+    </React.Fragment>
+  )
+}
+
+LanguageButton.propTypes = {
+  value: PropTypes.object.isRequired,
+  language: PropTypes.string.isRequired,
+}
+
+const mapStateToProps = (state, ownProps) => ({
+  language: selectLanguageLabel(state, ownProps.value.lang),
+})
+
+export default connect(mapStateToProps)(LanguageButton)
diff --git a/src/components/editor/inputs/ReadOnlyInputLiteral.jsx b/src/components/editor/inputs/ReadOnlyInputLiteral.jsx
new file mode 100644
index 000000000..afd2cc059
--- /dev/null
+++ b/src/components/editor/inputs/ReadOnlyInputLiteral.jsx
@@ -0,0 +1,25 @@
+import React from "react"
+import { useSelector } from "react-redux"
+import PropTypes from "prop-types"
+import { selectProperty } from "selectors/resources"
+
+const ReadOnlyInputLiteral = ({ propertyKey }) => {
+  const property = useSelector((state) => selectProperty(state, propertyKey))
+
+  const inputValues = property.values.map((value) => {
+    const language = value.langLabel || "No language specified"
+    return (
+      <p key={value.key}>
+        {value.literal} [{language}]
+      </p>
+    )
+  })
+
+  return <React.Fragment>{inputValues}</React.Fragment>
+}
+
+ReadOnlyInputLiteral.propTypes = {
+  propertyKey: PropTypes.string.isRequired,
+}
+
+export default ReadOnlyInputLiteral
diff --git a/src/components/editor/property/InputLiteral.jsx b/src/components/editor/property/InputLiteral.jsx
deleted file mode 100644
index b442e0b16..000000000
--- a/src/components/editor/property/InputLiteral.jsx
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2018, 2019 Stanford University see LICENSE for license
-
-import React, { useRef, useState } from "react"
-import PropTypes from "prop-types"
-import { bindActionCreators } from "redux"
-import { connect, useSelector } from "react-redux"
-import TextareaAutosize from "react-textarea-autosize"
-import { displayResourceValidations } from "selectors/errors"
-import { selectCurrentResourceIsReadOnly } from "selectors/resources"
-import InputValue from "./InputValue"
-import { defaultLanguageId } from "utilities/Utilities"
-import _ from "lodash"
-import { addValue } from "actions/resources"
-import { newLiteralValue } from "utilities/valueFactory"
-import DiacriticsSelection from "components/editor/diacritics/DiacriticsSelection"
-import useDiacritics from "hooks/useDiacritics"
-
-const InputLiteral = (props) => {
-  const inputLiteralRef = useRef(null)
-  const [lang, setLang] = useState(defaultLanguageId)
-  const id = `inputliteral-${props.property.key}`
-  const diacriticsId = `diacritics-${props.property.key}`
-  const {
-    clearContent,
-    handleKeyDownDiacritics,
-    handleChangeDiacritics,
-    handleBlurDiacritics,
-    toggleDiacritics,
-    closeDiacritics,
-    handleAddCharacter,
-    handleClickDiacritics,
-    currentContent,
-    setCurrentContent,
-    showDiacritics,
-  } = useDiacritics(inputLiteralRef, id, diacriticsId)
-  const readOnly = useSelector((state) =>
-    selectCurrentResourceIsReadOnly(state)
-  )
-
-  const disabled =
-    readOnly ||
-    (!props.propertyTemplate.repeatable && props.property.valueKeys.length > 0)
-
-  const addItem = () => {
-    if (_.isEmpty(currentContent.trim())) return
-
-    props.addValue(newLiteralValue(props.property, currentContent.trim(), lang))
-    clearContent()
-    closeDiacritics()
-    setLang(defaultLanguageId)
-  }
-
-  const handleKeyDown = (event) => {
-    if (event.key === "Enter") {
-      addItem()
-      event.preventDefault()
-    }
-    // Handle any position changing
-    handleKeyDownDiacritics(event)
-  }
-
-  const handleEdit = (content, lang) => {
-    setCurrentContent(content)
-    setLang(lang)
-    inputLiteralRef.current.focus()
-  }
-
-  const handleBlur = (event) => {
-    if (handleBlurDiacritics(event)) {
-      addItem()
-    }
-  }
-
-  const addedList = props.property.valueKeys.map((valueKey) => (
-    <InputValue key={valueKey} handleEdit={handleEdit} valueKey={valueKey} />
-  ))
-  const required = props.propertyTemplate.required
-
-  let error
-  let controlClasses = "form-control"
-  if (props.displayValidations && !_.isEmpty(props.property.errors)) {
-    controlClasses += " is-invalid"
-    error = props.property.errors.join(",")
-  }
-
-  // TextareaAutosize does not disable well, so using a disabled input.
-
-  return (
-    <div className="form-group">
-      <div className="input-group" onBlur={handleBlur} id={id}>
-        {disabled ? (
-          <input
-            type="text"
-            disabled={true}
-            className="form-control"
-            placeholder={props.propertyTemplate.label}
-            value=""
-            ref={inputLiteralRef}
-          />
-        ) : (
-          <TextareaAutosize
-            required={required}
-            className={controlClasses}
-            placeholder={props.propertyTemplate.label}
-            aria-label={props.propertyTemplate.label}
-            onChange={handleChangeDiacritics}
-            onKeyDown={handleKeyDown}
-            onClick={handleClickDiacritics}
-            value={currentContent}
-            ref={inputLiteralRef}
-            id={props.propertyLabelId}
-          />
-        )}
-        <div className="input-group-append" tabIndex="0">
-          <button
-            className="btn btn-outline-primary"
-            disabled={disabled}
-            aria-label={`Select diacritics for ${props.propertyTemplate.label}`}
-            data-testid={`Select diacritics for ${props.propertyTemplate.label}`}
-            onClick={toggleDiacritics}
-          >
-            &auml;
-          </button>
-        </div>
-        {error && <span className="invalid-feedback">{error}</span>}
-      </div>
-      {addedList}
-      <DiacriticsSelection
-        id={diacriticsId}
-        handleAddCharacter={handleAddCharacter}
-        closeDiacritics={closeDiacritics}
-        showDiacritics={showDiacritics}
-      />
-    </div>
-  )
-}
-
-InputLiteral.propTypes = {
-  displayValidations: PropTypes.bool,
-  property: PropTypes.object.isRequired,
-  propertyTemplate: PropTypes.object.isRequired,
-  addValue: PropTypes.func,
-  content: PropTypes.string,
-  propertyLabelId: PropTypes.string.isRequired,
-}
-
-const mapStateToProps = (state, ownProps) => ({
-  displayValidations: displayResourceValidations(
-    state,
-    ownProps.property?.rootSubjectKey
-  ),
-})
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators({ addValue }, dispatch)
-
-export default connect(mapStateToProps, mapDispatchToProps)(InputLiteral)
diff --git a/src/components/editor/property/InputLookup.jsx b/src/components/editor/property/InputLookup.jsx
index b7f745bb8..c66e926dd 100644
--- a/src/components/editor/property/InputLookup.jsx
+++ b/src/components/editor/property/InputLookup.jsx
@@ -16,7 +16,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import { faGlobe, faTrashAlt } from "@fortawesome/free-solid-svg-icons"
 import ResourceList from "./ResourceList"
 import Lookup from "./Lookup"
-import useDiacritics from "hooks/useDiacritics"
+import useDiacritics from "hooks/useDiacriticsLegacy"
 import DiacriticsSelection from "components/editor/diacritics/DiacriticsSelection"
 
 const InputLookup = (props) => {
diff --git a/src/components/editor/property/LanguageButton.jsx b/src/components/editor/property/LanguageButton.jsx
index 716a82960..197acdea8 100644
--- a/src/components/editor/property/LanguageButton.jsx
+++ b/src/components/editor/property/LanguageButton.jsx
@@ -3,7 +3,7 @@
 import React from "react"
 import PropTypes from "prop-types"
 import { useDispatch, useSelector, connect } from "react-redux"
-import InputLang from "./InputLang"
+import InputLang from "components/editor/inputs/InputLang"
 import { showModal } from "actions/modals"
 import { selectLanguageLabel } from "selectors/languages"
 import { selectCurrentResourceIsReadOnly } from "selectors/resources"
diff --git a/src/components/editor/property/NestedPropertyHeader.jsx b/src/components/editor/property/NestedPropertyHeader.jsx
index 8fb90ff4b..ff404f473 100644
--- a/src/components/editor/property/NestedPropertyHeader.jsx
+++ b/src/components/editor/property/NestedPropertyHeader.jsx
@@ -100,17 +100,18 @@ const NestedPropertyHeader = (props) => {
         />
       </strong>
       <PropertyLabelInfo propertyTemplate={props.propertyTemplate} />
-      <button
-        type="button"
-        className="btn btn-sm btn-remove pull-right"
-        disabled={readOnly}
-        onClick={() => props.contractProperty(props.property.key)}
-        aria-label={`Remove ${props.propertyTemplate.label}`}
-        data-testid={`Remove ${props.propertyTemplate.label}`}
-        data-id={props.property.key}
-      >
-        <FontAwesomeIcon className="trash-icon" icon={trashIcon} />
-      </button>
+      {!readOnly && (
+        <button
+          type="button"
+          className="btn btn-sm btn-remove pull-right"
+          onClick={() => props.contractProperty(props.property.key)}
+          aria-label={`Remove ${props.propertyTemplate.label}`}
+          data-testid={`Remove ${props.propertyTemplate.label}`}
+          data-id={props.property.key}
+        >
+          <FontAwesomeIcon className="trash-icon" icon={trashIcon} />
+        </button>
+      )}
     </div>
   )
 }
diff --git a/src/components/editor/property/PropertyComponent.jsx b/src/components/editor/property/PropertyComponent.jsx
index 414259d7d..921b71557 100644
--- a/src/components/editor/property/PropertyComponent.jsx
+++ b/src/components/editor/property/PropertyComponent.jsx
@@ -1,50 +1,58 @@
 // Copyright 2019 Stanford University see LICENSE for license
 
 import React from "react"
+import { useSelector } from "react-redux"
 import PropTypes from "prop-types"
-import InputLiteral from "./InputLiteral"
+import InputLiteral from "../inputs/InputLiteral"
 import InputURI from "./InputURI"
 import InputList from "./InputList"
 import InputLookup from "./InputLookup"
 import NestedResource from "./NestedResource"
+import ReadOnlyInputLiteral from "../inputs/ReadOnlyInputLiteral"
 import Alert from "../../Alert"
+import { selectCurrentResourceIsReadOnly } from "selectors/resources"
+import { displayResourceValidations } from "selectors/errors"
 
 // Decides how to render this property.
-const PropertyComponent = (props) => {
+const PropertyComponent = ({ property, propertyTemplate, propertyLabelId }) => {
+  const readOnly = useSelector((state) =>
+    selectCurrentResourceIsReadOnly(state)
+  )
+  const displayValidations = useSelector((state) =>
+    displayResourceValidations(state, property.rootSubjectKey)
+  )
+
   // Might be tempted to use lazy / suspense here, but it forces a remounting of components.
-  switch (props.propertyTemplate.component) {
+  switch (propertyTemplate.component) {
     case "NestedResource":
-      return props.property.valueKeys.map((valueKey) => (
+      return property.valueKeys.map((valueKey) => (
         <NestedResource key={valueKey} valueKey={valueKey} />
       ))
     case "InputLiteral":
+      if (readOnly) {
+        return <ReadOnlyInputLiteral propertyKey={property.key} />
+      }
       return (
         <InputLiteral
-          propertyLabelId={props.propertyLabelId}
-          property={props.property}
-          propertyTemplate={props.propertyTemplate}
+          property={property}
+          propertyTemplate={propertyTemplate}
+          displayValidations={displayValidations}
         />
       )
     case "InputURI":
       return (
-        <InputURI
-          property={props.property}
-          propertyTemplate={props.propertyTemplate}
-        />
+        <InputURI property={property} propertyTemplate={propertyTemplate} />
       )
     case "InputLookup":
       return (
-        <InputLookup
-          property={props.property}
-          propertyTemplate={props.propertyTemplate}
-        />
+        <InputLookup property={property} propertyTemplate={propertyTemplate} />
       )
     case "InputList":
       return (
         <InputList
-          propertyLabelId={props.propertyLabelId}
-          property={props.property}
-          propertyTemplate={props.propertyTemplate}
+          propertyLabelId={propertyLabelId}
+          property={property}
+          propertyTemplate={propertyTemplate}
         />
       )
     default:
diff --git a/src/hooks/useDiacritics.js b/src/hooks/useDiacritics.js
index 85a67d8cc..80e8ce1eb 100644
--- a/src/hooks/useDiacritics.js
+++ b/src/hooks/useDiacritics.js
@@ -1,18 +1,19 @@
 import { useState } from "react"
 
-const useDiacritics = (inputRef, inputId, diacriticsId) => {
+const useDiacritics = (
+  inputRef,
+  inputId,
+  diacriticsId,
+  diacriticsBtnId,
+  defaultContent
+) => {
   const [showDiacritics, setShowDiacritics] = useState(false)
-  const [currentContent, setCurrentContent] = useState("")
+  const [currentContent, setCurrentContent] = useState(defaultContent)
   const [currentPosition, setCurrentPosition] = useState(0)
 
   const handleKeyDownDiacritics = (event) => {
     // Handle any position changing
-    setCurrentPosition(event.target.selectionStart)
-  }
-
-  const clearContent = () => {
-    setCurrentContent("")
-    setCurrentPosition(0)
+    setCurrentPosition(event.target.selectionStart + 1)
   }
 
   const handleChangeDiacritics = (event) => {
@@ -26,6 +27,7 @@ const useDiacritics = (inputRef, inputId, diacriticsId) => {
       return false
     }
     if (focusIn(event, inputId)) return false
+    if (focusIn(event, diacriticsBtnId)) return false
 
     setShowDiacritics(false)
 
@@ -65,11 +67,11 @@ const useDiacritics = (inputRef, inputId, diacriticsId) => {
     setCurrentPosition(currentPosition + 1)
   }
 
-  const handleClickDiacritics = () =>
+  const handleClickDiacritics = () => {
     setCurrentPosition(inputRef.current.selectionStart)
+  }
 
   return {
-    clearContent,
     handleKeyDownDiacritics,
     handleChangeDiacritics,
     handleBlurDiacritics,
@@ -78,9 +80,6 @@ const useDiacritics = (inputRef, inputId, diacriticsId) => {
     handleAddCharacter,
     handleClickDiacritics,
     currentContent,
-    setCurrentContent,
-    currentPosition,
-    setCurrentPosition,
     showDiacritics,
   }
 }
diff --git a/src/hooks/useDiacriticsLegacy.js b/src/hooks/useDiacriticsLegacy.js
new file mode 100644
index 000000000..85a67d8cc
--- /dev/null
+++ b/src/hooks/useDiacriticsLegacy.js
@@ -0,0 +1,88 @@
+import { useState } from "react"
+
+const useDiacritics = (inputRef, inputId, diacriticsId) => {
+  const [showDiacritics, setShowDiacritics] = useState(false)
+  const [currentContent, setCurrentContent] = useState("")
+  const [currentPosition, setCurrentPosition] = useState(0)
+
+  const handleKeyDownDiacritics = (event) => {
+    // Handle any position changing
+    setCurrentPosition(event.target.selectionStart)
+  }
+
+  const clearContent = () => {
+    setCurrentContent("")
+    setCurrentPosition(0)
+  }
+
+  const handleChangeDiacritics = (event) => {
+    setCurrentContent(event.target.value)
+    event.preventDefault()
+  }
+
+  const handleBlurDiacritics = (event) => {
+    if (focusIn(event, diacriticsId)) {
+      setCurrentPosition(inputRef.current.selectionStart)
+      return false
+    }
+    if (focusIn(event, inputId)) return false
+
+    setShowDiacritics(false)
+
+    return true
+  }
+
+  const toggleDiacritics = (event) => {
+    setShowDiacritics(!showDiacritics)
+
+    event.preventDefault()
+  }
+
+  const closeDiacritics = () => {
+    setShowDiacritics(false)
+    inputRef.current.focus()
+  }
+
+  const focusIn = (event, checkId) => {
+    if (event.relatedTarget === null) return false
+
+    let node = event.relatedTarget
+
+    while (node !== null) {
+      if (node.id === checkId) return true
+      node = node.parentNode
+    }
+
+    return false
+  }
+
+  const handleAddCharacter = (character) => {
+    setCurrentContent(
+      currentContent.slice(0, currentPosition) +
+        character +
+        currentContent.slice(currentPosition)
+    )
+    setCurrentPosition(currentPosition + 1)
+  }
+
+  const handleClickDiacritics = () =>
+    setCurrentPosition(inputRef.current.selectionStart)
+
+  return {
+    clearContent,
+    handleKeyDownDiacritics,
+    handleChangeDiacritics,
+    handleBlurDiacritics,
+    toggleDiacritics,
+    closeDiacritics,
+    handleAddCharacter,
+    handleClickDiacritics,
+    currentContent,
+    setCurrentContent,
+    currentPosition,
+    setCurrentPosition,
+    showDiacritics,
+  }
+}
+
+export default useDiacritics
diff --git a/src/hooks/useNavigableComponent.js b/src/hooks/useNavigableComponent.js
index 77e9675cd..b87a9eaf3 100644
--- a/src/hooks/useNavigableComponent.js
+++ b/src/hooks/useNavigableComponent.js
@@ -1,4 +1,4 @@
-import { useLayoutEffect, useRef } from "react"
+import { useLayoutEffect, useRef, useState } from "react"
 import { setCurrentComponent } from "actions/index"
 import { useDispatch, useSelector } from "react-redux"
 import { selectCurrentComponentKey } from "selectors/index"
@@ -12,11 +12,18 @@ const useNavigableComponent = (
   const currentComponentKey = useSelector((state) =>
     selectCurrentComponentKey(state, rootSubjectKey)
   )
+  const [lastComponentKey, setLastComponentKey] = useState(null)
 
   useLayoutEffect(() => {
-    if (componentKey === currentComponentKey && !isVisible(navEl.current))
+    if (
+      componentKey === currentComponentKey &&
+      lastComponentKey !== currentComponentKey &&
+      !isVisible(navEl.current)
+    ) {
       navEl.current.scrollIntoView({ behavior: "smooth" })
-  })
+      setLastComponentKey(currentComponentKey)
+    }
+  }, [componentKey, currentComponentKey, lastComponentKey])
 
   // From  https://blogreact.com/check-element-is-in-viewport/
   const isVisible = (el) => {
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 37e68a8e4..a741e782b 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -2,6 +2,8 @@
 
 import { combineReducers } from "redux"
 import { setUser, removeUser } from "./authenticate"
+import { setLanguage, languagesReceived } from "./languages"
+import { groupsReceived } from "./groups"
 import {
   setBaseURL,
   hideProperty,
@@ -21,9 +23,8 @@ import {
   setValueOrder,
   clearResourceFromEditor,
   saveResourceFinishedEditor,
+  updateLiteralValue,
 } from "./resources"
-import { setLanguage, languagesReceived } from "./languages"
-import { groupsReceived } from "./groups"
 import {
   hideValidationErrors,
   addError,
@@ -112,6 +113,7 @@ const entityHandlers = {
   SET_RESOURCE_GROUP: setResourceGroup,
   SET_VALUE_ORDER: setValueOrder,
   SHOW_PROPERTY: showProperty,
+  UPDATE_LITERAL_VALUE: updateLiteralValue,
 }
 
 const historyHandlers = {
diff --git a/src/reducers/resources.js b/src/reducers/resources.js
index 999141d8c..bc5440929 100644
--- a/src/reducers/resources.js
+++ b/src/reducers/resources.js
@@ -1,5 +1,6 @@
 import _ from "lodash"
 import { resourceEditErrorKey } from "components/editor/Editor"
+import { emptyValue } from "utilities/Utilities"
 
 export const setBaseURL = (state, action) => {
   const newState = stateWithNewSubject(state, action.payload.resourceKey)
@@ -206,7 +207,7 @@ const addPropertyToNewState = (state, property) => {
   }
 
   // Errors
-  newState = updateErrors(newState, newProperty.key)
+  newState = updatePropertyErrors(newState, newProperty.key)
   newProperty = newState.properties[newProperty.key]
 
   // If changed, then set resource as changed.
@@ -232,6 +233,9 @@ const addValueToNewState = (state, value, siblingValueKey) => {
     delete newValue.property
   }
 
+  // langLabel
+  delete newValue.langLabel
+
   // Add value to state
   let newState = stateWithNewValue(state, newValue.key)
   newState.values[newValue.key] = newValue
@@ -281,26 +285,64 @@ const addValueToNewState = (state, value, siblingValueKey) => {
     delete newValue.valueSubject
   }
 
-  // Add value key to ancestors (for URIs and literals)
+  // Add/remove value key to ancestors (for URIs and literals)
   if (!newValue.valueSubjectKey) {
     newState = recursiveAncestorsFromValue(
       newState,
       newValue.key,
-      addToDescUriOrLiteralValueKeysFunc(newValue.key)
+      emptyValue(newValue)
+        ? removeFromDescUriOrLiteralValueKeysFunc(newValue.key)
+        : addToDescUriOrLiteralValueKeysFunc(newValue.key)
     )
   }
 
   // Errors
-  newState = updateErrors(newState, newProperty.key)
+  newState = updatePropertyErrors(newState, newProperty.key)
+  newState = updateValueErrors(newState, newValue.key)
 
   // Update Bibframe refs
   newState = updateBibframeRefs(newState, newValue, newProperty)
 
   // If changed, then set resource as changed.
   newValue = newState.values[newValue.key]
+  // Preventing marking changed when adding a blank value.
+  if (!_.isEqual(newValue, oldValue) && (oldValue || !emptyValue(newValue))) {
+    newState = setSubjectChanged(newState, newValue.rootSubjectKey, true)
+  }
+  return newState
+}
+
+export const updateLiteralValue = (state, action) => {
+  const { valueKey, literal, lang } = action.payload
+
+  const oldValue = state.values[valueKey]
+  const newValue = { ...oldValue, literal, lang }
+
+  let newState = {
+    ...state,
+    values: {
+      ...state.values,
+      [valueKey]: newValue,
+    },
+  }
+
+  // Add/remove value key to ancestors
+  newState = recursiveAncestorsFromValue(
+    newState,
+    newValue.key,
+    emptyValue(newValue)
+      ? removeFromDescUriOrLiteralValueKeysFunc(newValue.key)
+      : addToDescUriOrLiteralValueKeysFunc(newValue.key)
+  )
+
+  // Errors
+  newState = updateValueErrors(newState, valueKey)
+
+  // If changed, then set resource as changed.
   if (!_.isEqual(newValue, oldValue)) {
     newState = setSubjectChanged(newState, newValue.rootSubjectKey, true)
   }
+
   return newState
 }
 
@@ -355,7 +397,7 @@ export const removeValue = (state, action) => {
   )
 
   // Errors
-  newState = updateErrors(newState, newProperty.key)
+  newState = updatePropertyErrors(newState, newProperty.key)
 
   newState = recursiveAncestorsFromValue(
     newState,
@@ -425,9 +467,11 @@ export const removeSubject = (state, action) => {
   return newState
 }
 
-const errorsForProperty = (property, propertyTemplate) => {
+const errorsForProperty = (property, state) => {
+  // For now this is URI only. It will go away when InputURI is refactored.
+  const propertyTemplate = state.propertyTemplates[property.propertyTemplateKey]
   if (
-    propertyTemplate.type !== "resource" &&
+    propertyTemplate.type === "uri" &&
     propertyTemplate.required &&
     _.isEmpty(property.valueKeys)
   ) {
@@ -436,14 +480,29 @@ const errorsForProperty = (property, propertyTemplate) => {
   return []
 }
 
-const updateErrors = (state, propertyKey) => {
+const errorsForValue = (value, state) => {
+  // For now, only for literal.
+  const property = state.properties[value.propertyKey]
+  const propertyTemplate = state.propertyTemplates[property.propertyTemplateKey]
+  // For now, only for literal.
+  if (propertyTemplate.type !== "literal") return []
+
+  // If this is first value, then must have a literal value.
+  if (
+    value.key === property.valueKeys[0] &&
+    propertyTemplate.required &&
+    !value.literal
+  )
+    return ["Required"]
+
+  return []
+}
+
+const updatePropertyErrors = (state, propertyKey) => {
   let newState = stateWithNewProperty(state, propertyKey)
   const newProperty = newState.properties[propertyKey]
 
-  const errors = errorsForProperty(
-    newProperty,
-    newState.propertyTemplates[newProperty.propertyTemplateKey]
-  )
+  const errors = errorsForProperty(newProperty, newState)
   newProperty.errors = errors
 
   if (_.isEmpty(errors)) {
@@ -464,6 +523,31 @@ const updateErrors = (state, propertyKey) => {
   return newState
 }
 
+const updateValueErrors = (state, valueKey) => {
+  let newState = stateWithNewValue(state, valueKey)
+  const newValue = newState.values[valueKey]
+
+  const errors = errorsForValue(newValue, newState)
+  newValue.errors = errors
+
+  if (_.isEmpty(errors)) {
+    // Remove key from descWithErrorPropertyKeys for self and ancestors.
+    newState = recursiveAncestorsFromProperty(
+      newState,
+      newValue.propertyKey,
+      removeFromDescWithErrorPropertyKeysFunc(newValue.propertyKey)
+    )
+  } else {
+    // Add key to descWithErrorPropertyKeys for self and ancestors.
+    newState = recursiveAncestorsFromProperty(
+      newState,
+      newValue.propertyKey,
+      addToDescWithErrorPropertyKeysFunc(newValue.propertyKey)
+    )
+  }
+  return newState
+}
+
 export const clearResourceFromEditor = (state, action) => {
   const resourceKey = action.payload
   const newState = {
diff --git a/src/selectors/groups.js b/src/selectors/groups.js
index e4aa33b96..41623f854 100644
--- a/src/selectors/groups.js
+++ b/src/selectors/groups.js
@@ -1,8 +1,7 @@
 // Copyright 2021 Stanford University see LICENSE for license
+import _ from "lodash"
 
-export const hasGroups = (state) => {
-  Object.keys(state.entities.groupMap).length > 0
-}
+export const hasGroups = (state) => !_.isEmpty(state.entities.groupMap)
 
 export const selectGroupMap = (state) => state.entities.groupMap
 
diff --git a/src/selectors/resources.js b/src/selectors/resources.js
index 0322bce05..d3a80ce4f 100644
--- a/src/selectors/resources.js
+++ b/src/selectors/resources.js
@@ -4,6 +4,7 @@ import {
   selectSubjectTemplate,
   selectPropertyTemplate,
 } from "selectors/templates"
+import { selectLanguageLabel } from "selectors/languages"
 
 // Always use selectNormSubject/Property/Value in components.
 // selectSubject/Property/Value can be used in actionCreators.
@@ -64,6 +65,8 @@ export const selectValue = (state, key) => {
   )
   newValue.property = newProperty
   newValue.valueSubject = selectSubject(state, newValue.valueSubjectKey)
+  if (newValue.lang)
+    newValue.langLabel = selectLanguageLabel(state, newValue.lang)
   return newValue
 }
 
diff --git a/src/utilities/Utilities.js b/src/utilities/Utilities.js
index 60a15b956..ad031a6f4 100644
--- a/src/utilities/Utilities.js
+++ b/src/utilities/Utilities.js
@@ -136,3 +136,6 @@ export const datasetFromRdf = (rdf) => {
   }
   return datasetFromJsonld(json)
 }
+
+export const emptyValue = (value) =>
+  !value.literal && !value.uri && !value.subjectValueKey