diff --git a/Pipfile.lock b/Pipfile.lock
index e23c2a88..c1fcf5c0 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -30,14 +30,6 @@
             "index": "pypi",
             "version": "==1.4.2"
         },
-        "amqp": {
-            "hashes": [
-                "sha256:70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21",
-                "sha256:aa7f313fb887c91f15474c1229907a04dac0b8135822d6603437803424c0aa59"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==2.6.1"
-        },
         "aniso8601": {
             "hashes": [
                 "sha256:529dcb1f5f26ee0df6c0a1ee84b7b27197c3c50fc3a6321d66c544689237d072",
@@ -50,7 +42,6 @@
                 "sha256:0ef97238856430dcf9228e07f316aefc17e8939fc8507e18c6501b761ef1a42a",
                 "sha256:2867b7b9f8326499ab5b0e2d12801fa5c98842d2cbd22b35112ae04bf85b4dff"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.1.0"
         },
         "babel": {
@@ -58,7 +49,6 @@
                 "sha256:1aac2ae2d0d8ea368fa90906567f5c08463d98ade155c0c4bfedd6a0f7160e38",
                 "sha256:d670ea0b10f8b723672d3a6abeb87b565b244da220d76b4dba1b66269ec152d4"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.8.0"
         },
         "bcrypt": {
@@ -71,7 +61,6 @@
                 "sha256:cd1ea2ff3038509ea95f687256c46b79f5fc382ad0aa3664d200047546d511d1",
                 "sha256:cdcdcb3972027f83fe24a48b1e90ea4b584d35f1cc279d76de6fc4b13376239d"
             ],
-            "markers": "python_version >= '3.6'",
             "version": "==3.2.0"
         },
         "beautifulsoup4": {
@@ -82,27 +71,12 @@
             ],
             "version": "==4.9.1"
         },
-        "billiard": {
-            "hashes": [
-                "sha256:bff575450859a6e0fbc2f9877d9b715b0bbc07c3565bb7ed2280526a0cdf5ede",
-                "sha256:d91725ce6425f33a97dfa72fb6bfef0e47d4652acd98a032bd1a7fbf06d5fa6a"
-            ],
-            "version": "==3.6.3.0"
-        },
         "blinker": {
             "hashes": [
                 "sha256:471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6"
             ],
             "version": "==1.4"
         },
-        "celery": {
-            "hashes": [
-                "sha256:a92e1d56e650781fb747032a3997d16236d037c8199eacd5217d1a72893bca45",
-                "sha256:d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==4.4.7"
-        },
         "certifi": {
             "hashes": [
                 "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3",
@@ -155,7 +129,6 @@
                 "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a",
                 "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==7.1.2"
         },
         "clickclick": {
@@ -172,14 +145,6 @@
             ],
             "version": "==0.9.1"
         },
-        "configparser": {
-            "hashes": [
-                "sha256:2ca44140ee259b5e3d8aaf47c79c36a7ab0d5e94d70bd4105c03ede7a20ea5a1",
-                "sha256:cffc044844040c7ce04e9acd1838b5f2e5fa3170182f6fda4d2ea8b0099dbadd"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==5.0.0"
-        },
         "connexion": {
             "extras": [
                 "swagger-ui"
@@ -236,7 +201,6 @@
                 "sha256:525ba66fb5f90b07169fdd48b6373c18f1ee12728ca277ca44567a367d9d7f74",
                 "sha256:a766c1dccb30c5f6eb2b203f87edd1d8588847709c78589e1521d769addc8218"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.2.10"
         },
         "docutils": {
@@ -244,7 +208,6 @@
                 "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af",
                 "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==0.16"
         },
         "docxtpl": {
@@ -327,16 +290,8 @@
                 "sha256:05b31d2034dd3f2a685cbbae4cfc4ed906b2a733cff7964ada450fd5e462b84e",
                 "sha256:bfc7150eaf809b1c283879302f04c42791136060c6eeb12c0c6674fb1291fae5"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.4.4"
         },
-        "future": {
-            "hashes": [
-                "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"
-            ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==0.18.2"
-        },
         "gunicorn": {
             "hashes": [
                 "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626",
@@ -357,7 +312,6 @@
                 "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
                 "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.10"
         },
         "imagesize": {
@@ -365,23 +319,20 @@
                 "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1",
                 "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.2.0"
         },
         "inflection": {
             "hashes": [
-                "sha256:88b101b2668a1d81d6d72d4c2018e53bc6c7fc544c987849da1c7f77545c3bc9",
-                "sha256:f576e85132d34f5bf7df5183c2c6f94cfb32e528f53065345cf71329ba0b8924"
+                "sha256:1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417",
+                "sha256:f38b2b640938a4f35ade69ac3d053042959b62a0f1076a5bbaa1b9526605a8a2"
             ],
-            "markers": "python_version >= '3.5'",
-            "version": "==0.5.0"
+            "version": "==0.5.1"
         },
         "itsdangerous": {
             "hashes": [
                 "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
                 "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.1.0"
         },
         "jdcal": {
@@ -396,7 +347,6 @@
                 "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0",
                 "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==2.11.2"
         },
         "jsonschema": {
@@ -406,20 +356,9 @@
             ],
             "version": "==3.2.0"
         },
-        "kombu": {
-            "hashes": [
-                "sha256:be48cdffb54a2194d93ad6533d73f69408486483d189fe9f5990ee24255b0e0a",
-                "sha256:ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==4.6.11"
-        },
         "ldap3": {
             "hashes": [
                 "sha256:59d1adcd5ead263387039e2a37d7cd772a2006b1cdb3ecfcbaab5192a601c515",
-                "sha256:7abbb3e5f4522114e0230ec175b60ae968b938d1f8a7d8bce7789f78d871fb9f",
-                "sha256:b399c39e80b6459e349b33fbe9787c1bcbf86de05994d41806a05c06f3e7574d",
-                "sha256:bdaf568cd30fc0006c8bb4f5e6014554afeb0c4bbea1677de9706e278a4057e7",
                 "sha256:df27407f4991f25bd669b5bb1bc8cb9ddf44a3e713ff6b3afeb3b3c26502f88f"
             ],
             "index": "pypi",
@@ -467,7 +406,6 @@
                 "sha256:8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27",
                 "sha256:93729a258e4ff0747c876bd9e20df1b9758028946e976324ccd2d68245c7b6a9"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.1.3"
         },
         "markdown": {
@@ -514,7 +452,6 @@
                 "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7",
                 "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.1.1"
         },
         "marshmallow": {
@@ -570,7 +507,6 @@
                 "sha256:ed8a311493cf5480a2ebc597d1e177231984c818a86875126cfd004241a73c3e",
                 "sha256:ef71a1d4fd4858596ae80ad1ec76404ad29701f8ca7cdcebc50300178db14dfc"
             ],
-            "markers": "python_version >= '3.6'",
             "version": "==1.19.1"
         },
         "openapi-spec-validator": {
@@ -583,18 +519,17 @@
         },
         "openpyxl": {
             "hashes": [
-                "sha256:6e62f058d19b09b95d20ebfbfb04857ad08d0833190516c1660675f699c6186f",
-                "sha256:d88dd1480668019684c66cfff3e52a5de4ed41e9df5dd52e008cbf27af0dbf87"
+                "sha256:18e11f9a650128a12580a58e3daba14e00a11d9e907c554a17ea016bf1a2c71b",
+                "sha256:f7d666b569f729257082cf7ddc56262431878f602dcc2bc3980775c59439cdab"
             ],
             "index": "pypi",
-            "version": "==3.0.4"
+            "version": "==3.0.5"
         },
         "packaging": {
             "hashes": [
                 "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8",
                 "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.4"
         },
         "pandas": {
@@ -657,19 +592,8 @@
         },
         "pyasn1": {
             "hashes": [
-                "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359",
-                "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576",
-                "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf",
-                "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7",
                 "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d",
-                "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00",
-                "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8",
-                "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86",
-                "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12",
-                "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776",
-                "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba",
-                "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2",
-                "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3"
+                "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba"
             ],
             "version": "==0.4.8"
         },
@@ -678,7 +602,6 @@
                 "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0",
                 "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.20"
         },
         "pygithub": {
@@ -694,7 +617,6 @@
                 "sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44",
                 "sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324"
             ],
-            "markers": "python_version >= '3.5'",
             "version": "==2.6.1"
         },
         "pyjwt": {
@@ -710,7 +632,6 @@
                 "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1",
                 "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.4.7"
         },
         "pyrsistent": {
@@ -745,9 +666,7 @@
             "hashes": [
                 "sha256:1bf6e860a8ad52a14c3ee1252d5dc25b2030618ed80c022598f00176adc8367d",
                 "sha256:51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b",
-                "sha256:5f98b069316ea1c2ed3f67e7f5df6c0d8f10b689964a4a811ff64f0106819ec8",
-                "sha256:c3da2053dbab6b29c94e43c486ff67206eafbe7eb52dbec7390b5e2fb05aac77",
-                "sha256:ea87e17f6ec459e780e4221f295411462e0d0810858e055fc514684350a2f522"
+                "sha256:5f98b069316ea1c2ed3f67e7f5df6c0d8f10b689964a4a811ff64f0106819ec8"
             ],
             "version": "==1.0.4"
         },
@@ -758,61 +677,6 @@
             "index": "pypi",
             "version": "==0.12.0"
         },
-        "python-levenshtein-wheels": {
-            "hashes": [
-                "sha256:0065529c8aec4c044468286177761857d36981ba6f7fdb62d7d5f7ffd143de5d",
-                "sha256:016924a59d689f9f47d5f7b26b70f31e309255e8dd72602c91e93ceb752b9f92",
-                "sha256:089d046ea7727e583233c71fef1046663ed67b96967063ae8ddc9f551e86a4fc",
-                "sha256:09f9faaaa8f65726f91b44c11d3d622fee0f1780cfbe2bf3f410dd0e7345adcb",
-                "sha256:0aea217eab612acd45dcc3424a2e8dbd977cc309f80359d0c01971f1e65b9a9b",
-                "sha256:0beb91ad80b1573829066e5af36b80190c367be6e0a65292f073353b0388c7fc",
-                "sha256:0ec1bc73f5ed3a1a06e02d13bb3cd22a0b32ebf65a9667bbccba106bfa0546f1",
-                "sha256:0fa2ca69ef803bc6037a8c919e2e8a17b55e94c9c9ffcb4c21befbb15a1d0f40",
-                "sha256:11c77d0d74ab7f46f89a58ae9c2d67349ebc1ae3e18636627f9939d810167c31",
-                "sha256:19a68716a322486ddffc8bf7e5cf44a82f7700b05a10658e6e7fc5c7ae92b13d",
-                "sha256:19a95a01d28d63b042438ba860c4ace90362906a038fa77962ba33325d377d10",
-                "sha256:1a61f3a51e00a3608659bbaabb3f27af37c9dbe84d843369061a3e45cf0d5103",
-                "sha256:1c50aebebab403fb2dd415d70355446ac364dece502b0e2737a1a085bb9a4aa4",
-                "sha256:1d2390d04f9b673391e5ce1a0b054d0565f2e00ea5d1187a044221dc5c02c3e6",
-                "sha256:1e51cdc123625a28709662d24ea0cb4cf6f991845e6054d9f803c78da1d6b08f",
-                "sha256:1eca6dc97dfcf588f53281fe48a6d5c423d4e14bdab658a1aa6efd447acc64e0",
-                "sha256:1f0056d3216b0fe38f25c6f8ebc84bd9f6d34c55a7a9414341b674fb98961399",
-                "sha256:228b59460e9a786e498bdfc8011838b89c6054650b115c86c9c819a055a793b0",
-                "sha256:23020f9ff2cb3457a926dcc470b84f9bd5b7646bd8b8e06b915bdbbc905cb23f",
-                "sha256:2b7b7cf0f43b677f818aa9a610464abf06106c19a51b9ac35bd051a439f337a5",
-                "sha256:3b591c9a7e91480f0d7bf2041d325f578b9b9c2f2d593304377cb28862e7f9a2",
-                "sha256:3ca9c70411ab587d071c1d8fc8b69d0558be8e4aa920f2595e2cb5eb229ccc4c",
-                "sha256:3e6bcca97a7ff4e720352b57ddc26380c0583dcdd4b791acef7b574ad58468a7",
-                "sha256:3ed88f9e638da57647149115c34e0e120cae6f3d35eee7d77e22cc9c1d8eced3",
-                "sha256:445bf7941cb1fa05d6c2a4a502ad4868a5cacd92e8eb77b2bd008cdda9d37c55",
-                "sha256:4ba5e147d76d7ee884fd6eae461438b080bcc9f2c6eb9b576811e1bcfe8f808e",
-                "sha256:4bb128b719c30f3b9feacfe71a338ae07d39dbffc077139416f3535c89f12362",
-                "sha256:4e951907b9b5d40c9f1b611c8bdfe46ff8cf8371877cebbd589bf5840feab662",
-                "sha256:53c0c9964390368fd64460b690f168221c669766b193b7e80ae3950c2b9551f8",
-                "sha256:57c4edef81611098d37176278f2b6a3712bf864eed313496d7d80504805896d1",
-                "sha256:5b36e406937c6463d1c1ef3dd82d3f771d9d845f21351e8a026fe4dd398ea8d0",
-                "sha256:7d0821dab24b430dfdc2cba70a06e6d7a45cb839d0dd0e6db97bb99e23c3d884",
-                "sha256:7f7283dfe50eac8a8cd9b777de9eb50b1edf7dbb46fc7cc9d9b0050d0c135021",
-                "sha256:7f9759095b3fc825464a72b1cae95125e610eba3c70f91557754c32a0bf32ea2",
-                "sha256:8005a4df455569c0d490ddfd9e5a163f21293477fd0ed4ea9effdd723ddd8eaa",
-                "sha256:86e865f29ad3dc3bb4733e5247220173d90f05ac8d2ad18e9689a220f90de55f",
-                "sha256:98727050ba70eb8d318ec8a8203531c20119347fc8f281102b097326812742ab",
-                "sha256:ac9cdf044dcb9481c7da782db01b50c1f0e7cdd78c8507b963b6d072829c0263",
-                "sha256:acfad8ffed96891fe7c583d92717cd8ec0c03b59a954c389fd4e26a5cdeac610",
-                "sha256:ad15f25abff8220e556d64e2a27c646241b08f00faf1bc02313655696cd3edfa",
-                "sha256:b679f951f842c38665aa54bea4d7403099131f71fac6d8584f893a731fe1266d",
-                "sha256:b8c183dc4aa4e95dc5c373eedc3d205c176805835611fcfec5d9050736c695c4",
-                "sha256:c097a6829967c76526a037ed34500a028f78f0d765c8e3dbd1a7717afd09fb92",
-                "sha256:c2c76f483d05eddec60a5cd89e92385adef565a4f243b1d9a6abe2f6bd2a7c0a",
-                "sha256:c388baa3c04272a7c585d3da24030c142353eb26eb531dd2681502e6be7d7a26",
-                "sha256:cb0f2a711db665b5bf8697b5af3b9884bb1139385c5c12c2e472e4bbee62da99",
-                "sha256:cbac984d7b36e75b440d1c8ff9d3425d778364a0cbc23f8943383d4decd35d5e",
-                "sha256:f55adf069be2d655f8d668594fe1be1b84d9dc8106d380a9ada06f34941c33c8",
-                "sha256:f9084ed3b8997ad4353d124b903f2860a9695b9e080663276d9e58c32e293244",
-                "sha256:fb7df3504222fcb1fa593f76623abbb54d6019eec15aac5d05cd07ad90ac016c"
-            ],
-            "version": "==0.13.1"
-        },
         "pytz": {
             "hashes": [
                 "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed",
@@ -868,7 +732,6 @@
                 "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
                 "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.15.0"
         },
         "snowballstemmer": {
@@ -883,7 +746,6 @@
                 "sha256:1634eea42ab371d3d346309b93df7870a88610f0725d47528be902a0d95ecc55",
                 "sha256:a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232"
             ],
-            "markers": "python_version >= '3.5'",
             "version": "==2.0.1"
         },
         "sphinx": {
@@ -899,7 +761,6 @@
                 "sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a",
                 "sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"
             ],
-            "markers": "python_version >= '3.5'",
             "version": "==1.0.2"
         },
         "sphinxcontrib-devhelp": {
@@ -907,7 +768,6 @@
                 "sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e",
                 "sha256:ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"
             ],
-            "markers": "python_version >= '3.5'",
             "version": "==1.0.2"
         },
         "sphinxcontrib-htmlhelp": {
@@ -915,7 +775,6 @@
                 "sha256:3c0bc24a2c41e340ac37c85ced6dafc879ab485c095b1d65d2461ac2f7cca86f",
                 "sha256:e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b"
             ],
-            "markers": "python_version >= '3.5'",
             "version": "==1.0.3"
         },
         "sphinxcontrib-jsmath": {
@@ -923,7 +782,6 @@
                 "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178",
                 "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"
             ],
-            "markers": "python_version >= '3.5'",
             "version": "==1.0.1"
         },
         "sphinxcontrib-qthelp": {
@@ -931,7 +789,6 @@
                 "sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72",
                 "sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6"
             ],
-            "markers": "python_version >= '3.5'",
             "version": "==1.0.3"
         },
         "sphinxcontrib-serializinghtml": {
@@ -939,22 +796,24 @@
                 "sha256:eaa0eccc86e982a9b939b2b82d12cc5d013385ba5eadcc7e4fed23f4405f77bc",
                 "sha256:f242a81d423f59617a8e5cf16f5d4d74e28ee9a66f9e5b637a18082991db5a9a"
             ],
