diff --git a/RACK-Ontology/OwlModels/.gitignore b/RACK-Ontology/OwlModels/.gitignore
new file mode 100644
index 00000000..e8512c1a
--- /dev/null
+++ b/RACK-Ontology/OwlModels/.gitignore
@@ -0,0 +1,40 @@
+/AGENTS.owl
+/ANALYSIS.owl
+/ARP-4754A.owl
+/CONFIDENCE.owl
+/CPP.owl
+/CounterApplication.owl
+/CounterApplicationLLR.owl
+/CounterApplicationRequirements.owl
+/CounterApplicationTesting.owl
+/CounterApplicationUnitTesting.owl
+/DO-178C.owl
+/DO-330.owl
+/DOCUMENT.owl
+/GenerateCSV.owl
+/GeneratePropInfoCSV.owl
+/HAZARD.owl
+/HazardAssessment.owl
+/InGateRequirements.owl
+/MIL-STD-881D-AppxA.owl
+/MIL-STD-881D-AppxB.owl
+/MIL-STD-881D-AppxC.owl
+/MIL-STD-881D-AppxD.owl
+/MIL-STD-881D.owl
+/PROCESS.owl
+/PROV-S.owl
+/REQUIREMENTS.owl
+/REVIEW.owl
+/SACM-S.owl
+/SOFTWARE.owl
+/SYSTEM.owl
+/SadlBuiltinFunctions.owl
+/SadlImplicitModel.owl
+/TESTING.owl
+/Turnstiles.owl
+/RdfsSubset.owl
+/GenerateCSVQueries.owl
+/RunCSVQueries.owl
+/FILE.owl
+/BASELINE.owl
+/MODEL.owl
diff --git a/RACK-Ontology/OwlModels/CONFIDENCE.owl b/RACK-Ontology/OwlModels/CONFIDENCE.owl
index f6d0a3bc..b3d230a6 100644
--- a/RACK-Ontology/OwlModels/CONFIDENCE.owl
+++ b/RACK-Ontology/OwlModels/CONFIDENCE.owl
@@ -19,9 +19,8 @@
   <owl:Class rdf:ID="CONFIDENCE_ASSESSMENT">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="uncertainty"/>
         </owl:onProperty>
@@ -29,9 +28,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="disbelief"/>
         </owl:onProperty>
@@ -39,9 +37,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="belief"/>
         </owl:onProperty>
diff --git a/RACK-Ontology/OwlModels/FILE.owl b/RACK-Ontology/OwlModels/FILE.owl
index 25597435..a30f9f54 100644
--- a/RACK-Ontology/OwlModels/FILE.owl
+++ b/RACK-Ontology/OwlModels/FILE.owl
@@ -23,9 +23,8 @@
   <owl:Class rdf:ID="FILE">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="filename"/>
         </owl:onProperty>
@@ -63,9 +62,8 @@
   <owl:Class rdf:ID="FILE_HASH">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="hashValue"/>
         </owl:onProperty>
@@ -73,9 +71,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass rdf:resource="#HASH_TYPE"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="hashType"/>
         </owl:onProperty>
diff --git a/RACK-Ontology/OwlModels/HAZARD.owl b/RACK-Ontology/OwlModels/HAZARD.owl
index 7f9aa9bd..0fdf0b3f 100644
--- a/RACK-Ontology/OwlModels/HAZARD.owl
+++ b/RACK-Ontology/OwlModels/HAZARD.owl
@@ -46,15 +46,6 @@
         </owl:onProperty>
       </owl:Restriction>
     </rdfs:subClassOf>
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
-        >1</owl:maxCardinality>
-        <owl:onProperty>
-          <owl:DatatypeProperty rdf:ID="definition"/>
-        </owl:onProperty>
-      </owl:Restriction>
-    </rdfs:subClassOf>
     <rdfs:comment xml:lang="en">HAZARD as identified by some HAZARD_IDENTIFICATION ACTIVITY, to be assessed for certification</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
@@ -83,11 +74,6 @@
     <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
     <rdfs:domain rdf:resource="#HAZARD"/>
   </owl:DatatypeProperty>
-  <owl:DatatypeProperty rdf:about="#definition">
-    <rdfs:comment xml:lang="en">Description of the HAZARD</rdfs:comment>
-    <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-    <rdfs:domain rdf:resource="#HAZARD"/>
-  </owl:DatatypeProperty>
   <owl:DatatypeProperty rdf:about="#severity">
     <rdfs:comment xml:lang="en">the severity of the HAZARD</rdfs:comment>
     <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
