From 0e8e4ac78173ad0e5f63ad3ddfc1b16d4062581f Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Mon, 16 Mar 2020 13:34:45 -0600
Subject: [PATCH 01/14] parser changes to handle restriction by pattern

---
 bsyncviewer/lib/schema_parser.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bsyncviewer/lib/schema_parser.py b/bsyncviewer/lib/schema_parser.py
index aaf823cb..c88c632e 100644
--- a/bsyncviewer/lib/schema_parser.py
+++ b/bsyncviewer/lib/schema_parser.py
@@ -107,6 +107,7 @@ def __init__(self):
         self.enumerations = []
         self.min_inclusive = 0
         self.max_inclusive = 0
+        self.pattern = ''
 
 
 class ChoiceElement(BuildingSyncSchemaElement):
@@ -314,6 +315,8 @@ def _read_restriction(parent_object):
                 this_restriction.min_inclusive = child.attrib['value']
             elif child.tag.endswith('maxInclusive'):
                 this_restriction.max_inclusive = child.attrib['value']
+            elif child.tag.endswith('pattern'):
+                this_restriction.pattern = child.attrib['value']
             else:
                 raise Exception("Invalid tag type in _read_restriction: " + child.tag)
         return this_restriction

From b4c61f9ae1d752e89c90ca1ba24c734afd41538b Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Mon, 16 Mar 2020 14:03:14 -0600
Subject: [PATCH 02/14] adding additional examples

---
 .../examples/schema2.0.0/example_files.zip    | Bin 10530 -> 12022 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bsyncviewer/lib/validator/examples/schema2.0.0/example_files.zip b/bsyncviewer/lib/validator/examples/schema2.0.0/example_files.zip