-            "markers": "python_version >= '3.5'",
             "version": "==1.1.4"
         },
         "spiffworkflow": {
             "git": "https://github.com/sartography/SpiffWorkflow.git",
-            "ref": "7f6f791b7b61cda1b93209a55d89da72787951c9"
+            "ref": "0581d29db6fd150ebb5ac86ba114681e2e078396"
         },
         "sqlalchemy": {
             "hashes": [
                 "sha256:072766c3bd09294d716b2d114d46ffc5ccf8ea0b714a4e1c48253014b771c6bb",
                 "sha256:107d4af989831d7b091e382d192955679ec07a9209996bf8090f1f539ffc5804",
                 "sha256:15c0bcd3c14f4086701c33a9e87e2c7ceb3bcb4a246cd88ec54a49cf2a5bd1a6",
+                "sha256:26c5ca9d09f0e21b8671a32f7d83caad5be1f6ff45eef5ec2f6fd0db85fc5dc0",
                 "sha256:276936d41111a501cf4a1a0543e25449108d87e9f8c94714f7660eaea89ae5fe",
                 "sha256:3292a28344922415f939ee7f4fc0c186f3d5a0bf02192ceabd4f1129d71b08de",
                 "sha256:33d29ae8f1dc7c75b191bb6833f55a19c932514b9b5ce8c3ab9bc3047da5db36",
                 "sha256:3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e",
+                "sha256:465c999ef30b1c7525f81330184121521418a67189053bcf585824d833c05b66",
+                "sha256:51064ee7938526bab92acd049d41a1dc797422256086b39c08bafeffb9d304c6",
                 "sha256:5a49e8473b1ab1228302ed27365ea0fadd4bf44bc0f9e73fe38e10fdd3d6b4fc",
                 "sha256:618db68745682f64cedc96ca93707805d1f3a031747b5a0d8e150cfd5055ae4d",
                 "sha256:6547b27698b5b3bbfc5210233bd9523de849b2bb8a0329cd754c9308fc8a05ce",
@@ -969,6 +828,7 @@
                 "sha256:9e865835e36dfbb1873b65e722ea627c096c11b05f796831e3a9b542926e979e",
                 "sha256:aa0554495fe06172b550098909be8db79b5accdf6ffb59611900bea345df5eba",
                 "sha256:b595e71c51657f9ee3235db8b53d0b57c09eee74dfb5b77edff0e46d2218dc02",
+                "sha256:b6ff91356354b7ff3bd208adcf875056d3d886ed7cef90c571aef2ab8a554b12",
                 "sha256:b70bad2f1a5bd3460746c3fb3ab69e4e0eb5f59d977a23f9b66e5bdc74d97b86",
                 "sha256:c7adb1f69a80573698c2def5ead584138ca00fff4ad9785a4b0b2bf927ba308d",
                 "sha256:c898b3ebcc9eae7b36bd0b4bbbafce2d8076680f6868bcbacee2d39a7a9726a7",
@@ -977,7 +837,6 @@
                 "sha256:f2e8a9c0c8813a468aa659a01af6592f71cd30237ec27c4cc0683f089f90dcfc",
                 "sha256:fe7fe11019fc3e6600819775a7d55abc5446dda07e9795f5954fdbf8a49e1c37"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.3.19"
         },
         "swagger-ui-bundle": {
@@ -993,23 +852,13 @@
                 "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a",
                 "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
             "version": "==1.25.10"
         },
-        "vine": {
-            "hashes": [
-                "sha256:133ee6d7a9016f177ddeaf191c1f58421a1dcc6ee9a42c58b34bed40e1d2cd87",
-                "sha256:ea4947cc56d1fd6f2095c8d543ee25dad966f78692528e68b4fada11ba3f98af"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.3.0"
-        },
         "waitress": {
             "hashes": [
                 "sha256:1bb436508a7487ac6cb097ae7a7fe5413aefca610550baf58f0940e51ecfb261",
                 "sha256:3d633e78149eb83b60a07dfabb35579c29aac2d24bb803c18b26fb2ab1a584db"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==1.4.4"
         },
         "webob": {
@@ -1017,7 +866,6 @@
                 "sha256:a3c89a8e9ba0aeb17382836cdb73c516d0ecf6630ec40ec28288f3ed459ce87b",
                 "sha256:aa3a917ed752ba3e0b242234b2a373f9c4e2a75d35291dcbe977649bd21fd108"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.8.6"
         },
         "webtest": {
@@ -1072,7 +920,6 @@
                 "sha256:0ef97238856430dcf9228e07f316aefc17e8939fc8507e18c6501b761ef1a42a",
                 "sha256:2867b7b9f8326499ab5b0e2d12801fa5c98842d2cbd22b35112ae04bf85b4dff"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.1.0"
         },
         "coverage": {
@@ -1127,7 +974,6 @@
                 "sha256:68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5",
                 "sha256:b78134b2063dd214000685165d81c154522c3ee0a1c0d4d113c80361c234c5a2"
             ],
-            "markers": "python_version >= '3.5'",
             "version": "==8.4.0"
         },
         "packaging": {
@@ -1135,7 +981,6 @@
                 "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8",
                 "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.4"
         },
         "pbr": {
@@ -1151,7 +996,6 @@
                 "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0",
                 "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==0.13.1"
         },
         "py": {
@@ -1159,7 +1003,6 @@
                 "sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2",
                 "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.9.0"
         },
         "pyparsing": {
@@ -1167,7 +1010,6 @@
                 "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1",
                 "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.4.7"
         },
         "pytest": {
@@ -1183,7 +1025,6 @@
                 "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
                 "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.15.0"
         },
         "toml": {
diff --git a/crc/static/bpmn/core_info/SponsorList.xls b/crc/static/bpmn/core_info/SponsorList.xls
index 7bb3882c..98b9f270 100644
Binary files a/crc/static/bpmn/core_info/SponsorList.xls and b/crc/static/bpmn/core_info/SponsorList.xls differ
diff --git a/crc/static/bpmn/core_info/core_info.bpmn b/crc/static/bpmn/core_info/core_info.bpmn
index 9763ced6..b5c7d6cc 100644
--- a/crc/static/bpmn/core_info/core_info.bpmn
+++ b/crc/static/bpmn/core_info/core_info.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_0be39yr" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_0be39yr" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.3">
   <bpmn:process id="Process_1cme33c" isExecutable="false">
     <bpmn:parallelGateway id="ParallelGateway_0ecwf3g">
       <bpmn:incoming>Flow_1wqp7vf</bpmn:incoming>
@@ -130,14 +130,17 @@
       <bpmn:incoming>Flow_1d4dncx</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1o39rt4</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:userTask id="UserTask_0ebxkp7" name="Enter Study Info" camunda:formKey="Study Info">
+    <bpmn:userTask id="UserTask_0ebxkp7" name="Enter Study Info" camunda:formKey="StudyInfo">
       <bpmn:extensionElements>
         <camunda:formData>
           <camunda:formField id="StudyShortName" label="Study Short Name" type="string">
             <camunda:properties>
               <camunda:property id="help" value="- This title is primarily used for Office of Grants and Contracts / Office of Sponsored Programs (OGC/OSP) related processes.\n- Length limit: 30 characters. It is automatically populated on Save based on School, Award Owning Organization, PI&#39;s computing ID, and study short name provided earlier and used for the workflow." />
-              <camunda:property id="description" value="Important: Until the system integration with ResearchUVa is in place, for consistency and alignment, please remember to enter this same title when you complete ePRF information in ResearchUVa." />
+              <camunda:property id="description" value="Important: Limit is 17 characters.  Until the system integration with ResearchUVa is in place, for consistency and alignment, please remember to enter this same title when you complete ePRF information in ResearchUVa." />
             </camunda:properties>
+            <camunda:validation>
+              <camunda:constraint name="max_length" config="17" />
+            </camunda:validation>
           </camunda:formField>
           <camunda:formField id="FullProtocolTitle" label="Full Protocol Title" type="string">
             <camunda:properties>
@@ -212,8 +215,7 @@
     <bpmn:scriptTask id="Activity_10nxpt2" name="Load Study Details">
       <bpmn:incoming>SequenceFlow_1r3yrhy</bpmn:incoming>
       <bpmn:outgoing>Flow_09h1imz</bpmn:outgoing>
-      <bpmn:script>StudyInfo = {}
-StudyInfo['details'] = study_info('details')</bpmn:script>
+      <bpmn:script>details = study_info('details')</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:businessRuleTask id="Activity_PBMultiSiteCheckQ12" name="PB Multi-Site Check Q12" camunda:decisionRef="Decision_core_info_multi_site_q12">
       <bpmn:incoming>Flow_09h1imz</bpmn:incoming>
@@ -257,7 +259,7 @@ StudyInfo['details'] = study_info('details')</bpmn:script>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1v7oplk_di" bpmnElement="SequenceFlow_1v7oplk">
         <di:waypoint x="1215" y="325" />
-        <di:waypoint x="1268" y="325" />
+        <di:waypoint x="1282" y="325" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0rw17h2_di" bpmnElement="SequenceFlow_0rw17h2">
         <di:waypoint x="1090" y="500" />
@@ -305,7 +307,7 @@ StudyInfo['details'] = study_info('details')</bpmn:script>
         <dc:Bounds x="1165" y="300" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_16uwhzg_di" bpmnElement="EndEvent_16uwhzg">
-        <dc:Bounds x="1268" y="307" width="36" height="36" />
+        <dc:Bounds x="1282" y="307" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1mhzkcr_di" bpmnElement="StartEvent_1mhzkcr">
         <dc:Bounds x="152" y="307" width="36" height="36" />
diff --git a/crc/static/bpmn/core_info/decision_core_info_multi_site_q12.dmn b/crc/static/bpmn/core_info/decision_core_info_multi_site_q12.dmn
index e4804c9e..f273641a 100644
--- a/crc/static/bpmn/core_info/decision_core_info_multi_site_q12.dmn
+++ b/crc/static/bpmn/core_info/decision_core_info_multi_site_q12.dmn
@@ -7,7 +7,7 @@
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="PB - Is Multi-Site">
         <inputExpression id="inputExpression_1" typeRef="string">
-          <text>StudyInfo.details.IS_MULTI_SITE</text>
+          <text>details.IS_MULTI_SITE</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Task Header" name="ElementDoc_MultiSite_Q12" typeRef="string" />
diff --git a/crc/static/bpmn/core_info/decision_core_info_multi_site_q14.dmn b/crc/static/bpmn/core_info/decision_core_info_multi_site_q14.dmn
index d19b20b4..f255c3ef 100644
--- a/crc/static/bpmn/core_info/decision_core_info_multi_site_q14.dmn
+++ b/crc/static/bpmn/core_info/decision_core_info_multi_site_q14.dmn
@@ -7,7 +7,7 @@
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="PB - MultiSite UVA PI">
         <inputExpression id="inputExpression_1" typeRef="string">
-          <text>StudyInfo.details.IS_UVA_PI_MULTI</text>
+          <text>details.IS_UVA_PI_MULTI</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Task Header" name="ElementDoc_MultiSite_Q14" typeRef="string" />
diff --git a/crc/static/bpmn/data_security_plan/NEW_DSP_template.docx b/crc/static/bpmn/data_security_plan/NEW_DSP_template.docx
index f6faeb28..f72d24f7 100644
Binary files a/crc/static/bpmn/data_security_plan/NEW_DSP_template.docx and b/crc/static/bpmn/data_security_plan/NEW_DSP_template.docx differ
diff --git a/crc/static/bpmn/data_security_plan/data_security_plan.bpmn b/crc/static/bpmn/data_security_plan/data_security_plan.bpmn
index 87b931b9..7bedc399 100644
--- a/crc/static/bpmn/data_security_plan/data_security_plan.bpmn
+++ b/crc/static/bpmn/data_security_plan/data_security_plan.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1wv9t3c" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1wv9t3c" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
   <bpmn:process id="Process_19ej1y2" name="Data Securty Plan" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1co48s3">
       <bpmn:outgoing>SequenceFlow_100w7co</bpmn:outgoing>
@@ -140,11 +140,11 @@
       <bpmn:documentation>UVA servers &amp; websites:</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="CollStorUVaLocUVaServersWebsites" label="Check all that apply:" type="enum">
+          <camunda:formField id="CollStorUVA_LocUVA_ServersWebsites" label="Check all that apply:" type="enum">
             <camunda:properties>
               <camunda:property id="enum_type" value="checkbox" />
               <camunda:property id="help" value="You may locate the server/drive name and path by taking the following steps:\n\n- Windows: Click your “computer icon”, right click on the Drive icon (e.g., F). Then click on ”properties”. The server/drive name and path will appear at the very top of the box.\n- If you need additional assistance, contact your department computer support or system administrator for assistance." />
-              <camunda:property id="spreadsheet.name" value="HIPAA_Ids.xls" />
+              <camunda:property id="spreadsheet.name" value="UVA_ServersWebsitesList.xls" />
               <camunda:property id="spreadsheet.value.column" value="Value" />
               <camunda:property id="spreadsheet.label.column" value="Label" />
             </camunda:properties>
@@ -353,6 +353,7 @@ Indicate all the possible formats in which you will transmit your data outside o
               <camunda:property id="spreadsheet.name" value="HIPAA_Ids.xls" />
               <camunda:property id="spreadsheet.value.column" value="Value" />
               <camunda:property id="spreadsheet.label.column" value="Label" />
+              <camunda:property id="enum_type" value="checkbox" />
             </camunda:properties>
             <camunda:validation>
               <camunda:constraint name="required" config="true" />
@@ -422,7 +423,7 @@ Indicate all the possible formats in which you will transmit your data outside o
       <bpmn:outgoing>SequenceFlow_0lere0k</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:endEvent id="EndEvent_151cj59">
-      <bpmn:documentation>Done message</bpmn:documentation>
+      <bpmn:documentation>Please download and check your DSP doc.</bpmn:documentation>
       <bpmn:incoming>SequenceFlow_16kyite</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:exclusiveGateway id="ExclusiveGateway_0pi0c2d" name="Outside of UVa?">
@@ -444,16 +445,16 @@ Indicate all the possible formats in which you will transmit your data outside o
     <bpmn:sequenceFlow id="SequenceFlow_0m2op9s" sourceRef="Task_0q6ir2l" targetRef="Task_0uotpzg" />
     <bpmn:sequenceFlow id="SequenceFlow_0jyty9m" sourceRef="Task_0uotpzg" targetRef="Task_EnterHIPAAIdentifiers" />
     <bpmn:sequenceFlow id="SequenceFlow_0blyor8" sourceRef="Task_EnterHIPAAIdentifiers" targetRef="Task_196zozc" />
-    <bpmn:sequenceFlow id="SequenceFlow_0k2r83n" sourceRef="ExclusiveGateway_1lpm3pa" targetRef="Task_1ypw8ge" />
-    <bpmn:sequenceFlow id="SequenceFlow_0t6xl9i" sourceRef="ExclusiveGateway_0pi0c2d" targetRef="Task_1ypw8ge">
+    <bpmn:sequenceFlow id="SequenceFlow_0k2r83n" sourceRef="ExclusiveGateway_1lpm3pa" targetRef="Task_GenDoc" />
+    <bpmn:sequenceFlow id="SequenceFlow_0t6xl9i" sourceRef="ExclusiveGateway_0pi0c2d" targetRef="Task_GenDoc">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">DateTransmittedOutside == False</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_16kyite" sourceRef="Task_1ypw8ge" targetRef="EndEvent_151cj59" />
-    <bpmn:scriptTask id="Task_1ypw8ge" name="Generate DSP">
+    <bpmn:sequenceFlow id="SequenceFlow_16kyite" sourceRef="Task_GenDoc" targetRef="EndEvent_151cj59" />
+    <bpmn:scriptTask id="Task_GenDoc" name="Generate DSP">
       <bpmn:incoming>SequenceFlow_0k2r83n</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_0t6xl9i</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_16kyite</bpmn:outgoing>
-      <bpmn:script>complete_template('NEW_DSP_template.docx','Study_DataSecurityPlan')</bpmn:script>
+      <bpmn:script>complete_template('NEW_DSP_template.docx', 'Study_DataSecurityPlan')</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:manualTask id="Task_0q6ir2l" name="View Instructions">
       <bpmn:documentation>##### Instructions
@@ -735,7 +736,7 @@ Indicate all the possible formats in which you will collect or receive your orig
       <bpmndi:BPMNShape id="ParallelGateway_1284xgu_di" bpmnElement="ExclusiveGateway_0x3t2vl">
         <dc:Bounds x="1725" y="365" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1616pnb_di" bpmnElement="Task_1ypw8ge">
+      <bpmndi:BPMNShape id="ScriptTask_1616pnb_di" bpmnElement="Task_GenDoc">
         <dc:Bounds x="2140" y="350" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1l6rjbr_di" bpmnElement="Task_0q6ir2l">
diff --git a/crc/static/bpmn/documents_approvals/documents_approvals.bpmn b/crc/static/bpmn/documents_approvals/documents_approvals.bpmn
index fea1b81b..f2ac3142 100644
--- a/crc/static/bpmn/documents_approvals/documents_approvals.bpmn
+++ b/crc/static/bpmn/documents_approvals/documents_approvals.bpmn
@@ -13,8 +13,8 @@
       <bpmn:documentation># Documents &amp; Approvals
 
 &gt; ## Protocol Document Management
-{% if StudyInfo.documents.Study_Protocol_Document is defined -%}
-{%- set p = StudyInfo.documents.Study_Protocol_Document -%}
+{% if documents.Study_Protocol_Document is defined -%}
+{%- set p = documents.Study_Protocol_Document -%}
 {% if p.files|length -%}
 {%- set f = p.files[0] -%}
 &gt; [{{p.display_name}}](/study/{{p.study_id}}/workflow/{{f.workflow_id}}/task/{{f.task_id}})
@@ -28,14 +28,14 @@
 &gt; ## Approvals
 &gt; | Name | Status | Help |
 |:---- |:------ |:---- |
-{% for approval in StudyInfo.approvals -%}
+{% for approval in approvals -%}
 | [{{approval.display_name}}](/study/{{approval.study_id}}/workflow/{{approval.workflow_id}}) | {{approval.status}} | [?](/help/{{approval.workflow_spec_id}}) |
 {% endfor %}
 
 &gt; ## Documents
 &gt; | Name | Status | Help | Download |
 |:---- |:------ |:---- |:-------- |
-{% for key, doc in StudyInfo.documents.items() %}{% if doc.required -%}
+{% for key, doc in documents.items() %}{% if doc.required -%}
     {% if doc.files|length -%}
         | [{{doc.display_name}}](/study/{{doc.study_id}}/workflow/{{doc.workflow_id}}/task/{{doc.task_id}}) | {{doc.status}} | [Context here](/help/documents/{{doc.code}}) | [Download](/file/{{doc.file_id}}/data) |
     {%- else -%}
@@ -44,7 +44,7 @@
 {% endif %}{% endfor %}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:properties>
-          <camunda:property name="display_name" value="'Documents and Approvals'" />
+          <camunda:property name="display_name" value="Documents and Approvals" />
         </camunda:properties>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_142jtxs</bpmn:incoming>
@@ -53,13 +53,12 @@
     <bpmn:scriptTask id="Activity_0a14x7j" name="Load Approvals">
       <bpmn:incoming>Flow_0c7ryff</bpmn:incoming>
       <bpmn:outgoing>Flow_142jtxs</bpmn:outgoing>
-      <bpmn:script>StudyInfo['approvals'] = study_info('approvals')</bpmn:script>
+      <bpmn:script>approvals = study_info('approvals')</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:scriptTask id="Activity_1aju60t" name="Load Documents">
       <bpmn:incoming>Flow_1k3su2q</bpmn:incoming>
       <bpmn:outgoing>Flow_0c7ryff</bpmn:outgoing>
-      <bpmn:script>StudyInfo = {}
-StudyInfo['documents'] = study_info('documents')</bpmn:script>
+      <bpmn:script>documents = study_info('documents')</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="Flow_142jtxs" sourceRef="Activity_0a14x7j" targetRef="Activity_DisplayDocsAndApprovals" />
     <bpmn:sequenceFlow id="Flow_0c7ryff" sourceRef="Activity_1aju60t" targetRef="Activity_0a14x7j" />
@@ -68,7 +67,7 @@ StudyInfo['documents'] = study_info('documents')</bpmn:script>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1gmf4la">
       <bpmndi:BPMNEdge id="Flow_1k3su2q_di" bpmnElement="Flow_1k3su2q">
-        <di:waypoint x="188" y="117" />
+        <di:waypoint x="258" y="117" />
         <di:waypoint x="390" y="117" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0c7ryff_di" bpmnElement="Flow_0c7ryff">
@@ -84,7 +83,7 @@ StudyInfo['documents'] = study_info('documents')</bpmn:script>
         <di:waypoint x="882" y="117" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="152" y="99" width="36" height="36" />
+        <dc:Bounds x="222" y="99" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1qvyxg7_di" bpmnElement="EndEvent_1qvyxg7">
         <dc:Bounds x="882" y="99" width="36" height="36" />
diff --git a/crc/static/bpmn/finance/finance.bpmn b/crc/static/bpmn/finance/finance.bpmn
index e68ae84e..84ad6511 100644
--- a/crc/static/bpmn/finance/finance.bpmn
+++ b/crc/static/bpmn/finance/finance.bpmn
@@ -116,7 +116,7 @@ If you have any questions about the process, contact contract negotiator or Offi
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_160jfpk_di" bpmnElement="SequenceFlow_160jfpk">
         <di:waypoint x="595" y="337" />
-        <di:waypoint x="682" y="337" />
+        <di:waypoint x="662" y="337" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0afrh4e_di" bpmnElement="SequenceFlow_0afrh4e">
         <di:waypoint x="460" y="190" />
@@ -135,8 +135,8 @@ If you have any questions about the process, contact contract negotiator or Offi
       <bpmndi:BPMNShape id="StartEvent_1p6s47e_di" bpmnElement="StartEvent_1p6s47e">
         <dc:Bounds x="122" y="319" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_14p904o_di" bpmnElement="EndEvent_14p904o">
-        <dc:Bounds x="682" y="319" width="36" height="36" />
+      <bpmndi:BPMNShape id="UserTask_03iirsg_di" bpmnElement="UserTask_03iirsg">
+        <dc:Bounds x="360" y="150" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ParallelGateway_02f3709_di" bpmnElement="ExclusiveGateway_0m1n8mu">
         <dc:Bounds x="225" y="312" width="50" height="50" />
@@ -150,8 +150,8 @@ If you have any questions about the process, contact contract negotiator or Offi
       <bpmndi:BPMNShape id="UserTask_1fv8l08_di" bpmnElement="Task_0xn3d6z">
         <dc:Bounds x="360" y="430" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="UserTask_03iirsg_di" bpmnElement="UserTask_03iirsg">
-        <dc:Bounds x="360" y="150" width="100" height="80" />
+      <bpmndi:BPMNShape id="EndEvent_14p904o_di" bpmnElement="EndEvent_14p904o">
+        <dc:Bounds x="662" y="319" width="36" height="36" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/crc/static/bpmn/ide_supplement/decision_ide_check.dmn b/crc/static/bpmn/ide_supplement/decision_ide_check.dmn
index a4d3d62c..76aa1238 100644
--- a/crc/static/bpmn/ide_supplement/decision_ide_check.dmn
+++ b/crc/static/bpmn/ide_supplement/decision_ide_check.dmn
@@ -1,38 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" id="Definitions_0o0ff2r" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" id="Definitions_0o0ff2r" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
   <decision id="decision_ide_check" name="IDE Check">
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="IS_IDE">
         <inputExpression id="inputExpression_1" typeRef="integer">
-          <text>StudyInfo.details.IS_IDE</text>
+          <text>is_ide.IS_IDE</text>
         </inputExpression>
       </input>
-      <input id="InputClause_0x1r5qo" label="IDE Set?">
+      <input id="InputClause_0x1r5qo" label="IDE Number?">
         <inputExpression id="LiteralExpression_1qxic4k" typeRef="string">
-          <text>StudyInfo.details.IDE</text>
+          <text>ide.IDE</text>
         </inputExpression>
       </input>
-      <output id="output_1" label="Add Supplemental Data" name="add_supplement" typeRef="boolean" />
+      <output id="OutputClause_1xvp2on" label="IDE Field Value" name="IDE_Number" typeRef="string" />
+      <output id="OutputClause_0g5qbkb" label="IDE Message" name="ide_message" typeRef="string" />
       <rule id="DecisionRule_0h0od2e">
         <inputEntry id="UnaryTests_09ctq71">
           <text>1</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1w71u9t">
-          <text>? != ''</text>
+          <text>!= ""</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1we3duh">
-          <text>True</text>
+        <outputEntry id="LiteralExpression_1ynrc3b">
+          <text>ide.IDE</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0n9fwk1">
+          <text>"Provide additional information for the IDE assocoated with this study"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_199dgpt">
         <inputEntry id="UnaryTests_1ec0msc">
-          <text></text>
+          <text>1</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0w8ohet">
+          <text>''</text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_0oyaymb">
+          <text>"not entered in Procol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0tiaje9">
+          <text>"The IDE number was not entered in Protocol Builder.  You must provide a number if it is available prior to IRB submission"</text>
+        </outputEntry>
+      </rule>
+      <rule id="DecisionRule_1ok04ot">
+        <inputEntry id="UnaryTests_0uhe0qi">
+          <text>0</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_1eivrcw">
           <text></text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1fhlpya">
-          <text>False</text>
+        <outputEntry id="LiteralExpression_03uxiu8">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_080066t">
+          <text>"You should not have access to this workflow since your Protocol Builder reposes indicate that a IDE is not associated with this study.  Please contact Support"</text>
+        </outputEntry>
+      </rule>
+      <rule id="DecisionRule_1cj8yq8">
+        <inputEntry id="UnaryTests_1fbn44t">
+          <text></text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0hejiza">
+          <text></text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_06fo7cc">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0ns0fff">
+          <text>"You should not have access to this workflow since your Protocol Builder reposes indicate that a IDE is not associated with this study.  Please contact Support"</text>
         </outputEntry>
       </rule>
     </decisionTable>
diff --git a/crc/static/bpmn/ide_supplement/ide_supplement.bpmn b/crc/static/bpmn/ide_supplement/ide_supplement.bpmn
deleted file mode 100644
index 394a1d46..00000000
--- a/crc/static/bpmn/ide_supplement/ide_supplement.bpmn
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1e7871f" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
-  <bpmn:process id="Process_04jm0bm" isExecutable="true">
-    <bpmn:startEvent id="StartEvent_1">
-      <bpmn:outgoing>SequenceFlow_1dhb8f4</bpmn:outgoing>
-    </bpmn:startEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_1dhb8f4" sourceRef="StartEvent_1" targetRef="ScriptTask_1fn00ox" />
-    <bpmn:userTask id="IDE_Entry_Submit" name="IDE Data Entry and Submit" camunda:formKey="IDE">
-      <bpmn:documentation>IDE #: {{StudyInfo.details.IDE}}</bpmn:documentation>
-      <bpmn:extensionElements>
-        <camunda:formData>
-          <camunda:formField id="NewDeviceOrNewIndication" label="New Device used or New Indication for Marketed Device" type="boolean" />
-          <camunda:formField id="HolderType" label="IDE Holder Type" type="enum">
-            <camunda:value id="Industry" name="Industry" />
-            <camunda:value id="UVaPI" name="UVa PI" />
-            <camunda:value id="OtherPI" name="Other PI" />
-            <camunda:value id="UVaCenter" name="UVaCenter" />
-            <camunda:value id="OtherCollUniv" name="Other Colleges and Universities" />
-            <camunda:value id="NotExempt" name="IDE not exempt, but no IDE#" />
-            <camunda:value id="Exempt" name="INE Exempt" />
-            <camunda:value id="NA" name="NA" />
-          </camunda:formField>
-          <camunda:formField id="HolderName" label="Holder Name" type="string" />
-          <camunda:formField id="HolderNameNotInList" label="IDE Holder Name if not in above list" type="string" />
-          <camunda:formField id="DeviceName" label="Device Name" type="string" />
-        </camunda:formData>
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_1yb1vma</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1t2ha54</bpmn:outgoing>
-    </bpmn:userTask>
-    <bpmn:endEvent id="EndEvent_1h89sl4">
-      <bpmn:incoming>SequenceFlow_1t2ha54</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_1yhv1qz</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_1t2ha54" sourceRef="IDE_Entry_Submit" targetRef="EndEvent_1h89sl4" />
-    <bpmn:scriptTask id="ScriptTask_1fn00ox" name="Load IRB Details">
-      <bpmn:incoming>SequenceFlow_1dhb8f4</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1uzcl1f</bpmn:outgoing>
-      <bpmn:script>StudyInfo = {}
-StudyInfo['details'] = study_info('details')</bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="SequenceFlow_1uzcl1f" sourceRef="ScriptTask_1fn00ox" targetRef="Task_SupplementIDE" />
-    <bpmn:exclusiveGateway id="ExclusiveGateway_1fib89p" name="IS_IDE = True and Number Provided?&#10;&#10;">
-      <bpmn:incoming>SequenceFlow_1lazou8</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1yb1vma</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_011l5xt</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_1yb1vma" name="Yes" sourceRef="ExclusiveGateway_1fib89p" targetRef="IDE_Entry_Submit">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">add_supplement == true</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_011l5xt" name="No" sourceRef="ExclusiveGateway_1fib89p" targetRef="Task_NoIDE">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">add_supplement == False</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:manualTask id="Task_NoIDE" name="IDE No. But No Numbers">
-      <bpmn:documentation>The use of an IDE was indicated in Protocol Builder, but no IDE No. was entered.  Please enter this number in the Supplemental section of Protocol Builder so supplemental information can be entered here.</bpmn:documentation>
-      <bpmn:incoming>SequenceFlow_011l5xt</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1yhv1qz</bpmn:outgoing>
-    </bpmn:manualTask>
-    <bpmn:sequenceFlow id="SequenceFlow_1lazou8" sourceRef="Task_SupplementIDE" targetRef="ExclusiveGateway_1fib89p" />
-    <bpmn:businessRuleTask id="Task_SupplementIDE" name="Supplement IDE?" camunda:decisionRef="decision_ide_check">
-      <bpmn:incoming>SequenceFlow_1uzcl1f</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1lazou8</bpmn:outgoing>
-    </bpmn:businessRuleTask>
-    <bpmn:sequenceFlow id="SequenceFlow_1yhv1qz" sourceRef="Task_NoIDE" targetRef="EndEvent_1h89sl4" />
-  </bpmn:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_04jm0bm">
-      <bpmndi:BPMNEdge id="SequenceFlow_1yhv1qz_di" bpmnElement="SequenceFlow_1yhv1qz">
-        <di:waypoint x="810" y="250" />
-        <di:waypoint x="871" y="250" />
-        <di:waypoint x="871" y="117" />
-        <di:waypoint x="932" y="117" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1lazou8_di" bpmnElement="SequenceFlow_1lazou8">
-        <di:waypoint x="520" y="117" />
-        <di:waypoint x="585" y="117" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_011l5xt_di" bpmnElement="SequenceFlow_011l5xt">
-        <di:waypoint x="610" y="142" />
-        <di:waypoint x="610" y="250" />
-        <di:waypoint x="710" y="250" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="618" y="194" width="15" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1yb1vma_di" bpmnElement="SequenceFlow_1yb1vma">
-        <di:waypoint x="635" y="117" />
-        <di:waypoint x="710" y="117" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="664" y="99" width="19" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1uzcl1f_di" bpmnElement="SequenceFlow_1uzcl1f">
-        <di:waypoint x="330" y="117" />
-        <di:waypoint x="420" y="117" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1t2ha54_di" bpmnElement="SequenceFlow_1t2ha54">
-        <di:waypoint x="810" y="117" />
-        <di:waypoint x="932" y="117" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1dhb8f4_di" bpmnElement="SequenceFlow_1dhb8f4">
-        <di:waypoint x="158" y="117" />
-        <di:waypoint x="230" y="117" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="UserTask_17syy68_di" bpmnElement="IDE_Entry_Submit">
-        <dc:Bounds x="710" y="77" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_1h89sl4_di" bpmnElement="EndEvent_1h89sl4">
-        <dc:Bounds x="932" y="99" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="414" y="202" width="74" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1fn00ox_di" bpmnElement="ScriptTask_1fn00ox">
-        <dc:Bounds x="230" y="77" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_1fib89p_di" bpmnElement="ExclusiveGateway_1fib89p" isMarkerVisible="true">
-        <dc:Bounds x="585" y="92" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="575" y="47" width="70" height="66" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ManualTask_1f7z9wm_di" bpmnElement="Task_NoIDE">
-        <dc:Bounds x="710" y="210" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BusinessRuleTask_1cszgkx_di" bpmnElement="Task_SupplementIDE">
-        <dc:Bounds x="420" y="77" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="122" y="99" width="36" height="36" />
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>
diff --git a/crc/static/bpmn/ids_full_submission/ids_full_submission.bpmn b/crc/static/bpmn/ids_full_submission/ids_full_submission.bpmn
index 4e940cf4..66112c4e 100644
--- a/crc/static/bpmn/ids_full_submission/ids_full_submission.bpmn
+++ b/crc/static/bpmn/ids_full_submission/ids_full_submission.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_07f7kut" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_07f7kut" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
   <bpmn:process id="Process_IDS" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_1dexemq</bpmn:outgoing>
@@ -100,7 +100,7 @@ Protocol Owner: **(need to insert value here)**</bpmn:documentation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
           </camunda:formField>
-          <camunda:formField id="FormField_Explain" label="Please explain" type="textarea">
+          <camunda:formField id="FormField_Explain" label="Please explain" type="text_area">
             <camunda:properties>
               <camunda:property id="rows" value="5" />
             </camunda:properties>
@@ -123,7 +123,7 @@ Protocol Owner: **(need to insert value here)**</bpmn:documentation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
           </camunda:formField>
-          <camunda:formField id="FormField_Explain" label="Please explain" type="textarea">
+          <camunda:formField id="FormField_Explain" label="Please explain" type="text_area">
             <camunda:properties>
               <camunda:property id="rows" value="5" />
             </camunda:properties>
@@ -159,13 +159,13 @@ Protocol Owner: **(need to insert value here)**</bpmn:documentation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
           </camunda:formField>
-          <camunda:formField id="FormField_Explain" label="Please explain" type="textarea">
+          <camunda:formField id="FormField_Explain" label="Please explain" type="text_area">
             <camunda:properties>
               <camunda:property id="rows" value="5" />
             </camunda:properties>
           </camunda:formField>
           <camunda:formField id="FormField_Training" label="Is any training required prior to obtaining system access?" type="boolean" />
-          <camunda:formField id="FormField_Details" label="If yes, provide details:" type="textarea">
+          <camunda:formField id="FormField_Details" label="If yes, provide details:" type="text_area">
             <camunda:properties>
               <camunda:property id="rows" value="5" />
               <camunda:property id="hide_expression" value="!model.FormField_Training | model.FormField_Training == null" />
@@ -206,7 +206,7 @@ Protocol Owner: **(need to insert value here)**</bpmn:documentation>
             <camunda:value id="no" name="No" />
             <camunda:value id="unknown" name="Unknown" />
           </camunda:formField>
-          <camunda:formField id="FormField_Details" label="If yes or unknown, provide details:" type="textarea" />
+          <camunda:formField id="FormField_Details" label="If yes or unknown, provide details:" type="text_area" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0lixqzs</bpmn:incoming>
@@ -217,129 +217,128 @@ Protocol Owner: **(need to insert value here)**</bpmn:documentation>
     <bpmn:scriptTask id="Activity_LoadDocuments" name="Load Documents">
       <bpmn:incoming>SequenceFlow_1dexemq</bpmn:incoming>
       <bpmn:outgoing>Flow_1x9d2mo</bpmn:outgoing>
-      <bpmn:script>StudyInfo = {}
-StudyInfo['documents'] = study_info('documents')</bpmn:script>
+      <bpmn:script>documents = study_info('documents')</bpmn:script>
     </bpmn:scriptTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_IDS">
       <bpmndi:BPMNEdge id="Flow_1x9d2mo_di" bpmnElement="Flow_1x9d2mo">
-        <di:waypoint x="340" y="340" />
-        <di:waypoint x="410" y="340" />
+        <di:waypoint x="200" y="340" />
+        <di:waypoint x="270" y="340" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1r7kcks_di" bpmnElement="SequenceFlow_1r7kcks">
-        <di:waypoint x="1320" y="340" />
-        <di:waypoint x="1412" y="340" />
+        <di:waypoint x="1180" y="340" />
+        <di:waypoint x="1252" y="340" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0lixqzs_di" bpmnElement="SequenceFlow_0lixqzs">
-        <di:waypoint x="1125" y="340" />
-        <di:waypoint x="1220" y="340" />
+        <di:waypoint x="985" y="340" />
+        <di:waypoint x="1080" y="340" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1dexemq_di" bpmnElement="SequenceFlow_1dexemq">
-        <di:waypoint x="188" y="340" />
-        <di:waypoint x="240" y="340" />
+        <di:waypoint x="48" y="340" />
+        <di:waypoint x="100" y="340" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1bkjyhx_di" bpmnElement="SequenceFlow_1bkjyhx">
-        <di:waypoint x="785" y="340" />
-        <di:waypoint x="835" y="340" />
+        <di:waypoint x="645" y="340" />
+        <di:waypoint x="695" y="340" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1kam5in_di" bpmnElement="SequenceFlow_1kam5in">
-        <di:waypoint x="646" y="340" />
-        <di:waypoint x="685" y="340" />
+        <di:waypoint x="506" y="340" />
+        <di:waypoint x="545" y="340" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1dcu8zu_di" bpmnElement="SequenceFlow_1dcu8zu">
-        <di:waypoint x="510" y="340" />
-        <di:waypoint x="546" y="340" />
+        <di:waypoint x="370" y="340" />
+        <di:waypoint x="406" y="340" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0m01j99_di" bpmnElement="SequenceFlow_0m01j99">
-        <di:waypoint x="1030" y="560" />
-        <di:waypoint x="1100" y="560" />
-        <di:waypoint x="1100" y="365" />
+        <di:waypoint x="890" y="560" />
+        <di:waypoint x="960" y="560" />
+        <di:waypoint x="960" y="365" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1lys0jq_di" bpmnElement="SequenceFlow_1lys0jq">
-        <di:waypoint x="860" y="365" />
-        <di:waypoint x="860" y="560" />
-        <di:waypoint x="930" y="560" />
+        <di:waypoint x="720" y="365" />
+        <di:waypoint x="720" y="560" />
+        <di:waypoint x="790" y="560" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_13fzv9y_di" bpmnElement="SequenceFlow_13fzv9y">
-        <di:waypoint x="1030" y="450" />
-        <di:waypoint x="1100" y="450" />
-        <di:waypoint x="1100" y="365" />
+        <di:waypoint x="890" y="450" />
+        <di:waypoint x="960" y="450" />
+        <di:waypoint x="960" y="365" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0jwnfzy_di" bpmnElement="SequenceFlow_0jwnfzy">
-        <di:waypoint x="860" y="365" />
-        <di:waypoint x="860" y="450" />
-        <di:waypoint x="930" y="450" />
+        <di:waypoint x="720" y="365" />
+        <di:waypoint x="720" y="450" />
+        <di:waypoint x="790" y="450" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1pg0dkw_di" bpmnElement="SequenceFlow_1pg0dkw">
-        <di:waypoint x="1030" y="340" />
-        <di:waypoint x="1075" y="340" />
+        <di:waypoint x="890" y="340" />
+        <di:waypoint x="935" y="340" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0y21euo_di" bpmnElement="SequenceFlow_0y21euo">
-        <di:waypoint x="885" y="340" />
-        <di:waypoint x="930" y="340" />
+        <di:waypoint x="745" y="340" />
+        <di:waypoint x="790" y="340" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1iiazgn_di" bpmnElement="SequenceFlow_1iiazgn">
-        <di:waypoint x="1030" y="120" />
-        <di:waypoint x="1100" y="120" />
-        <di:waypoint x="1100" y="315" />
+        <di:waypoint x="890" y="120" />
+        <di:waypoint x="960" y="120" />
+        <di:waypoint x="960" y="315" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_100vc9e_di" bpmnElement="SequenceFlow_100vc9e">
-        <di:waypoint x="1030" y="230" />
-        <di:waypoint x="1100" y="230" />
-        <di:waypoint x="1100" y="315" />
+        <di:waypoint x="890" y="230" />
+        <di:waypoint x="960" y="230" />
+        <di:waypoint x="960" y="315" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0movigc_di" bpmnElement="SequenceFlow_0movigc">
-        <di:waypoint x="860" y="315" />
-        <di:waypoint x="860" y="230" />
-        <di:waypoint x="930" y="230" />
+        <di:waypoint x="720" y="315" />
+        <di:waypoint x="720" y="230" />
+        <di:waypoint x="790" y="230" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1guaev4_di" bpmnElement="SequenceFlow_1guaev4">
-        <di:waypoint x="860" y="315" />
-        <di:waypoint x="860" y="120" />
-        <di:waypoint x="930" y="120" />
+        <di:waypoint x="720" y="315" />
+        <di:waypoint x="720" y="120" />
+        <di:waypoint x="790" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="152" y="322" width="36" height="36" />
+        <dc:Bounds x="12" y="322" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_0wr3vp4_di" bpmnElement="Task_EnterIDSStudyIdentification">
-        <dc:Bounds x="930" y="80" width="100" height="80" />
+        <dc:Bounds x="790" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_0s34owg_di" bpmnElement="Task_EnterIDSFeeStructure">
-        <dc:Bounds x="930" y="190" width="100" height="80" />
+        <dc:Bounds x="790" y="190" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ParallelGateway_1c14ymx_di" bpmnElement="ExclusiveGateway_14igy57">
-        <dc:Bounds x="835" y="315" width="50" height="50" />
+        <dc:Bounds x="695" y="315" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ParallelGateway_188sr3c_di" bpmnElement="ExclusiveGateway_1b69uum">
-        <dc:Bounds x="1075" y="315" width="50" height="50" />
+        <dc:Bounds x="935" y="315" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0jypqha_di" bpmnElement="EndEvent_0jypqha">
-        <dc:Bounds x="1412" y="322" width="36" height="36" />
+        <dc:Bounds x="1252" y="322" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_0li1vo4_di" bpmnElement="Task_ReviewPharmacyManualStatus">
-        <dc:Bounds x="930" y="300" width="100" height="80" />
+        <dc:Bounds x="790" y="300" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_0uvz4r8_di" bpmnElement="UserTask_ReviewInvestigatorsBrochureStatus">
-        <dc:Bounds x="930" y="410" width="100" height="80" />
+        <dc:Bounds x="790" y="410" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_06sfx4u_di" bpmnElement="UserTask_ReviewIVRS-IWRS-IXRSManualStatus">
-        <dc:Bounds x="930" y="520" width="100" height="80" />
+        <dc:Bounds x="790" y="520" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BusinessRuleTask_1ld7tdu_di" bpmnElement="BusinessRuleTask_PharmacyManual">
-        <dc:Bounds x="546" y="300" width="100" height="80" />
+        <dc:Bounds x="406" y="300" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BusinessRuleTask_04d0y1w_di" bpmnElement="BusinessRuleTask_InvestigatorsBrochure">
-        <dc:Bounds x="410" y="300" width="100" height="80" />
+        <dc:Bounds x="270" y="300" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BusinessRuleTask_03zh0rt_di" bpmnElement="BusinessRuleTask_IVRS-IWRS-IXRSManual">
-        <dc:Bounds x="685" y="300" width="100" height="80" />
+        <dc:Bounds x="545" y="300" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_03o04d0_di" bpmnElement="UserTask_03o04d0">
-        <dc:Bounds x="1220" y="300" width="100" height="80" />
+        <dc:Bounds x="1080" y="300" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0f5ox7w_di" bpmnElement="Activity_LoadDocuments">
-        <dc:Bounds x="240" y="300" width="100" height="80" />
+        <dc:Bounds x="100" y="300" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/crc/static/bpmn/ids_full_submission/investigators_brochure.dmn b/crc/static/bpmn/ids_full_submission/investigators_brochure.dmn
index 42f2f16a..e909e4b4 100644
--- a/crc/static/bpmn/ids_full_submission/investigators_brochure.dmn
+++ b/crc/static/bpmn/ids_full_submission/investigators_brochure.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_181emiu" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_181emiu" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
   <decision id="Decision_InvestigatorBrochure" name="Decision_InvestigatorBrochure">
     <extensionElements>
       <biodi:bounds x="150" y="150" width="180" height="80" />
@@ -7,7 +7,7 @@
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="Investigator&#39;s Brochure Form Upload Count">
         <inputExpression id="inputExpression_1" typeRef="integer">
-          <text>StudyInfo.documents.DrugDevDoc_InvestBrochure.count</text>
+          <text>documents.DrugDevDoc_InvestBrochure.count</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Investigator&#39;s Brochure(s) Uploaded?" name="isInvestigatorsBrochure" typeRef="boolean" />
@@ -17,7 +17,7 @@
           <text>0</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1egtix6">
-          <text>False</text>
+          <text>false</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0syurh2">
           <text>"The Investigator's Brochure has not been uploaded.  If you do not intend to upload a manual before you IDS submission, please complete the questions below.  If you do intend to upload a brochure, you do not need to complete them."</text>
@@ -28,7 +28,7 @@
           <text>1</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_10fvqcp">
-          <text>True</text>
+          <text>true</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_12xmgog">
           <text>"This brochure will be sent as part of your IDS Submission."</text>
@@ -39,7 +39,7 @@
           <text>&gt; 1</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0ybjs1p">
-          <text>True</text>
+          <text>true</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1fhucbl">
           <text>"These brochures will be sent as part of your IDS Submission."</text>
diff --git a/crc/static/bpmn/ids_full_submission/ivrs_iwrs_ixrs.dmn b/crc/static/bpmn/ids_full_submission/ivrs_iwrs_ixrs.dmn
index 094b5cc1..e4e9510e 100644
--- a/crc/static/bpmn/ids_full_submission/ivrs_iwrs_ixrs.dmn
+++ b/crc/static/bpmn/ids_full_submission/ivrs_iwrs_ixrs.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_13ibzgx" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_13ibzgx" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
   <decision id="Decision_IVRS-IWRS-IXRS" name="IVRS-IWRS-IXRS Manual">
     <extensionElements>
       <biodi:bounds x="150" y="150" width="180" height="80" />
@@ -7,7 +7,7 @@
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="IVRS-IWRS-IXRS Manual Count">
         <inputExpression id="inputExpression_1" typeRef="integer">
-          <text>StudyInfo.documents.DrugDevDoc_IVRSIWRSIXRSMan.count</text>
+          <text>documents.DrugDevDoc_IVRSIWRSIXRSMan.count</text>
         </inputExpression>
       </input>
       <output id="output_1" label="IVRS-IWRS-IXRS Manual Uploaded?" name="isIVRS-IWRS-IXRS" typeRef="boolean" />
@@ -17,7 +17,7 @@
           <text>0</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1i0v4vv">
-          <text>False</text>
+          <text>false</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1rmabtw">
           <text>"The IVRS/IWRS/IXRS Manual has not been uploaded.  If you do not intend to upload a manual before you IDS submission, please complete the questions below.  If you do intend to upload a manual, you do not need to complete them."</text>
@@ -28,7 +28,7 @@
           <text>1</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_19ht3su">
-          <text>True</text>
+          <text>true</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_00sov94">
           <text>"This manual will be sent as part of your IDS Submission"</text>
@@ -39,7 +39,7 @@
           <text>&gt; 0</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_047zb7w">
-          <text>True</text>
+          <text>true</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_00yj9ia">
           <text>"These manuals will be sent as part of your IDS Submission"</text>
diff --git a/crc/static/bpmn/ids_full_submission/pharmacy_manual.dmn b/crc/static/bpmn/ids_full_submission/pharmacy_manual.dmn
index a5581519..bb5582c4 100644
--- a/crc/static/bpmn/ids_full_submission/pharmacy_manual.dmn
+++ b/crc/static/bpmn/ids_full_submission/pharmacy_manual.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_a268e14" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_a268e14" name="DRD" namespace="http://camunda.org/schema/1.0/dmn">
   <decision id="Decision_PharmacyManual" name="Pharmacy Manual">
     <extensionElements>
       <biodi:bounds x="190" y="140" width="180" height="80" />
@@ -7,7 +7,7 @@
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="Pharmacy Manual Upload Count">
         <inputExpression id="inputExpression_1" typeRef="integer">
-          <text>StudyInfo.documents.DrugDevDoc_PharmManual.count</text>
+          <text>documents.DrugDevDoc_PharmManual.count</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Pharmacy Manual(s) Uploaded?" name="isPharmacyManual" typeRef="boolean" />
@@ -17,7 +17,7 @@
           <text>0</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1kidcjg">
-          <text>False</text>
+          <text>false</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0tk68d3">
           <text>"The Pharmacy Manual has not been uploaded.  If you do not intend to upload a manual before your IDS submission, please complete the questions below.  If you do intend to upload a manual, you do not need to complete them."</text>
@@ -28,7 +28,7 @@
           <text>1</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_08v3bfw">
-          <text>True</text>
+          <text>true</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1espyxg">
           <text>"This manual will be sent as part of your IDS Submission"</text>
@@ -39,7 +39,7 @@
           <text>&gt; 1</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1hb3ip1">
-          <text>True</text>
+          <text>true</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0yslf6v">
           <text>"These manuals will be sent as part of your IDS Submission"</text>
diff --git a/crc/static/bpmn/ids_waiver/ids_waiver.bpmn b/crc/static/bpmn/ids_waiver/ids_waiver.bpmn
index cfabb88e..f407ecaa 100644
--- a/crc/static/bpmn/ids_waiver/ids_waiver.bpmn
+++ b/crc/static/bpmn/ids_waiver/ids_waiver.bpmn
@@ -34,7 +34,7 @@
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1hssp5j">
       <bpmndi:BPMNEdge id="SequenceFlow_1pbjfym_di" bpmnElement="SequenceFlow_1pbjfym">
         <di:waypoint x="620" y="120" />
-        <di:waypoint x="722" y="120" />
+        <di:waypoint x="692" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1aq1jk8_di" bpmnElement="SequenceFlow_1aq1jk8">
         <di:waypoint x="188" y="120" />
@@ -54,7 +54,7 @@
         <dc:Bounds x="520" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1nf8um4_di" bpmnElement="EndEvent_1nf8um4">
-        <dc:Bounds x="722" y="102" width="36" height="36" />
+        <dc:Bounds x="692" y="102" width="36" height="36" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/crc/static/bpmn/ind_update/SponsorList.xls b/crc/static/bpmn/ind_update/SponsorList.xls
index df1cf0d7..25c40201 100644
Binary files a/crc/static/bpmn/ind_update/SponsorList.xls and b/crc/static/bpmn/ind_update/SponsorList.xls differ
diff --git a/crc/static/bpmn/ind_update/decision_ind_check.dmn b/crc/static/bpmn/ind_update/decision_ind_check.dmn
index 19f226c0..af125b3f 100644
--- a/crc/static/bpmn/ind_update/decision_ind_check.dmn
+++ b/crc/static/bpmn/ind_update/decision_ind_check.dmn
@@ -1,56 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" id="Definitions_0o0ff2r" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
-  <decision id="decision_ind_check" name="IND Check-feel">
+<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" id="Definitions_0o0ff2r" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
+  <decision id="decision_ind_check" name="IND Check">
     <decisionTable id="decisionTable_1">
-      <input id="input_1" label="IS_IND">
+      <input id="input_1" label="IS_IND in PB">
         <inputExpression id="inputExpression_1" typeRef="integer">
-          <text>StudyInfo.details.IS_IND</text>
+          <text>is_ind</text>
         </inputExpression>
       </input>
-      <input id="InputClause_1yk6kx1" label="IND_1 Number?">
-        <inputExpression id="LiteralExpression_00xhtjw" typeRef="string" expressionLanguage="feel">
-          <text>StudyInfo.details.IND_1</text>
+      <input id="InputClause_1yk6kx1" label="IND_1 Number in PB?">
+        <inputExpression id="LiteralExpression_00xhtjw" typeRef="string">
+          <text>ind_1</text>
         </inputExpression>
       </input>
       <input id="InputClause_069sith" label="IND_2 Number?">
-        <inputExpression id="LiteralExpression_1h9kd8o" typeRef="string" expressionLanguage="feel">
-          <text>StudyInfo.details.IND_2</text>
+        <inputExpression id="LiteralExpression_1h9kd8o" typeRef="string">
+          <text>ind_2</text>
         </inputExpression>
       </input>
       <input id="InputClause_0d0vpur" label="IND_3 Number?">
-        <inputExpression id="LiteralExpression_0zbsg01" typeRef="string" expressionLanguage="feel">
-          <text>StudyInfo.details.IND_3</text>
+        <inputExpression id="LiteralExpression_0zbsg01" typeRef="string">
+          <text>ind_3</text>
         </inputExpression>
       </input>
-      <output id="output_1" label="Add Supplemental Data" name="ind_supplement" typeRef="boolean" />
-      <output id="OutputClause_0cfn42v" label="IND Count Entered" name="ind_cnt" typeRef="string" />
+      <output id="output_1" label="Non-sequential PB Entry" name="is_non_seq_pb_entry" typeRef="boolean" />
+      <output id="OutputClause_08qk83g" label="IND 1 Field Value" name="IRB_IND1_Number" typeRef="string" />
+      <output id="OutputClause_0yman8a" label="Has Second PB IND?" name="has_second_pb_ind" typeRef="boolean" />
+      <output id="OutputClause_1a9ypxf" label="IND 2 Field Value" name="IRB_IND2_Number" typeRef="string" />
+      <output id="OutputClause_19dr73j" label="Has Third PB IND" name="has_third_pb_ind" typeRef="boolean" />
+      <output id="OutputClause_0ysbmmv" label="IND 3 Field Value" name="IRB_IND3_Number" typeRef="string" />
       <output id="OutputClause_0xcdkqm" label="IND Message" name="ind_message" typeRef="string" />
-      <output id="OutputClause_08qk83g" label="IND 1 Field Value" name="IND1_Number" typeRef="string" />
       <rule id="DecisionRule_0teanii">
         <description>3 IND #s</description>
         <inputEntry id="UnaryTests_0akfjdp">
           <text>1</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1c88e2t">
-          <text>not('')</text>
+          <text>!= ""</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0zfrdlt">
-          <text>not('')</text>
+          <text>!= ""</text>
         </inputEntry>
         <inputEntry id="UnaryTests_07drghr">
-          <text>not('')</text>
+          <text>!= ""</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1i7dtia">
-          <text>True</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_0kulwlr">
-          <text>"three"</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_1tw8tzn">
-          <text>"Three IND #s entered"</text>
+          <text>False</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1fiijih">
-          <text></text>
+          <text>ind_1</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0xfbzo0">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0c5sv9n">
+          <text>ind_2</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0lu82no">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0ukag0c">
+          <text>ind_3</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1tw8tzn">
+          <text>"Provide requested information for the three IND numbers associated with this study entered in Protocol Builder"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_199dgpt">
@@ -59,79 +71,34 @@
           <text>1</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0h3sj7g">
-          <text>not('')</text>
+          <text>!= ""</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1ji4kgh">
-          <text>not('')</text>
+          <text>!= ""</text>
         </inputEntry>
         <inputEntry id="UnaryTests_10gxrx9">
-          <text>""</text>
+          <text>== ""</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1fhlpya">
-          <text>True</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_1h5mox1">
-          <text>"two"</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_1nvcjhv">
-          <text>"Two IND #s entered"</text>
+          <text>False</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_1rwd1ja">
-          <text></text>
+          <text>ind_1</text>
         </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0z0tcm0">
-        <description>3 IND#s, missing #2</description>
-        <inputEntry id="UnaryTests_1kf86r3">
-          <text>1</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_0jm1wzq">
-          <text>not('')</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_14itgac">
-          <text>""</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_1prht5p">
-          <text>not('')</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0pooubu">
+        <outputEntry id="LiteralExpression_0o8a5qg">
           <text>True</text>
         </outputEntry>
-        <outputEntry id="LiteralExpression_0nioovi">
-          <text>"two"</text>
+        <outputEntry id="LiteralExpression_0iyqi80">
+          <text>ind_2</text>
         </outputEntry>
-        <outputEntry id="LiteralExpression_1fa5e2o">
-          <text>"Two IND #s entered"</text>
+        <outputEntry id="LiteralExpression_0d1tnpm">
+          <text>False</text>
         </outputEntry>
-        <outputEntry id="LiteralExpression_1qul3vr">
-          <text></text>
+        <outputEntry id="LiteralExpression_1munivg">
+          <text>"not entered in Protocol Builder"</text>
         </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0bwkqh7">
-        <description>3 IND#s, missing #1</description>
-        <inputEntry id="UnaryTests_13ig4fh">
-          <text>1</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_11kb6cw">
-          <text>""</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_0sfwtwo">
-          <text>not('')</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_0xxmh5j">
-          <text>not('')</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_14otjle">
-          <text>True</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_13qodmm">
-          <text>"two"</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_0xhjgjn">
-          <text>"Two IND #s entered"</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_13g0u0n">
-          <text></text>
+        <outputEntry id="LiteralExpression_1nvcjhv">
+          <text>"Provide requested information for the two IND numbers associated with this study entered in Protocol Builder and any others with numbers pending or exempt"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_0h0od2e">
@@ -140,25 +107,178 @@
           <text>1</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1cub5pk">
-          <text>not('')</text>
+          <text>!= ""</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0aubvru">
-          <text>""</text>
+          <text>== ""</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0rjeqez">
-          <text>""</text>
+          <text>== ""</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1we3duh">
-          <text>True</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_1jv0san">
-          <text>"one"</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_19cvvhd">
-          <text>"One IND # entered"</text>
+          <text>False</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_15ikz7u">
-          <text>StudyInfo.details.IND_1</text>
+          <text>ind_1</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0scnjxc">
+          <text>False</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1vmvj00">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_059bp6f">
+          <text>False</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0bx4383">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_19cvvhd">
+          <text>"Provide requested information for the IND number associated with this study entered in Protocol Builder and any others with numbers pending or exempt"</text>
+        </outputEntry>
+      </rule>
+      <rule id="DecisionRule_0z0tcm0">
+        <description>Invalid entry sequence, IND_1 and IND_3 entered, no IND_2</description>
+        <inputEntry id="UnaryTests_1kf86r3">
+          <text>1</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0jm1wzq">
+          <text>!= ""</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_14itgac">
+          <text>== ""</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_1prht5p">
+          <text>!= ""</text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_0pooubu">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1qul3vr">
+          <text>ind_1</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1myb8bv">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1kw2w4x">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1xxycbv">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1ec0zoc">
+          <text>ind_3</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1fa5e2o">
+          <text>"Two IND #s entered, but not in sequential Protocol Builder fields.  Please correct in Protocol Builder if this was not intended"</text>
+        </outputEntry>
+      </rule>
+      <rule id="DecisionRule_0bwkqh7">
+        <description>Invalid entry sequence, IND_2 and IND_3 entered, no IND_1</description>
+        <inputEntry id="UnaryTests_13ig4fh">
+          <text>1</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_11kb6cw">
+          <text>== ""</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0sfwtwo">
+          <text>!= ""</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0xxmh5j">
+          <text>!= ""</text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_14otjle">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_13g0u0n">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0goa7rm">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1s6utug">
+          <text>ind_2</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1fcdh57">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0bacx0w">
+          <text>ind_3</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0xhjgjn">
+          <text>"Two IND #s entered, but not in sequential Protocol Builder fields.  Please correct in Protocol Builder if this was not intended"</text>
+        </outputEntry>
+      </rule>
+      <rule id="DecisionRule_0aubiri">
+        <description>Invalid entry sequence, IND_2 entered, no IND_1 and IND_3</description>
+        <inputEntry id="UnaryTests_06o2bff">
+          <text>1</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0a79wl7">
+          <text>== ""</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_1o02de0">
+          <text>!= ""</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_1n6nr7w">
+          <text>== ""</text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_1lujdoj">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_05b12fr">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1hsxec0">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1dr1sdq">
+          <text>ind_2</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1piefr7">
+          <text>False</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0kzme1x">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0oad9ah">
+          <text>"One IND #s entered, but not in the first Protocol Builder field.  Please correct in Protocol Builder if this was not intended"</text>
+        </outputEntry>
+      </rule>
+      <rule id="DecisionRule_1kp5i27">
+        <description>Invalid entry sequence, IND_3 entered, no IND_1 and IND_2</description>
+        <inputEntry id="UnaryTests_0c0oxqi">
+          <text>1</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_1hcjrkk">
+          <text>== ""</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0xao0nq">
+          <text>== ""</text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_1eonsag">
+          <text>!= ""</text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_0alpmli">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1qsomfm">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_00xrc5b">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0m8n2hh">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0e4liap">
+          <text>True</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0nb0ikb">
+          <text>ind_3</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1mcyec7">
+          <text>"One IND #s entered, but not in the first Protocol Builder field.  Please correct in Protocol Builder if this was not intended"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_1nitohs">
@@ -178,14 +298,23 @@
         <outputEntry id="LiteralExpression_0c2mi3l">
           <text>True</text>
         </outputEntry>
-        <outputEntry id="LiteralExpression_1e2kzvw">
-          <text>"na"</text>
+        <outputEntry id="LiteralExpression_049iioi">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_09h1veb">
+          <text>False</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_17kywu8">
+          <text>"not entered in Protocol Builder"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_015vz5w">
+          <text>False</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0fzubhr">
+          <text>"not entered in Protocol Builder"</text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0wj4zzb">
-          <text>"No IND Numbers Entered in PB"</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_049iioi">
-          <text>""</text>
+          <text>"No IND Numbers entered in Protocol Builder.  Please enter them and return to this workflow to save if they are availabile before submission to the IRB"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_0m9aydp">
@@ -203,17 +332,96 @@
           <text></text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1wuhxz7">
-          <text>False</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_1dznftw">
-          <text></text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_1lbt5oy">
           <text></text>
         </outputEntry>
         <outputEntry id="LiteralExpression_0tkt63s">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_05iughi">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0i6mpvj">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0a9ww2m">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1lrscuy">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1lbt5oy">
+          <text>"You should not be in this workflow since no IND was indicated in PB.  Please contact Support and inform them of this error"</text>
+        </outputEntry>
+      </rule>
+      <rule id="DecisionRule_1vodqp8">
+        <inputEntry id="UnaryTests_1tpspfa">
+          <text></text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0bkp3ds">
+          <text></text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0dz5okk">
+          <text></text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_1f33zcd">
+          <text></text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_169264f">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0qxk12m">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0wgsh79">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_07bzcpu">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_00x7ss1">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1fpotur">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0ysg90w">
+          <text>"You should not be in this workflow since no IND was indicated in PB.  Please contact Support and inform them of this error"</text>
+        </outputEntry>
+      </rule>
+      <rule id="DecisionRule_0wz09ul">
+        <inputEntry id="UnaryTests_0ejngto">
+          <text></text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0mf773o">
+          <text></text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_1g6bm6w">
+          <text></text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_19oxlpg">
+          <text></text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_11fxqu8">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1lb640f">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0tzuvxl">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1yh8b65">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_03ecp5l">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_10bphfn">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1bm8bkw">
+          <text></text>
+        </outputEntry>
       </rule>
     </decisionTable>
   </decision>
diff --git a/crc/static/bpmn/ind_update/ind_update.bpmn b/crc/static/bpmn/ind_update/ind_update.bpmn
index 1d288dc6..026972b1 100644
--- a/crc/static/bpmn/ind_update/ind_update.bpmn
+++ b/crc/static/bpmn/ind_update/ind_update.bpmn
@@ -1,34 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1e7871f" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.0.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1e7871f" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
   <bpmn:process id="Process_04jm0bm" isExecutable="true">
+    <bpmn:documentation>Click Start over if you have updated your Protocol Builder entries.</bpmn:documentation>
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_1dhb8f4</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_1dhb8f4" sourceRef="StartEvent_1" targetRef="ScriptTask_LoadIRBDetails" />
+    <bpmn:sequenceFlow id="SequenceFlow_1dhb8f4" sourceRef="StartEvent_1" targetRef="Activity_LoadIND_Data" />
     <bpmn:endEvent id="EndEvent_1h89sl4">
       <bpmn:incoming>Flow_0jqdolk</bpmn:incoming>
       <bpmn:incoming>Flow_OneOnly</bpmn:incoming>
+      <bpmn:incoming>Flow_13jejjr</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:scriptTask id="ScriptTask_LoadIRBDetails" name="Load IRB Details">
-      <bpmn:incoming>SequenceFlow_1dhb8f4</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1uzcl1f</bpmn:outgoing>
-      <bpmn:script>StudyInfo = {}
-StudyInfo['details'] = study_info('details')</bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="SequenceFlow_1uzcl1f" sourceRef="ScriptTask_LoadIRBDetails" targetRef="Task_SupplementIDE" />
-    <bpmn:businessRuleTask id="Task_SupplementIDE" name="Current IND Status" camunda:decisionRef="decision_ind_check">
-      <bpmn:incoming>SequenceFlow_1uzcl1f</bpmn:incoming>
+    <bpmn:businessRuleTask id="BusinessTask_IND_NumberCheck" name="IND Number Check" camunda:decisionRef="decision_ind_check">
+      <bpmn:incoming>Flow_1rk7fmm</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1cwibmt</bpmn:outgoing>
     </bpmn:businessRuleTask>
     <bpmn:userTask id="IND_n1_info" name="Edit IND #1 Info" camunda:formKey="IND1_Info">
-      <bpmn:documentation>IND No.: {{ StudyInfo.details.IND_1 }}</bpmn:documentation>
+      <bpmn:documentation>{{ ind_message }}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
           <camunda:formField id="IND1_Number" label="IND1 number:" type="string">
             <camunda:properties>
-              <camunda:property id="description" value="Enter IND number, if available." />
+              <camunda:property id="description" value="IND number from Protocol Builder, if available." />
+              <camunda:property id="value_expression" value="model.IRB_IND1_Number" />
+              <camunda:property id="read_only" value="true" />
             </camunda:properties>
           </camunda:formField>
+          <camunda:formField id="IND1_UVA" label="Is UVA the IND number holder?" type="boolean" defaultValue="true" />
           <camunda:formField id="IND1_HolderType" label="IND Holder Type" type="enum">
             <camunda:value id="Industry" name="Industry" />
             <camunda:value id="UVaPI" name="UVa PI" />
@@ -36,45 +34,57 @@ StudyInfo['details'] = study_info('details')</bpmn:script>
             <camunda:value id="UVaCenter" name="UVaCenter" />
             <camunda:value id="OtherCollUniv" name="Other Colleges and Universities" />
             <camunda:value id="Exempt" name="IND Exempt" />
-            <camunda:value id="NA" name="NA" />
           </camunda:formField>
-          <camunda:formField id="IND1_HolderName" label="Holder Name" type="autocomplete">
+          <camunda:formField id="IND1_HolderNameOSP" label="Holder Name" type="autocomplete">
             <camunda:properties>
               <camunda:property id="spreadsheet.name" value="SponsorList.xls" />
               <camunda:property id="spreadsheet.value.column" value="CUSTOMER_NUMBER" />
               <camunda:property id="spreadsheet.label.column" value="CUSTOMER_NAME" />
+              <camunda:property id="autocomplete_num" value="15" />
+              <camunda:property id="description" value="OSP" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="IND1_HolderNameNotInList" label="IND Holder Name if not in above list" type="string">
+          <camunda:formField id="IND1_HolderNameText" label="Holder Name" type="string">
             <camunda:properties>
-              <camunda:property id="hide_expression" value="model.IND1_HolderName &#38;&#38; model.IND1_HolderName.value !== &#34;0&#34;" />
+              <camunda:property id="description" value="Text entry" />
+            </camunda:properties>
+          </camunda:formField>
+          <camunda:formField id="IND1_HolderNameUVA" label="Holder Name" type="autocomplete">
+            <camunda:properties>
+              <camunda:property id="ldap.lookup" value="true" />
+              <camunda:property id="autocomplete_num" value="10" />
+              <camunda:property id="description" value="LDAP" />
             </camunda:properties>
           </camunda:formField>
           <camunda:formField id="IND1_DrugBiologicName" label="Drug/Biologic Name" type="string" />
+          <camunda:formField id="IND1_AnotherIND" label="Another IND?" type="boolean">
+            <camunda:properties>
+              <camunda:property id="value_expression" value="model.has_second_pb_ind" />
+            </camunda:properties>
+          </camunda:formField>
         </camunda:formData>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1bn0jp7</bpmn:incoming>
+      <bpmn:incoming>Flow_00wk9rz</bpmn:incoming>
       <bpmn:outgoing>Flow_10rb7gb</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:userTask id="IND_n2_info" name="Edit IND #2 Info" camunda:formKey="IND2_Info">
-      <bpmn:documentation>IND No.:</bpmn:documentation>
+      <bpmn:documentation>{{ ind_message }}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="IND2_Status" label="Do you have a second Investigational New Drug?" type="enum">
-            <camunda:value id="Yes" name="Yes" />
-            <camunda:value id="YesBut" name="Yes, but number is not available at this time" />
-            <camunda:value id="No" name="No" />
-          </camunda:formField>
           <camunda:formField id="IND2_Number" label="IND2 Number:" type="string">
             <camunda:properties>
-              <camunda:property id="value_expression" value="model.StudyInfo.details.IND_2" />
-              <camunda:property id="hide_expression" value="!model.IND2_Status || !model.IND2_Status.value || model.IND2_Status.value === &#39;No&#39;" />
+              <camunda:property id="description" value="IND number from Protocol Builder, if available." />
+              <camunda:property id="read_only" value="true" />
+              <camunda:property id="hide_expression" value="model.IND2_HolderType === &#34;Exempt&#34;" />
+              <camunda:property id="value_expression" value="IRB_IND2_Number" />
+            </camunda:properties>
+          </camunda:formField>
+          <camunda:formField id="IND2_UVA" label="Is UVA the IND number holder?" type="boolean">
+            <camunda:properties>
+              <camunda:property id="hide_expression" value="!model.pb_is_uva_ind || model.pb_is_uva_ind === 0" />
             </camunda:properties>
           </camunda:formField>
           <camunda:formField id="IND2_HolderType" label="IND Holder Type" type="enum">
-            <camunda:properties>
-              <camunda:property id="hide_expression" value="!model.IND2_Status || !model.IND2_Status.value || model.IND2_Status.value === &#39;No&#39;" />
-            </camunda:properties>
             <camunda:value id="Industry" name="Industry" />
             <camunda:value id="UVaPI" name="UVa PI" />
             <camunda:value id="OtherPI" name="Other PI" />
@@ -83,48 +93,53 @@ StudyInfo['details'] = study_info('details')</bpmn:script>
             <camunda:value id="Exempt" name="IND Exempt" />
             <camunda:value id="NA" name="NA" />
           </camunda:formField>
-          <camunda:formField id="IND2_HolderName" label="Holder Name" type="autocomplete">
+          <camunda:formField id="IND2_HolderNameOSP" label="Holder Name" type="autocomplete">
             <camunda:properties>
               <camunda:property id="spreadsheet.name" value="SponsorList.xls" />
               <camunda:property id="spreadsheet.value.column" value="CUSTOMER_NUMBER" />
               <camunda:property id="spreadsheet.label.column" value="CUSTOMER_NAME" />
-              <camunda:property id="hide_expression" value="!model.IND2_Status || !model.IND2_Status.value || model.IND2_Status.value === &#39;No&#39;" />
+              <camunda:property id="autocomplete_num" value="15" />
+              <camunda:property id="hide_expression" value="!model.IND2_HolderType || !model.IND2_HolderType.value || (model.IND2_HolderType.value !== &#34;Industry&#34; &#38;&#38; model.IND2_HolderType.value !== &#34;OtherCollUniv&#34;)" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="IND2_HolderNameNotInList" label="IND Holder Name if not in above list" type="string">
+          <camunda:formField id="IND2_HolderNameText" label="IND Holder Name if not in above list" type="string">
             <camunda:properties>
-              <camunda:property id="hide_expression" value="!model.IND2_Status || !model.IND2_Status.value || model.IND2_Status.value === &#39;No&#39; || model.IND2_HolderName.value !== &#34;0&#34;" />
+              <camunda:property id="hide_expression" value="(!model.IND2_HolderType || !model.IND2_HolderType.value || model.IND2_HolderType.value === &#34;UVaPI&#34; || model.IND2_HolderType.value === &#34;Exempt&#34;) || ((model.IND2_HolderType.value === &#34;Industry&#34; || model.IND2_HolderType.value === &#34;OtherCollUniv&#34;) &#38;&#38; (!model.IND2_HolderNameOSP || !model.IND2_HolderNameOSP.value || model.IND2_HolderNameOSP.value !== &#34;100&#34;))" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="IND2_DrugBiologicName" label="Drug/Biologic Name" type="string">
+          <camunda:formField id="IND2_HolderNameUVA" label="Holder Name" type="autocomplete">
             <camunda:properties>
-              <camunda:property id="hide_expression" value="!model.IND2_Status || !model.IND2_Status.value || model.IND2_Status.value === &#39;No&#39;" />
+              <camunda:property id="ldap.lookup" value="true" />
+              <camunda:property id="autocomplete_num" value="10" />
+              <camunda:property id="description" value="LDAP" />
+              <camunda:property id="hide_expression" value="!model.IND2_HolderType || !model.IND2_HolderType.value || model.IND2_HolderType.value !== &#34;UVaPI&#34;" />
             </camunda:properties>
           </camunda:formField>
+          <camunda:formField id="IND2_DrugBiologicName" label="Drug/Biologic Name" type="string" />
+          <camunda:formField id="IND2_AnotherIND" label="Another IND?" type="boolean" defaultValue="false" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_TwoOrThree</bpmn:incoming>
       <bpmn:outgoing>Flow_1p563xr</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:userTask id="IND_n3_info" name="Edit IND #3 Info" camunda:formKey="IND3_Info">
-      <bpmn:documentation>IND No.:</bpmn:documentation>
+      <bpmn:documentation>{{ ind_message }}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="IND3_Status" label="Do you have a third Investigational New Drug?" type="enum" defaultValue="No">
-            <camunda:value id="Yes" name="Yes" />
-            <camunda:value id="YesBut" name="Yes, but number is not available at this time." />
-            <camunda:value id="No" name="No" />
-          </camunda:formField>
           <camunda:formField id="IND3_Number" label="IND3 Number:" type="string">
             <camunda:properties>
-              <camunda:property id="value_expression" value="model.StudyInfo.details.IND_3" />
-              <camunda:property id="hide_expression" value="!model.IND3_Status || !model.IND3_Status.value || model.IND3_Status.value === &#39;No&#39;" />
+              <camunda:property id="description" value="IND number from Protocol Builder, if available." />
+              <camunda:property id="read_only" value="true" />
+              <camunda:property id="hide_expression" value="model.IND3_HolderType === &#34;Exempt&#34;" />
+              <camunda:property id="value_expression" value="IRB_IND3_Number" />
+            </camunda:properties>
+          </camunda:formField>
+          <camunda:formField id="IND3_UVA" label="Is UVA the IND number holder?" type="boolean">
+            <camunda:properties>
+              <camunda:property id="hide_expression" value="!model.pb_is_uva_ind || model.pb_is_uva_ind === 0" />
             </camunda:properties>
           </camunda:formField>
           <camunda:formField id="IND3_HolderType" label="IND Holder Type" type="enum">
-            <camunda:properties>
-              <camunda:property id="hide_expression" value="!model.IND3_Status || !model.IND3_Status.value || model.IND3_Status.value === &#39;No&#39;" />
-            </camunda:properties>
             <camunda:value id="Industry" name="Industry" />
             <camunda:value id="UVaPI" name="UVa PI" />
             <camunda:value id="OtherPI" name="Other PI" />
@@ -133,144 +148,237 @@ StudyInfo['details'] = study_info('details')</bpmn:script>
             <camunda:value id="Exempt" name="IND Exempt" />
             <camunda:value id="NA" name="NA" />
           </camunda:formField>
-          <camunda:formField id="IND3_HolderName" label="Holder Name" type="autocomplete">
+          <camunda:formField id="IND3_HolderNameOSP" label="Holder Name" type="autocomplete">
             <camunda:properties>
               <camunda:property id="spreadsheet.name" value="SponsorList.xls" />
               <camunda:property id="spreadsheet.value.column" value="CUSTOMER_NUMBER" />
               <camunda:property id="spreadsheet.label.column" value="CUSTOMER_NAME" />
-              <camunda:property id="hide_expression" value="!model.IND3_Status || !model.IND3_Status.value || model.IND3_Status.value === &#39;No&#39;" />
+              <camunda:property id="autocomplete_num" value="15" />
+              <camunda:property id="hide_expression" value="!model.IND3_HolderType || !model.IND3_HolderType.value || (model.IND3_HolderType.value !== &#34;Industry&#34; &#38;&#38; model.IND3_HolderType.value !== &#34;OtherCollUniv&#34;)" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="IND3_HolderNameNotInList" label="IND Holder Name if not in above list" type="string">
+          <camunda:formField id="IND3_HolderNameText" label="IND Holder Name if not in above list" type="string">
             <camunda:properties>
-              <camunda:property id="hide_expression" value="!model.IND3_Status || !model.IND3_Status.value || model.IND3_Status.value === &#39;No&#39; || model.IND3_HolderName.value !== &#34;0&#34;" />
+              <camunda:property id="hide_expression" value="(!model.IND3_HolderType || !model.IND3_HolderType.value || model.IND3_HolderType.value === &#34;UVaPI&#34; || model.IND3_HolderType.value === &#34;Exempt&#34;) || ((model.IND3_HolderType.value === &#34;Industry&#34; || model.IND3_HolderType.value === &#34;OtherCollUniv&#34;) &#38;&#38; (!model.IND3_HolderNameOSP || !model.IND3_HolderNameOSP.value || model.IND3_HolderNameOSP.value !== &#34;100&#34;))" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="IND3_DrugBiologicName" label="Drug/Biologic Name" type="string">
+          <camunda:formField id="IND3_HolderNameUVA" label="Holder Name" type="autocomplete">
             <camunda:properties>
-              <camunda:property id="hide_expression" value="!model.IND3_Status || !model.IND3_Status.value || model.IND3_Status.value === &#39;No&#39;" />
+              <camunda:property id="ldap.lookup" value="true" />
+              <camunda:property id="autocomplete_num" value="10" />
+              <camunda:property id="description" value="LDAP" />
+              <camunda:property id="hide_expression" value="!model.IND3_HolderType || !model.IND3_HolderType.value || model.IND3_HolderType.value !== &#34;UVaPI&#34;" />
             </camunda:properties>
           </camunda:formField>
+          <camunda:formField id="IND3_DrugBiologicName" label="Drug/Biologic Name" type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1p563xr</bpmn:incoming>
+      <bpmn:incoming>Flow_1wxvyqe</bpmn:incoming>
       <bpmn:outgoing>Flow_0jqdolk</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:sequenceFlow id="SequenceFlow_1cwibmt" sourceRef="Task_SupplementIDE" targetRef="Activity_0yf2ypo" />
-    <bpmn:userTask id="Activity_0yf2ypo" name="Provide IND Count" camunda:formKey="IND_Count">
-      <bpmn:documentation>{{ ind_message }}</bpmn:documentation>
-      <bpmn:extensionElements>
-        <camunda:formData>
-          <camunda:formField id="IND_CntEntered" label="How Many?" type="enum" defaultValue="one">
-            <camunda:validation>
-              <camunda:constraint name="required" config="true" />
-            </camunda:validation>
-            <camunda:value id="value_one" name="1 IND number" />
-            <camunda:value id="value_two" name="2 IND number" />
-            <camunda:value id="value_three" name="3 IND number" />
-            <camunda:value id="value_na" name="No IND Numbers in PB" />
-          </camunda:formField>
-          <camunda:formField id="FormField_0h8vmid" label="Test" type="string">
-            <camunda:properties>
-              <camunda:property id="value_expression" value="model.ind_cnt" />
-            </camunda:properties>
-          </camunda:formField>
-        </camunda:formData>
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_1cwibmt</bpmn:incoming>
-      <bpmn:outgoing>Flow_1bn0jp7</bpmn:outgoing>
-    </bpmn:userTask>
-    <bpmn:sequenceFlow id="Flow_1bn0jp7" sourceRef="Activity_0yf2ypo" targetRef="IND_n1_info" />
-    <bpmn:sequenceFlow id="Flow_1p563xr" sourceRef="IND_n2_info" targetRef="IND_n3_info" />
+    <bpmn:sequenceFlow id="SequenceFlow_1cwibmt" sourceRef="BusinessTask_IND_NumberCheck" targetRef="Activity_UVA_IND_Check" />
+    <bpmn:sequenceFlow id="Flow_1p563xr" sourceRef="IND_n2_info" targetRef="Gateway_Count3" />
     <bpmn:sequenceFlow id="Flow_0jqdolk" sourceRef="IND_n3_info" targetRef="EndEvent_1h89sl4" />
-    <bpmn:sequenceFlow id="Flow_10rb7gb" sourceRef="IND_n1_info" targetRef="Gateway_0ckycp9" />
-    <bpmn:exclusiveGateway id="Gateway_0ckycp9">
+    <bpmn:sequenceFlow id="Flow_10rb7gb" sourceRef="IND_n1_info" targetRef="Gateway_Count2" />
+    <bpmn:exclusiveGateway id="Gateway_Count2" name="Another IND?&#10;" default="Flow_TwoOrThree">
       <bpmn:incoming>Flow_10rb7gb</bpmn:incoming>
       <bpmn:outgoing>Flow_TwoOrThree</bpmn:outgoing>
       <bpmn:outgoing>Flow_OneOnly</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_TwoOrThree" name="Two or Three INDs" sourceRef="Gateway_0ckycp9" targetRef="IND_n2_info">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">IND_CntEntered != "value_one"</bpmn:conditionExpression>
+    <bpmn:sequenceFlow id="Flow_TwoOrThree" name="Yes" sourceRef="Gateway_Count2" targetRef="IND_n2_info" />
+    <bpmn:sequenceFlow id="Flow_OneOnly" name="No" sourceRef="Gateway_Count2" targetRef="EndEvent_1h89sl4">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">IND1_AnotherIND != True</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_OneOnly" name="One IND" sourceRef="Gateway_0ckycp9" targetRef="EndEvent_1h89sl4">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">IND_CntEntered == "value_one"</bpmn:conditionExpression>
+    <bpmn:sequenceFlow id="Flow_1rk7fmm" sourceRef="Activity_LoadIND_Data" targetRef="BusinessTask_IND_NumberCheck" />
+    <bpmn:scriptTask id="Activity_LoadIND_Data" name="Load IND Data">
+      <bpmn:incoming>SequenceFlow_1dhb8f4</bpmn:incoming>
+      <bpmn:outgoing>Flow_1rk7fmm</bpmn:outgoing>
+      <bpmn:script>details = study_info('details')
+ind_1 = details.IND_1
+ind_2 = details.IND_2
+ind_3 = details.IND_3
+is_ind = details.IS_IND
+is_uva_ind = details.IS_UVA_IND
+del(details)</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:exclusiveGateway id="Gateway_Count1" name="IS_IND?" default="Flow_00wk9rz">
+      <bpmn:incoming>Flow_0pwur5c</bpmn:incoming>
+      <bpmn:outgoing>Flow_04rl7gw</bpmn:outgoing>
+      <bpmn:outgoing>Flow_00wk9rz</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_04rl7gw" name="&#10;" sourceRef="Gateway_Count1" targetRef="Activity_0yf2ypo">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">is_ind != 1</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_00wk9rz" name="= 1 (Yes)" sourceRef="Gateway_Count1" targetRef="IND_n1_info" />
+    <bpmn:exclusiveGateway id="Gateway_Count3" name="Another IND?" default="Flow_1wxvyqe">
+      <bpmn:incoming>Flow_1p563xr</bpmn:incoming>
+      <bpmn:outgoing>Flow_1wxvyqe</bpmn:outgoing>
+      <bpmn:outgoing>Flow_13jejjr</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_1wxvyqe" name="Yes" sourceRef="Gateway_Count3" targetRef="IND_n3_info" />
+    <bpmn:sequenceFlow id="Flow_13jejjr" name="No" sourceRef="Gateway_Count3" targetRef="EndEvent_1h89sl4">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">not IND2_AnotherIND or IND2_AnotherIND != True</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:endEvent id="EndEvent_NoOrNull_IS_IND">
+      <bpmn:incoming>Flow_19usc52</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_19usc52" sourceRef="Activity_0yf2ypo" targetRef="EndEvent_NoOrNull_IS_IND" />
+    <bpmn:manualTask id="Activity_0yf2ypo" name="Show Contact Admin">
+      <bpmn:documentation>{{ ind_message }}</bpmn:documentation>
+      <bpmn:extensionElements>
+        <camunda:formData>
+          <camunda:formField id="IND_CntEntered" label="How Many?" type="enum">
+            <camunda:properties>
+              <camunda:property id="enum_type" value="radio" />
+            </camunda:properties>
+            <camunda:validation>
+              <camunda:constraint name="required" config="true" />
+            </camunda:validation>
+            <camunda:value id="one" name="1" />
+            <camunda:value id="two" name="2" />
+            <camunda:value id="three" name="3" />
+          </camunda:formField>
+        </camunda:formData>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_04rl7gw</bpmn:incoming>
+      <bpmn:outgoing>Flow_19usc52</bpmn:outgoing>
+    </bpmn:manualTask>
+    <bpmn:sequenceFlow id="Flow_0pwur5c" sourceRef="Activity_UVA_IND_Check" targetRef="Gateway_Count1" />
+    <bpmn:businessRuleTask id="Activity_UVA_IND_Check" name="UVA IND Check" camunda:decisionRef="Decision_UVA_IND_Check">
+      <bpmn:incoming>SequenceFlow_1cwibmt</bpmn:incoming>
+      <bpmn:outgoing>Flow_0pwur5c</bpmn:outgoing>
+    </bpmn:businessRuleTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_04jm0bm">
-      <bpmndi:BPMNEdge id="Flow_00n2n7p_di" bpmnElement="Flow_OneOnly">
-        <di:waypoint x="940" y="142" />
-        <di:waypoint x="940" y="260" />
-        <di:waypoint x="1510" y="260" />
-        <di:waypoint x="1510" y="135" />
+      <bpmndi:BPMNEdge id="Flow_0pwur5c_di" bpmnElement="Flow_0pwur5c">
+        <di:waypoint x="900" y="197" />
+        <di:waypoint x="965" y="197" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_19usc52_di" bpmnElement="Flow_19usc52">
+        <di:waypoint x="1040" y="390" />
+        <di:waypoint x="1112" y="390" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_13jejjr_di" bpmnElement="Flow_13jejjr">
+        <di:waypoint x="1710" y="172" />
+        <di:waypoint x="1710" y="100" />
+        <di:waypoint x="2100" y="100" />
+        <di:waypoint x="2100" y="179" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1205" y="242" width="43" height="14" />
+          <dc:Bounds x="1899" y="82" width="15" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1wxvyqe_di" bpmnElement="Flow_1wxvyqe">
+        <di:waypoint x="1735" y="197" />
+        <di:waypoint x="1790" y="197" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1754" y="179" width="18" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_00wk9rz_di" bpmnElement="Flow_00wk9rz">
+        <di:waypoint x="1015" y="197" />
+        <di:waypoint x="1140" y="197" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1049" y="173" width="44" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_04rl7gw_di" bpmnElement="Flow_04rl7gw">
+        <di:waypoint x="990" y="222" />
+        <di:waypoint x="990" y="350" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1010" y="276" width="0" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1rk7fmm_di" bpmnElement="Flow_1rk7fmm">
+        <di:waypoint x="550" y="197" />
+        <di:waypoint x="640" y="197" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_00n2n7p_di" bpmnElement="Flow_OneOnly">
+        <di:waypoint x="1370" y="222" />
+        <di:waypoint x="1370" y="340" />
+        <di:waypoint x="2100" y="340" />
+        <di:waypoint x="2100" y="215" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1730" y="322" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1o2u7k3_di" bpmnElement="Flow_TwoOrThree">
-        <di:waypoint x="965" y="117" />
-        <di:waypoint x="1070" y="117" />
+        <di:waypoint x="1395" y="197" />
+        <di:waypoint x="1480" y="197" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="987" y="86" width="65" height="27" />
+          <dc:Bounds x="1432" y="166" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_10rb7gb_di" bpmnElement="Flow_10rb7gb">
-        <di:waypoint x="860" y="117" />
-        <di:waypoint x="915" y="117" />
+        <di:waypoint x="1240" y="197" />
+        <di:waypoint x="1345" y="197" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0jqdolk_di" bpmnElement="Flow_0jqdolk">
-        <di:waypoint x="1380" y="117" />
-        <di:waypoint x="1492" y="117" />
+        <di:waypoint x="1890" y="197" />
+        <di:waypoint x="2082" y="197" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1p563xr_di" bpmnElement="Flow_1p563xr">
-        <di:waypoint x="1170" y="117" />
-        <di:waypoint x="1280" y="117" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1bn0jp7_di" bpmnElement="Flow_1bn0jp7">
-        <di:waypoint x="670" y="117" />
-        <di:waypoint x="760" y="117" />
+        <di:waypoint x="1580" y="197" />
+        <di:waypoint x="1685" y="197" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1cwibmt_di" bpmnElement="SequenceFlow_1cwibmt">
-        <di:waypoint x="520" y="117" />
-        <di:waypoint x="570" y="117" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1uzcl1f_di" bpmnElement="SequenceFlow_1uzcl1f">
-        <di:waypoint x="340" y="117" />
-        <di:waypoint x="420" y="117" />
+        <di:waypoint x="740" y="197" />
+        <di:waypoint x="800" y="197" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1dhb8f4_di" bpmnElement="SequenceFlow_1dhb8f4">
-        <di:waypoint x="188" y="117" />
-        <di:waypoint x="240" y="117" />
+        <di:waypoint x="358" y="197" />
+        <di:waypoint x="450" y="197" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="152" y="99" width="36" height="36" />
+        <dc:Bounds x="322" y="179" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1h89sl4_di" bpmnElement="EndEvent_1h89sl4">
-        <dc:Bounds x="1492" y="99" width="36" height="36" />
+        <dc:Bounds x="2082" y="179" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="414" y="202" width="74" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1fn00ox_di" bpmnElement="ScriptTask_LoadIRBDetails">
-        <dc:Bounds x="240" y="77" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BusinessRuleTask_1cszgkx_di" bpmnElement="Task_SupplementIDE">
-        <dc:Bounds x="420" y="77" width="100" height="80" />
+      <bpmndi:BPMNShape id="BusinessRuleTask_1cszgkx_di" bpmnElement="BusinessTask_IND_NumberCheck">
+        <dc:Bounds x="640" y="157" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_0a2dfa8_di" bpmnElement="IND_n1_info">
-        <dc:Bounds x="760" y="77" width="100" height="80" />
+        <dc:Bounds x="1140" y="157" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_1smni98_di" bpmnElement="IND_n2_info">
-        <dc:Bounds x="1070" y="77" width="100" height="80" />
+        <dc:Bounds x="1480" y="157" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_1378hd8_di" bpmnElement="IND_n3_info">
-        <dc:Bounds x="1280" y="77" width="100" height="80" />
+        <dc:Bounds x="1790" y="157" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0wfey2b_di" bpmnElement="Activity_0yf2ypo">
-        <dc:Bounds x="570" y="77" width="100" height="80" />
+      <bpmndi:BPMNShape id="Gateway_0ckycp9_di" bpmnElement="Gateway_Count2" isMarkerVisible="true">
+        <dc:Bounds x="1345" y="172" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1338" y="146" width="67" height="27" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_0ckycp9_di" bpmnElement="Gateway_0ckycp9" isMarkerVisible="true">
-        <dc:Bounds x="915" y="92" width="50" height="50" />
+      <bpmndi:BPMNShape id="Activity_0el77c2_di" bpmnElement="Activity_LoadIND_Data">
+        <dc:Bounds x="450" y="157" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_0nrywiv_di" bpmnElement="Gateway_Count1" isMarkerVisible="true">
+        <dc:Bounds x="965" y="172" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="975" y="142" width="42" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1iu0zpo_di" bpmnElement="Gateway_Count3" isMarkerVisible="true">
+        <dc:Bounds x="1685" y="172" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1677" y="229" width="67" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0dnhrh6_di" bpmnElement="EndEvent_NoOrNull_IS_IND">
+        <dc:Bounds x="1112" y="372" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0362d0t_di" bpmnElement="Activity_0yf2ypo">
+        <dc:Bounds x="940" y="350" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1w7kyic_di" bpmnElement="Activity_UVA_IND_Check">
+        <dc:Bounds x="800" y="157" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/crc/static/bpmn/irb_api_details/irb_api_details.bpmn b/crc/static/bpmn/irb_api_details/irb_api_details.bpmn
index 9e0b6271..da7a22db 100644
--- a/crc/static/bpmn/irb_api_details/irb_api_details.bpmn
+++ b/crc/static/bpmn/irb_api_details/irb_api_details.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_00j2iu5" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_00j2iu5" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
   <bpmn:process id="Process_1gmf4la" isExecutable="true">
     <bpmn:documentation />
     <bpmn:startEvent id="StartEvent_1">
@@ -8,8 +8,7 @@
     <bpmn:scriptTask id="ScriptTask_02924vs" name="Load IRB Details">
       <bpmn:incoming>SequenceFlow_1fmyo77</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_18nr0gf</bpmn:outgoing>
-      <bpmn:script>StudyInfo = {}
-StudyInfo['details'] = study_info('details')</bpmn:script>
+      <bpmn:script>details = study_info('details')</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_1fmyo77" sourceRef="StartEvent_1" targetRef="ScriptTask_02924vs" />
     <bpmn:sequenceFlow id="SequenceFlow_18nr0gf" sourceRef="ScriptTask_02924vs" targetRef="Activity_FromIRB-API" />
@@ -20,7 +19,7 @@ StudyInfo['details'] = study_info('details')</bpmn:script>
     <bpmn:manualTask id="Activity_FromIRB-API" name="From IRB API">
       <bpmn:documentation>| Data Point | Value | Help |
 |:-------------- |:-------- |:------ |
-{% for key, value in StudyInfo.details.items() -%}
+{% for key, value in details.items() -%}
 | {{key}} | {%- if value == None -%}
 \-\-
 {%- else -%}
@@ -56,21 +55,21 @@ Question not presented
         <di:waypoint x="470" y="117" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1fmyo77_di" bpmnElement="SequenceFlow_1fmyo77">
-        <di:waypoint x="228" y="117" />
+        <di:waypoint x="238" y="117" />
         <di:waypoint x="310" y="117" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="192" y="99" width="36" height="36" />
+        <dc:Bounds x="202" y="99" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_02924vs_di" bpmnElement="ScriptTask_02924vs">
         <dc:Bounds x="310" y="77" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_19nawos_di" bpmnElement="Activity_FromIRB-API">
-        <dc:Bounds x="470" y="77" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1qvyxg7_di" bpmnElement="EndEvent_1qvyxg7">
         <dc:Bounds x="672" y="99" width="36" height="36" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_19nawos_di" bpmnElement="Activity_FromIRB-API">
+        <dc:Bounds x="470" y="77" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/crc/static/bpmn/irb_api_personnel/decision_dept_chair.dmn b/crc/static/bpmn/irb_api_personnel/decision_dept_chair.dmn
index 0e3ad6dd..dfa7c021 100644
--- a/crc/static/bpmn/irb_api_personnel/decision_dept_chair.dmn
+++ b/crc/static/bpmn/irb_api_personnel/decision_dept_chair.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_d28686b" name="DRD" namespace="http://camunda.org/schema/1.0/dmn">
-  <decision id="Decision_53dac17" name="Decision 1">
+  <decision id="Decision_dept_chair" name="Department Chair">
     <extensionElements>
       <biodi:bounds x="290" y="130" width="180" height="80" />
     </extensionElements>
@@ -10,20 +10,40 @@
           <text>PI_department</text>
         </inputExpression>
       </input>
-      <output id="output_1" label="Chair Name &#38; Degree" name="Chair_Name_Degree" typeRef="string" />
       <output id="OutputClause_0a23e1m" label="Chair Computer ID" name="Chair_CID" typeRef="string" />
+      <output id="output_1" label="Chair Name &#38; Degree" name="Chair_Name_Degree" typeRef="string" />
       <output id="OutputClause_0ysj4lb" label="Chair Title" name="Chair_Title" typeRef="string" />
+      <output id="OutputClause_1cw9kan" label="Chair Sig Block" name="Chair_Sig_Block" typeRef="string" />
+      <output id="OutputClause_0lym39s" label="Designee 1 CID" name="D1_CID" typeRef="string" />
+      <output id="OutputClause_1jjvdz1" label="Designee 1 Name &#38; Degree" name="D1_Name_Degree" typeRef="string" />
+      <output id="OutputClause_07o7aw8" label="Designee 1 Title" name="D1_Title" typeRef="string" />
+      <output id="OutputClause_0vfjwcc" label="Designee 1 Sig Block" name="D1_Sig_Block" typeRef="string" />
       <rule id="DecisionRule_130my8k">
         <inputEntry id="UnaryTests_0utry5v">
           <text>"Anesthesiology"</text>
         </inputEntry>
+        <outputEntry id="LiteralExpression_0npmzip">
+          <text>"gfr2f"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0tk1vjc">
           <text>"George F. Rich, MD, PhD"</text>
         </outputEntry>
-        <outputEntry id="LiteralExpression_0npmzip">
+        <outputEntry id="LiteralExpression_0e67jw1">
+          <text>"Harrison Medical Teaching Professor and Chair"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_01dz6m5">
+          <text>"Department of Anesthesiology"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0n6oua7">
           <text></text>
         </outputEntry>
-        <outputEntry id="LiteralExpression_0e67jw1">
+        <outputEntry id="LiteralExpression_0zajaid">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0grhgrz">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1goqtom">
           <text></text>
         </outputEntry>
       </rule>
@@ -31,41 +51,86 @@
         <inputEntry id="UnaryTests_1twyz8n">
           <text>"Biochemistry &amp; Molecular Genetics"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_02ypl0q">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0mk1ouw">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_02ypl0q">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1g170wj">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1jhsveh">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_082aspf">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0awx5vb">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0aukxvo">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0009kji">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_11vnz24">
         <inputEntry id="UnaryTests_1n5hdk0">
           <text>"Biomedical Engineering"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1nbiz8o">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1ki2y5r">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1nbiz8o">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0zidebq">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_002cq1c">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0j5jqsg">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0lbxiqn">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0wkbs71">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1wlnj8l">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0o9l1g4">
         <inputEntry id="UnaryTests_00c9fvd">
           <text>"Brain Institute"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0e4jt7e">
-          <text>"Jaideep Kapur, MD, PhD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0a5eyr5">
           <text>"jk8t"</text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0e4jt7e">
+          <text>"Jaideep Kapur, MD, PhD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1kjp55c">
+          <text>"Director of UVA Brain Institute"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_17791yy">
+          <text>"Eugene Meyer III Professor of Neuroscience"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0v9pxd6">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_07n4c21">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0hvam0u">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_19e4obt">
           <text></text>
         </outputEntry>
       </rule>
@@ -73,27 +138,57 @@
         <inputEntry id="UnaryTests_1ne2xho">
           <text>"Cell Biology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0wfnk1a">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1mt2ueq">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0wfnk1a">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1bdq1nk">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_17cxb6g">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1n5mxii">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1tzwz8h">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_06ibam8">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0o5p6mi">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0tbdzg7">
         <inputEntry id="UnaryTests_192cb1q">
           <text>"Center for Diabetes Technology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_10za2my">
-          <text>"Harry G. Mitchell"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_00jss4e">
           <text>"hgm7s"</text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_10za2my">
+          <text>"Harry G. Mitchell"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_096h7xv">
+          <text>"Chief Operating Officer"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_07qfbku">
+          <text>"Center for Diabetes Technology"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0obq3ta">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0a8ph15">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1tscoeq">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_047859r">
           <text></text>
         </outputEntry>
       </rule>
@@ -101,13 +196,28 @@
         <inputEntry id="UnaryTests_1pbp49w">
           <text>"Center for Research in Reproduction"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_19cb1bz">
-          <text>"John C. Marshall, MD, PhD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0zkt3i2">
           <text>"jcm9h"</text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_19cb1bz">
+          <text>"John C. Marshall, MD, PhD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0uktq93">
+          <text>"Director, Center for Research in Reproduction"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0v8z227">
+          <text>"Andrew D. Hart Professor of Medicine"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_18x17lq">
+          <text>"cm2hq"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1l41pgn">
+          <text>"Christopher McCartney, MD"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1qhexw2">
+          <text>"Associate Professor of Medicine"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0th4s9k">
           <text></text>
         </outputEntry>
       </rule>
@@ -115,351 +225,726 @@
         <inputEntry id="UnaryTests_06vfwmk">
           <text>"Dermatology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1apthzx">
-          <text>"Art P. Saavedra, MD, PhD, MBA"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1yav83a">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1apthzx">
+          <text>"Art P. Saavedra, MD, PhD, MBA"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0hhk5mn">
-          <text></text>
+          <text>"Endowed Professor and Chair of Dermatology"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1yp78ih">
+          <text>"Chief of Ambulatory Strategy and Operations, Department of Dematology"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_163a3e0">
+          <text>"ltg4ga"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0nknugg">
+          <text>"Leisa Gonnella"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1rj0p0p">
+          <text>"Chief Operating Officer, Administrator"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1p9cuj3">
+          <text>"Department of Dermatology"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_1w4vnv2">
         <inputEntry id="UnaryTests_1uxzlwk">
           <text>"Emergency Medicine"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_00rdpy1">
-          <text>"Robert O'Connor, MD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0y4klbl">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_00rdpy1">
+          <text>"Robert O'Connor, MD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_00v04f6">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0rse4cx">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1w8ejrj">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0qdmvgy">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0tjzvg5">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0jfgfhp">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0v9kyu9">
         <inputEntry id="UnaryTests_0obk165">
           <text>"Family Medicine"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0g02cea">
-          <text>"Li Li, MD, PhD, MPH"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1u4cfnj">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0g02cea">
+          <text>"Li Li, MD, PhD, MPH"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_06vuegj">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1qhnttc">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_12xt0ep">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1qa5kcs">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0za5gpp">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1twuim4">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0yft3o2">
         <inputEntry id="UnaryTests_11hmf6p">
           <text>"Institute of Law, Psychiatry and Public Policy (institutional)"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1en1sr3">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1k99mrq">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1en1sr3">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0q5jqja">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_011ucce">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0bogqw7">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0jxkapm">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_13xl7b5">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1pwpak6">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0tn1ntu">
         <inputEntry id="UnaryTests_03sw24v">
           <text>"Keck Center for Cellular Imaging (institutional)"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0rzmxbc">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_13i4uts">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0rzmxbc">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1c1hbm4">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_01151r2">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_087iw0o">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0snuc6d">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_13kstqw">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1e8264r">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_1xa7pks">
         <inputEntry id="UnaryTests_1pppuin">
           <text>"Kinesiology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0f8mbsy">
-          <text>"Arthur L. Weltman"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_17bh2dl">
           <text>"alw2v"</text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0f8mbsy">
+          <text>"Arthur L. Weltman"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1ktzrw6">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0bs8674">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_02nf3re">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1oxr1hm">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0n7l563">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0opge44">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_07gq82a">
         <inputEntry id="UnaryTests_1usw6cv">
           <text>"Microbiology, Immunology, and Cancer Biology (MIC)"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0zas7lc">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0ayt0hb">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0zas7lc">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1t5vcgd">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0nfe8zu">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_02lfwjn">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1qgnopz">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1mw0evh">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_109mquo">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_1ugttjx">
         <inputEntry id="UnaryTests_0l14jnz">
           <text>"Molecular Physiology &amp; Biological Physics"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0nz91ut">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0cmnhcl">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0nz91ut">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1mvclh2">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1vz32qe">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0ra8i39">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1ssvvwf">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_09y17lm">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1jl7ljp">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_13zj816">
         <inputEntry id="UnaryTests_03te6ro">
           <text>"Neurology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1ym154j">
-          <text>"Howard Goodkin MD, PhD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0i51oau">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1ym154j">
+          <text>"Howard Goodkin MD, PhD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0txl5cj">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0sekcao">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0gfwwav">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0aszk0t">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1co84ru">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_03q6up9">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_1d162e6">
         <inputEntry id="UnaryTests_0t4sokv">
           <text>"Neuroscience"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1lszybr">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1tfzksp">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1lszybr">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1976phh">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1h2752z">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0jnhvv5">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1rzehm7">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0n5fge7">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1a80hnb">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_1qa4tbk">
         <inputEntry id="UnaryTests_0h7ex0k">
           <text>"Neurosurgery"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1ivww3e">
-          <text>"Mark E. Shaffrey, MD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1jrc8uu">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1ivww3e">
+          <text>"Mark E. Shaffrey, MD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1xdcxk9">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1d9vr6b">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1fd2214">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0lce0kt">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1nlp8dp">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1uy1fel">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_194hj7g">
         <inputEntry id="UnaryTests_1lmoxki">
           <text>"Obstetrics &amp; Gynecology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0l5nykm">
-          <text>"James (Jef) E  Ferguson II, MD, MBA"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1d2368t">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0l5nykm">
+          <text>"James (Jef) E  Ferguson II, MD, MBA"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0jwhpxm">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1391acv">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0si3942">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0d1n3k1">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1i5o5yn">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0dn6xa0">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_1feefxw">
         <inputEntry id="UnaryTests_1bquriu">
           <text>"Ophthalmology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0rcmv2x">
-          <text>"Peter Netland, MD, PhD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1cvve9k">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0rcmv2x">
+          <text>"Peter Netland, MD, PhD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0lb9uaq">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_063dzsz">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_097bq13">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1pu38e4">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0sea7rb">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0uhn2ma">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0kk6ajr">
         <inputEntry id="UnaryTests_0j98tua">
           <text>"Orthopedic Surgery"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_14lbprk">
-          <text>"A. Bobby Chhabra, MD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1jpdhy8">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_14lbprk">
+          <text>"A. Bobby Chhabra, MD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_16su4fp">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0br0ljc">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_18tsp9o">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0iytnrt">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1sqb3bn">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_00hwx9m">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_1ckz8ox">
         <inputEntry id="UnaryTests_1gkxt51">
           <text>"Otolaryngology- Head &amp; Neck Surgery"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1urdeg3">
-          <text>"Stephen S. Park, MD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1jxatpo">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1urdeg3">
+          <text>"Stephen S. Park, MD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1puli8h">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_05hanjd">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_05z5vca">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_140631p">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0sg2tkh">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1cco0sk">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_04eribm">
         <inputEntry id="UnaryTests_1a11t50">
           <text>"Pathology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1ovk0xq">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0kh06ih">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1ovk0xq">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0dc4w43">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_14xd721">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1w3elof">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0cndgkq">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_09cqz3x">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_19ke3cp">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_04do91b">
         <inputEntry id="UnaryTests_1hg6qgn">
           <text>"Pediatrics"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1h4gtcc">
-          <text>"James P. Nataro, MD, PhD, MBA, FAAP"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0wipbsc">
           <text>"jpn2r"</text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1h4gtcc">
+          <text>"James P. Nataro, MD, PhD, MBA, FAAP"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_18uyr1o">
           <text>"Chair, Department of Pediatrics"</text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_04ajeps">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_130lm87">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1ghciu1">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0ywnhpr">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1lgvui4">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0lb8hi5">
         <inputEntry id="UnaryTests_0y76uqi">
           <text>"Pharmacology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_0xu1r2k">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0zjqu5t">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0xu1r2k">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_12a5zfs">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1t7jwlp">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0c3vy0f">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0mdcrsx">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1hup339">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0mqbucf">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0csfjb9">
         <inputEntry id="UnaryTests_0ccnf2c">
           <text>"Plastic and Maxillofacial Surgery"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_09ynoch">
-          <text>"Thomas J. Gampper, MD, FACS"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0so2ly5">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_09ynoch">
+          <text>"Thomas J. Gampper, MD, FACS"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0ized9e">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0i6xbfl">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0ip9317">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1nurrpl">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0cdiqdv">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_12im461">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0ie3f70">
         <inputEntry id="UnaryTests_10hi0vn">
           <text>"Psychiatry and Neurobehavioral Sciences"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1tcqtd0">
-          <text>"Anita H. Clayton, MD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_05qrc3z">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1tcqtd0">
+          <text>"Anita H. Clayton, MD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_16paqdh">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1lomodj">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_128hjyq">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1ct7zgi">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1g86k3w">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_05bq3ae">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_1iavxz0">
         <inputEntry id="UnaryTests_1myl3be">
           <text>"Public Health Sciences"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1ayhurb">
-          <text></text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_0kdn3sp">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1ayhurb">
+          <text></text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_193gp8u">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0t4xqbq">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1ct3aon">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_11975jk">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0c75zal">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1joannt">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_1d7j3pd">
         <inputEntry id="UnaryTests_1m7gkcr">
           <text>"Radiation Oncology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_11ufvnv">
-          <text>"James M. Larner, MD, FASTRO"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1xg47wl">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_11ufvnv">
+          <text>"James M. Larner, MD, FASTRO"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1bm58kb">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1uqjshy">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0pombk0">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0yxaw3s">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_00i47mj">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0z7nmmd">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_0gzdz53">
         <inputEntry id="UnaryTests_0mo9711">
           <text>"Radiology and Medical Imaging"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1v4defw">
-          <text>"Alan H. Matsumoto, MD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_07shsb0">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1v4defw">
+          <text>"Alan H. Matsumoto, MD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0gqqxxj">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1oowa0l">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0p9rbw9">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1rmnnwe">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1p31rj5">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0zhi6dq">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_1immrvr">
         <inputEntry id="UnaryTests_01pmp6n">
           <text>"Surgery"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_01ao8qh">
-          <text>"Alexander S. Krupnick , MD"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_026jlgr">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_01ao8qh">
+          <text>"Alexander S. Krupnick , MD"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_1yqde5y">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_0obxa2t">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0tvp046">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0yww9ti">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_19qm59b">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1rjo16e">
+          <text></text>
+        </outputEntry>
       </rule>
       <rule id="DecisionRule_148egsn">
         <inputEntry id="UnaryTests_0x77krc">
           <text>"Urology"</text>
         </inputEntry>
-        <outputEntry id="LiteralExpression_1qsi7o3">
-          <text>"Kristen L.Greene, MD, MAS, FACS"</text>
-        </outputEntry>
         <outputEntry id="LiteralExpression_1xwdb9q">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_1qsi7o3">
+          <text>"Kristen L.Greene, MD, MAS, FACS"</text>
+        </outputEntry>
         <outputEntry id="LiteralExpression_0hi3yzf">
           <text></text>
         </outputEntry>
+        <outputEntry id="LiteralExpression_04tmu5b">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_15ixegr">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_1mjzs1w">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_16wfyws">
+          <text></text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0ehj16p">
+          <text></text>
+        </outputEntry>
       </rule>
     </decisionTable>
   </decision>
diff --git a/crc/static/bpmn/irb_api_personnel/determine_pi_dept.dmn b/crc/static/bpmn/irb_api_personnel/determine_pi_dept.dmn
deleted file mode 100644
index 0ee30e30..00000000
--- a/crc/static/bpmn/irb_api_personnel/determine_pi_dept.dmn
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_a3b9c9b" name="DRD" namespace="http://camunda.org/schema/1.0/dmn">
-  <decision id="Decision_PI_Dept" name="PI Department">
-    <extensionElements>
-      <biodi:bounds x="300" y="140" width="180" height="80" />
-    </extensionElements>
-    <decisionTable id="decisionTable_1">
-      <input id="InputClause_12xvnxx" label="E0 Dept">
-        <inputExpression id="LiteralExpression_1q9d9zi" typeRef="string">
-          <text>E0_dept</text>
-        </inputExpression>
-      </input>
-      <output id="output_1" label="PI Department" name="PI_department" typeRef="string" />
-      <rule id="DecisionRule_1b5ywn5">
-        <inputEntry id="UnaryTests_1bev7id">
-          <text>"ANES"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1nzq40i">
-          <text>"Anesthesiology"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0wbq6tr">
-        <inputEntry id="UnaryTests_1vs880z">
-          <text>"BIOC"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0tgoozf">
-          <text>"Biochemistry &amp; Molecular Genetics"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0zojm1d">
-        <inputEntry id="UnaryTests_0kgwioh">
-          <text>"BIOM"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_08w2wq9">
-          <text>"Biomedical Engineering"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0owmu0q">
-        <inputEntry id="UnaryTests_0rywcw8">
-          <text>"CELL"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0ru3sax">
-          <text>"Cell Biology"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_1ryvd9v">
-        <inputEntry id="UnaryTests_0yrysju">
-          <text>"DMED"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1c4iwlq">
-          <text></text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_11nfq9u">
-        <inputEntry id="UnaryTests_15017iw">
-          <text>"INMD"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_193ae27">
-          <text>"Institute of Law, Psychiatry and Public Policy (institutional)"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0lwmys9">
-        <inputEntry id="UnaryTests_0bgwlbf">
-          <text>"INMD-Ctr"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1p0b3ea">
-          <text>"Keck Center for Cellular Imaging (institutional)"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_1qjzff0">
-        <inputEntry id="UnaryTests_10jnj9r">
-          <text>"MICR"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1qpt4pk">
-          <text>"Microbiology, Immunology, and Cancer Biology (MIC)"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_08qhcy9">
-        <inputEntry id="UnaryTests_19uyawr">
-          <text>"MPHY"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_06z2wux">
-          <text>"Molecular Physiology &amp; Biological Physics"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0ovrx5p">
-        <inputEntry id="UnaryTests_0pg1um2">
-          <text>"NERS"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0p5gvct">
-          <text>"Neurosurgery"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_135q0hq">
-        <inputEntry id="UnaryTests_0e11w4s">
-          <text>"NESC"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0bu5hgk">
-          <text>"Neuroscience"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_18zb09n">
-        <inputEntry id="UnaryTests_0fvagjn">
-          <text>"NEUR"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0tl3ksn">
-          <text>"Neurology"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_1vev1e3">
-        <inputEntry id="UnaryTests_07qj3jf">
-          <text>"OBGY"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_067ehpk">
-          <text>"Obstetrics and Gynecology"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_08k4jec">
-        <inputEntry id="UnaryTests_0nlzxc2">
-          <text>"OPHT"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_103y6qq">
-          <text>"Ophthalmology"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0a48i89">
-        <inputEntry id="UnaryTests_1y5nfzo">
-          <text>"ORTP"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1cr3wq0">
-          <text>"Orthopaedic Surgery"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0km2u3f">
-        <inputEntry id="UnaryTests_1buhr78">
-          <text>"PATH"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0nx1reo">
-          <text>"Pathology"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_1gc10ny">
-        <inputEntry id="UnaryTests_1uru4m4">
-          <text>"PBHS"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_073f0bn">
-          <text>"Public Health Sciences"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_145vhtj">
-        <inputEntry id="UnaryTests_1y8kr8n">
-          <text>"PEDT"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1k444fj">
-          <text>"Pediatrics"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_05u0zki">
-        <inputEntry id="UnaryTests_1uudg05">
-          <text>"PHAR"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1mz3u7d">
-          <text>"Pharmacology"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0o9ozyh">
-        <inputEntry id="UnaryTests_1ytw7l4">
-          <text>"PLSR"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0mxv6ov">
-          <text>"Plastic and Maxillofacial Surgery"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0wbzqhg">
-        <inputEntry id="UnaryTests_0uwi3mu">
-          <text>"PSCH"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1lsruwb">
-          <text>"Psychiatry and Neurobehavioral Sciences"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_1ukpgze">
-        <inputEntry id="UnaryTests_0ijuf1f">
-          <text>"RADL"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1tjwp0q">
-          <text>"Radiology and Medical Imaging"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_04la8a6">
-        <inputEntry id="UnaryTests_1f5hv2r">
-          <text>"RONC"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0g10afk">
-          <text>"Radiation Oncology"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0qwccau">
-        <inputEntry id="UnaryTests_0661n6g">
-          <text>"SURG"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1iuug6l">
-          <text>"Surgery"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0jleevh">
-        <inputEntry id="UnaryTests_1cpprhv">
-          <text>"UROL"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0kllkvf">
-          <text>"Urology"</text>
-        </outputEntry>
-      </rule>
-    </decisionTable>
-  </decision>
-</definitions>
diff --git a/crc/static/bpmn/irb_api_personnel/irb_api_personnel.bpmn b/crc/static/bpmn/irb_api_personnel/irb_api_personnel.bpmn
index 6293a96c..343f77cb 100644
--- a/crc/static/bpmn/irb_api_personnel/irb_api_personnel.bpmn
+++ b/crc/static/bpmn/irb_api_personnel/irb_api_personnel.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_06pyjz2" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_06pyjz2" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
   <bpmn:process id="Process_01143nb" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_0kcrx5l</bpmn:outgoing>
@@ -7,203 +7,634 @@
     <bpmn:scriptTask id="ScriptTask_LoadPersonnel" name="Load IRB Personnel">
       <bpmn:incoming>Flow_0kcrx5l</bpmn:incoming>
       <bpmn:outgoing>Flow_1dcsioh</bpmn:outgoing>
-      <bpmn:script>investigators = study_info('investigators')</bpmn:script>
+      <bpmn:script>me = ldap()
+investigators = study_info('investigators')
+pi = investigators.get('PI', None)
+is_me_pi = False
+if pi != None:
+	hasPI = True
+	if pi['uid'] == me['uid']:
+		is_me_pi = True
+else:
+	hasPI = False
+dc = investigators.get('DEPT_CH', None)
+pcs = {}
+is_me_pc = False
+for k in investigators.keys():
+	if k in ['SC_I','SC_II','IRBC']:
+		investigator = investigators.get(k)
+		if investigator['uid'] != me['uid']:
+			pcs[k] = investigator
+		else:
+			is_me_pc = True
+			is_me_pc_role = investigator['label']
+cnt_pcs = len(pcs.keys())
+del(k)
+del(investigator)
+acs = {}
+is_me_ac = False
+for k in investigators.keys():
+	if k == 'AS_C':
+		investigator = investigators.get(k)
+		if investigator['uid'] != me['uid']:
+			acs[k] = investigator
+		else:
+			is_me_ac = True
+			is_me_ac_role = investigator['label']
+cnt_acs = len(acs.keys())
+del(k)
+del(investigator)
+subs = {}
+is_me_subs = False
+for k in investigators.keys():
+	if k[:2] == 'SI':
+		investigator = investigators.get(k)
+		if investigator['uid'] != me['uid']:
+			subs[k] = investigator
+		else:
+			is_me_subs = True
+cnt_subs = len(subs.keys())
+del(k)
+del(investigator)
+del(investigators)</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:endEvent id="EndEvent_1qor16n">
-      <bpmn:documentation>## The following information was gathered:
-{% if pi|length == 1 %}
-### PI: {{ pi.PI.display_name }}
-  * Edit Acess? {{ pi.edit_access }}
-  * Send Emails? {{ pi.emails }}
-  * Experience: {{ pi.experience }}
-{% else %}
-### No PI in PB
-{% endif %}</bpmn:documentation>
-      <bpmn:incoming>Flow_1n0k4pd</bpmn:incoming>
-      <bpmn:incoming>Flow_1oqem42</bpmn:incoming>
+    <bpmn:endEvent id="EndEvent_1qor16n" name="None">
+      <bpmn:documentation>temp</bpmn:documentation>
+      <bpmn:incoming>Flow_0ofpgml</bpmn:incoming>
+      <bpmn:incoming>Flow_0jxzqw1</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:userTask id="Activity_EditPI" name="Update PI Info" camunda:formKey="PI_AccessEmailsExperience">
-      <bpmn:documentation>### Please provide supplemental information for:
-#### {{ pi.PI.display_name }} 
-##### Title: {{ pi.PI.title }}
+    <bpmn:userTask id="Activity_EditPI" name="Update PI Info" camunda:formKey="PI_Info">
+      <bpmn:documentation>##### Please confirm Primary Investigator entered in Protocol Builder is correct and if so, provide additional information:
+### **{{ pi.display_name }}** 
+***Email:*** {{ pi.email_address }}
 
-##### Department: {{ pi.PI.department }}
-##### Affiliation: {{ pi.PI.affiliation }}</bpmn:documentation>
+**Primary Appointment**
+***School:*** {{ pi.E0.schoolName }}
+***Department:*** {{ pi.E0.deptName }}
+
+
+{% if is_me_pi %}
+Since you are the person entering this information, you already have access and will receive all emails.
+{% endif %}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="pi.edit_access" label="Should the Principal Investigator have full editing access in the system?" type="boolean" defaultValue="true" />
-          <camunda:formField id="pi.emails" label="Should the Principal Investigator receive automated email notifications?" type="boolean" defaultValue="true" />
           <camunda:formField id="pi.experience" label="Investigator&#39;s Experience" type="textarea">
             <camunda:properties>
               <camunda:property id="rows" value="5" />
             </camunda:properties>
           </camunda:formField>
+          <camunda:formField id="pi.access" label="Should the Principal Investigator have full editing access in the system?" type="boolean" defaultValue="true">
+            <camunda:properties>
+              <camunda:property id="hide_expression" value="model.is_me_pi" />
+            </camunda:properties>
+          </camunda:formField>
+          <camunda:formField id="pi.emails" label="Should the Principal Investigator receive automated email notifications?" type="boolean" defaultValue="true">
+            <camunda:properties>
+              <camunda:property id="hide_expression" value="model.is_me_pi" />
+            </camunda:properties>
+          </camunda:formField>
         </camunda:formData>
         <camunda:properties>
-          <camunda:property name="display_name" value="pi.PI.label" />
+          <camunda:property name="display_name" value="pi.label" />
         </camunda:properties>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_147b9li</bpmn:incoming>
+      <bpmn:incoming>Flow_1kg5jot</bpmn:incoming>
       <bpmn:outgoing>Flow_1mplloa</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_0kcrx5l" sourceRef="StartEvent_1" targetRef="ScriptTask_LoadPersonnel" />
-    <bpmn:sequenceFlow id="Flow_1mplloa" sourceRef="Activity_EditPI" targetRef="Activity_0r8pam5" />
-    <bpmn:sequenceFlow id="Flow_1dcsioh" sourceRef="ScriptTask_LoadPersonnel" targetRef="Activity_0bg56lv" />
-    <bpmn:sequenceFlow id="Flow_17uqguj" sourceRef="Activity_0bg56lv" targetRef="Gateway_CheckForPI" />
-    <bpmn:scriptTask id="Activity_0bg56lv" name="Check for PI">
+    <bpmn:sequenceFlow id="Flow_1mplloa" sourceRef="Activity_EditPI" targetRef="UserTask_SelectChair" />
+    <bpmn:sequenceFlow id="Flow_1dcsioh" sourceRef="ScriptTask_LoadPersonnel" targetRef="Gateway_CheckForPI" />
+    <bpmn:exclusiveGateway id="Gateway_CheckForPI" name="PI Cnt" default="Flow_147b9li">
       <bpmn:incoming>Flow_1dcsioh</bpmn:incoming>
-      <bpmn:outgoing>Flow_17uqguj</bpmn:outgoing>
-      <bpmn:script>pi = {x:investigators[x] for x in investigators.keys() if x[:2] == 'PI'}</bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:exclusiveGateway id="Gateway_CheckForPI" name="PI Cnt">
-      <bpmn:incoming>Flow_17uqguj</bpmn:incoming>
       <bpmn:outgoing>Flow_147b9li</bpmn:outgoing>
       <bpmn:outgoing>Flow_00prawo</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_147b9li" name="1 PI from PB" sourceRef="Gateway_CheckForPI" targetRef="Activity_EditPI">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">len(pi.keys()) == 1</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_147b9li" name="1 PI from PB" sourceRef="Gateway_CheckForPI" targetRef="ScriptTask_DeterminePI_E0_Department" />
     <bpmn:sequenceFlow id="Flow_00prawo" name="No PI from PB" sourceRef="Gateway_CheckForPI" targetRef="Activity_1qwzwyi">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">len(pi.keys()) == 0</bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">hasPI == False</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:manualTask id="Activity_1qwzwyi" name="Show No PI">
       <bpmn:documentation>No PI entered in PB</bpmn:documentation>
       <bpmn:incoming>Flow_00prawo</bpmn:incoming>
-      <bpmn:outgoing>Flow_14ti38o</bpmn:outgoing>
+      <bpmn:outgoing>Flow_16qr5jf</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:sequenceFlow id="Flow_0elbjpd" sourceRef="Activity_0r8pam5" targetRef="Gateway_0jykh6r" />
-    <bpmn:scriptTask id="Activity_0r8pam5" name="Check for Study Coordinators">
-      <bpmn:incoming>Flow_1mplloa</bpmn:incoming>
-      <bpmn:incoming>Flow_14ti38o</bpmn:incoming>
-      <bpmn:outgoing>Flow_0elbjpd</bpmn:outgoing>
-      <bpmn:script>scs = {x:investigators[x] for x in investigators.keys() if x[:3] == 'SC_'}</bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:exclusiveGateway id="Gateway_0jykh6r">
-      <bpmn:incoming>Flow_0elbjpd</bpmn:incoming>
+    <bpmn:exclusiveGateway id="Gateway_0jykh6r" name="How many Primary Coordinators?" default="Flow_0xifvai">
+      <bpmn:incoming>Flow_0kpe12r</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_0cdtt11</bpmn:incoming>
       <bpmn:outgoing>Flow_0xifvai</bpmn:outgoing>
       <bpmn:outgoing>Flow_1oqem42</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_0xifvai" name="1 or more Study Coordinators" sourceRef="Gateway_0jykh6r" targetRef="Activity_1bcnjyq">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">len(scs.keys()) &gt;= 1</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_1n0k4pd" sourceRef="Activity_1bcnjyq" targetRef="EndEvent_1qor16n" />
-    <bpmn:userTask id="Activity_1bcnjyq" name="Update SC Info" camunda:formKey="SC_AccessEmails">
-      <bpmn:documentation>### Please provide supplemental information for:
-#### {{ sc.display_name }} 
-##### Title: {{ sc.title }}
+    <bpmn:sequenceFlow id="Flow_0xifvai" name="1 or more" sourceRef="Gateway_0jykh6r" targetRef="TaskPMI_UpdateCoordinatorInfo" />
+    <bpmn:sequenceFlow id="Flow_1n0k4pd" sourceRef="TaskPMI_UpdateCoordinatorInfo" targetRef="Gateway_0zrcknh" />
+    <bpmn:userTask id="TaskPMI_UpdateCoordinatorInfo" name="Update Primary Coordinator Info" camunda:formKey="SC_AccessEmails">
+      <bpmn:documentation>The following Primary Coordinators were entered in Protocol Builder:
+{%+ for key, value in pcs.items() %}{{value.display_name}} ({{key}}){% if loop.index is lt cnt_pcs %}, {% endif %}{% endfor %}
+To Save the current settings for all Primary Coordinators, select Save All.
 
 
-##### Department: {{ sc.department }}
-##### Affiliation: {{ sc.affiliation }}</bpmn:documentation>
+Otherwise, edit each Coordinator as necessary and select the Save button for each.
+
+### Please provide supplemental information for:
+ #### {{ pc.display_name }} 
+ ##### Title: {{ pc.title }}
+
+ ##### Department: {{ pc.department }}
+ ##### Affiliation: {{ pc.affiliation }}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="sc.access" label="Should this Study Coordinator have full editing access in the system?" type="boolean" />
-          <camunda:formField id="sc.emails" label="Should this Study Coordinator receive automated email notifications?" type="boolean" defaultValue="yes" />
+          <camunda:formField id="pc.access" label="Should this Coordinator have full editing access in the system?" type="boolean" defaultValue="true" />
+          <camunda:formField id="pc.emails" label="Should this Coordinator receive automated email notifications?" type="boolean" defaultValue="true" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0xifvai</bpmn:incoming>
       <bpmn:outgoing>Flow_1n0k4pd</bpmn:outgoing>
-      <bpmn:multiInstanceLoopCharacteristics camunda:collection="scs" camunda:elementVariable="sc" />
+      <bpmn:multiInstanceLoopCharacteristics camunda:collection="pcs" camunda:elementVariable="pc" />
     </bpmn:userTask>
-    <bpmn:sequenceFlow id="Flow_1oqem42" name="No Study Coordinators" sourceRef="Gateway_0jykh6r" targetRef="EndEvent_1qor16n">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">len(scs.keys()) == 0</bpmn:conditionExpression>
+    <bpmn:sequenceFlow id="Flow_1oqem42" name="None" sourceRef="Gateway_0jykh6r" targetRef="Gateway_0zrcknh">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">cnt_pcs == 0</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:scriptTask id="ScriptTask_DeterminePI_E0_Department" name="Determine PI E0 Department">
+      <bpmn:incoming>Flow_147b9li</bpmn:incoming>
+      <bpmn:outgoing>Flow_1grahhv</bpmn:outgoing>
+      <bpmn:script>LDAP_dept = pi.department
+length_LDAP_dept = len(LDAP_dept)
+pi.E0 = {}
+if length_LDAP_dept &gt; 0:
+	E0_start = LDAP_dept.find("E0:") + 3
+	E0_slice = LDAP_dept[E0_start:length_LDAP_dept]
+	E0_first_hyphen = E0_slice.find("-")
+	E0_dept_start = E0_first_hyphen + 1
+	pi.E0.schoolAbbrv = E0_slice[0:E0_first_hyphen]
+	isSpace = " " in E0_slice
+	if isSpace:
+		E0_first_space = E0_slice.find(" ")
+		E0_spec_start = E0_first_space + 1
+		E0_spec_end = len(E0_slice)
+		pi.E0.deptAbbrv = E0_slice[E0_dept_start:E0_first_space]
+		pi.E0.specName = E0_slice[E0_spec_start:E0_spec_end]
+	else:
+		pi.E0.specName = ""
+else:
+	pi.E0.schoolAbbrv = "Not in LDAP"
+	pi.E0.deptAbbrv = "Not in LDAP"
+	pi.E0.specName = "Not in LDAP"</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="Flow_1grahhv" sourceRef="ScriptTask_DeterminePI_E0_Department" targetRef="BusinessRule_PI_School" />
+    <bpmn:businessRuleTask id="BusinessRule_PI_Dept" name="Determine PI Department" camunda:decisionRef="Decision_PI_Dept">
+      <bpmn:incoming>Flow_1eaikyp</bpmn:incoming>
+      <bpmn:outgoing>Flow_1wz38hl</bpmn:outgoing>
+    </bpmn:businessRuleTask>
+    <bpmn:sequenceFlow id="Flow_1wz38hl" sourceRef="BusinessRule_PI_Dept" targetRef="ScriptTask_Update_PIData" />
+    <bpmn:sequenceFlow id="Flow_1eaikyp" sourceRef="BusinessRule_PI_School" targetRef="BusinessRule_PI_Dept" />
+    <bpmn:businessRuleTask id="BusinessRule_PI_School" name="Determine PI School" camunda:decisionRef="Decision_PI_School">
+      <bpmn:incoming>Flow_1grahhv</bpmn:incoming>
+      <bpmn:outgoing>Flow_1eaikyp</bpmn:outgoing>
+    </bpmn:businessRuleTask>
+    <bpmn:userTask id="UserTask_SelectChair" name="Select Responsible Organization" camunda:formKey="Chair_Info">
+      <bpmn:documentation>The Study's Responsible Organization is needed in order to confirm the Department Chair.  If it is the same as the Primary Investigator's Primary Department show below, we have all the information needed to determine the Department Chair.
+
+
+**Primary Investigator's Primary Appointment** 
+***School:*** {{ pi.E0.schoolName }}
+***Department:*** {{ pi.E0.deptName }}</bpmn:documentation>
+      <bpmn:extensionElements>
+        <camunda:formData>
+          <camunda:formField id="isRO_SameAsPIsPriDept" label="Is the Study&#39;s Responsible Organization the same as the PI&#39;s Primary Department?" type="boolean" defaultValue="true" />
+          <camunda:formField id="RO_StudySchool" label="Study&#39;s Responsible Organization School" type="enum">
+            <camunda:properties>
+              <camunda:property id="spreadsheet.name" value="SchoolList.xls" />
+              <camunda:property id="spreadsheet.value.column" value="Value" />
+              <camunda:property id="spreadsheet.label.column" value="School Name" />
+              <camunda:property id="hide_expression" value="model.isRO_SameAsPIsPriDept" />
+              <camunda:property id="value_expression" value="field.templateOptions.options.find(o =&#62; o.value === model.E0_school)" />
+            </camunda:properties>
+          </camunda:formField>
+          <camunda:formField id="RO_StudyDeptArtsSciences" label="PI&#39;s Study Responsible Organization Department" type="enum">
+            <camunda:properties>
+              <camunda:property id="spreadsheet.name" value="DepartmentList-ArtsSciences.xlsx" />
+              <camunda:property id="spreadsheet.value.column" value="Value" />
+              <camunda:property id="spreadsheet.label.column" value="Label" />
+              <camunda:property id="description" value="Type key words to find A&#38;S Department" />
+              <camunda:property id="hide_expression" value="!model.RO_StudySchool || !model.RO_StudySchool.value || model.isRO_SameAsPIsPriDept || (model.RO_StudySchool &#38;&#38; model.RO_StudySchool.value !== &#34;AS&#34;)" />
+            </camunda:properties>
+          </camunda:formField>
+          <camunda:formField id="RO_StudyDeptEducation" label="PI&#39;s Study Responsible Organization Department" type="enum">
+            <camunda:properties>
+              <camunda:property id="spreadsheet.name" value="DepartmentList-Education.xlsx" />
+              <camunda:property id="spreadsheet.value.column" value="Value" />
+              <camunda:property id="spreadsheet.label.column" value="Label" />
+              <camunda:property id="hide_expression" value="!model.RO_StudySchool || !model.RO_StudySchool.value || model.isRO_SameAsPIsPriDept || (model.RO_StudySchool &#38;&#38; model.RO_StudySchool.value !== &#34;CU&#34;)" />
+              <camunda:property id="description" value="Type key words to find Education Department" />
+            </camunda:properties>
+          </camunda:formField>
+          <camunda:formField id="RO_StudyDeptMedicine" label="PI&#39;s Study Responsible Organization Department" type="enum">
+            <camunda:properties>
+              <camunda:property id="spreadsheet.name" value="DepartmentList-Medicine.xlsx" />
+              <camunda:property id="spreadsheet.value.column" value="Value" />
+              <camunda:property id="spreadsheet.label.column" value="Label" />
+              <camunda:property id="hide_expression" value="!model.RO_StudySchool || !model.RO_StudySchool.value || model.isRO_SameAsPIsPriDept || (model.RO_StudySchool &#38;&#38; model.RO_StudySchool.value !== &#34;MD&#34;)" />
+              <camunda:property id="description" value="Type key words to find Medicine Department" />
+            </camunda:properties>
+          </camunda:formField>
+        </camunda:formData>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1mplloa</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_08zdodt</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="SequenceFlow_08zdodt" sourceRef="UserTask_SelectChair" targetRef="BusinessRuleTask_Determine_RO" />
+    <bpmn:sequenceFlow id="Flow_1oo0ijr" sourceRef="BusinessRuleTask_Determine_RO_Chair" targetRef="ScriptTask_UpdateRO_Data" />
+    <bpmn:businessRuleTask id="BusinessRuleTask_Determine_RO_Chair" name="Determine RO Chair" camunda:decisionRef="Decision_RO_Chair">
+      <bpmn:incoming>Flow_0d4x46e</bpmn:incoming>
+      <bpmn:outgoing>Flow_1oo0ijr</bpmn:outgoing>
+    </bpmn:businessRuleTask>
+    <bpmn:sequenceFlow id="Flow_0d4x46e" sourceRef="BusinessRuleTask_Determine_RO_Department" targetRef="BusinessRuleTask_Determine_RO_Chair" />
+    <bpmn:businessRuleTask id="BusinessRuleTask_Determine_RO_Department" name="Determine RO Department" camunda:decisionRef="Decision_RO_Dept">
+      <bpmn:incoming>Flow_0uzx3wo</bpmn:incoming>
+      <bpmn:outgoing>Flow_0d4x46e</bpmn:outgoing>
+    </bpmn:businessRuleTask>
+    <bpmn:userTask id="UserTask_109otvi" name="Update Chair Info" camunda:formKey="RO_Chair_Info">
+      <bpmn:documentation>***Name &amp; Degree:*** {{ RO_Chair_Name_Degree }}
+***School:*** {{ RO_School }}
+***Department:*** {{ RO_Department }}
+***Title:*** {{ RO_Chair_Title }}
+***Email:*** {{ RO_Chair_CID }}
+
+
+{% if RO_Chair_CID != dc.uid %}
+  *Does not match the Department Chair specified in Protocol Builder, {{ dc.display_name }}*
+{% endif %}</bpmn:documentation>
+      <bpmn:extensionElements>
+        <camunda:formData>
+          <camunda:formField id="RO_ChairAccess" label="Should the Department Chair have full editing access in the system?" type="boolean" defaultValue="false" />
+          <camunda:formField id="RO_ChairEmails" label="Should the Department Chair receive automated email notifications?" type="boolean" defaultValue="false" />
+        </camunda:formData>
+        <camunda:properties>
+          <camunda:property name="display_name" value="&#34;Responsible Organization&#39;s Chair Info&#34;" />
+        </camunda:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0vi6thu</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0cdtt11</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="SequenceFlow_0cdtt11" sourceRef="UserTask_109otvi" targetRef="Gateway_0jykh6r" />
+    <bpmn:sequenceFlow id="Flow_0uzx3wo" sourceRef="BusinessRuleTask_Determine_RO" targetRef="BusinessRuleTask_Determine_RO_Department" />
+    <bpmn:businessRuleTask id="BusinessRuleTask_Determine_RO" name="Determine RO" camunda:decisionRef="Decision_RO">
+      <bpmn:incoming>SequenceFlow_08zdodt</bpmn:incoming>
+      <bpmn:outgoing>Flow_0uzx3wo</bpmn:outgoing>
+    </bpmn:businessRuleTask>
+    <bpmn:exclusiveGateway id="Gateway_PI_is_DeptChair" name="PI is Dept Chair?" default="Flow_0vi6thu">
+      <bpmn:incoming>Flow_070j5fg</bpmn:incoming>
+      <bpmn:outgoing>Flow_0vi6thu</bpmn:outgoing>
+      <bpmn:outgoing>Flow_00yhlrq</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_0vi6thu" name="No" sourceRef="Gateway_PI_is_DeptChair" targetRef="UserTask_109otvi" />
+    <bpmn:sequenceFlow id="Flow_00yhlrq" name="Yes" sourceRef="Gateway_PI_is_DeptChair" targetRef="Activity_ShowPI_is_DeptChair">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">RO_Chair_CID == pi.uid</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:manualTask id="Activity_ShowPI_is_DeptChair" name="Show PI is Dept Chair">
+      <bpmn:documentation>The PI is also the RO Chair</bpmn:documentation>
+      <bpmn:incoming>Flow_00yhlrq</bpmn:incoming>
+      <bpmn:outgoing>Flow_0kpe12r</bpmn:outgoing>
+    </bpmn:manualTask>
+    <bpmn:sequenceFlow id="Flow_0kpe12r" sourceRef="Activity_ShowPI_is_DeptChair" targetRef="Gateway_0jykh6r" />
+    <bpmn:exclusiveGateway id="Gateway_1oxt6h1" name="How many Sub-Investigators?" default="Flow_05rqrlf">
+      <bpmn:incoming>Flow_12ss6u8</bpmn:incoming>
+      <bpmn:incoming>Flow_0dt3pjw</bpmn:incoming>
+      <bpmn:outgoing>Flow_05rqrlf</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0jxzqw1</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_05rqrlf" name="1 or more" sourceRef="Gateway_1oxt6h1" targetRef="Activity_0yd4wuz" />
+    <bpmn:sequenceFlow id="Flow_0ofpgml" sourceRef="Activity_0yd4wuz" targetRef="EndEvent_1qor16n" />
+    <bpmn:sequenceFlow id="Flow_0jxzqw1" name="None" sourceRef="Gateway_1oxt6h1" targetRef="EndEvent_1qor16n">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">cnt_subs == 0</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:userTask id="Activity_0yd4wuz" name="Update Sub-Investigator Info" camunda:formKey="SI_AccessEmails">
+      <bpmn:documentation>The following Sub-Investigators were entered in Protocol Builder:
+{%+ for key, value in subs.items() %}{{value.display_name}} ({{key}}){% if loop.index is lt cnt_subs %}, {% endif %}{% endfor %}
+To Save the current settings for all Sub-Investigators, select Save All.
+
+
+Otherwise, edit each Sub-Investigator as necessary and select the Save button for each.
+
+
+### Please provide supplemental information for:
+ #### {{ sub.display_name }} 
+ ##### Title: {{ sub.title }}
+
+ ##### Department: {{ sub.department }}
+ ##### Affiliation: {{ sub.affiliation }}</bpmn:documentation>
+      <bpmn:extensionElements>
+        <camunda:formData>
+          <camunda:formField id="sub.access" label="Should this Sub-Investigator have full editing access in the system?" type="boolean" defaultValue="false" />
+          <camunda:formField id="sub.emails" label="Should this Sub-Investigator receive automated email notifications?" type="boolean" defaultValue="false" />
+        </camunda:formData>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_05rqrlf</bpmn:incoming>
+      <bpmn:outgoing>Flow_0ofpgml</bpmn:outgoing>
+      <bpmn:multiInstanceLoopCharacteristics camunda:collection="subs" camunda:elementVariable="sub" />
+    </bpmn:userTask>
+    <bpmn:endEvent id="Event_0npjf2p">
+      <bpmn:documentation>Please enter the Private Investigator in Protocol Builder.</bpmn:documentation>
+      <bpmn:incoming>Flow_16qr5jf</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_16qr5jf" sourceRef="Activity_1qwzwyi" targetRef="Event_0npjf2p" />
+    <bpmn:sequenceFlow id="Flow_1kg5jot" sourceRef="ScriptTask_Update_PIData" targetRef="Activity_EditPI" />
+    <bpmn:scriptTask id="ScriptTask_Update_PIData" name="Update PI Data">
+      <bpmn:incoming>Flow_1wz38hl</bpmn:incoming>
+      <bpmn:outgoing>Flow_1kg5jot</bpmn:outgoing>
+      <bpmn:script>pi.E0.schoolName = PI_E0_schoolName
+pi.E0.deptName = PI_E0_deptName
+ro = {}
+ro['chair'] = {}</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="Flow_070j5fg" sourceRef="ScriptTask_UpdateRO_Data" targetRef="Gateway_PI_is_DeptChair" />
+    <bpmn:scriptTask id="ScriptTask_UpdateRO_Data" name="Update RO Data">
+      <bpmn:incoming>Flow_1oo0ijr</bpmn:incoming>
+      <bpmn:outgoing>Flow_070j5fg</bpmn:outgoing>
+      <bpmn:script>ro.school = RO_School
+ro.dept = RO_Department
+ro.chair.uid = RO_Chair_CID
+ro.chair.name_degree = RO_Chair_Name_Degree
+ro.chair.title = RO_Chair_Title
+ro.chair.sig_block = RO_Chair_Sig_Block</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:exclusiveGateway id="Gateway_0zrcknh" name="How many Additional Coordinators?" default="Flow_1gtl2o3">
+      <bpmn:incoming>Flow_1n0k4pd</bpmn:incoming>
+      <bpmn:incoming>Flow_1oqem42</bpmn:incoming>
+      <bpmn:outgoing>Flow_1gtl2o3</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0dt3pjw</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_1gtl2o3" name="1 or more" sourceRef="Gateway_0zrcknh" targetRef="Activity_1yjg742" />
+    <bpmn:sequenceFlow id="Flow_12ss6u8" sourceRef="Activity_1yjg742" targetRef="Gateway_1oxt6h1" />
+    <bpmn:userTask id="Activity_1yjg742" name="Update Additional Coordinator Info">
+      <bpmn:documentation>The following Additional Coordinators were entered in Protocol Builder:
+{%+ for key, value in acs.items() %}{{value.display_name}} ({{key}}){% if loop.index is lt cnt_acs %}, {% endif %}{% endfor %}
+To Save the current settings for all Additional Coordinators, select Save All.
+
+
+
+
+Otherwise, edit each Coordinator as necessary and select the Save button for each.
+
+
+### Please provide supplemental information for:
+ #### {{ acs.display_name }} 
+ ##### Title: {{ acs.title }}
+
+
+ ##### Department: {{ acs.department }}
+ ##### Affiliation: {{ acs.affiliation }}</bpmn:documentation>
+      <bpmn:incoming>Flow_1gtl2o3</bpmn:incoming>
+      <bpmn:outgoing>Flow_12ss6u8</bpmn:outgoing>
+      <bpmn:multiInstanceLoopCharacteristics camunda:collection="acs" camunda:elementVariable="ac" />
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="Flow_0dt3pjw" name="None" sourceRef="Gateway_0zrcknh" targetRef="Gateway_1oxt6h1">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">cnt_acs == 0</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_14ti38o" sourceRef="Activity_1qwzwyi" targetRef="Activity_0r8pam5" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_01143nb">
-      <bpmndi:BPMNEdge id="Flow_14ti38o_di" bpmnElement="Flow_14ti38o">
-        <di:waypoint x="800" y="240" />
-        <di:waypoint x="910" y="240" />
-        <di:waypoint x="910" y="160" />
+      <bpmndi:BPMNEdge id="Flow_0dt3pjw_di" bpmnElement="Flow_0dt3pjw">
+        <di:waypoint x="3110" y="95" />
+        <di:waypoint x="3110" y="10" />
+        <di:waypoint x="3490" y="10" />
+        <di:waypoint x="3490" y="95" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3287" y="-8" width="27" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_12ss6u8_di" bpmnElement="Flow_12ss6u8">
+        <di:waypoint x="3350" y="120" />
+        <di:waypoint x="3465" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1gtl2o3_di" bpmnElement="Flow_1gtl2o3">
+        <di:waypoint x="3135" y="120" />
+        <di:waypoint x="3250" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3169" y="102" width="48" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_070j5fg_di" bpmnElement="Flow_070j5fg">
+        <di:waypoint x="2330" y="120" />
+        <di:waypoint x="2375" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1kg5jot_di" bpmnElement="Flow_1kg5jot">
+        <di:waypoint x="1350" y="120" />
+        <di:waypoint x="1410" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_16qr5jf_di" bpmnElement="Flow_16qr5jf">
+        <di:waypoint x="830" y="240" />
+        <di:waypoint x="952" y="240" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0jxzqw1_di" bpmnElement="Flow_0jxzqw1">
+        <di:waypoint x="3490" y="145" />
+        <di:waypoint x="3490" y="220" />
+        <di:waypoint x="3820" y="220" />
+        <di:waypoint x="3820" y="138" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3642" y="202" width="27" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0ofpgml_di" bpmnElement="Flow_0ofpgml">
+        <di:waypoint x="3720" y="120" />
+        <di:waypoint x="3802" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_05rqrlf_di" bpmnElement="Flow_05rqrlf">
+        <di:waypoint x="3515" y="120" />
+        <di:waypoint x="3620" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3544" y="102" width="48" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0kpe12r_di" bpmnElement="Flow_0kpe12r">
+        <di:waypoint x="2450" y="-50" />
+        <di:waypoint x="2750" y="-50" />
+        <di:waypoint x="2750" y="90" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_00yhlrq_di" bpmnElement="Flow_00yhlrq">
+        <di:waypoint x="2400" y="95" />
+        <di:waypoint x="2400" y="-10" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2411" y="8" width="18" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0vi6thu_di" bpmnElement="Flow_0vi6thu">
+        <di:waypoint x="2425" y="120" />
+        <di:waypoint x="2550" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2481" y="102" width="15" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0uzx3wo_di" bpmnElement="Flow_0uzx3wo">
+        <di:waypoint x="1840" y="120" />
+        <di:waypoint x="1910" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0cdtt11_di" bpmnElement="SequenceFlow_0cdtt11">
+        <di:waypoint x="2650" y="120" />
+        <di:waypoint x="2725" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0d4x46e_di" bpmnElement="Flow_0d4x46e">
+        <di:waypoint x="2010" y="120" />
+        <di:waypoint x="2080" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1oo0ijr_di" bpmnElement="Flow_1oo0ijr">
+        <di:waypoint x="2180" y="120" />
+        <di:waypoint x="2230" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_08zdodt_di" bpmnElement="SequenceFlow_08zdodt">
+        <di:waypoint x="1680" y="120" />
+        <di:waypoint x="1740" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1eaikyp_di" bpmnElement="Flow_1eaikyp">
+        <di:waypoint x="1040" y="120" />
+        <di:waypoint x="1110" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1wz38hl_di" bpmnElement="Flow_1wz38hl">
+        <di:waypoint x="1210" y="120" />
+        <di:waypoint x="1250" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1grahhv_di" bpmnElement="Flow_1grahhv">
+        <di:waypoint x="830" y="120" />
+        <di:waypoint x="940" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1oqem42_di" bpmnElement="Flow_1oqem42">
-        <di:waypoint x="1050" y="145" />
-        <di:waypoint x="1050" y="270" />
-        <di:waypoint x="1400" y="270" />
-        <di:waypoint x="1400" y="138" />
+        <di:waypoint x="2750" y="145" />
+        <di:waypoint x="2750" y="230" />
+        <di:waypoint x="3110" y="230" />
+        <di:waypoint x="3110" y="145" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1195" y="236" width="64" height="27" />
+          <dc:Bounds x="2825" y="213" width="27" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1n0k4pd_di" bpmnElement="Flow_1n0k4pd">
-        <di:waypoint x="1290" y="120" />
-        <di:waypoint x="1382" y="120" />
+        <di:waypoint x="2990" y="120" />
+        <di:waypoint x="3085" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0xifvai_di" bpmnElement="Flow_0xifvai">
-        <di:waypoint x="1075" y="120" />
-        <di:waypoint x="1190" y="120" />
+        <di:waypoint x="2775" y="120" />
+        <di:waypoint x="2890" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1080" y="86" width="79" height="27" />
+          <dc:Bounds x="2803" y="103" width="48" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0elbjpd_di" bpmnElement="Flow_0elbjpd">
-        <di:waypoint x="960" y="120" />
-        <di:waypoint x="1025" y="120" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_00prawo_di" bpmnElement="Flow_00prawo">
-        <di:waypoint x="570" y="145" />
-        <di:waypoint x="570" y="240" />
-        <di:waypoint x="700" y="240" />
+        <di:waypoint x="590" y="145" />
+        <di:waypoint x="590" y="240" />
+        <di:waypoint x="730" y="240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="590" y="222" width="71" height="14" />
+          <dc:Bounds x="599" y="183" width="71" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_147b9li_di" bpmnElement="Flow_147b9li">
-        <di:waypoint x="595" y="120" />
-        <di:waypoint x="700" y="120" />
+        <di:waypoint x="615" y="120" />
+        <di:waypoint x="730" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="608" y="102" width="63" height="14" />
+          <dc:Bounds x="608" y="103" width="63" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_17uqguj_di" bpmnElement="Flow_17uqguj">
-        <di:waypoint x="500" y="120" />
-        <di:waypoint x="545" y="120" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1dcsioh_di" bpmnElement="Flow_1dcsioh">
-        <di:waypoint x="350" y="120" />
-        <di:waypoint x="400" y="120" />
+        <di:waypoint x="470" y="120" />
+        <di:waypoint x="565" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1mplloa_di" bpmnElement="Flow_1mplloa">
-        <di:waypoint x="800" y="120" />
-        <di:waypoint x="860" y="120" />
+        <di:waypoint x="1510" y="120" />
+        <di:waypoint x="1580" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0kcrx5l_di" bpmnElement="Flow_0kcrx5l">
-        <di:waypoint x="188" y="120" />
-        <di:waypoint x="250" y="120" />
+        <di:waypoint x="268" y="120" />
+        <di:waypoint x="370" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="152" y="102" width="36" height="36" />
+        <dc:Bounds x="232" y="102" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0h49cmf_di" bpmnElement="ScriptTask_LoadPersonnel">
-        <dc:Bounds x="250" y="80" width="100" height="80" />
+        <dc:Bounds x="370" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1qor16n_di" bpmnElement="EndEvent_1qor16n">
-        <dc:Bounds x="1382" y="102" width="36" height="36" />
+        <dc:Bounds x="3802" y="102" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3806" y="78" width="27" height="14" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0d622qi_di" bpmnElement="Activity_EditPI">
-        <dc:Bounds x="700" y="80" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1dq6tzx_di" bpmnElement="Activity_0bg56lv">
-        <dc:Bounds x="400" y="80" width="100" height="80" />
+        <dc:Bounds x="1410" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_0qzf1r3_di" bpmnElement="Gateway_CheckForPI" isMarkerVisible="true">
-        <dc:Bounds x="545" y="95" width="50" height="50" />
+        <dc:Bounds x="565" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="554" y="71" width="31" height="14" />
+          <dc:Bounds x="574" y="71" width="31" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0neg931_di" bpmnElement="Activity_1qwzwyi">
-        <dc:Bounds x="700" y="200" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1ktvk27_di" bpmnElement="Activity_0r8pam5">
-        <dc:Bounds x="860" y="80" width="100" height="80" />
+        <dc:Bounds x="730" y="200" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_0jykh6r_di" bpmnElement="Gateway_0jykh6r" isMarkerVisible="true">
-        <dc:Bounds x="1025" y="95" width="50" height="50" />
+        <dc:Bounds x="2725" y="95" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2755" y="139" width="70" height="40" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1nz85vv_di" bpmnElement="Activity_1bcnjyq">
-        <dc:Bounds x="1190" y="80" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_1nz85vv_di" bpmnElement="TaskPMI_UpdateCoordinatorInfo">
+        <dc:Bounds x="2890" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1z05bvn_di" bpmnElement="ScriptTask_DeterminePI_E0_Department">
+        <dc:Bounds x="730" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0uz6yhu_di" bpmnElement="BusinessRule_PI_Dept">
+        <dc:Bounds x="1110" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1sn7wxh_di" bpmnElement="BusinessRule_PI_School">
+        <dc:Bounds x="940" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="UserTask_1a7hck9_di" bpmnElement="UserTask_SelectChair">
+        <dc:Bounds x="1580" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1sk9596_di" bpmnElement="BusinessRuleTask_Determine_RO_Chair">
+        <dc:Bounds x="2080" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_08ry4jo_di" bpmnElement="BusinessRuleTask_Determine_RO_Department">
+        <dc:Bounds x="1910" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="UserTask_109otvi_di" bpmnElement="UserTask_109otvi">
+        <dc:Bounds x="2550" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1g9tr7n_di" bpmnElement="BusinessRuleTask_Determine_RO">
+        <dc:Bounds x="1740" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1xio5hy_di" bpmnElement="Gateway_PI_is_DeptChair" isMarkerVisible="true">
+        <dc:Bounds x="2375" y="95" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2358" y="152" width="84" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0i869dj_di" bpmnElement="Activity_ShowPI_is_DeptChair">
+        <dc:Bounds x="2350" y="-90" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1oxt6h1_di" bpmnElement="Gateway_1oxt6h1" isMarkerVisible="true">
+        <dc:Bounds x="3465" y="95" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3510" y="145" width="79" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0oyqfs3_di" bpmnElement="Activity_0yd4wuz">
+        <dc:Bounds x="3620" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0npjf2p_di" bpmnElement="Event_0npjf2p">
+        <dc:Bounds x="952" y="222" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_02led02_di" bpmnElement="ScriptTask_Update_PIData">
+        <dc:Bounds x="1250" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1mt9o4o_di" bpmnElement="ScriptTask_UpdateRO_Data">
+        <dc:Bounds x="2230" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_0zrcknh_di" bpmnElement="Gateway_0zrcknh" isMarkerVisible="true">
+        <dc:Bounds x="3085" y="95" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3125" y="139" width="70" height="40" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1gqvpu9_di" bpmnElement="Activity_1yjg742">
+        <dc:Bounds x="3250" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/crc/static/bpmn/protocol/protocol.bpmn b/crc/static/bpmn/protocol/protocol.bpmn
index e1539bc9..0fff3571 100644
--- a/crc/static/bpmn/protocol/protocol.bpmn
+++ b/crc/static/bpmn/protocol/protocol.bpmn
@@ -26,18 +26,18 @@
         <di:waypoint x="432" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0kanc90_di" bpmnElement="Flow_0kanc90">
-        <di:waypoint x="215" y="177" />
+        <di:waypoint x="218" y="177" />
         <di:waypoint x="280" y="177" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="179" y="159" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0zakcui_di" bpmnElement="Event_0zakcui">
         <dc:Bounds x="432" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1rp9n6c_di" bpmnElement="Activity_UploadProtocol">
         <dc:Bounds x="280" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="182" y="159" width="36" height="36" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/crc/static/bpmn/rsc_hire_committee/rsc_hire_committee.bpmn b/crc/static/bpmn/rsc_hire_committee/rsc_hire_committee.bpmn
index b9e195b8..212381b6 100644
--- a/crc/static/bpmn/rsc_hire_committee/rsc_hire_committee.bpmn
+++ b/crc/static/bpmn/rsc_hire_committee/rsc_hire_committee.bpmn
@@ -116,7 +116,7 @@
           </camunda:formField>
         </camunda:formData>
         <camunda:properties>
-          <camunda:property name="display_name" value="'Select Template Type'" />
+          <camunda:property name="display_name" value="Select Template Type" />
         </camunda:properties>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0schnpa</bpmn:incoming>
@@ -176,12 +176,9 @@
         <di:waypoint x="430" y="117" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1u26ez2_di" bpmnElement="SequenceFlow_1u26ez2">
-        <di:waypoint x="208" y="117" />
+        <di:waypoint x="218" y="117" />
         <di:waypoint x="270" y="117" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="172" y="99" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ManualTask_0j9p20t_di" bpmnElement="Task_1pnr7ik">
         <dc:Bounds x="270" y="77" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -206,6 +203,9 @@
       <bpmndi:BPMNShape id="UserTask_0tvyriw_di" bpmnElement="UserTask_0tvyriw">
         <dc:Bounds x="1060" y="77" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="182" y="99" width="36" height="36" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/crc/static/bpmn/rsc_hire_submission/rsc_hire_submission.bpmn b/crc/static/bpmn/rsc_hire_submission/rsc_hire_submission.bpmn
index 1037a883..18ed29ee 100644
--- a/crc/static/bpmn/rsc_hire_submission/rsc_hire_submission.bpmn
+++ b/crc/static/bpmn/rsc_hire_submission/rsc_hire_submission.bpmn
@@ -535,7 +535,7 @@ This area is only for off label use or non-FDA approved imaging, or if you are i
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0f9d82z_di" bpmnElement="SequenceFlow_0f9d82z">
         <di:waypoint x="730" y="447" />
-        <di:waypoint x="792" y="447" />
+        <di:waypoint x="802" y="447" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0oaa5d7_di" bpmnElement="SequenceFlow_0oaa5d7">
         <di:waypoint x="575" y="447" />
@@ -642,7 +642,7 @@ This area is only for off label use or non-FDA approved imaging, or if you are i
         <dc:Bounds x="630" y="407" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_13y1gik_di" bpmnElement="EndEvent_13y1gik">
-        <dc:Bounds x="792" y="429" width="36" height="36" />
+        <dc:Bounds x="802" y="429" width="36" height="36" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/crc/static/bpmn/sponsor_funding_source/sponsor_funding_source.bpmn b/crc/static/bpmn/sponsor_funding_source/sponsor_funding_source.bpmn
index e8306c72..25eb7741 100644
--- a/crc/static/bpmn/sponsor_funding_source/sponsor_funding_source.bpmn
+++ b/crc/static/bpmn/sponsor_funding_source/sponsor_funding_source.bpmn
@@ -8,27 +8,28 @@
     <bpmn:userTask id="Task_14cuhvm" name="Update Sponsor / Funding Source Info" camunda:formKey="form_spons">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_FromPB" label="From Protocl Builder" type="string">
+          <camunda:formField id="FromPB" label="From Protocl Builder" type="string">
             <camunda:properties>
               <camunda:property id="read_only" value="true" />
               <camunda:property id="placeholder" value="Merck" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="FormField_FromOSP" label="From OSP" type="autocomplete">
+          <camunda:formField id="SelectFromOSP" label="From OSP" type="autocomplete">
             <camunda:properties>
-              <camunda:property id="spreadsheet.name" value="sponsors.xls" />
+              <camunda:property id="spreadsheet.name" value="SponsorList.xls" />
               <camunda:property id="spreadsheet.value.column" value="CUSTOMER_NUMBER" />
               <camunda:property id="spreadsheet.label.column" value="CUSTOMER_NAME" />
+              <camunda:property id="autocomplete_num" value="15" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="FormField_Type" label="Select all that apply:" type="enum">
+          <camunda:formField id="SponsorType" label="Select all that apply:" type="enum">
             <camunda:properties>
               <camunda:property id="enum_type" value="checkbox" />
             </camunda:properties>
             <camunda:value id="sponsor" name="Sponsor" />
             <camunda:value id="funding_source" name="Funding Source" />
           </camunda:formField>
-          <camunda:formField id="FormField_Notes" label="Notes" type="textarea">
+          <camunda:formField id="SponsorNotes" label="Notes" type="textarea">
             <camunda:properties>
               <camunda:property id="rows" value="5" />
             </camunda:properties>
@@ -71,8 +72,8 @@
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_0quormc">
       <bpmndi:BPMNEdge id="Flow_1l3gw28_di" bpmnElement="Flow_1l3gw28">
         <di:waypoint x="430" y="280" />
-        <di:waypoint x="490" y="280" />
-        <di:waypoint x="490" y="222" />
+        <di:waypoint x="500" y="280" />
+        <di:waypoint x="500" y="222" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0hdjgx6_di" bpmnElement="Flow_0hdjgx6">
         <di:waypoint x="260" y="222" />
@@ -80,8 +81,8 @@
         <di:waypoint x="330" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_030v94s_di" bpmnElement="Flow_030v94s">
-        <di:waypoint x="515" y="197" />
-        <di:waypoint x="552" y="197" />
+        <di:waypoint x="525" y="197" />
+        <di:waypoint x="562" y="197" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_13604n2_di" bpmnElement="Flow_13604n2">
         <di:waypoint x="260" y="172" />
@@ -90,21 +91,18 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1n3utyf_di" bpmnElement="SequenceFlow_1n3utyf">
         <di:waypoint x="430" y="120" />
-        <di:waypoint x="490" y="120" />
-        <di:waypoint x="490" y="172" />
+        <di:waypoint x="500" y="120" />
+        <di:waypoint x="500" y="172" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_17znkku_di" bpmnElement="SequenceFlow_17znkku">
-        <di:waypoint x="188" y="197" />
+        <di:waypoint x="178" y="197" />
         <di:waypoint x="235" y="197" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="152" y="179" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="UserTask_15oiwqt_di" bpmnElement="Task_14cuhvm">
         <dc:Bounds x="330" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_19upzzo_di" bpmnElement="EndEvent_19upzzo">
-        <dc:Bounds x="552" y="179" width="36" height="36" />
+        <dc:Bounds x="562" y="179" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1oeywwl_di" bpmnElement="Activity_0xxhfyh">
         <dc:Bounds x="330" y="240" width="100" height="80" />
@@ -113,7 +111,10 @@
         <dc:Bounds x="235" y="172" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1kowkjp_di" bpmnElement="Gateway_1924s77">
-        <dc:Bounds x="465" y="172" width="50" height="50" />
+        <dc:Bounds x="475" y="172" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="142" y="179" width="36" height="36" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/crc/static/bpmn/sponsor_funding_source/sponsors.xls b/crc/static/bpmn/sponsor_funding_source/sponsors.xls
deleted file mode 100644
index 92c6cf66..00000000
Binary files a/crc/static/bpmn/sponsor_funding_source/sponsors.xls and /dev/null differ
diff --git a/crc/static/bpmn/top_level_workflow/data_security_plan.dmn b/crc/static/bpmn/top_level_workflow/data_security_plan.dmn
index 88233c69..c2cbf6c7 100644
--- a/crc/static/bpmn/top_level_workflow/data_security_plan.dmn
+++ b/crc/static/bpmn/top_level_workflow/data_security_plan.dmn
@@ -7,14 +7,14 @@
     <decisionTable id="DecisionTable_1mjqwlv">
       <input id="InputClause_18pwfqu" label="Required Doc Keys">
         <inputExpression id="LiteralExpression_1y84stb" typeRef="boolean" expressionLanguage="python">
-          <text>StudyInfo.documents['Study_DataSecurityPlan']['required']</text>
+          <text>documents['Study_DataSecurityPlan']['required']</text>
         </inputExpression>
       </input>
       <output id="OutputClause_05y0j7c" label="data_security_plan" name="data_security_plan" typeRef="string" />
       <rule id="DecisionRule_17xsr74">
         <description></description>
         <inputEntry id="UnaryTests_05ldcq4">
-          <text>True</text>
+          <text>true</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_09oao3s">
           <text>"required"</text>
diff --git a/crc/static/bpmn/top_level_workflow/enter_core_info.dmn b/crc/static/bpmn/top_level_workflow/enter_core_info.dmn
index d70bf27c..1337e03f 100644
--- a/crc/static/bpmn/top_level_workflow/enter_core_info.dmn
+++ b/crc/static/bpmn/top_level_workflow/enter_core_info.dmn
@@ -2,12 +2,12 @@
 <definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_1p34ouw" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.4.1">
   <decision id="enter_core_info" name="Enter Core Info">
     <extensionElements>
-      <biodi:bounds x="160" y="60" width="180" height="80" />
+      <biodi:bounds x="250" y="110" width="180" height="80" />
     </extensionElements>
     <decisionTable id="decisionTable_1">
       <input id="InputClause_1ki80j6" label="required doc ids">
         <inputExpression id="LiteralExpression_10mfcy7" typeRef="boolean" expressionLanguage="Python">
-          <text>StudyInfo.documents['UVACompl_PRCAppr']['required']</text>
+          <text>documents['UVACompl_PRCAppr']['required']</text>
         </inputExpression>
       </input>
       <output id="output_1" label="enter_core_info" name="enter_core_info" typeRef="string" />
diff --git a/crc/static/bpmn/top_level_workflow/ide_supplement.dmn b/crc/static/bpmn/top_level_workflow/ide_supplement.dmn
index 0b316cca..006b030c 100644
--- a/crc/static/bpmn/top_level_workflow/ide_supplement.dmn
+++ b/crc/static/bpmn/top_level_workflow/ide_supplement.dmn
@@ -4,7 +4,7 @@
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="IS_IDE">
         <inputExpression id="inputExpression_1" typeRef="integer">
-          <text>StudyInfo.details.IS_IDE</text>
+          <text>details.IS_IDE</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Menu Staus" name="ide_supplement" typeRef="string" />
diff --git a/crc/static/bpmn/top_level_workflow/ids_full_submission.dmn b/crc/static/bpmn/top_level_workflow/ids_full_submission.dmn
index 6e15fb82..27cb3ce1 100644
--- a/crc/static/bpmn/top_level_workflow/ids_full_submission.dmn
+++ b/crc/static/bpmn/top_level_workflow/ids_full_submission.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_dc7ea6f" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_dc7ea6f" name="DRD" namespace="http://camunda.org/schema/1.0/dmn">
   <decision id="ids_full_submission" name="IDS Full Submission">
     <extensionElements>
       <biodi:bounds x="240" y="130" width="180" height="80" />
@@ -7,11 +7,12 @@
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="IRB API IDS Waiver Status">
         <inputExpression id="inputExpression_1" typeRef="boolean">
-          <text>StudyInfo.documents.UVACompl_IDSWaiverApp.required</text>
+          <text>documents.UVACompl_IDSWaiverApp.required</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Menu Status" name="ids_full_submission" typeRef="string" />
       <rule id="DecisionRule_0rj79pz">
+        <description>IDS Full Submission hidden</description>
         <inputEntry id="UnaryTests_1w0ydbs">
           <text>True</text>
         </inputEntry>
@@ -20,6 +21,7 @@
         </outputEntry>
       </rule>
       <rule id="DecisionRule_1eyx8lf">
+        <description>IDS Full Submission required</description>
         <inputEntry id="UnaryTests_02h1s2m">
           <text>False</text>
         </inputEntry>
@@ -28,6 +30,7 @@
         </outputEntry>
       </rule>
       <rule id="DecisionRule_1ds7sa4">
+        <description>IDS Full Submission disabled</description>
         <inputEntry id="UnaryTests_0cy791h">
           <text></text>
         </inputEntry>
diff --git a/crc/static/bpmn/top_level_workflow/ids_waiver.dmn b/crc/static/bpmn/top_level_workflow/ids_waiver.dmn
index e7575342..cc62a6ce 100644
--- a/crc/static/bpmn/top_level_workflow/ids_waiver.dmn
+++ b/crc/static/bpmn/top_level_workflow/ids_waiver.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_08c3b1a" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_08c3b1a" name="DRD" namespace="http://camunda.org/schema/1.0/dmn">
   <decision id="ids_waiver" name="IDS Waiver">
     <extensionElements>
       <biodi:bounds x="250" y="140" width="180" height="80" />
@@ -7,11 +7,12 @@
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="IRB API Input">
         <inputExpression id="inputExpression_1" typeRef="boolean">
-          <text>StudyInfo.documents.UVACompl_IDSWaiverApp.required</text>
+          <text>documents.UVACompl_IDSWaiverApp.required</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Menu State" name="ids_waiver" typeRef="string" />
       <rule id="DecisionRule_0dxax4m">
+        <description>IDS Waiver required</description>
         <inputEntry id="UnaryTests_0fq42gg">
           <text>True</text>
         </inputEntry>
@@ -20,6 +21,7 @@
         </outputEntry>
       </rule>
       <rule id="DecisionRule_0s4qnxi">
+        <description>IDS Waiver hidden</description>
         <inputEntry id="UnaryTests_09k30nw">
           <text>False</text>
         </inputEntry>
@@ -28,6 +30,7 @@
         </outputEntry>
       </rule>
       <rule id="DecisionRule_0no7hwo">
+        <description>IDS Waiver disabled</description>
         <inputEntry id="UnaryTests_18i69j2">
           <text></text>
         </inputEntry>
diff --git a/crc/static/bpmn/top_level_workflow/ind_supplement.dmn b/crc/static/bpmn/top_level_workflow/ind_supplement.dmn
deleted file mode 100644
index ae67851b..00000000
--- a/crc/static/bpmn/top_level_workflow/ind_supplement.dmn
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" id="Definitions_0o0ff2r" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
-  <decision id="decision_ind_supplement" name="IND Menu Check">
-    <decisionTable id="decisionTable_1">
-      <input id="input_1" label="IS_IND">
-        <inputExpression id="inputExpression_1" typeRef="integer">
-          <text>StudyInfo.details.IS_IND</text>
-        </inputExpression>
-      </input>
-      <output id="output_1" label="Menu Staus" name="ind_supplement" typeRef="string" />
-      <rule id="DecisionRule_0h0od2e">
-        <description>IND in study per PB</description>
-        <inputEntry id="UnaryTests_09ctq71">
-          <text>1</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1we3duh">
-          <text>"required"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0gbnvkg">
-        <description>IND not in study per PB</description>
-        <inputEntry id="UnaryTests_1enoihd">
-          <text>0</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0r5plb1">
-          <text>"hidden"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0zg0u2w">
-        <description>IND question has not been answered in PB</description>
-        <inputEntry id="UnaryTests_10f42xe">
-          <text></text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0qnqsm5">
-          <text>"disabled"</text>
-        </outputEntry>
-      </rule>
-    </decisionTable>
-  </decision>
-</definitions>
diff --git a/crc/static/bpmn/top_level_workflow/personnel.dmn b/crc/static/bpmn/top_level_workflow/personnel.dmn
index 827d64bb..127c6333 100644
--- a/crc/static/bpmn/top_level_workflow/personnel.dmn
+++ b/crc/static/bpmn/top_level_workflow/personnel.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_Personnel" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_Personnel" name="DRD" namespace="http://camunda.org/schema/1.0/dmn">
   <decision id="personnel" name="Personnel">
     <extensionElements>
       <biodi:bounds x="320" y="150" width="180" height="80" />
@@ -7,26 +7,18 @@
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="Personnel in PBB">
         <inputExpression id="inputExpression_1" typeRef="string">
-          <text>StudyInfo.investigators</text>
+          <text>investigators</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Menu Status" name="personnel" typeRef="string" />
       <rule id="DecisionRule_0ye20t5">
         <inputEntry id="UnaryTests_00d27jy">
-          <text>? != ''</text>
+          <text></text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1keknlr">
           <text>'required'</text>
         </outputEntry>
       </rule>
-      <rule id="DecisionRule_05vh73x">
-        <inputEntry id="UnaryTests_0e0vqx6">
-          <text></text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0pop4pr">
-          <text>"disabled"</text>
-        </outputEntry>
-      </rule>
     </decisionTable>
   </decision>
 </definitions>
diff --git a/crc/static/bpmn/top_level_workflow/sponsor_funding_source.dmn b/crc/static/bpmn/top_level_workflow/sponsor_funding_source.dmn
index 73750854..7df1cd1e 100644
--- a/crc/static/bpmn/top_level_workflow/sponsor_funding_source.dmn
+++ b/crc/static/bpmn/top_level_workflow/sponsor_funding_source.dmn
@@ -2,29 +2,30 @@
 <definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_1p34ouw" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
   <decision id="sponsor_funding_source" name="Sponsor Funding Source">
     <extensionElements>
-      <biodi:bounds x="190" y="80" width="180" height="80" />
+      <biodi:bounds x="280" y="90" width="180" height="80" />
     </extensionElements>
     <decisionTable id="DecisionTable_00zdxg0">
       <input id="InputClause_02n3ccs" label="CoCApplication Required?">
         <inputExpression id="LiteralExpression_1ju4o1o" typeRef="boolean" expressionLanguage="feel">
-          <text>StudyInfo.documents.AD_LabManual.required</text>
+          <text>documents.AD_LabManual.required</text>
         </inputExpression>
       </input>
       <output id="OutputClause_1ybi1ud" label="sponsor_funding_source" name="sponsor_funding_source" typeRef="string" />
       <rule id="DecisionRule_1t97mw4">
         <inputEntry id="UnaryTests_0ym4ln2">
-          <text>True</text>
+          <text>true</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1pweuqc">
           <text>"required"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_1q965wz">
+        <description>was "disabled"</description>
         <inputEntry id="UnaryTests_1mlhh3t">
-          <text>False</text>
+          <text>false</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_073vd6i">
-          <text>"disabled"</text>
+          <text>"required"</text>
         </outputEntry>
       </rule>
       <rule id="DecisionRule_0zh6o60">
diff --git a/crc/static/bpmn/top_level_workflow/top_level_workflow.bpmn b/crc/static/bpmn/top_level_workflow/top_level_workflow.bpmn
index 041d49a7..e7b71a85 100644
--- a/crc/static/bpmn/top_level_workflow/top_level_workflow.bpmn
+++ b/crc/static/bpmn/top_level_workflow/top_level_workflow.bpmn
@@ -11,14 +11,13 @@
     <bpmn:scriptTask id="Task_Load_Requirements" name="Load Documents From PB">
       <bpmn:incoming>SequenceFlow_1ees8ka</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_17ct47v</bpmn:outgoing>
-      <bpmn:script>StudyInfo = {}
-StudyInfo['documents'] = study_info('documents')</bpmn:script>
+      <bpmn:script>documents = study_info('documents')</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:businessRuleTask id="Activity_1yqy50i" name="Enter Core Info&#10;" camunda:decisionRef="enter_core_info">
+    <bpmn:businessRuleTask id="Activity_EnterCoreInfo" name="Enter Core Info&#10;" camunda:decisionRef="enter_core_info">
       <bpmn:incoming>Flow_1m8285h</bpmn:incoming>
       <bpmn:outgoing>Flow_1sggkit</bpmn:outgoing>
     </bpmn:businessRuleTask>
-    <bpmn:sequenceFlow id="Flow_1sggkit" sourceRef="Activity_1yqy50i" targetRef="Gateway_12tpgcy" />
+    <bpmn:sequenceFlow id="Flow_1sggkit" sourceRef="Activity_EnterCoreInfo" targetRef="Gateway_12tpgcy" />
     <bpmn:parallelGateway id="Gateway_12tpgcy">
       <bpmn:incoming>Flow_1sggkit</bpmn:incoming>
       <bpmn:incoming>Flow_0x9580l</bpmn:incoming>
@@ -30,7 +29,7 @@ StudyInfo['documents'] = study_info('documents')</bpmn:script>
     <bpmn:parallelGateway id="Gateway_1nta7st" name="Some Name">
       <bpmn:extensionElements>
         <camunda:properties>
-          <camunda:property name="display_name" value="'Some Name'" />
+          <camunda:property name="display_name" value="Some Name" />
         </camunda:properties>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_17ct47v</bpmn:incoming>
@@ -39,65 +38,63 @@ StudyInfo['documents'] = study_info('documents')</bpmn:script>
       <bpmn:outgoing>Flow_1tgxyp5</bpmn:outgoing>
       <bpmn:outgoing>Flow_0lrz4jq</bpmn:outgoing>
     </bpmn:parallelGateway>
-    <bpmn:sequenceFlow id="Flow_1m8285h" sourceRef="Gateway_1nta7st" targetRef="Activity_1yqy50i" />
+    <bpmn:sequenceFlow id="Flow_1m8285h" sourceRef="Gateway_1nta7st" targetRef="Activity_EnterCoreInfo" />
     <bpmn:sequenceFlow id="SequenceFlow_17ct47v" sourceRef="Task_Load_Requirements" targetRef="Gateway_1nta7st" />
-    <bpmn:sequenceFlow id="Flow_18pl92p" sourceRef="Gateway_1nta7st" targetRef="Activity_16cm213" />
-    <bpmn:businessRuleTask id="Activity_16cm213" name="Sponsor Funding Source" camunda:decisionRef="sponsor_funding_source">
+    <bpmn:sequenceFlow id="Flow_18pl92p" sourceRef="Gateway_1nta7st" targetRef="Activity_SponsorFundingSource" />
+    <bpmn:businessRuleTask id="Activity_SponsorFundingSource" name="Sponsor Funding Source" camunda:decisionRef="sponsor_funding_source">
       <bpmn:incoming>Flow_18pl92p</bpmn:incoming>
       <bpmn:outgoing>Flow_0x9580l</bpmn:outgoing>
     </bpmn:businessRuleTask>
-    <bpmn:sequenceFlow id="Flow_0x9580l" sourceRef="Activity_16cm213" targetRef="Gateway_12tpgcy" />
-    <bpmn:businessRuleTask id="Activity_1bqc7fa" name="Investigational Drug Service (IDS) Waiver" camunda:decisionRef="ids_waiver">
+    <bpmn:sequenceFlow id="Flow_0x9580l" sourceRef="Activity_SponsorFundingSource" targetRef="Gateway_12tpgcy" />
+    <bpmn:businessRuleTask id="Activity_IDSWaiver" name="Investigational Drug Service (IDS) Waiver" camunda:decisionRef="ids_waiver">
       <bpmn:incoming>Flow_1tgxyp5</bpmn:incoming>
       <bpmn:outgoing>Flow_1bdr0gi</bpmn:outgoing>
     </bpmn:businessRuleTask>
-    <bpmn:sequenceFlow id="Flow_1tgxyp5" sourceRef="Gateway_1nta7st" targetRef="Activity_1bqc7fa" />
-    <bpmn:sequenceFlow id="Flow_1bdr0gi" sourceRef="Activity_1bqc7fa" targetRef="Gateway_12tpgcy" />
-    <bpmn:businessRuleTask id="Activity_0a14ftj" name="Investigational Drug Service (IDS) Full Submission" camunda:decisionRef="ids_full_submission">
+    <bpmn:sequenceFlow id="Flow_1tgxyp5" sourceRef="Gateway_1nta7st" targetRef="Activity_IDSWaiver" />
+    <bpmn:sequenceFlow id="Flow_1bdr0gi" sourceRef="Activity_IDSWaiver" targetRef="Gateway_12tpgcy" />
+    <bpmn:businessRuleTask id="Activity_IDS" name="Investigational Drug Service (IDS) Full Submission" camunda:decisionRef="ids_full_submission">
       <bpmn:incoming>Flow_0lrz4jq</bpmn:incoming>
       <bpmn:outgoing>Flow_18pax8n</bpmn:outgoing>
     </bpmn:businessRuleTask>
-    <bpmn:sequenceFlow id="Flow_0lrz4jq" sourceRef="Gateway_1nta7st" targetRef="Activity_0a14ftj" />
-    <bpmn:sequenceFlow id="Flow_18pax8n" sourceRef="Activity_0a14ftj" targetRef="Gateway_12tpgcy" />
+    <bpmn:sequenceFlow id="Flow_0lrz4jq" sourceRef="Gateway_1nta7st" targetRef="Activity_IDS" />
+    <bpmn:sequenceFlow id="Flow_18pax8n" sourceRef="Activity_IDS" targetRef="Gateway_12tpgcy" />
     <bpmn:sequenceFlow id="Flow_0eq6px2" sourceRef="Activity_0f295la" targetRef="Gateway_1so972f" />
     <bpmn:scriptTask id="Activity_0f295la" name="Load Details from PB">
       <bpmn:incoming>Flow_0pwtiqm</bpmn:incoming>
       <bpmn:outgoing>Flow_0eq6px2</bpmn:outgoing>
-      <bpmn:script>StudyInfo = {}
-StudyInfo['details'] = study_info('details')</bpmn:script>
+      <bpmn:script>details = study_info('details')</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:businessRuleTask id="Activity_0ahlc3u" name="IDE Supplement" camunda:decisionRef="decision_ide_menu_check">
+    <bpmn:businessRuleTask id="Activity_IDE" name="IDE Supplement" camunda:decisionRef="decision_ide_menu_check">
       <bpmn:incoming>Flow_14ce1d7</bpmn:incoming>
       <bpmn:outgoing>Flow_0ffvg2f</bpmn:outgoing>
     </bpmn:businessRuleTask>
-    <bpmn:businessRuleTask id="Activity_0teqy3w" name="IND Supplement" camunda:decisionRef="decision_ind_supplement">
+    <bpmn:businessRuleTask id="Activity_IND" name="IND Update" camunda:decisionRef="decision_ind_update">
       <bpmn:incoming>Flow_1jini69</bpmn:incoming>
       <bpmn:outgoing>Flow_145qxh8</bpmn:outgoing>
     </bpmn:businessRuleTask>
-    <bpmn:sequenceFlow id="Flow_14ce1d7" sourceRef="Gateway_1so972f" targetRef="Activity_0ahlc3u" />
+    <bpmn:sequenceFlow id="Flow_14ce1d7" sourceRef="Gateway_1so972f" targetRef="Activity_IDE" />
     <bpmn:parallelGateway id="Gateway_1so972f">
       <bpmn:incoming>Flow_0eq6px2</bpmn:incoming>
       <bpmn:outgoing>Flow_14ce1d7</bpmn:outgoing>
       <bpmn:outgoing>Flow_1jini69</bpmn:outgoing>
     </bpmn:parallelGateway>
-    <bpmn:sequenceFlow id="Flow_1jini69" sourceRef="Gateway_1so972f" targetRef="Activity_0teqy3w" />
-    <bpmn:sequenceFlow id="Flow_145qxh8" sourceRef="Activity_0teqy3w" targetRef="Gateway_15ksf70" />
+    <bpmn:sequenceFlow id="Flow_1jini69" sourceRef="Gateway_1so972f" targetRef="Activity_IND" />
+    <bpmn:sequenceFlow id="Flow_145qxh8" sourceRef="Activity_IND" targetRef="Gateway_15ksf70" />
     <bpmn:parallelGateway id="Gateway_15ksf70">
       <bpmn:incoming>Flow_145qxh8</bpmn:incoming>
       <bpmn:incoming>Flow_0ffvg2f</bpmn:incoming>
       <bpmn:outgoing>Flow_1qyrmzn</bpmn:outgoing>
     </bpmn:parallelGateway>
-    <bpmn:sequenceFlow id="Flow_0ffvg2f" sourceRef="Activity_0ahlc3u" targetRef="Gateway_15ksf70" />
+    <bpmn:sequenceFlow id="Flow_0ffvg2f" sourceRef="Activity_IDE" targetRef="Gateway_15ksf70" />
     <bpmn:sequenceFlow id="Flow_1qyrmzn" sourceRef="Gateway_15ksf70" targetRef="Activity_0g3qa1c" />
-    <bpmn:sequenceFlow id="Flow_0vo6ul1" sourceRef="Activity_0g3qa1c" targetRef="Activity_13ep6ar" />
+    <bpmn:sequenceFlow id="Flow_0vo6ul1" sourceRef="Activity_0g3qa1c" targetRef="Activity_Personnel" />
     <bpmn:scriptTask id="Activity_0g3qa1c" name="Load Personnel from PB">
       <bpmn:incoming>Flow_1qyrmzn</bpmn:incoming>
       <bpmn:outgoing>Flow_0vo6ul1</bpmn:outgoing>
-      <bpmn:script>StudyInfo = {}
-StudyInfo['investigators'] = study_info('investigators')</bpmn:script>
+      <bpmn:script>investigators =  study_info('investigators')</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="Flow_1ybicki" sourceRef="Activity_13ep6ar" targetRef="Event_135x8jg" />
-    <bpmn:businessRuleTask id="Activity_13ep6ar" name="Personnel" camunda:decisionRef="personnel">
+    <bpmn:sequenceFlow id="Flow_1ybicki" sourceRef="Activity_Personnel" targetRef="Event_135x8jg" />
+    <bpmn:businessRuleTask id="Activity_Personnel" name="Personnel" camunda:decisionRef="personnel">
       <bpmn:incoming>Flow_0vo6ul1</bpmn:incoming>
       <bpmn:outgoing>Flow_1ybicki</bpmn:outgoing>
     </bpmn:businessRuleTask>
@@ -211,7 +208,7 @@ StudyInfo['investigators'] = study_info('investigators')</bpmn:script>
       <bpmndi:BPMNShape id="ScriptTask_0x4a3pe_di" bpmnElement="Task_Load_Requirements">
         <dc:Bounds x="310" y="399" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1yqy50i_di" bpmnElement="Activity_1yqy50i">
+      <bpmndi:BPMNShape id="Activity_1yqy50i_di" bpmnElement="Activity_EnterCoreInfo">
         <dc:Bounds x="550" y="260" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1kk6x70_di" bpmnElement="Gateway_12tpgcy">
@@ -223,22 +220,22 @@ StudyInfo['investigators'] = study_info('investigators')</bpmn:script>
           <dc:Bounds x="462" y="471" width="62" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_16cm213_di" bpmnElement="Activity_16cm213">
+      <bpmndi:BPMNShape id="Activity_16cm213_di" bpmnElement="Activity_SponsorFundingSource">
         <dc:Bounds x="550" y="650" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0zpnt48_di" bpmnElement="Activity_1bqc7fa">
+      <bpmndi:BPMNShape id="Activity_0zpnt48_di" bpmnElement="Activity_IDSWaiver">
         <dc:Bounds x="550" y="399" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0cxqj36_di" bpmnElement="Activity_0a14ftj">
+      <bpmndi:BPMNShape id="Activity_0cxqj36_di" bpmnElement="Activity_IDS">
         <dc:Bounds x="550" y="520" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1hkeo8n_di" bpmnElement="Activity_0f295la">
         <dc:Bounds x="790" y="399" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1u4ccm9_di" bpmnElement="Activity_0ahlc3u">
+      <bpmndi:BPMNShape id="Activity_1u4ccm9_di" bpmnElement="Activity_IDE">
         <dc:Bounds x="1030" y="490" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0qkzul9_di" bpmnElement="Activity_0teqy3w">
+      <bpmndi:BPMNShape id="Activity_0qkzul9_di" bpmnElement="Activity_IND">
         <dc:Bounds x="1020" y="320" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1y87e9r_di" bpmnElement="Gateway_1so972f">
@@ -250,7 +247,7 @@ StudyInfo['investigators'] = study_info('investigators')</bpmn:script>
       <bpmndi:BPMNShape id="Activity_1s8l694_di" bpmnElement="Activity_0g3qa1c">
         <dc:Bounds x="1270" y="399" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1onpeul_di" bpmnElement="Activity_13ep6ar">
+      <bpmndi:BPMNShape id="Activity_1onpeul_di" bpmnElement="Activity_Personnel">
         <dc:Bounds x="1440" y="399" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_1pv8ygy_di" bpmnElement="TextAnnotation_1pv8ygy">
diff --git a/example_data.py b/example_data.py
index 8b9b0c27..d219cf5d 100644
--- a/example_data.py
+++ b/example_data.py
@@ -107,12 +107,18 @@ class ExampleDataLoader:
                          description="Upload the Study Protocol here.",
                          category_id=1,
                          display_order=0)
+        self.create_spec(id="non_uva_approval",
+                         name="non_uva",
+                         display_name="Non-UVA Institutional Approval",
+                         description="TBD",
+                         category_id=1,
+                         display_order=1)
         self.create_spec(id="core_info",
                          name="core_info",
                          display_name="Core Info",
                          description="TBD",
                          category_id=1,
-                         display_order=1)
+                         display_order=2)
 
         # Approvals
         self.create_spec(id="ids_full_submission",
@@ -139,6 +145,12 @@ class ExampleDataLoader:
                          description="TBD",
                          category_id=2,
                          display_order=3)
+        self.create_spec(id="department_chair_approval",
+                         name="department_chair_approval",
+                         display_name="Department Chair Approval",
+                         description="TBD",
+                         category_id=2,
+                         display_order=4)
 
         # Data Security Plan
         self.create_spec(id="data_security_plan",
@@ -308,3 +320,58 @@ class ExampleDataLoader:
                                        binary_data=file.read(),
                                        content_type=CONTENT_TYPES['xls'])
         file.close()
+
+def ldap(): return "x";
+def study_info(i): return {"x":"Y"};
+
+
+me = ldap()
+investigators = study_info('investigators')
+pi = investigators.get('PI', None)
+is_me_pi = False
+if pi is not None:
+    hasPI = True
+    if pi['uid'] == me['uid']:
+        is_me_pi = True
+else:
+    hasPI = False
+
+dc = investigators.get('DEPT_CH', None)
+pcs = {}
+is_me_pc = False
+for k in investigators.keys():
+    if k in ['SC_I','SC_II','IRBC']:
+        investigator = investigators.get(k)
+        if investigator['uid'] != me['uid']:
+            pcs[k] = investigator
+        else:
+            is_me_pc = True
+            is_me_pc_role = investigator['label']
+        del(investigator)
+cnt_pcs = len(pcs.keys())
+acs = {}
+is_me_ac = False
+for k in investigators.keys():
+    if k == 'AS_C':
+        investigator = investigators.get(k)
+        if investigator['uid'] != me['uid']:
+            acs[k] = investigator
+        else:
+            is_me_ac = True
+            is_me_ac_role = investigator['label']
+        del investigator
+
+cnt_acs = len(acs.keys())
+subs = {}
+is_me_subs = False
+for k in investigators.keys():
+    if k[:2] == 'SI':
+        investigator = investigators.get(k)
+        if investigator['uid'] != me['uid']:
+            subs[k] = investigator
+        else:
+            is_me_subs = True
+        del investigator
+
+cnt_subs = len(subs.keys())
+del investigators
\ No newline at end of file