diff --git a/RACK-Ontology/OwlModels/MODEL.owl b/RACK-Ontology/OwlModels/MODEL.owl
index c813ccce..35afc6d5 100644
--- a/RACK-Ontology/OwlModels/MODEL.owl
+++ b/RACK-Ontology/OwlModels/MODEL.owl
@@ -19,9 +19,8 @@
   <owl:Class rdf:ID="MODEL">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass rdf:resource="PROV-S#THING"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="models"/>
         </owl:onProperty>
diff --git a/RACK-Ontology/OwlModels/SOFTWARE.owl b/RACK-Ontology/OwlModels/SOFTWARE.owl
index b1c0708f..56091619 100644
--- a/RACK-Ontology/OwlModels/SOFTWARE.owl
+++ b/RACK-Ontology/OwlModels/SOFTWARE.owl
@@ -39,9 +39,8 @@
   <owl:Class rdf:ID="SWCOMPONENT">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass rdf:resource="#COMPONENT_TYPE"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="componentType"/>
         </owl:onProperty>
@@ -51,21 +50,6 @@
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
   <owl:Class rdf:ID="PACKAGE">
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:someValuesFrom>
-          <owl:Class>
-            <owl:oneOf rdf:parseType="Collection">
-              <rdf:Description rdf:about="AGENTS#PERSON"/>
-              <rdf:Description rdf:about="AGENTS#ORGANIZATION"/>
-            </owl:oneOf>
-          </owl:Class>
-        </owl:someValuesFrom>
-        <owl:onProperty>
-          <owl:ObjectProperty rdf:ID="performedBy"/>
-        </owl:onProperty>
-      </owl:Restriction>
-    </rdfs:subClassOf>
     <rdfs:comment xml:lang="en">ACTIVITY of running a PACKAGER to produce a package FILE</rdfs:comment>
     <rdfs:subClassOf rdf:resource="FILE#FILE_CREATION"/>
   </owl:Class>
@@ -129,7 +113,7 @@
     <rdfs:range rdf:resource="#COMPONENT_TYPE"/>
     <rdfs:domain rdf:resource="#SWCOMPONENT"/>
   </owl:ObjectProperty>
-  <owl:ObjectProperty rdf:about="#performedBy">
+  <owl:ObjectProperty rdf:ID="performedBy">
     <rdfs:comment xml:lang="en">AGENT(s) (e.g. PACKAGER) performing the packaging</rdfs:comment>
     <rdfs:domain>
       <owl:Class>
diff --git a/RACK-Ontology/OwlModels/SadlImplicitModel.owl b/RACK-Ontology/OwlModels/SadlImplicitModel.owl
index 4d77e1ca..2ab19b10 100644
--- a/RACK-Ontology/OwlModels/SadlImplicitModel.owl
+++ b/RACK-Ontology/OwlModels/SadlImplicitModel.owl
@@ -27,9 +27,8 @@
   <owl:Class rdf:ID="DataTable">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="dataLocation"/>
         </owl:onProperty>
@@ -37,11 +36,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass>
-          <owl:Class rdf:nodeID="A0"/>
-        </owl:onClass>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="dataContent"/>
         </owl:onProperty>
@@ -49,11 +45,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass>
-          <owl:Class rdf:nodeID="A1"/>
-        </owl:onClass>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="columnDescriptors"/>
         </owl:onProperty>
@@ -63,11 +56,8 @@
   <owl:Class rdf:ID="FunctionPattern">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass>
-          <owl:Class rdf:nodeID="A2"/>
-        </owl:onClass>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="argValues"/>
         </owl:onProperty>
@@ -75,11 +65,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass>
-          <owl:Class rdf:ID="Equation"/>
-        </owl:onClass>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="builtin"/>
         </owl:onProperty>
@@ -110,11 +97,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass>
-          <owl:Class rdf:nodeID="A3"/>
-        </owl:onClass>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="specifiedUnits"/>
         </owl:onProperty>
@@ -122,9 +106,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:about="#dataType"/>
         </owl:onProperty>
@@ -132,40 +115,19 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="localDescriptorName"/>
         </owl:onProperty>
       </owl:Restriction>
     </rdfs:subClassOf>
   </owl:Class>