index 5ac258287d569c2d7c36530f2f568a1b6c53ebbe..a394be8ae9d26b058805f62d36cf21b289f3b28b 100644
GIT binary patch
delta 1696
zcmZ1!^evVzz?+#xgn<JHnd_VbCM&SXOw<zN5Wbopr?%K4ZllK)Ru-s)5r-mFbaNEj
zHX(?xh@=CD0ZceXat>cT%(&w8f&d02Aj2TQ;A3E55FebGTbh$tl9`_u?-b<e929S0
zs8^Aj6B@z8P<S&xZq}LnxZnR*dQ1(C&3|MdQ1d+8rBa<QS2c=d<*hjup^J{MEQt44
zPc}=4O;TQec}jh}uzK#Cmay+^#+!F<{<f~(cyH~=p!bp@MVe{<G&pMcStdv8l^Op(
zUS+rETmIsMQ=a7%&HwzRWqn^$rJB!!BL|G@*MCiPI<aig#S4uLz7yUmF7`0nz$zo9
zxs$`)yiW92(;wX}8eI!^@GQ9{>1m;~UtWB*QN;<?EG>x{8c&307b;3#U3&Nb>Nj(r
zWPIroJ6PZMx^~}5L6ON$%@-IaOJ;71NL4&9?)XCBAa~y1j0crZSDw*)ta)AL1Ix|_
z7o9|RJlZ8@dBZxSvHbR0rXy-`h95Q4_dM@;_hiZ*#n^{l!IOU^Cc1u$-^^nfe0=8%
zJ9g9Owly<<?ys0t^k?@pR*n0j;h)}f8TB>X&tRK4wR-6ttNMZ$`+n?-nG@tPub}#K
zpw8wqcVw2YJX`E`ZF=F!h&lu1(wxlcoj*Cv?ppfB@2k{Wx+~aWqwjXs*nMjw<oN|^
zLxnE>D(Lh-Tz|=={l%*+n|*wT6>^?#$hofk^Fm7ZJCjJOAIu@TlOtxOhFWU(XO$T5
z+p^L2$%5#G`wqUF^35l?-t=nk-AeZhcXujhotR+pVDU@k@VT*T5*|Iv>GpmpEVJa&
zTNbgmYc6*+F6cVFuXNSUqPg!holdcSSs$dUTfTH!SgrZW{-oc}PvmK({(r$Y&GUOn
z)G2ijhnf8>M~<}^u2aaYP=D_B<}y>Be(Y+!`?6E!6>n>)*7sdgx7qXe#j*+YpK{CF
zKYo$zU|S#H&CbD7u*bxfiGjh6oq++7)JaI2MzFM5f|54l^KTgl)ISdfrcE{1xnV3T
zGt9PmzMZjPcKx=!KF4AXL?tQD4}Ng_`jL}e!k4qw@2|JJUH<LIw}2-Hg*Bc8`5dy4
zYGLG1yB?FH_VD}h$p5t!v%ehMlCpUBr0422l_EL@W{t|s{)g6H+byWLdX}5BJCljy
zw$>)4$b(WF@|Qfx61d;8^=reQ`K9~syZ=s9xq8fl&G6^Xg8ggG)Ys|-1Rp%GV?uw<
zqrE91;ZOhFKXuTv&u#q+yITc&b;DJgl7cb>tdce<Jda)zeByGbNkPYphSvr!SshEY
zj89dZGiA4N)T`JMz^k`2&xP+B)76AopPRCN=(5_#mGi}GFFSp{`=$Hz7qcdpUpCB4
z&Xf4Kyfo*n)toj5|5je{nxFLsoX;bVN&fL%ImuGo<crupU&n)jAGCE9Hufzjyiq07
zs=p}G<gBKWIcMm6m6bYN#pmZdGke~2X1YcCnmaSuY_@ILW+z?l`S|qgr$MV$GIizd
z(tYtM*R@oA{uGxjr8|zy{w8mtuPAw}`E}yy{F!;RPp&dWm!vmeeYL+~Rpm4<<N9l>
zQmz^vHUGHvYn6xpcC+o*--i3!M?I=J6(>-#{BwsCmkQsHgl~bX&Rw}?P-uMnk=L$<
zxgon`6E2=}(3Rv^wc`tK$l*}tQg^{KF%9*Tq%uv_d$-*CZuxcA_503c0h+(P%?-})
zT7Ef5Pk}jgpRk9o;IabNn~`sy1a<G-*|1yO;k@+A4|m-@&e^Pbr`q!Ptm|{P%r9qO
zS;x3t(%;_gQZ*YWRmL9I$uS3}$_#L-WMmR$Mk<2YG#n&g<!^vDnq(YM5>^ajNN&^c
ztA`cF$daJsj+_x>7<ga>v%`|cZ|V#L3T6&?!HjMyvPZzCdP58b8r!Rd(^zPp;$VQ~
WsQ_<QHjqYEAUwp#z#yj!;sF3^3ByAG

delta 193
zcmewsyC{e+z?+#xgn<JHs~htDCo8bYOw<zND4+E#_NLzX*o_`nSXmZiB>Dj*j5sQQ
zqB#>PV>U;zZ4+YA3~u(HEF$T^aTX|C3&fjaB<Jw)F*1oVBN?ct>mUI$Ex;Qg2{yD1
jC<!wZSrTmYJzYOJn9%{=tZWQGzzl?9j0_Cl)ImG|tuQ(H


From 7970b9d5d52477e5b08e673eee1d989f6d6ef473 Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Tue, 17 Mar 2020 15:34:46 -0600
Subject: [PATCH 03/14] adding new examples

---
 .../schema2.0.0/L000_Simulation_BRICR_01.xml  | 47 ++++++++++++++++++
 .../schema2.0.0/L000_Simulation_BRICR_02.xml  | 48 +++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_01.xml
 create mode 100644 bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_02.xml

diff --git a/bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_01.xml b/bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_01.xml
new file mode 100644
index 00000000..21d71372
--- /dev/null
+++ b/bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_01.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 https://raw.githubusercontent.com/BuildingSync/schema/v2.0/BuildingSync.xsd">
+  <auc:Facilities>
+    <auc:Facility>
+      <auc:Sites>
+        <auc:Site>
+          <auc:Address>
+            <auc:City>Chicago</auc:City>
+            <auc:State>IL</auc:State>
+          </auc:Address>
+          <auc:Buildings>
+            <auc:Building ID="Willis_Tower">
+              <auc:PremisesName>Willis Tower</auc:PremisesName>
+              <auc:BuildingClassification>Commercial</auc:BuildingClassification>
+              <auc:OccupancyClassification>Office</auc:OccupancyClassification>
+              <auc:FloorAreas>
+                <auc:FloorArea>
+                  <auc:FloorAreaType>Gross</auc:FloorAreaType>
+                  <auc:FloorAreaValue>4477800.0</auc:FloorAreaValue>
+                </auc:FloorArea>
+              </auc:FloorAreas>
+              <auc:YearOfConstruction>1973</auc:YearOfConstruction>
+            </auc:Building>
+          </auc:Buildings>
+        </auc:Site>
+      </auc:Sites>
+      <auc:Systems/>
+      <auc:Measures>
+        <auc:Measure/>
+      </auc:Measures>
+      <auc:Reports>
+        <auc:Report>
+          <auc:Scenarios>
+            <auc:Scenario ID="Baseline">
+              <auc:ScenarioName>Baseline</auc:ScenarioName>
+              <auc:ScenarioType>
+                <auc:PackageOfMeasures>
+                  <auc:ReferenceCase IDref="Baseline"/>
+                </auc:PackageOfMeasures>
+              </auc:ScenarioType>
+            </auc:Scenario>
+          </auc:Scenarios>
+        </auc:Report>
+      </auc:Reports>
+    </auc:Facility>
+  </auc:Facilities>
+</auc:BuildingSync>
diff --git a/bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_02.xml b/bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_02.xml
new file mode 100644
index 00000000..693bccb2
--- /dev/null
+++ b/bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_02.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 https://raw.githubusercontent.com/BuildingSync/schema/v2.0/BuildingSync.xsd">
+  <auc:Facilities>
+    <auc:Facility>
+      <auc:Sites>
+        <auc:Site>
+          <auc:ClimateZoneType>
+            <auc:ASHRAE>
+              <auc:ClimateZone>6A</auc:ClimateZone>
+            </auc:ASHRAE>
+          </auc:ClimateZoneType>
+          <auc:Buildings>
+            <auc:Building ID="Office_Carolina">
+              <auc:PremisesName>Office Carolina</auc:PremisesName>
+              <auc:BuildingClassification>Commercial</auc:BuildingClassification>
+              <auc:OccupancyClassification>Office</auc:OccupancyClassification>
+              <auc:FloorAreas>
+                <auc:FloorArea>
+                  <auc:FloorAreaType>Gross</auc:FloorAreaType>
+                  <auc:FloorAreaValue>31053</auc:FloorAreaValue>
+                </auc:FloorArea>
+              </auc:FloorAreas>
+              <auc:YearOfConstruction>1915</auc:YearOfConstruction>
+            </auc:Building>
+          </auc:Buildings>
+        </auc:Site>
+      </auc:Sites>
+      <auc:Systems/>
+      <auc:Measures>
+        <auc:Measure/>
+      </auc:Measures>
+      <auc:Reports>
+        <auc:Report>
+          <auc:Scenarios>
+            <auc:Scenario ID="Baseline">
+              <auc:ScenarioName>Baseline</auc:ScenarioName>
+              <auc:ScenarioType>
+                <auc:PackageOfMeasures>
+                  <auc:ReferenceCase IDref="Baseline"/>
+                </auc:PackageOfMeasures>
+              </auc:ScenarioType>
+            </auc:Scenario>
+          </auc:Scenarios>
+        </auc:Report>
+      </auc:Reports>
+    </auc:Facility>
+  </auc:Facilities>
+</auc:BuildingSync>

From 8990729e78fe6e4b6ce32fea80a92cd581ebde33 Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Tue, 17 Mar 2020 15:34:59 -0600
Subject: [PATCH 04/14] attempting to add a docker volume for test suite

---
 Dockerfile               | 7 +++++++
 docker-compose.local.yml | 3 +++
 docker-compose.yml       | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index b16e8b3d..b8980dd8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ RUN apk add --no-cache python3 \
         linux-headers \
         bash \
         bash-completion \
+        git \
         ruby \
         ruby-dev \
         nginx && \
@@ -51,6 +52,12 @@ COPY . /srv/selection-tool/
 ### Copy the wait-for-it command to /usr/local
 COPY /docker/wait-for-it.sh /usr/local/wait-for-it.sh
 
+### Copy the GitHub TestSuite repo into the testsuite volume
+WORKDIR /srv/selection-tool/bsyncviewer/lib/testsuite
+RUN cd /srv/selection-tool/bsyncviewer/lib/testsuite
+RUN git clone https://github.com/BuildingSync/TestSuite.git .
+
+
 # nginx configurations - alpine doesn't use the sites-available directory. Put the selection tool
 # configuration file into the /etc/nginx/conf.d/ folder.
 COPY /docker/nginx.conf /etc/nginx/conf.d/selection_tool.conf
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index 17cf90cb..019a3d17 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -42,6 +42,7 @@ services:
       - "80:80"
     volumes:
       - selectiontool_mediadata:/srv/selection-tool/bsyncviewer/media
+      - selectiontool_testsuite:/srv/selection-tool/bsyncviewer/lib/testsuite
     deploy:
       restart_policy:
         condition: on-failure
@@ -53,3 +54,5 @@ volumes:
     external: true
   selectiontool_mediadata:
     external: true
+  selectiontool_testsuite:
+    external: true
diff --git a/docker-compose.yml b/docker-compose.yml
index e9b41663..3b25c2b1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,8 +28,11 @@ services:
       - "8080:80"
     volumes:
       - selectiontool_mediadata:/srv/selection-tool/bsyncviewer/media
+      - selectiontool_testsuite:/srv/selection-tool/bsyncviewer/lib/testsuite
 volumes:
   selectiontool_pgdata:
     external: true
   selectiontool_mediadata:
     external: true
+  selectiontool_testsuite:
+    external: true

From e67c018a2c553a037869207da1571ef0e64244bc Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Tue, 24 Mar 2020 16:25:52 -0600
Subject: [PATCH 05/14] adding special L000 OpenStudio Simulation use case

---
 README.md                                     |  36 ++-
 ....xml => L000_OpenStudio_Simulation_01.xml} |   0
 ....xml => L000_OpenStudio_Simulation_02.xml} |   0
 .../examples/schema2.0.0/example_files.zip    | Bin 12022 -> 12042 bytes
 bsyncviewer/lib/validator/workflow.py         |  36 ++-
 bsyncviewer/templates/validator_results.html  |  25 +-
 bsyncviewer/testsuitelib/buildingElements.sch | 101 ++++++
 bsyncviewer/testsuitelib/contactElements.sch  |  61 ++++
 bsyncviewer/testsuitelib/energyElements.sch   |   6 +
 bsyncviewer/testsuitelib/floorElements.sch    | 302 ++++++++++++++++++
 .../testsuitelib/occupancyElements.sch        |  59 ++++
 bsyncviewer/testsuitelib/rootElements.sch     |  79 +++++
 bsyncviewer/testsuitelib/scenarioElements.sch |  32 ++
 bsyncviewer/testsuitelib/sectionElements.sch  |  55 ++++
 .../testsuitelib/siteBuildingElements.sch     |  36 +++
 15 files changed, 821 insertions(+), 7 deletions(-)
 rename bsyncviewer/lib/validator/examples/schema2.0.0/{L000_Simulation_BRICR_01.xml => L000_OpenStudio_Simulation_01.xml} (100%)
 rename bsyncviewer/lib/validator/examples/schema2.0.0/{L000_Simulation_BRICR_02.xml => L000_OpenStudio_Simulation_02.xml} (100%)
 create mode 100644 bsyncviewer/testsuitelib/buildingElements.sch
 create mode 100644 bsyncviewer/testsuitelib/contactElements.sch
 create mode 100644 bsyncviewer/testsuitelib/energyElements.sch
 create mode 100644 bsyncviewer/testsuitelib/floorElements.sch
 create mode 100644 bsyncviewer/testsuitelib/occupancyElements.sch
 create mode 100644 bsyncviewer/testsuitelib/rootElements.sch
 create mode 100644 bsyncviewer/testsuitelib/scenarioElements.sch
 create mode 100644 bsyncviewer/testsuitelib/sectionElements.sch
 create mode 100644 bsyncviewer/testsuitelib/siteBuildingElements.sch

diff --git a/README.md b/README.md
index 2d1d64bf..f5facaf8 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,15 @@ This is the repository for the BuildingSync Validator web application.
 	```bash
 	pip install -r requirements.txt
 	```
+1.  Install the schematron-nokogiri gem for schematron use case validation.  We are using a forked version to handle OpenStudio Simulation use cases which contain abstract patterns.
+    ```bash
+    git clone https://github.com/BuildingSync/schematron.git
+    cd schematron
+    gem build schematron-nokogiri.gemspec
+    gem install schematron-nokogiri-0.0.3
+
+    ```
+
 1.  Initialize the database:
 	```bash
 	python manage.py migrate
@@ -182,12 +191,35 @@ Follow these steps to add a new schema version to the selection tool:
 1. Test the validator with the new XML example files.
 1. Reparse bedes terms to map them to the new schema following the steps in the BEDES section above.
 
-### Adding Examples from the TestSuite
+### Adding Examples from the TestSuite repo
 
-Follow these steps to add new example tables from the TestSuite
+Follow these steps to add new example tables from the TestSuite repo
 
 1. Clone the [TestSuite](https://github.com/BuildingSync/TestSuite) repo
 2. Install [pandoc](https://pandoc.org/installing.html)
 3. Convert the TestSuite README to html:
     ``` pandoc README.md -s -o README.html ```
 4. Copy the tables part of the README.html and paste to replace the old content in ```bsyncviewer/templates/examples.html```.
+
+### Adding an OpenStudio Simulation Use Case from the TestSuite repo
+
+1. The relevant files are currently on the L000_Schematron branch of the [TestSuite](https://github.com/BuildingSync/TestSuite/tree/L100_Schematron) repo.  Clone the repo locally.
+1. OpenStudio Simulation use case schematron files include patterns from a [library of schematron files](https://github.com/BuildingSync/TestSuite/tree/L100_Schematron/lib).  Copy these files from the TestSuite repo into the selection-tool at the following location: ```bsyncviewer/testsuitelib```.
+1. Open the relevant use case file from the TestSuite repo.  For example: [L00_OpenStudio_Simulation.sch](https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/spec/use_cases/schema2.0.0/L000_OpenStudio_Simulation.sch).  Edit the include statements at the top of the file with relative paths to the selection-tool testsuitelib directory.  Save the file.
+    ```bash
+      <include href="../../testsuitelib/rootElements.sch#root.oneOfEachUntilBuilding"/>
+      <include href="../../testsuitelib/rootElements.sch#root.oneOfEachFacilityUntilScenario"/>
+      <include href="../../testsuitelib/siteBuildingElements.sch#sbe.cityStateOrClimateZone"/>
+      <include href="../../testsuitelib/scenarioElements.sch#sc.baseline.ID"/>
+      <include href="../../testsuitelib/scenarioElements.sch#sc.baseline.asPackageOfMeasures"/>
+      <include href="../../testsuitelib/buildingElements.sch#be.L000BuildingInfo"/>
+      <include href="../../testsuitelib/floorElements.sch#fa.oneOfType"/>
+      <include href="../../testsuitelib/floorElements.sch#fa.haveTypeAndValue"/>
+    ```
+1. Add the use case to the selection-tool by browsing to the ```/use_cases``` URL and clicking the *New Use Case* button.
+    1. Fill out the name, description, and schema version
+    1. Upload the file that was modified in the previous step
+    1. Save
+1. Make the use case public from the selection-tool admin interface.
+1. If you have any example files to add to the selection-tool (for example, for the L000 OpenStudio Simulation use case, there are [2 examples files](https://github.com/BuildingSync/TestSuite/tree/L100_Schematron/spec/use_cases/schema2.0.0/examples)), add them in the appropriate schema directory in ```bsyncviewer/lib/validator/examples```. Regenerate the ```example_files.zip``` archive.  This will make the files available as examples at the ```/validator``` URL.  
+1. You can now validate XMLs against the new use case.
diff --git a/bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_01.xml b/bsyncviewer/lib/validator/examples/schema2.0.0/L000_OpenStudio_Simulation_01.xml
similarity index 100%
rename from bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_01.xml
rename to bsyncviewer/lib/validator/examples/schema2.0.0/L000_OpenStudio_Simulation_01.xml
diff --git a/bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_02.xml b/bsyncviewer/lib/validator/examples/schema2.0.0/L000_OpenStudio_Simulation_02.xml
similarity index 100%
rename from bsyncviewer/lib/validator/examples/schema2.0.0/L000_Simulation_BRICR_02.xml
rename to bsyncviewer/lib/validator/examples/schema2.0.0/L000_OpenStudio_Simulation_02.xml
diff --git a/bsyncviewer/lib/validator/examples/schema2.0.0/example_files.zip b/bsyncviewer/lib/validator/examples/schema2.0.0/example_files.zip
index a394be8ae9d26b058805f62d36cf21b289f3b28b..ead5208fdc885d730095d4c90e6c072885fc35a0 100644
GIT binary patch
delta 389
zcmews+Z8v#fw`-xYNInh8*`;);pR}b|3b`irB$25C0Ft}xK&gHFdzX%1_1^i0|SG2
z|AN%K;F8jm%>4M^%-qtP#FEVXym$jcy^7qN&<Gv|ppkJQKvS$WVwgxa#Rz6f3)GZL
zT635{uAE$`8wzqIkQSYMPuEWs=+HQ|#TIb^-i%D5%pwdNKnQX(Pr)7&TP6kuJ9Y*J
z#mRwsV)ghP%mH&ShDou<b#lysCS`z3V&H*=g~O7@Nm>ke!vg9H4hE1fq=10|G@F$T
QWB@A=o?&EQ(9i|(048Z`_W%F@

delta 382
zcmeB*`xZOFfm!%!{zhkhHfF`E`I|%8{tGc102$$uEBUO8(+dI^kbn$>0E3T#fkAw5
zW^QRtVo7FxUc6I~r*lxefuUYSZcb<f4@2S2{J2?X@;5tZ#4wR!fDz1q5~u-pwB|5@
z+%~ydHx%Ty$(MDL>w!*-Q(J5i7vRmvB+4wpzyX9HSMn6>F|lQ0V6bCnV31+pfw|dX
zN#i$l1_Ey8fVmmN)Y#)XIp#o9Ghn8ALktEQ+pC4sSg21p7@$4@8q3NC(#Q&ghZq?c
I<a9wi0FifRQ~&?~

diff --git a/bsyncviewer/lib/validator/workflow.py b/bsyncviewer/lib/validator/workflow.py
index d6dcab1c..f64ae1fb 100644
--- a/bsyncviewer/lib/validator/workflow.py
+++ b/bsyncviewer/lib/validator/workflow.py
@@ -145,15 +145,43 @@ def process_use_case(self, use_case):
         results = OrderedDict()
         results['valid'] = True
         results['errors'] = []
+        results['infos'] = []
+        results['warnings'] = []
 
         result = subprocess.run(['stron-nokogiri', use_case.import_file.path, self.filepath], stdout=subprocess.PIPE)
         errors = result.stdout.decode('utf-8')
-        results['errors'] = errors.split('\n')
-        results['errors'] = [i for i in results['errors'] if i]
-        print("RESULTS ERROR: {}".format(results['errors']))
+        temp_results = errors.split('\n')
+        temp_results = [i for i in temp_results if i]
+
+        temp_results = self.process_errors(temp_results)
 
         # set valid to valse if errors.count > 0
-        if len(results['errors']) > 0:
+        if len(temp_results['errors']) > 0:
             results['valid'] = False
 
+        results['warnings'] = temp_results['warnings']
+        results['errors'] = temp_results['errors']
+        results['infos'] = temp_results['infos']
+
         return results
+
+    def process_errors(self, results):
+        # separate INFO, WARNING, ERROR
+
+        final_results = OrderedDict()
+        final_results['infos'] = []
+        final_results['warnings'] = []
+        final_results['errors'] = []
+
+        for res in results:
+            if '[INFO]' in res:
+                # append to info
+                final_results['infos'].append(res)
+            elif '[WARNING]' in res:
+                # append to warnings
+                final_results['warnings'].append(res)
+            else:
+                # assume error
+                final_results['errors'].append(res)
+
+        return final_results
diff --git a/bsyncviewer/templates/validator_results.html b/bsyncviewer/templates/validator_results.html
index 4b8feb8d..2fca7e8c 100644
--- a/bsyncviewer/templates/validator_results.html
+++ b/bsyncviewer/templates/validator_results.html
@@ -72,8 +72,31 @@ <h3>{# {{ name }} #}
   {#                    <span class="label label-danger pad-10">Invalid</span>#}
                     </h3>
                   {% endif %}
+                  {% if uc.infos %}
+                    <h4>Info<span class="label label-info pad5">{{ uc.infos|length }}</span></h4> 
+                    <table style="table-layout: fixed; ">
+                      {% for item in uc.infos %}
+                        <tr class="wrap-it">
+                          <td width="5%">{{ forloop.counter }}.</td>
+                          <td class="wrap-it">{{ item }}</td>
+                        </tr>
+                      {% endfor %}
+                    </table>
+                  {% endif %}  
+                  {% if uc.warnings %}
+                    <h4>Warnings<span class="label label-warning pad5">{{ uc.warnings|length }}</span></h4> 
+                    <table style="table-layout: fixed; ">
+                      {% for item in uc.warnings %}
+                        <tr class="wrap-it">
+                          <td width="5%">{{ forloop.counter }}.</td>
+                          <td class="wrap-it">{{ item }}</td>
+                        </tr>
+                      {% endfor %}
+                    </table>
+                  {% endif %}
+
                   {%  if uc.valid is False %}
-                    <h4>Issues <span class="label label-danger pad5">{{ uc.errors|length }}</span></h4>
+                    <h4>Errors <span class="label label-danger pad5">{{ uc.errors|length }}</span></h4>
                     <table style="table-layout: fixed; ">
                       {% for err in uc.errors %}
                         <tr class="wrap-it">
diff --git a/bsyncviewer/testsuitelib/buildingElements.sch b/bsyncviewer/testsuitelib/buildingElements.sch
new file mode 100644
index 00000000..db475cd9
--- /dev/null
+++ b/bsyncviewer/testsuitelib/buildingElements.sch
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+  <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
+  <!--  For logic pertaining to a Building element. -->
+  <!--    Required elements for L000 at the building level -->
+  <pattern id="be.L000BuildingInfo">
+    <rule context="auc:Buildings/auc:Building">
+      <assert test="auc:PremisesName">
+        [ERROR] element 'auc:PremisesName' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:BuildingClassification">
+        [ERROR] element 'auc:BuildingClassification' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:OccupancyClassification">
+        [ERROR] element 'auc:OccupancyClassification' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:YearOfConstruction">
+        [ERROR] element 'auc:YearOfConstruction' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--
+    Check the main details for the Building element as required by 211.
+-->
+  <pattern id="be.mainDetails">
+    <rule context="auc:Buildings/auc:Building">
+      <assert test="auc:PremisesName">
+        [ERROR] element 'auc:PremisesName' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:BuildingClassification">
+        [ERROR] element 'auc:BuildingClassification' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:OccupancyClassification">
+        [ERROR] element 'auc:OccupancyClassification' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:YearOfConstruction">
+        [ERROR] element 'auc:YearOfConstruction' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:BuildingAutomationSystem">
+        [ERROR] element 'auc:BuildingAutomationSystem' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:HistoricalLandmark">
+        [ERROR] element 'auc:HistoricalLandmark' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:PercentOccupiedByOwner">
+        [ERROR] element 'auc:PercentOccupiedByOwner' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:PercentLeasedByOwner">
+        [ERROR] element 'auc:PercentLeasedByOwner' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:ConditionedFloorsAboveGrade">
+        [ERROR] element 'auc:ConditionedFloorsAboveGrade' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:ConditionedFloorsBelowGrade">
+        [ERROR] element 'auc:ConditionedFloorsBelowGrade' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:FloorsAboveGrade or auc:UnconditionedFloorsAboveGrade">
+        [ERROR] element 'auc:FloorsAboveGrade' or 'auc:UnconditionedFloorsAboveGrade' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:FloorsBelowGrade or auc:UnconditionedFloorsBelowGrade">
+        [ERROR] element 'auc:FloorsBelowGrade' or 'auc:UnconditionedFloorsBelowGrade' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:YearOfLastEnergyAudit">
+        [WARNING] element 'auc:YearOfLastEnergyAudit' is RECOMMENDED for: '<name/>'
+      </assert>
+      <assert test="auc:RetrocommissioningDate">
+        [WARNING] element 'auc:RetrocommissioningDate' is RECOMMENDED for: '<name/>'
+      </assert>
+      <assert test="auc:YearOfLastMajorRemodel">
+        [WARNING] element 'auc:YearOfLastMajorRemodel' is RECOMMENDED for: '<name/>'
+      </assert>
+      <!--      <assert test="if (auc:ConditionedFloorsAboveGrade and auc:FloorsAboveGrade and auc:UnconditionedFloorsAboveGrade) then (auc:FloorsAboveGrade = auc:ConditionedFloorsAboveGrade + auc:UnconditionedFloorsAboveGrade) else (true())">
+        The following statement must be true: auc:FloorsAboveGrade = auc:ConditionedFloorsAboveGrade + auc:UnconditionedFloorsAboveGrade
+      </assert>-->
+      <!--      <assert test="if (auc:ConditionedFloorsBelowGrade and auc:FloorsBelowGrade and auc:UnconditionedFloorsBelowGrade) then (auc:FloorsBelowGrade = auc:ConditionedFloorsBelowGrade + auc:UnconditionedFloorsBelowGrade) else (true())">
+        The following statement must be true: auc:FloorsBelowGrade = auc:ConditionedFloorsBelowGrade + auc:UnconditionedFloorsBelowGrade
+      </assert>-->
+    </rule>
+  </pattern>
+  <!--
+    Check the simple location details for the Building element as required by 211.
+    This function doesn't handle complex address types, i.e auc:StreetAddressDetail/auc:Complex
+    <severity> error
+-->
+  <pattern id="be.simpleLocationDetails">
+    <rule context="auc:Buildings/auc:Building">
+      <assert test="auc:Address/auc:City">
+        [ERROR] element 'auc:City' within element 'auc:Address' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:Address/auc:State">
+        [ERROR] element 'auc:State' within element 'auc:Address' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:Address/auc:PostalCode">
+        [ERROR] element 'auc:PostalCode' within element 'auc:Address' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:Address/auc:StreetAddressDetail/auc:Simplified/auc:StreetAddress">
+        [ERROR] element 'auc:StreetAddress' within element 'auc:Address/auc:StreetAddressDetail/auc:Simplified' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+</schema>
diff --git a/bsyncviewer/testsuitelib/contactElements.sch b/bsyncviewer/testsuitelib/contactElements.sch
new file mode 100644
index 00000000..a20ccdf5
--- /dev/null
+++ b/bsyncviewer/testsuitelib/contactElements.sch
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+  <!--  
+    For logic pertaining to Contact elements.  Parent passed should be an auc:Contact.
+-->
+  <!--  
+    Check that the name, email, and phone number are specified for contacts.
+    <severity> error
+    <param> parent - an auc:Contact element
+-->
+  <pattern abstract="true" id="con.nameEmailPhone">
+    <rule context="$parent">
+      <assert test="auc:ContactName">
+        [ERROR] element 'auc:ContactName' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="count(auc:ContactEmailAddresses//auc:EmailAddress[text()]) &gt;= 1">
+        [ERROR] element 'auc:EmailAddress' within element 'auc:ContactEmailAddresses/auc:ContactEmailAddress' is REQUIRED AT LEAST ONCE for: '<name/>'
+      </assert>
+      <assert test="count(auc:ContactTelephoneNumbers//auc:TelephoneNumber[text()]) &gt;= 1">
+        [ERROR] element 'auc:TelephoneNumber' within element 'auc:ContactTelephoneNumbers/auc:ContactTelephoneNumber' is REQUIRED AT LEAST ONCE for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that there are atleast two auc:Contact elements within an auc:Facility,
+    and that there is atleast one Energy Auditor and one Owner.
+    <severity> error
+    <param> parent - an auc:Facility/auc:Contacts element
+-->
+  <pattern abstract="true" id="con.atleastOneAuditorAndOneOwner">
+    <rule context="$parent">
+      <let name="numContacts" value="count(auc:Contact)"/>
+      <let name="numAuditors" value="count(auc:Contact/auc:ContactRoles/auc:ContactRole[text()='Energy Auditor'])"/>
+      <let name="numOwners" value="count(auc:Contact/auc:ContactRoles/auc:ContactRole[text()='Owner'])"/>
+      <assert test="$numContacts &gt;= 2">
+        [ERROR] element 'auc:Contact' is REQUIRED AT LEAST TWICE for: '<name/>’. Current number of occurrences: <value-of select="$numContacts"/>
+      </assert>
+      <assert test="$numAuditors &gt;= 1">
+        [ERROR] element 'auc:Contact' with child element 'auc:ContactRoles/auc:ContactRole' with value 'Energy Auditor' is REQUIRED AT LEAST ONCE for: '<name/>’. Current number of occurrences: <value-of select="$numAuditors"/>
+      </assert>
+      <assert test="$numOwners &gt;= 1">
+        [ERROR] element 'auc:Contact' with child element 'auc:ContactRoles/auc:ContactRole' with value 'Owner' is REQUIRED AT LEAST ONCE for: '<name/>’. Current number of occurrences: <value-of select="$numOwners"/>
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that there are atleast two auc:Contact elements within an auc:Facility,
+    and that there is atleast one Energy Auditor and one Owner.
+    <severity> error
+    <param> parent - an auc:Facility/auc:Contacts/auc:Contact element
+-->
+  <pattern abstract="true" id="con.notAuditorAndOwner">
+    <rule context="$parent">
+      <let name="numAuditors" value="count(auc:ContactRoles/auc:ContactRole[text()='Energy Auditor'])"/>
+      <let name="numOwners" value="count(auc:ContactRoles/auc:ContactRole[text()='Owner'])"/>
+      <assert test="$numOwners * $numAuditors = 0">
+        [ERROR] element 'auc:ContactRole' MUST NOT HAVE values 'Energy Auditor' and 'Owner' within 'auc:ContactRoles' for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+</schema>
diff --git a/bsyncviewer/testsuitelib/energyElements.sch b/bsyncviewer/testsuitelib/energyElements.sch
new file mode 100644
index 00000000..61ed8c00
--- /dev/null
+++ b/bsyncviewer/testsuitelib/energyElements.sch
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
+  <!--  
+    For logic pertaining to Energy / Resource / Utilty elements.
+-->
+</schema>
diff --git a/bsyncviewer/testsuitelib/floorElements.sch b/bsyncviewer/testsuitelib/floorElements.sch
new file mode 100644
index 00000000..851551d8
--- /dev/null
+++ b/bsyncviewer/testsuitelib/floorElements.sch
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+  <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
+  <!--  
+    For logic pertaining to FloorArea elements.
+-->
+  <!--  
+    Each FloorAreaType enumeration can occur AT MOST one time in a set of FloorArea elements.
+    <severity> error
+    <param> parent - an auc:FloorAreas element
+-->
+  <pattern abstract="true" id="fa.maxOneOfEachType">
+    <rule context="$parent">
+      <let name="tenant" value="count(auc:FloorArea[auc:FloorAreaType = 'Tenant'])"/>
+      <let name="common" value="count(auc:FloorArea[auc:FloorAreaType = 'Common'])"/>
+      <let name="gross" value="count(auc:FloorArea[auc:FloorAreaType = 'Gross'])"/>
+      <let name="net" value="count(auc:FloorArea[auc:FloorAreaType = 'Net'])"/>
+      <let name="finished" value="count(auc:FloorArea[auc:FloorAreaType = 'Finished'])"/>
+      <let name="footprint" value="count(auc:FloorArea[auc:FloorAreaType = 'Footprint'])"/>
+      <let name="rentable" value="count(auc:FloorArea[auc:FloorAreaType = 'Rentable'])"/>
+      <let name="occupied" value="count(auc:FloorArea[auc:FloorAreaType = 'Occupied'])"/>
+      <let name="lighted" value="count(auc:FloorArea[auc:FloorAreaType = 'Lighted'])"/>
+      <let name="daylit" value="count(auc:FloorArea[auc:FloorAreaType = 'Daylit'])"/>
+      <let name="heated" value="count(auc:FloorArea[auc:FloorAreaType = 'Heated'])"/>
+      <let name="cooled" value="count(auc:FloorArea[auc:FloorAreaType = 'Cooled'])"/>
+      <let name="conditioned" value="count(auc:FloorArea[auc:FloorAreaType = 'Conditioned'])"/>
+      <let name="unconditioned" value="count(auc:FloorArea[auc:FloorAreaType = 'Unconditioned'])"/>
+      <let name="semiConditioned" value="count(auc:FloorArea[auc:FloorAreaType = 'Semi-conditioned'])"/>
+      <let name="heatedCooled" value="count(auc:FloorArea[auc:FloorAreaType = 'Heated and Cooled'])"/>
+      <let name="heatedOnly" value="count(auc:FloorArea[auc:FloorAreaType = 'Heated only'])"/>
+      <let name="cooledOnly" value="count(auc:FloorArea[auc:FloorAreaType = 'Cooled only'])"/>
+      <let name="ventilated" value="count(auc:FloorArea[auc:FloorAreaType = 'Ventilated'])"/>
+      <let name="enclosed" value="count(auc:FloorArea[auc:FloorAreaType = 'Enclosed'])"/>
+      <let name="nonEnclosed" value="count(auc:FloorArea[auc:FloorAreaType = 'Non-Enclosed'])"/>
+      <let name="open" value="count(auc:FloorArea[auc:FloorAreaType = 'Open'])"/>
+      <let name="lot" value="count(auc:FloorArea[auc:FloorAreaType = 'Lot'])"/>
+      <let name="custom" value="count(auc:FloorArea[auc:FloorAreaType = 'Custom'])"/>
+      <assert test="1 &gt;= $tenant">
+        [ERROR] element 'auc:FloorAreaType' with value 'Tenant' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $common">
+        [ERROR] element 'auc:FloorAreaType' with value 'Common' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $gross">
+        [ERROR] element 'auc:FloorAreaType' with value 'Gross' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $net">
+        [ERROR] element 'auc:FloorAreaType' with value 'Net' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $finished">
+        [ERROR] element 'auc:FloorAreaType' with value 'Finished' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $footprint">
+        [ERROR] element 'auc:FloorAreaType' with value 'Footprint' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $rentable">
+        [ERROR] element 'auc:FloorAreaType' with value 'Rentable' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $occupied">
+        [ERROR] element 'auc:FloorAreaType' with value 'Occupied' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $lighted">
+        [ERROR] element 'auc:FloorAreaType' with value 'Lighted' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $daylit">
+        [ERROR] element 'auc:FloorAreaType' with value 'Daylit' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $heated">
+        [ERROR] element 'auc:FloorAreaType' with value 'Heated' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $cooled">
+        [ERROR] element 'auc:FloorAreaType' with value 'Cooled' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $conditioned">
+        [ERROR] element 'auc:FloorAreaType' with value 'Conditioned' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $unconditioned">
+        [ERROR] element 'auc:FloorAreaType' with value 'Unconditioned' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $semiConditioned">
+        [ERROR] element 'auc:FloorAreaType' with value 'Semi-conditioned' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $heatedCooled">
+        [ERROR] element 'auc:FloorAreaType' with value 'Heated and Cooled' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $heatedOnly">
+        [ERROR] element 'auc:FloorAreaType' with value 'Heated only' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $cooledOnly">
+        [ERROR] element 'auc:FloorAreaType' with value 'Cooled only' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $ventilated">
+        [ERROR] element 'auc:FloorAreaType' with value 'Ventilated' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $enclosed">
+        [ERROR] element 'auc:FloorAreaType' with value 'Enclosed' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $nonEnclosed">
+        [ERROR] element 'auc:FloorAreaType' with value 'Non-Enclosed' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $open">
+        [ERROR] element 'auc:FloorAreaType' with value 'Open' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $lot">
+        [ERROR] element 'auc:FloorAreaType' with value 'Lot' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+      <assert test="1 &gt;= $custom">
+        [ERROR] element 'auc:FloorAreaType' with value 'Custom' is ALLOWED NO MORE THAN ONCE for '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that the auc:FloorArea elements have the auc:FloorAreaType and auc:FloorAreaValue.
+    <severity> error
+    <param> parent - an auc:FloorArea element
+-->
+  <pattern abstract="true" id="fa.haveTypeAndValue">
+    <rule context="$parent">
+      <assert test="auc:FloorAreaType and auc:FloorAreaValue">
+        [ERROR] elements 'auc:FloorAreaType' and 'auc:FloorAreaValue' are REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that there is exactly one auc:FloorAreaType
+    <severity> error
+    <param> parent - an auc:FloorAreas element
+    <param> floorAreaType - one of the standardized string enumerations of the auc:FloorAreaType element
+-->
+  <pattern abstract="true" id="fa.oneOfType">
+    <rule context="$parent">
+      <assert test="count(auc:FloorArea[auc:FloorAreaType = $floorAreaType]) = 1">
+        [ERROR] element 'auc:FloorAreaType' with value '<value-of select="$floorAreaType"/>' is REQUIRED EXACTLY ONCE within element 'auc:FloorArea' for '<name/>'.  Currently occurs: <value-of select="count(auc:FloorArea[auc:FloorAreaType = $floorAreaType])"/>
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check if an auc:FloorAreaType is declared.
+    <severity> error
+    <param> parent - an auc:FloorAreas element
+    <param> floorAreaType - one of the standardized string enumerations of the auc:FloorAreaType element
+-->
+  <pattern abstract="true" id="fa.noneDefinedWarn">
+    <rule context="$parent">
+      <assert test="count(auc:FloorArea/auc:FloorAreaType[text() = $floorAreaType]) != 0">
+        [WARNING] element 'auc:FloorAreaType' with value '<value-of select="$floorAreaType"/>' is RECOMMENDED for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--
+    Check mechanical floor area types add up to the gross type.  The following values are assumed if the type is not declared, 
+    although these types are not inserted in the BSync document:
+    - Cooled only -> 0.0
+    - Heated only -> 0.0
+    - Heated and Cooled -> 0.0
+    - Ventilated -> 0.0
+    - Conditioned -> Cooled only + Heated only + Heated and Cooled + Ventilated
+    - Unconditioned -> Gross - Conditioned
+    <severity> error
+    <param> parent - an auc:FloorAreas element
+-->
+  <pattern abstract="true" id="fa.mechTypeChecks">
+    <rule context="$parent" role="error">
+      <let name="grossAreaValue" value="number(auc:FloorArea[auc:FloorAreaType/text()='Gross']/auc:FloorAreaValue)"/>
+      <let name="grossArea" value="number(translate(string($grossAreaValue), 'NaN', '0'))"/>
+      <let name="cooledOnlyAreaValue" value="number(auc:FloorArea[auc:FloorAreaType/text()='Cooled only']/auc:FloorAreaValue)"/>
+      <let name="cooledOnlyArea" value="number(translate(string($cooledOnlyAreaValue), 'NaN', '0'))"/>
+      <let name="heatedOnlyAreaValue" value="number(auc:FloorArea[auc:FloorAreaType/text()='Heated only']/auc:FloorAreaValue)"/>
+      <let name="heatedOnlyArea" value="number(translate(string($heatedOnlyAreaValue), 'NaN', '0'))"/>
+      <let name="heatedCooledAreaValue" value="number(auc:FloorArea[auc:FloorAreaType/text()='Heated and Cooled']/auc:FloorAreaValue)"/>
+      <let name="heatedCooledArea" value="number(translate(string($heatedCooledAreaValue), 'NaN', '0'))"/>
+      <let name="ventilatedAreaValue" value="number(auc:FloorArea[auc:FloorAreaType/text()='Ventilated']/auc:FloorAreaValue)"/>
+      <let name="ventilatedArea" value="number(translate(string($ventilatedAreaValue), 'NaN', '0'))"/>
+      
+<!--      The following logic is based on Becker's method for if-else statements in XPath 1.0 -->
+      <let name="conditionedAreaValue" value="number(auc:FloorArea[auc:FloorAreaType/text()='Conditioned']/auc:FloorAreaValue)"/>
+      <let name="conditionedAreaValueComputed" value="$cooledOnlyArea + $heatedOnlyArea + $heatedCooledArea + $ventilatedArea"/>
+      <let name="endTextPosition1CA" value="number(not(string($conditionedAreaValue) != 'NaN')) * string-length(string($conditionedAreaValueComputed))"/>
+      <let name="endTextPosition2CA" value="number(not(string($conditionedAreaValue) = 'NaN')) * string-length(string($conditionedAreaValue))"/>
+      <let name="conditionedArea" value="number(concat(substring($conditionedAreaValueComputed, 1, $endTextPosition1CA),
+                                                       substring($conditionedAreaValue, 1, $endTextPosition2CA)))"/>
+      <let name="unconditionedAreaValue" value="number(auc:FloorArea[auc:FloorAreaType/text()='Unconditioned']/auc:FloorAreaValue)"/>
+      <let name="unconditionedAreaValueComputed" value="$grossArea - $conditionedArea"/>
+      <let name="endTextPosition1UCA" value="number(not(string($unconditionedAreaValue) != 'NaN')) * string-length(string($unconditionedAreaValueComputed))"/>
+      <let name="endTextPosition2UCA" value="number(not(string($unconditionedAreaValue) = 'NaN')) * string-length(string($unconditionedAreaValue))"/>
+      <let name="unconditionedArea" value="number(concat(substring($unconditionedAreaValueComputed, 1, $endTextPosition1UCA),
+                                                         substring($unconditionedAreaValue, 1, $endTextPosition2UCA)))"/>
+      <assert test="$conditionedArea &gt;= $cooledOnlyArea + $heatedOnlyArea + $heatedCooledArea + $ventilatedArea">
+        [ERROR] Conditioned Floor Area (<value-of select="$conditionedArea"/>) must be greater than or equal to: Heated and Cooled (<value-of select="$heatedCooledArea"/>) + Heated only (<value-of select="$heatedOnlyArea"/>) + Cooled only (<value-of select="$cooledOnlyArea"/>) + Ventilated (<value-of select="$ventilatedArea"/>)
+      </assert>
+      <assert test="$grossArea &gt;= $conditionedArea + $unconditionedArea and $unconditionedArea >= 0">
+        [ERROR] Gross Floor Area (<value-of select="$grossArea"/>) must be greater than or equal to: Conditioned (<value-of select="$conditionedArea"/>) + Unconditioned (<value-of select="$unconditionedArea"/>) AND Unconditioned Floor Area must be > 0
+      </assert>
+      <assert test="false()">
+        [INFO] 'Gross' Floor Area: <value-of select="$grossArea"/>
+      </assert>
+      <assert test="false()">
+        [INFO] 'Cooled only' Floor Area: <value-of select="$cooledOnlyArea"/>
+      </assert>
+      <assert test="false()">
+        [INFO] 'Heated only' Floor Area: <value-of select="$heatedOnlyArea"/>
+      </assert>
+      <assert test="false()">
+        [INFO] 'Heated and Cooled' Floor Area: <value-of select="$heatedCooledArea"/>
+      </assert>
+      <assert test="false()">
+        [INFO] 'Ventilated' Floor Area: <value-of select="$ventilatedArea"/>
+      </assert>
+      <assert test="false()">
+        [INFO] 'Conditioned' Floor Area: <value-of select="$conditionedArea"/>
+      </assert>
+      <assert test="false()">
+        [INFO] 'Unconditioned' Floor Area: <value-of select="$unconditionedArea"/>
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that 'Heated' and 'Cooled' FloorAreaTypes are not defined.
+    <severity> error
+    <param> parent - an auc:FloorAreas element
+-->
+  <pattern abstract="true" id="fa.dontUse">
+    <rule context="$parent">
+      <assert test="not (auc:FloorArea/auc:FloorAreaType[text()='Heated'])">
+        [ERROR] element 'auc:FloorAreaType' with value 'Heated' within element 'auc:FloorArea' SHOULD NOT BE USED for: '<name/>'
+      </assert>
+      <assert test="not (auc:FloorArea/auc:FloorAreaType[text()='Cooled'])">
+        [ERROR] element 'auc:FloorAreaType' with value 'Cooled' within element 'auc:FloorArea' SHOULD NOT BE USED for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that at least one of the mechanical floor area types is defined.
+    <severity> error
+    <param> parent - an auc:FloorAreas element
+-->
+  <pattern abstract="true" id="fa.oneOfMechType">
+    <rule context="$parent">
+      <let name="conditioned" value="count(auc:FloorArea/auc:FloorAreaType[text()='Conditioned'])"/>
+      <let name="heatedCooled" value="count(auc:FloorArea/auc:FloorAreaType[text()='Heated and Cooled'])"/>
+      <let name="heated" value="count(auc:FloorArea/auc:FloorAreaType[text()='Heated only'])"/>
+      <let name="cooled" value="count(auc:FloorArea/auc:FloorAreaType[text()='Cooled only'])"/>
+      <let name="ventilated" value="count(auc:FloorArea/auc:FloorAreaType[text()='Ventilated'])"/>
+      <assert test="$conditioned + $heatedCooled + $heated + $cooled + $ventilated > 0">
+        [ERROR] element 'auc:FloorAreaType' with value 'Conditioned' or 'Heated and Cooled' or 'Heated only' or 'Cooled only' or 'Ventilated' is REQUIRED AT LEAST ONCE for '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that the Conditioned area is greater than Cooled only + Heated only + Heated and Cooled + Ventilated
+    <severity> error
+    <param> parent - an auc:FloorAreas[auc:FloorAreaType='Conditioned' and auc:FloorAreaPercentage] element
+-->
+  <pattern abstract="true" id="fa.conditionedPercentChecks">
+    <rule context="$parent">
+      <let name="grossArea" value="if (parent::node()/auc:FloorArea/auc:FloorAreaType[text()='Gross']) then (number(parent::node()/auc:FloorArea/auc:FloorAreaType[text()='Gross']/parent::auc:FloorArea/auc:FloorAreaValue)) else (0.0)"/>
+      <let name="cooledOnlyArea" value="if (parent::node()/auc:FloorArea/auc:FloorAreaType[text()='Cooled only']) then (number(parent::node()/auc:FloorArea/auc:FloorAreaType[text()='Cooled only']/parent::auc:FloorArea/auc:FloorAreaValue)) else (0.0)"/>
+      <let name="heatedOnlyArea" value="if (parent::node()/auc:FloorArea/auc:FloorAreaType[text()='Heated only']) then (number(parent::node()/auc:FloorArea/auc:FloorAreaType[text()='Heated only']/parent::auc:FloorArea/auc:FloorAreaValue)) else (0.0)"/>
+      <let name="heatedCooledArea" value="if (parent::node()/auc:FloorArea/auc:FloorAreaType[text()='Heated and Cooled']) then (number(parent::node()/auc:FloorArea/auc:FloorAreaType[text()='Heated and Cooled']/parent::auc:FloorArea/auc:FloorAreaValue)) else (0.0)"/>
+      <let name="ventilatedArea" value="if (parent::node()/auc:FloorArea/auc:FloorAreaType[text()='Ventilated']) then (number(auc:FloorArea/auc:FloorAreaType[text()='Ventilated']/parent::auc:FloorArea/auc:FloorAreaValue)) else (0.0)"/>
+      <let name="conditionedAreaPercentage" value="auc:FloorAreaPercentage"/>
+      <let name="conditionedAreaValue" value="$grossArea*$conditionedAreaPercentage div 100"/>
+      <assert test="$conditionedAreaValue &gt;= $cooledOnlyArea + $heatedOnlyArea + $heatedCooledArea + $ventilatedArea">
+        Conditioned Area Percentage * Gross Area (<value-of select="$conditionedAreaValue"/>) must be greater than or equal to: Heated and Cooled (<value-of select="$heatedCooledArea"/>) + Heated only (<value-of select="$heatedOnlyArea"/>) + Cooled only (<value-of select="$cooledOnlyArea"/>) + Ventilated (<value-of select="$ventilatedArea"/>)
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that the Gross Area of the auc:Building is greater than or equal to the sum of the Gross Area from all auc:Section[auc:SectionType='Space function'] elements
+    <severity> error
+    <param> parent - an auc:Building
+-->
+  <pattern abstract="true" id="fa.buildingSectionGrossAreaChecks">
+    <rule context="$parent">
+      <let name="buildingGrossArea" value="number(auc:FloorAreas/auc:FloorArea[auc:FloorAreaType='Gross']/auc:FloorAreaValue)"/>
+      <let name="allSpaceFunctionSectionsGrossArea" value="number(sum(//auc:Section[auc:SectionType/text()='Space function']/auc:FloorAreas/auc:FloorArea[auc:FloorAreaType='Gross']/auc:FloorAreaValue))"/>
+      <assert test="$buildingGrossArea >= $allSpaceFunctionSectionsGrossArea">
+        [ERROR] auc:Building Gross Floor (<value-of select="$buildingGrossArea"/>) Area MUST BE GREATER THAN OR EQUAL TO the sum of all Gross Floor areas from elements auc:Section[auc:SectionType='Space function'] (<value-of select="$allSpaceFunctionSectionsGrossArea"/>)
+      </assert>
+      <assert test="false()">
+        [INFO] Building Gross Floor Area: <value-of select="$buildingGrossArea"/>
+      </assert>
+      <assert test="false()">
+        [INFO] Sum of all auc:Section[auc:SectionType='Space function'] Gross Floor Area: <value-of select="$allSpaceFunctionSectionsGrossArea"/>
+      </assert>
+    </rule>
+  </pattern>
+<!--  Check that either a auc:FloorAreaValue or auc:FloorAreaPercentage is specifed, but not both 
+      <severity> error
+      <param> parent - an auc:FloorArea element
+  -->
+  <pattern abstract="true" id="fa.type.valueOrPercent">
+    <rule context="$parent">
+      <let name="value" value="count(auc:FloorAreaValue)"/>
+      <let name="percent" value="count(auc:FloorAreaPercentage)"/>
+      <assert test="$value + $percent = 1">
+        [ERROR] either element 'auc:FloorAreaValue' OR 'auc:FloorAreaPercentage' MUST BE SPECIFIED for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  
+</schema>
diff --git a/bsyncviewer/testsuitelib/occupancyElements.sch b/bsyncviewer/testsuitelib/occupancyElements.sch
new file mode 100644
index 00000000..bffa8be5
--- /dev/null
+++ b/bsyncviewer/testsuitelib/occupancyElements.sch
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+  <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
+  <!--  
+    For logic that pertains to Occupancy
+-->
+  <!--  
+    Check that both the auc:TypicalOccupantUsageValue and auc:TypicalOccupantUsageUnits are specified.
+    <severity> error
+    <param> parent - an auc:TypicalOccupantUsage element
+-->
+  <pattern abstract="true" id="occ.typUsage.haveUnitsAndValue">
+    <rule context="$parent">
+      <assert test="auc:TypicalOccupantUsageUnits/text() and auc:TypicalOccupantUsageValue/text()">
+        [ERROR] elements 'auc:TypicalOccupantUsageValue' and 'auc:TypicalOccupantUsageUnits' are REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--
+    Check that, within an auc:TypicalOccupantUsages element, there is exactly one auc:TypicalOccupantUsage element
+    with the auc:TypicalOccupantUsageUnits = $typUsageUnits passed in as a parameter. 
+    <severity> error
+    <param> parent - an auc:TypicalOccupantUsages element
+    <param> typUsageUnits - one of the standard enums for auc:TypicalOccupantUsageUnits, such as 'Hours per week'
+-->
+  <pattern abstract="true" id="occ.oneOfType.typicalUsageUnits">
+    <rule context="$parent">
+      <assert test="count(auc:TypicalOccupantUsage/auc:TypicalOccupantUsageUnits[text()=$typUsageUnits]) = 1">
+        [ERROR] element 'auc:TypicalOccupantUsage' with child element 'auc:TypicalOccupantUsageUnits' having value '<value-of select="$typUsageUnits"/>' is REQUIRED EXACTLY ONCE for '<name/>'. Current number of occurrences: <value-of select="count(auc:TypicalOccupantUsage/auc:TypicalOccupantUsageUnits[text()=$typUsageUnits])"/>
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that all auc:OccupancyLevel elements have the auc:OccupantQuantityType and auc:OccupantQuantity child elements defined.
+    <severity> error
+    <param> parent - an auc:OccupancyLevel element
+-->
+  <pattern abstract="true" id="occ.levels.haveQuantityAndType">
+    <rule context="$parent">
+      <assert test="auc:OccupantQuantityType/text() and auc:OccupantQuantity/text()">
+        [ERROR] elements 'auc:OccupancyQuantityType' and 'auc:OccupantQuantity' are REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--  
+    Check that, within an auc:OccupancyLevels element, there is exactly one auc:OccupancyLevel element 
+    with the auc:OccupantQuantityType = $occLevelType passed in as a parameter
+    <severity> error
+    <param> parent - an auc:OccupancyLevels element
+    <param> occLevelType - one of the standard enum values for auc:OccupancyQuantityType, such as 'Peak total occupants'
+-->
+  <pattern abstract="true" id="occ.levels.oneOfType">
+    <rule context="$parent">
+      <assert test="count(auc:OccupancyLevel/auc:OccupantQuantityType[text()=$occLevelType]) = 1">
+        [ERROR] element 'auc:OccupancyLevel' with child element 'auc:OccupantQuantityType' having value '<value-of select="$occLevelType"/>' is REQUIRED EXACTLY ONCE for '<name/>'. Current number of occurrences: <value-of select="count(auc:OccupancyLevel/auc:OccupantQuantityType[text()=$occLevelType])"/>
+      </assert>
+    </rule>
+  </pattern>
+</schema>
diff --git a/bsyncviewer/testsuitelib/rootElements.sch b/bsyncviewer/testsuitelib/rootElements.sch
new file mode 100644
index 00000000..97361080
--- /dev/null
+++ b/bsyncviewer/testsuitelib/rootElements.sch
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+  <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
+  <!--    
+    This pattern ensures there is exactly one of every element inclusive of the Building element
+    It walks the path: BuildingSync/Facilities/Facility/Sites/Site/Buildings/Building
+    <severity> error
+  -->
+  <pattern id="root.oneOfEachUntilBuilding">
+    <rule context="/">
+      <assert test="count(auc:BuildingSync) = 1">[ERROR] element 'auc:BuildingSync' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+    <rule context="auc:BuildingSync">
+      <assert test="count(auc:Facilities) = 1">[ERROR] element 'auc:Facilities' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+    <rule context="auc:Facilities">
+      <assert test="count(auc:Facility) = 1">[ERROR] element 'auc:Facility' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+    <rule context="auc:Facility">
+      <assert test="count(auc:Sites) = 1">[ERROR] element 'auc:Sites' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+    <rule context="auc:Sites">
+      <assert test="count(auc:Site) = 1">[ERROR] element 'auc:Site' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+    <rule context="auc:Site">
+      <assert test="count(auc:Buildings) = 1">[ERROR] element 'auc:Buildings' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+    <rule context="auc:Buildings">
+      <assert test="count(auc:Building) = 1">[ERROR] element 'auc:Building' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+  </pattern>
+  <!--    
+    This pattern ensures there is exactly one of every element inclusive of the Scenario element
+    It starts at the Facility element and walks the path: Reports/Report/Scenarios/Scenario
+    <severity> error
+  -->
+  <pattern id="root.oneOfEachFacilityUntilScenario">
+    <rule context="auc:Facility">
+      <assert test="count(auc:Reports) = 1">[ERROR] element 'auc:Reports' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+    <rule context="auc:Reports">
+      <assert test="count(auc:Report) &gt;= 1">[ERROR] element 'auc:Report' is REQUIRED AT LEAST ONCE for: '<name/>'</assert>
+    </rule>
+    <rule context="auc:Report">
+      <assert test="count(auc:Scenarios) = 1">[ERROR] element 'auc:Scenarios' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+    <rule context="auc:Scenarios">
+      <assert test="count(auc:Scenario) &gt;= 1">[ERROR] element 'auc:Scenario' is REQUIRED AT LEAST ONCE for: '<name/>'</assert>
+    </rule>
+  </pattern>
+  <!--    
+    This pattern ensures there is exactly one of every element inclusive of the Contacts element
+    It starts at the Facility element and walks the path: Facility/Contacts
+    <severity> error
+  -->
+  <pattern id="root.oneOfEachFacilityUntilContacts">
+    <rule context="auc:Facility">
+      <assert test="count(auc:Contacts) = 1">[ERROR] element 'auc:Contacts' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
+    </rule>
+  </pattern>
+  <!--    
+    This pattern ensures there is at least one Report in a Facility
+    <severity> error
+  -->
+  <pattern id="root.atleastOneReportInFacility">
+    <rule context="auc:Facility">
+      <assert test="auc:Reports/auc:Report">[ERROR] element 'auc:Report' is REQUIRED AT LEAST ONCE for: '<name/>'</assert>
+    </rule>
+  </pattern>
+  <!--    
+    This pattern ensures there is at least one Scenario in a Report
+    <severity> error
+  -->
+  <pattern id="root.atleastOneScenarioInReport">
+    <rule context="auc:Report">
+      <assert test="auc:Scenarios/auc:Scenario">[ERROR] element 'auc:Scenario' is REQUIRED AT LEAST ONCE for: '<name/>'</assert>
+    </rule>
+  </pattern>
+</schema>
diff --git a/bsyncviewer/testsuitelib/scenarioElements.sch b/bsyncviewer/testsuitelib/scenarioElements.sch
new file mode 100644
index 00000000..06c9f5be
--- /dev/null
+++ b/bsyncviewer/testsuitelib/scenarioElements.sch
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
+  <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
+  <!--  
+    For logic that pertains to Scenario elements
+-->
+  <!--
+    A baseline scenario must be defined.  Within the baseline scenario, the following 
+    must be defined exactly: auc:ScenarioType/auc:PackageOfMeasures/auc:ReferenceCase IDref='Baseline'
+    TODO: Need to update BuildingSync-gem to look for following and change this function to look for:
+      auc:ScenarioType/auc:CurrentBuilding/auc:CalculationMethod/auc:Modeled
+      The thought being that there should only be ONE of these types for a building.  Any other iterations
+      based on this original should be defined as:
+        auc:ScenarioType/auc:PackageOfMeasures/auc:ReferenceCase/@IDref='above'
+-->
+  <pattern id="sc.baseline.ID">
+    <let name="baselineCount" value="count(//auc:Scenario[@ID='Baseline'])"/>
+    <rule context="auc:Scenarios">
+      <assert test="$baselineCount = 1">
+        [ERROR] element 'auc:Scenario' with attribute ID='Baseline' is REQUIRED EXACTLY ONCE for: <name/>
+      </assert>
+    </rule>
+  </pattern>
+  <pattern id="sc.baseline.asPackageOfMeasures">
+    <rule context="auc:Scenario[@ID='Baseline']">
+      <assert test="auc:ScenarioType/auc:PackageOfMeasures/auc:ReferenceCase/@IDref = 'Baseline'">
+        [ERROR] element 'auc:Scenario' with attribute ID='Baseline' MUST CONTAIN the following subelements:
+        auc:ScenarioType/auc:PackageOfMeasures/auc:ReferenceCase IDref='Baseline'
+      </assert>
+    </rule>
+  </pattern>
+</schema>
diff --git a/bsyncviewer/testsuitelib/sectionElements.sch b/bsyncviewer/testsuitelib/sectionElements.sch
new file mode 100644
index 00000000..188e1da2
--- /dev/null
+++ b/bsyncviewer/testsuitelib/sectionElements.sch
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
+  <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
+  <!--  
+    For logic that pertains to Section elements
+-->
+  <!--
+    Check the main details for the Section element as required by 211.  Although this function
+    can be run against any auc:Section element, it is typically restricted to 'Space function'
+    element types, i.e. auc:Section[auc:SectionType='Space function']
+    <severity> error
+    <param> parent - an auc:Section element.  
+-->
+  <pattern abstract="true" id="sec.mainDetails">
+    <rule context="$parent">
+      <assert test="auc:OccupancyClassification">
+        [ERROR] element 'auc:OccupancyClassification' is REQUIRED EXACTLY ONCE for: '<name/>'
+      </assert>
+      <assert test="auc:OriginalOccupancyClassification">
+        [WARNING] element 'auc:OriginalOccupancyClassification' is RECOMMENDED for: '<name/>'
+      </assert>
+    </rule>
+  </pattern>
+  <!--
+    Require that each auc:Section element is referenced to by exactly one of 
+    each of the following elements via an @IDref:
+    1. auc:Systems/auc:HVACSystems/auc:HVACSystem/auc:LinkedPremises/auc:Section/auc:LinkedSectionID
+    2. auc:System/auc:LightingSystems/auc:LightingSystem/auc:LinkedPremises/auc:Section/auc:LinkedSectionID
+    3. auc:System/auc:PlugLoads/auc:PlugLoad/auc:LinkedPremises/auc:Section/auc:LinkedSectionID
+    <param> parent - an auc:Section element
+    TODO: Change to work with XPath 1.0
+-->
+  <pattern abstract="true" id="sec.primarySystems">
+    <rule context="$parent" role="error">
+      <let name="sectionId" value="@ID"/>
+      <let name="systemsElements" value="ancestor::auc:Facility/auc:Systems"/>
+      <let name="hvacSystems" value="$systemsElements/auc:HVACSystems/auc:HVACSystem"/>
+      <let name="hvacIDrefs" value="$hvacSystems//auc:LinkedSectionID/@IDref"/>
+      <!--      <let name="idFromIdref" value="idref(@ID)"/>
+      <let name="count" value="count(data($hvacIDrefs) = data($sectionId))"/>-->
+      <let name="count2" value="count( $hvacIDrefs = $sectionId)"/>
+      <assert test="false()"><name/> has id: <value-of select="$sectionId"/>
+      </assert>
+      <assert test="false()">
+        HVAC IDRefs: <value-of select="$hvacIDrefs"/>
+      </assert>
+      <!--      <assert test="false()">
+        count: <value-of select="$count"/>.  count2: <value-of select="$count2"/>
+      </assert>-->
+      <!--      <assert test="false()">
+        idFromIdref: <value-of select="$idFromIdref"/>
+      </assert>-->
+    </rule>
+  </pattern>
+</schema>
diff --git a/bsyncviewer/testsuitelib/siteBuildingElements.sch b/bsyncviewer/testsuitelib/siteBuildingElements.sch
new file mode 100644
index 00000000..7473ea3f
--- /dev/null
+++ b/bsyncviewer/testsuitelib/siteBuildingElements.sch
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+  <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
+  <!--  
+    For logic that pertains to either a Site OR a Building element.  
+-->
+  <!--  
+    This pattern checks that: atleast 1 city and 1 state OR 
+    1 climate zone are specified at the site OR building level.
+    A warning is issued if more than one of each element is specified.
+    <severity> error
+    <param> parent - an auc:Site
+  -->
+  <pattern abstract="true" id="sbe.cityStateOrClimateZone">
+    <rule context="$parent">
+      <let name="siteCityCount" value="count(auc:Address/auc:City)"/>
+      <let name="siteStateCount" value="count(auc:Address/auc:State)"/>
+      <let name="siteClimateZoneCount" value="count(auc:ClimateZoneType//auc:ClimateZone)"/>
+      <let name="allCityCount" value="count(.//auc:Address/auc:City)"/>
+      <let name="allStateCount" value="count(.//auc:Address/auc:State)"/>
+      <let name="allClimateZoneCount" value="count(.//auc:ClimateZoneType//auc:ClimateZone)"/>
+      <assert test="($allCityCount = 1 and $allStateCount = 1 and $allClimateZoneCount &lt;= 1) or ($allCityCount &lt;= 1 and $allStateCount &lt;= 1 and $allClimateZoneCount = 1)">
+        [WARNING] elements 'auc:City' and 'auc:State' or element 'auc:ClimateZoneType//auc:ClimateZone' are RECOMMENDED EXACTLY ONCE at either the 'auc:Site' or 'auc:Building' level.
+      </assert>
+      <assert test="false()">
+        [INFO] Number of 'auc:City' elements defined at the 'auc:Site' = <value-of select="$siteCityCount"/>, 'auc:Building' = <value-of select="$allCityCount - $siteCityCount"/>
+      </assert>
+      <assert test="false()">
+        [INFO] Number of 'auc:State' elements defined at the 'auc:Site' = <value-of select="$siteStateCount"/>, 'auc:Building' = <value-of select="$allStateCount - $siteStateCount"/>
+      </assert>
+      <assert test="false()">
+        [INFO] Number of 'auc:ClimateZoneType//auc:ClimateZone' elements defined at the 'auc:Site' = <value-of select="$siteClimateZoneCount"/>, 'auc:Building' = <value-of select="$allClimateZoneCount - $siteClimateZoneCount"/>
+      </assert>
+    </rule>
+  </pattern>
+</schema>

From 6f82d8df47d2b3593ce68488e609a451f7bdb663 Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Tue, 24 Mar 2020 16:27:50 -0600
Subject: [PATCH 06/14] reverting separate volume for testsuite and modifying
 install of schematron-nokogiri gem

---
 Dockerfile               | 13 +++++--------
 README.md                |  2 +-
 docker-compose.local.yml |  3 ---
 docker-compose.yml       |  3 ---
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b8980dd8..7ce3c675 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,8 +43,11 @@ WORKDIR /srv/selection-tool
 COPY /requirements.txt /srv/selection-tool/requirements.txt
 RUN pip install -r requirements.txt
 
-#install the schematron-nokogiri gem
-RUN gem install schematron-nokogiri
+#install the schematron-nokogiri gem from BuildingSync org
+git clone https://github.com/BuildingSync/schematron
+RUN cd schematron
+RUN gem build schematron-nokogiri.gemspec
+RUN gem install schematron-nokogiri-0.0.3.gem
 
 ### Copy over the remaining part of the application and some helpers
 COPY . /srv/selection-tool/
@@ -52,12 +55,6 @@ COPY . /srv/selection-tool/
 ### Copy the wait-for-it command to /usr/local
 COPY /docker/wait-for-it.sh /usr/local/wait-for-it.sh
 
-### Copy the GitHub TestSuite repo into the testsuite volume
-WORKDIR /srv/selection-tool/bsyncviewer/lib/testsuite
-RUN cd /srv/selection-tool/bsyncviewer/lib/testsuite
-RUN git clone https://github.com/BuildingSync/TestSuite.git .
-
-
 # nginx configurations - alpine doesn't use the sites-available directory. Put the selection tool
 # configuration file into the /etc/nginx/conf.d/ folder.
 COPY /docker/nginx.conf /etc/nginx/conf.d/selection_tool.conf
diff --git a/README.md b/README.md
index f5facaf8..40433e45 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ This is the repository for the BuildingSync Validator web application.
     git clone https://github.com/BuildingSync/schematron.git
     cd schematron
     gem build schematron-nokogiri.gemspec
-    gem install schematron-nokogiri-0.0.3
+    gem install schematron-nokogiri-0.0.3.gem
 
     ```
 
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index 019a3d17..17cf90cb 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -42,7 +42,6 @@ services:
       - "80:80"
     volumes:
       - selectiontool_mediadata:/srv/selection-tool/bsyncviewer/media
-      - selectiontool_testsuite:/srv/selection-tool/bsyncviewer/lib/testsuite
     deploy:
       restart_policy:
         condition: on-failure
@@ -54,5 +53,3 @@ volumes:
     external: true
   selectiontool_mediadata:
     external: true
-  selectiontool_testsuite:
-    external: true
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b25c2b1..e9b41663 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,11 +28,8 @@ services:
       - "8080:80"
     volumes:
       - selectiontool_mediadata:/srv/selection-tool/bsyncviewer/media
-      - selectiontool_testsuite:/srv/selection-tool/bsyncviewer/lib/testsuite
 volumes:
   selectiontool_pgdata:
     external: true
   selectiontool_mediadata:
     external: true
-  selectiontool_testsuite:
-    external: true

From 9288581f0021d6a28091138475ad55782d874e1d Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Tue, 24 Mar 2020 20:55:15 -0600
Subject: [PATCH 07/14] dockerfile changes

---
 Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7ce3c675..20467366 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,11 +44,14 @@ COPY /requirements.txt /srv/selection-tool/requirements.txt
 RUN pip install -r requirements.txt
 
 #install the schematron-nokogiri gem from BuildingSync org
-git clone https://github.com/BuildingSync/schematron
-RUN cd schematron
+WORKDIR /srv
+RUN git clone https://github.com/BuildingSync/schematron
+WORKDIR /srv/schematron
+
 RUN gem build schematron-nokogiri.gemspec
 RUN gem install schematron-nokogiri-0.0.3.gem
 
+WORKDIR /srv/selection-tool
 ### Copy over the remaining part of the application and some helpers
 COPY . /srv/selection-tool/
 

From 36ecd410354091a96961ec08fde73a15055f5c3c Mon Sep 17 00:00:00 2001
From: Nicholas Long <nicholas.long@nrel.gov>
Date: Thu, 26 Mar 2020 07:57:11 -0600
Subject: [PATCH 08/14] precommit, changelog, version

---
 .pre-commit-config.yaml    | 29 +++++++++++++++++++++++++++++
 CHANGELOG.md               | 12 ++++++++++++
 app_version.txt            |  2 +-
 docker/start_server.sh     |  2 +-
 docs/scripts/change_log.py |  0
 5 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 .pre-commit-config.yaml
 mode change 100644 => 100755 docs/scripts/change_log.py

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..8c111ba7
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,29 @@
+exclude: |
+  (?x)(
+    ^docs/conf.py|
+    ^modelica_builder/modelica_parser/
+  )
+
+repos:
+- repo: git://github.com/pre-commit/pre-commit-hooks
+  rev: v2.2.3
+  hooks:
+  - id: trailing-whitespace
+  - id: check-added-large-files
+  - id: check-ast
+  - id: check-json
+  - id: check-merge-conflict
+  - id: check-xml
+  - id: check-yaml
+  - id: debug-statements
+  - id: end-of-file-fixer
+#  - id: requirements-txt-fixer
+  - id: mixed-line-ending
+  - id: flake8
+    args: ['--max-line-length=140']  # default of Black
+
+- repo: https://github.com/pre-commit/mirrors-isort
+  rev: v4.3.4
+  hooks:
+  - id: isort
+    args: ['-m 3']  # vertical hanging
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82de9a1f..b065f410 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # BuildingSync Use Case Selection Tool
 
+## Version 1.1.1 (Unreleased)
+
+General updates:
+
+* Adding L000 OpenStudio Simulation use case and example files
+* Dockerize TestSuite repository
+
+Date Range: 12/21/20 - 03/26/20
+
+Closed Issues and Features:
+
+
 ## Version 1.1.0
 
 Date Range: 11/19/19 - 12/20/19
diff --git a/app_version.txt b/app_version.txt
index 1cc5f657..8cfbc905 100644
--- a/app_version.txt
+++ b/app_version.txt
@@ -1 +1 @@
-1.1.0
\ No newline at end of file
+1.1.1
\ No newline at end of file
diff --git a/docker/start_server.sh b/docker/start_server.sh
index bf330791..dfef5191 100755
--- a/docker/start_server.sh
+++ b/docker/start_server.sh
@@ -9,7 +9,7 @@ echo "Waiting for postgres to start"
 ./manage.py migrate
 ./manage.py collectstatic --noinput
 
-# Check if a schema has been imports
+# Check if a schema has been imported
 ./manage.py reset_schema --schema_version 1.0.0
 ./manage.py bedes --schema_version=1.0.0 --bedes_version=v2.2 --save_to_db
 
diff --git a/docs/scripts/change_log.py b/docs/scripts/change_log.py
old mode 100644
new mode 100755

From cef951617ced237b0be86a1cb7888695e0810a7d Mon Sep 17 00:00:00 2001
From: Nicholas Long <nicholas.long@nrel.gov>
Date: Thu, 26 Mar 2020 08:01:53 -0600
Subject: [PATCH 09/14] precommit info

---
 .pre-commit-config.yaml |  6 ------
 README.md               | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8c111ba7..da40f5d5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,9 +1,3 @@
-exclude: |
-  (?x)(
-    ^docs/conf.py|
-    ^modelica_builder/modelica_parser/
-  )
-
 repos:
 - repo: git://github.com/pre-commit/pre-commit-hooks
   rev: v2.2.3
diff --git a/README.md b/README.md
index 40433e45..35c171c5 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,20 @@ This is the repository for the BuildingSync Validator web application.
 	python manage.py reset_schema --schema_version=1.0.0
 	```
 
+### Precommit
+
+This project used `pre-commit <https://pre-commit.com/>`_ to ensure code consistency. To enable pre-commit, run the following from the command line.
+
+```bash
+pip install pre-commit
+pre-commit install
+```
+
+To run pre-commit against the files without calling git commit, then run the following. This is useful when cleaning up the repo before committing.
+
+```bash
+pre-commit run --all-files
+```    
 
 ### Testing
 

From 2ea75057de3d89c557ae9ac5c62ef3a628a5e135 Mon Sep 17 00:00:00 2001
From: Nicholas Long <nicholas.long@nrel.gov>
Date: Thu, 26 Mar 2020 08:05:22 -0600
Subject: [PATCH 10/14] code cleanup

---
 .gitignore                                    |  1 -
 README.md                                     | 14 ++--
 app_version.txt                               |  2 +-
 bsyncviewer/admin.py                          |  2 +-
 bsyncviewer/forms.py                          |  1 +
 bsyncviewer/lib/bedes/bedes_parser.py         |  3 +-
 .../v2.2/bedes_online_dictionary_uuid-lo.xml  | 12 ++--
 bsyncviewer/lib/bedes/v2.2/bedes_v2.2.json    |  2 +-
 .../BuildingSync_v1.0.0.xsd                   |  2 +-
 bsyncviewer/lib/schema_parser.py              |  5 +-
 .../bricr_use_case_ashrae_v1.0.0.csv          |  2 +-
 .../lib/use_cases/bricr_use_case_v1.0.0.csv   |  2 +-
 .../lib/use_cases/ll87_usecase_schematron.sch |  2 +-
 .../Example \342\200\223 A Valid Schema.xml"  |  2 +-
 .../Example \342\200\223 Invalid Schema.xml"  |  4 +-
 ...\200\223 Valid Schema Invalid UseCase.xml" |  2 +-
 .../Example \342\200\223 A Valid Schema.xml"  |  2 +-
 .../Example \342\200\223 Invalid Schema.xml"  |  4 +-
 .../Example \342\200\223 A Valid Schema.xml"  |  2 +-
 .../Example \342\200\223 Invalid Schema.xml"  |  4 +-
 .../Example \342\200\223 A Valid Schema.xml"  |  2 +-
 .../Example \342\200\223 Invalid Schema.xml"  |  4 +-
 bsyncviewer/lib/validator/workflow.py         |  5 +-
 bsyncviewer/management/commands/bedes.py      | 15 ++--
 .../management/commands/create_use_case.py    |  5 +-
 .../management/commands/reset_schema.py       |  4 +-
 bsyncviewer/migrations/0001_initial.py        |  4 +-
 .../migrations/0002_auto_20190501_2038.py     |  2 +-
 .../migrations/0005_auto_20190501_2111.py     |  2 +-
 bsyncviewer/models/enumeration.py             |  3 +-
 bsyncviewer/models/schema.py                  |  5 +-
 bsyncviewer/models/use_case.py                |  4 +-
 bsyncviewer/static/images/arrow.svg           | 69 +++++++++----------
 bsyncviewer/static/images/bars.svg            | 69 +++++++++----------
 bsyncviewer/static/images/close.svg           | 69 +++++++++----------
 bsyncviewer/static/style.css                  |  6 +-
 bsyncviewer/templates/base.html               |  2 -
 bsyncviewer/templates/dictionary.html         |  4 +-
 bsyncviewer/templates/email.html              |  2 +-
 bsyncviewer/templates/use_case_mappings.html  |  4 +-
 bsyncviewer/templates/use_cases.html          | 10 +--
 bsyncviewer/templates/validator_results.html  |  6 +-
 bsyncviewer/tests/test_api.py                 |  3 +-
 bsyncviewer/tests/test_command.py             |  7 +-
 bsyncviewer/tests/test_schema.py              |  5 +-
 bsyncviewer/tests/test_use_case.py            |  5 +-
 bsyncviewer/tests/test_validator.py           |  7 +-
 bsyncviewer/tests/test_views.py               | 16 +++--
 bsyncviewer/testsuitelib/contactElements.sch  |  8 +--
 bsyncviewer/testsuitelib/energyElements.sch   |  2 +-
 bsyncviewer/testsuitelib/floorElements.sch    | 26 +++----
 .../testsuitelib/occupancyElements.sch        | 12 ++--
 bsyncviewer/testsuitelib/rootElements.sch     | 10 +--
 bsyncviewer/testsuitelib/scenarioElements.sch |  4 +-
 bsyncviewer/testsuitelib/sectionElements.sch  |  6 +-
 .../testsuitelib/siteBuildingElements.sch     |  8 +--
 bsyncviewer/urls.py                           |  6 +-
 bsyncviewer/views.py                          | 33 +++++----
 docker/README.md                              |  4 +-
 docs/release_instructions.md                  |  1 -
 requirements.txt                              |  1 -
 61 files changed, 261 insertions(+), 269 deletions(-)

diff --git a/.gitignore b/.gitignore
index 80b7036d..353fec21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,4 +98,3 @@ bsyncviewer/lib/bedes/v2.2/schema0.0.1/
 bsyncviewer/lib/bedes/*/schema*/bedes-mappings-enumerations.csv
 bsyncviewer/lib/bedes/*/schema*/bedes-mappings-terms.csv
 bsyncviewer/lib/bedes/*/schema*/bsync_unique_words.csv
-
diff --git a/README.md b/README.md
index 35c171c5..bca88618 100644
--- a/README.md
+++ b/README.md
@@ -2,17 +2,17 @@
 
 [![Build Status](https://travis-ci.org/BuildingSync/selection-tool.svg?branch=develop)](https://travis-ci.org/BuildingSync/selection-tool)
 
-This is the repository for the BuildingSync Validator web application. 
+This is the repository for the BuildingSync Validator web application.
 
 ## Installation
 
 1. Clone the repository.
 1. Setup python 3.  You can use a virtual environment:
     ```bash
-    pyenv install 3.6.5 
+    pyenv install 3.6.5
     pyenv virtualenv 3.6.5 bsync-validator-3.6.5
     pyenv local bsync-validator-3.6.3
-    ```   
+    ```
 1. Install PostgreSQL server for local development (if desired)
 	* Once installed, create your local database and user:
 		```bash
@@ -75,7 +75,7 @@ To run pre-commit against the files without calling git commit, then run the fol
 
 ```bash
 pre-commit run --all-files
-```    
+```
 
 ### Testing
 
@@ -114,7 +114,7 @@ To modify an existing schema, click on the edit link.  If changes are made to th
 Authenticated users can add private use cases to the BuildingSync Schema Viewer.  Use cases are represented by a schematron file that defines a set of rules and patterns.
 
 To add a use case, click on the 'Use Case' link in the top navigation bar, then click on the '+ New Use Case' button.
-Select a name and a BuildingSync schema version.  Select your use case definitions schematron file and upload, then click 'Submit'.  
+Select a name and a BuildingSync schema version.  Select your use case definitions schematron file and upload, then click 'Submit'.
 
 Once ready, contact a BuildingSync admin to make the use case public. Public use cases will be available on the 'Validator' page to validate XML files submitted by users.
 
@@ -201,7 +201,7 @@ Follow these steps to add a new schema version to the selection tool:
 1. Add the schema file in the admin interface.  Must have admin privileges.  The schema will get automatically parsed.
 1. Convert existing use cases schematron files to the new schema.  Add the new use cases.
 1. When the use cases have been reviewed, make them public in the admin interface.
-1. Create XML example files and place them in the `lib/validator/examples/schema<VERSION>` directory. 
+1. Create XML example files and place them in the `lib/validator/examples/schema<VERSION>` directory.
 1. Test the validator with the new XML example files.
 1. Reparse bedes terms to map them to the new schema following the steps in the BEDES section above.
 
@@ -235,5 +235,5 @@ Follow these steps to add new example tables from the TestSuite repo
     1. Upload the file that was modified in the previous step
     1. Save
 1. Make the use case public from the selection-tool admin interface.
-1. If you have any example files to add to the selection-tool (for example, for the L000 OpenStudio Simulation use case, there are [2 examples files](https://github.com/BuildingSync/TestSuite/tree/L100_Schematron/spec/use_cases/schema2.0.0/examples)), add them in the appropriate schema directory in ```bsyncviewer/lib/validator/examples```. Regenerate the ```example_files.zip``` archive.  This will make the files available as examples at the ```/validator``` URL.  
+1. If you have any example files to add to the selection-tool (for example, for the L000 OpenStudio Simulation use case, there are [2 examples files](https://github.com/BuildingSync/TestSuite/tree/L100_Schematron/spec/use_cases/schema2.0.0/examples)), add them in the appropriate schema directory in ```bsyncviewer/lib/validator/examples```. Regenerate the ```example_files.zip``` archive.  This will make the files available as examples at the ```/validator``` URL.
 1. You can now validate XMLs against the new use case.
diff --git a/app_version.txt b/app_version.txt
index 8cfbc905..524cb552 100644
--- a/app_version.txt
+++ b/app_version.txt
@@ -1 +1 @@
-1.1.1
\ No newline at end of file
+1.1.1
diff --git a/bsyncviewer/admin.py b/bsyncviewer/admin.py
index 76bfd960..fd3c1be3 100644
--- a/bsyncviewer/admin.py
+++ b/bsyncviewer/admin.py
@@ -1,9 +1,9 @@
 import semantic_version
+from django import forms
 from django.contrib import admin
 from django.contrib.admin import AdminSite
 from django.contrib.auth.admin import GroupAdmin, UserAdmin
 from django.contrib.auth.models import Group, User
-from django import forms
 
 from .models.attribute import Attribute
 from .models.schema import Schema
diff --git a/bsyncviewer/forms.py b/bsyncviewer/forms.py
index ebfff46f..c1d5aff2 100644
--- a/bsyncviewer/forms.py
+++ b/bsyncviewer/forms.py
@@ -4,6 +4,7 @@
 from django.conf import settings
 
 from .models.schema import Schema
+
 DEFAULT_SCHEMA_VERSION = settings.DEFAULT_SCHEMA_VERSION
 
 
diff --git a/bsyncviewer/lib/bedes/bedes_parser.py b/bsyncviewer/lib/bedes/bedes_parser.py
index 3c36c5cd..02e52832 100644
--- a/bsyncviewer/lib/bedes/bedes_parser.py
+++ b/bsyncviewer/lib/bedes/bedes_parser.py
@@ -1,10 +1,9 @@
 import json
 import os
-from collections import defaultdict, OrderedDict, Mapping
+from collections import Mapping, OrderedDict, defaultdict
 
 import xmltodict
 
-
 # BEDES have a very simple two level hierarchy. The first level is the category and the
 # second category is the Term. The data are stored in this format, but it is important
 # to note that the Term is globally unique.
diff --git a/bsyncviewer/lib/bedes/v2.2/bedes_online_dictionary_uuid-lo.xml b/bsyncviewer/lib/bedes/v2.2/bedes_online_dictionary_uuid-lo.xml
index bebdb34f..bc2f4277 100644
--- a/bsyncviewer/lib/bedes/v2.2/bedes_online_dictionary_uuid-lo.xml
+++ b/bsyncviewer/lib/bedes/v2.2/bedes_online_dictionary_uuid-lo.xml
@@ -36246,8 +36246,8 @@ environment.</List-Option-Definition>
     <Content-UUID>b6fca2b4-5856-452a-9198-1a0455dd73f0</Content-UUID>
     <URL>https://bedes.lbl.gov/node/b6fca2b4-5856-452a-9198-1a0455dd73f0</URL>
     <List-Option>WELL Educational Facilities (Pilot)</List-Option>
-    <List-Option-Definition>Educational Facilities applies to projects where dedicated staff are employed for instructional purposes, and students may be of any age.
-Courses may cover any range of topics, and facilities may be typified by fully scheduled days, or distinct classes that students enroll in at will.
+    <List-Option-Definition>Educational Facilities applies to projects where dedicated staff are employed for instructional purposes, and students may be of any age.
+Courses may cover any range of topics, and facilities may be typified by fully scheduled days, or distinct classes that students enroll in at will.
 The education pilot standard is applicable to early education, K-12, and adult education (college, university, or other).</List-Option-Definition>
     <Unit-of-Measure>N/A</Unit-of-Measure>
     <Related-Term>Assessment Recognition</Related-Term>
@@ -36260,8 +36260,8 @@ The education pilot standard is applicable to early education, K-12, and adult e
     <Content-UUID>51c3b1c9-2ffd-4b1a-84b8-bd86d675a4dc</Content-UUID>
     <URL>https://bedes.lbl.gov/node/51c3b1c9-2ffd-4b1a-84b8-bd86d675a4dc</URL>
     <List-Option>WELL Multifamily Residential (Pilot)</List-Option>
-    <List-Option-Definition>Multifamily Residential applies specifically to projects with at least five dwelling units in a single building with common structural elements.
-Projects that qualify include apartments, condominiums, townhouses, and other residential complexes within all market thresholds -
+    <List-Option-Definition>Multifamily Residential applies specifically to projects with at least five dwelling units in a single building with common structural elements.
+Projects that qualify include apartments, condominiums, townhouses, and other residential complexes within all market thresholds -
 affordable housing, market-rate, and luxury.</List-Option-Definition>
     <Unit-of-Measure>N/A</Unit-of-Measure>
     <Related-Term>Assessment Recognition</Related-Term>
@@ -36322,8 +36322,8 @@ affordable housing, market-rate, and luxury.</List-Option-Definition>
     <Content-UUID>a3b99610-6784-432f-b07e-65385daf0f16</Content-UUID>
     <URL>https://bedes.lbl.gov/node/a3b99610-6784-432f-b07e-65385daf0f16</URL>
     <List-Option>WELL Retail (Pilot)</List-Option>
-    <List-Option-Definition>Retail applies to locations where consumers can view and purchase merchandise onsite, and staff are employed to assist in the sale of
-products. The Retail pilot standard is applicable to both owner- and tenant-occupied projects, and to both those in stand-alone retail
+    <List-Option-Definition>Retail applies to locations where consumers can view and purchase merchandise onsite, and staff are employed to assist in the sale of
+products. The Retail pilot standard is applicable to both owner- and tenant-occupied projects, and to both those in stand-alone retail
 buildings and/ or those integrated into larger structures.</List-Option-Definition>
     <Unit-of-Measure>N/A</Unit-of-Measure>
     <Related-Term>Assessment Recognition</Related-Term>
diff --git a/bsyncviewer/lib/bedes/v2.2/bedes_v2.2.json b/bsyncviewer/lib/bedes/v2.2/bedes_v2.2.json
index 8fadda81..f333a8c7 100644
--- a/bsyncviewer/lib/bedes/v2.2/bedes_v2.2.json
+++ b/bsyncviewer/lib/bedes/v2.2/bedes_v2.2.json
@@ -46155,4 +46155,4 @@
       "list_options": []
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/bsyncviewer/lib/buildingsync_schemas/BuildingSync_v1.0.0.xsd b/bsyncviewer/lib/buildingsync_schemas/BuildingSync_v1.0.0.xsd
index 31b86cd7..3c1d2dbe 100644
--- a/bsyncviewer/lib/buildingsync_schemas/BuildingSync_v1.0.0.xsd
+++ b/bsyncviewer/lib/buildingsync_schemas/BuildingSync_v1.0.0.xsd
@@ -15888,4 +15888,4 @@ Window spacing: the dimension between windows in a discrete window layout. (in.)
       </xs:element>
     </xs:sequence>
   </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/bsyncviewer/lib/schema_parser.py b/bsyncviewer/lib/schema_parser.py
index c88c632e..88bdc7ae 100644
--- a/bsyncviewer/lib/schema_parser.py
+++ b/bsyncviewer/lib/schema_parser.py
@@ -1,8 +1,9 @@
 import xmlschema
-
 from bsyncviewer.models.attribute import Attribute
+from bsyncviewer.models.attribute_enumeration_class import (
+    AttributeEnumerationClass
+)
 from bsyncviewer.models.enumeration import Enumeration, EnumerationClass
-from bsyncviewer.models.attribute_enumeration_class import AttributeEnumerationClass
 from django.db import transaction
 
 
diff --git a/bsyncviewer/lib/use_cases/bricr_use_case_ashrae_v1.0.0.csv b/bsyncviewer/lib/use_cases/bricr_use_case_ashrae_v1.0.0.csv
index 9db9f974..dc9b79e4 100644
--- a/bsyncviewer/lib/use_cases/bricr_use_case_ashrae_v1.0.0.csv
+++ b/bsyncviewer/lib/use_cases/bricr_use_case_ashrae_v1.0.0.csv
@@ -3521,4 +3521,4 @@ BuildingSync.Facilities.Facility.Tenants.Tenant.UserDefinedFields.UserDefinedFie
 BuildingSync.Facilities.Facility.UserDefinedFields,,,,,
 BuildingSync.Facilities.Facility.UserDefinedFields.UserDefinedField,,,,,
 BuildingSync.Facilities.Facility.UserDefinedFields.UserDefinedField.FieldName,,,,,
-BuildingSync.Facilities.Facility.UserDefinedFields.UserDefinedField.FieldValue,,,,,
\ No newline at end of file
+BuildingSync.Facilities.Facility.UserDefinedFields.UserDefinedField.FieldValue,,,,,
diff --git a/bsyncviewer/lib/use_cases/bricr_use_case_v1.0.0.csv b/bsyncviewer/lib/use_cases/bricr_use_case_v1.0.0.csv
index 38cab595..983c01e9 100644
--- a/bsyncviewer/lib/use_cases/bricr_use_case_v1.0.0.csv
+++ b/bsyncviewer/lib/use_cases/bricr_use_case_v1.0.0.csv
@@ -3521,4 +3521,4 @@ BuildingSync.Facilities.Facility.Tenants.Tenant.UserDefinedFields.UserDefinedFie
 BuildingSync.Facilities.Facility.UserDefinedFields,,,,,
 BuildingSync.Facilities.Facility.UserDefinedFields.UserDefinedField,,,,,
 BuildingSync.Facilities.Facility.UserDefinedFields.UserDefinedField.FieldName,,,,,
-BuildingSync.Facilities.Facility.UserDefinedFields.UserDefinedField.FieldValue,,,,,
\ No newline at end of file
+BuildingSync.Facilities.Facility.UserDefinedFields.UserDefinedField.FieldValue,,,,,
diff --git a/bsyncviewer/lib/use_cases/ll87_usecase_schematron.sch b/bsyncviewer/lib/use_cases/ll87_usecase_schematron.sch
index 6c2e55f4..07b80e0e 100644
--- a/bsyncviewer/lib/use_cases/ll87_usecase_schematron.sch
+++ b/bsyncviewer/lib/use_cases/ll87_usecase_schematron.sch
@@ -6970,4 +6970,4 @@
       <sch:assert test="(number(text()) = text()) and (number() &gt;= 0)">text "<sch:value-of select="text()"/>": element "text()" MUST be a number and MUST be greater than or equal to 0</sch:assert>
     </sch:rule>
   </sch:pattern>
-</sch:schema>
\ No newline at end of file
+</sch:schema>
diff --git "a/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 A Valid Schema.xml" "b/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 A Valid Schema.xml"
index ba9d9727..a9c4ceb6 100644
--- "a/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 A Valid Schema.xml"	
+++ "b/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 A Valid Schema.xml"	
@@ -1623,4 +1623,4 @@
 			</auc:Report>
 		</auc:Facility>
 	</auc:Facilities>
-</auc:BuildingSync>
\ No newline at end of file
+</auc:BuildingSync>
diff --git "a/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 Invalid Schema.xml" "b/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 Invalid Schema.xml"
index 564256f7..370d44de 100644
--- "a/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 Invalid Schema.xml"	
+++ "b/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 Invalid Schema.xml"	
@@ -771,7 +771,7 @@
         <auc:ContactEmailAddress>bob.auditor@test.com</auc:ContactEmailAddress>
       </auc:ContactEmailAddresses>
     </auc:Contact>
-  </auc:Contacts>  
+  </auc:Contacts>
   <auc:UserDefinedFields>
     <auc:UserDefinedField>
       <auc:FieldName>BIN</auc:FieldName>
@@ -802,4 +802,4 @@
       <auc:FieldValue>1234</auc:FieldValue>
     </auc:UserDefinedField>
   </auc:UserDefinedFields>
-</auc:BuildingSync>
\ No newline at end of file
+</auc:BuildingSync>
diff --git "a/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 Valid Schema Invalid UseCase.xml" "b/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 Valid Schema Invalid UseCase.xml"
index d9084879..36cab897 100644
--- "a/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 Valid Schema Invalid UseCase.xml"	
+++ "b/bsyncviewer/lib/validator/examples/schema1.0.0/Example \342\200\223 Valid Schema Invalid UseCase.xml"	
@@ -948,4 +948,4 @@
       </auc:UserDefinedField>
     </auc:UserDefinedFields>
   </auc:Audit>
-</auc:Audits>
\ No newline at end of file
+</auc:Audits>
diff --git "a/bsyncviewer/lib/validator/examples/schema2.0.0-pr1/Example \342\200\223 A Valid Schema.xml" "b/bsyncviewer/lib/validator/examples/schema2.0.0-pr1/Example \342\200\223 A Valid Schema.xml"
index 2ecf4f7b..68bf4227 100644
--- "a/bsyncviewer/lib/validator/examples/schema2.0.0-pr1/Example \342\200\223 A Valid Schema.xml"	
+++ "b/bsyncviewer/lib/validator/examples/schema2.0.0-pr1/Example \342\200\223 A Valid Schema.xml"	
@@ -164,7 +164,7 @@
 						</auc:Scenario>
 					</auc:Scenarios>
 				</auc:Report>
-			</auc:Reports>	
+			</auc:Reports>
 		</auc:Facility>
 	</auc:Facilities>
 </auc:BuildingSync>
diff --git "a/bsyncviewer/lib/validator/examples/schema2.0.0-pr1/Example \342\200\223 Invalid Schema.xml" "b/bsyncviewer/lib/validator/examples/schema2.0.0-pr1/Example \342\200\223 Invalid Schema.xml"
index e68ae381..370d44de 100644
--- "a/bsyncviewer/lib/validator/examples/schema2.0.0-pr1/Example \342\200\223 Invalid Schema.xml"	
+++ "b/bsyncviewer/lib/validator/examples/schema2.0.0-pr1/Example \342\200\223 Invalid Schema.xml"	
@@ -771,7 +771,7 @@
         <auc:ContactEmailAddress>bob.auditor@test.com</auc:ContactEmailAddress>
       </auc:ContactEmailAddresses>
     </auc:Contact>
-  </auc:Contacts>  
+  </auc:Contacts>
   <auc:UserDefinedFields>
     <auc:UserDefinedField>
       <auc:FieldName>BIN</auc:FieldName>
@@ -802,4 +802,4 @@
       <auc:FieldValue>1234</auc:FieldValue>
     </auc:UserDefinedField>
   </auc:UserDefinedFields>
-</auc:BuildingSync>  
\ No newline at end of file
+</auc:BuildingSync>
diff --git "a/bsyncviewer/lib/validator/examples/schema2.0.0-pr2/Example \342\200\223 A Valid Schema.xml" "b/bsyncviewer/lib/validator/examples/schema2.0.0-pr2/Example \342\200\223 A Valid Schema.xml"
index 3e88822d..22481d8e 100644
--- "a/bsyncviewer/lib/validator/examples/schema2.0.0-pr2/Example \342\200\223 A Valid Schema.xml"	
+++ "b/bsyncviewer/lib/validator/examples/schema2.0.0-pr2/Example \342\200\223 A Valid Schema.xml"	
@@ -162,7 +162,7 @@
 						</auc:Scenario>
 					</auc:Scenarios>
 				</auc:Report>
-			</auc:Reports>	
+			</auc:Reports>
 		</auc:Facility>
 	</auc:Facilities>
 </auc:BuildingSync>
diff --git "a/bsyncviewer/lib/validator/examples/schema2.0.0-pr2/Example \342\200\223 Invalid Schema.xml" "b/bsyncviewer/lib/validator/examples/schema2.0.0-pr2/Example \342\200\223 Invalid Schema.xml"
index e68ae381..370d44de 100644
--- "a/bsyncviewer/lib/validator/examples/schema2.0.0-pr2/Example \342\200\223 Invalid Schema.xml"	
+++ "b/bsyncviewer/lib/validator/examples/schema2.0.0-pr2/Example \342\200\223 Invalid Schema.xml"	
@@ -771,7 +771,7 @@
         <auc:ContactEmailAddress>bob.auditor@test.com</auc:ContactEmailAddress>
       </auc:ContactEmailAddresses>
     </auc:Contact>
-  </auc:Contacts>  
+  </auc:Contacts>
   <auc:UserDefinedFields>
     <auc:UserDefinedField>
       <auc:FieldName>BIN</auc:FieldName>
@@ -802,4 +802,4 @@
       <auc:FieldValue>1234</auc:FieldValue>
     </auc:UserDefinedField>
   </auc:UserDefinedFields>
-</auc:BuildingSync>  
\ No newline at end of file
+</auc:BuildingSync>
diff --git "a/bsyncviewer/lib/validator/examples/schema2.0.0/Example \342\200\223 A Valid Schema.xml" "b/bsyncviewer/lib/validator/examples/schema2.0.0/Example \342\200\223 A Valid Schema.xml"
index 2ecf4f7b..68bf4227 100644
--- "a/bsyncviewer/lib/validator/examples/schema2.0.0/Example \342\200\223 A Valid Schema.xml"	
+++ "b/bsyncviewer/lib/validator/examples/schema2.0.0/Example \342\200\223 A Valid Schema.xml"	
@@ -164,7 +164,7 @@
 						</auc:Scenario>
 					</auc:Scenarios>
 				</auc:Report>
-			</auc:Reports>	
+			</auc:Reports>
 		</auc:Facility>
 	</auc:Facilities>
 </auc:BuildingSync>
diff --git "a/bsyncviewer/lib/validator/examples/schema2.0.0/Example \342\200\223 Invalid Schema.xml" "b/bsyncviewer/lib/validator/examples/schema2.0.0/Example \342\200\223 Invalid Schema.xml"
index e68ae381..370d44de 100644
--- "a/bsyncviewer/lib/validator/examples/schema2.0.0/Example \342\200\223 Invalid Schema.xml"	
+++ "b/bsyncviewer/lib/validator/examples/schema2.0.0/Example \342\200\223 Invalid Schema.xml"	
@@ -771,7 +771,7 @@
         <auc:ContactEmailAddress>bob.auditor@test.com</auc:ContactEmailAddress>
       </auc:ContactEmailAddresses>
     </auc:Contact>
-  </auc:Contacts>  
+  </auc:Contacts>
   <auc:UserDefinedFields>
     <auc:UserDefinedField>
       <auc:FieldName>BIN</auc:FieldName>
@@ -802,4 +802,4 @@
       <auc:FieldValue>1234</auc:FieldValue>
     </auc:UserDefinedField>
   </auc:UserDefinedFields>
-</auc:BuildingSync>  
\ No newline at end of file
+</auc:BuildingSync>
diff --git a/bsyncviewer/lib/validator/workflow.py b/bsyncviewer/lib/validator/workflow.py
index f64ae1fb..7f737c01 100644
--- a/bsyncviewer/lib/validator/workflow.py
+++ b/bsyncviewer/lib/validator/workflow.py
@@ -1,9 +1,8 @@
-from collections import OrderedDict
-
-import xmlschema
 import copy
 import subprocess
+from collections import OrderedDict
 
+import xmlschema
 from bsyncviewer.models.schema import Schema
 from bsyncviewer.models.use_case import UseCase
 
diff --git a/bsyncviewer/management/commands/bedes.py b/bsyncviewer/management/commands/bedes.py
index e35f7f29..bcadd429 100644
--- a/bsyncviewer/management/commands/bedes.py
+++ b/bsyncviewer/management/commands/bedes.py
@@ -1,19 +1,22 @@
 import csv
-import xmltodict
 import os
 import re
 from collections import defaultdict
 
 import jellyfish
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
+import xmltodict
 from bsyncviewer.lib.bedes.bedes_parser import BedesParser
 from bsyncviewer.models.attribute import Attribute
-from bsyncviewer.models.bedes_models import BedesTerm, BedesMapping, BedesEnumeration, \
-    BedesEnumerationMapping
+from bsyncviewer.models.bedes_models import (
+    BedesEnumeration,
+    BedesEnumerationMapping,
+    BedesMapping,
+    BedesTerm
+)
 from bsyncviewer.models.enumeration import Enumeration
 from bsyncviewer.models.schema import Schema
+from django.conf import settings
+from django.core.management.base import BaseCommand
 
 # MATCH TYPES:
 # Term-to-List-Option Match -> use bedes_url col (will contain only 1 URL)
diff --git a/bsyncviewer/management/commands/create_use_case.py b/bsyncviewer/management/commands/create_use_case.py
index f478361c..93cf0ea4 100644
--- a/bsyncviewer/management/commands/create_use_case.py
+++ b/bsyncviewer/management/commands/create_use_case.py
@@ -1,12 +1,11 @@
 import os
 
+from bsyncviewer.models.schema import Schema
+from bsyncviewer.models.use_case import UseCase
 from django.conf import settings
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.management.base import BaseCommand
 
-from bsyncviewer.models.schema import Schema
-from bsyncviewer.models.use_case import UseCase
-
 DEFAULT_SCHEMA_VERSION = settings.DEFAULT_SCHEMA_VERSION
 
 
diff --git a/bsyncviewer/management/commands/reset_schema.py b/bsyncviewer/management/commands/reset_schema.py
index 35065d1c..d77850d3 100644
--- a/bsyncviewer/management/commands/reset_schema.py
+++ b/bsyncviewer/management/commands/reset_schema.py
@@ -1,9 +1,9 @@
 import os
 from shutil import copyfile
 
-from django.core.management.base import BaseCommand
-from django.conf import settings
 from bsyncviewer.models.schema import Schema
+from django.conf import settings
+from django.core.management.base import BaseCommand
 
 
 class Command(BaseCommand):
diff --git a/bsyncviewer/migrations/0001_initial.py b/bsyncviewer/migrations/0001_initial.py
index 05108725..b1139986 100644
--- a/bsyncviewer/migrations/0001_initial.py
+++ b/bsyncviewer/migrations/0001_initial.py
@@ -1,10 +1,10 @@
 # Generated by Django 2.1 on 2018-12-06 17:39
 
 import bsyncviewer.models.schema
-from django.conf import settings
 import django.contrib.postgres.fields
-from django.db import migrations, models
 import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/bsyncviewer/migrations/0002_auto_20190501_2038.py b/bsyncviewer/migrations/0002_auto_20190501_2038.py
index b3083f1d..371eee43 100644
--- a/bsyncviewer/migrations/0002_auto_20190501_2038.py
+++ b/bsyncviewer/migrations/0002_auto_20190501_2038.py
@@ -1,7 +1,7 @@
 # Generated by Django 2.1.7 on 2019-05-01 20:38
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/bsyncviewer/migrations/0005_auto_20190501_2111.py b/bsyncviewer/migrations/0005_auto_20190501_2111.py
index f449fe9f..2dd9a4b1 100644
--- a/bsyncviewer/migrations/0005_auto_20190501_2111.py
+++ b/bsyncviewer/migrations/0005_auto_20190501_2111.py
@@ -1,7 +1,7 @@
 # Generated by Django 2.1.7 on 2019-05-01 21:11
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/bsyncviewer/models/enumeration.py b/bsyncviewer/models/enumeration.py
index 557c180b..bc220c73 100644
--- a/bsyncviewer/models/enumeration.py
+++ b/bsyncviewer/models/enumeration.py
@@ -1,6 +1,5 @@
-from django.db import models
-
 from bsyncviewer.models.enumeration_class import EnumerationClass
+from django.db import models
 
 
 class Enumeration(models.Model):
diff --git a/bsyncviewer/models/schema.py b/bsyncviewer/models/schema.py
index c6831f77..08f33e35 100644
--- a/bsyncviewer/models/schema.py
+++ b/bsyncviewer/models/schema.py
@@ -1,12 +1,11 @@
 import os
 
+from bsyncviewer.lib.schema_parser import process_schema
 # from django.conf import settings
 from django.db import models
-from django.db.models.signals import post_save, post_delete, pre_save
+from django.db.models.signals import post_delete, post_save, pre_save
 from django.dispatch import receiver
 
-from bsyncviewer.lib.schema_parser import process_schema
-
 
 def rename_schema_file(instance, path):
     if instance.version:
diff --git a/bsyncviewer/models/use_case.py b/bsyncviewer/models/use_case.py
index a21d3c57..c42c594a 100644
--- a/bsyncviewer/models/use_case.py
+++ b/bsyncviewer/models/use_case.py
@@ -1,10 +1,10 @@
 import os
 
 from django.contrib.auth.models import User
+from django.core.validators import FileExtensionValidator
 from django.db import models
-from django.db.models.signals import pre_save, post_delete
+from django.db.models.signals import post_delete, pre_save
 from django.dispatch import receiver
-from django.core.validators import FileExtensionValidator
 
 
 class UseCase(models.Model):
diff --git a/bsyncviewer/static/images/arrow.svg b/bsyncviewer/static/images/arrow.svg
index e981e1ab..2b0f54f8 100644
--- a/bsyncviewer/static/images/arrow.svg
+++ b/bsyncviewer/static/images/arrow.svg
@@ -20,20 +20,20 @@
 
   <link crossorigin="anonymous" media="all" integrity="sha512-Z0JAar9+DkI1NjGVdZr3GivARUgJtA0o2eHlTv7Ou2gshR5awWVf8QGsq11Ns9ZxQLEs+G5/SuARmvpOLMzulw==" rel="stylesheet" href="https://assets-cdn.github.com/assets/frameworks-95aff0b550d3fe338b645a4deebdcb1b.css" />
   <link crossorigin="anonymous" media="all" integrity="sha512-wvPR+gk57u3h+UKfkh2lDrR9cgm7DU0GzYz6g6QY7XE9yDIePXtL3UcVXAXxwkpQAPOFVuAVf0slCAFB3POfbA==" rel="stylesheet" href="https://assets-cdn.github.com/assets/github-654dec7b79d64121e916eb2670d92814.css" />
-  
-  
-  
-  
+
+
+
+
 
   <meta name="viewport" content="width=device-width">
-  
+
   <title>website/arrow.svg at gh-pages · BuildingSync/website</title>
     <meta name="description" content=" BuildingSync® Website">
     <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub">
   <link rel="fluid-icon" href="https://github.com/fluidicon.png" title="GitHub">
   <meta property="fb:app_id" content="1401488693436528">
 
-    
+
     <meta property="og:image" content="https://avatars2.githubusercontent.com/u/15875715?s=400&amp;v=4" /><meta property="og:site_name" content="GitHub" /><meta property="og:type" content="object" /><meta property="og:title" content="BuildingSync/website" /><meta property="og:url" content="https://github.com/BuildingSync/website" /><meta property="og:description" content="website -  BuildingSync® Website" />
 
   <link rel="assets" href="https://assets-cdn.github.com/">
@@ -43,7 +43,7 @@
   <meta name="request-id" content="F7EA:7FCE:C48609:16699C0:5B7F20A8" data-pjax-transient>
 
 
-  
+
 
   <meta name="selected-link" value="repo_source" data-pjax-transient>
 
@@ -62,7 +62,7 @@
 <meta class="js-ga-set" name="dimension1" content="Logged In">
 
 
-  
+
 
       <meta name="hostname" content="github.com">
     <meta name="user-login" content="kflemin">
@@ -75,7 +75,7 @@
   <meta name="html-safe-nonce" content="2ca4b6f305dbadf11716f7eb420a6ab52a5acedc">
 
   <meta http-equiv="x-pjax-version" content="bdac835dc1c5262a6eac2081515fe341">
-  
+
 
       <link href="https://github.com/BuildingSync/website/commits/gh-pages.atom" rel="alternate" title="Recent Commits to website:gh-pages" type="application/atom+xml">
 
@@ -104,19 +104,19 @@
   </head>
 
   <body class="logged-in env-production emoji-size-boost page-blob">
-    
+
 
   <div class="position-relative js-header-wrapper ">
     <a href="#start-of-content" tabindex="1" class="p-3 bg-blue text-white show-on-focus js-skip-to-content">Skip to content</a>
     <div id="js-pjax-loader-bar" class="pjax-loader-bar"><div class="progress"></div></div>
 
-    
-    
-    
 
 
 
-        
+
+
+
+
 <header class="Header  f5" role="banner">
   <div class="d-flex flex-justify-between px-3 container-lg">
     <div class="d-flex flex-justify-between ">
@@ -229,11 +229,11 @@
       </div>
 
       <div class="d-flex">
-        
+
 <ul class="user-nav d-flex flex-items-center list-style-none" id="user-links">
   <li class="dropdown">
     <span class="d-inline-block  px-2">
-      
+
     <a aria-label="You have unread notifications" class="notification-indicator tooltipped tooltipped-s  js-socket-channel js-notification-indicator" data-hotkey="g n" data-ga-click="Header, go to notifications, icon:unread" data-channel="notification-changed:2205659" href="/notifications">
         <span class="mail-status unread"></span>
         <svg class="octicon octicon-bell" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M13.99 11.991v1H0v-1l.73-.58c.769-.769.809-2.547 1.189-4.416.77-3.767 4.077-4.996 4.077-4.996 0-.55.45-1 .999-1 .55 0 1 .45 1 1 0 0 3.387 1.229 4.156 4.996.38 1.879.42 3.657 1.19 4.417l.659.58h-.01zM6.995 15.99c1.11 0 1.999-.89 1.999-1.999H4.996c0 1.11.89 1.999 1.999 1.999z"/></svg>
@@ -250,7 +250,7 @@
         <span class="dropdown-caret mt-1"></span>
       </summary>
       <details-menu class="dropdown-menu dropdown-menu-sw">
-        
+
 <a role="menuitem" class="dropdown-item" href="/new" data-ga-click="Header, create new repository">
   New repository
 </a>
@@ -323,7 +323,7 @@
   </div>
 </header>
 
-      
+
 
   </div>
 
@@ -339,13 +339,13 @@
   <div role="main" class="application-main ">
         <div itemscope itemtype="http://schema.org/SoftwareSourceCode" class="">
     <div id="js-repo-pjax-container" data-pjax-container >
-      
 
 
 
 
 
-  
+
+
 
 
 
@@ -432,7 +432,7 @@
   </li>
 
   <li>
-    
+
   <div class="js-toggler-container js-social-container starring-container ">
     <!-- '"` --><!-- </textarea></xmp> --></option></form><form class="starred js-social-form" action="/BuildingSync/website/unstar" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="&#x2713;" /><input type="hidden" name="authenticity_token" value="eAMvdGllK5t59/9l5s3MZ7NICuO3nTi7z+LDk2+ItVYDhJGZE3ANJLCbC8pLspgEDduI+Z6nxNL/YmSCGanvAA==" />
       <input type="hidden" name="context" value="repository"></input>
@@ -508,7 +508,7 @@
 </h1>
 
     </div>
-    
+
 <nav class="reponav js-repo-nav js-sidenav-container-pjax container"
      itemscope
      itemtype="http://schema.org/BreadcrumbList"
@@ -565,18 +565,18 @@
 <div class="container new-discussion-timeline experiment-repo-nav  ">
   <div class="repository-content ">
 
-    
+
   <a class="d-none js-permalink-shortcut" data-hotkey="y" href="/BuildingSync/website/blob/9b5a80ec32877206ec02e96f0fb94d1f51015532/css/images/arrow.svg">Permalink</a>
 
   <!-- blob contrib key: blob_contributors:v21:c587b9cf5e0fd0d78b7525757d8a1d37 -->
 
-  
+
 
   <div class="file-navigation">
-    
+
 <div class="select-menu branch-select-menu js-menu-container js-select-menu float-left">
   <button class=" btn btn-sm select-menu-button js-menu-target css-truncate" data-hotkey="w"
-    
+
     type="button" aria-label="Switch branches or tags" aria-expanded="false" aria-haspopup="true">
       <i>Branch:</i>
       <span class="js-select-button css-truncate-target">gh-pages</span>
@@ -747,10 +747,10 @@
   </div>
 </div>
 
-    
+
 
   <div itemprop="text" class="blob-wrapper data type-svg">
-      
+
   <div class="render-wrapper">
     <div class="render-container is-render-pending js-render-target "
       data-identity="956fc31e-2e1c-4657-aac0-6b1095b84f90"
@@ -787,7 +787,7 @@
 
   </div>
 
-        
+
 <div class="footer container-lg px-3" role="contentinfo">
   <div class="position-relative d-flex flex-justify-between pt-6 pb-2 mt-6 f6 text-gray border-top border-gray-light ">
     <ul class="list-style-none d-flex flex-wrap ">
@@ -828,13 +828,13 @@
   </div>
 
 
-    
+
     <script crossorigin="anonymous" integrity="sha512-cGWjjJVq606iqo+ayW6FGddeon7S+c13Z0WhA8qqpDfqpcIqOXs8e2xPkkaKq8smahtoCdD17h8rBmkEGinnOg==" type="application/javascript" src="https://assets-cdn.github.com/assets/frameworks-02b5fc3130cdd668ab6d1036a2165732.js"></script>
-    
+
     <script crossorigin="anonymous" async="async" integrity="sha512-MZSqwzniHKlxCBDOtUZWtv5hD+CvC4X9aYRd51W9N7G0YESIgYWQJbX/SOTGM0FwvmmYHLV60bsNyGrmak91ug==" type="application/javascript" src="https://assets-cdn.github.com/assets/github-6afbacd4fc54b107124f98972969d64e.js"></script>
-    
-    
-    
+
+
+
   <div class="js-stale-session-flash stale-session-flash flash flash-warn flash-banner d-none">
     <svg class="octicon octicon-alert" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z"/></svg>
     <span class="signed-in-tab-flash">You signed in with another tab or window. <a href="">Reload</a> to refresh your session.</span>
@@ -874,4 +874,3 @@
 
   </body>
 </html>
-
diff --git a/bsyncviewer/static/images/bars.svg b/bsyncviewer/static/images/bars.svg
index 850e4e5b..1f2bbe7e 100644
--- a/bsyncviewer/static/images/bars.svg
+++ b/bsyncviewer/static/images/bars.svg
@@ -20,20 +20,20 @@
 
   <link crossorigin="anonymous" media="all" integrity="sha512-Z0JAar9+DkI1NjGVdZr3GivARUgJtA0o2eHlTv7Ou2gshR5awWVf8QGsq11Ns9ZxQLEs+G5/SuARmvpOLMzulw==" rel="stylesheet" href="https://assets-cdn.github.com/assets/frameworks-95aff0b550d3fe338b645a4deebdcb1b.css" />
   <link crossorigin="anonymous" media="all" integrity="sha512-wvPR+gk57u3h+UKfkh2lDrR9cgm7DU0GzYz6g6QY7XE9yDIePXtL3UcVXAXxwkpQAPOFVuAVf0slCAFB3POfbA==" rel="stylesheet" href="https://assets-cdn.github.com/assets/github-654dec7b79d64121e916eb2670d92814.css" />
-  
-  
-  
-  
+
+
+
+
 
   <meta name="viewport" content="width=device-width">
-  
+
   <title>website/bars.svg at gh-pages · BuildingSync/website</title>
     <meta name="description" content=" BuildingSync® Website">
     <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub">
   <link rel="fluid-icon" href="https://github.com/fluidicon.png" title="GitHub">
   <meta property="fb:app_id" content="1401488693436528">
 
-    
+
     <meta property="og:image" content="https://avatars2.githubusercontent.com/u/15875715?s=400&amp;v=4" /><meta property="og:site_name" content="GitHub" /><meta property="og:type" content="object" /><meta property="og:title" content="BuildingSync/website" /><meta property="og:url" content="https://github.com/BuildingSync/website" /><meta property="og:description" content="website -  BuildingSync® Website" />
 
   <link rel="assets" href="https://assets-cdn.github.com/">
@@ -43,7 +43,7 @@
   <meta name="request-id" content="F7EA:7FCE:C489D1:1669F34:5B7F20AE" data-pjax-transient>
 
 
-  
+
 
   <meta name="selected-link" value="repo_source" data-pjax-transient>
 
@@ -62,7 +62,7 @@
 <meta class="js-ga-set" name="dimension1" content="Logged In">
 
 
-  
+
 
       <meta name="hostname" content="github.com">
     <meta name="user-login" content="kflemin">
@@ -75,7 +75,7 @@
   <meta name="html-safe-nonce" content="2ca4b6f305dbadf11716f7eb420a6ab52a5acedc">
 
   <meta http-equiv="x-pjax-version" content="bdac835dc1c5262a6eac2081515fe341">
-  
+
 
       <link href="https://github.com/BuildingSync/website/commits/gh-pages.atom" rel="alternate" title="Recent Commits to website:gh-pages" type="application/atom+xml">
 
@@ -104,19 +104,19 @@
   </head>
 
   <body class="logged-in env-production emoji-size-boost page-blob">
-    
+
 
   <div class="position-relative js-header-wrapper ">
     <a href="#start-of-content" tabindex="1" class="p-3 bg-blue text-white show-on-focus js-skip-to-content">Skip to content</a>
     <div id="js-pjax-loader-bar" class="pjax-loader-bar"><div class="progress"></div></div>
 
-    
-    
-    
 
 
 
-        
+
+
+
+
 <header class="Header  f5" role="banner">
   <div class="d-flex flex-justify-between px-3 container-lg">
     <div class="d-flex flex-justify-between ">
@@ -229,11 +229,11 @@
       </div>
 
       <div class="d-flex">
-        
+
 <ul class="user-nav d-flex flex-items-center list-style-none" id="user-links">
   <li class="dropdown">
     <span class="d-inline-block  px-2">
-      
+
     <a aria-label="You have unread notifications" class="notification-indicator tooltipped tooltipped-s  js-socket-channel js-notification-indicator" data-hotkey="g n" data-ga-click="Header, go to notifications, icon:unread" data-channel="notification-changed:2205659" href="/notifications">
         <span class="mail-status unread"></span>
         <svg class="octicon octicon-bell" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M13.99 11.991v1H0v-1l.73-.58c.769-.769.809-2.547 1.189-4.416.77-3.767 4.077-4.996 4.077-4.996 0-.55.45-1 .999-1 .55 0 1 .45 1 1 0 0 3.387 1.229 4.156 4.996.38 1.879.42 3.657 1.19 4.417l.659.58h-.01zM6.995 15.99c1.11 0 1.999-.89 1.999-1.999H4.996c0 1.11.89 1.999 1.999 1.999z"/></svg>
@@ -250,7 +250,7 @@
         <span class="dropdown-caret mt-1"></span>
       </summary>
       <details-menu class="dropdown-menu dropdown-menu-sw">
-        
+
 <a role="menuitem" class="dropdown-item" href="/new" data-ga-click="Header, create new repository">
   New repository
 </a>
@@ -323,7 +323,7 @@
   </div>
 </header>
 
-      
+
 
   </div>
 
@@ -339,13 +339,13 @@
   <div role="main" class="application-main ">
         <div itemscope itemtype="http://schema.org/SoftwareSourceCode" class="">
     <div id="js-repo-pjax-container" data-pjax-container >
-      
 
 
 
 
 
-  
+
+
 
 
 
@@ -432,7 +432,7 @@
   </li>
 
   <li>
-    
+
   <div class="js-toggler-container js-social-container starring-container ">
     <!-- '"` --><!-- </textarea></xmp> --></option></form><form class="starred js-social-form" action="/BuildingSync/website/unstar" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="&#x2713;" /><input type="hidden" name="authenticity_token" value="vaXk9xye4W0k5EaFSNb8+/+2aSpTAa1rJO6fpylnpSLGIloaZovH0u2IsirlqaiYQSXrMHo7UQIUbji2X0b/dA==" />
       <input type="hidden" name="context" value="repository"></input>
@@ -508,7 +508,7 @@
 </h1>
 
     </div>
-    
+
 <nav class="reponav js-repo-nav js-sidenav-container-pjax container"
      itemscope
      itemtype="http://schema.org/BreadcrumbList"
@@ -565,18 +565,18 @@
 <div class="container new-discussion-timeline experiment-repo-nav  ">
   <div class="repository-content ">
 
-    
+
   <a class="d-none js-permalink-shortcut" data-hotkey="y" href="/BuildingSync/website/blob/9b5a80ec32877206ec02e96f0fb94d1f51015532/css/images/bars.svg">Permalink</a>
 
   <!-- blob contrib key: blob_contributors:v21:2a2cd30ce3f2b89a1b1ba2d08bf3bacf -->
 
-  
+
 
   <div class="file-navigation">
-    
+
 <div class="select-menu branch-select-menu js-menu-container js-select-menu float-left">
   <button class=" btn btn-sm select-menu-button js-menu-target css-truncate" data-hotkey="w"
-    
+
     type="button" aria-label="Switch branches or tags" aria-expanded="false" aria-haspopup="true">
       <i>Branch:</i>
       <span class="js-select-button css-truncate-target">gh-pages</span>
@@ -747,10 +747,10 @@
   </div>
 </div>
 
-    
+
 
   <div itemprop="text" class="blob-wrapper data type-svg">
-      
+
   <div class="render-wrapper">
     <div class="render-container is-render-pending js-render-target "
       data-identity="a88f07d4-9ddf-4c0c-9037-d84f4ca74c58"
@@ -787,7 +787,7 @@
 
   </div>
 
-        
+
 <div class="footer container-lg px-3" role="contentinfo">
   <div class="position-relative d-flex flex-justify-between pt-6 pb-2 mt-6 f6 text-gray border-top border-gray-light ">
     <ul class="list-style-none d-flex flex-wrap ">
@@ -828,13 +828,13 @@
   </div>
 
 
-    
+
     <script crossorigin="anonymous" integrity="sha512-cGWjjJVq606iqo+ayW6FGddeon7S+c13Z0WhA8qqpDfqpcIqOXs8e2xPkkaKq8smahtoCdD17h8rBmkEGinnOg==" type="application/javascript" src="https://assets-cdn.github.com/assets/frameworks-02b5fc3130cdd668ab6d1036a2165732.js"></script>
-    
+
     <script crossorigin="anonymous" async="async" integrity="sha512-MZSqwzniHKlxCBDOtUZWtv5hD+CvC4X9aYRd51W9N7G0YESIgYWQJbX/SOTGM0FwvmmYHLV60bsNyGrmak91ug==" type="application/javascript" src="https://assets-cdn.github.com/assets/github-6afbacd4fc54b107124f98972969d64e.js"></script>
-    
-    
-    
+
+
+
   <div class="js-stale-session-flash stale-session-flash flash flash-warn flash-banner d-none">
     <svg class="octicon octicon-alert" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z"/></svg>
     <span class="signed-in-tab-flash">You signed in with another tab or window. <a href="">Reload</a> to refresh your session.</span>
@@ -874,4 +874,3 @@
 
   </body>
 </html>
-
diff --git a/bsyncviewer/static/images/close.svg b/bsyncviewer/static/images/close.svg
index ba54edd4..4c2b3eb8 100644
--- a/bsyncviewer/static/images/close.svg
+++ b/bsyncviewer/static/images/close.svg
@@ -20,20 +20,20 @@
 
   <link crossorigin="anonymous" media="all" integrity="sha512-Z0JAar9+DkI1NjGVdZr3GivARUgJtA0o2eHlTv7Ou2gshR5awWVf8QGsq11Ns9ZxQLEs+G5/SuARmvpOLMzulw==" rel="stylesheet" href="https://assets-cdn.github.com/assets/frameworks-95aff0b550d3fe338b645a4deebdcb1b.css" />
   <link crossorigin="anonymous" media="all" integrity="sha512-wvPR+gk57u3h+UKfkh2lDrR9cgm7DU0GzYz6g6QY7XE9yDIePXtL3UcVXAXxwkpQAPOFVuAVf0slCAFB3POfbA==" rel="stylesheet" href="https://assets-cdn.github.com/assets/github-654dec7b79d64121e916eb2670d92814.css" />
-  
-  
-  
-  
+
+
+
+
 
   <meta name="viewport" content="width=device-width">
-  
+
   <title>website/close.svg at gh-pages · BuildingSync/website</title>
     <meta name="description" content=" BuildingSync® Website">
     <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub">
   <link rel="fluid-icon" href="https://github.com/fluidicon.png" title="GitHub">
   <meta property="fb:app_id" content="1401488693436528">
 
-    
+
     <meta property="og:image" content="https://avatars2.githubusercontent.com/u/15875715?s=400&amp;v=4" /><meta property="og:site_name" content="GitHub" /><meta property="og:type" content="object" /><meta property="og:title" content="BuildingSync/website" /><meta property="og:url" content="https://github.com/BuildingSync/website" /><meta property="og:description" content="website -  BuildingSync® Website" />
 
   <link rel="assets" href="https://assets-cdn.github.com/">
@@ -43,7 +43,7 @@
   <meta name="request-id" content="F7EA:7FCE:C48BF3:166A63D:5B7F20B5" data-pjax-transient>
 
 
-  
+
 
   <meta name="selected-link" value="repo_source" data-pjax-transient>
 
@@ -62,7 +62,7 @@
 <meta class="js-ga-set" name="dimension1" content="Logged In">
 
 
-  
+
 
       <meta name="hostname" content="github.com">
     <meta name="user-login" content="kflemin">
@@ -75,7 +75,7 @@
   <meta name="html-safe-nonce" content="2ca4b6f305dbadf11716f7eb420a6ab52a5acedc">
 
   <meta http-equiv="x-pjax-version" content="bdac835dc1c5262a6eac2081515fe341">
-  
+
 
       <link href="https://github.com/BuildingSync/website/commits/gh-pages.atom" rel="alternate" title="Recent Commits to website:gh-pages" type="application/atom+xml">
 
@@ -104,19 +104,19 @@
   </head>
 
   <body class="logged-in env-production emoji-size-boost page-blob">
-    
+
 
   <div class="position-relative js-header-wrapper ">
     <a href="#start-of-content" tabindex="1" class="p-3 bg-blue text-white show-on-focus js-skip-to-content">Skip to content</a>
     <div id="js-pjax-loader-bar" class="pjax-loader-bar"><div class="progress"></div></div>
 
-    
-    
-    
 
 
 
-        
+
+
+
+
 <header class="Header  f5" role="banner">
   <div class="d-flex flex-justify-between px-3 container-lg">
     <div class="d-flex flex-justify-between ">
@@ -229,11 +229,11 @@
       </div>
 
       <div class="d-flex">
-        
+
 <ul class="user-nav d-flex flex-items-center list-style-none" id="user-links">
   <li class="dropdown">
     <span class="d-inline-block  px-2">
-      
+
     <a aria-label="You have unread notifications" class="notification-indicator tooltipped tooltipped-s  js-socket-channel js-notification-indicator" data-hotkey="g n" data-ga-click="Header, go to notifications, icon:unread" data-channel="notification-changed:2205659" href="/notifications">
         <span class="mail-status unread"></span>
         <svg class="octicon octicon-bell" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M13.99 11.991v1H0v-1l.73-.58c.769-.769.809-2.547 1.189-4.416.77-3.767 4.077-4.996 4.077-4.996 0-.55.45-1 .999-1 .55 0 1 .45 1 1 0 0 3.387 1.229 4.156 4.996.38 1.879.42 3.657 1.19 4.417l.659.58h-.01zM6.995 15.99c1.11 0 1.999-.89 1.999-1.999H4.996c0 1.11.89 1.999 1.999 1.999z"/></svg>
@@ -250,7 +250,7 @@
         <span class="dropdown-caret mt-1"></span>
       </summary>
       <details-menu class="dropdown-menu dropdown-menu-sw">
-        
+
 <a role="menuitem" class="dropdown-item" href="/new" data-ga-click="Header, create new repository">
   New repository
 </a>
@@ -323,7 +323,7 @@
   </div>
 </header>
 
-      
+
 
   </div>
 
@@ -339,13 +339,13 @@
   <div role="main" class="application-main ">
         <div itemscope itemtype="http://schema.org/SoftwareSourceCode" class="">
     <div id="js-repo-pjax-container" data-pjax-container >
-      
 
 
 
 
 
-  
+
+
 
 
 
@@ -432,7 +432,7 @@
   </li>
 
   <li>
-    
+
   <div class="js-toggler-container js-social-container starring-container ">
     <!-- '"` --><!-- </textarea></xmp> --></option></form><form class="starred js-social-form" action="/BuildingSync/website/unstar" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="&#x2713;" /><input type="hidden" name="authenticity_token" value="22xKipwjVaVk11s11PPQJAwNqlCcCsJ159b3GdyOOqCg6/Rn5jZzGq27r5p5jIRHsp4oSrUwPhzXVlAIqq9g9g==" />
       <input type="hidden" name="context" value="repository"></input>
@@ -508,7 +508,7 @@
 </h1>
 
     </div>
-    
+
 <nav class="reponav js-repo-nav js-sidenav-container-pjax container"
      itemscope
      itemtype="http://schema.org/BreadcrumbList"
@@ -565,18 +565,18 @@
 <div class="container new-discussion-timeline experiment-repo-nav  ">
   <div class="repository-content ">
 
-    
+
   <a class="d-none js-permalink-shortcut" data-hotkey="y" href="/BuildingSync/website/blob/9b5a80ec32877206ec02e96f0fb94d1f51015532/css/images/close.svg">Permalink</a>
 
   <!-- blob contrib key: blob_contributors:v21:028e78f1baee1ebfe7d960476ec812e2 -->
 
-  
+
 
   <div class="file-navigation">
-    
+
 <div class="select-menu branch-select-menu js-menu-container js-select-menu float-left">
   <button class=" btn btn-sm select-menu-button js-menu-target css-truncate" data-hotkey="w"
-    
+
     type="button" aria-label="Switch branches or tags" aria-expanded="false" aria-haspopup="true">
       <i>Branch:</i>
       <span class="js-select-button css-truncate-target">gh-pages</span>
@@ -747,10 +747,10 @@
   </div>
 </div>
 
-    
+
 
   <div itemprop="text" class="blob-wrapper data type-svg">
-      
+
   <div class="render-wrapper">
     <div class="render-container is-render-pending js-render-target "
       data-identity="28710314-f431-4128-8c12-1e81373a6d1e"
@@ -787,7 +787,7 @@
 
   </div>
 
-        
+
 <div class="footer container-lg px-3" role="contentinfo">
   <div class="position-relative d-flex flex-justify-between pt-6 pb-2 mt-6 f6 text-gray border-top border-gray-light ">
     <ul class="list-style-none d-flex flex-wrap ">
@@ -828,13 +828,13 @@
   </div>
 
 
-    
+
     <script crossorigin="anonymous" integrity="sha512-cGWjjJVq606iqo+ayW6FGddeon7S+c13Z0WhA8qqpDfqpcIqOXs8e2xPkkaKq8smahtoCdD17h8rBmkEGinnOg==" type="application/javascript" src="https://assets-cdn.github.com/assets/frameworks-02b5fc3130cdd668ab6d1036a2165732.js"></script>
-    
+
     <script crossorigin="anonymous" async="async" integrity="sha512-MZSqwzniHKlxCBDOtUZWtv5hD+CvC4X9aYRd51W9N7G0YESIgYWQJbX/SOTGM0FwvmmYHLV60bsNyGrmak91ug==" type="application/javascript" src="https://assets-cdn.github.com/assets/github-6afbacd4fc54b107124f98972969d64e.js"></script>
-    
-    
-    
+
+
+
   <div class="js-stale-session-flash stale-session-flash flash flash-warn flash-banner d-none">
     <svg class="octicon octicon-alert" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M8.893 1.5c-.183-.31-.52-.5-.887-.5s-.703.19-.886.5L.138 13.499a.98.98 0 0 0 0 1.001c.193.31.53.501.886.501h13.964c.367 0 .704-.19.877-.5a1.03 1.03 0 0 0 .01-1.002L8.893 1.5zm.133 11.497H6.987v-2.003h2.039v2.003zm0-3.004H6.987V5.987h2.039v4.006z"/></svg>
     <span class="signed-in-tab-flash">You signed in with another tab or window. <a href="">Reload</a> to refresh your session.</span>
@@ -874,4 +874,3 @@
 
   </body>
 </html>
-
diff --git a/bsyncviewer/static/style.css b/bsyncviewer/static/style.css
index 87107242..af851bfc 100644
--- a/bsyncviewer/static/style.css
+++ b/bsyncviewer/static/style.css
@@ -1,5 +1,5 @@
-body { 
-  padding-top: 60px; 
+body {
+  padding-top: 60px;
   font-family: "open sans", Helvetica, sans-serif;
   background: #eee;
   font-size:0.9em;
@@ -378,4 +378,4 @@ ul.errorlist li{
   padding-top:20px;
   padding-right:10px;
   padding-left: 80%;
-}
\ No newline at end of file
+}
diff --git a/bsyncviewer/templates/base.html b/bsyncviewer/templates/base.html
index ee13427d..49311d54 100644
--- a/bsyncviewer/templates/base.html
+++ b/bsyncviewer/templates/base.html
@@ -96,5 +96,3 @@ <h1>{% block title %}(no title){% endblock %}</h1>
  {% block base_extra_script %}
   {% block extra_script %}{% endblock %}
  {%  endblock base_extra_script %}
-
-
diff --git a/bsyncviewer/templates/dictionary.html b/bsyncviewer/templates/dictionary.html
index e855d2e2..7fa00a1a 100644
--- a/bsyncviewer/templates/dictionary.html
+++ b/bsyncviewer/templates/dictionary.html
@@ -120,7 +120,7 @@ <h2 class="panel-title">Enumerations</h2>
                   // set bedes section and display
                   if (jsondata.bedes_terms.length > 0){
 
-                    
+
                     $('#bedes_none').removeClass("visible").addClass("hidden");
                     $('#bedes_found').removeClass("hidden").addClass("visible");
                     $('#term_results').html('');
@@ -132,7 +132,7 @@ <h2 class="panel-title">Enumerations</h2>
                     var term_ul = $('<ul>').appendTo('#term_results');
                     $(jsondata.bedes_terms).each(function(index, item) {
                       var text = '<strong>' + item['term'] + '</strong> &mdash;' + item['definition'] + '&nbsp;&nbsp;(<em>Category: ' + item['category'] + '</em>)&nbsp;&nbsp;<a href="' + item['url'] + '" target="_blank">' + 'BEDES <i class="fa fa-external-link" aria-hidden="true"></i></a>';
-                      
+
                       term_ul.append(
                         $(document.createElement('li')).html(text).addClass('pad-bot-10')
                       );
diff --git a/bsyncviewer/templates/email.html b/bsyncviewer/templates/email.html
index a0ad109b..971723bf 100644
--- a/bsyncviewer/templates/email.html
+++ b/bsyncviewer/templates/email.html
@@ -22,4 +22,4 @@ <h2>Contact Us</h2>
         </header>
     </div>
 
-{% endblock content_notitle %}
\ No newline at end of file
+{% endblock content_notitle %}
diff --git a/bsyncviewer/templates/use_case_mappings.html b/bsyncviewer/templates/use_case_mappings.html
index 4198818b..61890f1a 100644
--- a/bsyncviewer/templates/use_case_mappings.html
+++ b/bsyncviewer/templates/use_case_mappings.html
@@ -23,11 +23,11 @@ <h3>Helpful Links</h3>
                 <ul>
                     <li class="pad-bot-10"><a href="{% url 'download_usecase_example' %}">Download Example Schematron File</a></li>
                     <li class=pad-bot-10><a href="http://schematron.com" target="_blank">Schematron Website</a></li>
-                       
+
                 </ul>
             </div>
         </div>
-       
+
     </div>
 
 {% endblock content_notitle %}
diff --git a/bsyncviewer/templates/use_cases.html b/bsyncviewer/templates/use_cases.html
index 3ebf5edd..9d097cd9 100644
--- a/bsyncviewer/templates/use_cases.html
+++ b/bsyncviewer/templates/use_cases.html
@@ -49,7 +49,7 @@ <h3>My Use Cases</h3>
 									<a href="{% url 'use_case_update' case.id %}">Edit</a> |
 									<a href="{% url 'use_case_delete' case.id %}">Delete</a> |
 									<a href="{% url 'download_usecase_file' case.id %}">Download File</a>
-                                    
+
 								</td>
 
 							</tr>
@@ -63,16 +63,16 @@ <h3>My Use Cases</h3>
 			        <div class="pad-bot-20">
 			        	&nbsp;
 			        </div>
-	        	{% endif %}	
+	        	{% endif %}
         	</div>
         	<div class="col-md-3">
         		<div class="callout-box">
         			<p>Click the link below for more information on adding and validating use cases</p>
-        			<span class="pad-10"><a class="btn btn-accent" href="{% url 'use_case_mappings' %}" role="button">	
-                        <i class="fa fa-question-circle" aria-hidden="true"></i>	
+        			<span class="pad-10"><a class="btn btn-accent" href="{% url 'use_case_mappings' %}" role="button">
+                        <i class="fa fa-question-circle" aria-hidden="true"></i>
                         Use Case Help Page
                         </a></span>
-        		</div> 	
+        		</div>
         	</div>
         </div>
     </div>
diff --git a/bsyncviewer/templates/validator_results.html b/bsyncviewer/templates/validator_results.html
index 2fca7e8c..086d1e0b 100644
--- a/bsyncviewer/templates/validator_results.html
+++ b/bsyncviewer/templates/validator_results.html
@@ -73,7 +73,7 @@ <h3>{# {{ name }} #}
                     </h3>
                   {% endif %}
                   {% if uc.infos %}
-                    <h4>Info<span class="label label-info pad5">{{ uc.infos|length }}</span></h4> 
+                    <h4>Info<span class="label label-info pad5">{{ uc.infos|length }}</span></h4>
                     <table style="table-layout: fixed; ">
                       {% for item in uc.infos %}
                         <tr class="wrap-it">
@@ -82,9 +82,9 @@ <h4>Info<span class="label label-info pad5">{{ uc.infos|length }}</span></h4>
                         </tr>
                       {% endfor %}
                     </table>
-                  {% endif %}  
+                  {% endif %}
                   {% if uc.warnings %}
-                    <h4>Warnings<span class="label label-warning pad5">{{ uc.warnings|length }}</span></h4> 
+                    <h4>Warnings<span class="label label-warning pad5">{{ uc.warnings|length }}</span></h4>
                     <table style="table-layout: fixed; ">
                       {% for item in uc.warnings %}
                         <tr class="wrap-it">
diff --git a/bsyncviewer/tests/test_api.py b/bsyncviewer/tests/test_api.py
index d4caec82..5cbe71e9 100644
--- a/bsyncviewer/tests/test_api.py
+++ b/bsyncviewer/tests/test_api.py
@@ -1,12 +1,11 @@
 import os
 
+from bsyncviewer.models.schema import Schema
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.urls import reverse
 from rest_framework import status
 from rest_framework.test import APITestCase
 
-from bsyncviewer.models.schema import Schema
-
 # Use a custom version that is not an actual version to prevent overwriting saved BEDES mappings
 TEST_SCHEMA_VERSION = '0.0.1'
 
diff --git a/bsyncviewer/tests/test_command.py b/bsyncviewer/tests/test_command.py
index b413e326..1c4d9b85 100644
--- a/bsyncviewer/tests/test_command.py
+++ b/bsyncviewer/tests/test_command.py
@@ -1,15 +1,14 @@
 import os
 from io import StringIO
 
+from bsyncviewer.models.bedes_models import BedesEnumeration, BedesTerm
+from bsyncviewer.models.schema import Schema
+from bsyncviewer.models.use_case import UseCase
 from django.conf import settings
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.management import call_command
 from django.test import TestCase
 
-from bsyncviewer.models.bedes_models import BedesTerm, BedesEnumeration
-from bsyncviewer.models.schema import Schema
-from bsyncviewer.models.use_case import UseCase
-
 # For reset test only
 DEFAULT_SCHEMA_VERSION = settings.DEFAULT_SCHEMA_VERSION
 
diff --git a/bsyncviewer/tests/test_schema.py b/bsyncviewer/tests/test_schema.py
index f896dfcb..1a87f67b 100644
--- a/bsyncviewer/tests/test_schema.py
+++ b/bsyncviewer/tests/test_schema.py
@@ -1,11 +1,10 @@
 import json
 import os
 
-from django.core.files.uploadedfile import SimpleUploadedFile
-from django.test import TestCase
-
 from bsyncviewer.lib.tree_viewer import get_schema_jstree_data
 from bsyncviewer.models.schema import Schema
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import TestCase
 
 # Use a custom version that is not an actual version to prevent overwriting saved BEDES mappings
 TEST_SCHEMA_VERSION = '0.0.1'
diff --git a/bsyncviewer/tests/test_use_case.py b/bsyncviewer/tests/test_use_case.py
index a6002bb9..0ff107a8 100644
--- a/bsyncviewer/tests/test_use_case.py
+++ b/bsyncviewer/tests/test_use_case.py
@@ -1,10 +1,9 @@
 import os
 
-from django.core.files.uploadedfile import SimpleUploadedFile
-from django.test import TestCase
-
 from bsyncviewer.models.schema import Schema
 from bsyncviewer.models.use_case import UseCase
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import TestCase
 
 # Use a custom version that is not an actual version to prevent overwriting saved BEDES mappings
 TEST_SCHEMA_VERSION = '0.0.1'
diff --git a/bsyncviewer/tests/test_validator.py b/bsyncviewer/tests/test_validator.py
index c646aa89..31fa78b0 100644
--- a/bsyncviewer/tests/test_validator.py
+++ b/bsyncviewer/tests/test_validator.py
@@ -1,11 +1,10 @@
 import os
 
-from django.core.files.uploadedfile import SimpleUploadedFile
-from django.test import Client, TestCase
-
-from bsyncviewer.forms import LoadXMLFile, LoadXMLExample
+from bsyncviewer.forms import LoadXMLExample, LoadXMLFile
 from bsyncviewer.lib.validator.workflow import ValidationWorkflow
 from bsyncviewer.models.schema import Schema
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import Client, TestCase
 
 # Use a custom version that is not an actual version to prevent overwriting saved BEDES mappings
 TEST_SCHEMA_VERSION = '0.0.1'
diff --git a/bsyncviewer/tests/test_views.py b/bsyncviewer/tests/test_views.py
index e42dc9f9..83543df5 100644
--- a/bsyncviewer/tests/test_views.py
+++ b/bsyncviewer/tests/test_views.py
@@ -1,16 +1,18 @@
 import os
 from io import StringIO
 
-from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.management import call_command
-from django.test import Client
-from django.test import TestCase
-from django.urls import reverse
-
 from bsyncviewer.models.attribute import Attribute
-from bsyncviewer.models.bedes_models import BedesEnumeration, BedesTerm, BedesMapping
+from bsyncviewer.models.bedes_models import (
+    BedesEnumeration,
+    BedesMapping,
+    BedesTerm
+)
 from bsyncviewer.models.schema import Schema
 from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.core.management import call_command
+from django.test import Client, TestCase
+from django.urls import reverse
 
 # Use a custom version that is not an actual version to prevent overwriting saved BEDES mappings
 TEST_SCHEMA_VERSION = '0.0.1'
diff --git a/bsyncviewer/testsuitelib/contactElements.sch b/bsyncviewer/testsuitelib/contactElements.sch
index a20ccdf5..f3bdba2a 100644
--- a/bsyncviewer/testsuitelib/contactElements.sch
+++ b/bsyncviewer/testsuitelib/contactElements.sch
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron">
-  <!--  
+  <!--
     For logic pertaining to Contact elements.  Parent passed should be an auc:Contact.
 -->
-  <!--  
+  <!--
     Check that the name, email, and phone number are specified for contacts.
     <severity> error
     <param> parent - an auc:Contact element
@@ -21,7 +21,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check that there are atleast two auc:Contact elements within an auc:Facility,
     and that there is atleast one Energy Auditor and one Owner.
     <severity> error
@@ -43,7 +43,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check that there are atleast two auc:Contact elements within an auc:Facility,
     and that there is atleast one Energy Auditor and one Owner.
     <severity> error
diff --git a/bsyncviewer/testsuitelib/energyElements.sch b/bsyncviewer/testsuitelib/energyElements.sch
index 61ed8c00..8480b563 100644
--- a/bsyncviewer/testsuitelib/energyElements.sch
+++ b/bsyncviewer/testsuitelib/energyElements.sch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
-  <!--  
+  <!--
     For logic pertaining to Energy / Resource / Utilty elements.
 -->
 </schema>
diff --git a/bsyncviewer/testsuitelib/floorElements.sch b/bsyncviewer/testsuitelib/floorElements.sch
index 851551d8..3cd2c287 100644
--- a/bsyncviewer/testsuitelib/floorElements.sch
+++ b/bsyncviewer/testsuitelib/floorElements.sch
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron">
   <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
-  <!--  
+  <!--
     For logic pertaining to FloorArea elements.
 -->
-  <!--  
+  <!--
     Each FloorAreaType enumeration can occur AT MOST one time in a set of FloorArea elements.
     <severity> error
     <param> parent - an auc:FloorAreas element
@@ -109,7 +109,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check that the auc:FloorArea elements have the auc:FloorAreaType and auc:FloorAreaValue.
     <severity> error
     <param> parent - an auc:FloorArea element
@@ -121,7 +121,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check that there is exactly one auc:FloorAreaType
     <severity> error
     <param> parent - an auc:FloorAreas element
@@ -134,7 +134,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check if an auc:FloorAreaType is declared.
     <severity> error
     <param> parent - an auc:FloorAreas element
@@ -148,7 +148,7 @@
     </rule>
   </pattern>
   <!--
-    Check mechanical floor area types add up to the gross type.  The following values are assumed if the type is not declared, 
+    Check mechanical floor area types add up to the gross type.  The following values are assumed if the type is not declared,
     although these types are not inserted in the BSync document:
     - Cooled only -> 0.0
     - Heated only -> 0.0
@@ -171,7 +171,7 @@
       <let name="heatedCooledArea" value="number(translate(string($heatedCooledAreaValue), 'NaN', '0'))"/>
       <let name="ventilatedAreaValue" value="number(auc:FloorArea[auc:FloorAreaType/text()='Ventilated']/auc:FloorAreaValue)"/>
       <let name="ventilatedArea" value="number(translate(string($ventilatedAreaValue), 'NaN', '0'))"/>
-      
+
 <!--      The following logic is based on Becker's method for if-else statements in XPath 1.0 -->
       <let name="conditionedAreaValue" value="number(auc:FloorArea[auc:FloorAreaType/text()='Conditioned']/auc:FloorAreaValue)"/>
       <let name="conditionedAreaValueComputed" value="$cooledOnlyArea + $heatedOnlyArea + $heatedCooledArea + $ventilatedArea"/>
@@ -214,7 +214,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check that 'Heated' and 'Cooled' FloorAreaTypes are not defined.
     <severity> error
     <param> parent - an auc:FloorAreas element
@@ -229,7 +229,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check that at least one of the mechanical floor area types is defined.
     <severity> error
     <param> parent - an auc:FloorAreas element
@@ -246,7 +246,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check that the Conditioned area is greater than Cooled only + Heated only + Heated and Cooled + Ventilated
     <severity> error
     <param> parent - an auc:FloorAreas[auc:FloorAreaType='Conditioned' and auc:FloorAreaPercentage] element
@@ -265,7 +265,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check that the Gross Area of the auc:Building is greater than or equal to the sum of the Gross Area from all auc:Section[auc:SectionType='Space function'] elements
     <severity> error
     <param> parent - an auc:Building
@@ -285,7 +285,7 @@
       </assert>
     </rule>
   </pattern>
-<!--  Check that either a auc:FloorAreaValue or auc:FloorAreaPercentage is specifed, but not both 
+<!--  Check that either a auc:FloorAreaValue or auc:FloorAreaPercentage is specifed, but not both
       <severity> error
       <param> parent - an auc:FloorArea element
   -->
@@ -298,5 +298,5 @@
       </assert>
     </rule>
   </pattern>
-  
+
 </schema>
diff --git a/bsyncviewer/testsuitelib/occupancyElements.sch b/bsyncviewer/testsuitelib/occupancyElements.sch
index bffa8be5..b241cde6 100644
--- a/bsyncviewer/testsuitelib/occupancyElements.sch
+++ b/bsyncviewer/testsuitelib/occupancyElements.sch
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron">
   <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
-  <!--  
+  <!--
     For logic that pertains to Occupancy
 -->
-  <!--  
+  <!--
     Check that both the auc:TypicalOccupantUsageValue and auc:TypicalOccupantUsageUnits are specified.
     <severity> error
     <param> parent - an auc:TypicalOccupantUsage element
@@ -18,7 +18,7 @@
   </pattern>
   <!--
     Check that, within an auc:TypicalOccupantUsages element, there is exactly one auc:TypicalOccupantUsage element
-    with the auc:TypicalOccupantUsageUnits = $typUsageUnits passed in as a parameter. 
+    with the auc:TypicalOccupantUsageUnits = $typUsageUnits passed in as a parameter.
     <severity> error
     <param> parent - an auc:TypicalOccupantUsages element
     <param> typUsageUnits - one of the standard enums for auc:TypicalOccupantUsageUnits, such as 'Hours per week'
@@ -30,7 +30,7 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
+  <!--
     Check that all auc:OccupancyLevel elements have the auc:OccupantQuantityType and auc:OccupantQuantity child elements defined.
     <severity> error
     <param> parent - an auc:OccupancyLevel element
@@ -42,8 +42,8 @@
       </assert>
     </rule>
   </pattern>
-  <!--  
-    Check that, within an auc:OccupancyLevels element, there is exactly one auc:OccupancyLevel element 
+  <!--
+    Check that, within an auc:OccupancyLevels element, there is exactly one auc:OccupancyLevel element
     with the auc:OccupantQuantityType = $occLevelType passed in as a parameter
     <severity> error
     <param> parent - an auc:OccupancyLevels element
diff --git a/bsyncviewer/testsuitelib/rootElements.sch b/bsyncviewer/testsuitelib/rootElements.sch
index 97361080..1eb63236 100644
--- a/bsyncviewer/testsuitelib/rootElements.sch
+++ b/bsyncviewer/testsuitelib/rootElements.sch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron">
   <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
-  <!--    
+  <!--
     This pattern ensures there is exactly one of every element inclusive of the Building element
     It walks the path: BuildingSync/Facilities/Facility/Sites/Site/Buildings/Building
     <severity> error
@@ -29,7 +29,7 @@
       <assert test="count(auc:Building) = 1">[ERROR] element 'auc:Building' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
     </rule>
   </pattern>
-  <!--    
+  <!--
     This pattern ensures there is exactly one of every element inclusive of the Scenario element
     It starts at the Facility element and walks the path: Reports/Report/Scenarios/Scenario
     <severity> error
@@ -48,7 +48,7 @@
       <assert test="count(auc:Scenario) &gt;= 1">[ERROR] element 'auc:Scenario' is REQUIRED AT LEAST ONCE for: '<name/>'</assert>
     </rule>
   </pattern>
-  <!--    
+  <!--
     This pattern ensures there is exactly one of every element inclusive of the Contacts element
     It starts at the Facility element and walks the path: Facility/Contacts
     <severity> error
@@ -58,7 +58,7 @@
       <assert test="count(auc:Contacts) = 1">[ERROR] element 'auc:Contacts' is REQUIRED EXACTLY ONCE for: '<name/>'</assert>
     </rule>
   </pattern>
-  <!--    
+  <!--
     This pattern ensures there is at least one Report in a Facility
     <severity> error
   -->
@@ -67,7 +67,7 @@
       <assert test="auc:Reports/auc:Report">[ERROR] element 'auc:Report' is REQUIRED AT LEAST ONCE for: '<name/>'</assert>
     </rule>
   </pattern>
-  <!--    
+  <!--
     This pattern ensures there is at least one Scenario in a Report
     <severity> error
   -->
diff --git a/bsyncviewer/testsuitelib/scenarioElements.sch b/bsyncviewer/testsuitelib/scenarioElements.sch
index 06c9f5be..163e1b48 100644
--- a/bsyncviewer/testsuitelib/scenarioElements.sch
+++ b/bsyncviewer/testsuitelib/scenarioElements.sch
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
   <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
-  <!--  
+  <!--
     For logic that pertains to Scenario elements
 -->
   <!--
-    A baseline scenario must be defined.  Within the baseline scenario, the following 
+    A baseline scenario must be defined.  Within the baseline scenario, the following
     must be defined exactly: auc:ScenarioType/auc:PackageOfMeasures/auc:ReferenceCase IDref='Baseline'
     TODO: Need to update BuildingSync-gem to look for following and change this function to look for:
       auc:ScenarioType/auc:CurrentBuilding/auc:CalculationMethod/auc:Modeled
diff --git a/bsyncviewer/testsuitelib/sectionElements.sch b/bsyncviewer/testsuitelib/sectionElements.sch
index 188e1da2..e8700b2e 100644
--- a/bsyncviewer/testsuitelib/sectionElements.sch
+++ b/bsyncviewer/testsuitelib/sectionElements.sch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
   <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
-  <!--  
+  <!--
     For logic that pertains to Section elements
 -->
   <!--
@@ -9,7 +9,7 @@
     can be run against any auc:Section element, it is typically restricted to 'Space function'
     element types, i.e. auc:Section[auc:SectionType='Space function']
     <severity> error
-    <param> parent - an auc:Section element.  
+    <param> parent - an auc:Section element.
 -->
   <pattern abstract="true" id="sec.mainDetails">
     <rule context="$parent">
@@ -22,7 +22,7 @@
     </rule>
   </pattern>
   <!--
-    Require that each auc:Section element is referenced to by exactly one of 
+    Require that each auc:Section element is referenced to by exactly one of
     each of the following elements via an @IDref:
     1. auc:Systems/auc:HVACSystems/auc:HVACSystem/auc:LinkedPremises/auc:Section/auc:LinkedSectionID
     2. auc:System/auc:LightingSystems/auc:LightingSystem/auc:LinkedPremises/auc:Section/auc:LinkedSectionID
diff --git a/bsyncviewer/testsuitelib/siteBuildingElements.sch b/bsyncviewer/testsuitelib/siteBuildingElements.sch
index 7473ea3f..f943d61a 100644
--- a/bsyncviewer/testsuitelib/siteBuildingElements.sch
+++ b/bsyncviewer/testsuitelib/siteBuildingElements.sch
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron">
   <ns prefix="auc" uri="http://buildingsync.net/schemas/bedes-auc/2019"/>
-  <!--  
-    For logic that pertains to either a Site OR a Building element.  
+  <!--
+    For logic that pertains to either a Site OR a Building element.
 -->
-  <!--  
-    This pattern checks that: atleast 1 city and 1 state OR 
+  <!--
+    This pattern checks that: atleast 1 city and 1 state OR
     1 climate zone are specified at the site OR building level.
     A warning is issued if more than one of each element is specified.
     <severity> error
diff --git a/bsyncviewer/urls.py b/bsyncviewer/urls.py
index b8d7149f..937d42d7 100644
--- a/bsyncviewer/urls.py
+++ b/bsyncviewer/urls.py
@@ -1,11 +1,11 @@
+from bsyncviewer import views
+from bsyncviewer.admin import admin_site
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib.auth import views as auth_views
-from django.urls import path, re_path, include
+from django.urls import include, path, re_path
 from rest_framework import routers
 
-from bsyncviewer import views
-from bsyncviewer.admin import admin_site
 from .views import emailView, successView
 
 app_name = 'bsyncviewer'
diff --git a/bsyncviewer/views.py b/bsyncviewer/views.py
index 3fc3421b..144549b2 100644
--- a/bsyncviewer/views.py
+++ b/bsyncviewer/views.py
@@ -3,39 +3,42 @@
 import subprocess
 import tempfile
 
+from bsyncviewer import forms
+from bsyncviewer.lib.tree_viewer import get_schema_jstree_data
+from bsyncviewer.lib.validator.workflow import ValidationWorkflow
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import update_session_auth_hash
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core.mail import BadHeaderError, send_mail
 from django.forms.models import model_to_dict
 from django.http import (
+    Http404,
     HttpResponse,
-    HttpResponseServerError,
     HttpResponseRedirect,
-    Http404,
+    HttpResponseServerError,
     JsonResponse
 )
-from django.core.mail import send_mail, BadHeaderError
-from django.shortcuts import render, redirect
-from django.urls import reverse_lazy, reverse
-from django.views.generic.edit import CreateView, UpdateView, DeleteView
+from django.shortcuts import redirect, render
+from django.urls import reverse, reverse_lazy
+from django.views.generic.edit import CreateView, DeleteView, UpdateView
+from rest_framework import views
+from rest_framework.parsers import MultiPartParser
+from rest_framework.response import Response
 
-from bsyncviewer import forms
-from bsyncviewer.lib.tree_viewer import get_schema_jstree_data
-from bsyncviewer.lib.validator.workflow import ValidationWorkflow
 from .models.attribute_enumeration_class import AttributeEnumerationClass
-from .models.bedes_models import BedesMapping, BedesTerm, BedesEnumeration, BedesEnumerationMapping
+from .models.bedes_models import (
+    BedesEnumeration,
+    BedesEnumerationMapping,
+    BedesMapping,
+    BedesTerm
+)
 from .models.enumeration import Enumeration
 from .models.schema import Schema
 from .models.use_case import UseCase
 
-from rest_framework import views
-from rest_framework.response import Response
-from rest_framework.parsers import MultiPartParser
-
-
 DEFAULT_SCHEMA_VERSION = settings.DEFAULT_SCHEMA_VERSION
 
 
diff --git a/docker/README.md b/docker/README.md
index d59bf97b..862dcca6 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -39,9 +39,9 @@ below on production, only for testing locally.
    cd /srv/selection-tool/
    docker-compose build
    ```
-  
+
  * Deploy
- 
+
    ```
    ./deploy.sh
    ```
diff --git a/docs/release_instructions.md b/docs/release_instructions.md
index 814ede65..e66f12b2 100644
--- a/docs/release_instructions.md
+++ b/docs/release_instructions.md
@@ -12,4 +12,3 @@ python docs/scripts/change_log.py –k GITHUB_API_TOKEN –s 2018-02-26 –e 201
 3. Paste the results (remove unneeded Accepted Pull Requests) into the CHANGELOG.md. Make sure to cleanup the formatting if needed.
 4. Once develop passes, then create a new PR from develop to master.
 5. Draft new Release from Github (https://github.com/BuildingSync/selection-tool/releases). Include list of changes since previous release (i.e., the content in the CHANGELOG.md)
-
diff --git a/requirements.txt b/requirements.txt
index 3fa2fae1..42291e67 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,4 +19,3 @@ tox==3.14.1
 
 # string matching
 jellyfish==0.7.1
-

From e62bca188a96d24c00bd47a317a57b74b246e148 Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Thu, 26 Mar 2020 22:29:23 -0600
Subject: [PATCH 11/14] clean up changelog

---
 CHANGELOG.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b065f410..5fcd1cd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # BuildingSync Use Case Selection Tool
 
-## Version 1.1.1 (Unreleased)
+## Version 1.1.1
 
 General updates:
 
@@ -9,8 +9,6 @@ General updates:
 
 Date Range: 12/21/20 - 03/26/20
 
-Closed Issues and Features:
-
 
 ## Version 1.1.0
 

From 98c4f5066ffddec536a92e67f9995172d24a13f1 Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Thu, 26 Mar 2020 22:31:33 -0600
Subject: [PATCH 12/14] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fcd1cd9..6bb1bb06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 General updates:
 
+* Parser changes to handle restriction by pattern
 * Adding L000 OpenStudio Simulation use case and example files
 * Dockerize TestSuite repository
 

From b4a54b39df3ca74a182406d25b09a5fa05264391 Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Fri, 27 Mar 2020 10:13:51 -0600
Subject: [PATCH 13/14] adding hvac examples

---
 bsyncviewer/templates/examples.html | 161 ++++++++++++++++++++++------
 1 file changed, 130 insertions(+), 31 deletions(-)

diff --git a/bsyncviewer/templates/examples.html b/bsyncviewer/templates/examples.html
index 59ffaf54..4e20f8c3 100644
--- a/bsyncviewer/templates/examples.html
+++ b/bsyncviewer/templates/examples.html
@@ -12,57 +12,156 @@
       <h2>Examples</h2>
     </header>
 
-    <!--start copy from TestSuite README -->
-    <h2 id="hvac-system-examples">HVAC System Examples</h2>
+    <h3 id="modeling-level-of-detail-definitions">Modeling Level of Detail Definitions</h2>
+    <p>The Modeling Level of Detail (MLOD) is similar in concept to the <a href="https://technical.buildingsmart.org/standards/mvd/">Model View Definitions (MVD)</a> defined by IFC. MLODs define a subset of the overall BuildingSync schema necessary for a specific use case or workflow. 
+    <p>Level definitions are in alignment with the ASHRAE Standard 211 levels as defined below:</p>
     <table>
     <thead>
     <tr class="header">
+    <th>MLOD</th>
+    <th>Use Case</th>
+    <th>Alignment to Std 211</th>
+    <th>Std 211 Section</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr class="odd">
+    <td>Level 000</td>
+    <td>Audit</td>
+    <td>Preliminary Analysis</td>
+    <td>Section 5.2.3</td>
+    </tr>
+    <tr class="even">
+    <td>Level 100</td>
+    <td>Audit</td>
+    <td>Level 1</td>
+    <td>Section 6.1</td>
+    </tr>
+    <tr class="odd">
+    <td>Level 200</td>
+    <td>Audit</td>
+    <td>Level 2</td>
+    <td>Section 6.2</td>
+    </tr>
+    <tr class="even">
+    <td>Level 300</td>
+    <td>Audit</td>
+    <td>Level 3</td>
+    <td>Section 6.3</td>
+    </tr>
+    <tr class="odd">
+    <td>Level 400</td>
+    <td>Audit</td>
+    <td>Not Applicable</td>
+    <td>Not Applicable</td>
+    </tr>
+    <tr class="even">
+    <td>Level 500</td>
+    <td>Audit</td>
+    <td>Not Applicable</td>
+    <td>Not Applicable</td>
+    </tr>
+    </tbody>
+    </table>
+
+    <!--start copy from TestSuite README -->
+    <h3 id="hvac-system-examples">HVAC System Examples</h3>
+    <p>Where the System Type specified below does not exactly match the enumeration in the BSync XML file, check the mapping defined by <a href="https://github.com/BuildingSync/BuildingSync-gem/blob/bb52655ebb8efeca44249277d3fb67ac60b4e610/lib/buildingsync/model_articulation/hvac_system.rb#L121-L143">map_primary_hvac_system_type_to_cbecs_system_type</a>. Additionally, see the <a href="https://github.com/BuildingSync/TestSuite/tree/L100_Schematron/examples/HVACSystems">examples/HVACSystems</a> directory for a tutorial and example files.</p>
+    <table style="width:100%;">
+    <colgroup>
+    <col width="35%" />
+    <col width="3%" />
+    <col width="10%" />
+    <col width="3%" />
+    <col width="3%" />
+    <col width="1%" />
+    <col width="4%" />
+    <col width="6%" />
+    <col width="29%" />
+    </colgroup>
+    <thead>
+    <tr class="header">
+    <th>File</th>
+    <th>Specified For</th>
     <th>System Type</th>
-    <th>Level 000</th>
-    <th>Level 100</th>
-    <th>Level 200</th>
+    <th>Translate Tested</th>
+    <th>Simulate Tested</th>
+    <th><a href="#modeling-level-of-detail-definitions">MLOD</a></th>
+    <th>Use Case</th>
+    <th>Validates Against</th>
+    <th>Description</th>
     </tr>
     </thead>
     <tbody>
     <tr class="odd">
-    <td>PSZ System</td>
-    <td></td>
-    <td><a href="https://github.com/BuildingSync/TestSuite/blob/master/tests/schema2.0.0-pr2/Level_100/inputs/L100_Instance1.xml">L100_Instance1.xml</a></td>
-    <td></td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/spec/use_cases/schema2.0.0/examples/L000_OpenStudio_Simulation_01.xml">L000_OpenStudio_Simulation_01.xml</a></td>
+    <td>Building</td>
+    <td>VAV with reheat</td>
+    <td>TRUE</td>
+    <td>TRUE</td>
+    <td>L000</td>
+    <td>OpenStudio_Simulation</td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/spec/use_cases/schema2.0.0/L000_OpenStudio_Simulation.sch">L000_OpenStudio_Simulation.sch</a></td>
+    <td>No system-type actually declared. System inferred from OpenStudio Standards based on Building's OccupancyClassification and Gross floor area.</td>
     </tr>
     <tr class="even">
-    <td>VAV</td>
-    <td></td>
-    <td><a href="https://github.com/BuildingSync/TestSuite/blob/master/tests/schema2.0.0-pr2/Level_100/inputs/L100_Instance2.xml">L100_Instance2.xml</a></td>
-    <td></td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/spec/use_cases/schema2.0.0/examples/L000_OpenStudio_Simulation_02.xml">L000_OpenStudio_Simulation_02.xml</a></td>
+    <td>Building</td>
+    <td>PSZ-AC with gas reheat</td>
+    <td>TRUE</td>
+    <td>TRUE</td>
+    <td>L000</td>
+    <td>OpenStudio_Simulation</td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/spec/use_cases/schema2.0.0/L000_OpenStudio_Simulation.sch">L000_OpenStudio_Simulation.sch</a></td>
+    <td>No system-type actually declared. System inferred from OpenStudio Standards based on Building's OccupancyClassification and Gross floor area.</td>
     </tr>
     <tr class="odd">
-    <td>Shared Boiler</td>
-    <td></td>
-    <td>TODO</td>
-    <td></td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/spec/use_cases/schema2.0.0/examples/L100_OpenStudio_Simulation_01.xml">L100_OpenStudio_Simulation_01.xml</a></td>
+    <td>Section-Retail</td>
+    <td>PSZ-AC with gas reheat</td>
+    <td>TRUE</td>
+    <td>TRUE</td>
+    <td>L100</td>
+    <td>OpenStudio_Simulation</td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/spec/use_cases/schema2.0.0/L100_OpenStudio_Simulation.sch">L100_OpenStudio_Simulation.sch</a></td>
+    <td>Packaged Rooftop Air Conditioner is mapped to PSZ-AC with gas reheat.</td>
     </tr>
     <tr class="even">
-    <td>DOAS &amp; Radiant</td>
-    <td></td>
-    <td>TODO</td>
-    <td></td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/spec/use_cases/schema2.0.0/examples/L100_OpenStudio_Simulation_01.xml">L100_OpenStudio_Simulation_01.xml</a></td>
+    <td>Section-Office</td>
+    <td>PVAV with PFP boxes</td>
+    <td>TRUE</td>
+    <td>TRUE</td>
+    <td>L100</td>
+    <td>OpenStudio_Simulation</td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/spec/use_cases/schema2.0.0/L100_OpenStudio_Simulation.sch">L100_OpenStudio_Simulation.sch</a></td>
+    <td>Packaged Rooftop VAV with Electric Reheat is mapped as PVAV with PFP boxes</td>
     </tr>
     <tr class="odd">
-    <td>Inferred from OpenStudio Standards</td>
-    <td><a href="https://github.com/BuildingSync/TestSuite/blob/master/tests/schema2.0.0-pr2/Level_000/inputs/L000_Instance1.xml">L000_Instance1.xml</a></td>
-    <td></td>
-    <td></td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/examples/HVACSystems/PSZ-AC-CDM-001.xml">PSZ-AC-CDM-001.xml</a></td>
+    <td>Section</td>
+    <td>PSZ-AC</td>
+    <td>N/A</td>
+    <td>N/A</td>
+    <td>L200</td>
+    <td>Audit</td>
+    <td>None</td>
+    <td>Example of constructing more complex, L200 system.</td>
     </tr>
     <tr class="even">
-    <td></td>
-    <td><a href="https://github.com/BuildingSync/TestSuite/blob/master/tests/schema2.0.0-pr2/Level_000/inputs/L000_Instance1.xml">L000_Instance2.xml</a></td>
-    <td></td>
-    <td></td>
+    <td><a href="https://github.com/BuildingSync/TestSuite/blob/L100_Schematron/examples/HVACSystems/PSZ-HP-CDM-001.xml">PSZ-HP-CDM-001.xml</a></td>
+    <td>Section</td>
+    <td>PSZ-HP</td>
+    <td>N/A</td>
+    <td>N/A</td>
+    <td>L200</td>
+    <td>Audit</td>
+    <td>None</td>
+    <td>Example of constructing more complex, L200 system.</td>
     </tr>
     </tbody>
     </table>
-    <h2 id="lighting-system-examples">Lighting System Examples</h2>
+    <h3 id="lighting-system-examples">Lighting System Examples</h3>
     <table>
     <thead>
     <tr class="header">
@@ -75,7 +174,7 @@ <h2 id="lighting-system-examples">Lighting System Examples</h2>
     <tbody>
     </tbody>
     </table>
-    <h2 id="premise-examples">Premise Examples</h2>
+    <h3 id="premise-examples">Premise Examples</h3>
     <table>
     <thead>
     <tr class="header">

From 4b74c320f9322aa83799ad623898b2bb5b8ad19f Mon Sep 17 00:00:00 2001
From: kflemin <katherine.fleming@nrel.gov>
Date: Fri, 27 Mar 2020 10:46:00 -0600
Subject: [PATCH 14/14] adding link to examples page

---
 bsyncviewer/templates/base.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bsyncviewer/templates/base.html b/bsyncviewer/templates/base.html
index 49311d54..2b96f502 100644
--- a/bsyncviewer/templates/base.html
+++ b/bsyncviewer/templates/base.html
@@ -45,6 +45,12 @@ <h1>
                           Validator
                       </a>
                   </li>
+                  <li class="{% active_page request 'examples'%}">
+                      <a href="{% url 'examples' %}">
+                        <i class="fa fa-book" aria-hidden="true"></i>
+                        Documentation
+                      </a>
+                  </li>
                   <li class="{% active_page request 'bsync'%}">
                       <a href="https://buildingsync.net/index.html">
                         <i class="fa fa-building" aria-hidden="true"></i>