-  <owl:Class rdf:nodeID="A0">
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A0"/>
-        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom>
-          <owl:Class rdf:ID="DataTableRow"/>
-        </owl:allValuesFrom>
-        <owl:onProperty rdf:resource="sadllistmodel#first"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
-  </owl:Class>
-  <owl:Class rdf:about="#Equation">
+  <owl:Class rdf:ID="Equation">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass>
-          <owl:Class rdf:nodeID="A1"/>
-        </owl:onClass>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="returnTypes"/>
         </owl:onProperty>
@@ -173,11 +135,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass>
-          <owl:Class rdf:nodeID="A1"/>
-        </owl:onClass>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="arguments"/>
         </owl:onProperty>
@@ -187,9 +146,8 @@
   <owl:Class rdf:ID="ExternalEquation">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="externalURI"/>
         </owl:onProperty>
@@ -198,45 +156,27 @@
     <rdfs:subClassOf rdf:resource="#Equation"/>
   </owl:Class>
   <owl:Class rdf:ID="GPAtom"/>
-  <owl:Class rdf:ID="Language"/>
-  <owl:Class rdf:nodeID="A3">
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A3"/>
-        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-        <owl:onProperty rdf:resource="sadllistmodel#first"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
-  </owl:Class>
-  <owl:Class rdf:nodeID="A1">
+  <owl:Class rdf:nodeID="A0">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A1"/>
+        <owl:allValuesFrom rdf:nodeID="A0"/>
         <owl:onProperty rdf:resource="sadllistmodel#rest"/>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:allValuesFrom rdf:resource="#DataDescriptor"/>
+        <owl:allValuesFrom rdf:resource="#GraphPattern"/>
         <owl:onProperty rdf:resource="sadllistmodel#first"/>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
   </owl:Class>
-  <owl:Class rdf:about="#DataTableRow">
+  <owl:Class rdf:ID="Language"/>
+  <owl:Class rdf:ID="DataTableRow">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass>
-          <owl:Class rdf:nodeID="A4"/>
-        </owl:onClass>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="rowValues"/>
         </owl:onProperty>
@@ -259,27 +199,11 @@
       <owl:Class rdf:ID="AugmentedType"/>
     </rdfs:subClassOf>
   </owl:Class>
-  <owl:Class rdf:nodeID="A5">
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A5"/>
-        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:resource="#GraphPattern"/>
-        <owl:onProperty rdf:resource="sadllistmodel#first"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
-  </owl:Class>
   <owl:Class rdf:ID="Script">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="script"/>
         </owl:onProperty>
@@ -287,9 +211,8 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass rdf:resource="#Language"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="language"/>
         </owl:onProperty>
@@ -299,8 +222,20 @@
   <owl:Class rdf:ID="UnittedQuantity">
     <rdfs:subClassOf rdf:resource="#ScientificConcept"/>
   </owl:Class>
-  <owl:Class rdf:ID="GPLiteralValue">
-    <rdfs:subClassOf rdf:resource="#GPAtom"/>
+  <owl:Class rdf:nodeID="A1">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:nodeID="A1"/>
+        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:resource="#anyDataType"/>
+        <owl:onProperty rdf:resource="sadllistmodel#first"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
   </owl:Class>
   <owl:Class rdf:nodeID="A2">
     <rdfs:subClassOf>
@@ -317,12 +252,29 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
   </owl:Class>
+  <owl:Class rdf:nodeID="A3">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:nodeID="A3"/>
+        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:resource="#DataTableRow"/>
+        <owl:onProperty rdf:resource="sadllistmodel#first"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
+  </owl:Class>
+  <owl:Class rdf:ID="GPLiteralValue">
+    <rdfs:subClassOf rdf:resource="#GPAtom"/>
+  </owl:Class>
   <owl:Class rdf:ID="GPVariable">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="gpVariableName"/>
         </owl:onProperty>
@@ -330,15 +282,29 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf rdf:resource="#GPAtom"/>
   </owl:Class>
+  <owl:Class rdf:nodeID="A4">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:nodeID="A4"/>
+        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+        <owl:onProperty rdf:resource="sadllistmodel#first"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
+  </owl:Class>
   <owl:Class rdf:ID="GPResource">
     <rdfs:subClassOf rdf:resource="#GPAtom"/>
   </owl:Class>
   <owl:Class rdf:ID="SemanticConstraint">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass rdf:nodeID="A5"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="constraints"/>
         </owl:onProperty>
@@ -347,45 +313,45 @@
     <rdfs:comment xml:lang="en">used to identify necessary patterns in semantic domain terms</rdfs:comment>
     <rdfs:subClassOf rdf:resource="#AugmentedType"/>
   </owl:Class>
-  <owl:Class rdf:nodeID="A4">
+  <owl:Class rdf:ID="TriplePattern">
+    <rdfs:subClassOf rdf:resource="#GraphPattern"/>
+  </owl:Class>
+  <owl:Class rdf:ID="Rule"/>
+  <owl:Class rdf:nodeID="A5">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A4"/>
+        <owl:allValuesFrom rdf:nodeID="A5"/>
         <owl:onProperty rdf:resource="sadllistmodel#rest"/>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:allValuesFrom rdf:resource="#anyDataType"/>
+        <owl:allValuesFrom rdf:resource="#DataDescriptor"/>
         <owl:onProperty rdf:resource="sadllistmodel#first"/>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
   </owl:Class>
-  <owl:Class rdf:ID="TriplePattern">
-    <rdfs:subClassOf rdf:resource="#GraphPattern"/>
-  </owl:Class>
-  <owl:Class rdf:ID="Rule"/>
   <owl:Class rdf:ID="NamedQuery"/>
   <owl:ObjectProperty rdf:about="#arguments">
-    <rdfs:range rdf:nodeID="A1"/>
+    <rdfs:range rdf:nodeID="A5"/>
     <rdfs:domain rdf:resource="#Equation"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#specifiedUnits">
     <rdfs:domain rdf:resource="#DataDescriptor"/>
     <rdfs:comment xml:lang="en">the array of possible units</rdfs:comment>
-    <rdfs:range rdf:nodeID="A3"/>
+    <rdfs:range rdf:nodeID="A4"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="gpObject">
     <rdfs:domain rdf:resource="#TriplePattern"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#dataContent">
     <rdfs:domain rdf:resource="#DataTable"/>
-    <rdfs:range rdf:nodeID="A0"/>
+    <rdfs:range rdf:nodeID="A3"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#columnDescriptors">
     <rdfs:domain rdf:resource="#DataTable"/>
-    <rdfs:range rdf:nodeID="A1"/>
+    <rdfs:range rdf:nodeID="A5"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="expression">
     <rdfs:domain rdf:resource="#Equation"/>
@@ -396,15 +362,15 @@
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#rowValues">
     <rdfs:domain rdf:resource="#DataTableRow"/>
-    <rdfs:range rdf:nodeID="A4"/>
+    <rdfs:range rdf:nodeID="A1"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#returnTypes">
-    <rdfs:range rdf:nodeID="A1"/>
+    <rdfs:range rdf:nodeID="A5"/>
     <rdfs:domain rdf:resource="#Equation"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#constraints">
     <rdfs:domain rdf:resource="#SemanticConstraint"/>
-    <rdfs:range rdf:nodeID="A5"/>
+    <rdfs:range rdf:nodeID="A0"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#argValues">
     <rdfs:comment xml:lang="en">values of arguments to the built-in</rdfs:comment>
diff --git a/RACK-Ontology/OwlModels/TESTING.owl b/RACK-Ontology/OwlModels/TESTING.owl
index 856fc627..08734e1c 100644
--- a/RACK-Ontology/OwlModels/TESTING.owl
+++ b/RACK-Ontology/OwlModels/TESTING.owl
@@ -20,6 +20,18 @@
     <rdfs:comment xml:lang="en">ACTIVITY of creating a TEST to participate in the evaluation of a requirement</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ACTIVITY"/>
   </owl:Class>
+  <owl:Class rdf:ID="TEST_PROCEDURE">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom>
+          <owl:Class rdf:ID="TEST_STEP"/>
+        </owl:allValuesFrom>
+        <owl:onProperty rdf:resource="PROV-S#content"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:comment xml:lang="en">A TEST_PROCEDURE is the TEST_STEPs that perform TESTs. </rdfs:comment>
+    <rdfs:subClassOf rdf:resource="PROV-S#COLLECTION"/>
+  </owl:Class>
   <owl:Class rdf:ID="TEST">
     <rdfs:comment xml:lang="en">Description of a single test</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
@@ -43,12 +55,30 @@
     <rdfs:comment xml:lang="en">The high-level outcome of a TEST_RESULT</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#THING"/>
   </owl:Class>
+  <owl:Class rdf:about="#TEST_STEP">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:maxCardinality>
+        <owl:onProperty>
+          <owl:ObjectProperty rdf:ID="nextStep"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:resource="#TEST"/>
+        <owl:onProperty rdf:resource="PROV-S#content"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:comment xml:lang="en">A TEST_STEP is a collection of TESTs that are performed in a single execution</rdfs:comment>
+    <rdfs:subClassOf rdf:resource="PROV-S#COLLECTION"/>
+  </owl:Class>
   <owl:Class rdf:ID="TEST_RESULT">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass rdf:resource="#TEST_STATUS"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="result"/>
         </owl:onProperty>
@@ -57,22 +87,82 @@
     <rdfs:comment xml:lang="en">Result corresponding to one execution of one TEST</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
+  <owl:Class rdf:ID="TEST_RECORD">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
+        <owl:onProperty>
+          <owl:ObjectProperty rdf:ID="logs"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:maxCardinality>
+        <owl:onProperty>
+          <owl:ObjectProperty rdf:ID="nextRecord"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:resource="#TEST_RESULT"/>
+        <owl:onProperty rdf:resource="PROV-S#content"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:comment xml:lang="en">a TEST_RECORD is a collection of TEST_RESULTs associated with a TEST_STEP</rdfs:comment>
+    <rdfs:subClassOf rdf:resource="PROV-S#COLLECTION"/>
+  </owl:Class>
   <owl:Class rdf:ID="TEST_EXECUTION">
     <rdfs:comment xml:lang="en">ACTIVITY of performing a TEST and record its corresponding TEST_RESULT</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ACTIVITY"/>
   </owl:Class>
+  <owl:Class rdf:ID="TEST_LOG">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:resource="#TEST_RECORD"/>
+        <owl:onProperty rdf:resource="PROV-S#content"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:comment xml:lang="en">A TEST_LOG is the TEST_RESULTs from executing a TEST_PROCEDURE</rdfs:comment>
+    <rdfs:subClassOf rdf:resource="PROV-S#COLLECTION"/>
+  </owl:Class>
   <owl:ObjectProperty rdf:ID="verifies">
     <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
     <rdfs:comment xml:lang="en">ENTITY(s) (e.g. REQUIREMENT) that this test verifies</rdfs:comment>
     <rdfs:range rdf:resource="PROV-S#ENTITY"/>
     <rdfs:domain rdf:resource="#TEST"/>
   </owl:ObjectProperty>
+  <owl:ObjectProperty rdf:about="#logs">
+    <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
+    <rdfs:comment xml:lang="en">TEST_STEP for which the TEST_RECORD is captured</rdfs:comment>
+    <rdfs:range rdf:resource="#TEST_STEP"/>
+    <rdfs:domain rdf:resource="#TEST_RECORD"/>
+  </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="confirms">
     <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
     <rdfs:comment xml:lang="en">Parent test(s) of this test result</rdfs:comment>
     <rdfs:range rdf:resource="#TEST"/>
     <rdfs:domain rdf:resource="#TEST_RESULT"/>
   </owl:ObjectProperty>
+  <owl:ObjectProperty rdf:about="#nextStep">
+    <rdfs:comment xml:lang="en">The next TEST_STEP in a sequence</rdfs:comment>
+    <rdfs:range rdf:resource="#TEST_STEP"/>
+    <rdfs:domain rdf:resource="#TEST_STEP"/>
+  </owl:ObjectProperty>
+  <owl:ObjectProperty rdf:about="#nextRecord">
+    <rdfs:comment xml:lang="en">The next TEST_RECORD that is the next in a sequence </rdfs:comment>
+    <rdfs:range rdf:resource="#TEST_RECORD"/>
+    <rdfs:domain rdf:resource="#TEST_RECORD"/>
+  </owl:ObjectProperty>
+  <owl:ObjectProperty rdf:ID="testProcedure">
+    <rdfs:subPropertyOf rdf:resource="PROV-S#used"/>
+    <rdfs:comment xml:lang="en">TEST_PROCEDURE that was executed.</rdfs:comment>
+    <rdfs:range rdf:resource="#TEST_PROCEDURE"/>
+    <rdfs:domain rdf:resource="#TEST_EXECUTION"/>
+  </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#result">
     <rdfs:comment xml:lang="en">Pass/Failed/Indeterminate status resulting from a TEST_EXECUTION</rdfs:comment>
     <rdfs:range rdf:resource="#TEST_STATUS"/>
diff --git a/RACK-Ontology/ontology/HARDWARE.sadl b/RACK-Ontology/ontology/HARDWARE.sadl
new file mode 100644
index 00000000..7c731a64
--- /dev/null
+++ b/RACK-Ontology/ontology/HARDWARE.sadl
@@ -0,0 +1,40 @@
+/* Copyright (c) 2021, General Electric Company, Galois, Inc.
+ *
+ * All Rights Reserved
+ *
+ * This material is based upon work supported by the Defense Advanced Research
+ * Projects Agency (DARPA) under Contract No. FA8750-20-C-0203.
+ *
+ * Any opinions, findings and conclusions or recommendations expressed in this
+ * material are those of the author(s) and do not necessarily reflect the views
+ * of the Defense Advanced Research Projects Agency (DARPA).
+ */
+
+uri "http://arcos.rack/HARDWARE" alias hw.
+import "http://arcos.rack/PROV-S".
+
+HWCOMPONENT is a type of ENTITY.
+    instantiates (note "What logical component (system) does this physical component instantiate or implement?")
+        describes HWCOMPONENT with values of type ENTITY.
+    componentType (note "Type of component")
+        describes HWCOMPONENT with a single value of type COMPONENT_TYPE.
+	partitions describes HWCOMPONENT with values of type PARTITION.
+
+PARTITION (note "a PARTIION divides a HWCOMPOENTS resources into protected, isolated execution space for software components.") is a type of ENTITY.
+
+COMPONENT_TYPE
+    (note "An open/extensible set of types of hardware components")
+    is a type of THING.
+Sensor
+    (note "a hardware component that interacts with the physical world outside the system of interest")
+    is a COMPONENT_TYPE
+    has identifier "Sensor".
+Bus
+    (note "a bus is a connection between hardware components that communicates data between the components")
+    is a COMPONENT_TYPE
+    has identifier "Bus".    
+    
+ComputePlatform
+    (note "a compute platform is a piece of hardware that executes software")
+    is a COMPONENT_TYPE
+    has identifier "ComputePlatform".    
\ No newline at end of file
diff --git a/RACK-Ontology/ontology/TESTING.sadl b/RACK-Ontology/ontology/TESTING.sadl
index 37cea177..9bf1c369 100644
--- a/RACK-Ontology/ontology/TESTING.sadl
+++ b/RACK-Ontology/ontology/TESTING.sadl
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, General Electric Company, Galois, Inc.
+/* Copyright (c) 2020-2021, General Electric Company, Galois, Inc.
  *
  * All Rights Reserved
  *
@@ -42,10 +42,34 @@ TEST_RESULT
 	confirms (note "Parent test(s) of this test result") describes TEST_RESULT with values of type TEST.
 	confirms is a type of wasImpactedBy.
 
+
+TEST_PROCEDURE (note "A TEST_PROCEDURE is the TEST_STEPs that perform TESTs. ") is a type of COLLECTION.
+	content of TEST_PROCEDURE only has values of type TEST_STEP.
+	
+	TEST_STEP (note "A TEST_STEP is a collection of TESTs that are performed in a single execution")is a type of COLLECTION.
+		content of TEST_STEP only has values of type TEST.
+		nextStep (note "The next TEST_STEP in a sequence" ) describes TEST_STEP with values of type TEST_STEP.
+		nextStep of TEST_STEP has at most 1 value.
+
+TEST_LOG (note "A TEST_LOG is the TEST_RESULTs from executing a TEST_PROCEDURE") is a type of COLLECTION.
+	content of TEST_LOG only has values of type TEST_RECORD.
+
+	
+	TEST_RECORD (note "a TEST_RECORD is a collection of TEST_RESULTs associated with a TEST_STEP") is a type of COLLECTION.
+		content of TEST_RECORD only has values of type TEST_RESULT.
+		nextRecord (note "The next TEST_RECORD that is the next in a sequence " ) describes TEST_RECORD with values of type TEST_RECORD.
+		nextRecord of TEST_RECORD has at most 1 value.
+		logs (note "TEST_STEP for which the TEST_RECORD is captured" ) describes TEST_RECORD with a single value of type TEST_STEP.
+		logs is a type of wasImpactedBy.
+
+
 TEST_DEVELOPMENT
 	(note "ACTIVITY of creating a TEST to participate in the evaluation of a requirement")
 	is a type of ACTIVITY.
-
+	
 TEST_EXECUTION
 	(note "ACTIVITY of performing a TEST and record its corresponding TEST_RESULT")
 	is a type of ACTIVITY.
+
+	testProcedure (note "TEST_PROCEDURE that was executed.")describes TEST_EXECUTION with values of type TEST_PROCEDURE.
+	testProcedure is a type of used.