diff --git a/src/metaschema/oscal_control-common_metaschema.xml b/src/metaschema/oscal_control-common_metaschema.xml
index 1f3443fc8e..09d9a7cac3 100644
--- a/src/metaschema/oscal_control-common_metaschema.xml
+++ b/src/metaschema/oscal_control-common_metaschema.xml
@@ -73,7 +73,16 @@
                         <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
             &allowed-values-control-group-property-name;
                         </allowed-values>
-                </constraint>
+<!--                        <allowed-values target=".[@name='assessment']/prop/@name" allow-other="yes">
+                                <enum value="method">The assessment method to use. This typically appears on parts with the name "assessment".</enum>
+                        </allowed-values>
+                        <has-cardinality target=".[@name='assessment']/prop[@name='method']" min-occurs="1"/>
+                        <allowed-values target=".[@name='assessment']/prop[@name='method']/@value">
+                                <enum value="INTERVIEW">The process of holding discussions with individuals or groups of individuals within an organization to once again, facilitate assessor understanding, achieve clarification, or obtain evidence.</enum>
+                                <enum value="EXAMINE">The process of reviewing, inspecting, observing, studying, or analyzing one or more assessment objects (i.e., specifications, mechanisms, or activities).</enum>
+                                <enum value="TEST">The process of exercising one or more assessment objects (i.e., activities or mechanisms) under specified conditions to compare actual with expected behavior.</enum>
+                        </allowed-values>
+-->                </constraint>
                 <remarks>
                         <p>A <code>part</code> provides for logical partitioning of prose, and can be thought of as a grouping structure (e.g., section). A <code>part</code> can have child parts allowing for arbitrary nesting of prose content (e.g., statement hierarchy). A <code>part</code> can contain <code>prop</code> objects that allow for enriching prose text with structured name/value information.</p>
                         <p>A <code>part</code> can be assigned an optional <code>id</code>, which allows for internal and external references to the textual concept contained within a <code>part</code>. A <code>id</code> provides a means for an OSCAL profile, or a higher layer OSCAL model to reference a specific part within a <code>catalog</code>. For example, an <code>id</code> can be used to reference or to make modifications to a control statement in a profile.</p>
diff --git a/src/metaschema/oscal_profile_metaschema.xml b/src/metaschema/oscal_profile_metaschema.xml
index 7bc0733640..179e0c8fb6 100644
--- a/src/metaschema/oscal_profile_metaschema.xml
+++ b/src/metaschema/oscal_profile_metaschema.xml
@@ -123,7 +123,7 @@
                               <formal-name>As-Is Structuring Directive</formal-name>
                               <description>An As-is element indicates that the controls should be structured in resolution as they are structured in their source catalogs. It does not contain any elements or attributes.</description>
                         </define-field>
-                        <define-assembly name="custom">
+                        <define-assembly name="custom" min-occurs="1">
                               <formal-name>Custom grouping</formal-name>
                               <description>A Custom element frames a structure for embedding represented controls in resolution.</description>
                               <model>
diff --git a/src/release/content-upgrade/json-prop-to-props.xsl b/src/release/content-upgrade/json-prop-to-props.xsl
new file mode 100644
index 0000000000..d986a18aa1
--- /dev/null
+++ b/src/release/content-upgrade/json-prop-to-props.xsl
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0"
+    xpath-default-namespace="http://www.w3.org/2005/xpath-functions"
+    xmlns="http://www.w3.org/2005/xpath-functions">
+    
+<!-- 
+    Command line invocation:
+    
+    $ java -jar $SAXON_HOME/saxon-he-10.2.jar -xsl:json-prop-to-props.xsl -it json-input=YOUR.json
+
+    where YOUR.json is your JSON file and the jar file is Saxon 10 or later.
+    
+    The process reads the file at this URL, parses it as JSON, maps it through a filter, and reports it back.
+    
+    -->
+    
+    <xsl:output method="text"/>
+    
+    <xsl:mode on-no-match="shallow-copy"/>
+    
+    <!-- The input JSON file -->
+    <xsl:param name="json-input" select="'url to json file'"/>
+    
+    <!-- The initial template that process the JSON -->
+    <xsl:template name="xsl:initial-template">
+        <xsl:variable name="mapped-result">
+            <xsl:apply-templates select="json-to-xml(unparsed-text($json-input))"/>
+        </xsl:variable>
+        <!--<xsl:copy-of select="$mapped-result"/>-->
+        <xsl:value-of select="xml-to-json($mapped-result)"/>
+    </xsl:template>
+    
+    <xsl:template match="array[@key='prop']">
+        <array key="props">
+            <xsl:apply-templates/>
+        </array>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/.gitignore b/src/specifications/profile-resolution/.gitignore
new file mode 100644
index 0000000000..c3dbbe3538
--- /dev/null
+++ b/src/specifications/profile-resolution/.gitignore
@@ -0,0 +1,2 @@
+!oscal-specs_share.xpr
+requirement-tests/output-actual/
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/example-set.xspec b/src/specifications/profile-resolution/example-set.xspec
new file mode 100644
index 0000000000..3a9945b3b0
--- /dev/null
+++ b/src/specifications/profile-resolution/example-set.xspec
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- autogenerated 2021-12-14T16:02:57.305-05:00 following model in example-set.xspec-->
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+               xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+               xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+               stylesheet="../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
+               run-as="external"
+               xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable">
+   <x:helper stylesheet="lib/oscal-profile-test-helper.xsl"/>
+   <!-- old tests are out of whack need update to current functionality /spec  -->
+   <!-- but the XSpec provides a functional model -->
+   <x:scenario label="Base test">
+      <!-- Alternative model for test scrubbing both the result and the expected
+           result for comparison -->
+      <x:context href="profile-resolution-examples/base-test_profile.xml"/>
+      <x:variable name="ov:expected-output"
+         href="profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml"/>
+      <x:expect label="Base test - fully resolved"
+         test="opr:scrub($x:result)" select="opr:scrub($ov:expected-output)"/>
+   </x:scenario>
+   
+   <x:scenario label="Testing base-test_profile.xml">
+      
+      <x:context href="profile-resolution-examples/base-test_profile.xml"/>
+      <x:expect label="Resolution of base-test_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing base2-test_profile.xml">
+      <x:context href="profile-resolution-examples/base2-test_profile.xml"/>
+      <x:expect label="Resolution of base2-test_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/base2-test_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing broken_profile.xml" pending="galtm">
+      <x:context href="profile-resolution-examples/broken_profile.xml"/>
+      <x:expect label="Resolution of broken_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/broken_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing circular_profile.xml">
+      <x:context href="profile-resolution-examples/circular_profile.xml"/>
+      <x:expect label="Resolution of circular_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/circular_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing exclude-call-test_profile.xml">
+      <x:context href="profile-resolution-examples/exclude-call-test_profile.xml"/>
+      <x:expect label="Resolution of exclude-call-test_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing full-test_profile.xml">
+      <x:context href="profile-resolution-examples/full-test_profile.xml"/>
+      <x:expect label="Resolution of full-test_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/full-test_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing home_profile.xml">
+      <x:context href="profile-resolution-examples/home_profile.xml"/>
+      <x:expect label="Resolution of home_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/home_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing import-twice_profile.xml">
+      <x:context href="profile-resolution-examples/import-twice_profile.xml"/>
+      <x:expect label="Resolution of import-twice_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/import-twice_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing include-all-no-children-test_profile.xml">
+      <x:context href="profile-resolution-examples/include-all-no-children-test_profile.xml"/>
+      <x:expect label="Resolution of include-all-no-children-test_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/include-all-no-children-test_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing include-all-test_profile.xml">
+      <x:context href="profile-resolution-examples/include-all-test_profile.xml"/>
+      <x:expect label="Resolution of include-all-test_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/include-all-test_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing include-call-with-children-test_profile.xml">
+      <x:context href="profile-resolution-examples/include-call-with-children-test_profile.xml"/>
+      <x:expect label="Resolution of include-call-with-children-test_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml"/>
+      <x:expect label="Includes grandparent in result" test="$x:result//o:control/@id = 'c3'"/>
+      <x:expect label="Includes grandchild in result"  test="$x:result//o:control/@id = 'c3.a-1'"/>
+      <x:expect label="Is missing a control not included"   test="not( $x:result//o:control/@id = 'c2' )"/>
+   </x:scenario>
+   <x:scenario label="Testing include-loose-param-test_profile.xml">
+      <x:context href="profile-resolution-examples/include-loose-param-test_profile.xml"/>
+      <x:expect label="Resolution of include-loose-param-test_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/include-loose-param-test_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing include-match-test_profile.xml">
+      <x:context href="profile-resolution-examples/include-match-test_profile.xml"/>
+      <x:expect label="Resolution of include-match-test_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/include-match-test_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing merge-implicit-keep_profile.xml">
+      <x:context href="profile-resolution-examples/merge-implicit-keep_profile.xml"/>
+      <x:expect label="Resolution of merge-implicit-keep_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/merge-implicit-keep_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing merge-keep-resources_profile.xml">
+      <x:context href="profile-resolution-examples/merge-keep-resources_profile.xml"/>
+      <x:expect label="Resolution of merge-keep-resources_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/merge-keep-resources_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing merge-keep_profile.xml">
+      <x:context href="profile-resolution-examples/merge-keep_profile.xml"/>
+      <x:expect label="Resolution of merge-keep_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/merge-keep_profile_RESOLVED.xml"/>
+   </x:scenario>
+   <x:scenario label="Testing modify-adds_profile.xml">
+      <x:context href="profile-resolution-examples/modify-adds_profile.xml"/>
+      <x:expect label="Resolution of modify-adds_profile.xml"
+                select="opr:scrub(.)"
+                href="profile-resolution-examples/output-expected/modify-adds_profile_RESOLVED.xml"/>
+   </x:scenario>
+</x:description>
diff --git a/src/specifications/profile-resolution/lib/build-examples-xspec.xsl b/src/specifications/profile-resolution/lib/build-examples-xspec.xsl
new file mode 100644
index 0000000000..68ea425445
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/build-examples-xspec.xsl
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/specml"
+    version="3.0">
+
+    <xsl:output indent="yes"/>
+
+<!-- This XSLT produces a set of file-oriented XSpecs binding to files named in the Specification document
+//req/@eg values -->
+
+    <xsl:template match="/">
+        <xsl:text>&#xA;</xsl:text>
+        <xsl:comment expand-text="true"> autogenerated { current-dateTime() } following model in example-set.xspec</xsl:comment>
+        <xsl:processing-instruction name="xml-model">href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:processing-instruction>
+        <xsl:processing-instruction name="xml-stylesheet">type="text/css" href="lib/xspec-oxygen.css"</xsl:processing-instruction>
+        <xsl:processing-instruction name="specification" expand-text="true">{ replace(document-uri(/),'.*/','') }</xsl:processing-instruction>
+        <x:description stylesheet="../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
+            run-as="external">
+
+            <!-- x:description/@run-as='external' permits the context item to be determined dynamically per scenario
+                cf https://github.com/xspec/xspec/wiki/External-Transformation#global-context-item
+                
+                helper function for cleaning up whitespace:
+                  see https://github.com/xspec/xspec/wiki/Integrating-Your-Own-Test-Helpers for
+                  for an example see https://github.com/xspec/xspec/blob/master/tutorial/helper/ws-only-text/href_stylesheet.xspec
+    -->
+
+            <x:helper stylesheet="lib/oscal-profile-test-helper.xsl"/>
+            <!-- looking at all the profile documents in the same directory as this XSLT -->
+
+            <xsl:apply-templates select="*" mode="make-file-scenario"/>
+
+        </x:description>
+
+    </xsl:template>
+
+    <xsl:template match="SPECIFICATION" mode="make-file-scenario" expand-text="true">
+        <xsl:for-each-group select="//eg" group-by="@href">
+            <x:scenario label="{ current-grouping-key() }">
+                <x:context href="{ current-grouping-key() }"/>
+                <xsl:apply-templates select="current-group()"
+                    mode="make-file-scenario"/>
+            </x:scenario>
+        </xsl:for-each-group>
+    </xsl:template>
+
+    <xsl:template match="head" mode="make-file-scenario"/>
+        
+
+    <xsl:template match="section" mode="test-header">
+        <!--<xsl:apply-templates select="parent::section" mode="#current"/>-->
+        <!--<xsl:text> </xsl:text>-->
+        <xsl:number level="multiple" format="1.1"/>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates select="head"/>
+        <xsl:text> | </xsl:text>
+    </xsl:template>
+    
+    <xsl:template match="req" mode="test-header">
+        <xsl:apply-templates select="ancestor::section[1]" mode="#current"/>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+<!-- dropped in default (no mode) traversal -->
+    <xsl:template match="eg"/>
+            
+    
+    
+    <xsl:template match="eg" mode="make-file-scenario" expand-text="true">
+        <xsl:apply-templates select="ancestor::req" mode="#current">
+            <xsl:with-param name="eg" select="."/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="req" mode="make-file-scenario" expand-text="true">
+        <xsl:param  required="true" name="eg" as="element(eg)?" />
+        <xsl:variable name="test-header">
+            <xsl:apply-templates select="." mode="test-header"/>
+        </xsl:variable>
+            
+        <x:scenario label="{ $test-header => normalize-space() }">
+            <xsl:if test="starts-with($eg,'PENDING')">
+                <xsl:attribute name="pending">[spec]</xsl:attribute>
+            </xsl:if>
+            <xsl:call-template name="make-file-scenario">
+                <xsl:with-param name="req-id" select="@id"/>
+                <xsl:with-param name="egfile" select="$eg/@href"/>
+            </xsl:call-template>
+        </x:scenario>
+        
+    </xsl:template>
+    
+    <xsl:template name="make-file-scenario" expand-text="true">
+        <xsl:param name="req-id" as="xs:string" required="true"/>
+        <xsl:param name="egfile" as="xs:string?" required="true"/>
+        <xsl:variable name="basename" as="xs:string" select="$egfile => substring-after('requirement-tests/') => replace('\.xml$','')"/>
+           <xsl:processing-instruction name="requirement">{ $req-id} </xsl:processing-instruction>
+            <!--<x:context href="requirement-tests/{ $egfile }"/>-->
+            
+            <x:expect label="Resolution of { $basename }.xml" select="opr:scrub(.)" href="requirement-tests/output-expected/{$basename}_RESOLVED.xml"/>
+    </xsl:template>
+
+    <xsl:template match="xref" expand-text="true">
+        <xsl:text>[Section {@rid}]</xsl:text>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/src/specifications/profile-resolution/lib/build-reqs-xspec.xsl b/src/specifications/profile-resolution/lib/build-reqs-xspec.xsl
new file mode 100644
index 0000000000..f4aaa279fb
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/build-reqs-xspec.xsl
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/specml"
+    version="3.0">
+
+    <xsl:output indent="yes"/>
+
+    <xsl:template match="/">
+        <xsl:text>&#xA;</xsl:text>
+        <xsl:comment expand-text="true"> autogenerated { current-dateTime() } following model in example-set.xspec</xsl:comment>
+        <xsl:processing-instruction name="xml-model">href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:processing-instruction>
+        <xsl:processing-instruction name="xml-stylesheet">type="text/css" href="lib/xspec-oxygen.css"</xsl:processing-instruction>
+        <xsl:processing-instruction name="specification" expand-text="true">{ replace(document-uri(/),'.*/','') }</xsl:processing-instruction>
+        <x:description stylesheet="../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
+            run-as="external">
+
+            <!-- x:description/@run-as='external' permits the context item to be determined dynamically per scenario
+                cf https://github.com/xspec/xspec/wiki/External-Transformation#global-context-item
+                
+                helper function for cleaning up whitespace:
+                  see https://github.com/xspec/xspec/wiki/Integrating-Your-Own-Test-Helpers for
+                  for an example see https://github.com/xspec/xspec/blob/master/tutorial/helper/ws-only-text/href_stylesheet.xspec
+    -->
+
+            <x:helper
+                stylesheet="lib/oscal-profile-test-helper.xsl"/>
+            <!-- looking at all the profile documents in the same directory as this XSLT -->
+
+            
+            <xsl:apply-templates select="//req" mode="make-file-scenario"/>
+
+        </x:description>
+
+    </xsl:template>
+
+    <xsl:template match="section" mode="test-header">
+        <!--<xsl:apply-templates select="parent::section" mode="#current"/>-->
+        <!--<xsl:text> </xsl:text>-->
+        <xsl:number level="multiple" format="1.1"/>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates select="head"/>
+        <xsl:text> | </xsl:text>
+    </xsl:template>
+    
+    
+    <xsl:template match="req" mode="test-header">
+        <xsl:apply-templates select="ancestor::section[1]" mode="#current"/>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <xsl:template match="eg"/>
+        
+    <xsl:template match="req" mode="make-file-scenario" expand-text="true">
+        <xsl:variable name="me" select="."/>
+        <xsl:variable name="test-header">
+            <xsl:apply-templates select="$me" mode="test-header"/>
+        </xsl:variable>
+        
+        <x:scenario label="{ $test-header => normalize-space() }">
+            <xsl:if test="empty(descendant::eg/@href)">
+                <xsl:attribute name="pending">[dev]</xsl:attribute>
+            </xsl:if>
+            <xsl:apply-templates select="descendant::eg" mode="make-file-scenario"/>
+        </x:scenario>
+    </xsl:template>
+    
+    <xsl:template mode="make-file-scenario" match="eg" expand-text="true">
+        <xsl:variable name="basename" as="xs:string" select="@href => substring-after('requirement-tests/') => replace('\.xml$','')"/>
+        <x:scenario label="Example TBD - {.}">
+            <xsl:if test="not(matches(@href,'\S')) or starts-with(.,'PENDING')">
+                <xsl:attribute name="pending">{ replace(.,'^PENDING:?\s*','') }</xsl:attribute>
+            </xsl:if>
+                
+            <xsl:if test="matches(@href,'\S')">
+                    <xsl:attribute name="label">Example { $basename }.xml - {.}</xsl:attribute>
+                    <xsl:processing-instruction name="requirement">{ ancestor::req[1]/@id } </xsl:processing-instruction>
+                    <x:context href="{ @href }"/>
+                    <x:expect label="Resolution of { $basename }.xml" select="opr:scrub(.)"
+                        href="requirement-tests/output-expected/{$basename}_RESOLVED.xml"/>
+                </xsl:if>
+                
+            
+        </x:scenario>
+    </xsl:template>
+    
+    <xsl:template match="xref" expand-text="true">
+        <xsl:text>[Section {@rid}]</xsl:text>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/src/specifications/profile-resolution/lib/build-testharness.xsl b/src/specifications/profile-resolution/lib/build-testharness.xsl
new file mode 100644
index 0000000000..6564fb9b40
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/build-testharness.xsl
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/specml"
+    exclude-result-prefixes="#all"
+    version="3.0">
+
+    <xsl:output indent="yes"/>
+
+    <xsl:template match="/">
+        <xsl:text>&#xA;</xsl:text>
+        
+        <!--<xsl:processing-instruction name="xml-model">href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:processing-instruction>
+        <xsl:processing-instruction name="xml-stylesheet">type="text/css" href="lib/xspec-oxygen.css"</xsl:processing-instruction>-->
+        <!--<xsl:processing-instruction name="specification" expand-text="true">{ replace(document-uri(/),'.*/','') }</xsl:processing-instruction>-->
+        <test-suite xmlns="http://csrc.nist.gov/ns/metaschema/test-suite/1.0"
+            xsi:schemaLocation="http://csrc.nist.gov/ns/metaschema/test-suite/1.0 unit-tests.xsd">
+            <xsl:apply-templates/>
+        </test-suite>
+        
+    </xsl:template>
+
+    <xsl:template match="/*/head"/>
+    
+    <xsl:template priority="22" match="section[empty(.//eg/@href)]"/>
+    
+    <xsl:template match="section" mode="test-header">
+        <!--<xsl:apply-templates select="parent::section" mode="#current"/>-->
+        <!--<xsl:text> </xsl:text>-->
+        <xsl:number level="multiple" format="1.1"/>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates select="head"/>
+        <xsl:text> | </xsl:text>
+    </xsl:template>
+    
+    
+    <xsl:template match="req" mode="test-header">
+        <xsl:apply-templates select="ancestor::section[1]" mode="#current"/>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <xsl:template match="eg"/>
+        
+    
+    
+    <xsl:template match="SPECIFICATION/section">
+        <test-collection name="{head/normalize-space(.)}" location="requirement-tests/">
+            <xsl:for-each-group select=".//eg[@href]" group-by="@href">
+                
+       
+        <xsl:variable name="basename" as="xs:string" select="current-grouping-key() => substring-after('requirement-tests/') => replace('\.xml$','')"/>
+        
+        <test-scenario name="{ $basename }">
+            <xsl:if test="matches(.,'\S')">
+            <example-description>
+                <xsl:apply-templates/>
+            </example-description>
+            </xsl:if>
+            <xsl:for-each select="current-group()/parent::req">
+            <addresses-requirement requirement-id="{ @id }">
+                <xsl:apply-templates select="."/> <!-- note no mode -->
+            </addresses-requirement>
+            </xsl:for-each>
+                <resolve-profile>
+                    <profile-source source-format="XML" location="{ @href/replace(.,'.*/','') }"/>
+                </resolve-profile>
+            <expected-resolution source-format="XML" location="output-expected/{ @href/replace(.,'.*/','') }"/>
+            </test-scenario>
+            </xsl:for-each-group>
+            
+        <!--<x:scenario label="Example TBD - {.}">
+            <xsl:if test="not(matches(@href,'\S')) or starts-with(.,'PENDING')">
+                <xsl:attribute name="pending">{ replace(.,'^PENDING:?\s*','') }</xsl:attribute>
+            </xsl:if>
+                
+            <xsl:if test="matches(@href,'\S')">
+                    <xsl:attribute name="label">Example { $basename }.xml - {.}</xsl:attribute>
+                    <xsl:processing-instruction name="requirement">{ ancestor::req[1]/@id } </xsl:processing-instruction>
+                    <x:context href="{ @href }"/>
+                    <x:expect label="Resolution of { $basename }.xml" select="opr:scrub(.)"
+                        href="requirement-tests/output-expected/{$basename}_RESOLVED.xml"/>
+                </xsl:if>
+                
+            
+        </x:scenario>-->
+        </test-collection>
+    </xsl:template>
+    
+    <xsl:template match="xref" expand-text="true">
+        <xsl:text>[Section {@rid}]</xsl:text>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/src/specifications/profile-resolution/lib/build-xspec.xsl b/src/specifications/profile-resolution/lib/build-xspec.xsl
new file mode 100644
index 0000000000..c3468468c1
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/build-xspec.xsl
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/specml"
+    version="3.0">
+
+    <xsl:output indent="yes"/>
+
+<!-- This XSLT produces a set of file-oriented XSpecs binding to files named in the Specification document
+//req/@eg values -->
+
+    <xsl:template match="/">
+        <xsl:text>&#xA;</xsl:text>
+        <xsl:comment expand-text="true"> autogenerated { current-dateTime() } following model in example-set.xspec</xsl:comment>
+        <xsl:processing-instruction name="xml-model">href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:processing-instruction>
+        <xsl:processing-instruction name="xml-stylesheet">type="text/css" href="lib/xspec-oxygen.css"</xsl:processing-instruction>
+        <xsl:processing-instruction name="specification" expand-text="true">{ replace(document-uri(/),'.*/','') }</xsl:processing-instruction>
+        <x:description stylesheet="../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
+            run-as="external">
+
+            <!-- x:description/@run-as='external' permits the context item to be determined dynamically per scenario
+                cf https://github.com/xspec/xspec/wiki/External-Transformation#global-context-item
+                
+                helper function for cleaning up whitespace:
+                  see https://github.com/xspec/xspec/wiki/Integrating-Your-Own-Test-Helpers for
+                  for an example see https://github.com/xspec/xspec/blob/master/tutorial/helper/ws-only-text/href_stylesheet.xspec
+    -->
+
+            <x:helper stylesheet="lib/oscal-profile-test-helper.xsl"/>
+            <!-- looking at all the profile documents in the same directory as this XSLT -->
+
+            <xsl:apply-templates select="*" mode="make-file-scenario"/>
+
+        </x:description>
+
+    </xsl:template>
+
+    <xsl:template match="SPECIFICATION" mode="make-file-scenario" expand-text="true">
+        <xsl:for-each-group select="descendant::req" group-by="@eg/tokenize(.,'\s+')">
+            <x:scenario label="{ current-grouping-key() }">
+                <x:context href="requirement-tests/{ current-grouping-key() }"/>
+                <xsl:apply-templates select="current-group()"
+                    mode="make-file-scenario">
+                    <xsl:with-param name="filename" select="current-grouping-key()"/>
+                </xsl:apply-templates>
+            </x:scenario>
+        </xsl:for-each-group>
+    </xsl:template>
+
+    <xsl:template match="head" mode="make-file-scenario"/>
+        
+
+    <xsl:template match="section" mode="test-header">
+        <!--<xsl:apply-templates select="parent::section" mode="#current"/>-->
+        <!--<xsl:text> </xsl:text>-->
+        <xsl:number level="multiple" format="1.1"/>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates select="head"/>
+        <xsl:text> | </xsl:text>
+    </xsl:template>
+    
+    <xsl:template match="req" mode="test-header">
+        <xsl:apply-templates select="ancestor::section[1]" mode="#current"/>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <!--<xsl:template match="req" mode="make-file-scenario" expand-text="true">
+        <xsl:variable name="me" select="."/>
+        <xsl:variable name="test-header">
+            <xsl:apply-templates select="$me" mode="test-header"/>
+        </xsl:variable>
+            
+        <x:scenario label="{ $test-header => normalize-space() }">
+            <xsl:if test="not(matches(@eg,'\S'))">
+                <xsl:attribute name="pending">[dev]</xsl:attribute>
+            </xsl:if>
+            <xsl:iterate select="@eg/tokenize(.,'\s+')">
+            <xsl:call-template name="make-file-scenario">
+                <xsl:with-param name="req-id" select="$me/@id"/>
+                <xsl:with-param name="filename" select="."/>
+            </xsl:call-template>
+        </xsl:iterate>
+        </x:scenario>
+        
+    </xsl:template>-->
+    
+    <xsl:template match="req" mode="make-file-scenario" expand-text="true">
+        <xsl:param name="filename" as="xs:string" required="true"/>
+        <xsl:variable name="filepath" as="xs:string">requirement-tests/{$filename}</xsl:variable>
+        <xsl:variable name="test-header">
+            <xsl:apply-templates select="." mode="test-header"/>
+        </xsl:variable>
+        
+        <x:scenario label="{ $test-header => normalize-space() }">
+            <xsl:text>&#xA;      </xsl:text>
+            <xsl:processing-instruction name="requirement">{ @id } </xsl:processing-instruction>
+            <!--<x:context href="requirement-tests/{ $filename }"/>-->
+            
+            <x:expect label="Resolution of { $filename }" select="opr:scrub(.)"
+                href="requirement-tests/output-expected/{ replace($filename,'\.xml$','_RESOLVED') }.xml"/>
+        </x:scenario>
+    </xsl:template>
+
+    <xsl:template match="xref" expand-text="true">
+        <xsl:text>[Section {@rid}]</xsl:text>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/src/specifications/profile-resolution/html-to-specml.xsl b/src/specifications/profile-resolution/lib/html-to-specml.xsl
similarity index 100%
rename from src/specifications/profile-resolution/html-to-specml.xsl
rename to src/specifications/profile-resolution/lib/html-to-specml.xsl
diff --git a/src/specifications/profile-resolution/lib/illustrate-resolution.xsl b/src/specifications/profile-resolution/lib/illustrate-resolution.xsl
new file mode 100644
index 0000000000..9eccf19845
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/illustrate-resolution.xsl
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:math="http://www.w3.org/2005/xpath-functions/math"
+    exclude-result-prefixes="xs math"
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0"
+    version="3.0">
+    
+<!--    For a profile, produces an HTML with views of sources and resolution result.
+    
+    Resolution results are read from `output-expected`
+    (but they could be generated dynamically)
+    -->
+    
+<!-- Limitations:
+    Reads only catalogs as imports, not profiles
+    Display is optimized for SP800-53/B case
+      nested parts not shown in patches
+      doesn't handle glob matching
+      doesn't match remove except by @id
+      
+    -->
+    <xsl:strip-space elements="*"/>
+     
+     <xsl:output method="html" html-version="5"/>
+    
+    
+     
+    <xsl:template match="/">
+         <html>
+             <head>
+                 <xsl:call-template name="style"/>
+             </head>
+             <body>
+                 <section id="import-maps">
+                     <xsl:apply-templates select="*/child::import" mode="show-import"/>
+                 </section>
+                 <section id="profile-map">
+                     <xsl:apply-templates select="*" mode="show-profile"/>
+                 </section>
+                 <section id="result-map">
+                     <xsl:apply-templates select="*" mode="show-result"/>
+                 </section>
+             </body>
+         </html>
+     </xsl:template>
+    
+    <xsl:template match="import[starts-with(@href,'#')]" mode="show-import">
+        <xsl:apply-templates select="." mode="head"/>
+        <xsl:variable name="imported" select="key('cross-reference',@href)/rlink[ends-with(@href,'.xml') or matches(@media-type,'xml')][1]/@href"/>
+        <xsl:call-template name="draw-import">
+            <xsl:with-param name="href" select="$imported"/>
+        </xsl:call-template>
+    </xsl:template>
+    
+    <xsl:template match="import" mode="show-import">
+        <xsl:apply-templates select="." mode="head"/>
+        <xsl:call-template name="draw-import">
+            <xsl:with-param name="href" select="@href"/>
+        </xsl:call-template>
+    </xsl:template>
+    
+    <xsl:template name="draw-import" expand-text="true">
+        <xsl:param name="href" required="yes"/>
+        <xsl:choose>
+            <xsl:when test="doc-available(resolve-uri($href,document-uri(/)))">
+                <xsl:for-each select="document($href)">
+                    <h4>In { name(child::*) }<code> { $href }</code></h4>
+                    <div class="docmap">
+                        <xsl:apply-templates mode="drawtree"/>
+                    </div>
+                </xsl:for-each>
+            </xsl:when>
+            <xsl:otherwise expand-text="true">
+                <h5 style="font-style:italic">No document found at { $href }</h5>
+            </xsl:otherwise>
+        </xsl:choose>
+        
+        
+    </xsl:template>
+    
+    
+    <xsl:template match="import" mode="head" expand-text="true">
+        <h3>Importing <code>{ @href }</code></h3>
+    </xsl:template>
+    
+    
+    
+    <xsl:key name="cross-reference" match="resource" use="'#' || @id"/>
+    <xsl:key name="cross-reference" match="resource" use="'#' || @uuid"/>
+    
+    <xsl:template match="profile" mode="show-profile" expand-text="true">
+        <h3>Profile <code>{ document-uri(/) => replace('.*/','') }</code></h3>
+        <div class="docmap">
+            <xsl:apply-templates select="." mode="drawtree"/>
+        </div>
+    </xsl:template>
+    
+    <xsl:template match="profile" mode="show-result" expand-text="true">
+        <xsl:variable name="where">{ /document-uri(.) }</xsl:variable>
+        <xsl:variable name="resolvedname">{ $where => replace('.+/','') => replace('\.xml$','_RESOLVED.xml') }</xsl:variable>
+        <xsl:variable name="resultpath">output-expected/{ $resolvedname }</xsl:variable>
+        <h3>Result <code>{ $resultpath }</code></h3>
+        <div class="docmap">
+            <xsl:apply-templates select="document($resultpath,/)" mode="drawtree"/>
+        </div>
+    </xsl:template>
+    
+    <xsl:template match="metadata" mode="drawtree"/>
+    
+    <xsl:template match="back-matter" mode="drawtree"/>
+    
+    <xsl:template match="title | prop | link | param/*" mode="drawtree"/>
+    
+    <xsl:template match="set-parameter/*" mode="drawtree"/>
+    
+    <xsl:template match="text()" mode="drawtree"/>
+    
+    <xsl:template match="*" mode="drawtree">
+        <details class="element" open="open">
+            <summary>
+            <div class="eflex">
+                <xsl:apply-templates select="." mode="tag"/>
+                <xsl:apply-templates select="." mode="contents"/>
+            </div>
+            </summary>
+            <xsl:apply-templates mode="#current"/>
+        </details>
+    </xsl:template>
+    
+    <xsl:template match="param | part | *[empty(child::*)] | add | remove | set-parameter" priority="-0.1" mode="drawtree">
+        <div class="element">
+            <div class="eflex">
+                <xsl:apply-templates select="." mode="tag"/>
+                <xsl:apply-templates select="." mode="contents"/>
+            </div>
+        </div>
+    </xsl:template>
+    
+    <xsl:template match="*" mode="contents">
+        <xsl:where-populated>
+            <div class="cnts">
+                <xsl:apply-templates select="@*" mode="contents"/>
+            </div>
+        </xsl:where-populated>
+    </xsl:template>
+    
+    <xsl:template match="param | set-parameter | add"  mode="contents">
+        <xsl:where-populated>
+            <div class="cnts">
+                <xsl:apply-templates select="*" mode="#current"/>
+            </div>
+        </xsl:where-populated>
+    </xsl:template>
+    
+    <xsl:template match="group | control"  mode="contents">
+        <xsl:where-populated>
+            <div class="cnts">
+                <xsl:apply-templates select="title" mode="contents"/>
+            </div>
+        </xsl:where-populated>
+    </xsl:template>
+    
+    <xsl:template match="part"  mode="contents">
+        <xsl:where-populated>
+            <div class="cnts">
+                <xsl:apply-templates select="descendant::insert" mode="contents"/>
+            </div>
+        </xsl:where-populated>
+    </xsl:template>
+    
+    <xsl:template match="param/* | set-parameter/* | add/* | insert | title" mode="contents">
+        <xsl:where-populated>
+            <div class="cnts-row">
+                <xsl:apply-templates select="." mode="tag"/>
+            </div>
+        </xsl:where-populated>
+    </xsl:template>
+    
+    <xsl:template match="@*" mode="contents" expand-text="true"/>
+    
+    <xsl:template match="*" mode="tag" expand-text="true">
+        <p class="tag">{ name() }</p>
+    </xsl:template>
+    
+    <xsl:template match="profile | profile//*" priority="-0.1" mode="tag" expand-text="true">
+        <p class="tag drctv">{ name() }</p>
+    </xsl:template>
+    
+    <xsl:template match="import" mode="tag" expand-text="true">
+        <p class="tag drctv">
+            <xsl:text>import</xsl:text>
+            <span class="flag">
+                <xsl:apply-templates select="." mode="get-href"/>
+            </span>
+        </p>
+    </xsl:template>
+    
+    <!-- support link to resource here -->
+    <xsl:template mode="get-href" match="import">
+        <xsl:value-of select="@href"/>
+    </xsl:template>
+    
+    <xsl:template match="with-id" mode="tag" expand-text="true">
+        <p class="flsb drctv tag ID_{ . }" onclick="flashClass('ID_{ . }')">with-id <span class="flag">{ . }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="set-parameter" mode="tag" expand-text="true">
+        <p class="tag drctv flsb ID_{ @param-id }" onclick="flashClass('ID_{ @param-id }')">set-parameter <span class="flag">{ @param-id }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="alter" mode="tag" expand-text="true">
+        <p class="flsb drctv tag ID_{ @control-id }" onclick="flashClass('ID_{ @control-id }')">alter <span class="flag">{ @control-id }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="group[exists(@id)]" mode="tag" expand-text="true">
+        <p class="flsb tag ID_{ @id }" onclick="flashClass('ID_{ @id }')">{ local-name() } <span class="flag">{ @id }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="control | param" mode="tag" expand-text="true">
+        <p class="tag flsb ID_{ @id }" onclick="flashClass('ID_{ @id }')">{ local-name() } <span class="flag">{ @id }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="resource" mode="tag" expand-text="true">
+        <p class="tag flsb ID_{ @uuid }" onclick="flashClass('ID_{ @uuid }')">resource <span class="flag">{ @uuid }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="insert" mode="tag" expand-text="true">
+        <p class="tag flsb ID_{ @id-ref}" onclick="flashClass('ID_{ @id-ref }')">insert <b>{ @type }</b> <span class="flag">{ @id-ref }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="combine" mode="tag" expand-text="true">
+        <p class="tag drctv">combine <span class="flag">{ @method }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="as-is" mode="tag" expand-text="true">
+        <p class="tag drctv">{ local-name() } <span class="flag">{ . }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="label | value" mode="tag" expand-text="true">
+        <!-- link builds from @id or @param-id of param or set-parameter parent -->
+        <xsl:variable name="id">ID_{ parent::*/(@id,@param-id)[1] }-{ local-name(.) }</xsl:variable>
+        <p class="flsb tag { $id }" onclick="flashClass('{ $id }')">{ local-name() } <span class="flag">{ . }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="rlink" mode="tag" expand-text="true">
+        <p class="tag">rlink <span class="flag">{ @href }</span></p>
+    </xsl:template>
+    
+    <xsl:template match="title" mode="tag" expand-text="true">
+        <p class="tag">title <span class="flag"><xsl:apply-templates select="." mode="inline"/></span></p>
+    </xsl:template>
+
+    <xsl:template match="prop[@id] | part[@id]" mode="tag" expand-text="true">
+        <p class="flsb tag ID_{ @id }" onclick="flashClass('ID_{ @id }')"> { local-name(.) } <b>{ @name }</b> <span class="flag">{ @id }</span> { [1 to count(child::*) ] ! '▮' }</p>
+    </xsl:template>
+    
+    
+    <xsl:template match="prop | part" mode="tag" expand-text="true">
+        <p class="tag">  { local-name(.) } <b>{ @name }</b><span class="flag">{ @value }</span></p>
+    </xsl:template>
+  
+    <xsl:template match="usage | constraint | guideline | select" mode="tag" expand-text="true">
+        <p class="flsb tag">{ local-name() } { (1 to count(child::*)) ! '▮' }</p>
+    </xsl:template>
+    
+    <xsl:template match="include-controls/@with-child-controls" mode="contents" expand-text="true">
+        <div class="cnts-row">
+            <p class="tag drctv">with child controls <span class="flag">{ . } </span></p>
+        </div>
+    </xsl:template>
+    
+    <xsl:template match="remove/@*" mode="contents" expand-text="true">
+        <div class="cnts-row">
+            <p class="tag drctv">{ replace(local-name(.),'\-',' ') } <span class="flag">{ . } </span></p>
+        </div>
+    </xsl:template>
+    
+
+    <xsl:template name="style" xml:space="preserve">
+      <style type="text/css">
+
+body { display: grid; grid-template-columns: 1fr 1fr 1fr;
+       grid-column-gap: 1vw;
+       font-family: sans-serif }
+       
+body > section {  border: thin solid black; padding: 0.4em; margin-top: 1em; max-height: 90vh; overflow: auto }
+
+.docmap p { margin: 0em }
+
+.docmap .element { outline: medium solid transparent }
+.docmap .element:hover { outline: medium solid #FDD7E4 }
+
+.docmap details.element { padding-left: 1em; margin-top: 0.2em }
+.docmap div.element { padding-left: 1em; margin-left: 1em; margin-top: 0.2em }
+
+details.element:not([open]) div.cnts { display: none }
+
+summary { display: list-item; list-style-position: outside; margin-left: 1em }
+
+div.eflex { display: inline-flex; align-items: start; gap:0.2em }
+
+div.eflex > * { flex: initial }
+
+p.tag { display: inline-block; background-color: midnightblue; color: white; padding: 0.4em; border-radius: 0.2em  }
+p.tag span.flag { display: inline-block; background-color: white; color: black;
+  padding: 0.1em; margin-left: 0.5em; }
+
+div.cnts  p.tag { margin-top:0.2em }
+p.tag.drctv { background-color: slategrey }
+
+div.cnts { display: inline-block; font-size: 80% }
+
+p.flsb:hover { background-color: royalblue }
+
+p.tag.ON { transition: background-color 0s, font-size 0.3s ease-out;
+      font-size: 120%;
+      background-color: steelblue !important }
+
+      h3 code { background-color: gainsboro }
+
+            </style>
+            <script type="text/javascript" >
+                 function flashClass(elemID) {
+                 let ilk = document.getElementsByClassName(elemID);
+                 for (let i of ilk) { i.classList.toggle('ON'); }
+            }
+            </script>
+        </xsl:template>
+     
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/lib/oscal-expected.sch b/src/specifications/profile-resolution/lib/oscal-expected.sch
new file mode 100644
index 0000000000..719b7fa7d7
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/oscal-expected.sch
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2"
+    xmlns:sqf="http://www.schematron-quickfix.com/validator/process"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    
+    <!--
+        Tests OSCAL for tightness.
+        Use IN ADDITION to appropriate schema validation
+        Applies to profiles, catalogs, and resolution results (catalogs)
+    -->
+    
+    <sch:ns uri="http://csrc.nist.gov/ns/oscal/1.0" prefix="o"/>
+    
+    <xsl:key name="internal-link" match="o:*[starts-with(@href,'#')]" use="@href"/>
+    
+    <xsl:key name="internal-resource" match="o:resource" use="'#' || @uuid"/>
+    
+    <sch:pattern>
+        <sch:rule context="o:link[@rel='resource']">
+            <sch:assert test="exists(key('internal-resource',@href))">Link corresponds to no resource in this document.</sch:assert>
+        </sch:rule>
+        <sch:rule context="o:resource">
+            <sch:let name="exception" value="o:prop[@name='keep']/@value='always'"/>
+            <sch:assert test="$exception or exists(key('internal-link',('#' || @uuid)))">Resource has no links.</sch:assert>
+        </sch:rule>
+    </sch:pattern>
+    
+</sch:schema>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/lib/oscal-profile-test-helper.xsl b/src/specifications/profile-resolution/lib/oscal-profile-test-helper.xsl
new file mode 100644
index 0000000000..44eb91412b
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/oscal-profile-test-helper.xsl
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="#all"
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0"
+    default-mode="scrubbing">
+
+    <!--
+
+    
+    XSLT provides utility functionality for testing OSCAL profile resolution.
+    
+    Function opr:scrub-document returns an OSCAL catalog or profile with 'cosmetic' whitespace removed,
+    for clean comparison.
+    
+    -->
+
+    <xsl:output method="xml"/>
+    
+    <xsl:strip-space
+        elements="catalog metadata param control group back-matter prop link part usage constraint guideline select remarks description test revisions revision role location party responsible-party address external-id resource citation rlink base64"/>
+
+
+    <!--All assemblies defined in the catalog model:
+        
+        https://raw.githubusercontent.com/wendellpiez/OSCAL/profile-resolution-update-v1a/xml/schema/oscal_catalog_schema.xsd
+        
+        //xs:element[ends-with(@type,'ASSEMBLY') or exists(xs:complexType[not(@mixed='true')])]/@name => distinct-values() => string-join(' | ')
+        
+        
+        catalog | metadata | param | control | group | back-matter | prop | link | part | usage | constraint | guideline | select | remarks | description | test | revisions | revision | role | location | party | responsible-party | address | external-id | resource | citation | rlink | base64
+        
+        
+    -->
+    <!--<xsl:template match="/">
+        <xsl:param name="source" select="." as="document-node()"/>
+        <xsl:document>
+          <xsl:apply-templates select="$source" mode="scrubbing"/>
+        </xsl:document>
+    </xsl:template>-->
+
+    <xsl:function name="opr:scrub" as="document-node()">
+        <xsl:param name="n" as="node()"/>
+        <xsl:document>
+          <xsl:apply-templates select="$n" mode="scrubbing"/>
+        </xsl:document>
+    </xsl:function>
+    
+    <xsl:template mode="scrubbing" match="* | text() | @*">
+        <xsl:copy>
+            <xsl:apply-templates mode="#current" select="@*"/>
+            <xsl:apply-templates mode="#current"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <!-- defends against whitespace/indentation glitches -->
+    <xsl:template mode="scrubbing" match="text()[matches(.,'\S') => not()]">
+        <xsl:variable name="wrapper" select="ancestor::p[1] | ancestor::li[1]"/>
+        <xsl:if test="not(. is $wrapper/descendant::text()[1]) and not(. is $wrapper/descendant::text()[last()])">
+            <xsl:next-match/>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template mode="scrubbing" match="catalog/metadata/prop[@name='resolution-tool']/@value">
+        <xsl:attribute name="value">...</xsl:attribute>
+    </xsl:template>
+
+    <xsl:template mode="scrubbing" match="catalog/metadata/link[@rel='source-profile']/@href">
+        <xsl:attribute name="href">...</xsl:attribute>
+    </xsl:template>
+
+    <xsl:template mode="scrubbing" match="last-modified">
+        <xsl:copy>...</xsl:copy>
+    </xsl:template>
+    
+    <xsl:template mode="scrubbing" match="catalog/@uuid">
+        <xsl:attribute name="uuid">...</xsl:attribute>
+    </xsl:template>
+    
+    <xsl:template mode="scrubbing" match="catalog | metadata | param | control | group | back-matter | prop | link | part | usage | constraint | guideline | select | remarks | description | test | revisions | revision | role | location | party | responsible-party | address | external-id | resource | citation | rlink | base64">
+        <xsl:copy>
+            <xsl:apply-templates mode="#current" select="@*"/>
+            <!-- strips comments and PIs too!  -->
+            <xsl:apply-templates mode="#current" select="child::*"/>
+        </xsl:copy>
+    </xsl:template>
+
+    
+</xsl:stylesheet>
diff --git a/src/specifications/profile-resolution/lib/reqs-md-punchlist.xsl b/src/specifications/profile-resolution/lib/reqs-md-punchlist.xsl
new file mode 100644
index 0000000000..327b870b08
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/reqs-md-punchlist.xsl
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns="http://csrc.nist.gov/ns/oscal/specml"
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/specml" version="3.0">
+
+    <xsl:output indent="yes"/>
+
+    <!-- This XSLT produces a set of file-oriented XSpecs binding to files named in the Specification document
+//req/@eg values -->
+
+    <xsl:output method="text"/>
+
+
+    <xsl:template match="SPECIFICATION" expand-text="true">
+        <xsl:variable name="items" as="element()*">
+            <xsl:apply-templates select="//req" mode="line-item"/>
+        </xsl:variable>
+        <xsl:apply-templates select="$items" mode="md"/>
+    </xsl:template>
+
+    <xsl:template match="item" mode="md">
+        <xsl:text expand-text="true">&#xA;- [{ if (eg/@href != '') then 'x' else ' ' }] </xsl:text>
+        <xsl:apply-templates mode="#current"/>
+    </xsl:template>
+
+    <xsl:template match="eg" mode="md">
+        <xsl:text expand-text="true"> [test { @href ! ('`' || . || '`')} </xsl:text>
+        <xsl:apply-templates/>
+        <xsl:text>]</xsl:text>
+    </xsl:template>
+
+    <xsl:template match="@id" mode="md" expand-text="true">`{.}`</xsl:template>
+
+    <xsl:mode name="line-item" on-no-match="shallow-copy"/>
+
+    <xsl:template match="req" mode="line-item">
+        <item>
+            <xsl:text expand-text="true">`{ @id }`</xsl:text>
+            <xsl:apply-templates select="." mode="test-header"/>
+            <xsl:apply-templates mode="#current"/>
+            <xsl:copy-of select="eg"/>
+        </item>
+    </xsl:template>
+
+    <xsl:template match="eg" mode="line-item"/>
+
+    <xsl:template match="head" mode="make-file-scenario"/>
+
+    <xsl:template match="section" mode="test-header">
+        <!--<xsl:apply-templates select="parent::section" mode="#current"/>-->
+        <xsl:text> *</xsl:text>
+        <xsl:number level="multiple" format="1.1"/>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates select="head"/>
+        <xsl:text>* </xsl:text>
+
+    </xsl:template>
+
+    <xsl:template match="req" mode="test-header">
+        <xsl:apply-templates select="ancestor::section[1]" mode="#current"/>
+    </xsl:template>
+
+    <xsl:template match="text()" mode="#all">
+        <xsl:text expand-text="true">{ replace(.,'\s+',' ') }</xsl:text>
+    </xsl:template>
+
+    <xsl:template match="xref" expand-text="true">
+        <xsl:text>[Section {@rid}]</xsl:text>
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/specifications/profile-resolution/lib/spec-checkup.sch b/src/specifications/profile-resolution/lib/spec-checkup.sch
new file mode 100644
index 0000000000..955268021f
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/spec-checkup.sch
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sch:schema
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2"
+    xmlns:sqf="http://www.schematron-quickfix.com/validator/process">
+
+    <sch:ns uri="http://csrc.nist.gov/ns/oscal/specml" prefix="os"/>
+    <sch:ns uri="http://www.jenitennison.com/xslt/xspec" prefix="x"/>
+    <sch:ns uri="http://csrc.nist.gov/ns/oscal/1.0" prefix="o"/>
+    
+    <sch:let name="test-filenames" value="/processing-instruction('specml-testset')/normalize-space(.)"/>
+    <sch:let name="test-set" value="document($test-filenames,/)"/>
+    
+    <sch:let name="known-tests" value="$test-set/*/os:requirement/os:test"/>
+    
+    <sch:let name="spec-filename" value="/processing-instruction('specml-spec')/normalize-space(.)"/>
+    <sch:let name="spec" value="document($spec-filename,/)"/>
+    
+    
+    <sch:pattern>
+        <sch:rule context="os:section">
+            <sch:assert test="count(ancestor::os:section) lt 5">section is too deep</sch:assert>
+        </sch:rule>
+    </sch:pattern>
+    
+    <sch:let name="all-requirements" value="//os:req"/>
+    
+    <sch:pattern>
+        <sch:rule context="os:req">
+            <sch:let name="me" value="."/>
+            <sch:let name="mine" value="$known-tests[parent::*/@id = $me/@id]"/>
+            <sch:assert test="count($all-requirements[@id=$me/@id]) eq 1">Requirement id '<sch:value-of select="@id"/>' is not distinct</sch:assert>
+            <sch:assert test="exists($mine)">No test is given for requirement "<sch:value-of select="@id"/>"</sch:assert>
+            <sch:report role="warn" test="$mine/@status = 'pending'">Requirement <sch:value-of select="if (count($mine[@status = 'pending']) gt 1) then 'tests are' else 'test is'"/> marked 'pending'</sch:report>
+            <!--<sch:let name="paths" value="descendant::os:eg"/>
+            <sch:let name="missing-eg" value="$paths[not(doc-available( resolve-uri(.,base-uri($me)) ))]"/>
+            <sch:assert test="empty($missing-eg)">No file found for example(s) <sch:value-of select="os:and-sequence($missing-eg)"/></sch:assert>
+            
+            <sch:let name="not-profile-eg" value="$paths[not(.=$missing-eg)][empty(document(.,$me)/o:profile)]"/>
+            <sch:assert test="empty($not-profile-eg)">Example files(s) not an OSCAL profile: <sch:value-of select="os:and-sequence($not-profile-eg)"/></sch:assert>-->
+            </sch:rule>
+        
+        <!--<sch:rule context="os:eg">
+            <sch:let name="stub" value="starts-with(.,'PENDING')"/>
+            <sch:let name="missing" value="not(doc-available( resolve-uri(@href,base-uri(.)) ))"/>
+            <sch:let name="not-profile-eg" value=".[not($missing)]/empty(document(@href,root())/o:profile) "/>
+            <sch:report test="$missing and not($stub)">No file found for example(s) <sch:value-of select="@href"/></sch:report>
+            <sch:report test="$not-profile-eg and not($stub)">Example <sch:value-of select="@href"/> is not an OSCAL profile</sch:report>
+        </sch:rule>-->
+        
+        <sch:rule context="os:requirement">
+            <sch:assert test="@id = $spec//os:req/@id">Requirement id '<sch:value-of select="@id"/>' is not found in specification <sch:value-of select="$spec-filename"/></sch:assert>
+            <sch:assert role="warn" test="exists(os:test)">Requirement has no testing indicated</sch:assert>
+        </sch:rule>
+        
+    </sch:pattern>
+    
+    <xsl:function name="os:or-sequence" as="xs:string">
+        <xsl:param name="seq" as="item()*"/>
+        <xsl:value-of>
+            <xsl:iterate select="$seq">
+                <xsl:if test="position() gt 1">
+                    <xsl:choose>
+                        <xsl:when test="position() eq last()"> or </xsl:when>
+                        <xsl:otherwise>, </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:if>
+                <xsl:value-of select="."/>
+            </xsl:iterate>
+        </xsl:value-of>
+    </xsl:function>
+    
+    <xsl:function name="os:and-sequence" as="xs:string">
+        <xsl:param name="seq" as="item()*"/>
+        <xsl:value-of>
+            <xsl:iterate select="$seq">
+                <xsl:if test="position() gt 1">
+                    <xsl:choose>
+                        <xsl:when test="position() eq last()"> and </xsl:when>
+                        <xsl:otherwise>, </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:if>
+                <xsl:value-of select="."/>
+            </xsl:iterate>
+        </xsl:value-of>
+    </xsl:function>
+    
+</sch:schema>
diff --git a/src/specifications/profile-resolution/specml-html-hugo-uswds.xsl b/src/specifications/profile-resolution/lib/specml-html-hugo-uswds.xsl
similarity index 97%
rename from src/specifications/profile-resolution/specml-html-hugo-uswds.xsl
rename to src/specifications/profile-resolution/lib/specml-html-hugo-uswds.xsl
index f02f0a2799..68a2eb8d7c 100644
--- a/src/specifications/profile-resolution/specml-html-hugo-uswds.xsl
+++ b/src/specifications/profile-resolution/lib/specml-html-hugo-uswds.xsl
@@ -28,6 +28,7 @@
         <xsl:variable name="page">
           <xsl:apply-templates/>
         </xsl:variable>
+        <!-- Micropipeline postprocesses the results -->
         <xsl:apply-templates select="$page" mode="for-serialization"/>
         <!--</div>-->
     </xsl:template>
diff --git a/src/specifications/profile-resolution/specml-html-preview.xsl b/src/specifications/profile-resolution/lib/specml-html-preview.xsl
similarity index 64%
rename from src/specifications/profile-resolution/specml-html-preview.xsl
rename to src/specifications/profile-resolution/lib/specml-html-preview.xsl
index c98065bec8..b7bab0f301 100644
--- a/src/specifications/profile-resolution/specml-html-preview.xsl
+++ b/src/specifications/profile-resolution/lib/specml-html-preview.xsl
@@ -24,10 +24,16 @@
                 <xsl:call-template name="css"/>
             </head>
             <body>
-            <aside class="toc">
-                <h3>{ child::head } Specification</h3>
-                <xsl:call-template name="toc"/>
-            </aside>
+                <aside class="navpanel">
+                <nav class="toc">
+                    <h3>{ child::head } Specification</h3>
+                    <xsl:call-template name="toc"/>
+                </nav>
+                <div class="rqrmts">
+                    <h3>Requirements</h3>
+                    <xsl:call-template name="requirements"/>
+                </div>
+                </aside>
                 <main>
                     <xsl:apply-templates/>
                 </main>
@@ -43,14 +49,25 @@ body {{ line-height: 140%; font-family: "Cambria", serif }}
 
 * {{ box-sizing: border-box }}
 
-aside.toc {{ position: fixed; overflow-y: scroll; max-width: 36%; top: 1em; bottom: 0px; font-family: { $display-font } }}
+aside.navpanel {{ position: fixed; overflow-y: scroll; max-width: 36%; top: 1em; bottom: 0px; font-family: { $display-font } }}
+
+aside.navpanel div.rqrmts * {{ margin: 0em }}
+
+.req {{ background-color: pink; padding: 0.2em; font-size: 110%; margin-top: 0.2em !important }}
+div.rqrmts .req {{ font-size: 90%; border-top: thin solid red; border-bottom: thin solid red }}
+.req.should {{ background-color: peachpuff; border-top: thin solid orange; border-bottom: thin solid orange }}
+.req.may {{ background-color: cornsilk; border-top: thin solid gold; border-bottom: thin solid gold }}
+.req.recommended {{ background-color: mintcream; border-top: thin solid blue; border-bottom: thin solid blue }}
+
+span.reqlabel {{ background-color: mintcream; color: forestgreen; margin-right: 0.4em; padding: 0.1em; border: thin solid green }} 
+
 .toc ul   {{ list-style: none; padding-left: 1em }}
 
 main      {{ margin-left: 40%; max-width: 48em }}
 
 details {{ margin-top: 1.5em }}
 
-details details {{ margin-left: 2em; border-left: thin solid black; padding-left: 1em }}
+details details {{ border-left: thin solid black; padding-left: 1em }}
 
 summary > * {{ display: inline }}
 
@@ -69,6 +86,8 @@ a {{ color: inherit }}
 a.linked {{ color: inherit }}
 .toc a {{ text-decoration: none }}
 
+span.req {{ color: royalblue }}
+span.req:hover {{ background-color: beige }}
 
 .example {{ padding: 0.5em; border: thin dotted black; margin-top: 1em  }}
 .example > *:first-child {{ margin-top: 0em }}
@@ -85,7 +104,52 @@ a.linked {{ color: inherit }}
         </style>
     </xsl:template>
 
+    <xsl:template name="requirements">
+        <xsl:apply-templates mode="requirements" select="section"/>
+    </xsl:template>
 
+    <!-- In this mode we want no text by default   -->
+    <xsl:template match="*" mode="requirements">
+        <xsl:apply-templates select="*" mode="#current"/>
+    </xsl:template>
+    
+    <xsl:template match="section" mode="requirements">
+        <xsl:apply-templates select="head | p | ul | section" mode="#current"/>
+    </xsl:template>
+    
+    <xsl:template match="head" mode="requirements">
+        <h5>
+            <!--mode toc provides number and link-->
+            <xsl:apply-templates select="." mode="toc"/>
+        </h5>
+    </xsl:template>
+    
+    <xsl:template match="p" mode="requirements">
+        <xsl:apply-templates select=".//req" mode="#current"/>
+    </xsl:template>
+    
+    <!-- overriding imported template to provide link to index  -->
+    <xsl:template match="req">
+        <span class="{local-name()} {@level}">
+            <xsl:copy-of select="@id"/>
+            <a href="#ix-{@id}">
+              <xsl:apply-templates select="." mode="reqlabel"/>
+            </a>
+            <xsl:apply-templates/>
+        </span>
+    </xsl:template>
+    
+    <xsl:template match="req" mode="requirements">
+        <p class="req { @level }" id="ix-{@id}">
+            <a href="#{@id}">
+                <xsl:apply-templates select="." mode="reqlabel"/>
+            </a>
+            <xsl:text> </xsl:text>
+            <xsl:apply-templates/>
+            
+        </p>
+    </xsl:template>
+    
     <xsl:template name="toc">
         <ul>
             <xsl:apply-templates mode="toc" select="section"/>
@@ -111,10 +175,14 @@ a.linked {{ color: inherit }}
         </li>
     </xsl:template>
 
-    <xsl:template match="head" mode="header-text">
+    <xsl:template match="section" mode="secno">
         <span class="secnum">
           <xsl:number level="multiple" count="section" format="1.1"/>
         </span>
+    </xsl:template>
+    
+    <xsl:template match="head" mode="header-text">
+        <xsl:apply-templates select="parent::section" mode="secno"/>
         <xsl:text> </xsl:text>
         <xsl:apply-templates/>
     </xsl:template>
@@ -151,7 +219,6 @@ a.linked {{ color: inherit }}
         <h4 class="label">Source (profile):</h4>
     </xsl:template>
     
-    
     <xsl:template match="tagging[@whose='inter_catalog']" mode="tagging-label">
         <h4 class="label">Intermediate (catalog):</h4>
     </xsl:template>
diff --git a/src/specifications/profile-resolution/specml-html-static.xsl b/src/specifications/profile-resolution/lib/specml-html-static.xsl
similarity index 100%
rename from src/specifications/profile-resolution/specml-html-static.xsl
rename to src/specifications/profile-resolution/lib/specml-html-static.xsl
diff --git a/src/specifications/profile-resolution/specml-html-xslt1.xsl b/src/specifications/profile-resolution/lib/specml-html-xslt1.xsl
similarity index 78%
rename from src/specifications/profile-resolution/specml-html-xslt1.xsl
rename to src/specifications/profile-resolution/lib/specml-html-xslt1.xsl
index 3228178bdf..f723843d53 100644
--- a/src/specifications/profile-resolution/specml-html-xslt1.xsl
+++ b/src/specifications/profile-resolution/lib/specml-html-xslt1.xsl
@@ -23,44 +23,74 @@
      <xsl:apply-templates/>
    </xsl:template>
 
+   <xsl:template mode="head-ID" match="o:section/o:head">
+      <xsl:attribute name="id">
+         <xsl:text>sec-</xsl:text>
+         <xsl:number level="multiple" count="o:section" format="1_1"/>
+         <xsl:text>-head</xsl:text>
+      </xsl:attribute>
+   </xsl:template>
+   
+   <xsl:template mode="head-ID" match="o:div/o:head">
+      <xsl:attribute name="id">
+         <xsl:text>div-</xsl:text>
+         <xsl:number level="any" count="o:div" format="1"/>
+         <xsl:text>-head</xsl:text>
+      </xsl:attribute>
+   </xsl:template>
+   
+   <xsl:template mode="head-ID" match="o:head" priority="0.1">
+      <xsl:attribute name="id">
+         <xsl:text>head-</xsl:text>
+         <xsl:value-of select="generate-id()"/>
+      </xsl:attribute>
+   </xsl:template>
+   
    <xsl:template match="o:head">
-      <h1 id="{generate-id()}-head">
+      <h1>
+         <xsl:apply-templates select="." mode="head-ID"/>
          <xsl:apply-templates select="." mode="header-text"/>
       </h1>
    </xsl:template>
 
    <xsl:template priority="1" match="o:section/o:head">
-      <h2 id="{generate-id()}-head">
+      <h2>
+         <xsl:apply-templates select="." mode="head-ID"/>
          <xsl:apply-templates select="." mode="header-text"/>
       </h2>
    </xsl:template>
 
    <xsl:template priority="2" match="o:section/o:section/o:head">
-      <h3 id="{generate-id()}-head">
+      <h3>
+         <xsl:apply-templates select="." mode="head-ID"/>
          <xsl:apply-templates select="." mode="header-text"/>
       </h3>
    </xsl:template>
 
    <xsl:template priority="2" match="o:div/o:head">
-      <h3 class="divhead" id="{generate-id()}-head">
+      <h3>
+         <xsl:apply-templates select="." mode="head-ID"/>
          <xsl:apply-templates select="." mode="header-text"/>
       </h3>
    </xsl:template>
 
    <xsl:template priority="3" match="o:section/o:section/o:section/o:head">
-      <h4 id="{generate-id()}-head">
+      <h4>
+         <xsl:apply-templates select="." mode="head-ID"/>
          <xsl:apply-templates select="." mode="header-text"/>
       </h4>
    </xsl:template>
 
    <xsl:template priority="4" match="o:section/o:section/o:section/o:section/o:head">
-      <h5 id="{generate-id()}-head">
+      <h5>
+         <xsl:apply-templates select="." mode="head-ID"/>
          <xsl:apply-templates select="." mode="header-text"/>
       </h5>
    </xsl:template>
 
    <xsl:template priority="5" match="o:section/o:section/o:section/o:section/o:section/o:head">
-      <h6 id="{generate-id()}-head">
+      <h6>
+         <xsl:apply-templates select="." mode="head-ID"/>
          <xsl:apply-templates select="." mode="header-text"/>
       </h6>
    </xsl:template>
diff --git a/src/specifications/profile-resolution/specml-html-xslt3.xsl b/src/specifications/profile-resolution/lib/specml-html-xslt3.xsl
similarity index 100%
rename from src/specifications/profile-resolution/specml-html-xslt3.xsl
rename to src/specifications/profile-resolution/lib/specml-html-xslt3.xsl
diff --git a/src/specifications/profile-resolution/lib/specml-tidy-config.xml b/src/specifications/profile-resolution/lib/specml-tidy-config.xml
new file mode 100644
index 0000000000..672af71c06
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/specml-tidy-config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<refactoringOperationDescriptor 
+    xmlns="http://www.oxygenxml.com/ns/xmlRefactoring" 
+    id="tidySpecML" 
+    name="Tidy (reformat) SpecML">
+	<description>Basic whitespace cleanup</description>    
+	<script type="XSLT" href="specml-tidy.xsl"/>
+	<category>NIST ITL/CSD SpecML</category>
+</refactoringOperationDescriptor>
diff --git a/src/specifications/profile-resolution/lib/specml-tidy.xsl b/src/specifications/profile-resolution/lib/specml-tidy.xsl
new file mode 100644
index 0000000000..c7a2b2d8da
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/specml-tidy.xsl
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns="http://csrc.nist.gov/ns/oscal/specml"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/specml">
+    
+    <!-- Greedy stripper from everything but 'tagging' -->
+    <xsl:strip-space elements="*"/>
+    <xsl:preserve-space elements="tagging"/>
+    
+    <xsl:mode on-no-match="shallow-copy"/>
+    
+    <xsl:output indent="no" cdata-section-elements="tagging"/>
+    
+    <!-- element-only elements        
+  let $all := //*/name() => distinct-values()
+  let $mixed := //text()[normalize-space(.)]/name(..) => distinct-values()
+  let $empties := //*[empty(*) and not(normalize-space()]/name() => distinct-values()
+  return ($all[not(.=($mixed,$empty))] ! (. || '/*') ) => string-join(' | ')
+
+-->  
+    
+    <xsl:template
+        match="SPECIFICATION/* | section/* | ul/* | li/* | mapping/*">
+        <!--LF before start tag if no one has given an LF before us -->
+        
+        <xsl:call-template name="leading-indent"/>
+        <xsl:copy>
+            <xsl:copy-of select="@*"/>
+            <xsl:apply-templates/>
+            <!-- indent for end tag *only* for element-only, not their children -->
+            <xsl:apply-templates select="." mode="end-tag-ws"/>
+        </xsl:copy>
+        <!--LF after end tag-->
+        <xsl:text>&#xA;</xsl:text>
+    </xsl:template>
+    
+    <xsl:template name="leading-indent">
+        <xsl:if test="empty(preceding-sibling::*)">
+            <xsl:text>&#xA;</xsl:text>
+        </xsl:if>
+        <!-- indent -->
+        <xsl:for-each select="ancestor::*">
+            <xsl:text>  </xsl:text>
+        </xsl:for-each>
+    </xsl:template>
+    
+    <!-- will match any element not element-only -->
+    <xsl:template match="*" mode="end-tag-ws"/>
+    
+    <!--this time matching element-only, but not their children -->
+    <xsl:template
+        match="SPECIFICATION | section | ul | li | mapping" mode="end-tag-ws">
+        <xsl:for-each select="ancestor::*">
+            <xsl:text>  </xsl:text>
+        </xsl:for-each>
+    </xsl:template>
+    
+    <xsl:template priority="101" match="tagging">
+        <xsl:call-template name="leading-indent"/>
+        <xsl:copy>
+            <xsl:copy-of select="@*"/>
+            <xsl:text>&#xA;</xsl:text>
+            <!-- trimming leading and trailing whitespace only -->
+            <xsl:value-of select="replace(string(),'^\s+|\s$','','s')"/>
+        </xsl:copy>
+        <!--LF after end tag-->
+        <xsl:text>&#xA;</xsl:text>
+    </xsl:template>
+
+    <xsl:template match="p//text()">
+        <xsl:variable name="soonest" select="ancestor::p/descendant::text()[normalize-space(.)][1]"/>
+        <xsl:variable name="latest"  select="ancestor::p/descendant::text()[normalize-space(.)][last()]"/>
+        <xsl:choose>
+            <!-- A text node after this paragraph's last interesting text node is discarded -->
+            <xsl:when test=". >> $latest"/>
+            <!-- Also a text node before this paragraph's first interesting text node -->
+            <xsl:when test="$soonest >> ."/>
+            <xsl:otherwise>
+                <xsl:next-match/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <!-- Adds extra whitespace padding to inline markup -->
+    <xsl:template match="p//*">
+        <xsl:variable name="first" as="text()" select="ancestor::p/descendant::text()[normalize-space(.)][1]"/>
+        <xsl:variable name="last"  as="text()" select="ancestor::p/descendant::text()[normalize-space(.)][last()]"/>
+        <xsl:variable name="next"  as="xs:string?" select="following-sibling::node()[1]/normalize-space(.)"/>
+        <!-- pad if something interesting has appeared first -->
+        <xsl:if test=". >> $first">
+            <xsl:text> </xsl:text>
+        </xsl:if>
+        <xsl:next-match/>
+        <!-- pad again to replace trimmed space -->
+        <xsl:if test="$last >> . and ($next ! matches(.,'^[\s\w]'))">
+            <xsl:text> </xsl:text>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="text()">
+        <xsl:value-of select="normalize-space(.)"/>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/specml.css b/src/specifications/profile-resolution/lib/specml.css
similarity index 93%
rename from src/specifications/profile-resolution/specml.css
rename to src/specifications/profile-resolution/lib/specml.css
index f26d0b868d..c38b2ad4d4 100644
--- a/src/specifications/profile-resolution/specml.css
+++ b/src/specifications/profile-resolution/lib/specml.css
@@ -48,6 +48,12 @@ q:after {
 
 term { display: inline; font-family: sans-serif; font-weight: bold; font-size: 80% }
 
+req { display: inline; font-family: sans-serif; font-size: 90%; color: darkred; background-color: #f8d0e7 }
+req:before { content: oxy_textfield(
+                edit, '@id',
+                columns, 20)
+}
+
 revisit { display: inline; font-family: sans-serif; font-size: 90%; color: darkorange; background-color: yellow }
 
 propose { display: inline; font-family: sans-serif; font-size: 90%; color: steelblue; background-color: gainsboro }
@@ -72,12 +78,12 @@ tagging:after {
             values, "source_catalog, source_profile, target_catalog, inter_catalog");
 }
 
-mapping:before {
+eg {
      background-color: white; padding: 0em 0.5em; border: thin solid black;
      content:
             'unit test: ' oxy_urlChooser(
-              edit, "@unit-test",
-              columns 25) }
+              edit, "@href",
+              columns 32) }
 
 mapping { background-color: gainsboro; border: medium double black; padding: 0.5em; margin: 1em 0em }
 
diff --git a/src/specifications/profile-resolution/specml.rnc b/src/specifications/profile-resolution/lib/specml.rnc
similarity index 73%
rename from src/specifications/profile-resolution/specml.rnc
rename to src/specifications/profile-resolution/lib/specml.rnc
index 820bc54ef0..605b270a6e 100644
--- a/src/specifications/profile-resolution/specml.rnc
+++ b/src/specifications/profile-resolution/lib/specml.rnc
@@ -4,7 +4,11 @@ datatypes dtd="http://relaxng.org/ns/compatibility/datatypes/1.0"
 
 # Lightweight syntax sugar over tiny HTML subset
 
-start        = element SPECIFICATION { head.elem?, misc, section.elem+ }
+start        = spec.elem | tests.elem
+
+spec.elem    = element SPECIFICATION { head.elem?, misc, section.elem+ }
+
+tests.elem    = element TESTSETS { requirement.elem* }
 
 head.elem    = element head { inline-mixed }
 
@@ -24,16 +28,13 @@ tagging.elem = element tagging { attribute whose { text }, (text | hi | revisit)
 
 cf.elem = element cf { attribute file { text }?, empty }
 
-mapping.elem = element mapping {
-                attribute unit-test { text }?,
-                    head.elem?, (blocks*, tagging.elem)*, blocks* }
+mapping.elem = element mapping { head.elem?, (blocks*, tagging.elem)*, blocks* }
 
 section.elem = element section { attribute id { xsd:ID }?, head.elem, misc, section.elem* }
 
-inline-mixed = (text | a | code | term | revisit | propose | em | strong | q | src | tgt | xpath | xref | int | inter | req )*
+inline-mixed = (text | a | code | term | revisit | propose | em | strong | q | src | tgt | xpath | xref | int | req)*
 
 req = element req { attribute id { xsd:ID }?, attribute level { text }?, inline-mixed }
-inter = element inter { text }
 a       = element a       { attribute href { text }, text }
 code    = element code    { text }
 term    = element term    { text }
@@ -49,3 +50,7 @@ xref    = element xref    { attribute rid { dtd:IDREF }, empty }
 int     = element int     { text }
 # hi combines em and strong inside tagging
 hi      = element hi      { text }
+
+requirement.elem = element requirement { attribute level { 'may' | 'should' | 'must' | 'recommended' }?, attribute id { xsd:ID }?, element statement { text }?, test.elem* }
+
+test.elem = element test { attribute status { text }?, attribute file { xsd:anyURI }?, text }
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/lib/xspec-oxygen.css b/src/specifications/profile-resolution/lib/xspec-oxygen.css
new file mode 100644
index 0000000000..d3301c19db
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/xspec-oxygen.css
@@ -0,0 +1,68 @@
+@namespace x "http://www.jenitennison.com/xslt/xspec";
+
+* { display: block }
+
+/*
+ * 
+ * 
+ * 
+ * 
+ *
+ * */
+
+x|description { font-family: sans-serif }
+
+/* x|helper      { } */
+
+
+
+x|scenario { margin-top: 1em; border: thin solid purple; padding: 0.5em;
+  background-color: lightgreen; line-height: 1.8em }
+
+x|scenario[pending] { background-color: gainsboro }
+
+x|scenario[pending=clarification] { background-color: peachpuff }
+
+x|scenario:before {
+    content: "Scenario: "
+    oxy_textfield(
+          edit, '@label',
+          columns, 120);
+}
+
+x|scenario[pending]:before {
+    content:
+    "Scenario: Pending "
+        oxy_textfield(
+            edit, "@pending",
+            values, "deployment, repair, update, discussion",
+            color, "blue",
+            columns, 10) " "
+        oxy_textfield(
+          edit, '@label',
+          columns, 120);
+}
+
+x|context { }
+
+
+x|context:before {
+    content: "Testing context:"
+        oxy_urlChooser(        
+        edit, "@href",
+        columns 50);
+}
+
+
+x|expect { }
+
+
+x|expect:before {
+    content: "Expecting:"
+        oxy_urlChooser(        
+        edit, "@href",
+        columns 55);
+}
+
+
+
diff --git a/src/specifications/profile-resolution/lib/xspec-test-dev.sch b/src/specifications/profile-resolution/lib/xspec-test-dev.sch
new file mode 100644
index 0000000000..98f983bf7e
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/xspec-test-dev.sch
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sch:schema
+    xmlns:s="http://csrc.nist.gov/ns/oscal/specml"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2"
+    xmlns:sqf="http://www.schematron-quickfix.com/validator/process">
+    
+    <!--Use for validating XSpec tests.
+    
+    Assesses coverage by:
+      reporting where bindings to tests are broken
+      reporting examples or results not found -->
+    
+    <sch:ns uri="http://www.jenitennison.com/xslt/xspec" prefix="x"/>
+    <sch:ns uri="http://csrc.nist.gov/ns/oscal/specml"   prefix="s"/>
+    
+    <sch:let name="specxml" value="/processing-instruction('specification')/document(normalize-space(.),.)"/>
+    
+    <xsl:key name="requirement-codes" match="s:req" use="@id"/>
+    
+    <sch:pattern>
+        <sch:rule context="x:description/processing-instruction('specification')">
+            <sch:assert test="exists(document(normalize-space(.),.))">No specification found at <sch:value-of select="."/></sch:assert>
+        </sch:rule>
+        <sch:rule context="x:scenario[empty(x:scenario)]">
+                <sch:assert test="exists(processing-instruction('requirement')) or exists(@pending)">Scenario given without any test bindings</sch:assert>
+            
+            <!-- Turn these on when ready -->
+            <sch:report role="warning" test="false() and exists(@pending)" sqf:fix="remove-pending">Test is pending</sch:report>
+            <sch:assert role="info" test="true() or exists(@pending)" sqf:fix="add-pending-deployment add-pending-repair add-pending-update add-pending-discussion">Test is ready</sch:assert>
+            <sqf:fix id="remove-pending">
+                <sqf:description>
+                    <sqf:title>Stage as ready</sqf:title>
+                </sqf:description>
+                <sqf:delete match="@pending"/>
+            </sqf:fix>
+            <!--<sqf:fix id="add-pending-selecting">
+                <sqf:description>
+                    <sqf:title>Add pending</sqf:title>
+                </sqf:description>
+                
+                <sqf:user-entry name="pending_value" default="'discussion'">
+                    <sqf:description>
+                        <sqf:title>Pending value</sqf:title>
+                    </sqf:description>
+                    
+                </sqf:user-entry>
+                <sqf:add node-type="attribute" target="pending" select="$pending_value"/>                
+            </sqf:fix>-->
+            <sqf:fix id="add-pending-deployment">
+                <sqf:description>
+                    <sqf:title>Restage pending deployment</sqf:title>
+                </sqf:description>
+                
+                <sqf:add node-type="attribute" target="pending">deployment</sqf:add>
+            </sqf:fix>
+            <sqf:fix id="add-pending-repair">
+                <sqf:description>
+                    <sqf:title>Restage pending repair</sqf:title>
+                </sqf:description>
+                <sqf:add node-type="attribute" target="pending">repair</sqf:add>
+            </sqf:fix>
+            <sqf:fix id="add-pending-update">
+                <sqf:description>
+                    <sqf:title>Restage pending update</sqf:title>
+                </sqf:description>
+                <sqf:add node-type="attribute" target="pending">update</sqf:add>
+            </sqf:fix>
+            <sqf:fix id="add-pending-discussion">
+                <sqf:description>
+                    <sqf:title>Restage pending discussion</sqf:title>
+                </sqf:description>
+                <sqf:add node-type="attribute" target="pending">discussion</sqf:add>
+            </sqf:fix>
+        </sch:rule>
+        
+        <sch:rule context="x:scenario/processing-instruction('requirement')">
+            <sch:let name="requirement-id" value="normalize-space(.)"/>
+            <sch:assert test="exists($specxml/key('requirement-codes',$requirement-id))">Rule not found in spec</sch:assert>
+        </sch:rule>
+        <sch:rule context="x:context[exists(@href)]">
+            <sch:assert test="exists(../@pending) or (resolve-uri(@href,document-uri(/)) => doc-available())">No test input found in location <sch:value-of select="@href"/></sch:assert>
+        </sch:rule>
+        <sch:rule context="x:expect[exists(@href)]">
+            <sch:assert test="exists(../@pending) or (resolve-uri(@href,document-uri(/)) => doc-available())">No test result found in location <sch:value-of select="@href"/></sch:assert>
+        </sch:rule>
+    </sch:pattern>
+      
+    
+      
+</sch:schema>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/metaschema-datatypes.xsd b/src/specifications/profile-resolution/metaschema-datatypes.xsd
new file mode 100644
index 0000000000..a1f8e099ae
--- /dev/null
+++ b/src/specifications/profile-resolution/metaschema-datatypes.xsd
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified">
+
+	<xs:simpleType name="Base64Datatype">
+		<xs:restriction base="xs:base64Binary">
+			<xs:pattern value="\S(.*\S)?">
+				<xs:annotation>
+					<xs:documentation>A trimmed string, at least one character with no
+						leading or trailing whitespace.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="BooleanDatatype">
+		<xs:restriction base="xs:boolean">
+			<xs:pattern value="\S(.*\S)?">
+				<xs:annotation>
+					<xs:documentation>A trimmed string, at least one character with no
+						leading or trailing whitespace.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="DateDatatype">
+		<xs:restriction base="xs:date">
+			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})?"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="DateWithTimezoneDatatype">
+		<xs:annotation>
+			<xs:documentation>The xs:date with a required timezone.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="DateDatatype">
+			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})"/>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="DateTimeDatatype">
+		<xs:restriction base="xs:dateTime">
+			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T((2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?)(Z|[+-][0-9]{2}:[0-9]{2})?"/>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="DateTimeWithTimezoneDatatype">
+		<xs:annotation>
+			<xs:documentation>The xs:dateTime with a required timezone.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="DateTimeDatatype">
+			<xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T((2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?)(Z|[+-][0-9]{2}:[0-9]{2})"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="DayTimeDurationDatatype">
+		<xs:restriction base="xs:duration">
+			<xs:pattern value="[-+]?P([-+]?[0-9]+D)?(T([-+]?[0-9]+H)?([-+]?[0-9]+M)?([-+]?[0-9]+([.,][0-9]{0,9})?S)?)?"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="DecimalDatatype">
+		<xs:restriction base="xs:decimal">
+			<xs:pattern value="\S(.*\S)?">
+				<xs:annotation>
+					<xs:documentation>A trimmed string, at least one character with no
+						leading or trailing whitespace.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="EmailAddressDatatype">
+		<xs:annotation>
+			<xs:documentation>An email address</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="StringDatatype">
+			<xs:pattern value="\S.*@.*\S">
+				<xs:annotation>
+					<xs:documentation>Need a better pattern.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="HostnameDatatype">
+		<xs:annotation>
+			<xs:documentation>A host name</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="StringDatatype">
+			<!-- TODO: Need a good hostname pattern -->
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="IntegerDatatype">
+		<xs:restriction base="xs:integer">
+			<xs:pattern value="\S(.*\S)?">
+				<xs:annotation>
+					<xs:documentation>A trimmed string, at least one character with no
+						leading or trailing whitespace.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="IPV4AddressDatatype">
+		<xs:annotation>
+			<xs:documentation>The ip-v4-address type specifies an IPv4 address in
+				dot decimal notation.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="StringDatatype">
+			<xs:pattern value="((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])" />
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="IPV6AddressDatatype">
+		<xs:annotation>
+			<xs:documentation>The ip-v6-address type specifies an IPv6 address
+				represented in 8 hextets separated by colons.</xs:documentation>
+			<xs:documentation>This is based on the pattern provided here:
+				https://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses
+				with some customizations.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:whiteSpace value="collapse" />
+			<xs:pattern
+				value="(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|[fF][eE]80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::([fF]{4}(:0{1,4}){0,1}:){0,1}((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3,3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3,3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]))" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="NonNegativeIntegerDatatype">
+		<xs:restriction base="xs:nonNegativeInteger">
+			<xs:pattern value="\S(.*\S)?">
+				<xs:annotation>
+					<xs:documentation>A trimmed string, at least one character with no
+						leading or trailing whitespace.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="PositiveIntegerDatatype">
+		<xs:restriction base="xs:positiveInteger">
+			<xs:pattern value="\S(.*\S)?">
+				<xs:annotation>
+					<xs:documentation>A trimmed string, at least one character with no
+						leading or trailing whitespace.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="StringDatatype">
+		<xs:annotation>
+			<xs:documentation>A string, but not empty and not whitespace-only
+				(whitespace is U+9, U+10, U+32 or [ \n\t]+ )</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:annotation>
+				<xs:documentation>The OSCAL 'string' datatype restricts the XSD type by prohibiting leading 
+					and trailing whitespace, and something (not only whitespace) is required.</xs:documentation>
+			</xs:annotation>
+			<xs:whiteSpace value="preserve" />
+			<xs:pattern value="\S(.*\S)?">
+				<xs:annotation>
+					<xs:documentation>A trimmed string, at least one character with no
+						leading or trailing whitespace.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="TokenDatatype">
+		<xs:annotation>
+			<!--<xs:documentation>Matching XSD NCName, except whitespace is not collapsed.</xs:documentation> -->
+			<xs:documentation>A string token following the rules of XML "no
+				colon" names, with no whitespace. (XML names are single alphabetic
+				characters followed by alphanumeric characters, periods, underscores or dashes.)
+			</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="StringDatatype">
+<!-- 			value="(\p{L}|_)(\p{L}|\p{N}|[.\-_]|\xb7|[#x0300-#x036F#x203F-#x2040])*">-->
+			<xs:pattern
+				value="(\p{L}|_)(\p{L}|\p{N}|[.\-_])*">
+				<xs:annotation>
+					<!--<xs:documentation>An XML initial character (but not colon), followed 
+						by any XML name character (but not colon).</xs:documentation> -->
+					<xs:documentation>A single token may not contain whitespace.
+					</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="URIDatatype">
+		<xs:annotation>
+			<xs:documentation>A URI</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:anyURI">
+			<xs:pattern value="[a-zA-Z][a-zA-Z0-9+\-.]+:.*\S">
+				<xs:annotation>
+					<xs:documentation>Requires a scheme with colon per RFC 3986.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="URIReferenceDatatype">
+		<xs:annotation>
+			<xs:documentation>A URI reference, such as a relative URL
+			</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:anyURI">
+			<xs:pattern value="\S(.*\S)?">
+				<xs:annotation>
+					<xs:documentation>A trimmed URI, at least one character with no
+						leading or trailing whitespace.</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="UUIDDatatype">
+		<xs:annotation>
+			<xs:documentation>A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC
+				4122.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="StringDatatype">
+			<xs:pattern
+				value="[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}">
+				<xs:annotation>
+					<xs:documentation>A sequence of 8-4-4-4-12 hex digits, with extra
+						constraints in the 13th and 17-18th places for version 4 and 5
+					</xs:documentation>
+				</xs:annotation>
+			</xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+</xs:schema>
+
diff --git a/src/specifications/profile-resolution/oscal-specs_share.xpr b/src/specifications/profile-resolution/oscal-specs_share.xpr
new file mode 100644
index 0000000000..ddfa49e5f1
--- /dev/null
+++ b/src/specifications/profile-resolution/oscal-specs_share.xpr
@@ -0,0 +1,2128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <meta>
+        <filters directoryPatterns="" filePatterns="profile-resolution-spec.xpr" positiveFilePatterns="" showHiddenFiles="false"/>
+        <options>
+            <serialized xml:space="preserve">
+                <serializableOrderedMap>
+                    <entry>
+                        <String>custom.refactoring.dir</String>
+                        <String>${pd}/lib</String>
+                    </entry>
+                    <entry>
+                        <String>editor.format.preserve.spaces.elements.v11</String>
+                        <String-array>
+                            <String>xsl:text</String>
+                            <String>xsl:comment</String>
+                            <String>xsl:processing-instruction</String>
+                            <String>literallayout</String>
+                            <String>programlisting</String>
+                            <String>screen</String>
+                            <String>synopsis</String>
+                            <String>pre</String>
+                            <String>xd:pre</String>
+                            <String>tagging</String>
+                        </String-array>
+                    </entry>
+                    <entry>
+                        <String>key.editor.format.xml.option.pane</String>
+                        <Boolean>true</Boolean>
+                    </entry>
+                    <entry>
+                        <String>key.xml.refactoring.option.pane</String>
+                        <Boolean>true</Boolean>
+                    </entry>
+                    <entry>
+                        <String>scenario.associations</String>
+                        <scenarioAssociation-array>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>Untitled1.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Test (this) XSLT on Profile Resolution Spec XML</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>../../../../../NIST/OSCAL-working/FedRAMP/profilesJuly2022/ars-5.0-low-profile.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/output-actual/req-modify-alter-remove-match2_RESOLVED.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-modify-alter-remove-match2.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-modify-alter-remove-match1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-all-asis.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-merge-keep2.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-merge-usefirst2.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-loose-params2.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-loose-params1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-merge-usefirst1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-merge-keep1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-exclude1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>profile-resolution-specml-102plus.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Requirements summary from XSpec (Markdown)</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-with-parent-controls-none.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-with-parent-controls-yes2.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-with-parent-controls-no1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-with-parent-controls-no.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Produce RESOLUTION ILLUSTRATION from this profile</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-by-id.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Produce RESOLUTION ILLUSTRATION from this profile</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/keep-everything-twice.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-exclude5.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-exclude4.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-chained-deepA.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-exclude2.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-by-match.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>lib/build-examples-xspec.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Produce XSpec for //eg (file list) from SpecML</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>lib/specml-html-preview.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Produce HTML preview for (this) SpecML XML - refresh</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>profile-resolution-specml-demo.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Produce HTML preview for (this) SpecML XML - refresh and open</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>profile-resolution-specml-working2.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Produce Profile Resolution Spec - preview (HTML) - refresh</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>profile-resolution-specml-tidier2.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Test (this) XSLT on Profile Resolution Spec XML</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>specml-html-hugo-uswds.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Produce Profile Resolution Spec - publish (HTML for site)</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>specml-html-preview.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Produce Profile Resolution Spec - preview (HTML) - refresh and open</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>profile-resolution-working-specml.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>Produce Profile Resolution Spec - preview (HTML) - refresh</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-with-parent-controls-yes1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>XSL</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                        </scenarioAssociation-array>
+                    </entry>
+                    <entry>
+                        <String>scenarios</String>
+                        <scenario-array>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Produce HTML preview for (this) SpecML XML - refresh</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/lib/specml-html-preview.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${currentFileURL}</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <String>${pd}/${cfn}-preview.html</String>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Produce HTML preview for (this) SpecML XML - refresh and open</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/lib/specml-html-preview.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${currentFileURL}</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <String>${pd}/${cfn}-preview.html</String>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Produce Profile Resolution Spec - preview (HTML) - refresh</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/lib/specml-html-preview.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${pdu}/profile-resolution-specml.xml</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <String>${pd}/profile-resolution-preview.html</String>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Produce Profile Resolution Spec - preview (HTML) - refresh and open</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/lib/specml-html-preview.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${pdu}/profile-resolution-specml.xml</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <String>${pd}/profile-resolution-preview.html</String>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Produce Profile Resolution Spec - publish (HTML for site)</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/lib/specml-html-hugo-uswds.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${pdu}/profile-resolution-specml.xml</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <String>C:/Users/wap1/Documents/usnistgov/OSCAL/docs/content/documentation/specification/processing/profile-resolution.html</String>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Produce RESOLUTION ILLUSTRATION from this profile</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/lib/illustrate-resolution.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${currentFileURL}</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <String>illustrations/${cfn}-view.html</String>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Produce XSpec for //eg (file list) from SpecML</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/lib/build-examples-xspec.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${currentFileURL}</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <String>${pdu}/${cfn}-${timeStamp}.xspec</String>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Produce XSpec for //req from SpecML</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/lib/build-reqs-xspec.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${currentFileURL}</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <String>${pdu}/${cfn}-${timeStamp}.xspec</String>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>RESOLVE the current profile and write result to ./output-actual</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${currentFileURL}</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <String>output-actual/${cfn}_RESOLVED.xml</String>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list>
+                                        <transformationParameter>
+                                            <field name="paramDescription">
+                                                <paramDescriptor>
+                                                    <field name="localName">
+                                                        <String>uuid-method</String>
+                                                    </field>
+                                                    <field name="prefix">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="namespace">
+                                                        <null/>
+                                                    </field>
+                                                </paramDescriptor>
+                                            </field>
+                                            <field name="value">
+                                                <String>random-java</String>
+                                            </field>
+                                            <field name="hasXPathValue">
+                                                <Boolean>false</Boolean>
+                                            </field>
+                                            <field name="isStatic">
+                                                <Boolean>false</Boolean>
+                                            </field>
+                                        </transformationParameter>
+                                    </list>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Requirements summary from XSpec (Markdown)</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${pdu}/lib/reqs-md-punchlist.xsl</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${currentFileURL}</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <null/>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                            <scenario>
+                                <field name="advancedOptionsMap">
+                                    <null/>
+                                </field>
+                                <field name="name">
+                                    <String>Test (this) XSLT on Profile Resolution Spec XML</String>
+                                </field>
+                                <field name="baseURL">
+                                    <String></String>
+                                </field>
+                                <field name="footerURL">
+                                    <String></String>
+                                </field>
+                                <field name="fOPMethod">
+                                    <String>pdf</String>
+                                </field>
+                                <field name="fOProcessorName">
+                                    <String>Apache FOP</String>
+                                </field>
+                                <field name="headerURL">
+                                    <String></String>
+                                </field>
+                                <field name="inputXSLURL">
+                                    <String>${currentFileURL}</String>
+                                </field>
+                                <field name="inputXMLURL">
+                                    <String>${pdu}/profile-resolution-specml.xml</String>
+                                </field>
+                                <field name="defaultScenario">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="isFOPPerforming">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="type">
+                                    <String>XSL</String>
+                                </field>
+                                <field name="saveAs">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="openInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="outputResource">
+                                    <null/>
+                                </field>
+                                <field name="openOtherLocationInBrowser">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="locationToOpenInBrowserURL">
+                                    <null/>
+                                </field>
+                                <field name="openInEditor">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInHTMLPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInXMLPane">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="showInSVGPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="showInResultSetPane">
+                                    <Boolean>false</Boolean>
+                                </field>
+                                <field name="useXSLTInput">
+                                    <Boolean>true</Boolean>
+                                </field>
+                                <field name="xsltParams">
+                                    <list/>
+                                </field>
+                                <field name="cascadingStylesheets">
+                                    <String-array/>
+                                </field>
+                                <field name="xslTransformer">
+                                    <String>Saxon-PE</String>
+                                </field>
+                                <field name="extensionURLs">
+                                    <String-array/>
+                                </field>
+                            </scenario>
+                        </scenario-array>
+                    </entry>
+                    <entry>
+                        <String>validation.scenario.associations</String>
+                        <scenarioAssociation-array>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-with-parent-controls-no1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL Profile schema (current local copy)</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>../../../../../NIST/OSCAL-working/FedRAMP/profilesJuly2022/output-actual/ars-5.0-low-profile_RESOLVED.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL Catalog schema (current local copy)</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-loose-params1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL Profile schema (current local copy)</String>
+                                        <String>OSCAL profile resolution test check</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-all-asis.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL Profile schema (current local copy)</String>
+                                        <String>OSCAL profile resolution test check</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-exclude1.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL Profile schema (current local copy)</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-with-child-controls-no.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL Profile schema (current local copy)</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-exclude4.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL Profile schema (current local copy)</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/output-actual/</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL Catalog schema (current local copy)</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirements-working-set.xspec</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL profile resolution test check</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-all-flat.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL Profile schema (current local copy)</String>
+                                        <String>OSCAL profile resolution test check</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests/req-include-all_01.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL profile resolution test check</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>requirement-tests.xspec</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>OSCAL profile resolution test check</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                        </scenarioAssociation-array>
+                    </entry>
+                    <entry>
+                        <String>validation.scenarios</String>
+                        <validationScenario-array>
+                            <validationScenario>
+                                <field name="pairs">
+                                    <list>
+                                        <validationUnit>
+                                            <field name="validationType">
+                                                <validationUnitType>
+                                                    <field name="validationInputType">
+                                                        <String>text/xml</String>
+                                                    </field>
+                                                </validationUnitType>
+                                            </field>
+                                            <field name="url">
+                                                <String>${currentFileURL}</String>
+                                            </field>
+                                            <field name="validationEngine">
+                                                <validationEngine>
+                                                    <field name="engineType">
+                                                        <String>&lt;Default engine></String>
+                                                    </field>
+                                                    <field name="allowsAutomaticValidation">
+                                                        <Boolean>true</Boolean>
+                                                    </field>
+                                                </validationEngine>
+                                            </field>
+                                            <field name="allowAutomaticValidation">
+                                                <Boolean>true</Boolean>
+                                            </field>
+                                            <field name="extensions">
+                                                <null/>
+                                            </field>
+                                            <field name="validationSchema">
+                                                <validationUnitSchema>
+                                                    <field name="dtdSchemaPublicID">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="schematronPhase">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="type">
+                                                        <Integer>2</Integer>
+                                                    </field>
+                                                    <field name="uri">
+                                                        <String>file:/C:/Users/wap1/Documents/usnistgov/OSCAL/xml/schema/oscal_catalog_schema.xsd</String>
+                                                    </field>
+                                                </validationUnitSchema>
+                                            </field>
+                                            <field name="validationAdvancedSettings">
+                                                <null/>
+                                            </field>
+                                        </validationUnit>
+                                    </list>
+                                </field>
+                                <field name="type">
+                                    <String>Validation_scenario</String>
+                                </field>
+                                <field name="name">
+                                    <String>OSCAL Catalog schema (current local copy)</String>
+                                </field>
+                            </validationScenario>
+                            <validationScenario>
+                                <field name="pairs">
+                                    <list>
+                                        <validationUnit>
+                                            <field name="validationType">
+                                                <validationUnitType>
+                                                    <field name="validationInputType">
+                                                        <String>text/xml</String>
+                                                    </field>
+                                                </validationUnitType>
+                                            </field>
+                                            <field name="url">
+                                                <String>${currentFileURL}</String>
+                                            </field>
+                                            <field name="validationEngine">
+                                                <validationEngine>
+                                                    <field name="engineType">
+                                                        <String>&lt;Default engine></String>
+                                                    </field>
+                                                    <field name="allowsAutomaticValidation">
+                                                        <Boolean>true</Boolean>
+                                                    </field>
+                                                </validationEngine>
+                                            </field>
+                                            <field name="allowAutomaticValidation">
+                                                <Boolean>true</Boolean>
+                                            </field>
+                                            <field name="extensions">
+                                                <null/>
+                                            </field>
+                                            <field name="validationSchema">
+                                                <validationUnitSchema>
+                                                    <field name="dtdSchemaPublicID">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="schematronPhase">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="type">
+                                                        <Integer>2</Integer>
+                                                    </field>
+                                                    <field name="uri">
+                                                        <String>file:/C:/Users/wap1/Documents/usnistgov/OSCAL/xml/schema/oscal_profile_schema.xsd</String>
+                                                    </field>
+                                                </validationUnitSchema>
+                                            </field>
+                                            <field name="validationAdvancedSettings">
+                                                <null/>
+                                            </field>
+                                        </validationUnit>
+                                    </list>
+                                </field>
+                                <field name="type">
+                                    <String>Validation_scenario</String>
+                                </field>
+                                <field name="name">
+                                    <String>OSCAL Profile schema (current local copy)</String>
+                                </field>
+                            </validationScenario>
+                            <validationScenario>
+                                <field name="pairs">
+                                    <list>
+                                        <validationUnit>
+                                            <field name="validationType">
+                                                <validationUnitType>
+                                                    <field name="validationInputType">
+                                                        <String>text/xml</String>
+                                                    </field>
+                                                </validationUnitType>
+                                            </field>
+                                            <field name="url">
+                                                <String>${currentFileURL}</String>
+                                            </field>
+                                            <field name="validationEngine">
+                                                <validationEngine>
+                                                    <field name="engineType">
+                                                        <String>&lt;Default engine></String>
+                                                    </field>
+                                                    <field name="allowsAutomaticValidation">
+                                                        <Boolean>true</Boolean>
+                                                    </field>
+                                                </validationEngine>
+                                            </field>
+                                            <field name="allowAutomaticValidation">
+                                                <Boolean>true</Boolean>
+                                            </field>
+                                            <field name="extensions">
+                                                <null/>
+                                            </field>
+                                            <field name="validationSchema">
+                                                <validationUnitSchema>
+                                                    <field name="dtdSchemaPublicID">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="schematronPhase">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="type">
+                                                        <Integer>7</Integer>
+                                                    </field>
+                                                    <field name="uri">
+                                                        <String>${pdu}/lib/xspec-test-dev.sch</String>
+                                                    </field>
+                                                </validationUnitSchema>
+                                            </field>
+                                            <field name="validationAdvancedSettings">
+                                                <null/>
+                                            </field>
+                                        </validationUnit>
+                                    </list>
+                                </field>
+                                <field name="type">
+                                    <String>Validation_scenario</String>
+                                </field>
+                                <field name="name">
+                                    <String>OSCAL profile resolution test check</String>
+                                </field>
+                            </validationScenario>
+                        </validationScenario-array>
+                    </entry>
+                </serializableOrderedMap>
+            </serialized>
+        </options>
+    </meta>
+    <projectTree name="oscal-specs_share.xpr">
+        <folder path="../../../docs/"/>
+        <folder path="../../"/>
+        <folder path="."/>
+    </projectTree>
+</project>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/assess-test-coverage.xsl b/src/specifications/profile-resolution/profile-resolution-examples/assess-test-coverage.xsl
new file mode 100644
index 0000000000..726e834eb8
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-examples/assess-test-coverage.xsl
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="#all"
+    version="3.0">
+    
+    <xsl:output indent="yes"/>
+    
+    
+    <xsl:template match="/">
+        <html>
+            <head>
+                <xsl:call-template name="style"/>
+            </head>
+            <body>
+    
+                <xsl:comment expand-text="true"> autogenerated { current-dateTime() } </xsl:comment>
+                
+                <xsl:variable name="collection-at" as="xs:string" expand-text="true">{ document-uri(document('')) ! replace(.,'/[^/]+$','') }?select=*_profile.xml</xsl:variable>
+                
+                
+                <xsl:call-template name="element-block">
+                    <xsl:with-param name="elements" select="collection($collection-at)/*"/>
+                </xsl:call-template>
+            </body>
+        </html>
+    </xsl:template>
+    
+    
+    <xsl:template name="element-block" expand-text="true">
+        <xsl:param name="elements" required="true"/>
+        <xsl:where-populated>
+            <xsl:for-each-group select="$elements" group-by="name()">
+                <div class="e">
+                    <p class="eline">
+                        <span class="ename">{ current-grouping-key() }</span>
+                        <xsl:call-template name="linkfiles"/>
+                    </p>
+                    <xsl:where-populated>
+                        <xsl:call-template name="attribute-block">
+                            <xsl:with-param name="attributes" select="current-group()/(attribute::* except @uuid)"/>
+                        </xsl:call-template>
+                    </xsl:where-populated>
+                    <xsl:call-template name="element-block">
+                        <xsl:with-param name="elements" select="current-group()/child::*"></xsl:with-param>
+                    </xsl:call-template>
+                </div>
+            </xsl:for-each-group>                
+            
+        </xsl:where-populated>
+    </xsl:template>
+    
+    <xsl:template name="linkfiles" expand-text="true">
+        <xsl:for-each-group select="current-group()" group-by="document-uri(/)">
+            <xsl:variable name="localname" select="replace(current-grouping-key(), '.*/', '')"/>
+            <a class="filelink" href="{ $localname }">{ $localname }</a>
+        </xsl:for-each-group>
+    </xsl:template>
+
+    
+    
+    <xsl:template name="attribute-block" expand-text="true">
+        <xsl:param name="attributes" required="true"/>
+        <xsl:where-populated>
+            <xsl:for-each-group select="$attributes" group-by="name()">
+                <details class="a">
+                    <summary class="aname">@{ current-grouping-key() } - { count(current-group()) } ({ current-group()=>distinct-values()=>count() })</summary>
+                    <div class="alinkset">
+                        <xsl:for-each-group select="current-group()" group-by="normalize-space(.)">
+                        <p class="avaluelinks">
+                            <span class="avalue">{ current-grouping-key() }</span>
+                            <xsl:call-template name="linkfiles"/>
+                        </p>    
+                        </xsl:for-each-group>
+                    </div>
+                </details>
+            </xsl:for-each-group>                
+            
+        </xsl:where-populated>
+    </xsl:template>
+    
+    <xsl:template name="style" xml:space="preserve">
+      <style type="text/css">
+
+html, body { font-family: sans-serif }
+
+p { margin: 0em }
+
+.e, .a { outline: thin solid black }
+
+details { padding-left: 1em; margin: 0.3em }
+div     { padding-left: 1em; margin-left: 1em; margin: 0.3em }
+
+summary { display: list-item; list-style-position: outside; margin-left: 1em }
+
+a.filelink { font-size: 80% ; display: inline-block; padding: 0.2em; border: thin solid darkgrey; color: darkgrey; background-color: gainsboro; margin: 0.2em; text-decoration: none; border-radius: 0.2em  }
+
+p:hover a.filelink { color: black }
+
+            </style>
+           <!-- <script type="text/javascript" >
+                 function flashClass(elemID) {
+                 let ilk = document.getElementsByClassName(elemID);
+                 for (let i of ilk) { i.classList.toggle('ON'); }
+            }
+            </script>-->
+        </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/example-set.xspec b/src/specifications/profile-resolution/profile-resolution-examples/example-set.xspec
index b5d8326d73..9a64e55d10 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/example-set.xspec
+++ b/src/specifications/profile-resolution/profile-resolution-examples/example-set.xspec
@@ -3,7 +3,8 @@
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
     stylesheet="../../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
     run-as="external">
-    <!--<x:param name="assign-uuid">00000000-0000-4000-A000-000000000000</x:param>-->
+    <!--<x:param name="top-uuid">00000000-0000-4000-A000-000000000000</x:param>
+        <x:param name="uuid-method" select="'user-provided'"/>-->
     
 <!-- x:description/@run-as='external' permits the context item to be determined dynamically per scenario
     cf https://github.com/xspec/xspec/wiki/External-Transformation#global-context-item
@@ -26,4 +27,45 @@
         <x:expect label="Full test - fully resolved" select="opr:scrub(.)"
             href="output-expected/full-test_profile_RESOLVED.xml"/>
     </x:scenario>
+    
+    <x:scenario label="scrub-ws" >
+        <x:variable name="opr:controlx">
+            <control id="a1"   xmlns="http://csrc.nist.gov/ns/oscal/1.0">
+                <title>Control A1</title>
+                <param id="param-a1.a">
+                    <label>a1.a parameter</label>
+                    <value>a1.a value</value>
+                </param>
+                <prop name="place" value="1st"/>
+                <part id="a1-stmt" name="statement">
+                    <p>A1 aaaaa aaaaaaaaaa</p>
+                    <p>Parameter A.a is set: 
+                        <insert type="param" id-ref="param-A.a"/>
+                    </p>
+                    <p>Parameter a1.a is set: 
+                        <insert type="param" id-ref="param-a1.a"/>
+                    </p>
+                </part>
+            </control>
+        </x:variable>
+        <x:call function="opr:scrub">
+            <x:param select="$opr:controlx"/>
+        </x:call>
+        <x:expect label="whitespace normalized">
+            <control id="a1">
+                <title>Control A1</title>
+                <param id="param-a1.a">
+                    <label>a1.a parameter</label>
+                    <value>a1.a value</value>
+                </param>
+                <prop name="place" value="1st"/>
+                <part id="a1-stmt" name="statement">
+                    <p>A1 aaaaa aaaaaaaaaa</p>
+                    <p>Parameter A.a is set: 
+                        <insert type="param" id-ref="param-A.a"/></p>
+                    <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
+                </part>
+            </control>
+        </x:expect>
+    </x:scenario>
 </x:description>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/profile-element-usage-survey.html b/src/specifications/profile-resolution/profile-resolution-examples/profile-element-usage-survey.html
new file mode 100644
index 0000000000..3a9805ab29
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-examples/profile-element-usage-survey.html
@@ -0,0 +1,229 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      
+      <style type="text/css">
+
+html, body { font-family: sans-serif }
+
+p { margin: 0em }
+
+.e, .a { outline: thin solid black }
+
+details { padding-left: 1em; margin: 0.3em }
+div     { padding-left: 1em; margin-left: 1em; margin: 0.3em }
+
+summary { display: list-item; list-style-position: outside; margin-left: 1em }
+
+a.filelink { font-size: 80% ; display: inline-block; padding: 0.2em; border: thin solid darkgrey; color: darkgrey; background-color: gainsboro; margin: 0.2em; text-decoration: none; border-radius: 0.2em  }
+
+p:hover a.filelink { color: black }
+
+            </style>
+      </head>
+   <body><!-- autogenerated 2021-12-21T16:54:57.773-05:00 -->
+      <div class="e">
+         <p class="eline"><span class="ename">profile</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="broken_profile.xml">broken_profile.xml</a><a class="filelink" href="circular_profile.xml">circular_profile.xml</a><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="home_profile.xml">home_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="include-all-no-children-test_profile.xml">include-all-no-children-test_profile.xml</a><a class="filelink" href="include-all-test_profile.xml">include-all-test_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+         <div class="e">
+            <p class="eline"><span class="ename">metadata</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="broken_profile.xml">broken_profile.xml</a><a class="filelink" href="circular_profile.xml">circular_profile.xml</a><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="home_profile.xml">home_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="include-all-no-children-test_profile.xml">include-all-no-children-test_profile.xml</a><a class="filelink" href="include-all-test_profile.xml">include-all-test_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            <div class="e">
+               <p class="eline"><span class="ename">title</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="broken_profile.xml">broken_profile.xml</a><a class="filelink" href="circular_profile.xml">circular_profile.xml</a><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="home_profile.xml">home_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="include-all-no-children-test_profile.xml">include-all-no-children-test_profile.xml</a><a class="filelink" href="include-all-test_profile.xml">include-all-test_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            </div>
+            <div class="e">
+               <p class="eline"><span class="ename">last-modified</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="broken_profile.xml">broken_profile.xml</a><a class="filelink" href="circular_profile.xml">circular_profile.xml</a><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="home_profile.xml">home_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="include-all-no-children-test_profile.xml">include-all-no-children-test_profile.xml</a><a class="filelink" href="include-all-test_profile.xml">include-all-test_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            </div>
+            <div class="e">
+               <p class="eline"><span class="ename">version</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="broken_profile.xml">broken_profile.xml</a><a class="filelink" href="circular_profile.xml">circular_profile.xml</a><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="home_profile.xml">home_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="include-all-no-children-test_profile.xml">include-all-no-children-test_profile.xml</a><a class="filelink" href="include-all-test_profile.xml">include-all-test_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            </div>
+            <div class="e">
+               <p class="eline"><span class="ename">oscal-version</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="broken_profile.xml">broken_profile.xml</a><a class="filelink" href="circular_profile.xml">circular_profile.xml</a><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="home_profile.xml">home_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="include-all-no-children-test_profile.xml">include-all-no-children-test_profile.xml</a><a class="filelink" href="include-all-test_profile.xml">include-all-test_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            </div>
+         </div>
+         <div class="e">
+            <p class="eline"><span class="ename">import</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="broken_profile.xml">broken_profile.xml</a><a class="filelink" href="circular_profile.xml">circular_profile.xml</a><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="home_profile.xml">home_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="include-all-no-children-test_profile.xml">include-all-no-children-test_profile.xml</a><a class="filelink" href="include-all-test_profile.xml">include-all-test_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            <details class="a">
+               <summary class="aname">@href - 20 (11)</summary>
+               <div class="alinkset">
+                  <p class="avaluelinks"><span class="avalue">catalogs/abc-simple_catalog.xml</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">#0050231f-4fd0-43d6-8fa0-431367cd83e1</span><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">missing_profile.xml</span><a class="filelink" href="broken_profile.xml">broken_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">home_profile.xml</span><a class="filelink" href="circular_profile.xml">circular_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">catalogs/abc-full_catalog.xml</span><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="include-all-no-children-test_profile.xml">include-all-no-children-test_profile.xml</a><a class="filelink" href="include-all-test_profile.xml">include-all-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">circular_profile.xml</span><a class="filelink" href="home_profile.xml">home_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">#7c688dca-f0dc-4d09-b6f0-f562165ad7d9</span><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">#9c745ccc-6a85-4172-a752-11c786910e3c</span><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">#01ecd6cc-e281-472c-bb7a-0394bdf938f2</span><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">#a097e626-2606-4213-8ae0-390e3d3d2aaa</span><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a></p>
+                  <p class="avaluelinks"><span class="avalue">#4d263315-ebac-45cc-801e-f5a986cd59a9</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+               </div>
+            </details>
+            <div class="e">
+               <p class="eline"><span class="ename">include-controls</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="broken_profile.xml">broken_profile.xml</a><a class="filelink" href="circular_profile.xml">circular_profile.xml</a><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="home_profile.xml">home_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+               <details class="a">
+                  <summary class="aname">@with-child-controls - 2 (1)</summary>
+                  <div class="alinkset">
+                     <p class="avaluelinks"><span class="avalue">yes</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a></p>
+                  </div>
+               </details>
+               <div class="e">
+                  <p class="eline"><span class="ename">with-id</span><a class="filelink" href="base-test_profile.xml">base-test_profile.xml</a><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="broken_profile.xml">broken_profile.xml</a><a class="filelink" href="circular_profile.xml">circular_profile.xml</a><a class="filelink" href="full-test_profile.xml">full-test_profile.xml</a><a class="filelink" href="home_profile.xml">home_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="include-call-with-children-test_profile.xml">include-call-with-children-test_profile.xml</a><a class="filelink" href="include-loose-param-test_profile.xml">include-loose-param-test_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+               </div>
+               <div class="e">
+                  <p class="eline"><span class="ename">matching</span><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a></p>
+                  <details class="a">
+                     <summary class="aname">@pattern - 1 (1)</summary>
+                     <div class="alinkset">
+                        <p class="avaluelinks"><span class="avalue">^a</span><a class="filelink" href="include-match-test_profile.xml">include-match-test_profile.xml</a></p>
+                     </div>
+                  </details>
+               </div>
+            </div>
+            <div class="e">
+               <p class="eline"><span class="ename">include-all</span><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a><a class="filelink" href="include-all-no-children-test_profile.xml">include-all-no-children-test_profile.xml</a><a class="filelink" href="include-all-test_profile.xml">include-all-test_profile.xml</a></p>
+            </div>
+            <div class="e">
+               <p class="eline"><span class="ename">exclude-controls</span><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a></p>
+               <div class="e">
+                  <p class="eline"><span class="ename">with-id</span><a class="filelink" href="exclude-call-test_profile.xml">exclude-call-test_profile.xml</a></p>
+               </div>
+            </div>
+         </div>
+         <div class="e">
+            <p class="eline"><span class="ename">back-matter</span><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            <div class="e">
+               <p class="eline"><span class="ename">resource</span><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+               <div class="e">
+                  <p class="eline"><span class="ename">rlink</span><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                  <details class="a">
+                     <summary class="aname">@href - 7 (2)</summary>
+                     <div class="alinkset">
+                        <p class="avaluelinks"><span class="avalue">catalogs/abc-simple_catalog.xml</span><a class="filelink" href="base2-test_profile.xml">base2-test_profile.xml</a><a class="filelink" href="import-twice_profile.xml">import-twice_profile.xml</a><a class="filelink" href="merge-implicit-keep_profile.xml">merge-implicit-keep_profile.xml</a><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                        <p class="avaluelinks"><span class="avalue">https://csrc.nist.gov/publications/detail/sp/800-37/rev-2/final</span><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a></p>
+                     </div>
+                  </details>
+               </div>
+               <div class="e">
+                  <p class="eline"><span class="ename">title</span><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a></p>
+               </div>
+               <div class="e">
+                  <p class="eline"><span class="ename">prop</span><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a></p>
+                  <details class="a">
+                     <summary class="aname">@name - 1 (1)</summary>
+                     <div class="alinkset">
+                        <p class="avaluelinks"><span class="avalue">keep</span><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a></p>
+                     </div>
+                  </details>
+                  <details class="a">
+                     <summary class="aname">@value - 1 (1)</summary>
+                     <div class="alinkset">
+                        <p class="avaluelinks"><span class="avalue">always</span><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a></p>
+                     </div>
+                  </details>
+               </div>
+               <div class="e">
+                  <p class="eline"><span class="ename">document-id</span><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a></p>
+                  <details class="a">
+                     <summary class="aname">@scheme - 1 (1)</summary>
+                     <div class="alinkset">
+                        <p class="avaluelinks"><span class="avalue">https://www.doi.org/</span><a class="filelink" href="merge-keep-resources_profile.xml">merge-keep-resources_profile.xml</a></p>
+                     </div>
+                  </details>
+               </div>
+            </div>
+         </div>
+         <div class="e">
+            <p class="eline"><span class="ename">merge</span><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            <div class="e">
+               <p class="eline"><span class="ename">combine</span><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+               <details class="a">
+                  <summary class="aname">@method - 2 (1)</summary>
+                  <div class="alinkset">
+                     <p class="avaluelinks"><span class="avalue">keep</span><a class="filelink" href="merge-keep_profile.xml">merge-keep_profile.xml</a><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                  </div>
+               </details>
+            </div>
+            <div class="e">
+               <p class="eline"><span class="ename">as-is</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            </div>
+         </div>
+         <div class="e">
+            <p class="eline"><span class="ename">modify</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+            <div class="e">
+               <p class="eline"><span class="ename">set-parameter</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+               <details class="a">
+                  <summary class="aname">@param-id - 2 (2)</summary>
+                  <div class="alinkset">
+                     <p class="avaluelinks"><span class="avalue">a1_prm1</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                     <p class="avaluelinks"><span class="avalue">a3_prm1</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                  </div>
+               </details>
+               <div class="e">
+                  <p class="eline"><span class="ename">constraint</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                  <div class="e">
+                     <p class="eline"><span class="ename">description</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                     <div class="e">
+                        <p class="eline"><span class="ename">p</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                     </div>
+                  </div>
+               </div>
+            </div>
+            <div class="e">
+               <p class="eline"><span class="ename">alter</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+               <details class="a">
+                  <summary class="aname">@control-id - 1 (1)</summary>
+                  <div class="alinkset">
+                     <p class="avaluelinks"><span class="avalue">a1</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                  </div>
+               </details>
+               <div class="e">
+                  <p class="eline"><span class="ename">add</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                  <details class="a">
+                     <summary class="aname">@position - 2 (1)</summary>
+                     <div class="alinkset">
+                        <p class="avaluelinks"><span class="avalue">starting</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                     </div>
+                  </details>
+                  <details class="a">
+                     <summary class="aname">@by-id - 2 (2)</summary>
+                     <div class="alinkset">
+                        <p class="avaluelinks"><span class="avalue">a1</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                        <p class="avaluelinks"><span class="avalue">a1-stmt</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                     </div>
+                  </details>
+                  <div class="e">
+                     <p class="eline"><span class="ename">prop</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                     <details class="a">
+                        <summary class="aname">@name - 3 (3)</summary>
+                        <div class="alinkset">
+                           <p class="avaluelinks"><span class="avalue">CORE</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                           <p class="avaluelinks"><span class="avalue">conformity</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                           <p class="avaluelinks"><span class="avalue">method</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                        </div>
+                     </details>
+                     <details class="a">
+                        <summary class="aname">@ns - 2 (1)</summary>
+                        <div class="alinkset">
+                           <p class="avaluelinks"><span class="avalue">https://fedramp.gov/ns/oscal</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                        </div>
+                     </details>
+                     <details class="a">
+                        <summary class="aname">@value - 3 (3)</summary>
+                        <div class="alinkset">
+                           <p class="avaluelinks"><span class="avalue">core</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                           <p class="avaluelinks"><span class="avalue">assessment-objective</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                           <p class="avaluelinks"><span class="avalue">EXAMINE</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                        </div>
+                     </details>
+                     <details class="a">
+                        <summary class="aname">@class - 1 (1)</summary>
+                        <div class="alinkset">
+                           <p class="avaluelinks"><span class="avalue">fedramp</span><a class="filelink" href="modify-adds_profile.xml">modify-adds_profile.xml</a></p>
+                        </div>
+                     </details>
+                  </div>
+               </div>
+            </div>
+         </div>
+      </div>
+   </body>
+</html>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/scrub-testing.xspec b/src/specifications/profile-resolution/profile-resolution-examples/scrub-testing.xspec
new file mode 100644
index 0000000000..0f6055e304
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-examples/scrub-testing.xspec
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    stylesheet="../../../utils/util/resolver-pipeline/oscal-profile-test-helper.xsl"
+       xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+       run-as="external">
+    
+    <!-- Turns out this won't test in XSpec due to its handling of ws-only text nodes -->
+    <x:scenario label="scrub-ws" >
+        <x:context mode="scrubbing">
+            <control id="a1">
+                <title>Control A1</title>
+                <param id="param-a1.a">
+                    <label>a1.a parameter</label>
+                    <value>a1.a value</value>
+                </param>
+                <prop name="place" value="1st"/>
+                <part id="a1-stmt" name="statement">
+                    <p>A1 aaaaa aaaaaaaaaa</p>
+                    <p xml:space="preserve">Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>
+                    </p>
+                    <p xml:space="preserve">Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>
+                      </p>
+                </part>
+            </control>
+        </x:context>
+        <x:expect label="whitespace normalized">
+            <control id="a1">
+                <title>Control A1</title>
+                <param id="param-a1.a">
+                    <label>a1.a parameter</label>
+                    <value>a1.a value</value>
+                </param>
+                <prop name="place" value="1st"/>
+                <part id="a1-stmt" name="statement">
+                    <p>A1 aaaaa aaaaaaaaaa</p>
+                    <p xml:space="preserve">Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+                    <p xml:space="preserve">Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
+                </part>
+            </control>
+        </x:expect>
+    </x:scenario>
+</x:description>
diff --git a/src/specifications/profile-resolution/profile-resolution-queryset.xspec b/src/specifications/profile-resolution/profile-resolution-queryset.xspec
new file mode 100644
index 0000000000..a68759df54
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-queryset.xspec
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- autogenerated 2022-02-15T16:32:41.750817-05:00 following model in example-set.xspec-->
+<?xml-model href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-stylesheet type="text/css" href="lib/xspec-oxygen.css"?>
+<?specification profile-resolution-specml-102-plus.xml?>
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+   xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+   xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+   xmlns:xs="http://www.w3.org/2001/XMLSchema"
+   stylesheet="../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
+   run-as="external">
+   <x:helper stylesheet="lib/oscal-profile-test-helper.xsl"/>
+
+   <x:scenario label=" ... ">
+      <?requirement req-include-all ?>
+      <x:context href="requirement-tests/req-spoofing-resource.xml"/>
+      <!--<x:expect label="Error showing retrieval failure" select="opr:scrub(.)"
+         href="requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml"/>-->
+      <!--Base URI for resolving a relative URI from a resource corresponds to the document URI of the containing profile-->
+      <x:expect label="As the base URI of the resource does not match document URI of containing profile (in the spoofing scenario) we should get an error not a successful resolution" href="requirement-tests/output-expected/req-spoofing-dropped-UNRESOLVED.xml"/>
+<!-- nb we need to test      -->
+   </x:scenario>
+   
+   <x:scenario label=" ... ">
+      <?requirement req-resolve-profile ?>
+      <x:context href="requirement-tests/req-chained-deepA.xml"/>
+      <x:expect label="A (chained) profile resolution merged with a catalog" select="opr:scrub(.)"
+         href="requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml"/>
+   </x:scenario>
+   
+</x:description>
diff --git a/src/specifications/profile-resolution/profile-resolution-specml-files.xspec b/src/specifications/profile-resolution/profile-resolution-specml-files.xspec
new file mode 100644
index 0000000000..4462be0669
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-specml-files.xspec
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- autogenerated 2022-04-19T13:32:10.4758398-04:00 following model in example-set.xspec-->
+<?xml-model href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-stylesheet type="text/css" href="lib/xspec-oxygen.css"?>
+<?specification profile-resolution-specml-102plus.xml?>
+<x:description xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+               xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+               xmlns:x="http://www.jenitennison.com/xslt/xspec"
+               xmlns:xs="http://www.w3.org/2001/XMLSchema"
+               stylesheet="../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
+               run-as="external">
+   <x:helper stylesheet="lib/oscal-profile-test-helper.xsl"/>
+   <x:scenario label="requirement-tests/req-include-all-asis.xml">
+      <x:context href="requirement-tests/req-include-all-asis.xml"/>
+      <x:scenario label="6.1.1 Import URI Resolution | Tools MUST resolve URIs by following Section 5 of RFC3986, with the exception of URI Fragments (URIs that start with &#34;#&#34;). URI Fragments MUST instead be resolved as defined in [Section internalref]."><?requirement req-uri-resolve ?>
+         <x:expect label="Resolution of req-include-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="6.1.2 Import Resource Acquisition | URI base corresponds to document URIFor the purposes of resolving URIs using the above specification, the Base URI MUST be considered to be the absolute URI of the containing profile."><?requirement req-uri-base ?>
+         <x:expect label="Resolution of req-include-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="6.2.1 include-all | When an import provides the include-all directive, ALL controls and groups in the referenced document (including nested controls) MUST be included."><?requirement req-include-all ?>
+         <x:expect label="Resolution of req-include-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="requirement-tests/req-import-by-resource.xml">
+      <x:context href="requirement-tests/req-import-by-resource.xml"/>
+      <x:scenario label="6.1.2 Import Resource Acquisition | Tools MUST acquire resources at the resolved URI by following Section 5 of RFC3986, with the exception of URI Fragments (URIs that start with &#34;#&#34;). URI Fragments MUST instead be acquired as defined in [Section internalref]."><?requirement req-uri-aquire ?>
+         <x:expect label="Resolution of req-import-by-resource.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="6.1.3 Internal References | In the context of the Import Phase, internal references will only appear as a reference to a profile or catalog that is in the resources section of the source. When tools encounter such a reference, they MUST locate the object in resources with the matching UUID value, and resolve the resource. By OSCAL model requirements, a given resource can have zero to many rlink objects and zero to one base64 objects; however, it must have at least one of the two present. Tools can assume that any of these each resolves to the same underlying OSCAL object, although potentially in different serialization formats. For deterministic resolution of these backmatter OSCAL objects, tools need to adhere to the following requirements:"><?requirement req-internal ?>
+         <x:expect label="Resolution of req-import-by-resource.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="requirement-tests/req-missing-resource.xml">
+      <x:context href="requirement-tests/req-missing-resource.xml"/>
+      <x:scenario label="6.1.2 Import Resource Acquisition | In the case that acquiring a resource fails, the tool MUST cease processing and provide an error. In order to ensure profile resolution results in the same catalog regardless of which tool resolves it, all imports must successfully resolve. While this may cause inconvenience if resources are frequently not available, it ensures interoperability."
+                  pending="[spec]"><?requirement req-uri-error ?>
+         <x:expect label="Resolution of req-missing-resource.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-missing-resource_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="6.1.3 Internal References | If the object fetched cannot be found or is not a valid OSCAL object, the tool MUST cease processing and provide an error."
+                  pending="[spec]"><?requirement req-internal-error ?>
+         <x:expect label="Resolution of req-missing-resource.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-missing-resource_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="requirement-tests/req-broken-import.xml">
+      <x:context href="requirement-tests/req-broken-import.xml"/>
+      <x:scenario label="6.1.3 Internal References | If the object fetched cannot be found or is not a valid OSCAL object, the tool MUST cease processing and provide an error."
+                  pending="[spec]"><?requirement req-internal-error ?>
+         <x:expect label="Resolution of req-broken-import.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-broken-import_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="requirement-tests/req-chained-all-asis.xml">
+      <x:context href="requirement-tests/req-chained-all-asis.xml"/>
+      <x:scenario label="6.1.4 Resolving Imports of Profiles | If the resource acquired is an OSCAL Profile, the tool MUST apply this specification to resolve it, then continue processing having imported the resulting catalog."><?requirement req-circular-resolve ?>
+         <x:expect label="Resolution of req-chained-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="6.1.4 Resolving Imports of Profiles | When a profile imports a profile, the subordinate profile SHOULD be resolved first into a catalog using this specification, before it is imported."><?requirement req-circular-catalog ?>
+         <x:expect label="Resolution of req-chained-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="requirement-tests/req-circular_import.xml">
+      <x:context href="requirement-tests/req-circular_import.xml"/>
+      <x:scenario label="6.1.4 Resolving Imports of Profiles | If a processor encounters a circular import as described above (self-imports are inherently circular), the processor MUST cease processing and generate an error."><?requirement req-circular-error ?>
+         <x:expect label="Resolution of req-circular_import.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-circular_import_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="requirement-tests/req-include-all-flat.xml">
+      <x:context href="requirement-tests/req-include-all-flat.xml"/>
+      <x:scenario label="6.2.1 include-all | When an import provides the include-all directive, ALL controls and groups in the referenced document (including nested controls) MUST be included."><?requirement req-include-all ?>
+         <x:expect label="Resolution of req-include-all-flat.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="7.2.1 No Structuring Directive | If no merge directive is given in the profile, or if a merge is given without a structuring directive, structuring the output MUST be treated as if the structuring directive flat was given. For example, a profile with no merge directive:"><?requirement req-structure-none ?>
+         <x:expect label="Resolution of req-include-all-flat.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+</x:description>
diff --git a/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec b/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec
new file mode 100644
index 0000000000..f4c64e37e6
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- autogenerated 2022-04-26T17:20:58.3482225-04:00 following model in example-set.xspec-->
+<?xml-model href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-stylesheet type="text/css" href="lib/xspec-oxygen.css"?>
+<?specification profile-resolution-specml-102plus.xml?>
+<x:description xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+               xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+               xmlns:x="http://www.jenitennison.com/xslt/xspec"
+               xmlns:xs="http://www.w3.org/2001/XMLSchema"
+               stylesheet="../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
+               run-as="external">
+   <x:helper stylesheet="lib/oscal-profile-test-helper.xsl"/>
+   <x:scenario label="5 Phases of Profile Processing | It is strongly RECOMMENDED that implementations execute the following steps in the order that they are provided here (import, merge, modify)."
+               pending="[dev]">
+      <x:scenario label="Example TBD - PENDING test design" pending="test design"/>
+   </x:scenario>
+   <x:scenario label="6.1.1 Import URI Resolution | Tools MUST resolve URIs by following Section 5 of RFC3986, with the exception of URI Fragments (URIs that start with &#34;#&#34;). URI Fragments MUST instead be resolved as defined in [Section internalref].">
+      <x:scenario label="Example req-include-all-asis.xml - relative URI"><?requirement req-uri-resolve ?>
+         <x:context href="requirement-tests/req-include-all-asis.xml"/>
+         <x:expect label="Resolution of req-include-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.2 Import Resource Acquisition | Tools MUST acquire resources at the resolved URI by following Section 5 of RFC3986, with the exception of URI Fragments (URIs that start with &#34;#&#34;). URI Fragments MUST instead be acquired as defined in [Section internalref].">
+      <x:scenario label="Example req-import-by-resource.xml - via internal reference to&#xA;              resource/rlink"><?requirement req-uri-aquire ?>
+         <x:context href="requirement-tests/req-import-by-resource.xml"/>
+         <x:expect label="Resolution of req-import-by-resource.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.2 Import Resource Acquisition | For the purposes of resolving URIs using the above specification, the Base URI MUST be considered to be the absolute URI of the containing profile.">
+      <x:scenario label="Example req-include-all-asis.xml - URI base corresponds to document URI"><?requirement req-uri-base ?>
+         <x:context href="requirement-tests/req-include-all-asis.xml"/>
+         <x:expect label="Resolution of req-include-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.2 Import Resource Acquisition | In the case that acquiring a resource fails, the tool MUST cease processing and provide an error. In order to ensure profile resolution results in the same catalog regardless of which tool resolves it, all imports must successfully resolve. While this may cause inconvenience if resources are frequently not available, it ensures interoperability.">
+      <x:scenario label="Example req-missing-resource.xml - PENDING rebase over latest from galtm missing resource"
+                  pending="rebase over latest from galtm missing resource"><?requirement req-uri-error ?>
+         <x:context href="requirement-tests/req-missing-resource.xml"/>
+         <x:expect label="Resolution of req-missing-resource.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-missing-resource_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.3 Internal References | In the context of the Import Phase, internal references will only appear as a reference to a profile or catalog that is in the resources section of the source. When tools encounter such a reference, they MUST locate the object in resources with the matching UUID value, and resolve the resource. By OSCAL model requirements, a given resource can have zero to many rlink objects and zero to one base64 objects; however, it must have at least one of the two present. Tools can assume that any of these each resolves to the same underlying OSCAL object, although potentially in different serialization formats. For deterministic resolution of these backmatter OSCAL objects, tools need to adhere to the following requirements:">
+      <x:scenario label="Example req-import-by-resource.xml - "><?requirement req-internal ?>
+         <x:context href="requirement-tests/req-import-by-resource.xml"/>
+         <x:expect label="Resolution of req-import-by-resource.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.3 Internal References | Tools MAY use any of the rlink or base64 objects present in the resource."
+               pending="[dev]">
+      <x:scenario label="Example TBD - PENDING test design (support for either/both base64&#xA;                  and rlink)"
+                  pending="test design (support for either/both base64&#xA;                  and rlink)"/>
+   </x:scenario>
+   <x:scenario label="6.1.3 Internal References | Tools MAY verify that each above objects resolves to the same underlying OSCAL object. If there are OSCAL Model content differences between the resolved objects, the tool SHOULD provide a warning."
+               pending="[dev]">
+      <x:scenario label="Example TBD - PENDING test design (correspondence of base64 and&#xA;                  rlink-nominated objects)"
+                  pending="test design (correspondence of base64 and&#xA;                  rlink-nominated objects)"/>
+   </x:scenario>
+   <x:scenario label="6.1.3 Internal References | When a rlink is encountered and is to be resolved, it MUST be resolved by using a HTTP request to retrieve a byte stream."
+               pending="[dev]">
+      <x:scenario label="Example TBD - PENDING test design (retrieval)"
+                  pending="test design (retrieval)"/>
+   </x:scenario>
+   <x:scenario label="6.1.3 Internal References | When a base64 is encountered and is to be resolved, it MUST be considered a Byte Stream."
+               pending="[dev]">
+      <x:scenario label="Example TBD - PENDING test design (base64 integrity)"
+                  pending="test design (base64 integrity)"/>
+   </x:scenario>
+   <x:scenario label="6.1.3 Internal References | Regardless of its source, the Byte Stream MUST be decoded based on the algorithm defined in Section 4 RFC 4648."
+               pending="[dev]">
+      <x:scenario label="Example TBD - PENDING test design (base64&#xA;                integrity)"
+                  pending="test design (base64&#xA;                integrity)"/>
+   </x:scenario>
+   <x:scenario label="6.1.3 Internal References | If the object fetched cannot be found or is not a valid OSCAL object, the tool MUST cease processing and provide an error.">
+      <x:scenario label="Example req-missing-resource.xml - PENDING rebase over latest from galtm"
+                  pending="rebase over latest from galtm"><?requirement req-internal-error ?>
+         <x:context href="requirement-tests/req-missing-resource.xml"/>
+         <x:expect label="Resolution of req-missing-resource.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-missing-resource_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="Example req-broken-import.xml - PENDING rebase over latest from galtm"
+                  pending="rebase over latest from galtm"><?requirement req-internal-error ?>
+         <x:context href="requirement-tests/req-broken-import.xml"/>
+         <x:expect label="Resolution of req-broken-import.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-broken-import_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.4 Resolving Imports of Profiles | If the resource acquired is an OSCAL Profile, the tool MUST apply this specification to resolve it, then continue processing having imported the resulting catalog.">
+      <x:scenario label="Example req-chained-all-asis.xml - PENDING chained profiles"
+                  pending="chained profiles"><?requirement req-circular-resolve ?>
+         <x:context href="requirement-tests/req-chained-all-asis.xml"/>
+         <x:expect label="Resolution of req-chained-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.4 Resolving Imports of Profiles | When a profile imports a profile, the subordinate profile SHOULD be resolved first into a catalog using this specification, before it is imported.">
+      <x:scenario label="Example req-chained-all-asis.xml - PENDING chained profiles"
+                  pending="chained profiles"><?requirement req-resolve-profile ?>
+         <x:context href="requirement-tests/req-chained-all-asis.xml"/>
+         <x:expect label="Resolution of req-chained-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="Example req-chained-deepA.xml - PENDING [bug repair] chained profile&#xA;              merged with controls from its own source catalog"
+                  pending="[bug repair] chained profile&#xA;              merged with controls from its own source catalog"><?requirement req-resolve-profile ?>
+         <x:context href="requirement-tests/req-chained-deepA.xml"/>
+         <x:expect label="Resolution of req-chained-deepA.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.4 Resolving Imports of Profiles | If a processor encounters a circular import as described above (self-imports are inherently circular), the processor MUST cease processing and generate an error.">
+      <x:scenario label="Example req-circular_import.xml - PENDING circular import detection"
+                  pending="circular import detection"><?requirement req-circular-error ?>
+         <x:context href="requirement-tests/req-circular_import.xml"/>
+         <x:expect label="Resolution of req-circular_import.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-circular_import_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.5 Multiple imports | Note that this occurs even if the same catalog is imported multiple times: each distinct import collects controls into a separate selection">
+      <x:scenario label="Example req-chained-deepA.xml - PENDING&#xA;              chained profiles"
+                  pending="chained profiles"><?requirement rq-mulitple-imports ?>
+         <x:context href="requirement-tests/req-chained-deepA.xml"/>
+         <x:expect label="Resolution of req-chained-deepA.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.1.5 Multiple imports | The control inclusions are combined and collapsed in the next phase of processing">
+      <x:scenario label="Example req-chained-deepA.xml - PENDING&#xA;              chained profiles"
+                  pending="chained profiles"><?requirement rq-multiple-merge ?>
+         <x:context href="requirement-tests/req-chained-deepA.xml"/>
+         <x:expect label="Resolution of req-chained-deepA.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.1 include-all | When an import provides the include-all directive, ALL controls and groups in the referenced document (including nested controls) MUST be included.">
+      <x:scenario label="Example req-include-all-asis.xml - "><?requirement req-include-all ?>
+         <x:context href="requirement-tests/req-include-all-asis.xml"/>
+         <x:expect label="Resolution of req-include-all-asis.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="Example req-include-all-flat.xml - "><?requirement req-include-all ?>
+         <x:context href="requirement-tests/req-include-all-flat.xml"/>
+         <x:expect label="Resolution of req-include-all-flat.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.2 include-controls plus with-id | When an import provides the include-controls directive, with a with-id child, all controls in the referenced document whose id match one of the listed id values MUST be included.">
+      <x:scenario label="Example req-include-by-id.xml - "><?requirement req-include-by-id ?>
+         <x:context href="requirement-tests/req-include-by-id.xml"/>
+         <x:expect label="Resolution of req-include-by-id.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-by-id_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.3 include-controls plus matching | When an import provides the include-controls directive, with a matching child, all controls in the referenced document whose id matches one of the listed pattern values (Glob matching) MUST be included.">
+      <x:scenario label="Example req-include-by-match.xml - "><?requirement req-include-by-match ?>
+         <x:context href="requirement-tests/req-include-by-match.xml"/>
+         <x:expect label="Resolution of req-include-by-match.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-by-match_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.3 include-controls plus matching | If a matching object is provided with no pattern, it MUST be treated as matching nothing. While not providing a pattern is technically valid, resolution tool implementers should be aware that it is generally undesirable, and warnings or notices to the user may be appropriate.">
+      <x:scenario label="Example req-include-by-match-empty.xml - "><?requirement req-include-by-match-empty ?>
+         <x:context href="requirement-tests/req-include-by-match-empty.xml"/>
+         <x:expect label="Resolution of req-include-by-match-empty.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-by-match-empty_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.4.1 with-child-controls | A with-child-controls: yes directive on an include-controls indicates that all descendant controls of the included control MUST also be included.">
+      <x:scenario label="Example req-include-by-id.xml - "><?requirement req-with-child-controls-yes ?>
+         <x:context href="requirement-tests/req-include-by-id.xml"/>
+         <x:expect label="Resolution of req-include-by-id.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-by-id_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.4.1 with-child-controls | A with-child-controls: no directive on an include-controls indicates that ONLY the matching control is included, any descendant children MUST NOT be included.">
+      <x:scenario label="Example req-with-child-controls-no.xml - "><?requirement req-with-child-controls-no ?>
+         <x:context href="requirement-tests/req-with-child-controls-no.xml"/>
+         <x:expect label="Resolution of req-with-child-controls-no.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-with-child-controls-no_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.4.1 with-child-controls | If no with-child-controls is provided, the processor MUST consider the directive as being equivalent to one having with-child-controls:no.">
+      <x:scenario label="Example req-with-child-controls-none.xml - "><?requirement req-with-child-controls-none ?>
+         <x:context href="requirement-tests/req-with-child-controls-none.xml"/>
+         <x:expect label="Resolution of req-with-child-controls-none.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-with-child-controls-none_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.4.2 with-parent-controls | A with-parent-controls: yes directive on an include-controls indicates that all parent controls of the included control MUST also be included.">
+      <x:scenario label="Example req-with-parent-controls-yes1.xml - PR&#xA;                https://github.com/usnistgov/OSCAL/pull/1207"><?requirement req-with-parent-controls-yes ?>
+         <x:context href="requirement-tests/req-with-parent-controls-yes1.xml"/>
+         <x:expect label="Resolution of req-with-parent-controls-yes1.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-with-parent-controls-yes1_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="Example req-with-parent-controls-yes2.xml - PR&#xA;                https://github.com/usnistgov/OSCAL/pull/1207"><?requirement req-with-parent-controls-yes ?>
+         <x:context href="requirement-tests/req-with-parent-controls-yes2.xml"/>
+         <x:expect label="Resolution of req-with-parent-controls-yes2.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-with-parent-controls-yes2_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.4.2 with-parent-controls | A with-parent-controls: no directive on an include-controls indicates that ONLY the matching control is included, any parent MUST NOT be included.">
+      <x:scenario label="Example req-with-parent-controls-no1.xml - PENDING PR&#xA;                https://github.com/usnistgov/OSCAL/pull/1207"
+                  pending="PR&#xA;                https://github.com/usnistgov/OSCAL/pull/1207"><?requirement req-with-parent-controls-no ?>
+         <x:context href="requirement-tests/req-with-parent-controls-no1.xml"/>
+         <x:expect label="Resolution of req-with-parent-controls-no1.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-with-parent-controls-no1_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.4.2 with-parent-controls | If no with-parent-controls is provided, the processor MUST consider the directive as being equivalent to one having with-parent-controls:yes."
+               pending="[dev]">
+      <x:scenario label="Example TBD - PENDING PR&#xA;                https://github.com/usnistgov/OSCAL/pull/1207"
+                  pending="PR&#xA;                https://github.com/usnistgov/OSCAL/pull/1207"/>
+   </x:scenario>
+   <x:scenario label="6.2.5 exclude-controls | Any control designated to be both included and excluded, MUST be excluded. This holds irrespective of the specificity of the selection for inclusion or exclusion.">
+      <x:scenario label="Example req-include-exclude1.xml - "><?requirement req-exclude ?>
+         <x:context href="requirement-tests/req-include-exclude1.xml"/>
+         <x:expect label="Resolution of req-include-exclude1.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-exclude1_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="Example req-include-exclude2.xml - "><?requirement req-exclude ?>
+         <x:context href="requirement-tests/req-include-exclude2.xml"/>
+         <x:expect label="Resolution of req-include-exclude2.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-exclude2_RESOLVED.xml"/>
+      </x:scenario>
+      <x:scenario label="Example req-include-exclude3.xml - "><?requirement req-exclude ?>
+         <x:context href="requirement-tests/req-include-exclude3.xml"/>
+         <x:expect label="Resolution of req-include-exclude3.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-exclude3_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.5 exclude-controls | When exclude-controls has at least one with-ids or matching directive, the processor MUST follow the same rules as defined in the relevant sections above for these directives, but exclude instead of include any controls. All optional features (with-child-controls, etc.) also apply to exclusion directives.">
+      <x:scenario label="Example req-include-exclude4.xml - "><?requirement req-exclude-additional ?>
+         <x:context href="requirement-tests/req-include-exclude4.xml"/>
+         <x:expect label="Resolution of req-include-exclude4.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-exclude4_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.6 Redundant Inclusions and Exclusions | A given import may have any number of inclusion statements and any number of exclusion statements. Their effect is cumulative; any control that is included (or excluded) more than once MUST be considered to be included (or excluded) only once. In other words, a given control being included or excluded more than once has no effect. Exclusion still takes priority over inclusion (see above).">
+      <x:scenario label="Example req-include-exclude4.xml - "><?requirement req-redundant ?>
+         <x:context href="requirement-tests/req-include-exclude4.xml"/>
+         <x:expect label="Resolution of req-include-exclude4.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-exclude4_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="6.2.7 Handling Params | All loose params from both imported documents and the profile source MUST be included. These params will be kept in the final output if the document contains any references to them, and discarded otherwise. See [Section cleanup]."
+               pending="[dev]"/>
+   <x:scenario label="7 Merge Phase | It is RECOMMENDED that tools apply the &#34;combine&#34; directive to the intermediate generated by the Import phase first, then apply the &#34;structuring&#34; directive."
+               pending="[dev]">
+      <x:scenario label="Example TBD - PENDING is this testable?"
+                  pending="is this testable?"/>
+   </x:scenario>
+   <x:scenario label="7.1 The &#34;combine&#34; Directive | Note that &#34;merge: combine&#34; is deprecated, and MUST be considered undefined behavior when encountered."
+               pending="[dev]">
+      <x:scenario label="Example TBD - PENDING specification" pending="specification"/>
+   </x:scenario>
+   <x:scenario label="7.1.1 No Combine Directive | If no merge directive is given in the profile, or if a merge is given without a combine, merge conflicts MUST be treated as if method: keep was given.">
+      <x:scenario label="Example keep-everything-twice.xml - "><?requirement req-merge-none ?>
+         <x:context href="requirement-tests/keep-everything-twice.xml"/>
+         <x:expect label="Resolution of keep-everything-twice.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/keep-everything-twice_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="7.1.2 method:keep | When a merge is indicated by method:keep, or when no merge directive is given, the keepcombination rule is used. Any control with the same distinctive ID [Section id]MUST NOT not merged. (They are kept.)"
+               pending="[dev]"/>
+   <x:scenario label="7.1.2 method:keep | Processors SHOULD provide a warning under the merge:keep directive when duplicate controls are detected."
+               pending="[dev]"/>
+   <x:scenario label="7.1.2 method:keep | The processor MAY throw an error and cease processing (short-circuiting a certain future error) when duplicate controls are detected under the merge:keep directive."
+               pending="[dev]"/>
+   <x:scenario label="7.1.3 method:use-first | When the &#34;use-first&#34;combination rule is applied, and controls that share a distinctive ID are found, the first control encountered MUST be kept, the rest MUST be discarded. &#34;First&#34; MUST be determined by a top-down, depth-first traversal of the source profile's import hierarchy."
+               pending="[dev]"/>
+   <x:scenario label="7.2 The &#34;structuring&#34; Directive | Optionally, one of three &#34;structuring&#34; directives can be included as a child of merge: flat, as-isand custom. When one of these appears, it is the selected structuring directive. If more than one appears, processors MUST generate an error and cease processing."
+               pending="[dev]"/>
+   <x:scenario label="7.2.1 No Structuring Directive | If no merge directive is given in the profile, or if a merge is given without a structuring directive, structuring the output MUST be treated as if the structuring directive flat was given. For example, a profile with no merge directive:">
+      <x:scenario label="Example req-include-all-flat.xml - "><?requirement req-structure-none ?>
+         <x:context href="requirement-tests/req-include-all-flat.xml"/>
+         <x:expect label="Resolution of req-include-all-flat.xml"
+                   select="opr:scrub(.)"
+                   href="requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml"/>
+      </x:scenario>
+   </x:scenario>
+   <x:scenario label="7.2.2 &#34;flat&#34; | Profiles with the &#34;flat&#34; merge directive MUST be resolved as unstructured catalogs, with no grouping or nesting of controls."
+               pending="[dev]"/>
+   <x:scenario label="7.2.2 &#34;flat&#34; | Unstructured catalog output MUST be produced by adhering to the following requirements:"
+               pending="[dev]"/>
+   <x:scenario label="7.2.2 &#34;flat&#34; | All included controls are output to the target as a flat list directly under &#34;catalog&#34;."
+               pending="[dev]"/>
+   <x:scenario label="7.2.2 &#34;flat&#34; | Any included &#34;loose params&#34; are output to the target as a flat list directly under &#34;catalog&#34;."
+               pending="[dev]"/>
+   <x:scenario label="7.2.2 &#34;flat&#34; | Any groups are discarded." pending="[dev]"/>
+   <x:scenario label="7.2.3 as-is | Processors MUST handle the as-is directive by adhering to the following requirements:"
+               pending="[dev]"/>
+   <x:scenario label="7.2.3 as-is | All included controls are output to the target, keeping the structure of the groups and nested controls. Any group that holds an included control MUST appear in the output with all of its non-control children intact. If an included control has a parent control that was not included, that control's output location is &#34;up-leveled&#34;, or made equal to the non-included parent. This applies recursively until the control is directly under either &#34;catalog&#34; or another included control."
+               pending="[dev]"/>
+   <x:scenario label="7.2.3 as-is | Any included &#34;loose params&#34; are output to the target as a flat list directly under &#34;catalog&#34;."
+               pending="[dev]"/>
+   <x:scenario label="7.2.4.1 Creating Custom Groups | A groupobject given under custom MUST result in a group with the exact same content (excluding insert-controls) in the target catalog."
+               pending="[dev]"/>
+   <x:scenario label="7.2.4.1 Creating Custom Groups | If the ID of the group matches the ID of a group that has been included during the import phase, all contents inside the group, including title, param, prop and part objects MUST be copied into the target, appearing in the same order as in the source."
+               pending="[dev]"/>
+   <x:scenario label="7.2.4.2 Inserting Controls | When processing the control selection of a custom element, the behavior defined in this section MUST be followed to generate the output."
+               pending="[dev]"/>
+   <x:scenario label="7.2.4.2 Inserting Controls | In the case that a control selection matches none of the included controls, it MUST be ignored."
+               pending="[dev]"/>
+   <x:scenario label="7.2.4.2 Inserting Controls | In the case that a control selection matches none of the included controls, a warning SHOULD be provided."
+               pending="[dev]"/>
+   <x:scenario label="8.1 Setting Parameters | If no such parameter is found, a warning SHOULD be issued."
+               pending="[dev]"/>
+   <x:scenario label="8.1 Setting Parameters | If no such parameter is found, processing MUST still continue."
+               pending="[dev]"/>
+   <x:scenario label="8.1 Setting Parameters | For the following objects inside the source: class, depends-on, label, usage, values, select; the object MUST be copied into the target from the source, first removing any existing objects with the same name."
+               pending="[dev]"/>
+   <x:scenario label="8.1 Setting Parameters | For the following objects inside the source: props, links, constraints, guidelines; the contents of the object MUST be added to the contents of the target object of the same name. If no such object exists in the target, it is created."
+               pending="[dev]"/>
+   <x:scenario label="8.1 Setting Parameters | For the following objects inside the source: prop, link; the object MUST be copied into the target from the source, first removing any existing objects with the same distinctive ID. ([Section id])."
+               pending="[dev]"/>
+   <x:scenario label="8.1 Setting Parameters | If more than one set-parameter directive is given for the same parameter, all MUST BE applied, in the sequence given in the profile."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.1 Implicit binding | An add directive with no by-id child MUST be considered an implicit binding, and will apply to the control as a whole."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.1 Implicit binding | The contents of an implicitly bound add directive MUST be added to the control contents in the target, either after its title when position is starting, or at the end if its position is ending, or if no valid position is given."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.1 Implicit binding | When an add directive is implicitly bound, the position values before and after MUST be treated like starting and ending, respectively."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.1 Implicit binding | After processing an implicitly bound add directive, the control contents MUST be sorted to appear in the required order: a new prop appears after any prop already in the control, when position is ending, or not given, or before any prop in the control when position is starting."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.2 Explicit binding | An add directive with a by-id child MUST be considered an explicit binding, and applies to only a single object inside the control."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.2 Explicit binding | When an add directive is explicitly bound, the value of the by-id child MUST correspond to the value of an id on an object inside the control, and not the control itself."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.2 Explicit binding | If by-id does not correspond to such a value, the add directive MUST be considered inoperative and ignored."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.2 Explicit binding | An inoperative add directive MAY result in a warning."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.2 Explicit binding | When position has a value of startingor ending, the contents of the source MUST be added inside the target, either at the start or end of its contents, respectively."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.2 Explicit binding | When position has a value of before or after, the contents of the source MUST be added outside the target, either directly before or after it, respectively."
+               pending="[dev]"/>
+   <x:scenario label="8.2.1.3 Modifying controls inside controls | Profile resolution tools MUST be able to correctly handle add directives targetting nested controls. This includes directives that target a child control as well as directives that target a parent control and modify the child."
+               pending="[dev]"/>
+   <x:scenario label="8.2.2 Removing contents from controls | An object inside the control MUST be removed from the output if and only if it meets all of the criteria given by the child objects of the remove directive."
+               pending="[dev]"/>
+   <x:scenario label="8.2.2 Removing contents from controls | The remove directive criteria by-id MUST match an object if and only if its value is identical to the id value of that object."
+               pending="[dev]"/>
+   <x:scenario label="8.2.2 Removing contents from controls | The remove directive criteria name-ref MUST match an object if and only if its value is identical to the value of that object's name child."
+               pending="[dev]"/>
+   <x:scenario label="8.2.2 Removing contents from controls | The remove directive criteria ns-ref MUST match an object if and only if its value is identical to the value of that object's ns child."
+               pending="[dev]"/>
+   <x:scenario label="8.2.2 Removing contents from controls | The remove directive criteria class-ref MUST match an object if and only if its value is identical to the value of that object's class child."
+               pending="[dev]"/>
+   <x:scenario label="8.2.2 Removing contents from controls | The remove directive criteria item-name MUST match an object if and only if its value is identical to the value of that object's serialized name."
+               pending="[dev]"/>
+   <x:scenario label="8.2.2 Removing contents from controls | In serialization formats that use arrays of objects in the OSCAL model, an object's name MUST be referenced as singular form of its containing parent array."
+               pending="[dev]"/>
+   <x:scenario label="9.1 Backmatter Resolution | The output's backmatter MUST be generated by copying in each resource object from the backmatters of the imported catalogs/profiles in top-to-bottom order, then by copying in each resource object from the backmatter of the source profile itself. These objects MUST be processed in the order they are defined in each respective document."
+               pending="[dev]"/>
+   <x:scenario label="9.1 Backmatter Resolution | If a given resource has the same uuid as a resource that has already been added, the previous resource MUST be removed, and the more recent one added, unless superseded by other requirements."
+               pending="[dev]"/>
+   <x:scenario label="9.1 Backmatter Resolution | A resource with a child prop of name:keep and value:always MUST NOT be replaced by the addition of another resource, unless the new resource also has a child prop of name:keep and value:always."
+               pending="[dev]"/>
+   <x:scenario label="9.1 Backmatter Resolution | Tools MAY check for pruning conditions [Section cleanup] as resources are added as long as the final result is the same as if the pruning had taken place at the end of all resource addition."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | The output catalog's metadata MUST have a unique top-level UUID (metadata:uuid). This UUID MAY be generated as seen fit by the tool, as long as it is reasonable to assume it is globally unique. It is RECOMMENDED that tools use a Version 4 UUID as specified in Section 4 of RFC 4122."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | The value of metadata:version in the target MUST be set with a string that identifies the version of that document."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | The metadata:version SHOULD be used to track updates to this specific output document."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | The value of metadata:oscal-version in the target MUST be set with a string that identifies the version of OSCAL used by this tool to resolve the profile (ex. 1.0.0). This value MUST be determined by compiling the oscal-versions from each imported document and the source profile, and taking the most recent minor version. If this version is more recent than what the resolution tool is using, then the value of oscal-version MUST be the version that the tool used internally."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | The value of metadata:last-modified in the target MUST be set with a valid timestamp representing the time the profile resolution completed."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | A child prop object with name:source-profile MUST be created. The value object of this prop SHOULD be set with a valid URI that points to the profile that resulted in this catalog."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | If there are privacy or security concerns, the value object of this prop MAY be set to anything, in which case the simple existence of the source-profile property indicates that this is a resolved profile."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | A child prop object with name:resolution-tool SHOULD be created. The value object of this prop in the target SHOULD be set with a string that represents the tool that was used to resolve this catalog."
+               pending="[dev]"/>
+   <x:scenario label="9.2 Metadata Resolution | For any metadata:roles or metadata:parties that exist in the source catalogs, if they have a prop child with name:keep and value:always, they are to be copied as is into the output metadata."
+               pending="[dev]"/>
+   <x:scenario label="9.3 Pruning and Ordering | The processor SHOULD prune the resulting output catalog by removing unused objects."
+               pending="[dev]"/>
+   <x:scenario label="9.3 Pruning and Ordering | Any object that has a child prop with a name of &#34;keep&#34; and a value of &#34;always&#34; MUST NOT be pruned."
+               pending="[dev]"/>
+   <x:scenario label="9.3 Pruning and Ordering | If an object was explicitly included in the [Section select-phase], it MUST NOT be pruned."
+               pending="[dev]"/>
+   <x:scenario label="9.3 Pruning and Ordering | If an object was referenced in a custom section of the source profile, it MUST NOT be pruned."
+               pending="[dev]"/>
+   <x:scenario label="9.3 Pruning and Ordering | If an object was referenced in the modify section of the source profile, it MUST NOT be pruned. Any objects removed in that section are still removed."
+               pending="[dev]"/>
+   <x:scenario label="9.3 Pruning and Ordering | If the object appears in a reference anywhere in the final result catalog, except in other objects that also meet all other pruning criteria, it MUST NOT be removed. A reference to a given object exists if #{distinctiveID} appears anywhere, where {distinctiveID} is the distinctive ID of the object [Section id]."
+               pending="[dev]"/>
+   <x:scenario label="9.3 Pruning and Ordering | Tools MUST reorder the output catalog into canonical order [Section order], except where this specification provides different ordering requirements."
+               pending="[dev]"/>
+   <x:scenario label="10.1 Distinct ID of Objects | For the objects control, param, and group, distinctiveness MUST be determined by the value of the &#34;id&#34; child object."
+               pending="[dev]"/>
+   <x:scenario label="10.1 Distinct ID of Objects | For the object resource, distinctiveness MUST be determined by the value of the &#34;uuid&#34; [Section target-back-matter]."
+               pending="[dev]"/>
+   <x:scenario label="10.2 Dealing with Multiple Formats | Profile Resolution tools SHOULD be able to handle source profiles, imported catalogs, and imported profiles that are serialized in XML, JSON, or YAML."
+               pending="[dev]"/>
+   <x:scenario label="10.2 Dealing with Multiple Formats | A different serialization format of any given input MUST NOT result in a differing output catalog."
+               pending="[dev]"/>
+   <x:scenario label="10.2.1 Requirements and Guidance for XML Output | The final Catalog output, if using XML, MUST be valid as defined by the XML model documentation for the OSCAL Catalog. See the complete XML reference for model requirements."
+               pending="[dev]"/>
+   <x:scenario label="10.2.2 Requirements and Guidance for JSON Output | The final Catalog output, if using JSON, MUST be valid as defined by the JSON model documentation for the OSCAL Catalog. See the complete JSON reference for model requirements."
+               pending="[dev]"/>
+   <x:scenario label="10.2.3 Requirements and Guidance for YAML Output | The final Catalog output, if using YAML, MUST be valid as defined by the JSON model documentation for the OSCAL Catalog."
+               pending="[dev]"/>
+   <x:scenario label="10.2.4 Order of objects in serialization | When the output format is XML, tools MUST use the OSCAL canonical order as described above. When using the YAML or JSON formats, order conveys no meaning, and is not considered important."
+               pending="[dev]"/>
+</x:description>
diff --git a/src/specifications/profile-resolution/profile-resolution-specml-working.xml b/src/specifications/profile-resolution/profile-resolution-specml-working.xml
new file mode 100644
index 0000000000..a3497f2e6e
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-specml-working.xml
@@ -0,0 +1,1063 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="lib/spec-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-model href="lib/specml.rnc" type="application/relax-ng-compact-syntax"?>
+
+<!-- Edit this PI for checking up on test bindings -->
+<?specml-testset requirements-working-set.xspec?>
+<?xml-stylesheet type="text/css" href="lib/specml.css"?>
+<SPECIFICATION xmlns="http://csrc.nist.gov/ns/oscal/specml">
+  <head>OSCAL Profile Resolution</head>
+  <section id="draft">
+    <head>Notice of Draft Status</head>
+    <p>Please note that this specification is currently a work in progress and is subject to change. If you have any feedback or comments, please create an issue at the NIST OSCAL Github Repository:<a href="https://github.com/usnistgov/OSCAL"/>.</p>
+  </section>
+  <section id="abstract">
+    <head>Abstract</head>
+    <p>This specification provides the minimal requirements for processing an OSCAL Profile to create a new OSCAL Catalog Document. This process of applying a profile to a catalog to create a new catalog is called <term>Profile Resolution</term>. Not all OSCAL Profiles will be resolved, nor are expected to be; however, the resolution requirements in this document are crucial to understanding the intended functionality of any given OSCAL Profile. This specification is intended for software developers who intend to develop an OSCAL Profile Resolver, or for OSCAL Profile authors who want a more in-depth understanding of profile resolution.</p>
+  </section>
+  <section id="intro">
+    <head>Introduction</head>
+    <section id="purpose">
+      <head>Purpose</head>
+      <p>This document defines the normative requirements for an OSCAL Profile Resolver. Profile resolution is core to addressing a fundamental OSCAL requirement: the representation of baselines separately from the control catalogs on which they depend). The requirements for resolution must therefore be well-defined and deterministic, enabling tool developers and parties exchanging OSCAL Profiles can work from a common understanding.</p>
+      <p>No requirements are placed on implementation-level details, instead, requirements are laid out as what the output of resolution must look like given a certain input. By adhering to these requirements OSCAL producers, OSCAL consumers, and any other members of the OSCAL ecosystem can create and resolve profiles deterministically, with repeatable results, regardless of the tool used.</p>
+    </section>
+  </section>
+  <section id="readingthis">
+    <head>Reading This Document</head>
+    <section id="terminology"><!-- TODO: Parse document for additional terms to add -->
+      <head>Terminology</head>
+      <p>Many core OSCAL concepts are defined on the <a href="https://pages.nist.gov/OSCAL/concepts/terminology/">OSCAL Terminology Page</a>. The most important are repeated in this document, but readers should verify their understanding of all core OSCAL terms before reading this document.</p>
+      <p>Additionally, many terms in the wider domain have overloaded definitions. Unless defined otherwise by OSCAL or explicitly in this document, terms are to be understood as defined in the <a href="https://csrc.nist.gov/glossary">NIST CSRC Glossary</a>.</p>
+      <ul>
+        <li>
+          <p><term>profile</term>- an OSCAL Profile Document. Defines a set of inclusions, modifications, and transformations against a <term>catalog</term>. See <a href="https://pages.nist.gov/OSCAL/concepts/layer/control/profile/">OSCAL Profile Model</a>.</p>
+        </li>
+        <li>
+          <p><term>catalog</term>- an OSCAL Catalog Document. Contains a well-defined set of <term>controls</term>. See <a href="https://pages.nist.gov/OSCAL/concepts/layer/control/catalog/">OSCAL Catalog Model</a>.</p>
+        </li>
+        <li>
+          <p><term>control</term>- an individual item in an OSCAL Catalog. See <a href="https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-53r5.pdf">NIST Special Publication 800-53r5</a> for a more in-depth definition.</p>
+        </li>
+        <li>
+          <p><term>profile resolution</term>- The process of consuming one or more OSCAL Profiles and the OSCAL Catalogs that they reference to produce a new tailored <term>catalog</term>. See <a href="https://pages.nist.gov/OSCAL/concepts/layer/control/catalog/">OSCAL Catalog Model</a>.</p>
+        </li>
+        <li>
+          <p><term>source</term>- refers to the profile document that is input into the profile resolution processor. This is the profile being resolved. In this document, when referring to objects from the <term>source</term> document, the following style is used:<src>source-object</src>.</p>
+        </li>
+        <li>
+          <p><term>target</term>- the intended output of the transformation, a catalog document. In this document, when referring to objects of a <term>target</term> document, the following style is used:<tgt>target-object</tgt>.</p>
+        </li>
+        <li>
+          <p><term>directive</term>- refers to an object or combination of objects in source documents, which is designed to affect a particular outcome in the target catalog. For the most part, directives are in the source profile document – for example, a <src>set-parameter</src> object in a source profile is a directive to set a parameter value in the target catalog.</p>
+        </li>
+        <li>
+          <p><term>original order</term>- the order of objects as presented in the <term>source</term> document(s). See XYZ.</p>
+        </li>
+        <li>
+          <p><term>canonical order</term>- the order of objects as required in the appropriate OSCAL Model (Profile, Catalog, etc.). This can differ from the above order when converting between &quot;ordered&quot; formats (ex. XML), and &quot;non-ordered&quot; formats (ex. JSON).</p>
+        </li>
+      </ul>
+    </section>
+    <section>
+      <head>Requirement Keywords</head>
+      <p>The key words &quot;MUST&quot;, &quot;MUST NOT&quot;, &quot;REQUIRED&quot;, &quot;SHALL&quot;, &quot;SHALL NOT&quot;, &quot;SHOULD&quot;, &quot;SHOULD NOT&quot;, &quot;RECOMMENDED&quot;, &quot;NOT RECOMMENDED&quot;, &quot;MAY&quot;, and &quot;OPTIONAL&quot; in this document are to be interpreted as described in <a href="https://tools.ietf.org/pdf/bcp14.pdf">BCP 14</a> <a href="https://tools.ietf.org/pdf/rfc2119">[RFC2119]</a><a href="https://tools.ietf.org/pdf/rfc8174">[RFC8174]</a> when, and only when, they appear in all capitals, as shown here.</p>
+    </section>
+    <section id="use-of-yaml">
+      <head>Use of YAML</head>
+      <p>OSCAL supports a variety of serialization formats, each of which having it&apos;s own benefits and drawbacks. In this document, YAML (YAML Ain&apos;t Markup Language) is used to represent the various objects of the <term>source</term> and <term>target</term>. All examples and in-line references will be represented using <a href="https://yaml.org/spec/1.2/spec.html">YAML 1.2</a>.</p>
+      <p>YAML maps cleanly to JSON, thus allowing easy use of existing JSON/XML transformers where needed. With that in mind, the <a href="https://pages.nist.gov/OSCAL/reference/latest/complete/json-reference/">OSCAL Complete JSON Reference</a> is a valuable resource for understanding the YAML-based information structures used in this document. All JSON properties and objects defined in the reference equate to a YAML mapping, list, or dictionary.</p>
+    </section>
+    <section id="reading-examples">
+      <head>Reading YAML Examples</head>
+      <p>YAML is a particularly human-readable format. For those unfamiliar with the format, the basics:</p>
+      <ul>
+        <li>
+          <p>Each line is a key-value pair, presented as <code>key:value</code>, or as <code>key:</code> with any number of list items on the following lines.</p>
+        </li>
+        <li>
+          <p>Indentation, spacing, and white space matters. Items below a key and indented one level in are members (or children) of that key.</p>
+        </li>
+        <li>
+          <p>List items are represented with a preceding dash <code>- listitemkey:value</code>.</p>
+        </li>
+      </ul>
+      <p>The YAML specification is freely available here:<a href="https://yaml.org/spec/1.2/spec.html">YAML 1.2</a>.</p>
+      <p>Additionally, in order to unambiguously express information, this specification uses additional conventions, as described below.</p>
+      <p>There are some objects whose values must be determined dynamically at processing time. The most common example of this is timestamping output as it is processed. In this case, and any other dynamic-value cases, the expression <code>${{ }}</code> is used.</p>
+      <p>For example:</p>
+      <tagging whose="target_catalog"><![CDATA[
+last-modified: ${{ timestamp }}]]></tagging>
+      <p>Indicates the <tgt>last-modified</tgt> object should be produced with contents generated appropriately, in this case, the timestamp at the time of processing.</p>
+      <p>Some examples may elide content to enhance readability or save space. In these cases, a YAML comment (any line that starts with <code>#</code>) will be used to explain the elision.</p>
+      <p>Finally, although examples are syntactically faithful to OSCAL, they are not necessarily always formally valid in every respect. For example, OSCAL defines allowed property names (<src>props</src>) and values, and those rules may not be observed here. Examples are given for purposes of illustrating profile resolution semantics only, and should not be taken as normative for any actual use.</p>
+    </section>
+    <section id="document-layout">
+      <head>Document Layout</head>
+      <p>The specification is broken into the following major sections:</p>
+      <ul>
+        <li>
+          <p><term>Phases of Profile Resolution</term>- Lays out the necessary steps and phases of profile resolution. As each phase executes, the processor is understood to be creating and editing an intermediate representation of the output. There is one section for each of the three main phases.</p>
+        </li>
+        <li>
+          <p><term>Target Catalog Structure</term>- Provides the requirements for structuring the final output from the intermediate representation generated throughout the previous section.</p>
+        </li>
+      </ul>
+      <p><term>Please note</term>: As referenced in the Purpose section <xref rid="purpose" />, this specification makes no hard requirements on the specifics of implementation. It is feasible for an implementation to use no intermediate representation, and to directly and iteratively build the output. As long as all processing and output requirements are satisfied, any approach is allowed. With that said, the specification has been laid out to aid in implementation by providing a clear organization as a sequence of distinct operations.</p>
+    </section>
+    <section id="intermediate">
+      <head>The Intermediate and Implementation Guidance</head>
+      <p>The overall intent of this document, in addition to defining strict requirements, is to provide rough guidelines on implementing an OSCAL Profile Resolution Tool. To this end, each phase of resolution will be framed as a series of transformations applied to an internal data structure that is persistent throughout the process. We call this &quot;the intermediate&quot;.</p>
+      <p>Any examples that are labelled as &quot;Intermediate&quot; are pseudo-code, designed to represent how this data structure might look as we apply different operations to it. The example intermediates are often not valid OSCAL, and are not to be taken as guidance, but rather a useful visualization tool for implementers.</p>
+      <p>The authors believe that applying the steps of resolution in order against this intermediate representation is the simplest way to achieve full compliance with the specification. However, there is no requirement to implement profile resolution in this way. Requirements are given as rules on the output of resolution, and as such, tools can operate any way they would like internally.</p>
+    </section>
+  </section>
+  <section id="phases">
+    <head>Phases of Profile Processing</head>
+    <p>An OSCAL Profile has three major sections, each which correspond to a phase of profile resolution. In order to complete the profile resolution process, each section must be fully parsed and a catalog output created.</p>
+    <p><req level="recommended" id="req-phase-order">It is strongly RECOMMENDED that implementations execute the following steps in the order that they are provided here (import, merge, modify).</req> While it is possible to achieve compliance with a non-standard approach, the iterative nature of profile resolution lends itself to linear processing.</p>
+    <p>The three steps are <term>import</term>;<term>merge</term>; and <term>modify</term>. In brief:</p>
+    <ul>
+      <li>
+        <p><term>import</term>- identifies one or more control sources (catalogs or profiles) and defines the controls within them to be included in the result catalog. If nothing is imported, no resulting catalog is produced. Invoked by <src>import</src> directives in source profiles;</p>
+      </li>
+      <li>
+        <p><term>merge</term>- designates the rules for how controls will be organized (ordered and/or grouped) and merged (addressing conflicts or ambiguities) in the result catalog. Controlled by the <src>merge</src> directive in source profiles; if none are included, default merge rules are used;</p>
+      </li>
+      <li>
+        <p><term>modify</term>- indicates how controls and their parameters in the underlying catalog are to be altered, edited, amended or added in the final result catalog. Logical evaluation and parameter constraints provide advanced processing. Controlled by the <src>modify</src> directive in source profiles. If a <src>modify</src> directive is not provided, no changes will be made to the controls that have been imported/merged.</p>
+      </li>
+    </ul>
+    <p>As described in the previous section, when resolved, an OSCAL Profile takes the form of an OSCAL Catalog. The phases described below will produce outputs conforming to the catalog model.</p>
+  </section>
+  <section id="import">
+    <head>Import Phase</head>
+    <p>A profile begins by listing a set of catalogs and/or profiles to be imported. Each is represented by a resolvable resource URI and a directive specifying which controls to import from that resource. These resources may be available as static resources, or they may be produced dynamically on request; such as is the case when a profile is imported. Imports are given in sequence after the metadata:</p>
+    <tagging whose="source_profile"><![CDATA[
+profile:
+  uuid: ~
+  metadata: ~
+  imports:
+    - href: ${{ catalog URI }}
+      include-controls: ${{ list of selected controls }}
+    - href: ${{ profile URI }}
+      include-controls: ${{ list of selected controls }} 
+   ]]></tagging>
+    <p>In an import directive, the reference to the resource to be imported appears on an <src>href</src> child object. It takes either of two forms, external or internal:</p>
+    <p>An external reference appears as an absolute or relative URL:</p>
+    <tagging whose="source_profile"><![CDATA[
+profile:
+  uuid: ~
+  metadata: ~
+  imports:
+    - href: >-
+        https://github.com/usnistgov/oscal-content/tree
+        /master/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_catalog.yaml
+      include-controls: ${{ list of selected controls }}
+    - href: "../../NIST_SP-800-53_rev5_catalog.yaml"
+      include-controls: ${{ list of selected controls }} 
+   ]]></tagging>
+    <p>While an internal reference appears as below (see <xref rid="internalref" />):</p>
+    <tagging whose="source_profile"><![CDATA[
+profile:
+  uuid: ~
+  metadata: ~
+  imports:
+    - href: #80052rev4
+      include-controls: ${{ list of selected controls }}
+    - href: #80052rev5
+      include-controls: ${{ list of selected controls }} 
+   ]]></tagging>
+    <p>All import directives will contain either <src>include-all: ~</src> or <src>include-controls</src>. These directives indicate which controls from the imported document are explicitly selected <xref rid="select-phase" />.</p>
+    <p>The following section contains requirements for processing the <src>import</src> child of a source <src>profile</src></p>
+    <section id="importhrefs">
+      <head>Import href Requirements</head>
+      <section id="resolving-uris">
+        <head>Import URI Resolution</head>
+        <p><req level="must" id="req-uri-resolve">Tools MUST resolve URIs by following <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-5">Section 5 of RFC3986</a>, with the exception of URI Fragments (URIs that start with &quot;#&quot;). URI Fragments MUST instead be resolved as defined in <xref rid="internalref" />.</req></p>
+      </section>
+      <section id="aquiring-resource">
+        <head>Import Resource Acquisition</head>
+        <p><req level="must" id="req-uri-aquire">Tools MUST acquire resources at the resolved URI by following <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-5">Section 5 of RFC3986</a>, with the exception of URI Fragments (URIs that start with &quot;#&quot;). URI Fragments MUST instead be acquired as defined in <xref rid="internalref" />.</req></p>
+        <p><req level="must" id="req-uri-base">For the purposes of resolving URIs using the above specification, the Base URI MUST be considered to be the absolute URI of the containing profile.</req></p>
+        <p><req level="must" id="req-uri-error">In the case that acquiring a resource fails, the tool MUST cease processing and provide an error. In order to ensure profile resolution results in the same catalog regardless of which tool resolves it, all imports must successfully resolve. While this may cause inconvenience if resources are frequently not available, it ensures interoperability.</req></p>
+        <p>Note that receiving a cached version of an import, or resolving an import that is otherwise unavailable through some other (but automatic) means still satisfies the above requirement. This specification does not put requirements on the precise function of the import, as long as the correct document is retrieved.</p>
+      </section>
+      <section id="internalref">
+        <head>Internal References</head>
+        <p>URI Fragments in OSCAL represent internal references to other OSCAL objects in the same document. These references follow the pattern of &quot;#{{objectID}}&quot;. For example, the URI Fragment &quot;#param1&quot; is referencing the Parameter with unique ID &quot;param1&quot;.</p>
+        <p><req level="must" id="req-internal">In the context of the Import Phase, internal references will only appear as a reference to a profile or catalog that is in the <src>resources</src> section of the source. When tools encounter such a reference, they MUST locate the object in <src>resources</src> with the matching ID value, and resolve the import using the <src>rlink</src> URI and the above resolution requirements.</req></p>
+        <p><req level="must" id="req-internal-error">If the object fetched cannot be found or is not a valid OSCAL object, the tool MUST cease processing and provide an error.</req></p>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  metadata: ~
+  imports:
+    - href: "#nist-sp800-53_catalog"
+      include-controls: ${{ list of selected controls }}
+    
+  # Content Elided
+    
+  backmatter:
+    resources:
+      - uuid: "nist-sp800-53_catalog"
+        description: "NIST SP 800-53 rev5 OSCAL format, on Github."
+        rlinks:
+          - rlink:
+              href: >-
+                https://github.com/usnistgov/oscal-content/tree
+                /master/nist.gov/SP800-53/rev4/xml/NIST_SP-800-53_rev5_catalog.xml   
+       ]]></tagging>
+      </section>
+      <section id="URI-circular">
+        <head>Resolving Imports of Profiles</head>
+        <p><req level="must" id="req-circular-resolve">If the resource acquired is an OSCAL Profile, the tool MUST apply this specification to resolve it, then continue processing having imported the resulting catalog.</req></p>
+        <p><req level="should" id="req-circular-catalog">When a profile imports a profile, the subordinate profile SHOULD be resolved first into a catalog using this specification, before it is imported.</req> This presents the possibility of circular imports, when a profile is directed to import itself either directly or indirectly.</p>
+        <p>A <term>circular import</term> occurs when a profile imports an already imported profile, which was called at an earlier place in the import hierarchy. For example, if profile A imports profile B, and profile B imports profile A, the second import is circular. (An import at the top can only be circular if a profile tries to import itself.) If A imports B, B imports C and C imports A, C’s import is circular.</p>
+        <p>Note that an import can only be circular within the context of processing a particular profile. In the last example, C’s import would not be circular if invoked in the context of resolving B by itself.</p>
+        <p><req level="must" id="req-circular-error">If a processor encounters a <term>circular import</term> as described above (self-imports are inherently circular), the processor MUST cease processing and generate an error.</req></p>
+        <mapping>
+          <p>A profile identified as <code>home_profile.yaml</code> imports another one identified as <code>circular_profile.yaml</code>:</p>
+          <tagging whose="source_profile"><![CDATA[
+profile:
+  id: "home_profile.yaml"
+  metadata: ~
+  imports:
+    - href: "circular_profile.yaml"
+      include-controls: ${{ list of selected controls }} 
+         ]]></tagging>
+          <p>In turn this file invokes <code>home_profile.xml</code>:</p>
+          <tagging whose="source_profile"><![CDATA[
+profile:
+  id: "circular_profile.yaml"
+  metadata: ~
+  imports:
+    - href: "home_profile.yaml"
+      include-controls: ${{ list of selected controls }} 
+         ]]></tagging>
+          <p>Once detected, this circular import will result in an error and no further processing will take place.</p>
+          <tagging whose="target_catalog"><![CDATA[
+# Import at href: "circular_profile.yaml" failed.
+  # Reason: Error during profile import:
+  # Import at href: "home_profile.yaml" failed.
+  # Reason: Circular import 
+         ]]></tagging>
+        </mapping>
+      </section>
+      <section id="URI-multiple">
+        <head>Multiple imports</head>
+        <p>Each import directive is processed to produce a set of controls. Note that this occurs even if the same catalog is imported multiple times: each distinct import collects controls into a separate <int>selection</int>:</p>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  uuid: ~
+  metadata: ~
+  imports:
+    - href: "#catalog"
+      include-controls:
+       - with-ids:
+          - ac-1
+          - ac-2
+    - href: "#catalog"
+      include-controls:
+       - with-ids:
+          - ac-3
+          - ac-4 
+       ]]></tagging>
+        <tagging whose="inter_catalog"><![CDATA[
+intermediate:
+  inclusions:
+    - id: ${{uuid of #catalog}}
+      included-controls:
+          - ac-1
+          - ac-2
+    - id: ${{uuid of #catalog}}
+      included-controls:
+          - ac-3
+          - ac-4 
+       ]]></tagging>
+        <p>The control inclusions are combined and collapsed in the next phase of processing,<term>merge</term>(see <xref rid="merge-phase"/>) .</p>
+        <p>Multiple imports against the same resource are allowed, and would most commonly occur when the profile author is using <xref rid="mapping"/> to create very specific output. Multiple imports may result in outputs with clashing control IDs if mapping or the merge directive is not set correctly.</p>
+      </section>
+      <section id="mapping">
+        <head>Mapping Controls</head>
+        <p>The optional <src>mapping</src> child of a given <src>import</src> provides a simple ID remapping for objects included from that specific import. This provides the means for profile authors to proactively avoid clashing IDs of controls and other objects.</p>
+        <p>The Mapping section consists of 5 optional subsections, each covering a particular type of object. Each subsection is a list of ID mappings to be applied for objects that are the parent object type.</p>
+        <p>When encountering a given mapping instruction, processors:</p>
+        <ul>
+          <li>
+            <p>MUST change the distinctive ID of that object to be equal to the value of the <src>to</src> object.</p>
+          </li>
+          <li>
+            <p>MUST update all known references to the old ID in other included content, allowing the new ID to be used in subsequent profile sections.</p>
+          </li>
+        </ul>
+        <p>Since mapping is a self contained process inside each import, the rest of this specification will continue to reference IDs with the assumption that mapping has already been applied if it was present. Since mapping is most commonly used to avoid clashing IDs, processors should take care to not handle duplicate IDs until after mapping is complete.</p>
+        <p>Below is a simple example of mapping. The second <src>import</src> is included controls from a different catalog whose ID values happen to collide. Knowing this, the profile author has remapped those IDs to new values.</p>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  uuid: ~
+  metadata: ~
+  imports:
+    - href: "#catalog"
+      include-controls:
+       - with-ids:
+          - ac-1
+          - ac-2
+    - href: "#catalog2"
+      include-controls:
+       - with-ids:
+          - ac-1
+          - ac-2
+      mapping:
+       - controls:
+          - from: ac-1
+            to: map-ac-1
+          - from: ac-2
+            to: map-ac-2
+       ]]></tagging>
+        <p>Using the intermediate approach, an internal data structure resembling the following would result from the above profile:</p>
+        <tagging whose="inter_catalog"><![CDATA[
+intermediate:
+  metadata: ~
+  inclusions:
+    - id: ${{uuid of #catalog}}
+      included-controls:
+          - ac-1
+          - ac-2
+    - id: ${{uuid of #catalog2}}
+      included-controls:
+          - map-ac-1
+          - map-ac-2 
+       ]]></tagging>
+      </section>
+    </section>
+    <section id="select-phase">
+      <head>Including Controls</head>
+      <p>Each import contains directives on which controls from the imported catalog are to be fetched and used for further processing. Throughout the rest of the document we will refer to this as &quot;inclusion&quot;. If a control is included, and the source profile makes no other changes to it, it will be present in the output. Exclusion directives in this section, as well as directives in the following two major sections (merge and modify), may make changes to an included control or group that could cause it to appear differently, or not at all, in the output. Using the intermediate implementation approach, any control(s) that are included would be extracted from the referenced catalogs, any applicable mappings would be applied, then the controls(s) would be stored.</p>
+      <section id="include-all">
+        <head>include-all</head>
+        <p><req level="must" id="req-include-all" eg="req-include-all-asis.xml req-include-all-flat.xml">When an import provides the <src>include-all</src> directive, ALL controls and groups in the referenced document (including nested controls) MUST be included.</req></p>
+        <tagging whose="source_profile"><![CDATA[
+include-all: ~]]></tagging>
+      </section>
+      <section id="include-by-id">
+        <head>include-controls plus with-id</head>
+        <p><req level="must" id="req-include-by-id">When an import provides the <src>include-controls</src> directive, with a <src>with-id</src> child, all controls in the referenced document whose <code>id</code> match one of the listed <code>id</code> values MUST be included.</req></p>
+        <tagging whose="source_profile"><![CDATA[
+include-controls:
+  - with-ids:
+    - id: ac-1
+    - id: ac-2
+       ]]></tagging>
+      </section>
+      <section id="include-by-match">
+        <head>include-controls plus matching</head>
+        <p>Controls may also be included using match patterns against their IDs. This is useful because related controls (either in a hierarchy, or together in a group) frequently have related IDs as well.</p>
+        <p><req level="must" id="req-include-by-match">When an import provides the <src>include-controls</src> directive, with a <src>matching</src> child, all controls in the referenced document whose <code>id</code> matches one of the listed <code>pattern</code> values (Glob matching) MUST be included.</req></p>
+        <p><req level="must" id="req-include-by-match-empty">If a <code>matching</code> object is provided with no <code>pattern</code>, it MUST be treated as matching nothing. While not providing a pattern is technically valid, resolution tool implementers should be aware that it is generally undesirable, and warnings or notices to the user may be appropriate.</req></p>
+        <tagging whose="source_profile"><![CDATA[
+include-controls:
+  - matching:
+    - pattern: "ac*" 
+       ]]></tagging>
+      </section>
+      <section id="import-nested">
+        <head>Dealing with Nested Controls and Groups</head>
+        <p>In OSCAL, controls may contain child controls. For instance, in SP 800-53 many controls are supplemented with control enhancements; in OSCAL these are represented as child controls within parent controls. So parent AC-2 (in a given catalog) has children AC-2(1) through AC-2(13), for example.</p>
+        <p>By default, inclusion of a control also causes any of that control&apos;s ancestors (or parents) to also be included. By default, inclusion of a control DOES NOT cause the inclusion of any descendants (or children) of that control to be included. This applies to both controls and groups.</p>
+        <p>This default behavior can be modified by the following two optional children of the <src>include-controls</src> object.</p>
+        <section id="include-child-controls">
+          <head>with-child-controls</head>
+          <p>Child controls are, for the most part, treated the same as top level controls: they can be explicitly included using the selection directives above. As a shortcut to manually including all of the desired descendant controls of a given control, OSCAL provides the &quot;with-child-controls&quot; option. &quot;with-child-controls&quot; appears as a child object under a given inclusion directive, and defines additional behavior that is to be executed alongside the parent inclusion.</p>
+          <p><req level="must" id="req-with-child-controls-yes">A <src>with-child-controls: yes</src> directive on an <src>include-controls</src> indicates that <em>all descendant controls</em> of the included control MUST also be included.</req></p>
+          <p><req level="must" id="req-with-child-controls-no">A <src>with-child-controls: no</src> directive on an <src>include-controls</src> indicates that ONLY the matching control is included, any descendant children MUST NOT be included.</req></p>
+          <p><req level="must" id="req-with-child-controls-none">If no <src>with-child-controls</src> is provided, the processor MUST consider the directive as being equivalent to one having <src>with-child-controls:no</src>.</req></p>
+        </section>
+        <section id="include-parent-controls">
+          <head>with-parent-controls</head>
+          <p>Although similar to the above <src>with-child-controls</src>, the optional <src>with-parent-controls</src> applies to parents of the included control, and has the opposite default behavior. In order to maintain the structure of the source catalog, profile resolution includes all parents of an included control by default. If a profile author wants to change this structure, they could use an exclude directive that lists all of the undesired parents. As a shortcut for this,<src>with-parent-controls</src> provides the following functionality:</p>
+          <p><req level="must" id="req-with-parent-controls-yes">A <src>with-parent-controls: yes</src> directive on an <src>include-controls</src> indicates that <em>all parent controls</em> of the included control MUST also be included.</req></p>
+          <p><req level="must" id="req-with-parent-controls-no">A <src>with-parent-controls: no</src> directive on an <src>include-controls</src> indicates that ONLY the matching control is included, any parents MUST NOT be included.</req></p>
+          <p><req level="must" id="req-with-parent-controls-none">If no <src>with-parent-controls</src> is provided, the processor MUST consider the directive as being equivalent to one having <src>with-parent-controls:yes</src>.</req></p>
+        </section>
+      </section>
+      <section id="exclude-directive">
+        <head>exclude-controls</head>
+        <p>Exclusions work the same way as inclusions, except with the opposite effect - the indicated control(s) do not appear in the target catalog.</p>
+        <p><req level="must" id="req-exclude">Any control designated to be both included and excluded, MUST be excluded. This holds irrespective of the specificity of the selection for inclusion or exclusion.</req> For example, if AC-1 is included by id <code>ac-1</code> and excluded by matching <code>ac.*</code>, it is excluded.</p>
+        <p><req level="must" id="req-exclude-additional">When <src>exclude-controls</src> has at least one <src>with-ids</src> or <src>matching</src> directive, the processor MUST follow the same rules as defined in the relevant sections above for these directives, but exclude instead of include any controls. All optional features (with-child-controls, etc.) also apply to exclusion directives.</req></p>
+      </section>
+      <section id="redundant-calls">
+        <head>Redundant Inclusions and Exclusions</head>
+        <p><req level="must" id="req-redundant">A given <src>import</src> may have any number of inclusion statements and any number of exclusion statements. Their effect is cumulative; any control that is included (or excluded) more than once MUST be considered to be included (or excluded) only once. In other words, a given control being included or excluded more than once has no effect. Exclusion still takes priority over inclusion (see above).</req></p>
+        <p>Note that this requirement only applies to controls included within the context of a single import. Controls with duplicate IDs included under a different <src>import</src> are not discarded. Also note that this redundancy pruning happens after any relevant mappings have been applied.</p>
+      </section>
+      <section id="import-param">
+        <head>Handling Params</head>
+        <p>Any <src>param</src> that is not directly under a control is referred to as a <q>loose</q> param.</p>
+        <p><req level="must" id="req-loose-param">All loose params from both imported documents and the profile source MUST be included. These params will be kept in the final output if document contains any references to them, and discarded otherwise. See <xref rid="cleanup" />.</req> Since new references can be created during the <src>modify</src> phase, tools should be careful not to prune params without fully understanding the final state of the output document.</p>
+      </section>
+      <section id="import-group"><!-- TODO: Add requirements here? Take another look at this. -->
+        <head>Handling Groups</head>
+        <p>Some source catalogs use <src>group</src> objects to place controls into arbitrary groupings. Tools will need to be aware of these groups when executing the "merge" phase below, as they will duplicated into the output under the "as-is" mode and can be referenced in "custom" mode. The naïve intermediate approach would keep all groups until all other phases are complete, but implementations may find it more performant to look ahead and prune unused groups early.</p>
+      </section>
+      <section id="import-pitfalls">
+        <head>Avoiding Implementation Pitfalls</head>
+        <p>In order to ensure that implementers have as much flexibility as possible, requirements in this section have purposefully been kept minimal. Below are some common issues for implementers to be aware of:</p>
+        <ul><!-- TODO: Add more of these pitfall tips? -->
+          <li>
+            <p>The ordering and hierarchical organization of included controls as they were present in the original catalog may be used later in the resolution process. Specifically, if the profile is using the "as-is" structuring directive, the ordering and organziation of the output should match the source catalog as closely as possible. Implementations may want to track this information, or look ahead to see what structuring mode is being used. Note that "as-is" also requires implementations to replicate any use of the <src>group</src> element.</p>
+          </li>
+        </ul>
+      </section>
+    </section>
+    <section id="import-wrap-up">
+      <head>Wrapping up the Import Phase</head>
+      <p>At this point all requirements for content importing and control inclusion have been covered. If using the intermediate approach, the processor should have an intermediate that contains: a set of included controls and all of their child informational (non-control, non-group) objects, any relevant <src>group</src> objects and their informational content, and a set of included &quot;loose params&quot;<xref rid="import-param" />(zero to many). The general structure of the intermediate would match that of the imported catalogs (i.e. Nested controls remain nested, grouped controls remain grouped).</p>
+    </section>
+  </section>
+  <section id="merge-phase">
+    <head>Merge Phase</head>
+    <p>Profiles may contain a <src>merge</src> section, where directives are given to instruct the processor how to combine the set of included objects collected during the Import Phase.<code>merge</code> has two parts: a &quot;combine&quot; directive, and a &quot;structuring&quot; directive.</p>
+    <p><req level="recommended" id="req-merge-order">It is RECOMMENDED that tools apply the &quot;combine&quot; directive to the intermediate generated by the Import phase first, then apply the &quot;structuring&quot; directive.</req></p>
+    <p>The following section contains requirements for processing the <src>merge</src> child of a source profile.</p>
+    <section id="merge-combine">
+      <head>The &quot;combine&quot; Directive</head>
+      <p><code>combine</code> is an optional child of <code>merge</code> that provides the rules for dealing with objects that have duplicate (or clashing) distinct IDs <xref rid="id" />.</p>
+      <p>There are two valid combination methods provided by OSCAL, provided by the <src>method</src> child of <src>combine</src>:</p>
+      <ul>
+        <li>
+          <p>use-first: Use the first definition - the first control with a given ID is used; subsequent ones are discarded</p>
+        </li>
+        <li>
+          <p>keep: Keep - controls with the same ID are kept, retaining the clash</p>
+        </li>
+      </ul>
+      <p><req level="must" id="req-merge-combine">Note that "merge: combine" is deprecated, and MUST be considered undefined behavior when encountered.</req></p>
+      <p>In order to apply the combination method, IDs of each control explicitly included are compared against one another. As IDs are unique across entire OSCAL documents, different imports or any groupings have no bearing on collision. Processing requirements for each method are described below.</p>
+      <section id="no-merge-explicit">
+        <head>No Combine Directive</head>
+        <p><req level="must" id="req-merge-none">If no <src>merge</src> directive is given in the profile, or if a <src>merge</src> is given without a <src>combine</src>, merge conflicts MUST be treated as if <src>method: keep</src> was given.</req> For example, a profile with no <src>merge</src> directive:</p>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  imports:
+    - href: #catalogURI
+      include-all: ~ 
+       ]]></tagging>
+        <p>is the same as</p>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  imports:
+    - href: #catalogURI
+      include-all: ~
+  merge:
+    combine:
+      method: keep
+      flat: ~ 
+       ]]></tagging>
+      </section>
+      <section id="no-merge-combination-rule">
+        <head><q>method:keep</q></head>
+        <p><req level="must" id="req-merge-keep">When a merge is indicated by <src>method:keep</src>, or when no merge directive is given, the <q>keep</q> combination rule is used. Any controls with the same distinctive ID <xref rid="id" /> MUST NOT not merged. (They are kept.)</req></p>
+        <tagging whose="source_profile"><![CDATA[
+merge:
+    combine:
+      method: keep 
+       ]]></tagging>
+        <p>Under this directive, colliding controls will result in invalid results, as they will both appear in the results with the same ID. Accordingly, this setting may be useful in ensuring integrity of references to controls as given in the profile: if any included control is called only once, clashing controls will not be produced and validation will succeed.</p>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  imports:
+    - href: #catalog1
+      include-controls:
+        - with-ids
+            id: ac-1
+            id: ac-2
+    - href: #catalog1
+      include-controls:
+        - with-ids
+            id: ac-1
+            id: ac-2 
+  merge:
+    combine:
+      method: keep
+       ]]></tagging>
+        <p>In the intermediate (showing control inclusions):</p>
+        <tagging whose="inter_catalog"><![CDATA[
+intermediate:
+  inclusions:
+    - explicitly-included-controls:
+          - ac-1
+          - ac-2
+          - ac-1
+          - ac-2 
+       ]]></tagging>
+        <p>In this case, downstream errors should be expected: the two <code>ac-1</code> controls clash with each other, as do the two <code>ac-2</code> controls.</p>
+        <p><req level="should" id="req-merge-keep-warning">Processors SHOULD provide a warning under the merge:keep directive when duplicate controls are detected.</req> <req level="may" id="req-merge-keep-error">The processor MAY throw an error and cease processing (short-circuiting a certain future error) when duplicate controls are detected under the merge:keep directive.</req></p>
+      </section>
+      <section id="use-first-combination-rule">
+        <head><q>method:use-first</q></head>
+        <tagging whose="source_profile"><![CDATA[
+merge:
+    combine:
+      method: use-first 
+       ]]></tagging>
+        <p><req level="must" id="req-merge-use-first">When the <q>use-first</q> combination rule is applied, and controls that share a distinctive ID are found, the first control encountered MUST be kept, the rest MUST be discarded.<q>First</q> MUST be determined by a top-down, depth-first traversal of the source profile&apos;s import hierarchy.</req></p>
+        <mapping>
+          <tagging whose="source_profile"><![CDATA[
+profile:
+  imports:
+    - href: #catalog1
+      include-controls:
+        - with-ids
+            id: ac-1
+            id: ac-3
+    - href: #catalog1
+      include-controls:
+        - with-ids
+            id: ac-1
+            id: ac-2 
+  merge:
+    combine:
+      method: use-first
+         ]]></tagging>
+          <p>In the intermediate(showing control inclusions):</p>
+          <tagging whose="inter_catalog"><![CDATA[
+intermediate:
+  inclusions:
+    - explicitly-included-controls:
+          - ac-1 (From catalog1)
+          - ac-3
+          - ac-2 
+         ]]></tagging>
+        </mapping>
+      </section>
+      <section id="merge-combination-rule">
+        <head><src>method:merge</src></head>
+        <p>Deprecated, unspecified behavior.</p>
+      </section>
+    </section>
+    <section id="structuring-result">
+      <head>The &quot;structuring&quot; Directive</head>
+      <p>This section describes how a profile may dictate the structure of the target <tgt>catalog</tgt>, apart from its <tgt>metadata</tgt> or <tgt>back-matter</tgt>.<req level="must" id="req-stucture">Optionally, one of three &quot;structuring&quot; directives can be included as a child of <src>merge</src>:<src>flat</src>,<src>as-is</src> and <src>custom</src>. When one of these appears, it is the selected structuring directive. If more than one appears, processors MUST generate an error and cease processing.</req> Processing requirements for each are given below:</p>
+      <section id="structure-none">
+        <head>No Structuring Directive</head>
+        <p><req level="must" id="req-structure-none" eg="req-include-all-flat.xml">If no <src>merge</src> directive is given in the profile, or if a <src>merge</src> is given without a structuring directive, structuring the output MUST be treated as if the structuring directive <src>flat</src> was given. For example, a profile with no <src>merge</src> directive:</req></p>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  imports:
+    - href: #catalogURI
+      include-all: ~ 
+       ]]></tagging>
+        <p>is the same as</p>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  imports:
+    - href: #catalogURI
+      include-all: ~
+  merge:
+    combine:
+      method: keep 
+      flat: ~ 
+       ]]></tagging>
+      </section>
+      <section id="merge-flat">
+        <head>&quot;flat&quot;</head>
+        <p><req level="must" id="req-merge-flat">Profiles with the &quot;flat&quot; merge directive MUST be resolved as unstructured catalogs, with no grouping or nesting of controls.</req></p>
+        <p><req level="must" id="req-merge-flat-list">Unstructured catalog output MUST be produced by adhering to the following requirements:</req></p>
+<!-- TODO, ISSUE, REQ TAGGING OF LISTS -->        <ul>
+          <li>
+            <p><req level="must" id="req-merge-flat-list-1">All included controls are output to the target as a flat list directly under &quot;catalog&quot;.</req></p>
+          </li>
+          <li>
+            <p><req level="must" id="req-merge-flat-list-2">Any included &quot;loose params&quot; are output to the target as a flat list directly under &quot;catalog&quot;.</req></p>
+          </li>
+          <li>
+            <p><req level="must" id="req-merge-flat-list-3">Any groups are discarded.</req></p>
+          </li>
+        </ul>
+        <p>An example of flat structuring is provided below</p>
+        <tagging whose="source_catalog"><![CDATA[
+catalog:
+  groups:
+    - groupA
+      - ac-1
+      - ac-2
+    - groupB
+      - bc-1 
+       ]]></tagging>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  imports:
+    - href: #catalogURI
+      include-controls:
+        with-ids:
+          - ac-1
+          - ac-2
+          - bc-1
+  merge:
+    combine:
+      method: keep 
+      flat: ~ 
+       ]]></tagging>
+        <tagging whose="inter_catalog"><![CDATA[
+intermediate:
+  controls:
+    - ac-1
+    - ac-2
+    - bc-1 
+       ]]></tagging>
+      </section>
+      <section id="merge-as-is">
+        <head><q>as-is</q></head>
+        <p>An <src>as-is</src> directive is used to reproduce the structure of the source documents in the target catalog.</p>
+        <p><req level="must" id="id-structure-as-is-list">Processors MUST handle the <src>as-is</src> directive by adhering to the following requirements:</req> <!-- TODO, ISSUE, REQ TAGGING OF LISTS --></p>
+        <ul>
+          <li>
+            <p><req level="must" id="id-structure-as-is-list-1">All included controls are output to the target, keeping the structure of the groups and nested controls. Any group that holds an included control MUST appear in the output with all of its non-control children intact. If an included control has a parent control that was not included, that control's output location is "up-leveled", or made equal to the non-included parent. This applies recursively until the control is directly under either "catalog" or another included control.</req></p>
+          </li>
+          <li>
+            <p><req level="must" id="id-structure-as-is-list-2">Any included &quot;loose params&quot; are output to the target as a flat list directly under &quot;catalog&quot;.</req></p>
+          </li>
+        </ul>
+        <p>Example:</p>
+        <tagging whose="source_catalog"><![CDATA[
+catalog:
+  groups:
+    - groupA
+      - ac-1
+      - ac-2
+    - groupB
+      - bc-1 
+       ]]></tagging>
+        <tagging whose="source_profile"><![CDATA[
+profile:
+  imports:
+    - href: #catalogURI
+      include-controls:
+        with-ids:
+          - ac-1
+          - ac-2
+          - bc-1
+  merge:
+    combine:
+      method: keep 
+      as-is: ~ 
+       ]]></tagging>
+        <tagging whose="inter_catalog"><![CDATA[
+intermediate: 
+#In this approach, the original hierarchy of the controls under the groups is stored,
+#but is not shown in this example.
+  controls:
+    - ac-1
+    - ac-2
+    - bc-1
+  groups:
+    - groupA
+    - groupB 
+       ]]></tagging>
+      </section>
+      <section id="merge-custom">
+        <head><q>custom</q></head>
+        <p>The <src>custom</src> directive provides the target catalog with a custom structure. A one-to-one mapping of the desired structure of the target catalog is defined alongside control matching instructions, resulting in a strictly controlled output catalog.</p>
+        <section id="custom-groups">
+          <head>Creating Custom Groups</head>
+          <p><req level="must" id="req-custom-group">A <src>group</src> object given under <src>custom</src> MUST result in a <tgt>group</tgt> with the exact same content (excluding <src>insert-controls</src>) in the target catalog.</req></p>
+          <p><req level="must" id="req-custom-group-contents">If the ID of the group matches the ID of a group that has been included during the import phase, all contents inside the group, including <src>title</src>,<src>param</src>,<src>prop</src> and <src>part</src> objects MUST be copied into the target, appearing in the same order as in the source.</req></p>
+          <p>Note that groups defined in <src>custom</src> may vary from fully featured to minimally instantiated. This includes arbitrary nesting of such groups inside of one another. No groups other than those explicitly declared should appear in the output catalog.</p>
+        </section>
+        <section id="custom-selection">
+          <head>Inserting Controls</head>
+          <p>The <src>insert-controls</src> directive may appear anywhere under <src>custom</src>, whether as a direct child or inside any of the defined groups. Inside insert-controls,<src>include-controls</src> and <src>include-all</src> from the Import Phase <xref rid="import" /> are used with the same basic behavior to configure which controls are selected and inserted at the current location.</p>
+          <p>In order to provide clarity, controls that match the various conditions of these inclusion directives inside the <src>custom</src> object will be referred to as &quot;selected&quot; instead of &quot;included&quot;. Only directly selected controls will appear in the target catalog.</p>
+          <p><req level="must" id="req-custom-select">When processing the control selection of a <src>custom</src> element, the behavior defined in this section MUST be followed to generate the output.</req></p>
+          <p>A <src>insert-controls</src> with an <src>include-controls</src> child results in the following behavior:</p>
+          <ul>
+            <li>
+              <p><src>with-id</src> results in selecting and inserting, at that point inside the new grouping, the included controls with the <src>id</src> given by <src>with-id</src>. They should be given in the same order as they appear in the control selection(s).</p>
+            </li>
+            <li>
+              <p>A <src>matching</src> directive results in selecting and inserting, at that point inside the new grouping, all included controls whose <src>id</src> match, as a Glob expression, the pattern given in the <src>pattern</src>. They are given in the same order as they appear in the input control selection(s).</p>
+            </li>
+          </ul>
+          <p>An <src>insert-controls</src> with an <src>include-all</src> child results in all included controls being selected and inserted. They are given in the same order as they appear in the input control selection(s).</p>
+          <p><src>insert-controls</src> can also indicate the order that the selected controls are to be emitted in the result catalog using an <src>order</src> child. Three values MUST be supported and handled as specified below:</p>
+          <ul>
+            <li>
+              <p><code>ascending</code> will sort all selected controls into ascending alphanumeric order by their ID.</p>
+            </li>
+            <li>
+              <p><code>descending</code> will sort all selected controls into descending alphanumeric order by their ID.</p>
+            </li>
+            <li>
+              <p><code>keep</code> indicates that controls should be inserted in the order of their appearance, using a depth-first traversal of the source profile&apos;s imports.</p>
+            </li>
+          </ul>
+          <p><req level="must" id="req-custom-select-ignore">In the case that a control selection matches none of the included controls, it MUST be ignored.</req> <req level="should" id="req-custom-select-warning">In the case that a control selection matches none of the included controls, a warning SHOULD be provided.</req> If a control that was included by the Import Phase is never selected, no error occurs, that control simply does not appear in the output catalog.</p>
+        </section>
+      </section>
+    </section>
+    <section id="merge-wrapup">
+      <head>Wrapping up the Merge Phase</head>
+      <p>After the merge phase, the intermediate should now closely resemble the content and structure of the final output catalog. Controls and groups have been included, remapped, de-duplicated, then placed into their final location within the output&apos;s structure. Note: there is still an opportunity for included controls or groups to become referenced; and therefore, not eligible for pruning <xref rid="cleanup" /> in the next phase.</p>
+      <p>Regardless of any merge directives, there also likely remains &quot;loose params&quot; that have been propagated forward; these too must be persisted.</p>
+    </section>
+  </section>
+  <section id="modify-phase">
+    <head>Modify Phase</head>
+    <p>There are two ways profiles may further modify the results of profile resolution: setting parameters, and altering controls. These activities are defined as two child objects inside the third step of profile resolution, the Modify Phase.</p>
+    <p>The following section contains requirements for processing the <src>modify</src> child of a source profile.</p>
+    <section id="param-setting">
+      <head>Setting Parameters</head>
+      <p>Modification of parameter settings is indicated using the <src>set-parameter</src> object under <src>modify</src>. For this section, a given <src>set-parameter</src> object will be referred to as the source.</p>
+      <p>Profile Resolution Tools MUST adhere to the following requirements for processing &quot;set-parameter&quot;:</p>
+      <ul>
+        <li>
+          <p>First, the list of included params (among &quot;loose params&quot; and remaining included controls and groups) is searched for a param who has an &quot;id&quot; equal to this object&apos;s &quot;param-id&quot;. This is the &quot;target&quot;.<req level="should" id="req-modify-set-param-warning">If no such parameter is found, a warning SHOULD be issued.</req> <req level="must" id="req-modify-set-param-id-ignore">If no such parameter is found, processing MUST still continue.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-modify-set-param-objects1">For the following objects inside the source: class, depends-on, label, usage, values, select; the object MUST be copied into the target from the source, first removing any existing objects with the same name.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-modify-set-param-objects2">For the following objects inside the source: props, links, constraints, guidelines; the contents of the object MUST be added to the contents of the target object of the same name. If no such object exists in the target, it is created.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-modify-set-param-objects3">For the following objects inside the source: prop, link; the object MUST be copied into the target from the source, first removing any existing objects with the same distinctive ID. (<xref rid="id"></xref>).</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-modify-param-multi">If more than one <src>set-parameter</src> directive is given for the same parameter, all MUST BE applied, in the sequence given in the profile.</req></p>
+        </li>
+      </ul>
+    </section>
+    <section id="control-altering">
+      <head>Altering controls</head>
+      <p>A control can be altered by an <src>alter</src> object inside &quot;modify&quot;. The <src>control-id</src> child object under the <src>alter</src> indicates the control to which the alteration is applied.</p>
+      <section id="add-directive">
+        <head>Adding contents to controls</head>
+        <p>Contents may be added to controls using an add directive inside an alter directive. There are two forms of alteration: with implicit and explicit bindings.</p>
+        <section id="add-to-control">
+          <head>Implicit binding</head>
+          <p><req level="must" id="req-modify-alter-add-implicit">An <src>add</src> directive with no <src>by-id</src> child MUST be considered an implicit binding, and will apply to the control as a whole.</req></p>
+          <p><req level="must" id="req-modify-alter-add-implicit0contents">The contents of an implicitly bound add directive MUST be added to the control contents in the target, either after its <tgt>title</tgt> when <src>position</src> is <code>starting</code>, or at the end if its position is <code>ending</code>, or if no valid poisition is given.</req></p>
+          <p><req level="must" id="req-modify-alter-add-implicit-position">When an add directive is implicitly bound, the <src>position</src> values <code>before</code> and <code>after</code> MUST be treated like <code>starting</code> and <code>ending</code>, respectively.</req></p>
+          <p>Control contents in catalogs must appear in the order <code>title, param, prop, link, part, control</code> per the OSCAL model documentation.<req level="must" id="req-modify-alter-add-implicit-order">After processing an implicitly bound add directive, the control contents MUST be sorted to appear in the required order: a new <tgt>prop</tgt> appears after any <src>prop</src> already in the control, when <src>position</src> is <code>ending</code>, or not given, or before any <src>prop</src> in the control when <src>position</src> is <code>starting</code>.</req></p>
+          <mapping>
+            <p>An addition operating on a control with implicit binding and position <code>starting</code></p>
+            <tagging whose="source_catalog"><![CDATA[
+control:
+  id: a1
+  title: Basic precautions
+  props:
+    - name: status
+      value: ready 
+           ]]></tagging>
+            <tagging whose="source_profile"><![CDATA[
+alter:
+  control-id: a1
+  add:
+    position: starting
+    props:
+      - name: basis
+        value: enumerated
+    parts:
+      - name: caution
+        prose: \\n\\nPending scheduled testing. 
+           ]]></tagging>
+            <tagging whose="target_catalog"><![CDATA[
+control:
+  id: a1
+  title: Basic precautions
+  props:
+    - name: basis
+      value: enumerated
+    - name: status
+      value: ready
+  parts:
+    - name: caution
+      prose: \\n\\nPending scheduled testing. 
+           ]]></tagging>
+            <p>Position is <code>starting</code> but the new <tgt>part</tgt> is added after the existing <tgt>prop</tgt>, because <tgt>prop</tgt> objects must always occur first.</p>
+          </mapping>
+          <mapping>
+            <p>An addition operating on a control with implicit binding and position <code>ending</code></p>
+            <tagging whose="source_catalog"><![CDATA[
+control:
+  id: a1
+  title: Basic precautions
+  props:
+    - name: status
+      value: ready 
+           ]]></tagging>
+            <tagging whose="source_profile"><![CDATA[
+alter:
+  control-id: a1
+  add:
+    position: starting
+    props:
+      - name: basis
+        value: enumerated
+    parts:
+      - name: caution
+        prose: \\n\\nPending scheduled testing. 
+           ]]></tagging>
+            <tagging whose="target_catalog"><![CDATA[
+control:
+  id: a1
+  title: Basic precautions
+  props:
+    - name: status
+      value: ready
+    - name: basis
+      value: enumerated
+  parts:
+    - name: caution
+      prose: \\n\\nPending scheduled testing. 
+           ]]></tagging>
+            <p>The <src>position</src> is <code>ending</code> so the new <tgt>prop</tgt> appears after the existing <tgt>prop</tgt>.</p>
+          </mapping>
+        </section>
+        <section id="add-to-element">
+          <head>Explicit binding</head>
+          <p>An explicit binding on an addition permits inserting new contents anywhere in a control, not only at the top level.<req level="must" id="req-modify-alter-add-explicit">An <src>add</src> directive with a <src>by-id</src> child MUST be considered an explicit binding, and applies to only a single object inside the control.</req> <req level="must" id="req-modify-alter-add-explicit-id">When an add directive is explitly bound, the value of the <src>by-id</src> child MUST correspond to the value of an <src>id</src> on an object inside the control, and not the control itself.</req> <req level="must" id="req-modify-alter-add-explicit-id-ignore">If <src>by-id</src> does not correspond to such a value, the <src>add</src> directive MUST be considered inoperative and ignored.</req> <req level="may" id="req-modify-alter-add-explicit-id-warning">An inoperative add directive MAY result in a warning.</req></p>
+          <p>The object with <src>id</src> equal to the value of <src>by-id</src> is considered the <term>target</term> of the addition.</p>
+          <p><req level="must" id="req-modify-alter-add-explicit-inside">When <src>position</src> has a value of <code>starting</code> or <code>ending</code>, the contents of the source MUST be added inside the target, either at the start or end of its contents, respectively.</req></p>
+          <p><req level="must" id="req-modify-alter-add-explicit-outside">When <src>position</src> has a value of <code>before</code> or <code>after</code>, the contents of the source MUST be added outside the target, either directly before or after it, respectively.</req></p>
+          <mapping>
+            <p>An addition operating on a control with explicit binding and position <code>after</code></p>
+            <tagging whose="source_catalog"><![CDATA[
+control:
+  id: a1
+  title: Basic precautions
+  props:
+    - name: status
+      value: ready
+  parts:
+    - name: recommendations
+      id: a1.b
+      parts: 
+        - name: task1
+          id: a1.b1
+          prose: Collect recycling for pickup
+        - name: task2
+          id: a1.b2
+          prose: Sweep surfaces free of dust
+           ]]></tagging>
+            <p>Note that the <src>add</src> directive identifies the object with <src>id</src>  <code>a1.b1</code> as its target.</p>
+            <tagging whose="source_profile"><![CDATA[
+alter:
+  control-id: a1
+  add:
+    position: after
+    by-id: a1.b1
+    props:
+      - name: basis
+        value: allocated
+    parts:
+      - name: caution
+        prose: Unavailable on weekends 
+           ]]></tagging>
+            <tagging whose="target_catalog"><![CDATA[
+control:
+  id: a1
+  title: Basic precautions
+  props:
+    - name: status
+      value: ready
+  parts:
+    - name: recommendations
+      id: a1.b
+      parts: 
+        - name: task1
+          id: a1.b1
+          prose: Collect recycling for pickup
+        - name: caution
+          prose: Unavailable on weekends
+        - name: task2
+          id: a1.b2
+          prose: Sweep surfaces free of dust
+      props:
+        - name: basis
+          value: allocated
+           ]]></tagging>
+            <p>The <src>position</src> is <code>after</code> so both objects inside <src>add</src> are added after (not inside) the target object. Since the target object is inside another <tgt>part</tgt> in the control, the new additions appear there as well.</p>
+            <p>Note that the result in this case will be schema-invalid since a <tgt>prop</tgt> may not occur directly following a <tgt>part</tgt>. A better result can be obtained (a better target may be defined) by using two <src>add</src> directives, to insert the new <tgt>prop</tgt> separately before any <tgt>part</tgt> objects in the target.</p>
+          </mapping>
+        </section>
+        <section id="nested-controls">
+          <head>Modifying controls inside controls</head>
+          <p>OSCAL supports controls inside controls in the form of <src>control</src> objects inside <src>control</src> objects. Because the semantics of the <src>add</src> and remove directives target any (object) contents of controls, they can be used to target these child controls for modification as well as other contents.<req level="must" id="req-modify-alter-add-nested">Profile Resolution tools MUST be able to correctly handle add directives targetting nested controls. This includes directives that target a child control as well as directives that target a parent control and modify the child.</req></p>
+        </section>
+      </section>
+      <section id="remove-directive">
+        <head>Removing contents from controls</head>
+        <p>Contents inside controls can be removed from them in catalog targets. In combination with adding new contents, this feature can be used to edit controls as well as amend them.</p>
+        <p>A <src>remove</src> directive inside an <src>alter</src> directive identifies an object or set of objects inside a control to be removed. It does this using any of five child objects.</p>
+        <p><req level="must" id="req-modify-alter-remove-match">An object inside the control MUST be removed from the output if and only if it meets all of the criteria given by the child objects of the remove directive.</req> When more than one child appears under the remove directive, an object would need to match all of them, otherwise it is not removed.</p>
+        <ul>
+          <li>
+            <p><req level="must" id="req-modify-alter-remove-by-id">The remove directive criteria <src>by-id</src> MUST match an object if and only its value is identical to the <src>id</src> value of that object.</req> Because <src>id</src> values are unique, this criteria will result in the remove directive removing only a single object.</p>
+          </li>
+          <li>
+            <p><req level="must" id="req-modify-alter-remove-name-ref">The remove directive criteria <src>name-ref</src> MUST match an object if and only its value is identical to the value of that object's <src>name</src> child.</req></p>
+          </li>
+          <li>
+            <p><req level="must" id="req-modify-alter-remove-ns-ref">The remove directive criteria <src>ns-ref</src> MUST match an object if and only its value is identical to the value of that object's <src>ns</src> child.</req></p>
+          </li>
+          <li>
+            <p><req level="must" id="req-modify-alter-remove-class-ref">The remove directive criteria <src>class-ref</src> MUST match an object if and only its value is identical to the value of that object's <src>class</src> child.</req></p>
+          </li>
+          <li>
+            <p><req level="must" id="req-modify-alter-remove-item-name">The remove directive criteria <src>item-name</src> MUST match an object if and only its value is identical to the value of that object's serialized name.</req> For example,<code>remove:item-name:prop</code> has the effect of removing all <src>prop</src> objects from inside the control.</p>
+            <p><req level="must" id="req-modify-alter-remove-item-name-array">In serialization formats that use arrays of objects in the OSCAL model, an object's name MUST be considered the singular form of its containing parent array.</req> For example, in the JSON format, remove:item-name:link would remove all of the objects inside of the <src>links</src> array.</p>
+          </li>
+        </ul>
+      </section>
+    </section>
+  </section>
+  <section id="finalphase">
+    <head>Final Operations</head>
+    <section id="target-back-matter">
+      <head>Backmatter Resolution</head>
+      <p><tgt>back-matter</tgt> in the result is produced by combining all objects within <src>back-matter</src> in all source catalogs, with the <src>back-matter</src> in the input profile.</p>
+      <ul>
+        <li>
+          <p><req level="must" id="req-backmatter">The output's backmatter MUST be generated by copying in each <src>resource</src> object from the backmatters of the imported catalogs/profiles in top-to-bottom order, then by copying in each <src>resource</src> object from the backmatter of the source profile itself. These objects MUST be processed in the order they are given in their respective documents.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-backmatter-dupe">If a given <src>resource</src> has the same <src>uuid</src> as a resource that has already been added, the previous resource MUST be removed, and the more recent one added, unless superceded by other requirements.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-backmatter-keep">A <src>resource</src> with a child <src>prop</src> of <src>name:keep</src> and <src>value:always</src> MUST NOT be replaced by the addition of another <src>resource</src>, unless the new resource also has a child <src>prop</src> of <src>name:keep</src> and <src>value:always</src>.</req></p>
+        </li>
+      </ul>
+      <p><req level="may" id="req-backmatter-prune">Tools MAY check for pruning conditions <xref rid="cleanup" /> as resources are added as long as the final result is the same as if the pruning had taken place at the end of all resource addition.</req></p>
+      <p>Placing the keep always prop on a resource in a catalog has the effect of ensuring it will always appear in the output produced by any profile importing that catalog, even if nothing links to the resource. This version of the resource will also be the one copied, unless a later-imported catalog or importing profile offers its own version marked to keep always.</p>
+    </section>
+    <section id="target-metadata">
+      <head>Metadata Resolution</head>
+      <p>The following requirements MUST be followed with regards to the Metadata section of the output catalog:</p>
+      <ul>
+        <li>
+          <p><req level="must" id="req-meta-uuid">The output catalog's metadata MUST have a unique top-level UUID (metadata:uuid). This UUID may be generated as seen fit by the tool, as long as it is reasonable to assume it is globally unique. It is RECOMMENDED that tools use a combination of meaningful text and a uniquely generated value (Ex.<code>{{sourceprofilename}}-RESOLVED-{{GUIDv5}}</code>).</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-meta-version">The value of metadata:version in the target MUST be set with a string that identifies the version of that document.</req> <req level="should" id="req-meta-version-track">The metadata:version SHOULD be used to track updates to this specific output document.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-meta-oscal-version">The value of metadata:oscal-version in the target MUST be set with a string that identifies the version of OSCAL used by this tool to resolve the profile (ex. 1.0.0). This value MUST be determined by compiling the oscal-versions from each imported document and the source profile, and taking the most recent minor version. If this version is more recent than what the resolution tool is using, then the value of the output oscal-version MUST be the version that the tool used internally.</req> <req level="must" id="req-meta-oscalversion-error">If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-meta-last-modified">The value of metadata:last-modified in the target MUST be set with a valid timestamp representing the time the profile resolution completed.</req></p>
+        </li>
+        <li>
+          <p><req level="should" id="req-meta-source-profile">The value of metadata:source-profile in the target SHOULD be set with a valid URI that points to the profile that resulted in this catalog.</req> <req level="may" id="req-meta-source-profile-privacy">If there are privacy or security concerns, the value of metadata:source-profile MAY be set to anything, in which case the simple existence of the source-profile property indicates that this is a resolved profile.</req></p>
+        </li>
+        <li>
+          <p><req level="should" id="req-meta-resolution-tool">The value of metadata:resolution-tool in the target SHOULD be set with a string that represents the tool that was used to resolve this catalog.</req></p>
+<!-- TODO: Should this be generalized? -->        </li>
+        <li>
+          <p><req level="must" id="req-meta-keep">For any metadata:roles or metadata:parties that exist in the source catalogs, if they have a <src>prop</src> child with name:keep and value:always, they are to be copied as is into the output metadata.</req></p>
+        </li>
+      </ul>
+      <p>Beyond these requirements, tools are free to use any and all of the objects inside metadata to provide additional information downstream.</p>
+      <p>Because of options in producing metadata and especially the requirement for a timestamp, developers and users should note that two different resolutions of the same profile will not, ordinarily, be identical inside <tgt>metadata</tgt>.</p>
+    </section>
+    <section id="cleanup">
+      <head>Pruning and Ordering</head>
+      <p><req level="should" id="req-prune">The processor SHOULD prune the resulting output catalog by removing unused objects.</req></p>
+      <ul>
+        <li>
+          <p><req level="must" id="req-prune-keep">Any object that has a child <src>prop</src> with a <src>name</src> of "keep" and a <src>value</src> of "always" MUST NOT be pruned.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-prune-include">If an object was explicitly included in the <xref rid="select-phase" />, it MUST NOT be pruned.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-prune-custom">If an object was referenced in a <src>custom</src> section of the source profile, it MUST NOT be pruned.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-prune-modify">If an object was referenced in the <src>modify</src> section of the source profile, it MUST NOT be pruned. Any objects removed in that section are still removed.</req></p>
+        </li>
+        <li>
+          <p><req level="must" id="req-prune-ref">If the object appears in a reference anywhere in the final result catalog, except in other objects that also meet all other pruning criteria, it MUST NOT be removed. A reference to a given object exists if &quot;#{distinctiveID}&quot; appears anywhere, where {distinctiveID} is the distinctive ID of the object <xref rid="id" />.</req></p>
+        </li>
+      </ul>
+      <p>Implementers should note that pruning need not take place after all other steps. As long as all above criteria are respected, pruning can happen at any time, and doing so is a likely performance and memory overhead improvement.</p>
+      <p><req level="must" id="req-reorder">Tools MUST reorder the output catalog into canonical order <xref rid="order" />, except where this specification provides different ordering requirements.</req></p>
+    </section>
+  </section>
+  <section id="other">
+    <head>Items of Note</head>
+    <section id="id">
+      <head>Distinct ID of Objects</head>
+      <p>Whenever this specification refers to <q>distinctiveness</q>, it is to be interpreted as is defined in this section with regards to the object in question.</p>
+      <p><req level="must" id="req-id-id">For the objects control, param, and group, distinctiveness MUST be determined by the value of the <q>id</q> child object.</req></p>
+      <p><req level="must" id="req-id-uuid">For the object resource, distinctiveness MUST be determined by the value of the <q>uuid</q> <xref rid="target-back-matter" />.</req></p>
+    </section>
+    <section id="multiformat">
+      <head>Dealing with Multiple Formats</head>
+      <p><req level="should" id="req-multiformat">Profile Resolution tools SHOULD be able to handle source profiles, imported catalogs, and imported profiles that are serialized in XML, JSON, or YAML.</req> <req level="must" id="req-multiformat-differ">A different serialization format of any given input MUST NOT result in a differing output catalog.</req></p>
+      <p>In order to help bootstrap this format management, the following resources are provided for implementers:</p>
+      <ul>
+        <li>
+          <p>.<!-- TODO: Add links to OSCAL conversion libraries, format guidance pages, etc. --></p>
+        </li>
+      </ul>
+      <p>The following sections provide additional requirements and guidance for each format.</p>
+      <section id="xmlrequirements">
+        <head>Requirements and Guidance for XML Output</head>
+        <p><req level="must" id="req-output-xml">The final Catalog output, if using XML, MUST be valid as defined by the XML model documentation for the OSCAL Catalog. See <a href="https://pages.nist.gov/OSCAL/reference/latest/complete/xml-definitions/">the complete XML reference</a> for model requirements.</req></p>
+<!-- TODO: Add Namespace --><!-- TODO: Consult XML Wizards on namespacing and other XML requirements -->      </section>
+      <section id="jsonrequirements">
+        <head>Requirements and Guidance for JSON Output</head>
+        <p><req level="must" id="req-output-json">The final Catalog output, if using JSON, MUST be valid as defined by the JSON model documentation for the OSCAL Catalog. See the <a href="https://pages.nist.gov/OSCAL/reference/latest/complete/json-reference/">complete JSON reference</a> for model requirements.</req></p>
+        <p>The JSON format, in general use, does not require the preservation of order of fields. As order matters in OSCAL, care should be taken to adhere to the canonical OSCAL order <xref rid="order" /> when outputting a catalog in JSON.</p>
+<!-- TODO: Add Namespace (BaseURI) -->      </section>
+      <section id="yamlrequirements">
+        <head>Requirements and Guidance for YAML Output</head>
+        <p><req level="must" id="req-output-yaml">The final Catalog output, if using YAML, MUST be valid as defined by the JSON model documentation for the OSCAL Catalog.</req> YAML is considered a simple variation on the JSON format. Beyond cosmetic differences there are no differences in the information structure between these formats. Therefore, the <a href="https://pages.nist.gov/OSCAL/reference/latest/complete/json-reference/">complete JSON reference</a> provides model requirements.</p>
+        <p>The YAML format, in general use, does not require the preservation of order of fields. As order matters in OSCAL, care should be taken to adhere to the canonical OSCAL order <xref rid="order" /> when outputting a catalog in YAML.</p>
+<!-- TODO: Add Namespace (BaseURI) -->      </section>
+      <section id="order">
+        <head>Order of objects in serialization</head>
+        <p>In OSCAL, order of top level objects (those that are direct children of the root element) is considered important only when the XML format is used. To facilitate this, OSCAL provides the concept of <term>canonical order</term>. This order is provided by the OSCAL Metaschema files for a given document type (see <a href="https://pages.nist.gov/OSCAL/concepts/layer/overview/#modeling-approach">an overview of Metaschema</a>.</p>
+        <p><req level="must" id="req-order">When the output format is XML, tools MUST use the OSCAL canonical order as described above. When using the YAML or JSON formats, order conveys no meaning, and is not considered important.</req></p>
+      </section>
+      <section id="comments-in-result">
+        <head>Comments in result documents</head>
+        <p>In an XML-based profile resolution, XML comments are one straightforward way for a processor to record events or conditions without affecting the output&apos;s nominal semantics. To support this, while two processors are obliged to return the same catalog XML for the same profile XML inputs, they are not required to match one another&apos;s comments, white space usage, attribute order, or processing instructions, only each other&apos;s objects, attributes and data content.</p>
+        <p>One consequence of this is that processes intended to compare two profile resolutions may have to accommodate differences in comments, considering them as insignificant along with other differences in serialization.</p>
+      </section>
+    </section>
+  </section>
+</SPECIFICATION>
+<!-- REMOVING INTRO
+<section id="infocontext">
+  <head>Informational Context and Scope</head>
+  <p>A <term>profile</term>in OSCAL represents a selection and configuration of a set of <term>controls</term>. 
+    In the normal case, the set of controls available to a profile is provided by a catalog.For example, the three NIST SP 800-53 profiles representing the impact baselines HIGH, MODERATE and LOW: call on a Catalog representing the families, 
+    controls and control enhancements described in SP 800-53/53A. In a data processing system, this dependency can be modeled in the form of separate documents or data instances - the (nominal) <q>catalog</q>and its
+    <q>profile</q>, the latter being a selection, adaptation and organization of controls, as distinct from the catalog from which those controls are derived.
+  </p>
+  <p>However, profiles may also select controls from profiles, thus deriving them from underlying catalogs as modified by those profiles. This feature enables an organization that wishes to promulgate guidelines or requirements to do so by publishing a set of customizations to an existing catalog, rather than create a catalog from scratch. Profiles can also arrange combinations of controls from more than one catalog or profile origin, making it possible to use them to support the creation of hybrid catalogs.</p>
+  <p>In the general case OSCAL must support sourcing more than one catalog at once, in order to aggregate and organize controls from disparate sources. For example, it should be routine for a profile to acquire its controls from an authoritative standard catalog, plus a local supplement. But multiple catalog inputs, especially when they are produced and sourced independently of one another, may not combine without issues. In order to provide sensible and transparent results even for incoherent inputs, this specification defines these processes such that legible and testable results are produced even when they are formally invalid to constraints governing the outputs. Such downstream processing errors including validation errors are expected to be detectable and remediable. This especially applies to situations where multiple catalogs are sourced, or where the same catalog is sourced more than once, directly or indirectly.</p>
+  <p>In order to support these semantics – because whatever data set is sourced by a profile, it must
+    <q>look like a catalog</q>– the results of resolving a single profile must be in the form of a single catalog. Two different OSCAL processors that promise profile resolution, must deliver, for the same input, the same catalog with regard to its contents: which controls are included; their ordering (insofar as the target format represents ordering); and the structure (groups) in which they are embedded. This specification is designed to make this possible, by defining outputs with sufficient rigor that
+    <q>the same</q>is meaningful and testable in this context.
+  </p>
+</section>
+<section id="why-a-catalog">
+ TODO: Needs more in-depth editing pass
+  <head>Why resolve a profile as a catalog</head>
+  <p>A profile is a representation of a delta, a
+    <q>here to there</q>. As such, a profile might be conceived of as a recipe or instruction set – a sequence of steps or procedures – whereby to create an OSCAL catalog (set of controls describing security requirements) from an OSCAL catalog (set of controls describing security requirements). The primary use case for this is when we need to make a new catalog to apply to a system or set of systems, starting from a canonical, received, mandated or standard catalog with a more general scope.
+  </p>
+  <p>This is because although catalogs - for example, the controls described in NIST SP 800-53 - are published, available for use, and even standardized, they can never be used exactly in the form in which they are acquired. They must be taken from the packaging and placed into operational context before they mean anything. This typically requires that a few operations over
+    <q>raw catalogs</q>be supported by a profiling mechanism. We must be able to select controls; we must be able to arrange them in order (or not); and we must be able to qualify or condition them by setting parameters defined for them and making adjustments to them.
+  </p>
+  <p>By representing the steps by which a base catalog can be sliced, sifted, amended and edited, into a (nominally) finished or ready set of control requirements, a profile makes it easier to codify and preserve even very incidental or temporary local revisions of a control catalog. Once expressed as a profile in OSCAL format, a set of amendments to a catalog (also known as &quot;tailoring&quot;) can be managed entirely separately and independently from the catalog. Because a conformant processor can always create the customized catalog by resolving the profile against its sources (executing the transformation described in this document), the profile can also be examined and used as a proxy for that catalog for other purposes. The customized catalog can be made available wherever and for whatever purposes it is needed, while its revision and maintenance can be focused on the profile.</p>
+  <p>This separation of concerns - between the originating catalog authors, who describe policy in only general terms, and the authors of the
+    <q>user manual</q>catalog, who must describe policy in very particular and local terms - is a necessary factor in supporting sustainable processes with the potential for automation and process improvement. An OSCAL profile bridges the gap between a set of general guidelines, and actionable rules. Only by examining the system in the context of the actual intentions appropriate to that system, can we properly assess its security. Profiles make this possible.
+  </p>
+  <p>In order for this to work, however, we need a process that can perform the necessary operations, to apply the delta to an unmodified catalog, to produce the local view of the catalog as modified. This is profile resolution.</p>
+</section>
+-->
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/profile-resolution-specml.xml b/src/specifications/profile-resolution/profile-resolution-specml.xml
index 5fcffde022..214fed619b 100644
--- a/src/specifications/profile-resolution/profile-resolution-specml.xml
+++ b/src/specifications/profile-resolution/profile-resolution-specml.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="spec-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<?xml-model href="specml.rnc" type="application/relax-ng-compact-syntax"?>
-<!--<?xml-stylesheet type="text/xsl" href="specml-html-xslt1.xsl"?>-->
-<?xml-stylesheet type="text/css" href="specml.css"?>
+<?xml-model href="lib/spec-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-model href="lib/specml.rnc" type="application/relax-ng-compact-syntax"?>
+
+<!-- Edit this PI for checking up on test bindings -->
+<?specml-testset resolution-testing.xml?>
+<?xml-stylesheet type="text/css" href="lib/specml.css"?>
 <SPECIFICATION xmlns="http://csrc.nist.gov/ns/oscal/specml">
   <head>OSCAL Profile Resolution</head>
   <section id="draft">
@@ -20,8 +22,10 @@
     <head>Introduction</head>
     <section id="purpose">
       <head>Purpose</head>
-      <p>
-        Information systems are implemented against a baseline of security controls. An OSCAL Profile defines the selection and potential alterations to a control catalog that are needed to establish a baseline. However, the OSCAL implementation layer depends on having an OSCAL Catalog that represents the baseline of controls to be implemented. Profile Resolution allows for computing an effective catalog based on an OSCAL Profile. For a given OSCAL Profile, the Profile Resolution process needs to result in the same OSCAL Catalog when executed by different tools on different endpoints. The requirements for resolution must therefore be well-defined and deterministic, enabling tool developers and parties exchanging OSCAL Profiles to work from a common understanding. This document defines the normative requirements for an OSCAL Profile Resolver.
+      <p><!-- For purposes of security assessment, an information system is designed and built (implemented) against a baseline of security controls. 
+      An OSCAL Profile defines the selection and (where appropriate) amendments or alterations to a control catalog that are needed to establish a baseline.
+      By design, OSCAL artifacts in the Implementation layer make reference to a catalog of controls. Profile Resolution allows for computing an effective catalog of controls from an OSCAL Profile.-->
+        Information systems are implemented against a baseline of security controls. An OSCAL Profile defines the selection and potential alterations to a control catalog that are needed to establish a baseline. However, the OSCAL implementation layer depends on having an OSCAL Catalog that represents the baseline of controls to be implemented. Profile Resolution allows for computing an effective catalog based on an OSCAL Profile. For a given OSCAL Profile, the Profile Resolution process needs to result in the same OSCAL Catalog when executed by different tools on the same inputs. The requirements for resolution must therefore be well-defined and deterministic, enabling tool developers and parties exchanging OSCAL Profiles to work from a common understanding. This document defines the normative requirements for an OSCAL Profile Resolver.
 </p>
 
       <p>No requirements are placed on implementation-level details, instead, requirements are laid out as what the output of resolution must look like given a certain input.
@@ -184,7 +188,11 @@
   <section id="phases">
     <head>Phases of Profile Processing</head>
     <p>An OSCAL Profile has three major sections, each which correspond to a phase of profile resolution. In order to complete the profile resolution process, each section must be fully parsed and a catalog output created.</p>
-    <p><req level="recommended" id="req-phase-order">It is strongly RECOMMENDED that implementations execute the following steps in the order that they are provided here (import, merge, modify).</req> While it is possible to achieve compliance with a non-standard approach, the iterative nature of profile resolution lends itself to linear processing.</p>
+    <p><req level="recommended" id="req-phase-order">It is strongly RECOMMENDED
+        that implementations execute the following steps in the order that they are provided here
+        (import, merge, modify).</req> While it is possible to achieve compliance with a
+      non-standard approach, the iterative nature of profile resolution lends itself to linear
+      processing.</p>
     <p>The three steps are
       <term>import</term>;
       <term>merge</term>; and
@@ -217,7 +225,7 @@
     <head>Import Phase</head>
     <p>A profile begins by listing a set of catalogs and/or profiles to be imported. Each is represented by a resolvable resource URI and a directive specifying which controls to import from that resource. These resources may be available as static resources, or they may be produced dynamically on request; such as is the case when a profile is imported. Imports are given in sequence after the metadata:</p>
     <tagging whose="source_profile">
-      <![CDATA[
+      
 profile:
   uuid: ~
   metadata: ~
@@ -225,14 +233,14 @@ profile:
     - href: ${{ catalog URI }}
       include-controls: ${{ list of selected controls }}
     - href: ${{ profile URI }}
-      include-controls: ${{ list of selected controls }} ]]>
+      include-controls: ${{ list of selected controls }} 
     </tagging>
     <p>In an import directive, the reference to the resource to be imported appears on an
       <src>href</src>child object. It takes either of two forms, external or internal:
     </p>
     <p>An external reference appears as an absolute or relative URL:</p>
     <tagging whose="source_profile">
-      <![CDATA[
+      
 profile:
   uuid: ~
   metadata: ~
@@ -242,13 +250,13 @@ profile:
         /master/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_catalog.yaml
       include-controls: ${{ list of selected controls }}
     - href: "../../NIST_SP-800-53_rev5_catalog.yaml"
-      include-controls: ${{ list of selected controls }} ]]>
+      include-controls: ${{ list of selected controls }} 
     </tagging>
     <p>While an internal reference appears as below (see
       <xref rid="internalref" />):
     </p>
     <tagging whose="source_profile">
-      <![CDATA[
+      
 profile:
   uuid: ~
   metadata: ~
@@ -256,7 +264,7 @@ profile:
     - href: #80052rev4
       include-controls: ${{ list of selected controls }}
     - href: #80052rev5
-      include-controls: ${{ list of selected controls }} ]]>
+      include-controls: ${{ list of selected controls }} 
     </tagging> 
     <p>All import directives will contain either
       <src>include-all: ~</src>or
@@ -271,41 +279,68 @@ profile:
       <head>Import href Requirements</head>
       <section id="resolving-uris">
         <head>Import URI Resolution</head>
-        <p><req level="must" id="req-uri-resolve">Tools MUST resolve URIs by following
-          <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-5">Section 5 of RFC3986</a>, with the exception of URI Fragments (URIs that start with &quot;#&quot;). URI Fragments MUST instead be resolved as defined in
-          <xref rid="internalref" />.</req>
+        <p><req level="must" id="req-uri-resolve">Tools MUST resolve
+            URIs by following <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-5"
+              >Section 5 of RFC3986</a>, with the exception of URI Fragments (URIs that start with
+            &quot;#&quot;). URI Fragments MUST instead be resolved as defined in <xref
+              rid="internalref"/>.</req>
         </p>
       </section>
       <section id="aquiring-resource">
         <head>Import Resource Acquisition</head>
-        <p><req level="must" id="req-uri-aquire">Tools MUST acquire resources at the resolved URI by following
-          <a href="https://datatracker.ietf.org/doc/html/rfc3986#section-5">Section 5 of RFC3986</a>, with the exception of URI Fragments (URIs that start with &quot;#&quot;). URI Fragments MUST instead be acquired as defined in
-          <xref rid="internalref" />.
+        <p><req level="must" id="req-uri-aquire">Tools MUST acquire resources at the resolved URI by following <a
+              href="https://datatracker.ietf.org/doc/html/rfc3986#section-5">Section 5 of
+              RFC3986</a>, with the exception of URI Fragments (URIs that start with &quot;#&quot;).
+            URI Fragments MUST instead be acquired as defined in <xref rid="internalref"/>.
         </req></p>
-        <p><req level="must" id="req-uri-base">For the purposes of resolving URIs using the above specification, the Base URI MUST be considered to be the absolute URI of the containing profile.</req></p>
-        <p><req level="must" id="req-uri-error">In the case that acquiring a resource fails, the tool MUST cease processing and provide an error. In order to ensure profile resolution results in the same catalog regardless of which tool resolves it, all imports must successfully resolve. While this may cause inconvenience if resources are frequently not available, it ensures interoperability.</req></p>
+        <p><req level="must" id="req-uri-base">For the purposes of resolving URIs
+            using the above specification, the Base URI MUST be considered to be the absolute URI of
+            the containing profile.</req></p>
+        <p><req level="must" id="req-uri-error">In the case
+            that acquiring a resource fails, the tool MUST cease processing and provide an error. In
+            order to ensure profile resolution results in the same catalog regardless of which tool
+            resolves it, all imports must successfully resolve. While this may cause inconvenience
+            if resources are frequently not available, it ensures interoperability.</req></p>
         <p>Note that receiving a cached version of an import, or resolving an import that is otherwise unavailable through some other (but automatic) means still satisfies the above requirement. This specification does not put requirements on the precise function of the import, as long as the correct document is retrieved.</p>
       </section>
       <section id="internalref">
         <head>Internal References</head>
         <p>URI Fragments in OSCAL represent internal references to other OSCAL objects in the same document. These references follow the pattern of <code>#{{objectID}}</code>. For example, the URI Fragment <code>#param1</code> is referencing the Parameter with unique ID <code>param1</code>.</p>
-        <p><req level="must" id="req-internal">In the context of the Import Phase, internal references will only appear as a reference to a profile or catalog that is in the <src>resources</src> section of the source. When tools encounter such a reference, they MUST locate the object in <src>resources</src> with the matching UUID value, and resolve the resource. 
-          By OSCAL model requirements, a given <src>resource</src> can have zero to many <src>rlink</src> objects and zero to one <src>base64</src> objects; however, it must have at least one of the two present. Tools can assume that any of these each resolves to the same underlying OSCAL object, although potentially in different serialization formats.
-          For deterministic resolution of these backmatter OSCAL objects, tools need to adhere to the following requirements:
-        </req></p>
+        <p><req level="must" id="req-internal">In the context of the Import Phase,
+            internal references will only appear as a reference to a profile or catalog that is in
+            the <src>resources</src> section of the source. When tools encounter such a reference,
+            they MUST locate the object in <src>resources</src> with the matching UUID value, and
+            resolve the resource. By OSCAL model requirements, a given <src>resource</src> can have
+            zero to many <src>rlink</src> objects and zero to one <src>base64</src> objects;
+            however, it must have at least one of the two present. Tools can assume that any of
+            these each resolves to the same underlying OSCAL object, although potentially in
+            different serialization formats. For deterministic resolution of these backmatter OSCAL
+            objects, tools need to adhere to the following requirements: </req></p>
         <ul>
-          <li><p><req level="may" id="req-internal-resolve1">Tools MAY use any of the <src>rlink</src> or <src>base64</src> objects present in the <src>resource</src>.</req> </p> </li>
-          <li><p><req level="may" id="req-internal-resolve2">Tools MAY verify that each above objects resolves to the same underlying OSCAL object. If there are OSCAL Model content differences between the resolved objects, the tool SHOULD provide a warning. </req></p> </li>
-          <li><p><req level="must" id="req-internal-resolve3">When a <src>rlink</src> is encountered and is to be resolved, it MUST be resolved by using a HTTP request to retrieve a byte stream. </req></p> </li>
-          <li><p><req level="must" id="req-internal-resolve4">When a <src>base64</src> is encountered and is to be resolved, it MUST be considered a Byte Stream.</req> </p> </li>
-          <li><p><req level="must" id="req-internal-resolve5">Regardless of its source, the Byte Stream MUST be decoded based on the algorithm defined in <a href="https://datatracker.ietf.org/doc/html/rfc4648"> Section 4 RFC 4648</a>. </req></p> </li>
+          <li><p><req level="may" id="req-internal-resolve1">Tools MAY use any of the <src>rlink</src> or <src>base64</src>
+                objects present in the <src>resource</src>.</req> </p> </li>
+          <li><p><req level="may" id="req-internal-resolve2">Tools MAY verify that each above objects resolves to
+                the same underlying OSCAL object. If there are OSCAL Model content differences
+                between the resolved objects, the tool SHOULD provide a warning. </req></p> </li>
+          <li><p><req level="must" id="req-internal-resolve3">When a
+                  <src>rlink</src> is encountered and is to be resolved, it MUST be resolved by
+                using a HTTP request to retrieve a byte stream. </req></p> </li>
+          <li><p><req level="must" id="req-internal-resolve4">When
+                a <src>base64</src> is encountered and is to be resolved, it MUST be considered a
+                Byte Stream.</req>
+            </p> </li>
+          <li><p><req level="must" id="req-internal-resolve5">Regardless of its source, the Byte Stream MUST be decoded based on
+                the algorithm defined in <a href="https://datatracker.ietf.org/doc/html/rfc4648">
+                  Section 4 RFC 4648</a>. </req></p> </li>
         </ul>
         
         
         
-        <p><req level="must" id="req-internal-error">If the object fetched cannot be found or is not a valid OSCAL object, the tool MUST cease processing and provide an error.</req></p>
+        <p><req level="must" id="req-internal-error">If the object fetched cannot be found
+            or is not a valid OSCAL object, the tool MUST cease processing and provide an
+            error.</req></p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   metadata: ~
   imports:
@@ -322,63 +357,66 @@ profile:
           - rlink:
               href: >-
                 https://github.com/usnistgov/oscal-content/tree
-                /master/nist.gov/SP800-53/rev4/xml/NIST_SP-800-53_rev5_catalog.xml   ]]>
+                /master/nist.gov/SP800-53/rev4/xml/NIST_SP-800-53_rev5_catalog.xml   
         </tagging>
       </section>
       <section id="URI-circular">
         <head>Resolving Imports of Profiles</head>
-        <p><req level="must" id="req-circular-resolve">If the resource acquired is an OSCAL Profile, the tool MUST apply this specification to resolve it, then continue processing having imported the resulting catalog.</req></p>
-        <p><req level="should" id="req-circular-catalog">When a profile imports a profile, the subordinate profile SHOULD be resolved first into a catalog using this specification, before it is imported. </req> This presents the possibility of circular imports, when a profile is directed to import itself either directly or indirectly.</p>
+        <p><req level="must" id="req-circular-resolve">If the resource acquired is an OSCAL Profile, the tool
+            MUST apply this specification to resolve it, then continue processing having imported
+            the resulting catalog.</req></p>
+        <p><req level="should" id="req-resolve-profile">When a profile imports a profile,
+            the subordinate profile SHOULD be resolved first into a catalog using this
+            specification, before it is imported. </req> This presents the possibility of circular
+          imports, when a profile is directed to import itself either directly or indirectly.</p>
         <p>A
           <term>circular import</term> occurs when a profile imports an already imported profile, which was called at an earlier place in the import hierarchy. For example, if profile A imports profile B, and profile B imports profile A, the second import is circular. (An import at the top can only be circular if a profile tries to import itself.) If A imports B, B imports C and C imports A, C’s import is circular.
         </p>
         <p>Note that an import can only be circular within the context of processing a particular profile. In the last example, C’s import would not be circular if invoked in the context of resolving B by itself.</p>
-        <p><req level="must" id="req-circular-error">If a processor encounters a
-          <term>circular import</term> as described above (self-imports are inherently circular), the processor MUST cease processing and generate an error.
-        </req></p>
+        <p><req level="must" id="req-circular-error">If a processor encounters a <term>circular
+              import</term> as described above (self-imports are inherently circular), the processor
+            MUST cease processing and generate an error. </req></p>
         <mapping>
-          <p>A profile identified as
-            <code>home_profile.yaml</code>imports another one identified as
-            <code>circular_profile.yaml</code>:
-          </p>
+          <p>A profile identified as <code>home_profile.yaml</code>imports another one identified as
+              <code>circular_profile.yaml</code>: </p>
           <tagging whose="source_profile">
-            <![CDATA[
+            
 profile:
   id: "home_profile.yaml"
   metadata: ~
   imports:
     - href: "circular_profile.yaml"
-      include-controls: ${{ list of selected controls }} ]]>
+      include-controls: ${{ list of selected controls }} 
           </tagging>
-          <p>In turn this file invokes
-            <code>home_profile.xml</code>:
-          </p>
+          <p>In turn this file invokes <code>home_profile.xml</code>: </p>
           <tagging whose="source_profile">
-            <![CDATA[
+            
 profile:
   id: "circular_profile.yaml"
   metadata: ~
   imports:
     - href: "home_profile.yaml"
-      include-controls: ${{ list of selected controls }} ]]>
+      include-controls: ${{ list of selected controls }} 
           </tagging>
-          <p>Once detected, this circular import will result in an error and no further processing will take place.</p>
+          <p>Once detected, this circular import will result in an error and no further processing
+            will take place.</p>
           <tagging whose="target_catalog">
-            <![CDATA[
+            
   # Import at href: "circular_profile.yaml" failed.
   # Reason: Error during profile import:
   # Import at href: "home_profile.yaml" failed.
-  # Reason: Circular import ]]>
+  # Reason: Circular import 
           </tagging>
         </mapping>
       </section>
       <section id="URI-multiple">
         <head>Multiple imports</head>
-        <p>Each import directive is processed to produce a set of controls. Note that this occurs even if the same catalog is imported multiple times: each distinct import collects controls into a separate
-          <int>selection</int>:
-        </p>
+        <p>Each import directive is processed to produce a set of controls. <req
+            id="rq-mulitple-imports">Note that this occurs even if the same catalog is imported
+            multiple times: each distinct import collects controls into a separate
+              <int>selection</int></req>: </p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   uuid: ~
   metadata: ~
@@ -392,10 +430,10 @@ profile:
       include-controls:
        - with-ids:
           - ac-3
-          - ac-4 ]]>
+          - ac-4 
         </tagging>
         <tagging whose="inter_catalog">
-          <![CDATA[
+          
 intermediate:
   inclusions:
     - id: ${{uuid of #catalog}}
@@ -405,11 +443,10 @@ intermediate:
     - id: ${{uuid of #catalog}}
       included-controls:
           - ac-3
-          - ac-4 ]]>
+          - ac-4 
         </tagging>
-        <p>The control inclusions are combined and collapsed in the next phase of processing,
-          <term>merge</term>(see <xref rid="merge-phase"/>) .
-        </p>
+        <p><req id="rq-multiple-merge">The control inclusions are combined and collapsed in the next
+            phase of processing</req>, <term>merge</term>(see <xref rid="merge-phase"/>) . </p>
         <p>Multiple imports against the same resource are allowed, and would most commonly occur when the profile author is using <xref rid="mapping"/> to create very specific output. 
           Multiple imports may result in outputs with clashing control IDs if mapping or the merge directive is not set correctly.</p>
       </section>
@@ -436,7 +473,7 @@ intermediate:
           <src>import</src> included controls from a different catalog whose ID values happen to collide. Knowing this, the profile author has remapped those IDs to new values.
         </p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   uuid: ~
   metadata: ~
@@ -456,11 +493,11 @@ profile:
           - from: ac-1
             to: map-ac-1
           - from: ac-2
-            to: map-ac-2]]>
+            to: map-ac-2
         </tagging>
         <p>Using the intermediate approach, an internal data structure resembling the following would result from the above profile:</p>
         <tagging whose="inter_catalog">
-          <![CDATA[
+          
 intermediate:
   metadata: ~
   inclusions:
@@ -471,7 +508,7 @@ intermediate:
     - id: ${{uuid of #catalog2}}
       included-controls:
           - map-ac-1
-          - map-ac-2 ]]>
+          - map-ac-2 
         </tagging>
       </section>
     </section>
@@ -482,25 +519,24 @@ intermediate:
         may make changes to an included control or group that could cause it to appear differently, or not at all, in the output. Using the intermediate implementation approach, any control(s) that are included would be extracted from the referenced catalogs, any applicable mappings would be applied, then the controls(s) would be stored.</p>
       <section id="include-all">
         <head>include-all</head>
-        <p><req level="must" id="req-include-all">When an import provides the
-          <src>include-all</src> directive, ALL controls and groups in the referenced document (including nested controls) MUST be included.
-        </req></p>
+        <p><req level="must" id="req-include-all">
+            When
+            an import provides the <src>include-all</src> directive, ALL controls and groups in the
+            referenced document (including nested controls) MUST be included. </req></p>
         <tagging whose="source_profile">include-all: ~</tagging>
       </section>
       <section id="include-by-id">
         <head>include-controls plus with-id</head>
         <p><req level="must" id="req-include-by-id">When an import provides the
-          <src>include-controls</src> directive, with a
-          <src>with-id</src> child, all controls in the referenced document whose
-          <code>id</code> match one of the listed
-          <code>id</code> values MUST be included.
-        </req></p>
+              <src>include-controls</src> directive, with a <src>with-id</src> child, all controls
+            in the referenced document whose <code>id</code> match one of the listed <code>id</code>
+            values MUST be included. </req></p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 include-controls:
   - with-ids:
     - id: ac-1
-    - id: ac-2]]>
+    - id: ac-2
         </tagging>
       </section>
       <section id="include-by-match">
@@ -517,10 +553,10 @@ include-controls:
           <code>pattern</code>, it MUST be treated as matching nothing. While not providing a pattern is technically valid, resolution tool implementers should be aware that it is generally undesirable, and warnings or notices to the user may be appropriate.
         </req></p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 include-controls:
   - matching:
-    - pattern: "ac*" ]]>
+    - pattern: "ac*" 
         </tagging>
       </section>
       <section id="import-nested">
@@ -533,18 +569,15 @@ include-controls:
         <section id="include-child-controls">
           <head>with-child-controls</head>
           <p>Child controls are, for the most part, treated the same as top level controls: they can be explicitly included using the selection directives above. As a shortcut to manually including all of the desired descendant controls of a given control, OSCAL provides the <code>with-child-controls</code> option. <code>with-child-controls</code> appears as a child object under a given inclusion directive, and defines additional behavior that is to be executed alongside the parent inclusion.</p>
-          <p><req level="must" id="req-with-child-controls-yes">A
-            <src>with-child-controls: yes</src> directive on an
-            <src>include-controls</src> indicates that
-            <em>all descendant controls</em> of the included control MUST also be included.
-          </req></p>
-          <p><req level="must" id="req-with-child-controls-no">A
-            <src>with-child-controls: no</src> directive on an
-            <src>include-controls</src> indicates that ONLY the matching control is included, any descendant children MUST NOT be included.
-          </req></p>
+          <p><req level="must" id="req-with-child-controls-yes">A <src>with-child-controls:
+                yes</src> directive on an <src>include-controls</src> indicates that <em>all
+                descendant controls</em> of the included control MUST also be included. </req></p>
+          <p><req level="must" id="req-with-child-controls-no">A <src>with-child-controls:
+                no</src> directive on an <src>include-controls</src> indicates that ONLY the
+              matching control is included, any descendant children MUST NOT be included. </req></p>
           <p><req level="must" id="req-with-child-controls-none">If no
-            <src>with-child-controls</src> is provided, the processor MUST consider the directive as being equivalent to one having
-            <src>with-child-controls:no</src>.
+                <src>with-child-controls</src> is provided, the processor MUST consider the
+              directive as being equivalent to one having <src>with-child-controls:no</src>.
           </req></p>
         </section>
         <section id="include-parent-controls">
@@ -554,39 +587,38 @@ include-controls:
             <src>with-parent-controls</src> applies to parents of the included control, and has the opposite default behavior. In order to maintain the structure of the source catalog, profile resolution includes all parents of an included control by default. If a profile author wants to change this structure, they should use an exclude directive that lists all of the undesired parents. As a shortcut for this,
             <src>with-parent-controls</src> provides the following functionality:
           </p>
-          <p><req level="must" id="req-with-parent-controls-yes">A
-            <src>with-parent-controls: yes</src> directive on an
-            <src>include-controls</src> indicates that
-            <em>all parent controls</em> of the included control MUST also be included.
-          </req></p>
-          <p><req level="must" id="req-with-parent-controls-no">A
-            <src>with-parent-controls: no</src> directive on an
-            <src>include-controls</src> indicates that ONLY the matching control is included, any parent MUST NOT be included.
-          </req></p>
-          <p><req level="must" id="req-with-parent-controls-none">If no
-            <src>with-parent-controls</src> is provided, the processor MUST consider the directive as being equivalent to one having
-            <src>with-parent-controls:yes</src>.
-          </req></p>
+          <p><req level="must" id="req-with-parent-controls-yes">A <src>with-parent-controls:
+                yes</src> directive on an <src>include-controls</src> indicates that <em>all parent
+                controls</em> of the included control MUST also be included.</req></p>
+          <p><req level="must" id="req-with-parent-controls-no">A <src>with-parent-controls:
+                no</src> directive on an <src>include-controls</src> indicates that ONLY the
+              matching control is included, any parent MUST NOT be included. </req></p>
+          <p><req level="must" id="req-with-parent-controls-none">If no <src>with-parent-controls</src> is provided, the processor MUST
+              consider the directive as being equivalent to one having
+                <src>with-parent-controls:yes</src>. </req></p>
         </section>
       </section>
       <section id="exclude-directive">
         <head>exclude-controls</head>
         <p>Exclusions work the same way as inclusions, except with the opposite effect - the indicated control(s) do not appear in the target catalog.</p>
-        <p><req level="must" id="req-exclude">Any control designated to be both included and excluded, MUST be excluded. This holds irrespective of the specificity of the selection for inclusion or exclusion.</req> For example, if AC-1 is included by id
-          <code>ac-1</code> and excluded by matching
-          <code>ac.*</code>, it is excluded.
-        </p>
-        <p><req level="must" id="req-exclude-additional">When
-          <src>exclude-controls</src> has at least one
-          <src>with-ids</src> or
-          <src>matching</src> directive, the processor MUST follow the same rules as defined in the relevant sections above for these directives, but exclude instead of include any controls. All optional features (<src>with-child-controls</src>, etc.) also apply to exclusion directives.
-        </req></p>
+        <p><req level="must" id="req-exclude">Any control designated to be both
+            included and excluded, MUST be excluded. This holds irrespective of the specificity of
+            the selection for inclusion or exclusion.</req> For example, if AC-1 is included by id
+            <code>ac-1</code> and excluded by matching <code>ac*</code>, it is excluded. </p>
+        <p><req level="must" id="req-exclude-additional">When <src>exclude-controls</src>
+            has at least one <src>with-ids</src> or <src>matching</src> directive, the processor
+            MUST follow the same rules as defined in the relevant sections above for these
+            directives, but exclude instead of include any controls. All optional features
+              (<src>with-child-controls</src>, etc.) also apply to exclusion directives. </req></p>
       </section>
       <section id="redundant-calls">
         <head>Redundant Inclusions and Exclusions</head>
-        <p><req level="must" id="req-redundant">A given
-          <src>import</src> may have any number of inclusion statements and any number of exclusion statements. Their effect is cumulative; any control that is included (or excluded) more than once MUST be considered to be included (or excluded) only once. In other words, a given control being included or excluded more than once has no effect. Exclusion still takes priority over inclusion (see above).
-        </req></p>
+        <p><req level="must" id="req-redundant">A given <src>import</src> may have
+            any number of inclusion statements and any number of exclusion statements. Their effect
+            is cumulative; any control that is included (or excluded) more than once MUST be
+            considered to be included (or excluded) only once. In other words, a given control being
+            included or excluded more than once has no effect. Exclusion still takes priority over
+            inclusion (see above). </req></p>
         <p>Note that this requirement only applies to controls included within the context of a single import. Controls with duplicate IDs included under a different
           <src>import</src> are not discarded. Also note that this redundancy pruning happens after any relevant mappings have been applied.
         </p>
@@ -634,7 +666,9 @@ include-controls:
       <src>merge</src>section, where directives are given to instruct the processor how to combine the set of included objects collected during the Import Phase.
       <src>merge</src>has two parts: a &quot;combine&quot; directive, and a &quot;structuring&quot; directive.
     </p>
-    <p><req level="recommended" id="req-merge-order">It is RECOMMENDED that tools apply the &quot;combine&quot; directive to the intermediate generated by the Import phase first, then apply the &quot;structuring&quot; directive.</req></p>
+    <p><req level="recommended" id="req-merge-order">It is RECOMMENDED that tools apply the
+        &quot;combine&quot; directive to the intermediate generated by the Import phase first, then
+        apply the &quot;structuring&quot; directive.</req></p>
     <p>The following section contains requirements for processing the
       <src>merge</src> child of a source profile.
     </p>
@@ -657,27 +691,27 @@ include-controls:
           <p>keep: Keep - controls with the same ID are kept, retaining the clash</p>
         </li>
       </ul>
-      <p><req level="must" id="req-merge-combine">Note that "merge: combine" is deprecated, and MUST be considered undefined behavior when encountered.</req></p>
+      <p><req level="must" id="req-merge-combine">Note that "merge:
+          combine" is deprecated, and MUST be considered undefined behavior when
+        encountered.</req></p>
       <p>In order to apply the combination method, IDs of each control explicitly included are compared against one another. As IDs are unique across entire OSCAL documents, different imports or any groupings have no bearing on collision. Processing requirements for each method are described below.</p>
       <section id="no-merge-explicit">
         <head>No Combine Directive</head>
-        <p><req level="must" id="req-merge-none"> If no
-          <src>merge</src> directive is given in the profile, or if a
-          <src>merge</src> is given without a
-          <src>combine</src>, merge conflicts MUST be treated as if
-          <src>method: keep</src> was given. </req> For example, a profile with no
-          <src>merge</src> directive:
-        </p>
+        <p><req level="must" id="req-merge-none">
+            If no <src>merge</src> directive
+            is given in the profile, or if a <src>merge</src> is given without a <src>combine</src>,
+            merge conflicts MUST be treated as if <src>method: keep</src> was given. </req> For
+          example, a profile with no <src>merge</src> directive: </p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   imports:
     - href: #catalogURI
-      include-all: ~ ]]>
+      include-all: ~ 
         </tagging>
         <p>is the same as</p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   imports:
     - href: #catalogURI
@@ -685,7 +719,7 @@ profile:
   merge:
     combine:
       method: keep
-      flat: ~ ]]>
+      flat: ~ 
         </tagging>
       </section>
       <section id="no-merge-combination-rule">
@@ -698,14 +732,14 @@ profile:
           <xref rid="id" />MUST NOT not merged. (They are kept.)
         </req></p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
   merge:
     combine:
-      method: keep ]]>
+      method: keep 
         </tagging>
         <p>Under this directive, colliding controls will result in invalid results, as they will both appear in the results with the same ID. Accordingly, this setting may be useful in ensuring integrity of references to controls as given in the profile: if any included control is called only once, clashing controls will not be produced and validation will succeed.</p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   imports:
     - href: #catalog1
@@ -720,18 +754,18 @@ profile:
             id: ac-2 
   merge:
     combine:
-      method: keep]]>
+      method: keep
         </tagging>
         <p>In the intermediate (showing control inclusions):</p>
         <tagging whose="inter_catalog">
-          <![CDATA[
+          
 intermediate:
   inclusions:
     - explicitly-included-controls:
           - ac-1
           - ac-2
           - ac-1
-          - ac-2 ]]>
+          - ac-2 
         </tagging>
         <p>In this case, downstream errors should be expected: the two
           <code>ac-1</code> controls clash with each other, as do the two
@@ -744,10 +778,10 @@ intermediate:
           <q>method:use-first</q>
         </head>
         <tagging whose="source_profile">
-          <![CDATA[
+          
   merge:
     combine:
-      method: use-first ]]>
+      method: use-first 
         </tagging>
         <p><req level="must" id="req-merge-use-first">When the
           &quot;use-first&quot;combination rule is applied, and controls that share a distinctive ID are found, the first control encountered MUST be kept, the rest MUST be discarded.
@@ -755,7 +789,7 @@ intermediate:
         </req></p>
         <mapping>
           <tagging whose="source_profile">
-            <![CDATA[
+            
 profile:
   imports:
     - href: #catalog1
@@ -770,17 +804,17 @@ profile:
             id: ac-2 
   merge:
     combine:
-      method: use-first]]>
+      method: use-first
           </tagging>
           <p>In the intermediate(showing control inclusions):</p>
           <tagging whose="inter_catalog">
-            <![CDATA[
+            
 intermediate:
   inclusions:
     - explicitly-included-controls:
           - ac-1 (From catalog1)
           - ac-3
-          - ac-2 ]]>
+          - ac-2 
           </tagging>
         </mapping>
       </section>
@@ -811,15 +845,15 @@ intermediate:
           <src>merge</src> directive:
         </req></p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   imports:
     - href: #catalogURI
-      include-all: ~ ]]>
+      include-all: ~ 
         </tagging>
         <p>is the same as</p>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   imports:
     - href: #catalogURI
@@ -827,7 +861,7 @@ profile:
   merge:
     combine:
       method: keep 
-      flat: ~ ]]>
+      flat: ~ 
         </tagging>
       </section>
       <section id="merge-flat">
@@ -845,17 +879,17 @@ profile:
         </ul>
         <p>An example of flat structuring is provided below</p>
         <tagging whose="source_catalog">
-          <![CDATA[
+          
 catalog:
   groups:
     - groupA
       - ac-1
       - ac-2
     - groupB
-      - bc-1 ]]>
+      - bc-1 
         </tagging>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   imports:
     - href: #catalogURI
@@ -867,15 +901,15 @@ profile:
   merge:
     combine:
       method: keep 
-      flat: ~ ]]>
+      flat: ~ 
         </tagging>
         <tagging whose="inter_catalog">
-          <![CDATA[
+          
 intermediate:
   controls:
     - ac-1
     - ac-2
-    - bc-1 ]]>
+    - bc-1 
         </tagging>
       </section>
       <section id="merge-as-is">
@@ -899,17 +933,17 @@ intermediate:
         </ul>
         <p>Example:</p>
         <tagging whose="source_catalog">
-          <![CDATA[
+          
 catalog:
   groups:
     - groupA
       - ac-1
       - ac-2
     - groupB
-      - bc-1 ]]>
+      - bc-1 
         </tagging>
         <tagging whose="source_profile">
-          <![CDATA[
+          
 profile:
   imports:
     - href: #catalogURI
@@ -921,10 +955,10 @@ profile:
   merge:
     combine:
       method: keep 
-      as-is: ~ ]]>
+      as-is: ~ 
         </tagging>
         <tagging whose="inter_catalog">
-          <![CDATA[
+          
 intermediate: 
 #In this approach, the original hierarchy of the controls under the groups is stored,
 #but is not shown in this example.
@@ -934,7 +968,7 @@ intermediate:
     - bc-1
   groups:
     - groupA
-    - groupB ]]>
+    - groupB 
         </tagging>
       </section>
       <section id="merge-custom">
@@ -1110,16 +1144,16 @@ intermediate:
               <code>starting</code>
             </p>
             <tagging whose="source_catalog">
-              <![CDATA[ 
+               
 control:
   id: a1
   title: Basic precautions
   props:
     - name: status
-      value: ready ]]>
+      value: ready 
             </tagging>
             <tagging whose="source_profile">
-              <![CDATA[ 
+               
 alter:
   control-id: a1
   add:
@@ -1129,10 +1163,10 @@ alter:
         value: enumerated
     parts:
       - name: caution
-        prose: \\n\\nPending scheduled testing. ]]>
+        prose: \\n\\nPending scheduled testing. 
             </tagging>
             <tagging whose="target_catalog">
-              <![CDATA[ 
+               
 control:
   id: a1
   title: Basic precautions
@@ -1143,7 +1177,7 @@ control:
       value: ready
   parts:
     - name: caution
-      prose: \\n\\nPending scheduled testing. ]]>
+      prose: \\n\\nPending scheduled testing. 
             </tagging>
             <p>Position is
               <code>starting</code>but the new
@@ -1157,16 +1191,16 @@ control:
               <code>ending</code>
             </p>
             <tagging whose="source_catalog">
-              <![CDATA[ 
+               
 control:
   id: a1
   title: Basic precautions
   props:
     - name: status
-      value: ready ]]>
+      value: ready 
             </tagging>
             <tagging whose="source_profile">
-              <![CDATA[ 
+               
 alter:
   control-id: a1
   add:
@@ -1176,10 +1210,10 @@ alter:
         value: enumerated
     parts:
       - name: caution
-        prose: \\n\\nPending scheduled testing. ]]>
+        prose: \\n\\nPending scheduled testing. 
             </tagging>
             <tagging whose="target_catalog">
-              <![CDATA[ 
+               
 control:
   id: a1
   title: Basic precautions
@@ -1190,7 +1224,7 @@ control:
       value: enumerated
   parts:
     - name: caution
-      prose: \\n\\nPending scheduled testing. ]]>
+      prose: \\n\\nPending scheduled testing. 
             </tagging>
             <p>The
               <src>position</src>is
@@ -1229,7 +1263,7 @@ control:
               <code>after</code>
             </p>
             <tagging whose="source_catalog">
-              <![CDATA[ 
+               
 control:
   id: a1
   title: Basic precautions
@@ -1245,7 +1279,7 @@ control:
           prose: Collect recycling for pickup
         - name: task2
           id: a1.b2
-          prose: Sweep surfaces free of dust]]>
+          prose: Sweep surfaces free of dust
             </tagging>
             <p>Note that the
               <src>add</src>directive identifies the object with
@@ -1253,7 +1287,7 @@ control:
               <code>a1.b1</code>as its target.
             </p>
             <tagging whose="source_profile">
-              <![CDATA[ 
+               
 alter:
   control-id: a1
   add:
@@ -1264,10 +1298,10 @@ alter:
         value: allocated
     parts:
       - name: caution
-        prose: Unavailable on weekends ]]>
+        prose: Unavailable on weekends 
             </tagging>
             <tagging whose="target_catalog">
-              <![CDATA[ 
+               
 control:
   id: a1
   title: Basic precautions
@@ -1288,7 +1322,7 @@ control:
           prose: Sweep surfaces free of dust
       props:
         - name: basis
-          value: allocated]]>
+          value: allocated
             </tagging>
             <p>The
               <src>position</src>is
@@ -1321,7 +1355,7 @@ control:
           <src>remove</src>directive inside an
           <src>alter</src> directive identifies an object or set of objects inside a control to be removed. It does this using any of five child objects.
         </p>
-        <p><req level="must" id="req-modify-alter-remove-match"> An object inside the control MUST be removed from the output if and only if it meets all of the criteria given by the child objects of the remove directive.</req> When more than one child appears under the remove directive, an object would need to match all of them, otherwise it is not removed. </p>
+        <p><req level="must" id="req-modify-alter-remove-match"> An object inside the control MUST be removed from the output if and only if it meets all of the criteria given by the child objects of the remove directive.</req> When more than one child appears under the remove directive, an object would need to match all of them, otherwise it is not removed.</p>
         <ul>
           <li>
             <p>
@@ -1410,7 +1444,7 @@ control:
     </section>
     <section id="cleanup">
       <head>Pruning and Ordering</head>
-      <p><req level="should" id="req-prune">The processor SHOULD prune the resulting output catalog by removing unused objects. </req></p>
+      <p><req level="should" id="req-prune">The processor SHOULD prune the resulting output catalog by removing unused objects.</req></p>
       <ul>
         <li>
           <p><req level="must" id="req-prune-keep">Any object that has a child <src>prop</src> with a <src>name</src> of "keep" and a <src>value</src> of "always" MUST NOT be pruned.</req></p>
diff --git a/src/specifications/profile-resolution/profile-resolution-unit-tests.xml b/src/specifications/profile-resolution/profile-resolution-unit-tests.xml
new file mode 100644
index 0000000000..e8161ff96c
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-unit-tests.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test-suite xmlns="http://csrc.nist.gov/ns/metaschema/test-suite/1.0"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://csrc.nist.gov/ns/metaschema/test-suite/1.0 unit-tests.xsd">
+   <test-collection name="Import Phase" location="requirement-tests/">
+      <test-scenario name="req-include-all-asis">
+         <example-description>relative URI</example-description>
+         <addresses-requirement requirement-id="req-uri-resolve">Tools MUST resolve
+            URIs by following Section 5 of RFC3986, with the exception of URI Fragments (URIs that start with
+            "#"). URI Fragments MUST instead be resolved as defined in [Section internalref].</addresses-requirement>
+         <addresses-requirement requirement-id="req-uri-base">For the purposes of resolving URIs
+            using the above specification, the Base URI MUST be considered to be the absolute URI of
+            the containing profile.</addresses-requirement>
+         <addresses-requirement requirement-id="req-include-all">
+            When
+            an import provides the include-all directive, ALL controls and groups in the
+            referenced document (including nested controls) MUST be included. </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-all-asis.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-include-all-asis.xml"/>
+      </test-scenario>
+      <test-scenario name="req-import-by-resource">
+         <example-description>via internal reference to
+              resource/rlink</example-description>
+         <addresses-requirement requirement-id="req-uri-aquire">Tools MUST acquire resources at the resolved URI by following Section 5 of
+              RFC3986, with the exception of URI Fragments (URIs that start with "#").
+            URI Fragments MUST instead be acquired as defined in [Section internalref].
+        </addresses-requirement>
+         <addresses-requirement requirement-id="req-internal">In the context of the Import Phase,
+            internal references will only appear as a reference to a profile or catalog that is in
+            the resources section of the source. When tools encounter such a reference,
+            they MUST locate the object in resources with the matching UUID value, and
+            resolve the resource. By OSCAL model requirements, a given resource can have
+            zero to many rlink objects and zero to one base64 objects;
+            however, it must have at least one of the two present. Tools can assume that any of
+            these each resolves to the same underlying OSCAL object, although potentially in
+            different serialization formats. For deterministic resolution of these backmatter OSCAL
+            objects, tools need to adhere to the following requirements: </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-import-by-resource.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML"
+                              location="output-expected/req-import-by-resource.xml"/>
+      </test-scenario>
+      <test-scenario name="req-missing-resource">
+         <example-description>PENDING rebase over latest from galtm missing resource</example-description>
+         <addresses-requirement requirement-id="req-uri-error">In the case
+            that acquiring a resource fails, the tool MUST cease processing and provide an error. In
+            order to ensure profile resolution results in the same catalog regardless of which tool
+            resolves it, all imports must successfully resolve. While this may cause inconvenience
+            if resources are frequently not available, it ensures interoperability.</addresses-requirement>
+         <addresses-requirement requirement-id="req-internal-error">If the object fetched cannot be found
+            or is not a valid OSCAL object, the tool MUST cease processing and provide an
+            error.</addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-missing-resource.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-missing-resource.xml"/>
+      </test-scenario>
+      <test-scenario name="req-broken-import">
+         <example-description>PENDING rebase over latest from galtm</example-description>
+         <addresses-requirement requirement-id="req-internal-error">If the object fetched cannot be found
+            or is not a valid OSCAL object, the tool MUST cease processing and provide an
+            error.</addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-broken-import.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-broken-import.xml"/>
+      </test-scenario>
+      <test-scenario name="req-chained-all-asis">
+         <example-description>PENDING chained profiles</example-description>
+         <addresses-requirement requirement-id="req-circular-resolve">If the resource acquired is an OSCAL Profile, the tool
+            MUST apply this specification to resolve it, then continue processing having imported
+            the resulting catalog.</addresses-requirement>
+         <addresses-requirement requirement-id="req-resolve-profile">When a profile imports a profile,
+            the subordinate profile SHOULD be resolved first into a catalog using this
+            specification, before it is imported. </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-chained-all-asis.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-chained-all-asis.xml"/>
+      </test-scenario>
+      <test-scenario name="req-chained-deepA">
+         <example-description>PENDING [bug repair] chained profile
+              merged with controls from its own source catalog</example-description>
+         <addresses-requirement requirement-id="req-resolve-profile">When a profile imports a profile,
+            the subordinate profile SHOULD be resolved first into a catalog using this
+            specification, before it is imported. </addresses-requirement>
+         <addresses-requirement requirement-id="rq-mulitple-imports">Note that this occurs even if the same catalog is imported
+            multiple times: each distinct import collects controls into a separate
+              selection</addresses-requirement>
+         <addresses-requirement requirement-id="rq-multiple-merge">The control inclusions are combined and collapsed in the next
+            phase of processing</addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-chained-deepA.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-chained-deepA.xml"/>
+      </test-scenario>
+      <test-scenario name="req-circular_import">
+         <example-description>PENDING circular import detection</example-description>
+         <addresses-requirement requirement-id="req-circular-error">If a processor encounters a circular
+              import as described above (self-imports are inherently circular), the processor
+            MUST cease processing and generate an error. </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-circular_import.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-circular_import.xml"/>
+      </test-scenario>
+      <test-scenario name="req-include-all-flat">
+         <addresses-requirement requirement-id="req-include-all">
+            When
+            an import provides the include-all directive, ALL controls and groups in the
+            referenced document (including nested controls) MUST be included. </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-all-flat.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-include-all-flat.xml"/>
+      </test-scenario>
+      <test-scenario name="req-include-by-id">
+         <addresses-requirement requirement-id="req-include-by-id">When an import provides the
+              include-controls directive, with a with-id child, all controls
+            in the referenced document whose id match one of the listed id
+            values MUST be included. </addresses-requirement>
+         <addresses-requirement requirement-id="req-with-child-controls-yes">A with-child-controls:
+                yes directive on an include-controls indicates that all
+                descendant controls of the included control MUST also be included. </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-by-id.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-include-by-id.xml"/>
+      </test-scenario>
+      <test-scenario name="req-include-by-match">
+         <addresses-requirement requirement-id="req-include-by-match">When an import provides the
+          include-controls directive, with a
+          matching child, all controls in the referenced document whose
+          id matches one of the listed
+          pattern values (Glob matching) MUST be included.
+        </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-by-match.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-include-by-match.xml"/>
+      </test-scenario>
+      <test-scenario name="req-include-by-match-empty">
+         <addresses-requirement requirement-id="req-include-by-match-empty">If a
+          matching object is provided with no
+          pattern, it MUST be treated as matching nothing. While not providing a pattern is technically valid, resolution tool implementers should be aware that it is generally undesirable, and warnings or notices to the user may be appropriate.
+        </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-by-match-empty.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML"
+                              location="output-expected/req-include-by-match-empty.xml"/>
+      </test-scenario>
+      <test-scenario name="req-with-child-controls-no">
+         <addresses-requirement requirement-id="req-with-child-controls-no">A with-child-controls:
+                no directive on an include-controls indicates that ONLY the
+              matching control is included, any descendant children MUST NOT be included. </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-with-child-controls-no.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML"
+                              location="output-expected/req-with-child-controls-no.xml"/>
+      </test-scenario>
+      <test-scenario name="req-with-child-controls-none">
+         <addresses-requirement requirement-id="req-with-child-controls-none">If no
+                with-child-controls is provided, the processor MUST consider the
+              directive as being equivalent to one having with-child-controls:no.
+          </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-with-child-controls-none.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML"
+                              location="output-expected/req-with-child-controls-none.xml"/>
+      </test-scenario>
+      <test-scenario name="req-with-parent-controls-yes1">
+         <example-description>PR
+                https://github.com/usnistgov/OSCAL/pull/1207</example-description>
+         <addresses-requirement requirement-id="req-with-parent-controls-yes">A with-parent-controls:
+                yes directive on an include-controls indicates that all parent
+                controls of the included control MUST also be included.</addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-with-parent-controls-yes1.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML"
+                              location="output-expected/req-with-parent-controls-yes1.xml"/>
+      </test-scenario>
+      <test-scenario name="req-with-parent-controls-yes2">
+         <example-description>PR
+                https://github.com/usnistgov/OSCAL/pull/1207</example-description>
+         <addresses-requirement requirement-id="req-with-parent-controls-yes">A with-parent-controls:
+                yes directive on an include-controls indicates that all parent
+                controls of the included control MUST also be included.</addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-with-parent-controls-yes2.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML"
+                              location="output-expected/req-with-parent-controls-yes2.xml"/>
+      </test-scenario>
+      <test-scenario name="req-with-parent-controls-no1">
+         <example-description>PENDING PR
+                https://github.com/usnistgov/OSCAL/pull/1207</example-description>
+         <addresses-requirement requirement-id="req-with-parent-controls-no">A with-parent-controls:
+                no directive on an include-controls indicates that ONLY the
+              matching control is included, any parent MUST NOT be included. </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-with-parent-controls-no1.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML"
+                              location="output-expected/req-with-parent-controls-no1.xml"/>
+      </test-scenario>
+      <test-scenario name="req-with-parent-controls-none">
+         <example-description>Neither setting is
+                given</example-description>
+         <addresses-requirement requirement-id="req-with-parent-controls-none">If no with-parent-controls is provided, the processor MUST
+              consider the directive as being equivalent to one having
+                with-parent-controls:yes. </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-with-parent-controls-none.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML"
+                              location="output-expected/req-with-parent-controls-none.xml"/>
+      </test-scenario>
+      <test-scenario name="req-include-exclude1">
+         <addresses-requirement requirement-id="req-exclude">Any control designated to be both
+            included and excluded, MUST be excluded. This holds irrespective of the specificity of
+            the selection for inclusion or exclusion.</addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-exclude1.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-include-exclude1.xml"/>
+      </test-scenario>
+      <test-scenario name="req-include-exclude2">
+         <addresses-requirement requirement-id="req-exclude">Any control designated to be both
+            included and excluded, MUST be excluded. This holds irrespective of the specificity of
+            the selection for inclusion or exclusion.</addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-exclude2.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-include-exclude2.xml"/>
+      </test-scenario>
+      <test-scenario name="req-include-exclude3">
+         <addresses-requirement requirement-id="req-exclude">Any control designated to be both
+            included and excluded, MUST be excluded. This holds irrespective of the specificity of
+            the selection for inclusion or exclusion.</addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-exclude3.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-include-exclude3.xml"/>
+      </test-scenario>
+      <test-scenario name="req-include-exclude4">
+         <addresses-requirement requirement-id="req-exclude-additional">When exclude-controls
+            has at least one with-ids or matching directive, the processor
+            MUST follow the same rules as defined in the relevant sections above for these
+            directives, but exclude instead of include any controls. All optional features
+              (with-child-controls, etc.) also apply to exclusion directives. </addresses-requirement>
+         <addresses-requirement requirement-id="req-redundant">A given import may have
+            any number of inclusion statements and any number of exclusion statements. Their effect
+            is cumulative; any control that is included (or excluded) more than once MUST be
+            considered to be included (or excluded) only once. In other words, a given control being
+            included or excluded more than once has no effect. Exclusion still takes priority over
+            inclusion (see above). </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-exclude4.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-include-exclude4.xml"/>
+      </test-scenario>
+   </test-collection>
+   <test-collection name="Merge Phase" location="requirement-tests/">
+      <test-scenario name="keep-everything-twice">
+         <addresses-requirement requirement-id="req-merge-none">
+            If no merge directive
+            is given in the profile, or if a merge is given without a combine,
+            merge conflicts MUST be treated as if method: keep was given. </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="keep-everything-twice.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML"
+                              location="output-expected/keep-everything-twice.xml"/>
+      </test-scenario>
+      <test-scenario name="req-include-all-flat">
+         <addresses-requirement requirement-id="req-structure-none">If no
+          merge directive is given in the profile, or if a
+          merge is given without a structuring directive, structuring the output MUST be treated as if the structuring directive
+          flat was given. For example, a profile with no
+          merge directive:
+        </addresses-requirement>
+         <resolve-profile>
+            <profile-source source-format="XML" location="req-include-all-flat.xml"/>
+         </resolve-profile>
+         <expected-resolution source-format="XML" location="output-expected/req-include-all-flat.xml"/>
+      </test-scenario>
+   </test-collection>
+</test-suite>
diff --git a/src/specifications/profile-resolution/readme.md b/src/specifications/profile-resolution/readme.md
index bc019f4039..f844d9ca2e 100644
--- a/src/specifications/profile-resolution/readme.md
+++ b/src/specifications/profile-resolution/readme.md
@@ -1,3 +1,26 @@
+# Profile Resolution Specification and Testing
+
+## process notes
+
+- new 'resolution-testing.xml' keeps track of unit tests
+- spec is validated against this test manifest
+- it can also be converted into XSpec or other test drivers
+
+### Test coverage
+
+Finishing the tests by assigning them to Github Issues?
+
+### Validating the tests (source/target)
+
+need a process for this - also Github Issues?
+
+### Revising the spec
+
+- validate test manifest against its spec - any broken links?
+
+
+
+
 ## Providing feedback on this specification
 
 The OSCAL team welcomes feedback on the work in progress in this subdirectory, whether it be questions, points for clarification, critiques or suggestions. A rendered version of the Profile Resolution specification maintained here [appears](https://pages.nist.gov/OSCAL/concepts/processing/profile-resolution/) on the OSCAL web site.
@@ -6,32 +29,62 @@ Please post Issues in Github or questions to the OSCAL mailing list, or ask abou
 
 The specifications are being edited in an ad-hoc XML back end format, a lightweight extension to HTML tagging. If you wish to edit the files directly, we have stylesheets for presentation and HTML conversion along with Schematron for validation (runtime or at check points); please contact us.
 
+## Profile Resolution Unit Tests
+
+Profile resolution unit tests are maintained here and bound to the specification via markup embedded with the specifications, for convenience in alignment. Formal test scenario files can be generated dynamically from markup when needed.
+
+In this subdirectory, the folder `profile-resolution-examples` includes old tests kept here for potential future use/reuse while we complete a common test set.
+
+The comment test set we are developing can be found in folder `requirement-tests`.
+
+## SpecML Capabilities
+
+- XML authoring of specifications
+- HTML previews with ToC / requirements index
+- HTML rendering for Hugo / site load
+- Back end validation support for specialized semantics
+- Tagging of requirements integrates with unit tests
+- Cosmetic reformatter rewrites your document with clean tagging and whitespace
+
+- Unit test set (XSpec) is annotated with keys (links) back to spec document
+- Two-way indexing enables assessment of coverage by unit tests (per marked up requirements)
+
+- The tests themselves can be illustrated (in/out) using another rendering XSLT
+
+### oXygen project for editing specs
+
+Included in this folder is an oXygen XML Editor project file with settings for many of these operations.
+
+### SpecML requirement tagging
+
+`//req` shows requirements called out as statements in line.
+
+`//eg` shows bindings to example documents for purposes of testing.
+
+```
+<eg href="requirement-tests/req-chained-deepA.xml">PENDING chained profiles</eg>
+```
+
+The `@href` is the file instance for the example. The text is a qualifying description. Prefixing the text with `PENDING` signals that a test should be deactivated. In this case, as soon as chained profiles are supported, the description can be changed and the test will be run.
+
+Presently all `eg` are inside `req` so there is an implicit relation there (no examples are named apart from stated requirements).
+
+### Unit test scenario generation
+
+Based on markup in the SpecML document, XSpec unit test sheets can be generated framing the unit test held in this subdirectory, to be executed in any (current) XSpec implementation.
+
+#### Requirements listing
 
-TODO:
+Broken out by requirement - corresponding line by line to //req in the Spec document source.
+This XSpec is generated by applying the XSLT `lib/build-reqs-xspec.xsl` to the SpecML source document (marked with `req` and `eg` tags).
 
-### Requirements index
+#### File listing
 
-Annotate a copy/mirror of profile metaschema (composed)
-  link to requirements
-  link to test(s)
+Grouped by file instead of by requirement (since there is a many-to-many relation), this XSpec may be faster and more efficient to execute.
 
-current XSpecs
-  for each test
-    if green
-      confirm correctness of test
-    if pink
-    
-XSLT to poll unit tests
-  drawing profile model element tree with links to tests showing usages
+This XSpec is generated by applying the XSLT `lib/build-examples-xspec.xsl` to the same SpecML source document.
 
+#### Handmade XSpec
 
-            
-new XSpecs
-  
-    
-for every test document, list
-- objects of interest (assembles fields flags or flag/values) - xpath
-- for each of these
-  - requirement(s) being tested
-  - index into spec (section title/phrase)
+Additionally handmade XSpec works, such as `profile-resolution-queryset.xspec`
 
diff --git a/src/specifications/profile-resolution/requirement-tests.xspec b/src/specifications/profile-resolution/requirement-tests.xspec
new file mode 100644
index 0000000000..ec3ed3a92e
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests.xspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- autogenerated 2021-12-14T16:02:57.305-05:00 following model in example-set.xspec-->
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+               xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+               xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+               stylesheet="../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
+               run-as="external"
+               xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable">
+   <x:helper stylesheet="lib/oscal-profile-test-helper.xsl"/>
+   
+<!-- Validate this XSpec with lib/xspec-test-bindings.sch to check whether declared
+     test bindings actually relate to anything -->
+   
+   <x:scenario label="Include all" pending="wap">
+      <?test req-include-all?>
+      <x:context href="requirement-tests/req-include-all_01.xml"/>
+      <x:expect label="When an import provides the include-all directive, ALL controls and groups in the referenced document (including nested controls) MUST be included."
+                select="opr:scrub(.)"
+                href="requirement-tests/output-expected/req-include-all_01_RESOLVED.xml"/>
+   </x:scenario>
+ 
+</x:description>
diff --git a/src/specifications/profile-resolution/requirement-tests/catalogs/abc-crazy_catalog.xml b/src/specifications/profile-resolution/requirement-tests/catalogs/abc-crazy_catalog.xml
new file mode 100644
index 0000000000..259a67d264
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/catalogs/abc-crazy_catalog.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T14:13:38.826-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         uuid="6498eb6e-8653-4470-8b97-54054d3ba886"
+         xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 ../../../../../xml/schema/oscal_catalog_schema.xsd">
+   <metadata>
+      <title>ABC Catalog</title>
+      <last-modified>2020-05-30T14:51:38.311-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <group>
+      <title>Group A of C</title>
+      <param id="param-A.a">
+         <label>A.a parameter</label>
+         <value>A.a value</value>
+      </param>
+      <param id="param-A.b">
+         <select>
+            <choice>A.b parameter selection choice 1</choice>
+            <choice>A.b parameter selection choice 2</choice>
+            <choice>A.b parameter selection choice 3</choice>
+         </select>
+      </param>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="param-a1.a">
+            <label>a1.a parameter</label>
+            <value>a1.a value</value>
+         </param>
+         <prop name="label" value="1st"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+            <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+            <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="2nd"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+            <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
+            </p>
+         </part>
+      </control>
+      <control id="a3">
+         <title>Control A3</title>
+         <prop name="label" value="3rd"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group B of C</title>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="4th"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="5th"/>
+         <link rel="reference" href="#4a3990e7-2020-4b8f-902c-d679ebea2b58"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+            <p>Also, we <a href="#4a3990e7-2020-4b8f-902c-d679ebea2b58">refer to a citation</a>.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="6th"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <part name="overview">
+         <p>Group C of C contains subgroups CA and CB.</p></part>
+      <group id="CA">
+         <title>Group CA</title>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="7th"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+            <p>We cite a document with an anchor: <a href="somedoc#citation">... citation ...</a>.</p>
+         </part>
+      </control>
+      <control id="c2">
+         <title>Control C2</title>
+         <prop name="label" value="8th"/>
+         <link rel="reference" href="#ef4c1cf0-a3cc-4354-bdd5-690466f61d4f"/>
+         <part name="statement" id="c2-stmt">
+            <p>C2 cccccccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+      </group>
+      <group id="CB">
+         <title>Group CB</title>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="9th"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="10th"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="11th"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+      </group>
+   </group>
+   <back-matter>
+      <resource uuid="4a3990e7-2020-4b8f-902c-d679ebea2b58">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+      <resource uuid="ef4c1cf0-a3cc-4354-bdd5-690466f61d4f">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	<prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+   </back-matter>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/catalogs/abc-full_catalog.xml b/src/specifications/profile-resolution/requirement-tests/catalogs/abc-full_catalog.xml
new file mode 100644
index 0000000000..9293fc1883
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/catalogs/abc-full_catalog.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T14:13:38.826-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         uuid="6498eb6e-8653-4470-8b97-54054d3ba886"
+         xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 ../../../../../xml/schema/oscal_catalog_schema.xsd">
+   <metadata>
+      <title>ABC Catalog</title>
+      <last-modified>2020-05-30T14:51:38.311-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <group>
+      <title>Group A of C</title>
+      <param id="param-A.a">
+         <label>A.a parameter</label>
+         <value>A.a value</value>
+      </param>
+      <param id="param-A.b">
+         <select>
+            <choice>A.b parameter selection choice 1</choice>
+            <choice>A.b parameter selection choice 2</choice>
+            <choice>A.b parameter selection choice 3</choice>
+         </select>
+      </param>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="param-a1.a">
+            <label>a1.a parameter</label>
+            <value>a1.a value</value>
+         </param>
+         <prop name="label" value="1st"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+            <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+            <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="2nd"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+            <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
+            </p>
+         </part>
+      </control>
+      <control id="a3">
+         <title>Control A3</title>
+         <prop name="label" value="3rd"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group B of C</title>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="4th"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="5th"/>
+         <link rel="reference" href="#4a3990e7-2020-4b8f-902c-d679ebea2b58"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+            <p>Also, we <a href="#4a3990e7-2020-4b8f-902c-d679ebea2b58">refer to a citation</a>.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="6th"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="7th"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+            <p>We cite a document with an anchor: <a href="somedoc#citation">... citation ...</a>.</p>
+         </part>
+      </control>
+      <control id="c2">
+         <title>Control C2</title>
+         <prop name="label" value="8th"/>
+         <link rel="reference" href="#ef4c1cf0-a3cc-4354-bdd5-690466f61d4f"/>
+         <part name="statement" id="c2-stmt">
+            <p>C2 cccccccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="9th"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="10th"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="11th"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+   </group>
+   <back-matter>
+      <resource uuid="4a3990e7-2020-4b8f-902c-d679ebea2b58">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+      <resource uuid="ef4c1cf0-a3cc-4354-bdd5-690466f61d4f">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	 <prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+   </back-matter>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/catalogs/abc-mixed-up_catalog.xml b/src/specifications/profile-resolution/requirement-tests/catalogs/abc-mixed-up_catalog.xml
new file mode 100644
index 0000000000..08f597bf28
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/catalogs/abc-mixed-up_catalog.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         uuid="4b22b835-c62f-44d2-89ac-e5a8f26e4ebe"
+         xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 ../../../../../xml/schema/oscal_catalog_schema.xsd">
+   <metadata>
+      <title>Mixed up Alphabet Catalog</title>
+      <last-modified>2022-02-14T17:26:02.616123-05:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <group>
+      <title>Group B of C</title>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="fifth"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="fourth"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="sixth"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group A of C</title>
+      <control id="a3">
+         <title>Control A3</title>
+         <param id="a3_prm1">
+            <label>A3 Parameter 1</label>
+         </param>
+         <prop name="label" value="third"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="second"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="a1_prm1">
+            <label>A1 Parameter 1</label>
+         </param>
+         <prop name="label" value="first"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+      <control id="c2">
+         <title>Control C2</title>
+         <prop name="label" value="eighth"/>
+         <part name="statement" id="c2-stmt">
+            <p>C2 cccccccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/catalogs/abc-simple_catalog.xml b/src/specifications/profile-resolution/requirement-tests/catalogs/abc-simple_catalog.xml
new file mode 100644
index 0000000000..12562931cf
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/catalogs/abc-simple_catalog.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:12:31.584-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         uuid="6c5149e8-f3a6-437c-8035-025e9b5fc0bf"
+         xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 ../../../../../xml/schema/oscal_catalog_schema.xsd">
+   <metadata>
+      <title>Alphabet Catalog</title>
+      <last-modified>2020-05-30T14:51:41.185-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <group>
+      <title>Group A of C</title>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="a1_prm1">
+            <label>A1 Parameter 1</label>
+         </param>
+         <prop name="label" value="first"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="second"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a3">
+         <title>Control A3</title>
+         <param id="a3_prm1">
+            <label>A3 Parameter 1</label>
+         </param>
+         <prop name="label" value="third"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group B of C</title>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="fourth"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="fifth"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="sixth"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+      <control id="c2">
+         <title>Control C2</title>
+         <prop name="label" value="eighth"/>
+         <part name="statement" id="c2-stmt">
+            <p>C2 cccccccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/catalogs/busy_catalog.xml b/src/specifications/profile-resolution/requirement-tests/catalogs/busy_catalog.xml
new file mode 100644
index 0000000000..426395e1e7
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/catalogs/busy_catalog.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T14:13:38.826-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         uuid="6498eb6e-8653-4470-8b97-54054d3ba886"
+         xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 ../../../../../xml/schema/oscal_catalog_schema.xsd">
+   <metadata>
+      <title>ABC Catalog</title>
+      <last-modified>2020-05-30T14:51:38.311-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <group>
+      <title>Group A of C</title>
+      <param id="param-A.a">
+         <label>A.a parameter</label>
+         <value>A.a value</value>
+      </param>
+      <param id="param-A.b">
+         <select>
+            <choice>A.b parameter selection choice 1</choice>
+            <choice>A.b parameter selection choice 2</choice>
+            <choice>A.b parameter selection choice 3</choice>
+         </select>
+      </param>
+      <param id="param-A.c">
+         <label>A.c parameter</label>
+         <usage><p>UNUSED</p></usage>
+      </param>
+      
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="param-a1.a">
+            <label>a1.a parameter</label>
+            <value>a1.a value</value>
+         </param>
+         <prop name="label" value="1st"/>
+         <prop name="extra" value="ex1"/>
+         <prop name="extra" value="ex2" ns="http://csrc.nist.gov/ns/oscal"/>
+         <prop name="extra" value="ex3" ns="http://somens.url"/>
+         <prop name="extra" value="ex4" class="special"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+            <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+            <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="2nd"/>
+         <prop name="extra" value="ex1"/>
+         <prop name="extra" value="ex2"/>
+         <prop name="extra" value="ex3" ns="http://somens.url"/>
+         <prop name="extra" value="ex4" class="special"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+            <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
+            </p>
+         </part>
+      </control>
+      <control id="a3">
+         <title>Control A3</title>
+         <prop name="extra" value="ex1"/>
+         <prop name="extra" value="ex2"/>
+         <prop name="extra" value="ex3" ns="http://somens.url"/>
+         <prop name="extra" value="ex4" class="special"/>
+         <prop name="label" value="3rd"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a4">
+         <title>Control A4</title>
+         <prop name="extra" value="ex1"/>
+         <prop name="extra" value="ex2"/>
+         <prop name="extra" value="ex3" ns="http://somens.url"/>
+         <prop name="extra" value="ex4" class="special"/>
+         <prop name="label" value="3rd"/>
+         <part name="statement" id="a3-stmt">
+            <p>A4 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a5">
+         <title>Control A5</title>
+         <prop name="extra" value="ex1"/>
+         <prop name="extra" value="ex2"/>
+         <prop name="extra" value="ex3" ns="http://somens.url"/>
+         <prop name="extra" value="ex4" class="special"/>
+         <prop name="label" value="3rd"/>
+         <part name="statement" id="a3-stmt">
+            <p>A5 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <back-matter>
+      <resource uuid="4a3990e7-2020-4b8f-902c-d679ebea2b58">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+      <resource uuid="ef4c1cf0-a3cc-4354-bdd5-690466f61d4f">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	<prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+   </back-matter>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/catalogs/loose-parameters.xml b/src/specifications/profile-resolution/requirement-tests/catalogs/loose-parameters.xml
new file mode 100644
index 0000000000..63c182eef8
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/catalogs/loose-parameters.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         uuid="e597b49b-e3cb-44be-a155-8601c368d7aa"
+         xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 ../../../../../xml/schema/oscal_catalog_schema.xsd">
+   <metadata>
+      <title>Loose Parameters</title>
+      <last-modified>2022-04-26T15:43:06.6638546-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <param id="floatA">
+      <label>floating param</label>
+      <guideline><p>When referenced from anywhere, this should float through.</p></guideline>
+   </param>
+   <group id="GRP">
+      <title>Group of Controls</title>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>Making reference to a parameter in another control, like this: <insert type="param" id-ref="c2p"/>.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc. <insert type="param" id-ref="floatA"/></p>
+         </part>
+      </control>
+      <control id="c2">
+         <title>Control C2</title>
+         <param id="c2p">
+            <label>param floating in C2</label>
+            <guideline><p>If Control C2 is missing, should be floating free.</p></guideline>
+         </param>
+         <prop name="label" value="eighth"/>
+         <part name="statement" id="c2-stmt">
+            <p>C2 cccccccc ccccccccccccccccc. <insert type="param" id-ref="c2p"/></p>
+         </part>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/catalogs/xyz-tiny_catalog.xml b/src/specifications/profile-resolution/requirement-tests/catalogs/xyz-tiny_catalog.xml
new file mode 100644
index 0000000000..eb557ac055
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/catalogs/xyz-tiny_catalog.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-stylesheet type="text/css" href="../../../../../../src/utils/util/author/CSS/oscal-author.css" title="Authoring" alternate="no"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:12:31.775-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="160a974c-2aaf-45cd-b504-44bb86bebada">
+   <metadata>
+      <title>XYZ Tiny Catalog</title>
+      <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <group>
+      <title>Group X of XYZ</title>
+      <control id="x1">
+         <title>Control X1</title>
+      </control>
+      <control id="x2">
+         <title>Control X2</title>
+      </control>
+      <control id="x3">
+         <title>Control X3</title>
+      </control>
+   </group>
+   <group>
+      <title>Group Y of XYZ</title>
+      <control id="y1">
+         <title>Control Y1</title>
+      </control>
+      <control id="y2">
+         <title>Control Y2</title>
+      </control>
+      <control id="y3">
+         <title>Control Y3</title>
+      </control>
+   </group>
+   <group>
+      <title>Group Z of XYZ</title>
+      <control id="z1">
+         <title>Control Z1</title>
+      </control>
+      <control id="z2">
+         <title>Control Z2</title>
+      </control>
+      <control id="z3">
+         <title>Control Z3</title>
+         <control id="z3.a">
+            <title>Control Z3-A</title>
+            <control id="z3.a-1">
+               <title>Control Z3-A-1</title>
+            </control>
+         </control>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/illustrations/req-include-all-asis-view.html b/src/specifications/profile-resolution/requirement-tests/illustrations/req-include-all-asis-view.html
new file mode 100644
index 0000000000..3ef99fc007
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/illustrations/req-include-all-asis-view.html
@@ -0,0 +1,603 @@
+<!DOCTYPE HTML><html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      
+      <style type="text/css">
+
+body { display: grid; grid-template-columns: 1fr 1fr 1fr;
+       grid-column-gap: 1vw;
+       font-family: sans-serif }
+       
+body > section {  border: thin solid black; padding: 0.4em; margin-top: 1em; max-height: 90vh; overflow: auto }
+
+.docmap p { margin: 0em }
+
+.docmap .element { outline: medium solid transparent }
+.docmap .element:hover { outline: medium solid #FDD7E4 }
+
+.docmap details.element { padding-left: 1em; margin-top: 0.2em }
+.docmap div.element { padding-left: 1em; margin-left: 1em; margin-top: 0.2em }
+
+details.element:not([open]) div.cnts { display: none }
+
+summary { display: list-item; list-style-position: outside; margin-left: 1em }
+
+div.eflex { display: inline-flex; align-items: start; gap:0.2em }
+
+div.eflex > * { flex: initial }
+
+p.tag { display: inline-block; background-color: midnightblue; color: white; padding: 0.4em; border-radius: 0.2em  }
+p.tag span.flag { display: inline-block; background-color: white; color: black;
+  padding: 0.1em; margin-left: 0.5em; }
+
+div.cnts  p.tag { margin-top:0.2em }
+p.tag.drctv { background-color: slategrey }
+
+div.cnts { display: inline-block; font-size: 80% }
+
+p.flsb:hover { background-color: royalblue }
+
+p.tag.ON { transition: background-color 0s, font-size 0.3s ease-out;
+      font-size: 120%;
+      background-color: steelblue !important }
+
+      h3 code { background-color: gainsboro }
+
+            </style>
+      <script type="text/javascript">
+                 function flashClass(elemID) {
+                 let ilk = document.getElementsByClassName(elemID);
+                 for (let i of ilk) { i.classList.toggle('ON'); }
+            }
+            </script>
+      </head>
+   <body>
+      <section id="import-maps">
+         <h3>Importing <code>catalogs/abc-mixed-up_catalog.xml</code></h3>
+         <h4>In catalog<code> catalogs/abc-mixed-up_catalog.xml</code></h4>
+         <div class="docmap">
+            <details class="element" open>
+               <summary>
+                  <div class="eflex">
+                     <p class="tag">catalog</p>
+                  </div>
+               </summary>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag">group</p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Group B of C</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_b2" onclick="flashClass('ID_b2')">control <span class="flag">b2</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control B2</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_b2-stmt" onclick="flashClass('ID_b2-stmt')"> part <b>statement</b><span class="flag">b2-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_b1" onclick="flashClass('ID_b1')">control <span class="flag">b1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control B1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_b1-stmt" onclick="flashClass('ID_b1-stmt')"> part <b>statement</b><span class="flag">b1-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_b3" onclick="flashClass('ID_b3')">control <span class="flag">b3</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control B3</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_b3-stmt" onclick="flashClass('ID_b3-stmt')"> part <b>statement</b><span class="flag">b3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag">group</p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Group A of C</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_a3" onclick="flashClass('ID_a3')">control <span class="flag">a3</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control A3</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="tag flsb ID_a3_prm1" onclick="flashClass('ID_a3_prm1')">param <span class="flag">a3_prm1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="flsb tag ID_a3_prm1-label" onclick="flashClass('ID_a3_prm1-label')">label <span class="flag">A3 Parameter 1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </div>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_a3-stmt" onclick="flashClass('ID_a3-stmt')"> part <b>statement</b><span class="flag">a3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_a2" onclick="flashClass('ID_a2')">control <span class="flag">a2</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control A2</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_a2-stmt" onclick="flashClass('ID_a2-stmt')"> part <b>statement</b><span class="flag">a2-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_a1" onclick="flashClass('ID_a1')">control <span class="flag">a1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control A1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="tag flsb ID_a1_prm1" onclick="flashClass('ID_a1_prm1')">param <span class="flag">a1_prm1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="flsb tag ID_a1_prm1-label" onclick="flashClass('ID_a1_prm1-label')">label <span class="flag">A1 Parameter 1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </div>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_a1-stmt" onclick="flashClass('ID_a1-stmt')"> part <b>statement</b><span class="flag">a1-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag">group</p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Group C of C</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c3" onclick="flashClass('ID_c3')">control <span class="flag">c3</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C3</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                     <details class="element" open>
+                        <summary>
+                           <div class="eflex">
+                              <p class="tag flsb ID_c3.a" onclick="flashClass('ID_c3.a')">control <span class="flag">c3.a</span></p>
+                              <div class="cnts">
+                                 <div class="cnts-row">
+                                    <p class="tag">title <span class="flag">Control C3-A</span></p>
+                                 </div>
+                              </div>
+                           </div>
+                        </summary>
+                        <div class="element">
+                           <div class="eflex">
+                              <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                           </div>
+                        </div>
+                        <details class="element" open>
+                           <summary>
+                              <div class="eflex">
+                                 <p class="tag flsb ID_c3.a-1" onclick="flashClass('ID_c3.a-1')">control <span class="flag">c3.a-1</span></p>
+                                 <div class="cnts">
+                                    <div class="cnts-row">
+                                       <p class="tag">title <span class="flag">Control C3-A-1</span></p>
+                                    </div>
+                                 </div>
+                              </div>
+                           </summary>
+                           <div class="element">
+                              <div class="eflex">
+                                 <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                              </div>
+                           </div>
+                        </details>
+                     </details>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c1" onclick="flashClass('ID_c1')">control <span class="flag">c1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c1-stmt" onclick="flashClass('ID_c1-stmt')"> part <b>statement</b><span class="flag">c1-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c2" onclick="flashClass('ID_c2')">control <span class="flag">c2</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C2</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c2-stmt" onclick="flashClass('ID_c2-stmt')"> part <b>statement</b><span class="flag">c2-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+               </details>
+            </details>
+         </div>
+      </section>
+      <section id="profile-map">
+         <h3>Profile <code>req-include-all-asis.xml</code></h3>
+         <div class="docmap">
+            <details class="element" open>
+               <summary>
+                  <div class="eflex">
+                     <p class="tag drctv">profile</p>
+                  </div>
+               </summary>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag drctv">import<span class="flag">catalogs/abc-mixed-up_catalog.xml</span></p>
+                     </div>
+                  </summary>
+                  <div class="element">
+                     <div class="eflex">
+                        <p class="tag drctv">include-all</p>
+                     </div>
+                  </div>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag drctv">merge</p>
+                     </div>
+                  </summary>
+                  <div class="element">
+                     <div class="eflex">
+                        <p class="tag drctv">as-is <span class="flag">true</span></p>
+                     </div>
+                  </div>
+               </details>
+            </details>
+         </div>
+      </section>
+      <section id="result-map">
+         <h3>Result <code>output-expected/req-include-all-asis_RESOLVED.xml</code></h3>
+         <div class="docmap">
+            <details class="element" open>
+               <summary>
+                  <div class="eflex">
+                     <p class="tag">catalog</p>
+                  </div>
+               </summary>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag">group</p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Group B of C</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_b2" onclick="flashClass('ID_b2')">control <span class="flag">b2</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control B2</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_b2-stmt" onclick="flashClass('ID_b2-stmt')"> part <b>statement</b><span class="flag">b2-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_b1" onclick="flashClass('ID_b1')">control <span class="flag">b1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control B1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_b1-stmt" onclick="flashClass('ID_b1-stmt')"> part <b>statement</b><span class="flag">b1-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_b3" onclick="flashClass('ID_b3')">control <span class="flag">b3</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control B3</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_b3-stmt" onclick="flashClass('ID_b3-stmt')"> part <b>statement</b><span class="flag">b3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag">group</p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Group A of C</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_a3" onclick="flashClass('ID_a3')">control <span class="flag">a3</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control A3</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="tag flsb ID_a3_prm1" onclick="flashClass('ID_a3_prm1')">param <span class="flag">a3_prm1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="flsb tag ID_a3_prm1-label" onclick="flashClass('ID_a3_prm1-label')">label <span class="flag">A3 Parameter 1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </div>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_a3-stmt" onclick="flashClass('ID_a3-stmt')"> part <b>statement</b><span class="flag">a3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_a2" onclick="flashClass('ID_a2')">control <span class="flag">a2</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control A2</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_a2-stmt" onclick="flashClass('ID_a2-stmt')"> part <b>statement</b><span class="flag">a2-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_a1" onclick="flashClass('ID_a1')">control <span class="flag">a1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control A1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="tag flsb ID_a1_prm1" onclick="flashClass('ID_a1_prm1')">param <span class="flag">a1_prm1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="flsb tag ID_a1_prm1-label" onclick="flashClass('ID_a1_prm1-label')">label <span class="flag">A1 Parameter 1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </div>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_a1-stmt" onclick="flashClass('ID_a1-stmt')"> part <b>statement</b><span class="flag">a1-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag">group</p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Group C of C</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c3" onclick="flashClass('ID_c3')">control <span class="flag">c3</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C3</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                     <details class="element" open>
+                        <summary>
+                           <div class="eflex">
+                              <p class="tag flsb ID_c3.a" onclick="flashClass('ID_c3.a')">control <span class="flag">c3.a</span></p>
+                              <div class="cnts">
+                                 <div class="cnts-row">
+                                    <p class="tag">title <span class="flag">Control C3-A</span></p>
+                                 </div>
+                              </div>
+                           </div>
+                        </summary>
+                        <div class="element">
+                           <div class="eflex">
+                              <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                           </div>
+                        </div>
+                        <details class="element" open>
+                           <summary>
+                              <div class="eflex">
+                                 <p class="tag flsb ID_c3.a-1" onclick="flashClass('ID_c3.a-1')">control <span class="flag">c3.a-1</span></p>
+                                 <div class="cnts">
+                                    <div class="cnts-row">
+                                       <p class="tag">title <span class="flag">Control C3-A-1</span></p>
+                                    </div>
+                                 </div>
+                              </div>
+                           </summary>
+                           <div class="element">
+                              <div class="eflex">
+                                 <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                              </div>
+                           </div>
+                        </details>
+                     </details>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c1" onclick="flashClass('ID_c1')">control <span class="flag">c1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c1-stmt" onclick="flashClass('ID_c1-stmt')"> part <b>statement</b><span class="flag">c1-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c2" onclick="flashClass('ID_c2')">control <span class="flag">c2</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C2</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c2-stmt" onclick="flashClass('ID_c2-stmt')"> part <b>statement</b><span class="flag">c2-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+               </details>
+            </details>
+         </div>
+      </section>
+   </body>
+</html>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/requirement-tests/illustrations/req-include-by-id-view.html b/src/specifications/profile-resolution/requirement-tests/illustrations/req-include-by-id-view.html
new file mode 100644
index 0000000000..5e4084d0fd
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/illustrations/req-include-by-id-view.html
@@ -0,0 +1,487 @@
+<!DOCTYPE HTML><html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      
+      <style type="text/css">
+
+body { display: grid; grid-template-columns: 1fr 1fr 1fr;
+       grid-column-gap: 1vw;
+       font-family: sans-serif }
+       
+body > section {  border: thin solid black; padding: 0.4em; margin-top: 1em; max-height: 90vh; overflow: auto }
+
+.docmap p { margin: 0em }
+
+.docmap .element { outline: medium solid transparent }
+.docmap .element:hover { outline: medium solid #FDD7E4 }
+
+.docmap details.element { padding-left: 1em; margin-top: 0.2em }
+.docmap div.element { padding-left: 1em; margin-left: 1em; margin-top: 0.2em }
+
+details.element:not([open]) div.cnts { display: none }
+
+summary { display: list-item; list-style-position: outside; margin-left: 1em }
+
+div.eflex { display: inline-flex; align-items: start; gap:0.2em }
+
+div.eflex > * { flex: initial }
+
+p.tag { display: inline-block; background-color: midnightblue; color: white; padding: 0.4em; border-radius: 0.2em  }
+p.tag span.flag { display: inline-block; background-color: white; color: black;
+  padding: 0.1em; margin-left: 0.5em; }
+
+div.cnts  p.tag { margin-top:0.2em }
+p.tag.drctv { background-color: slategrey }
+
+div.cnts { display: inline-block; font-size: 80% }
+
+p.flsb:hover { background-color: royalblue }
+
+p.tag.ON { transition: background-color 0s, font-size 0.3s ease-out;
+      font-size: 120%;
+      background-color: steelblue !important }
+
+      h3 code { background-color: gainsboro }
+
+            </style>
+      <script type="text/javascript">
+                 function flashClass(elemID) {
+                 let ilk = document.getElementsByClassName(elemID);
+                 for (let i of ilk) { i.classList.toggle('ON'); }
+            }
+            </script>
+      </head>
+   <body>
+      <section id="import-maps">
+         <h3>Importing <code>catalogs/abc-simple_catalog.xml</code></h3>
+         <h4>In catalog<code> catalogs/abc-simple_catalog.xml</code></h4>
+         <div class="docmap">
+            <details class="element" open>
+               <summary>
+                  <div class="eflex">
+                     <p class="tag">catalog</p>
+                  </div>
+               </summary>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag">group</p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Group A of C</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_a1" onclick="flashClass('ID_a1')">control <span class="flag">a1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control A1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="tag flsb ID_a1_prm1" onclick="flashClass('ID_a1_prm1')">param <span class="flag">a1_prm1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="flsb tag ID_a1_prm1-label" onclick="flashClass('ID_a1_prm1-label')">label <span class="flag">A1 Parameter 1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </div>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_a1-stmt" onclick="flashClass('ID_a1-stmt')"> part <b>statement</b><span class="flag">a1-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_a2" onclick="flashClass('ID_a2')">control <span class="flag">a2</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control A2</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_a2-stmt" onclick="flashClass('ID_a2-stmt')"> part <b>statement</b><span class="flag">a2-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_a3" onclick="flashClass('ID_a3')">control <span class="flag">a3</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control A3</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="tag flsb ID_a3_prm1" onclick="flashClass('ID_a3_prm1')">param <span class="flag">a3_prm1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="flsb tag ID_a3_prm1-label" onclick="flashClass('ID_a3_prm1-label')">label <span class="flag">A3 Parameter 1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </div>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_a3-stmt" onclick="flashClass('ID_a3-stmt')"> part <b>statement</b><span class="flag">a3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag">group</p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Group B of C</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_b1" onclick="flashClass('ID_b1')">control <span class="flag">b1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control B1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_b1-stmt" onclick="flashClass('ID_b1-stmt')"> part <b>statement</b><span class="flag">b1-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_b2" onclick="flashClass('ID_b2')">control <span class="flag">b2</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control B2</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_b2-stmt" onclick="flashClass('ID_b2-stmt')"> part <b>statement</b><span class="flag">b2-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_b3" onclick="flashClass('ID_b3')">control <span class="flag">b3</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control B3</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_b3-stmt" onclick="flashClass('ID_b3-stmt')"> part <b>statement</b><span class="flag">b3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag">group</p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Group C of C</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c1" onclick="flashClass('ID_c1')">control <span class="flag">c1</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C1</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c1-stmt" onclick="flashClass('ID_c1-stmt')"> part <b>statement</b><span class="flag">c1-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c2" onclick="flashClass('ID_c2')">control <span class="flag">c2</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C2</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c2-stmt" onclick="flashClass('ID_c2-stmt')"> part <b>statement</b><span class="flag">c2-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                  </details>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c3" onclick="flashClass('ID_c3')">control <span class="flag">c3</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C3</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                     <details class="element" open>
+                        <summary>
+                           <div class="eflex">
+                              <p class="tag flsb ID_c3.a" onclick="flashClass('ID_c3.a')">control <span class="flag">c3.a</span></p>
+                              <div class="cnts">
+                                 <div class="cnts-row">
+                                    <p class="tag">title <span class="flag">Control C3-A</span></p>
+                                 </div>
+                              </div>
+                           </div>
+                        </summary>
+                        <div class="element">
+                           <div class="eflex">
+                              <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                           </div>
+                        </div>
+                        <details class="element" open>
+                           <summary>
+                              <div class="eflex">
+                                 <p class="tag flsb ID_c3.a-1" onclick="flashClass('ID_c3.a-1')">control <span class="flag">c3.a-1</span></p>
+                                 <div class="cnts">
+                                    <div class="cnts-row">
+                                       <p class="tag">title <span class="flag">Control C3-A-1</span></p>
+                                    </div>
+                                 </div>
+                              </div>
+                           </summary>
+                           <div class="element">
+                              <div class="eflex">
+                                 <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                              </div>
+                           </div>
+                        </details>
+                     </details>
+                  </details>
+               </details>
+            </details>
+         </div>
+      </section>
+      <section id="profile-map">
+         <h3>Profile <code>req-include-by-id.xml</code></h3>
+         <div class="docmap">
+            <details class="element" open>
+               <summary>
+                  <div class="eflex">
+                     <p class="tag drctv">profile</p>
+                  </div>
+               </summary>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag drctv">import<span class="flag">catalogs/abc-simple_catalog.xml</span></p>
+                     </div>
+                  </summary>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag drctv">include-controls</p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag drctv">with child controls <span class="flag">yes </span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb drctv tag ID_a1" onclick="flashClass('ID_a1')">with-id <span class="flag">a1</span></p>
+                        </div>
+                     </div>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb drctv tag ID_b1" onclick="flashClass('ID_b1')">with-id <span class="flag">b1</span></p>
+                        </div>
+                     </div>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb drctv tag ID_c1" onclick="flashClass('ID_c1')">with-id <span class="flag">c1</span></p>
+                        </div>
+                     </div>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb drctv tag ID_c3" onclick="flashClass('ID_c3')">with-id <span class="flag">c3</span></p>
+                        </div>
+                     </div>
+                  </details>
+               </details>
+            </details>
+         </div>
+      </section>
+      <section id="result-map">
+         <h3>Result <code>output-expected/req-include-by-id_RESOLVED.xml</code></h3>
+         <div class="docmap">
+            <details class="element" open>
+               <summary>
+                  <div class="eflex">
+                     <p class="tag">catalog</p>
+                  </div>
+               </summary>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag flsb ID_a1" onclick="flashClass('ID_a1')">control <span class="flag">a1</span></p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Control A1</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <div class="element">
+                     <div class="eflex">
+                        <p class="tag flsb ID_a1_prm1" onclick="flashClass('ID_a1_prm1')">param <span class="flag">a1_prm1</span></p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="flsb tag ID_a1_prm1-label" onclick="flashClass('ID_a1_prm1-label')">label <span class="flag">A1 Parameter 1</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </div>
+                  <div class="element">
+                     <div class="eflex">
+                        <p class="flsb tag ID_a1-stmt" onclick="flashClass('ID_a1-stmt')"> part <b>statement</b><span class="flag">a1-stmt</span> ▮</p>
+                     </div>
+                  </div>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag flsb ID_b1" onclick="flashClass('ID_b1')">control <span class="flag">b1</span></p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Control B1</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <div class="element">
+                     <div class="eflex">
+                        <p class="flsb tag ID_b1-stmt" onclick="flashClass('ID_b1-stmt')"> part <b>statement</b><span class="flag">b1-stmt</span> ▮</p>
+                     </div>
+                  </div>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag flsb ID_c1" onclick="flashClass('ID_c1')">control <span class="flag">c1</span></p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Control C1</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <div class="element">
+                     <div class="eflex">
+                        <p class="flsb tag ID_c1-stmt" onclick="flashClass('ID_c1-stmt')"> part <b>statement</b><span class="flag">c1-stmt</span> ▮</p>
+                     </div>
+                  </div>
+               </details>
+               <details class="element" open>
+                  <summary>
+                     <div class="eflex">
+                        <p class="tag flsb ID_c3" onclick="flashClass('ID_c3')">control <span class="flag">c3</span></p>
+                        <div class="cnts">
+                           <div class="cnts-row">
+                              <p class="tag">title <span class="flag">Control C3</span></p>
+                           </div>
+                        </div>
+                     </div>
+                  </summary>
+                  <div class="element">
+                     <div class="eflex">
+                        <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                     </div>
+                  </div>
+                  <details class="element" open>
+                     <summary>
+                        <div class="eflex">
+                           <p class="tag flsb ID_c3.a" onclick="flashClass('ID_c3.a')">control <span class="flag">c3.a</span></p>
+                           <div class="cnts">
+                              <div class="cnts-row">
+                                 <p class="tag">title <span class="flag">Control C3-A</span></p>
+                              </div>
+                           </div>
+                        </div>
+                     </summary>
+                     <div class="element">
+                        <div class="eflex">
+                           <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                        </div>
+                     </div>
+                     <details class="element" open>
+                        <summary>
+                           <div class="eflex">
+                              <p class="tag flsb ID_c3.a-1" onclick="flashClass('ID_c3.a-1')">control <span class="flag">c3.a-1</span></p>
+                              <div class="cnts">
+                                 <div class="cnts-row">
+                                    <p class="tag">title <span class="flag">Control C3-A-1</span></p>
+                                 </div>
+                              </div>
+                           </div>
+                        </summary>
+                        <div class="element">
+                           <div class="eflex">
+                              <p class="flsb tag ID_c3-stmt" onclick="flashClass('ID_c3-stmt')"> part <b>statement</b><span class="flag">c3-stmt</span> ▮</p>
+                           </div>
+                        </div>
+                     </details>
+                  </details>
+               </details>
+            </details>
+         </div>
+      </section>
+   </body>
+</html>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/requirement-tests/keep-everything-twice.xml b/src/specifications/profile-resolution/requirement-tests/keep-everything-twice.xml
new file mode 100644
index 0000000000..7452b3f9f4
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/keep-everything-twice.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/abc-mixed-up_catalog.xml">
+        <include-all/>
+    </import>
+    <import href="catalogs/abc-mixed-up_catalog.xml">
+        <include-all/>
+    </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-asis_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-asis_RESOLVED.xml
new file mode 100644
index 0000000000..4be608d978
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-asis_RESOLVED.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="f4f5b2ba-298c-486c-a69b-0ed18d6e9d44">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-06-14T16:44:05.310572-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>TODO: Not implemented yet</oscal-version>
+      <prop name="resolution-tool"
+            value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+      <link href="file:/C:/Users/wap1/Documents/usnistgov/OSCAL-dev/src/specifications/profile-resolution/requirement-tests/req-include-all-asis.xml"
+            rel="source-profile"/>
+   </metadata>
+   <group>
+      <title>Group B of C</title>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="fifth"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="fourth"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="sixth"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group A of C</title>
+      <control id="a3">
+         <title>Control A3</title>
+         <param id="a3_prm1">
+            <label>A3 Parameter 1</label>
+         </param>
+         <prop name="label" value="third"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="second"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="a1_prm1">
+            <label>A1 Parameter 1</label>
+         </param>
+         <prop name="label" value="first"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+      <control id="c2">
+         <title>Control C2</title>
+         <prop name="label" value="eighth"/>
+         <part name="statement" id="c2-stmt">
+            <p>C2 cccccccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-flat_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-flat_RESOLVED.xml
new file mode 100644
index 0000000000..d9e8500563
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-flat_RESOLVED.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="5487fa04-5947-4de0-b263-f63373f9e153">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-18T15:24:19.2090219-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-all-flat.xml"/>
+   </metadata>
+   <control id="b2">
+      <title>Control B2</title>
+      <prop name="label" value="fifth"/>
+      <part name="statement" id="b2-stmt">
+         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b3">
+      <title>Control B3</title>
+      <prop name="label" value="sixth"/>
+      <part name="statement" id="b3-stmt">
+         <p>B3 bbbb bbbbbbb bbbb.</p>
+      </part>
+   </control>
+   <control id="a3">
+      <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
+      <prop name="label" value="third"/>
+      <part name="statement" id="a3-stmt">
+         <p>A3 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="label" value="second"/>
+      <part name="statement" id="a2-stmt">
+         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <prop name="label" value="first"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a-1">
+            <title>Control C3-A-1</title>
+            <prop name="label" value="eleventh"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A-1 ccccc cccccccccccccc.</p>
+            </part>
+         </control>
+      </control>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c2">
+      <title>Control C2</title>
+      <prop name="label" value="eighth"/>
+      <part name="statement" id="c2-stmt">
+         <p>C2 cccccccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/keep-everything-twice_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/keep-everything-twice_RESOLVED.xml
new file mode 100644
index 0000000000..7f603bcf77
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/keep-everything-twice_RESOLVED.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="f7a050b7-16f6-488f-b596-f184cc044280">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-25T16:32:27.0669689-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="keep-everything-twice.xml"/>
+   </metadata>
+   <!-- note that constraints over id should make these results invalid  -->
+   <control id="b2">
+      <title>Control B2</title>
+      <prop name="label" value="fifth"/>
+      <part name="statement" id="b2-stmt">
+         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b3">
+      <title>Control B3</title>
+      <prop name="label" value="sixth"/>
+      <part name="statement" id="b3-stmt">
+         <p>B3 bbbb bbbbbbb bbbb.</p>
+      </part>
+   </control>
+   <control id="a3">
+      <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
+      <prop name="label" value="third"/>
+      <part name="statement" id="a3-stmt">
+         <p>A3 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="label" value="second"/>
+      <part name="statement" id="a2-stmt">
+         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <prop name="label" value="first"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a-1">
+            <title>Control C3-A-1</title>
+            <prop name="label" value="eleventh"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A-1 ccccc cccccccccccccc.</p>
+            </part>
+         </control>
+      </control>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c2">
+      <title>Control C2</title>
+      <prop name="label" value="eighth"/>
+      <part name="statement" id="c2-stmt">
+         <p>C2 cccccccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="b2">
+      <title>Control B2</title>
+      <prop name="label" value="fifth"/>
+      <part name="statement" id="b2-stmt">
+         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b3">
+      <title>Control B3</title>
+      <prop name="label" value="sixth"/>
+      <part name="statement" id="b3-stmt">
+         <p>B3 bbbb bbbbbbb bbbb.</p>
+      </part>
+   </control>
+   <control id="a3">
+      <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
+      <prop name="label" value="third"/>
+      <part name="statement" id="a3-stmt">
+         <p>A3 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="label" value="second"/>
+      <part name="statement" id="a2-stmt">
+         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <prop name="label" value="first"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a-1">
+            <title>Control C3-A-1</title>
+            <prop name="label" value="eleventh"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A-1 ccccc cccccccccccccc.</p>
+            </part>
+         </control>
+      </control>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c2">
+      <title>Control C2</title>
+      <prop name="label" value="eighth"/>
+      <part name="statement" id="c2-stmt">
+         <p>C2 cccccccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml
new file mode 100644
index 0000000000..5e00340e8a
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="90ece0fd-0f0a-4fc3-b623-0b047aa7921e">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-18T15:24:15.880015-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-chained-all-asis.xml"/>
+      <link rel="resolution-source" href="req-include-all-asis.xml"/>
+   </metadata>
+   <group>
+      <title>Group B of C</title>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="fifth"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="fourth"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="sixth"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group A of C</title>
+      <control id="a3">
+         <title>Control A3</title>
+         <param id="a3_prm1">
+            <label>A3 Parameter 1</label>
+         </param>
+         <prop name="label" value="third"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="second"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="a1_prm1">
+            <label>A1 Parameter 1</label>
+         </param>
+         <prop name="label" value="first"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+      <control id="c2">
+         <title>Control C2</title>
+         <prop name="label" value="eighth"/>
+         <part name="statement" id="c2-stmt">
+            <p>C2 cccccccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml
new file mode 100644
index 0000000000..8c843136a6
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="f64f5d0e-f7eb-4b1d-b234-cffdaab8f4f8">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-25T15:47:00.2942155-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-chained-deepA.xml"/>
+   </metadata>
+   <group>
+      <title>Group B of C</title>
+      <control id="b1"><!-- via req-include-all-asis.xml -->
+         <title>Control B1</title>
+         <prop name="label" value="fourth"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="sixth"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group A of C</title>
+      <control id="a3">
+         <title>Control A3</title>
+         <param id="a3_prm1">
+            <label>A3 Parameter 1</label>
+         </param>
+         <prop name="label" value="third"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a1"><!-- via req-include-all-asis.xml -->
+         <title>Control A1</title>
+         <param id="a1_prm1">
+            <label>A1 Parameter 1</label>
+         </param>
+         <prop name="label" value="first"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c3"><!-- via req-include-all-asis.xml -->
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+      <control id="c1"><!-- via req-include-all-asis.xml -->
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-circular_import_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-circular_import_RESOLVED.xml
new file mode 100644
index 0000000000..90d7c81aef
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-circular_import_RESOLVED.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="941045b5-7e4f-4528-9537-88f890540c32">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-18T15:24:16.5210188-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-circular_import.xml"/>
+   </metadata>
+   <ERROR level="fatal">Import of href="req-circular_importer.xml" fails - circular import</ERROR>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml
new file mode 100644
index 0000000000..5764fb3933
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="df7094f5-22ff-4052-a231-b5a0c23a0b9b">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-18T15:24:17.90803-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-import-by-resource.xml"/>
+   </metadata>
+   <group>
+      <title>Group B of C</title>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="fifth"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="fourth"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="sixth"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group A of C</title>
+      <control id="a3">
+         <title>Control A3</title>
+         <param id="a3_prm1">
+            <label>A3 Parameter 1</label>
+         </param>
+         <prop name="label" value="third"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="second"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="a1_prm1">
+            <label>A1 Parameter 1</label>
+         </param>
+         <prop name="label" value="first"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+      <control id="c2">
+         <title>Control C2</title>
+         <prop name="label" value="eighth"/>
+         <part name="statement" id="c2-stmt">
+            <p>C2 cccccccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml
new file mode 100644
index 0000000000..d618bc1891
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="b6d24151-eb31-41a4-8bbe-aab29bb75cc4">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-02-15T13:27:39.019088-05:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-all-asis.xml"/>
+   </metadata>
+   <group>
+      <title>Group B of C</title>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="fifth"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="fourth"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="sixth"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group A of C</title>
+      <control id="a3">
+         <title>Control A3</title>
+         <param id="a3_prm1">
+            <label>A3 Parameter 1</label>
+         </param>
+         <prop name="label" value="third"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="second"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+         </part>
+      </control>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="a1_prm1">
+            <label>A1 Parameter 1</label>
+         </param>
+         <prop name="label" value="first"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+      <control id="c2">
+         <title>Control C2</title>
+         <prop name="label" value="eighth"/>
+         <part name="statement" id="c2-stmt">
+            <p>C2 cccccccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml
new file mode 100644
index 0000000000..0b2ae6a52d
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="4ad6497f-8f00-4f61-a279-4ed9b3088a60">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-02-15T16:39:33.396588-05:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-all-flat.xml"/>
+   </metadata>
+   <control id="b2">
+      <title>Control B2</title>
+      <prop name="label" value="fifth"/>
+      <part name="statement" id="b2-stmt">
+         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b3">
+      <title>Control B3</title>
+      <prop name="label" value="sixth"/>
+      <part name="statement" id="b3-stmt">
+         <p>B3 bbbb bbbbbbb bbbb.</p>
+      </part>
+   </control>
+   <control id="a3">
+      <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
+      <prop name="label" value="third"/>
+      <part name="statement" id="a3-stmt">
+         <p>A3 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="label" value="second"/>
+      <part name="statement" id="a2-stmt">
+         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <prop name="label" value="first"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a-1">
+            <title>Control C3-A-1</title>
+            <prop name="label" value="eleventh"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A-1 ccccc cccccccccccccc.</p>
+            </part>
+         </control>
+      </control>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c2">
+      <title>Control C2</title>
+      <prop name="label" value="eighth"/>
+      <part name="statement" id="c2-stmt">
+         <p>C2 cccccccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-id_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-id_RESOLVED.xml
new file mode 100644
index 0000000000..d392c4d5d3
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-id_RESOLVED.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="4793f015-b0db-44d4-a145-9256ffaf7b8e">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-19T15:51:51.3807658-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-by-id.xml"/>
+   </metadata>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <prop name="label" value="first"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a-1">
+            <title>Control C3-A-1</title>
+            <prop name="label" value="eleventh"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A-1 ccccc cccccccccccccc.</p>
+            </part>
+         </control>
+      </control>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match-empty_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match-empty_RESOLVED.xml
new file mode 100644
index 0000000000..519a5c30e3
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match-empty_RESOLVED.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="424d0a68-cb4e-4bd6-aef8-b2c23af679d2">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-19T16:10:50.306097-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-by-match-empty.xml"/>
+   </metadata>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match_RESOLVED.xml
new file mode 100644
index 0000000000..57215dbe01
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match_RESOLVED.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="f206ec86-3fe7-4694-b9f7-581c6c37755c">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-19T16:07:09.7400721-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-by-match.xml"/>
+   </metadata>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <prop name="label" value="first"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="label" value="second"/>
+      <part name="statement" id="a2-stmt">
+         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a3">
+      <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
+      <prop name="label" value="third"/>
+      <part name="statement" id="a3-stmt">
+         <p>A3 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude1_RESOLVED.xml
new file mode 100644
index 0000000000..01d7ff07eb
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude1_RESOLVED.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="46fb1cbc-e13c-4dda-82c6-af5783163b66">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-20T11:25:08.5989517-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-exclude1.xml"/>
+   </metadata>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="label" value="second"/>
+      <part name="statement" id="a2-stmt">
+         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a3">
+      <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
+      <prop name="label" value="third"/>
+      <part name="statement" id="a3-stmt">
+         <p>A3 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude2_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude2_RESOLVED.xml
new file mode 100644
index 0000000000..2611d1817a
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude2_RESOLVED.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="6f457bf5-50c6-4b0b-aa8e-a9d812efa489">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-20T11:27:11.0114457-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-exclude2.xml"/>
+   </metadata>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="label" value="second"/>
+      <part name="statement" id="a2-stmt">
+         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a3">
+      <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
+      <prop name="label" value="third"/>
+      <part name="statement" id="a3-stmt">
+         <p>A3 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude3_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude3_RESOLVED.xml
new file mode 100644
index 0000000000..3a26a74414
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude3_RESOLVED.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="dce8a59e-d0a7-4222-b3a2-9cdcee1e12f6">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-20T11:29:12.5084741-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-exclude3.xml"/>
+   </metadata>
+   <control id="b2">
+      <title>Control B2</title>
+      <prop name="label" value="fifth"/>
+      <part name="statement" id="b2-stmt">
+         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude4_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude4_RESOLVED.xml
new file mode 100644
index 0000000000..31f7820633
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude4_RESOLVED.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="21a14237-59cf-4227-8f96-31b4a2372495">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-25T16:18:40.4891642-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-exclude4.xml"/>
+   </metadata>
+   <control id="b2">
+      <title>Control B2</title>
+      <prop name="label" value="fifth"/>
+      <part name="statement" id="b2-stmt">
+         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude5_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude5_RESOLVED.xml
new file mode 100644
index 0000000000..f192200e80
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude5_RESOLVED.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="30a5bef7-aa54-413d-86ed-c927523b18c6">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-25T16:20:19.1426274-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-include-exclude5.xml"/>
+   </metadata>
+   <control id="b2">
+      <title>Control B2</title>
+      <prop name="label" value="fifth"/>
+      <part name="statement" id="b2-stmt">
+         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-loose-params1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-loose-params1_RESOLVED.xml
new file mode 100644
index 0000000000..73059434a8
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-loose-params1_RESOLVED.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="00000000-0000-4000-B000-000000000000">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-06-13T13:51:15.3863601-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>TODO: Not implemented yet</oscal-version>
+      <prop name="resolution-tool"
+            value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+      <link href="requirement-tests/req-loose-params1.xml"
+            rel="source-profile"/>
+   </metadata>
+   <param id="floatA">
+      <label>floating param</label>
+      <guideline><p>When referenced from anywhere, this should float through.</p></guideline>
+   </param>
+   <param id="c2p">
+      <label>param floating in C2</label>
+      <guideline><p>If Control C2 is missing, should be floating free.</p></guideline>
+   </param>
+   <group id="GRP">
+      <title>Group of Controls</title>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>Making reference to a parameter in another control, like this: <insert type="param" id-ref="c2p"/>.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc. <insert type="param" id-ref="floatA"/>
+            </p>
+         </part>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-loose-params2_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-loose-params2_RESOLVED.xml
new file mode 100644
index 0000000000..75a0a99b89
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-loose-params2_RESOLVED.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="00000000-0000-4000-B000-000000000000">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-06-14T10:12:38.6256557-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>TODO: Not implemented yet</oscal-version>
+      <prop name="resolution-tool"
+            value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+      <link href="requirement-tests/req-loose-params2.xml"
+            rel="source-profile"/>
+   </metadata>
+   <param id="floatA">
+      <label>floating param</label>
+      <guideline><p>When referenced from anywhere, this should float through.</p></guideline>
+   </param>
+   <param id="c2p">
+      <label>param floating in C2</label>
+      <guideline><p>If Control C2 is missing, should be floating free.</p></guideline>
+   </param>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a-1">
+            <title>Control C3-A-1</title>
+            <prop name="label" value="eleventh"/>
+            <part name="statement" id="c3-stmt">
+               <p>Making reference to a parameter in another control, like this: <insert type="param" id-ref="c2p"/>.</p>
+            </part>
+         </control>
+      </control>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc. <insert type="param" id-ref="floatA"/>
+         </p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-merge-usefirst1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-merge-usefirst1_RESOLVED.xml
new file mode 100644
index 0000000000..83e45b7bb5
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-merge-usefirst1_RESOLVED.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="00000000-0000-4000-B000-000000000000">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-06-13T14:18:05.6425797-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>TODO: Not implemented yet</oscal-version>
+      <prop name="resolution-tool"
+            value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+      <link href="requirement-tests/req-merge-usefirst1.xml"
+            rel="source-profile"/>
+   </metadata>
+   <group>
+      <title>Group A of C</title>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="a1_prm1">
+            <label>A1 Parameter 1</label>
+         </param>
+         <prop name="label" value="first"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group B of C</title>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="fourth"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c1">
+         <title>Control C1</title>
+         <prop name="label" value="seventh"/>
+         <part name="statement" id="c1-stmt">
+            <p>C1 ccccc ccc ccccccccccccccccc.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group B of C</title>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="fifth"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group A of C</title>
+      <control id="a3">
+         <title>Control A3</title>
+         <param id="a3_prm1">
+            <label>A3 Parameter 1</label>
+         </param>
+         <prop name="label" value="third"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <control id="c3">
+         <title>Control C3</title>
+         <prop name="label" value="ninth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="tenth"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="eleventh"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </control>
+   </group>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-merge-usefirst2_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-merge-usefirst2_RESOLVED.xml
new file mode 100644
index 0000000000..4e697d24e5
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-merge-usefirst2_RESOLVED.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="00000000-0000-4000-B000-000000000000">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-06-13T14:20:25.5347906-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>TODO: Not implemented yet</oscal-version>
+      <prop name="resolution-tool"
+            value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+      <link href="requirement-tests/req-merge-usefirst2.xml"
+            rel="source-profile"/>
+   </metadata>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <prop name="label" value="first"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="label" value="second"/>
+      <part name="statement" id="a2-stmt">
+         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a3">
+      <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
+      <prop name="label" value="third"/>
+      <part name="statement" id="a3-stmt">
+         <p>A3 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b2">
+      <title>Control B2</title>
+      <prop name="label" value="fifth"/>
+      <part name="statement" id="b2-stmt">
+         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+      </part>
+   </control>
+   <control id="b3">
+      <title>Control B3</title>
+      <prop name="label" value="sixth"/>
+      <part name="statement" id="b3-stmt">
+         <p>B3 bbbb bbbbbbb bbbb.</p>
+      </part>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c2">
+      <title>Control C2</title>
+      <prop name="label" value="eighth"/>
+      <part name="statement" id="c2-stmt">
+         <p>C2 cccccccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a-1">
+            <title>Control C3-A-1</title>
+            <prop name="label" value="eleventh"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A-1 ccccc cccccccccccccc.</p>
+            </part>
+         </control>
+      </control>
+   </control>
+   
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-modify-alter-remove-match1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-modify-alter-remove-match1_RESOLVED.xml
new file mode 100644
index 0000000000..d03e52fe08
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-modify-alter-remove-match1_RESOLVED.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="f5e749ae-2d5a-47a6-970e-62fffe85fa62">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-06-15T10:30:30.4321464-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>TODO: Not implemented yet</oscal-version>
+      <prop name="resolution-tool"
+            value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+      <link href="file:/C:/Users/wap1/Documents/usnistgov/OSCAL-dev/src/specifications/profile-resolution/requirement-tests/req-modify-alter-remove-match1.xml"
+            rel="source-profile"/>
+   </metadata>
+   <control id="a3">
+      <title>Control A3</title>
+      <param id="a3_prm1">
+         <label>A3 Parameter 1</label>
+      </param>
+   </control>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="label" value="second"/>
+   </control>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a-1">
+            <title>Control C3-A-1</title>
+            <prop name="label" value="eleventh"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A-1 ccccc cccccccccccccc.</p>
+            </part>
+         </control>
+      </control>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c2">
+      <title>Control C2</title>
+      <prop name="label" value="eighth"/>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-modify-alter-remove-match2_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-modify-alter-remove-match2_RESOLVED.xml
new file mode 100644
index 0000000000..9ed7b5da62
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-modify-alter-remove-match2_RESOLVED.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="85c7333c-5880-4d80-83ea-e9d4aa71f4ce">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-06-15T16:22:58.1586252-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>TODO: Not implemented yet</oscal-version>
+      <prop name="resolution-tool"
+            value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+      <link href="file:/C:/Users/wap1/Documents/usnistgov/OSCAL-dev/src/specifications/profile-resolution/requirement-tests/req-modify-alter-remove-match2.xml"
+            rel="source-profile"/>
+   </metadata>
+   <param id="param-A.a">
+      <label>A.a parameter</label>
+      <value>A.a value</value>
+   </param>
+   <param id="param-A.b">
+      <select>
+         <choice>A.b parameter selection choice 1</choice>
+         <choice>A.b parameter selection choice 2</choice>
+         <choice>A.b parameter selection choice 3</choice>
+      </select>
+   </param>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="param-a1.a">
+         <label>a1.a parameter</label>
+         <value>a1.a value</value>
+      </param>
+      <prop name="extra" value="ex3" ns="http://somens.url"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>
+         </p>
+         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>
+         </p>
+      </part>
+   </control>
+   <control id="a2">
+      <title>Control A2</title>
+      <prop name="extra" value="ex1"/>
+      <prop name="extra" value="ex2"/>
+      <prop name="extra" value="ex3" ns="http://somens.url"/>
+      <part name="statement" id="a2-stmt">
+         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+         <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
+         </p>
+      </part>
+   </control>
+   <control id="a3">
+      <title>Control A3</title>
+      <part name="statement" id="a3-stmt">
+         <p>A3 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a4">
+      <title>Control A4</title>
+      <prop name="extra" value="ex1"/>
+      <prop name="extra" value="ex2"/>
+      <prop name="extra" value="ex4" class="special"/>
+      <prop name="label" value="3rd"/>
+      <part name="statement" id="a3-stmt">
+         <p>A4 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="a5">
+      <title>Control A5</title>
+      <prop name="extra" value="ex1"/>
+      <prop name="extra" value="ex2"/>
+      <prop name="extra" value="ex4" class="special"/>
+      <prop name="label" value="3rd"/>
+      <part name="statement" id="a3-stmt">
+         <p>A5 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-structure-asis1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-structure-asis1_RESOLVED.xml
new file mode 100644
index 0000000000..6ee6467c1d
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-structure-asis1_RESOLVED.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="00000000-0000-4000-B000-000000000000">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-06-14T10:31:48.9825185-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>TODO: Not implemented yet</oscal-version>
+      <prop name="resolution-tool"
+            value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+      <link href="requirement-tests/req-structure-asis1.xml"
+            rel="source-profile"/>
+   </metadata>
+   <group>
+      <title>Group A of C</title>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="param-a1.a">
+            <label>a1.a parameter</label>
+            <value>a1.a value</value>
+         </param>
+         <prop name="label" value="1st"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+            <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>
+            </p>
+            <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>
+            </p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="2nd"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+            <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
+            </p>
+         </part>
+      </control>
+      <control id="a3">
+         <title>Control A3</title>
+         <prop name="label" value="3rd"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group B of C</title>
+      <control id="b1">
+         <title>Control B1</title>
+         <prop name="label" value="4th"/>
+         <part name="statement" id="b1-stmt">
+            <p>B1 bbbb bbbbbbb.</p>
+         </part>
+      </control>
+      <control id="b2">
+         <title>Control B2</title>
+         <prop name="label" value="5th"/>
+         <link rel="reference" href="#4a3990e7-2020-4b8f-902c-d679ebea2b58"/>
+         <part name="statement" id="b2-stmt">
+            <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+            <p>Also, we <a href="#4a3990e7-2020-4b8f-902c-d679ebea2b58">refer to a citation</a>.</p>
+         </part>
+      </control>
+      <control id="b3">
+         <title>Control B3</title>
+         <prop name="label" value="6th"/>
+         <part name="statement" id="b3-stmt">
+            <p>B3 bbbb bbbbbbb bbbb.</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <part name="overview">
+         <p>Group C of C contains subgroups CA and CB.</p>
+      </part>
+      <group id="CA">
+         <title>Group CA</title>
+         <control id="c1">
+            <title>Control C1</title>
+            <prop name="label" value="7th"/>
+            <part name="statement" id="c1-stmt">
+               <p>C1 ccccc ccc ccccccccccccccccc.</p>
+               <p>We cite a document with an anchor: <a href="somedoc#citation">... citation ...</a>.</p>
+            </part>
+         </control>
+         <control id="c2">
+            <title>Control C2</title>
+            <prop name="label" value="8th"/>
+            <link rel="reference" href="#ef4c1cf0-a3cc-4354-bdd5-690466f61d4f"/>
+            <part name="statement" id="c2-stmt">
+               <p>C2 cccccccc ccccccccccccccccc.</p>
+            </part>
+         </control>
+      </group>
+   </group>
+   <back-matter>
+      <resource uuid="4a3990e7-2020-4b8f-902c-d679ebea2b58">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+      <resource uuid="ef4c1cf0-a3cc-4354-bdd5-690466f61d4f">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+   </back-matter>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-structure-asis2_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-structure-asis2_RESOLVED.xml
new file mode 100644
index 0000000000..ea2300e158
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-structure-asis2_RESOLVED.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="00000000-0000-4000-B000-000000000000">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-06-14T10:33:37.4077081-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>TODO: Not implemented yet</oscal-version>
+      <prop name="resolution-tool"
+            value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+      <link href="requirement-tests/req-structure-asis2.xml"
+            rel="source-profile"/>
+   </metadata>
+   <group>
+      <title>Group A of C</title>
+      <control id="a1">
+         <title>Control A1</title>
+         <param id="param-a1.a">
+            <label>a1.a parameter</label>
+            <value>a1.a value</value>
+         </param>
+         <prop name="label" value="1st"/>
+         <part name="statement" id="a1-stmt">
+            <p>A1 aaaaa aaaaaaaaaa</p>
+            <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>
+            </p>
+            <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>
+            </p>
+         </part>
+      </control>
+      <control id="a2">
+         <title>Control A2</title>
+         <prop name="label" value="2nd"/>
+         <part name="statement" id="a2-stmt">
+            <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+            <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
+            </p>
+         </part>
+      </control>
+      <control id="a3">
+         <title>Control A3</title>
+         <prop name="label" value="3rd"/>
+         <part name="statement" id="a3-stmt">
+            <p>A3 aaaaa aaaaaaaaaa</p>
+         </part>
+      </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+      <part name="overview">
+         <p>Group C of C contains subgroups CA and CB.</p>
+      </part>
+      <group id="CA">
+         <title>Group CA</title>
+         <control id="c1">
+            <title>Control C1</title>
+            <prop name="label" value="7th"/>
+            <part name="statement" id="c1-stmt">
+               <p>C1 ccccc ccc ccccccccccccccccc.</p>
+               <p>We cite a document with an anchor: <a href="somedoc#citation">... citation ...</a>.</p>
+            </part>
+         </control>
+         <control id="c2">
+            <title>Control C2</title>
+            <prop name="label" value="8th"/>
+            <link rel="reference" href="#ef4c1cf0-a3cc-4354-bdd5-690466f61d4f"/>
+            <part name="statement" id="c2-stmt">
+               <p>C2 cccccccc ccccccccccccccccc.</p>
+            </part>
+         </control>
+      </group>
+      <group id="CB">
+         <title>Group CB</title>
+         <control id="c3.a">
+            <title>Control C3-A</title>
+            <prop name="label" value="10th"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A ccccc cccccccccccccc.</p>
+            </part>
+            <control id="c3.a-1">
+               <title>Control C3-A-1</title>
+               <prop name="label" value="11th"/>
+               <part name="statement" id="c3-stmt">
+                  <p>C3 A-1 ccccc cccccccccccccc.</p>
+               </part>
+            </control>
+         </control>
+      </group>
+   </group>
+   <back-matter>
+      <resource uuid="ef4c1cf0-a3cc-4354-bdd5-690466f61d4f">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+   </back-matter>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-no_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-no_RESOLVED.xml
new file mode 100644
index 0000000000..76b78502ff
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-no_RESOLVED.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="993ecb6b-a87f-49f0-8f3b-4454bdeff8d5">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-19T16:25:49.1221541-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-with-child-controls-no.xml"/>
+   </metadata>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <prop name="label" value="first"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-none_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-none_RESOLVED.xml
new file mode 100644
index 0000000000..3d9c352467
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-none_RESOLVED.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="5f42683a-3ec8-42c3-a737-91d84d5540d0">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-19T16:27:33.9704261-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-with-child-controls-none.xml"/>
+   </metadata>
+   <control id="a1">
+      <title>Control A1</title>
+      <param id="a1_prm1">
+         <label>A1 Parameter 1</label>
+      </param>
+      <prop name="label" value="first"/>
+      <part name="statement" id="a1-stmt">
+         <p>A1 aaaaa aaaaaaaaaa</p>
+      </part>
+   </control>
+   <control id="b1">
+      <title>Control B1</title>
+      <prop name="label" value="fourth"/>
+      <part name="statement" id="b1-stmt">
+         <p>B1 bbbb bbbbbbb.</p>
+      </part>
+   </control>
+   <control id="c1">
+      <title>Control C1</title>
+      <prop name="label" value="seventh"/>
+      <part name="statement" id="c1-stmt">
+         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-no1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-no1_RESOLVED.xml
new file mode 100644
index 0000000000..5605cb1acb
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-no1_RESOLVED.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="46abd95c-a95f-4bbd-b874-daaa2080d284">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-26T17:10:21.286142-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-with-parent-controls-no1.xml"/>
+   </metadata>
+   <control id="c3.a">
+      <title>Control C3-A</title>
+      <prop name="label" value="tenth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 A ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a-1">
+         <title>Control C3-A-1</title>
+         <prop name="label" value="eleventh"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A-1 ccccc cccccccccccccc.</p>
+         </part>
+      </control>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-none_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-none_RESOLVED.xml
new file mode 100644
index 0000000000..229f9cabd2
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-none_RESOLVED.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="d8952eb1-57fc-4ca5-b7a3-461f3e310882">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-26T17:19:59.7102091-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-with-parent-controls-none.xml"/>
+   </metadata>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+      </control>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes1_RESOLVED.xml
new file mode 100644
index 0000000000..90cd98f27f
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes1_RESOLVED.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="c9fae162-e184-4f25-9987-ee7ab3e59a10">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-26T17:11:18.9602994-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-with-parent-controls-yes1.xml"/>
+   </metadata>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+         <control id="c3.a-1">
+            <title>Control C3-A-1</title>
+            <prop name="label" value="eleventh"/>
+            <part name="statement" id="c3-stmt">
+               <p>C3 A-1 ccccc cccccccccccccc.</p>
+            </part>
+         </control>
+      </control>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes2_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes2_RESOLVED.xml
new file mode 100644
index 0000000000..813f9ac4b9
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes2_RESOLVED.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="c9fae162-e184-4f25-9987-ee7ab3e59a10">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-26T17:11:18.9602994-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+      <link rel="resolution-source" href="req-with-parent-controls-yes2.xml"/>
+   </metadata>
+   <control id="c3">
+      <title>Control C3</title>
+      <prop name="label" value="ninth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 ccccc cccccccccccccc.</p>
+      </part>
+      <control id="c3.a">
+         <title>Control C3-A</title>
+         <prop name="label" value="tenth"/>
+         <part name="statement" id="c3-stmt">
+            <p>C3 A ccccc cccccccccccccc.</p>
+         </part>
+      </control>
+   </control>
+</catalog>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-broken-import.xml b/src/specifications/profile-resolution/requirement-tests/req-broken-import.xml
new file mode 100644
index 0000000000..86c6a6cfd8
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-broken-import.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/missing-catalog.xml">
+        <include-all/>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-chained-all-asis.xml b/src/specifications/profile-resolution/requirement-tests/req-chained-all-asis.xml
new file mode 100644
index 0000000000..a10fcb9a17
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-chained-all-asis.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-04-18T15:14:17.679398100-04:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <!-- Points to a profile, which must be resolved to produce the catalog   -->
+    <import href="req-include-all-asis.xml">
+        <include-all/>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-chained-deepA.xml b/src/specifications/profile-resolution/requirement-tests/req-chained-deepA.xml
new file mode 100644
index 0000000000..bd62a69304
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-chained-deepA.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-04-18T15:14:17.679398100-04:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <!-- Points to a profile, which must be resolved to produce the catalog   -->
+    <import href="req-include-all-asis.xml">
+        <include-controls with-child-controls="yes">
+            <with-id>a1</with-id>
+            <with-id>b1</with-id>
+            <with-id>c1</with-id>
+            <with-id>c3</with-id>
+        </include-controls>
+    </import>
+    <import href="catalogs/abc-mixed-up_catalog.xml">
+        <include-controls with-child-controls="yes">
+            <with-id>a3</with-id>
+            <with-id>b3</with-id>
+        </include-controls>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-circular_import.xml b/src/specifications/profile-resolution/requirement-tests/req-circular_import.xml
new file mode 100644
index 0000000000..ff0a12a7b3
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-circular_import.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:08.516-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="de92ec95-2f16-4bfb-8d4f-68e8fca078b6">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:39.562-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="req-circular_importer.xml">
+      <include-controls>
+         <with-id>a1</with-id>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-circular_importer.xml b/src/specifications/profile-resolution/requirement-tests/req-circular_importer.xml
new file mode 100644
index 0000000000..8e766511ac
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-circular_importer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:08.516-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="de92ec95-2f16-4bfb-8d4f-68e8fca078b6">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:39.562-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="req-circular_import.xml">
+      <include-controls>
+         <with-id>a1</with-id>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-import-by-resource.xml b/src/specifications/profile-resolution/requirement-tests/req-import-by-resource.xml
new file mode 100644
index 0000000000..f943f2a5a4
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-import-by-resource.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="#449ce77c-24d3-4740-b0bd-1b37239437ff">
+        <include-all/>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+    <back-matter>
+        <resource uuid="449ce77c-24d3-4740-b0bd-1b37239437ff">
+            <rlink href="catalogs/abc-mixed-up_catalog.xml"/>
+        </resource>
+    </back-matter>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-all-asis.xml b/src/specifications/profile-resolution/requirement-tests/req-include-all-asis.xml
new file mode 100644
index 0000000000..69d1c64cf6
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-all-asis.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/abc-mixed-up_catalog.xml">
+        <include-all/>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-all-flat.xml b/src/specifications/profile-resolution/requirement-tests/req-include-all-flat.xml
new file mode 100644
index 0000000000..0ef0dc3d57
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-all-flat.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="b636f129-d980-41c8-95e3-d3649a1fd546">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-02-15T13:33:09.325121-05:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-mixed-up_catalog.xml">
+      <include-all/>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-by-id.xml b/src/specifications/profile-resolution/requirement-tests/req-include-by-id.xml
new file mode 100644
index 0000000000..f6a0a7a1ca
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-by-id.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.58-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="ff18dea5-a79b-4d55-a72a-e65e23a215f3">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:45.684-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls with-child-controls="yes">
+         <with-id>a1</with-id>
+         <with-id>b1</with-id>
+         <with-id>c1</with-id>
+         <with-id>c3</with-id>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-by-match-empty.xml b/src/specifications/profile-resolution/requirement-tests/req-include-by-match-empty.xml
new file mode 100644
index 0000000000..2e08675d5a
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-by-match-empty.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.89-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="3ad7db02-7024-4176-af24-8090182356d5">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:47.217-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls>
+         <matching/>
+         <matching pattern=""/>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-by-match.xml b/src/specifications/profile-resolution/requirement-tests/req-include-by-match.xml
new file mode 100644
index 0000000000..ae3eebf018
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-by-match.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.89-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="3ad7db02-7024-4176-af24-8090182356d5">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:47.217-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls>
+         <matching pattern="a*"/>
+         <matching pattern="?1"/>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude1.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude1.xml
new file mode 100644
index 0000000000..16127a2df0
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.89-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="3ad7db02-7024-4176-af24-8090182356d5">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:47.217-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls>
+         <matching pattern="a*"/>
+         <matching pattern="?1"/>
+      </include-controls>
+      <exclude-controls>
+         <with-id>a1</with-id>
+      </exclude-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude2.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude2.xml
new file mode 100644
index 0000000000..f8bb596091
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.89-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="3ad7db02-7024-4176-af24-8090182356d5">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:47.217-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls>
+         <matching pattern="a*"/>
+      </include-controls>
+      <exclude-controls>
+         <matching pattern="?1"/>
+      </exclude-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude3.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude3.xml
new file mode 100644
index 0000000000..45c32f4187
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude3.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.89-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="3ad7db02-7024-4176-af24-8090182356d5">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:47.217-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls>
+         <matching pattern="a1"/>
+         <matching pattern="b2"/>
+         <matching pattern="c3"/>
+      </include-controls>
+      <exclude-controls>
+         <matching pattern="?1"/>
+      </exclude-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude4.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude4.xml
new file mode 100644
index 0000000000..ad8bf1a3f3
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude4.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.89-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="3ad7db02-7024-4176-af24-8090182356d5">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:47.217-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls with-child-controls="no">
+         <matching pattern="a1"/>
+         <matching pattern="b2"/>
+         <matching pattern="c3"/>
+      </include-controls>
+      <exclude-controls>
+         <matching pattern="?1"/>
+      </exclude-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude5.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude5.xml
new file mode 100644
index 0000000000..55609abb5a
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude5.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.89-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="3ad7db02-7024-4176-af24-8090182356d5">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:47.217-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls with-child-controls="no">
+         <matching pattern="a1"/>
+         <matching pattern="b2"/>
+         <matching pattern="b2"/>
+         <matching pattern="b2"/>
+         <matching pattern="b2"/>
+         <matching pattern="c3"/>
+      </include-controls>
+      <exclude-controls>
+         <matching pattern="?1"/>
+      </exclude-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-loose-params1.xml b/src/specifications/profile-resolution/requirement-tests/req-loose-params1.xml
new file mode 100644
index 0000000000..9b36f9fea0
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-loose-params1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/loose-parameters.xml">
+        <include-all/>
+        <exclude-controls>
+            <with-id>c2</with-id><!-- note parameter c2p should come through -->
+        </exclude-controls>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-loose-params2.xml b/src/specifications/profile-resolution/requirement-tests/req-loose-params2.xml
new file mode 100644
index 0000000000..54098dd455
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-loose-params2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/loose-parameters.xml">
+        <include-all/>
+        <exclude-controls>
+            <with-id>c2</with-id><!-- note parameter c2p should come through -->
+        </exclude-controls>
+    </import>
+    <merge>
+        <flat/>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-merge-keep1.xml b/src/specifications/profile-resolution/requirement-tests/req-merge-keep1.xml
new file mode 100644
index 0000000000..9300226a17
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-merge-keep1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/abc-simple_catalog.xml">
+        <include-all/>
+    </import>
+    <import href="catalogs/abc-mixed-up_catalog.xml">
+        <include-all/>
+    </import>
+    <merge>
+        <combine method="keep"/>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-merge-keep2.xml b/src/specifications/profile-resolution/requirement-tests/req-merge-keep2.xml
new file mode 100644
index 0000000000..9300226a17
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-merge-keep2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/abc-simple_catalog.xml">
+        <include-all/>
+    </import>
+    <import href="catalogs/abc-mixed-up_catalog.xml">
+        <include-all/>
+    </import>
+    <merge>
+        <combine method="keep"/>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-merge-usefirst1.xml b/src/specifications/profile-resolution/requirement-tests/req-merge-usefirst1.xml
new file mode 100644
index 0000000000..3eb6817e8f
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-merge-usefirst1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/abc-simple_catalog.xml">
+        <include-all/>
+    </import>
+    <import href="catalogs/abc-mixed-up_catalog.xml">
+        <include-all/>
+    </import>
+    <merge>
+        <combine method="use-first"/>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-merge-usefirst2.xml b/src/specifications/profile-resolution/requirement-tests/req-merge-usefirst2.xml
new file mode 100644
index 0000000000..6ba138bd28
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-merge-usefirst2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/abc-simple_catalog.xml">
+        <include-all/>
+    </import>
+    <import href="catalogs/abc-mixed-up_catalog.xml">
+        <include-all/>
+    </import>
+    <merge>
+        <combine method="use-first"/>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-missing-resource.xml b/src/specifications/profile-resolution/requirement-tests/req-missing-resource.xml
new file mode 100644
index 0000000000..1f4f255edd
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-missing-resource.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="#449ce77c-24d3-4740-b0bd-1b37239437f0">
+        <include-all/>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+    <back-matter>
+        <resource uuid="449ce77c-24d3-4740-b0bd-1b37239437f0">
+            <rlink href="catalogs/abc-mixed-up_catalog-missing.xml"/>
+        </resource>
+    </back-matter>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-modify-alter-remove-match1.xml b/src/specifications/profile-resolution/requirement-tests/req-modify-alter-remove-match1.xml
new file mode 100644
index 0000000000..ed3296fde0
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-modify-alter-remove-match1.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="b636f129-d980-41c8-95e3-d3649a1fd546">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-02-15T13:33:09.325121-05:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-mixed-up_catalog.xml">
+      <include-all/>
+      <exclude-controls>
+         <matching pattern="b*"/>
+      </exclude-controls>
+   </import>
+   <modify>
+      <alter control-id="a1">
+         <remove by-name="label"/><!-- removes a prop -->
+      </alter>
+      <alter control-id="a2">
+         <remove by-item-name="part"/><!-- removes a part -->
+      </alter>
+      <alter control-id="a3"><!-- leaves a param -->
+         <remove by-item-name="prop"/><!-- removes a part -->
+         <remove by-item-name="part"/><!-- removes a part -->
+      </alter>
+      <alter control-id="c3.a">
+         <remove by-name="label" by-item-name="part"/><!-- should be a no-op -->
+      </alter>
+      <alter control-id="c2">
+         <remove by-id="c2-stmt"/><!-- removed a part -->
+         <remove by-id="c3-stmt"/><!-- should be a no-op -->
+      </alter>
+   </modify>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-modify-alter-remove-match2.xml b/src/specifications/profile-resolution/requirement-tests/req-modify-alter-remove-match2.xml
new file mode 100644
index 0000000000..b0c075292f
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-modify-alter-remove-match2.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="b636f129-d980-41c8-95e3-d3649a1fd546">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-02-15T13:33:09.325121-05:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/busy_catalog.xml">
+      <include-all/>
+      <exclude-controls>
+         <matching pattern="b*"/>
+      </exclude-controls>
+   </import>
+   <modify>
+      <alter control-id="a1">
+         <remove by-name="label"/><!-- removes a prop -->
+         <remove by-name="extra" by-ns="http://csrc.nist.gov/ns/oscal"/><!-- removes three props, leaves one -->
+      </alter>
+      <alter control-id="a2">
+         <remove by-name="label"/><!-- removes a prop -->
+         <remove by-name="extra" by-class="special"/><!-- removes one prop -->
+      </alter>
+      <alter control-id="a3">
+         <remove by-name="label"/><!-- removes a prop -->
+         <remove by-name="extra"/><!-- removes four props -->
+      </alter>
+      <alter control-id="a4">
+         <remove by-name="extra" by-ns="http://somens.url"/><!-- removes one prop-->
+      </alter>
+      <alter control-id="a5">
+         <remove by-ns="http://somens.url"/><!-- removes one prop-->
+      </alter>
+   </modify>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-spoofing-resource.xml b/src/specifications/profile-resolution/requirement-tests/req-spoofing-resource.xml
new file mode 100644
index 0000000000..4261620265
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-spoofing-resource.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!DOCTYPE profile [
+<!ENTITY spoof SYSTEM "spoofed-resource.xml"> ]>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="#449ce77c-24d3-4740-b0bd-1b37239437f0">
+        <include-all/>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+    <back-matter>
+        &spoof;
+    </back-matter>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-structure-asis1.xml b/src/specifications/profile-resolution/requirement-tests/req-structure-asis1.xml
new file mode 100644
index 0000000000..6b504ebadb
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-structure-asis1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/abc-crazy_catalog.xml">
+        <include-all/>
+        <exclude-controls with-child-controls="yes">
+            <with-id>c3</with-id><!-- should also drop its group -->
+        </exclude-controls>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-structure-asis2.xml b/src/specifications/profile-resolution/requirement-tests/req-structure-asis2.xml
new file mode 100644
index 0000000000..a485bdb1be
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-structure-asis2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="0a281290-eb91-423f-9430-576e8099cae4">
+    <metadata>
+        <title>Test Profile</title>
+        <last-modified>2022-02-14T17:44:59.245623-05:00</last-modified>
+        <version>1.0</version>
+        <oscal-version>1.0.0</oscal-version>
+    </metadata>
+    <import href="catalogs/abc-crazy_catalog.xml">
+        <include-all/>
+        <exclude-controls>
+            <with-id>c3</with-id><!-- should keep descendant controls -->
+            <matching pattern="b*"/><!-- should drop group -->
+        </exclude-controls>
+    </import>
+    <merge>
+        <as-is>true</as-is>
+    </merge>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-no.xml b/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-no.xml
new file mode 100644
index 0000000000..4223dd4b53
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-no.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.58-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="ff18dea5-a79b-4d55-a72a-e65e23a215f3">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:45.684-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls with-child-controls="no">
+         <with-id>a1</with-id>
+         <with-id>b1</with-id>
+         <with-id>c1</with-id>
+         <with-id>c3</with-id>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-none.xml b/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-none.xml
new file mode 100644
index 0000000000..3874fd3cb0
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-none.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.58-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="ff18dea5-a79b-4d55-a72a-e65e23a215f3">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2020-05-30T14:39:45.684-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls>
+         <with-id>a1</with-id>
+         <with-id>b1</with-id>
+         <with-id>c1</with-id>
+         <with-id>c3</with-id>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-no1.xml b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-no1.xml
new file mode 100644
index 0000000000..6925264970
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-no1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.58-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="4909dc72-134f-42d1-bca7-8a48978cd3ce">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-26T16:46:04.8198642-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls with-parent-controls="yes" with-child-controls="yes">
+         <with-id>c3</with-id>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-none.xml b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-none.xml
new file mode 100644
index 0000000000..e911c6ef89
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-none.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.58-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="8f921ee8-e1ef-49c5-a286-2617808e5303">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-26T17:19:08.8113625-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls>
+         <with-id>c3.a</with-id>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes1.xml b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes1.xml
new file mode 100644
index 0000000000..eefb32678e
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.58-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="6007afa0-bf97-4113-a94c-9652c2438245">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-26T17:09:44.5371952-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls with-parent-controls="yes" with-child-controls="yes">
+         <with-id>c3.a</with-id>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes2.xml b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes2.xml
new file mode 100644
index 0000000000..6c73c9c3a5
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:09.58-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="6007afa0-bf97-4113-a94c-9652c2438245">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-26T17:09:44.5371952-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="catalogs/abc-simple_catalog.xml">
+      <include-controls with-parent-controls="yes" with-child-controls="no">
+         <with-id>c3.a</with-id>
+      </include-controls>
+   </import>
+</profile>
diff --git a/src/specifications/profile-resolution/requirement-tests/spoofed-resource.xml b/src/specifications/profile-resolution/requirement-tests/spoofed-resource.xml
new file mode 100644
index 0000000000..31b577d67e
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/spoofed-resource.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource uuid="449ce77c-24d3-4740-b0bd-1b37239437f0">
+  <rlink href="catalogs/abc-mixed-up_catalog.xml"/>
+</resource>
diff --git a/src/specifications/profile-resolution/requirements-extract.xsl b/src/specifications/profile-resolution/requirements-extract.xsl
new file mode 100644
index 0000000000..0ae67df614
--- /dev/null
+++ b/src/specifications/profile-resolution/requirements-extract.xsl
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:math="http://www.w3.org/2005/xpath-functions/math"
+    exclude-result-prefixes="xs math"
+   xpath-default-namespace="http://csrc.nist.gov/ns/oscal/specml"
+   version="3.0">
+    
+    <xsl:output indent="true"/>
+    
+    <xsl:template match="/*">
+        <xsl:copy>
+            <xsl:apply-templates select="//req"/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <xsl:template match="req" >
+        <requirement>
+            <xsl:copy-of select="@*"/>
+            <xsl:where-populated>
+                <text>
+                    <xsl:apply-templates/>
+                </text>
+            </xsl:where-populated>
+            <xsl:apply-templates select="eg" mode="eg"/>
+        </requirement>
+    </xsl:template>
+    
+    <xsl:template match="eg"/>
+        
+    
+    <xsl:template match="eg" mode="eg">
+        <xsl:variable name="status" select="ready"/>
+        <test>
+            <xsl:apply-templates select="@href"/>
+            <xsl:if test="starts-with(.,'PENDING')">
+                <xsl:attribute name="status">pending</xsl:attribute>
+            </xsl:if>
+            <xsl:apply-templates/>
+        </test>
+    </xsl:template>
+    
+    <xsl:template match="@href">
+        <xsl:attribute name="file" select="."/>
+    </xsl:template>
+    
+    <xsl:template match="xref">
+        <xsl:apply-templates select="key('by-id',@rid)" mode="title"/>
+    </xsl:template>
+    
+    <xsl:key name="by-id" match="*" use="@id"/>
+    
+    <xsl:template match="*" mode="title">
+        <xsl:value-of select="head"/>
+    </xsl:template>
+    
+    <xsl:template match="text()">
+        <xsl:value-of select="replace(.,'\s+',' ')"/>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/resolution-testing.xml b/src/specifications/profile-resolution/resolution-testing.xml
new file mode 100644
index 0000000000..f6955e9e33
--- /dev/null
+++ b/src/specifications/profile-resolution/resolution-testing.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="lib/spec-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-model href="lib/specml.rnc" type="application/relax-ng-compact-syntax"?>
+
+<!-- Edit this PI for checking up on test bindings -->
+<?specml-spec profile-resolution-specml.xml?>
+<TESTSETS xmlns="http://csrc.nist.gov/ns/oscal/specml">
+   <requirement level="recommended" id="req-phase-order">
+      <statement>It is strongly RECOMMENDED that implementations execute the following steps in the order that they are provided here (import, merge, modify).</statement>
+      <test status="pending">PENDING test design</test>
+   </requirement>
+   <requirement level="must" id="req-uri-resolve">
+      <statement>Tools MUST resolve URIs by following Section 5 of RFC3986, with the exception of URI Fragments (URIs that start with "#"). URI Fragments MUST instead be resolved as defined in Internal References.</statement>
+      <test file="requirement-tests/req-include-all-asis.xml">relative URI</test>
+   </requirement>
+   <requirement level="must" id="req-uri-aquire">
+      <statement>Tools MUST acquire resources at the resolved URI by following Section 5 of RFC3986, with the exception of URI Fragments (URIs that start with "#"). URI Fragments MUST instead be acquired as defined in Internal References. </statement>
+      <test file="requirement-tests/req-import-by-resource.xml">via internal reference to resource/rlink</test>
+   </requirement>
+   <requirement level="must" id="req-uri-base">
+      <statement>For the purposes of resolving URIs using the above specification, the Base URI MUST be considered to be the absolute URI of the containing profile.</statement>
+      <test file="requirement-tests/req-include-all-asis.xml">URI base corresponds to document URI</test>
+   </requirement>
+   <requirement level="must" id="req-uri-error">
+      <statement>In the case that acquiring a resource fails, the tool MUST cease processing and provide an error. In order to ensure profile resolution results in the same catalog regardless of which tool resolves it, all imports must successfully resolve. While this may cause inconvenience if resources are frequently not available, it ensures interoperability.</statement>
+      <test file="requirement-tests/req-missing-resource.xml" status="pending">PENDING rebase over latest from galtm missing resource</test>
+   </requirement>
+   <requirement level="must" id="req-internal">
+      <statement>In the context of the Import Phase, internal references will only appear as a reference to a profile or catalog that is in the resources section of the source. When tools encounter such a reference, they MUST locate the object in resources with the matching UUID value, and resolve the resource. By OSCAL model requirements, a given resource can have zero to many rlink objects and zero to one base64 objects; however, it must have at least one of the two present. Tools can assume that any of these each resolves to the same underlying OSCAL object, although potentially in different serialization formats. For deterministic resolution of these backmatter OSCAL objects, tools need to adhere to the following requirements: </statement>
+      <test file="requirement-tests/req-import-by-resource.xml"/>
+   </requirement>
+   <requirement level="may" id="req-internal-resolve1">
+      <statement>Tools MAY use any of the rlink or base64 objects present in the resource.</statement>
+      <test status="pending">PENDING test design (support for either/both base64 and rlink)</test>
+   </requirement>
+   <requirement level="may" id="req-internal-resolve2">
+      <statement>Tools MAY verify that each above objects resolves to the same underlying OSCAL object. If there are OSCAL Model content differences between the resolved objects, the tool SHOULD provide a warning. </statement>
+      <test status="pending">PENDING test design (correspondence of base64 and rlink-nominated objects)</test>
+   </requirement>
+   <requirement level="must" id="req-internal-resolve3">
+      <statement>When a rlink is encountered and is to be resolved, it MUST be resolved by using a HTTP request to retrieve a byte stream. </statement>
+      <test status="pending">PENDING test design (retrieval)</test>
+   </requirement>
+   <requirement level="must" id="req-internal-resolve4">
+      <statement>When a base64 is encountered and is to be resolved, it MUST be considered a Byte Stream.</statement>
+      <test status="pending">PENDING test design (base64 integrity)</test>
+   </requirement>
+   <requirement level="must" id="req-internal-resolve5">
+      <statement>Regardless of its source, the Byte Stream MUST be decoded based on the algorithm defined in  Section 4 RFC 4648. </statement>
+      <test status="pending">PENDING test design (base64 integrity)</test>
+   </requirement>
+   <requirement level="must" id="req-internal-error">
+      <statement>If the object fetched cannot be found or is not a valid OSCAL object, the tool MUST cease processing and provide an error.</statement>
+      <test file="requirement-tests/req-missing-resource.xml" status="pending">PENDING rebase over latest from galtm</test>
+      <test file="requirement-tests/req-broken-import.xml" status="pending">PENDING rebase over latest from galtm</test>
+   </requirement>
+   <requirement level="must" id="req-circular-resolve">
+      <statement>If the resource acquired is an OSCAL Profile, the tool MUST apply this specification to resolve it, then continue processing having imported the resulting catalog.</statement>
+      <test file="requirement-tests/req-chained-all-asis.xml" status="pending">PENDING chained profiles</test>
+   </requirement>
+   <requirement level="should" id="req-resolve-profile">
+      <statement>When a profile imports a profile, the subordinate profile SHOULD be resolved first into a catalog using this specification, before it is imported. </statement>
+      <test file="requirement-tests/req-chained-all-asis.xml" status="pending">PENDING chained profiles</test>
+      <test file="requirement-tests/req-chained-deepA.xml" status="pending">PENDING [bug repair] chained profile merged with controls from its own source catalog</test>
+   </requirement>
+   <requirement level="must" id="req-circular-error">
+      <statement>If a processor encounters a circular import as described above (self-imports are inherently circular), the processor MUST cease processing and generate an error. </statement>
+      <test file="requirement-tests/req-circular_import.xml" status="pending">PENDING circular import detection</test>
+   </requirement>
+   <requirement id="rq-mulitple-imports">
+      <statement>Note that this occurs even if the same catalog is imported multiple times: each distinct import collects controls into a separate selection</statement>
+      <test file="requirement-tests/req-chained-deepA.xml" status="pending">PENDING chained profiles</test>
+   </requirement>
+   <requirement id="rq-multiple-merge">
+      <statement>The control inclusions are combined and collapsed in the next phase of processing</statement>
+      <test file="requirement-tests/req-chained-deepA.xml" status="pending">PENDING chained profiles</test>
+   </requirement>
+   <requirement level="must" id="req-include-all">
+      <statement> When an import provides the include-all directive, ALL controls and groups in the referenced document (including nested controls) MUST be included. </statement>
+      <test file="requirement-tests/req-include-all-asis.xml"/>
+      <test file="requirement-tests/req-include-all-flat.xml"/>
+   </requirement>
+   <requirement level="must" id="req-include-by-id">
+      <statement>When an import provides the include-controls directive, with a with-id child, all controls in the referenced document whose id match one of the listed id values MUST be included. </statement>
+      <test file="requirement-tests/req-include-by-id.xml"/>
+   </requirement>
+   <requirement level="must" id="req-include-by-match">
+      <statement>When an import provides the include-controls directive, with a matching child, all controls in the referenced document whose id matches one of the listed pattern values (Glob matching) MUST be included. </statement>
+      <test file="requirement-tests/req-include-by-match.xml"/>
+   </requirement>
+   <requirement level="must" id="req-include-by-match-empty">
+      <statement>If a matching object is provided with no pattern, it MUST be treated as matching nothing. While not providing a pattern is technically valid, resolution tool implementers should be aware that it is generally undesirable, and warnings or notices to the user may be appropriate. </statement>
+      <test file="requirement-tests/req-include-by-match-empty.xml"/>
+   </requirement>
+   <requirement level="must" id="req-with-child-controls-yes">
+      <statement>A with-child-controls: yes directive on an include-controls indicates that all descendant controls of the included control MUST also be included. </statement>
+      <test file="requirement-tests/req-include-by-id.xml"/>
+   </requirement>
+   <requirement level="must" id="req-with-child-controls-no">
+      <statement>A with-child-controls: no directive on an include-controls indicates that ONLY the matching control is included, any descendant children MUST NOT be included. </statement>
+      <test file="requirement-tests/req-with-child-controls-no.xml"/>
+   </requirement>
+   <requirement level="must" id="req-with-child-controls-none">
+      <statement>If no with-child-controls is provided, the processor MUST consider the directive as being equivalent to one having with-child-controls:no. </statement>
+      <test file="requirement-tests/req-with-child-controls-none.xml"/>
+   </requirement>
+   <requirement level="must" id="req-with-parent-controls-yes">
+      <statement>A with-parent-controls: yes directive on an include-controls indicates that all parent controls of the included control MUST also be included.</statement>
+      <test file="requirement-tests/req-with-parent-controls-yes1.xml">PR https://github.com/usnistgov/OSCAL/pull/1207</test>
+      <test file="requirement-tests/req-with-parent-controls-yes2.xml">PR https://github.com/usnistgov/OSCAL/pull/1207</test>
+   </requirement>
+   <requirement level="must" id="req-with-parent-controls-no">
+      <statement>A with-parent-controls: no directive on an include-controls indicates that ONLY the matching control is included, any parent MUST NOT be included. </statement>
+      <test file="requirement-tests/req-with-parent-controls-no1.xml"
+            status="pending">PENDING PR https://github.com/usnistgov/OSCAL/pull/1207</test>
+   </requirement>
+   <requirement level="must" id="req-with-parent-controls-none">
+      <statement>If no with-parent-controls is provided, the processor MUST consider the directive as being equivalent to one having with-parent-controls:yes. </statement>
+      <test file="requirement-tests/req-with-parent-controls-none.xml">Neither setting is given</test>
+   </requirement>
+   <requirement level="must" id="req-exclude">
+      <statement>Any control designated to be both included and excluded, MUST be excluded. This holds irrespective of the specificity of the selection for inclusion or exclusion.</statement>
+      <test file="requirement-tests/req-include-exclude1.xml"/>
+      <test file="requirement-tests/req-include-exclude2.xml"/>
+      <test file="requirement-tests/req-include-exclude3.xml"/>
+   </requirement>
+   <requirement level="must" id="req-exclude-additional">
+      <statement>When exclude-controls has at least one with-ids or matching directive, the processor MUST follow the same rules as defined in the relevant sections above for these directives, but exclude instead of include any controls. All optional features (with-child-controls, etc.) also apply to exclusion directives. </statement>
+      <test file="requirement-tests/req-include-exclude4.xml"/>
+   </requirement>
+   <requirement level="must" id="req-redundant">
+      <statement>A given import may have any number of inclusion statements and any number of exclusion statements. Their effect is cumulative; any control that is included (or excluded) more than once MUST be considered to be included (or excluded) only once. In other words, a given control being included or excluded more than once has no effect. Exclusion still takes priority over inclusion (see above). </statement>
+      <test file="requirement-tests/req-include-exclude4.xml"/>
+   </requirement>
+   <requirement level="must" id="req-loose-param">
+      <statement>All loose params from both imported documents and the profile source MUST be included. These params will be kept in the final output if the document contains any references to them, and discarded otherwise. See Pruning and Ordering.</statement>
+      <test file="requirement-tests/req-loose-params1.xml"/>
+   </requirement>
+   <requirement level="recommended" id="req-merge-order">
+      <statement>It is RECOMMENDED that tools apply the "combine" directive to the intermediate generated by the Import phase first, then apply the "structuring" directive.</statement>
+      <test status="pending">PENDING is this testable?</test>
+   </requirement>
+   <requirement level="must" id="req-merge-combine">
+      <statement>Note that "merge: combine" is deprecated, and MUST be considered undefined behavior when encountered.</statement>
+      <test status="pending">PENDING specification</test>
+   </requirement>
+   <requirement level="must" id="req-merge-none">
+      <statement> If no merge directive is given in the profile, or if a merge is given without a combine, merge conflicts MUST be treated as if method: keep was given. </statement>
+      <test file="requirement-tests/keep-everything-twice.xml"/>
+   </requirement>
+   <requirement level="must" id="req-merge-keep">
+      <statement>When a merge is indicated by method:keep, or when no merge directive is given, the keepcombination rule is used. Any control with the same distinctive ID Distinct ID of ObjectsMUST NOT not merged. (They are kept.) </statement>
+      <test file="requirement-tests/req-merge-keep1.xml"/>
+      <test file="requirement-tests/req-merge-keep2.xml"/>
+   </requirement>
+   <requirement level="should" id="req-merge-keep-warning">
+      <statement>Processors SHOULD provide a warning under the merge:keep directive when duplicate controls are detected.</statement>
+      <test file="requirement-tests/req-merge-keep1.xml"/>
+      <test file="requirement-tests/req-merge-keep2.xml"/>
+   </requirement>
+   <requirement level="may" id="req-merge-keep-error">
+      <statement>The processor MAY throw an error and cease processing (short-circuiting a certain future error) when duplicate controls are detected under the merge:keep directive.</statement>
+      <test file="requirement-tests/req-merge-keep1.xml"/>
+      <test file="requirement-tests/req-merge-keep2.xml"/>
+   </requirement>
+   <requirement level="must" id="req-merge-use-first">
+      <statement>When the "use-first"combination rule is applied, and controls that share a distinctive ID are found, the first control encountered MUST be kept, the rest MUST be discarded. "First" MUST be determined by a top-down, depth-first traversal of the source profile's import hierarchy. </statement>
+      <test file="requirement-tests/req-merge-usefirst1.xml"/>
+      <test file="requirement-tests/req-merge-usefirst2.xml"/>
+   </requirement>
+   <requirement level="must" id="req-stucture">
+      <statement>Optionally, one of three "structuring" directives can be included as a child of merge: flat, as-isand custom. When one of these appears, it is the selected structuring directive. If more than one appears, processors MUST generate an error and cease processing.</statement>
+      <test status="pending">PENDING how do we test this?</test>
+   </requirement>
+   <requirement level="must" id="req-structure-none">
+      <statement>If no merge directive is given in the profile, or if a merge is given without a structuring directive, structuring the output MUST be treated as if the structuring directive flat was given. For example, a profile with no merge directive: </statement>
+      <test file="requirement-tests/req-include-all-flat.xml"/>
+   </requirement>
+   <requirement level="must" id="req-merge-flat">
+      <statement>Profiles with the "flat" merge directive MUST be resolved as unstructured catalogs, with no grouping or nesting of controls.</statement>
+      <test file="requirement-tests/req-include-all-flat.xml"/>
+   </requirement>
+   <requirement level="must" id="req-merge-flat-list">
+      <statement>Unstructured catalog output MUST be produced by adhering to the following requirements:</statement>
+   </requirement>
+   <requirement level="must" id="req-merge-flat-list-1">
+      <statement>All included controls are output to the target as a flat list directly under "catalog". </statement>
+      <test file="requirement-tests/req-include-all-flat.xml"/>
+   </requirement>
+   <requirement level="must" id="req-merge-flat-list-2">
+      <statement>Any included "loose params" are output to the target as a flat list directly under "catalog".</statement>
+      <test file="requirement-tests/req-loose-params2.xml"/>
+   </requirement>
+   <requirement level="must" id="req-merge-flat-list-3">
+      <statement>Any groups are discarded.</statement>
+      <test file="requirement-tests/req-include-all-flat.xml"/>
+      <test file="requirement-tests/req-loose-params2.xml"/>
+   </requirement>
+   <requirement level="must" id="id-structure-as-is-list">
+      <statement>Processors MUST handle the as-is directive by adhering to the following requirements:</statement>
+   </requirement>
+   <requirement level="must" id="id-structure-as-is-list-1">
+      <statement>All included controls are output to the target, keeping the structure of the groups and nested controls. Any group that holds an included control MUST appear in the output with all of its non-control children intact. If an included control has a parent control that was not included, that control's output location is "up-leveled", or made equal to the non-included parent. This applies recursively until the control is directly under either "catalog" or another included control.</statement>
+   </requirement>
+   <requirement level="must" id="id-structure-as-is-list-2">
+      <statement>Any included "loose params" are output to the target as a flat list directly under "catalog".</statement>
+   </requirement>
+   <requirement level="must" id="req-custom-group">
+      <statement>A groupobject given under custom MUST result in a group with the exact same content (excluding insert-controls) in the target catalog. </statement>
+   </requirement>
+   <requirement level="must" id="req-custom-group-contents">
+      <statement>If the ID of the group matches the ID of a group that has been included during the import phase, all contents inside the group, including title, param, prop and part objects MUST be copied into the target, appearing in the same order as in the source. </statement>
+   </requirement>
+   <requirement level="must" id="req-custom-select">
+      <statement>When processing the control selection of a custom element, the behavior defined in this section MUST be followed to generate the output.</statement>
+   </requirement>
+   <requirement level="must" id="req-custom-select-ignore">
+      <statement>In the case that a control selection matches none of the included controls, it MUST be ignored.</statement>
+   </requirement>
+   <requirement level="should" id="req-custom-select-warning">
+      <statement>In the case that a control selection matches none of the included controls, a warning SHOULD be provided.</statement>
+   </requirement>
+   <requirement level="should" id="req-modify-set-param-warning">
+      <statement>If no such parameter is found, a warning SHOULD be issued.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-set-param-id-ignore">
+      <statement>If no such parameter is found, processing MUST still continue.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-set-param-objects1">
+      <statement>For the following objects inside the source: class, depends-on, label, usage, values, select; the object MUST be copied into the target from the source, first removing any existing objects with the same name.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-set-param-objects2">
+      <statement>For the following objects inside the source: props, links, constraints, guidelines; the contents of the object MUST be added to the contents of the target object of the same name. If no such object exists in the target, it is created.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-set-param-objects3">
+      <statement>For the following objects inside the source: prop, link; the object MUST be copied into the target from the source, first removing any existing objects with the same distinctive ID. (Distinct ID of Objects).</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-param-multi">
+      <statement>If more than one set-parameter directive is given for the same parameter, all MUST BE applied, in the sequence given in the profile.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-implicit">
+      <statement>An add directive with no by-id child MUST be considered an implicit binding, and will apply to the control as a whole.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-implicit0contents">
+      <statement>The contents of an implicitly bound add directive MUST be added to the control contents in the target, either after its title when position is starting, or at the end if its position is ending, or if no valid position is given.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-implicit-position">
+      <statement>When an add directive is implicitly bound, the position values before and after MUST be treated like starting and ending, respectively.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-implicit-order">
+      <statement>After processing an implicitly bound add directive, the control contents MUST be sorted to appear in the required order: a new prop appears after any prop already in the control, when position is ending, or not given, or before any prop in the control when position is starting.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-explicit">
+      <statement>An add directive with a by-id child MUST be considered an explicit binding, and applies to only a single object inside the control.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-explicit-id">
+      <statement>When an add directive is explicitly bound, the value of the by-id child MUST correspond to the value of an id on an object inside the control, and not the control itself.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-explicit-id-ignore">
+      <statement>If by-id does not correspond to such a value, the add directive MUST be considered inoperative and ignored.</statement>
+   </requirement>
+   <requirement level="may" id="req-modify-alter-add-explicit-id-warning">
+      <statement>An inoperative add directive MAY result in a warning.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-explicit-inside">
+      <statement>When position has a value of startingor ending, the contents of the source MUST be added inside the target, either at the start or end of its contents, respectively.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-explicit-outside">
+      <statement>When position has a value of before or after, the contents of the source MUST be added outside the target, either directly before or after it, respectively.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-add-nested">
+      <statement>Profile resolution tools MUST be able to correctly handle add directives targetting nested controls. This includes directives that target a child control as well as directives that target a parent control and modify the child. </statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-remove-match">
+      <statement> An object inside the control MUST be removed from the output if and only if it meets all of the criteria given by the child objects of the remove directive.</statement>
+      <test file="requirement-tests/req-modify-alter-remove-match1.xml"/>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-remove-by-id">
+      <statement>The remove directive criteria by-id MUST match an object if and only if its value is identical to the id value of that object.</statement>
+      <test file="requirement-tests/req-modify-alter-remove-match1.xml"/>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-remove-name-ref">
+      <statement>The remove directive criteria name-ref MUST match an object if and only if its value is identical to the value of that object's name child.</statement>
+      <test file="requirement-tests/req-modify-alter-remove-match1.xml"/>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-remove-ns-ref">
+      <statement>The remove directive criteria ns-ref MUST match an object if and only if its value is identical to the value of that object's ns child.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-remove-class-ref">
+      <statement>The remove directive criteria class-ref MUST match an object if and only if its value is identical to the value of that object's class child.</statement>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-remove-item-name">
+      <statement>The remove directive criteria item-name MUST match an object if and only if its value is identical to the value of that object's serialized name.</statement>
+      <test file="requirement-tests/req-modify-alter-remove-match1.xml"/>
+   </requirement>
+   <requirement level="must" id="req-modify-alter-remove-item-name-array">
+      <statement>In serialization formats that use arrays of objects in the OSCAL model, an object's name MUST be referenced as singular form of its containing parent array. </statement>
+   </requirement>
+   <requirement level="must" id="req-backmatter">
+      <statement>The output's backmatter MUST be generated by copying in each resource object from the backmatters of the imported catalogs/profiles in top-to-bottom order, then by copying in each resource object from the backmatter of the source profile itself. These objects MUST be processed in the order they are defined in each respective document.</statement>
+   </requirement>
+   <requirement level="must" id="req-backmatter-dupe">
+      <statement>If a given resource has the same uuid as a resource that has already been added, the previous resource MUST be removed, and the more recent one added, unless superseded by other requirements.</statement>
+   </requirement>
+   <requirement level="must" id="req-backmatter-keep">
+      <statement>A resource with a child prop of name:keep and value:always MUST NOT be replaced by the addition of another resource, unless the new resource also has a child prop of name:keep and value:always.</statement>
+   </requirement>
+   <requirement level="may" id="req-backmatter-prune">
+      <statement>Tools MAY check for pruning conditions Pruning and Ordering as resources are added as long as the final result is the same as if the pruning had taken place at the end of all resource addition.</statement>
+   </requirement>
+   <requirement level="must" id="req-meta-uuid">
+      <statement>The output catalog's metadata MUST have a unique top-level UUID (metadata:uuid). This UUID MAY be generated as seen fit by the tool, as long as it is reasonable to assume it is globally unique. It is RECOMMENDED that tools use a Version 4 UUID as specified in Section 4 of RFC 4122. </statement>
+   </requirement>
+   <requirement level="must" id="req-meta-version">
+      <statement>The value of metadata:version in the target MUST be set with a string that identifies the version of that document.</statement>
+   </requirement>
+   <requirement level="should" id="req-meta-version-track">
+      <statement>The metadata:version SHOULD be used to track updates to this specific output document.</statement>
+   </requirement>
+   <requirement level="must" id="req-meta-oscal-version">
+      <statement>The value of metadata:oscal-version in the target MUST be set with a string that identifies the version of OSCAL used by this tool to resolve the profile (ex. 1.0.0). This value MUST be determined by compiling the oscal-versions from each imported document and the source profile, and taking the most recent minor version. If this version is more recent than what the resolution tool is using, then the value of oscal-version MUST be the version that the tool used internally.</statement>
+      <test status="pending">PENDING https://github.com/usnistgov/OSCAL/issues/1313</test>
+   </requirement>
+   <requirement level="must" id="req-meta-oscalversion-error">
+      <statement>If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing.</statement>
+   </requirement>
+   <requirement level="must" id="req-meta-last-modified">
+      <statement>The value of metadata:last-modified in the target MUST be set with a valid timestamp representing the time the profile resolution completed.</statement>
+      <test status="pending">PENDING develop an external (XPath) test</test>
+   </requirement>
+   <requirement level="should" id="req-meta-source-profile">
+      <statement>A child prop object with name:source-profile MUST be created. The value object of this prop SHOULD be set with a valid URI that points to the profile that resulted in this catalog. </statement>
+   </requirement>
+   <requirement level="may" id="req-meta-source-profile-privacy">
+      <statement> If there are privacy or security concerns, the value object of this prop MAY be set to anything, in which case the simple existence of the source-profile property indicates that this is a resolved profile.</statement>
+   </requirement>
+   <requirement level="should" id="req-meta-resolution-tool">
+      <statement>A child prop object with name:resolution-tool SHOULD be created. The value object of this prop in the target SHOULD be set with a string that represents the tool that was used to resolve this catalog.</statement>
+   </requirement>
+   <requirement level="must" id="req-meta-keep">
+      <statement>For any metadata:roles or metadata:parties that exist in the source catalogs, if they have a prop child with name:keep and value:always, they are to be copied as is into the output metadata.</statement>
+   </requirement>
+   <requirement level="should" id="req-prune">
+      <statement>The processor SHOULD prune the resulting output catalog by removing unused objects.</statement>
+      <test file="requirement-tests/req-modify-alter-remove-match2.xml"/>
+   </requirement>
+   <requirement level="must" id="req-prune-keep">
+      <statement>Any object that has a child prop with a name of "keep" and a value of "always" MUST NOT be pruned.</statement>
+      <test file="requirement-tests/req-modify-alter-remove-match2.xml"/>
+   </requirement>
+   <requirement level="must" id="req-prune-include">
+      <statement>If an object was explicitly included in the Including Controls, it MUST NOT be pruned.</statement>
+      <test status="pending">PENDING How to test? isn't this just selection semantics</test>
+   </requirement>
+   <requirement level="must" id="req-prune-custom">
+      <statement>If an object was referenced in a custom section of the source profile, it MUST NOT be pruned.</statement>
+      <test status="pending">PENDING clarification</test>
+   </requirement>
+   <requirement level="must" id="req-prune-modify">
+      <statement>If an object was referenced in the modify section of the source profile, it MUST NOT be pruned. Any objects removed in that section are still removed.</statement>
+      <test status="pending">PENDING clarification</test>
+   </requirement>
+   <requirement level="must" id="req-prune-ref">
+      <statement>If the object appears in a reference anywhere in the final result catalog, except in other objects that also meet all other pruning criteria, it MUST NOT be removed. A reference to a given object exists if #{distinctiveID} appears anywhere, where {distinctiveID} is the distinctive ID of the object Distinct ID of Objects.</statement>
+      <test status="pending">PENDING clarification</test>
+   </requirement>
+   <requirement level="must" id="req-reorder">
+      <statement>Tools MUST reorder the output catalog into canonical order Order of objects in serialization, except where this specification provides different ordering requirements.</statement>
+      <test status="pending">PENDING how do we test?</test>
+   </requirement>
+   <requirement level="must" id="req-id-id">
+      <statement>For the objects control, param, and group, distinctiveness MUST be determined by the value of the "id" child object.</statement>
+      <test status="pending">PENDING how do we test? Query outputs for duplicate IDs? Example docs?</test>
+   </requirement>
+   <requirement level="must" id="req-id-uuid">
+      <statement>For the object resource, distinctiveness MUST be determined by the value of the "uuid" Backmatter Resolution.</statement>
+      <test status="pending">PENDING how do we test? Query outputs for duplicate UUIDs? Example docs?</test>
+   </requirement>
+   <requirement level="should" id="req-multiformat">
+      <statement>Profile Resolution tools SHOULD be able to handle source profiles, imported catalogs, and imported profiles that are serialized in XML, JSON, or YAML.</statement>
+      <test status="pending">PENDING how do we test?</test>
+   </requirement>
+   <requirement level="must" id="req-multiformat-differ">
+      <statement>A different serialization format of any given input MUST NOT result in a differing output catalog.</statement>
+      <test status="pending">PENDING how do we test?</test>
+   </requirement>
+   <requirement level="must" id="req-output-xml">
+      <statement>The final Catalog output, if using XML, MUST be valid as defined by the XML model documentation for the OSCAL Catalog. See the complete XML reference for model requirements.</statement>
+      <test status="pending">PENDING how do we test?</test>
+   </requirement>
+   <requirement level="must" id="req-output-json">
+      <statement>The final Catalog output, if using JSON, MUST be valid as defined by the JSON model documentation for the OSCAL Catalog. See the complete JSON reference for model requirements. </statement>
+      <test status="pending">PENDING how do we test?</test>
+   </requirement>
+   <requirement level="must" id="req-output-yaml">
+      <statement>The final Catalog output, if using YAML, MUST be valid as defined by the JSON model documentation for the OSCAL Catalog. </statement>
+      <test status="pending">PENDING how do we test?</test>
+   </requirement>
+   <requirement level="must" id="req-order">
+      <statement>When the output format is XML, tools MUST use the OSCAL canonical order as described above. When using the YAML or JSON formats, order conveys no meaning, and is not considered important.</statement>
+      <test status="pending">PENDING how do we test this?</test>
+   </requirement>
+</TESTSETS>
diff --git a/src/specifications/profile-resolution/spec-checkup.sch b/src/specifications/profile-resolution/spec-checkup.sch
deleted file mode 100644
index bf2c4034a6..0000000000
--- a/src/specifications/profile-resolution/spec-checkup.sch
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2"
-    xmlns:sqf="http://www.schematron-quickfix.com/validator/process">
-
-    <sch:ns uri="http://csrc.nist.gov/ns/oscal/specml" prefix="os"/>
-
-    <sch:pattern>
-        <sch:rule context="os:section">
-            <sch:assert test="count(ancestor::os:section) lt 5">section is too deep</sch:assert>
-        </sch:rule>
-    </sch:pattern>
-</sch:schema>
diff --git a/src/specifications/profile-resolution/unit-tests.xsd b/src/specifications/profile-resolution/unit-tests.xsd
new file mode 100644
index 0000000000..c746b134a0
--- /dev/null
+++ b/src/specifications/profile-resolution/unit-tests.xsd
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://csrc.nist.gov/ns/metaschema/test-suite/1.0"
+    targetNamespace="http://csrc.nist.gov/ns/metaschema/test-suite/1.0" elementFormDefault="qualified">
+  <xs:include schemaLocation="metaschema-datatypes.xsd"/>
+  
+  <xs:element name="test-suite">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="test-collection" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="test-collection">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="test-scenario" maxOccurs="unbounded"/>
+      </xs:sequence>
+      <xs:attribute name="location" type="URIReferenceDatatype" use="required"/>
+      <xs:attribute name="name" type="StringDatatype" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="test-scenario">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="example-description" type="xs:string" minOccurs="0"
+          maxOccurs="1"/>
+        <xs:element name="addresses-requirement"  minOccurs="0"
+          maxOccurs="unbounded">
+          <xs:complexType mixed="true">
+            <xs:attribute name="requirement-id" type="StringDatatype" use="required"/>
+          </xs:complexType>
+          
+        </xs:element>
+        <xs:choice>
+          <xs:sequence>
+            <xs:element ref="generate-schema"/>
+            <xs:element name="validation-case" type="ContentCaseType" minOccurs="0"
+              maxOccurs="unbounded"/>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element ref="resolve-profile"/>
+            <xs:element name="expected-resolution" type="SourceCaseType" minOccurs="0"
+              maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="name" type="StringDatatype" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="generate-schema">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="metaschema"/>
+        <xs:element name="generation-case" type="GenerationCaseType" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+      <xs:attribute name="generation-result" type="GenerationResultType" default="SUCCESS"/>
+      <xs:attribute name="validation-result" type="ValidationResultType" default="VALID"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="resolve-profile">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="profile-source" type="SourceCaseType" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="metaschema">
+    <xs:complexType>
+      <xs:attribute name="location" type="URIReferenceDatatype" use="required"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name="SourceCaseType">
+    <xs:attribute name="source-format" use="required" type="FormatType"/>
+    <xs:attribute name="location" type="URIReferenceDatatype" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="ContentCaseType">
+    <xs:complexContent>
+      <xs:extension base="SourceCaseType">
+        <xs:attribute name="validation-result" type="ValidationResultType" default="VALID"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="GenerationCaseType">
+    <xs:complexContent>
+      <xs:extension base="SourceCaseType">
+        <xs:attribute name="match-result" type="MatchResultType" default="MATCH"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:simpleType name="GenerationResultType">
+    <xs:restriction base="TokenDatatype">
+      <xs:enumeration value="SUCCESS">
+        <xs:annotation>
+          <xs:documentation>Generation succeeded.</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="FAILURE">
+        <xs:annotation>
+          <xs:documentation>Generation resulted in failure caused by some error.</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+    </xs:restriction>
+  </xs:simpleType>
+  
+  <xs:simpleType name="FormatType">
+    <xs:restriction base="TokenDatatype">
+      <xs:enumeration value="XML">
+        <xs:annotation>
+          <xs:documentation>Content is XML.</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="JSON">
+        <xs:annotation>
+          <xs:documentation>Content is JSON.</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="YAML">
+        <xs:annotation>
+          <xs:documentation>Content is YAML.</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+    </xs:restriction>
+  </xs:simpleType>
+  
+  <xs:simpleType name="MatchResultType">
+    <xs:restriction base="TokenDatatype">
+      <xs:enumeration value="MATCH">
+        <xs:annotation>
+          <xs:documentation>The actual content matched the expectect content.</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="MISMATCH">
+        <xs:annotation>
+          <xs:documentation>The actual content did not match the expectect content.</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+    </xs:restriction>
+  </xs:simpleType>
+  
+  <xs:simpleType name="ValidationResultType">
+    <xs:restriction base="TokenDatatype">
+      <xs:enumeration value="VALID">
+        <xs:annotation>
+          <xs:documentation>Validation succeeded.</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="INVALID">
+        <xs:annotation>
+          <xs:documentation>Validation resulted in failure caused by some content defect or error.</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>
diff --git a/src/utils/util/resolver-pipeline/message-handler.xsl b/src/utils/util/resolver-pipeline/message-handler.xsl
new file mode 100644
index 0000000000..7b0420fbb7
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/message-handler.xsl
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+    xmlns:mh="http://csrc.nist.gov/ns/message"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="#all"
+    version="3.0">
+    
+    <xsl:template name="mh:message-handler">
+        <xsl:param name="text" as="xs:string"/>
+        <xsl:param name="message-type" as="xs:string?"/><!-- e.g., 'Error', 'Warning' -->
+        <xsl:param name="error-code" as="xs:string?"/>
+        <xsl:param name="terminate" as="xs:boolean" select="false()"/>
+        <xsl:message expand-text="yes" terminate="{$terminate}">{
+            string-join(($message-type, $error-code, $text),': ')
+            }</xsl:message>
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl b/src/utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl
index 025a5785a9..e4ba2066ba 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:u="http://csrc.nist.gov/ns/uuid"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     exclude-result-prefixes="#all"
-    xmlns:javaUUID="java.util.UUID"
-    xmlns:r="http://csrc.nist.gov/ns/random"
     xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 
     <!--
@@ -22,8 +21,10 @@
 
     <xsl:output method="xml" indent="yes"/>
 
-    <xsl:import href="random-util.xsl"/>
-    
+    <!-- uuid-method-choice.xsl has global parameters
+        $uuid-method, $top-uuid, and $uuid-service. -->
+    <xsl:import href="uuid-method-choice.xsl"/>
+
     <xsl:strip-space
         elements="catalog group control param guideline select part
         metadata back-matter annotation party person org rlink address resource role responsible-party citation
@@ -35,43 +36,19 @@
 
     <xsl:param name="trace" as="xs:string">off</xsl:param>
     
-    <!-- Provide a top-level UUID for the result catalog as $assign-uuid,
-         or assign-uuid=make-uuid for a native (XSLT 3.0) function call. -->
-    <xsl:param name="assign-uuid" as="xs:string?"/>
-    <!-- Alternatively, call a web site if the processor supports it -->
-    <xsl:param name="uuid-service" select="'https://www.uuidgenerator.net/api/version4'"/>
-    
-    <!-- For checking a UUID before assigning it. -->
-    <xsl:variable name="uuid-v4-regex" as="xs:string">^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$</xsl:variable>
-    
     <xsl:param name="uri-stack" as="xs:anyURI*" select="()"/>
-
-    <xsl:variable name="use-uuid" as="xs:string">
-        <xsl:choose>
-            <xsl:when test="matches($assign-uuid,$uuid-v4-regex)">
-                <xsl:sequence select="$assign-uuid"/>
-            </xsl:when>
-            <xsl:when use-when="function-available('random-number-generator')" test="$assign-uuid = 'make-uuid'">
-                <!-- seed splices a timestamp with a given @uuid -->
-                <xsl:sequence select="r:make-uuid( /*/@uuid || '-' || replace( string(current-dateTime()),'\D','') )"/>
-            </xsl:when>
-            <xsl:when use-when="function-available('javaUUID:randomUUID')" test="function-available('javaUUID:randomUUID')">
-                <xsl:sequence select="javaUUID:randomUUID()"/>
-            </xsl:when>
-            <xsl:when test="unparsed-text-available($uuid-service)">
-                <xsl:sequence select="unparsed-text($uuid-service)"/>
-            </xsl:when>
-            <xsl:otherwise>00000000-0000-4000-B000-000000000000</xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
-
+    
     <!-- $path-to-source should point back to the location of the source catalog (or profile) from its result,
          so '..' is appropriate when writing results down a directory. -->
     <xsl:param name="path-to-source" as="xs:string?"/>
 
     <xsl:variable name="louder" select="$trace = 'on'"/>
 
-    <xsl:param name="home" select="/"/>
+    <xsl:variable name="home" select="/"/>
+
+    <!-- If true, do not record profile URI in output catalog's source-profile
+        metadata, due to privacy or security concerns. -->
+    <xsl:param name="hide-source-profile-uri" as="xs:boolean" select="false()"/>
 
     <!-- The $transformation-sequence declares transformations to be applied in order. -->
     <xsl:variable name="transformation-sequence">
@@ -109,8 +86,10 @@
     <xsl:template mode="opr:provide-parameters" match="opr:transform"/>
     
     <xsl:template mode="opr:provide-parameters" match="opr:transform[.='oscal-profile-resolve-metadata.xsl']">
-        <!-- Since the fallback is not a valid URI the processor will try Java -->
-        <xsl:map-entry key="QName('','assign-uuid')" select="$use-uuid"/>
+        <xsl:map-entry key="QName('','top-uuid-computed')">
+            <xsl:call-template name="u:determine-uuid"/>
+        </xsl:map-entry>
+        <xsl:map-entry key="QName('','hide-source-profile-uri')" select="$hide-source-profile-uri"/>
     </xsl:template>
     
     <!-- for opr:transformation, the semantics are "apply this XSLT" -->
diff --git a/src/utils/util/resolver-pipeline/oscal-profile-resolve-merge.xsl b/src/utils/util/resolver-pipeline/oscal-profile-resolve-merge.xsl
index d6464f5506..89099f6f9f 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-resolve-merge.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-resolve-merge.xsl
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
     xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:mh="http://csrc.nist.gov/ns/message"
     xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -9,8 +10,10 @@
     exclude-result-prefixes="xs math o opr"
     xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0" >
 
-    <!-- XSLT 2.0 so as to validate against XSLT 3.0 constructs -->
+    <xsl:import href="message-handler.xsl"/>
 
+    <xsl:variable name="in_xspec" as="xs:boolean" select="false()"/>
+    <xsl:variable name="true-content" as="xs:string+" select="('true','1')"/>
 
     <xsl:template match="* | @*" mode="#all">
         <xsl:copy copy-namespaces="no">
@@ -25,34 +28,43 @@
             templates not this one. -->
     </xsl:template>
 
-    <xsl:template match="catalog" priority="2">
+    <!-- If there is no selection and no merge (i.e., we don't reach one of
+        the higher-priority templates that match catalog), pass the catalog
+        through unchanged. -->
+    <xsl:template match="catalog" priority="2" as="element(catalog)">
         <xsl:copy-of select="."/>
     </xsl:template>
 
-    <xsl:template match="catalog[exists(selection)]" priority="10">
+    <!-- If there is a selection but neither merge/as-is nor merge/custom,
+        use flat structuring. -->
+    <xsl:template match="catalog[exists(selection)]" priority="10" as="element(catalog)">
         <catalog>
             <xsl:apply-templates select="@*"/>
             <xsl:apply-templates select="metadata"/>
             <xsl:apply-templates select="selection"/>
             <xsl:apply-templates select="modify"/>
-            <xsl:for-each-group select="back-matter/* | selection/back-matter/*" group-by="true()">
+            <xsl:where-populated>
                 <back-matter>
-                    <xsl:copy-of select="current-group()"/>
+                    <xsl:sequence select="back-matter/* | selection/back-matter/*"/>
                 </back-matter>
-            </xsl:for-each-group>
+            </xsl:where-populated>
         </catalog>
     </xsl:template>
 
-    <xsl:template priority="12" match="catalog[merge/as-is=('true','1')]">
+    <!-- If there is a merge/as-is directive, we go down that branch.
+        If there is also a merge/custom directive, we apply the
+        higher-priority template instead of this one. -->
+    <xsl:template match="catalog[merge/as-is=$true-content]" priority="12" as="element(catalog)">
+        <xsl:call-template name="detect-multiple-structuring-directives"/>
         <catalog>
             <xsl:apply-templates select="@*"/>
             <xsl:apply-templates select="metadata"/>
             <xsl:variable name="merged-selections">
-            <xsl:call-template name="o:merge-groups-as-is">
-                <xsl:with-param name="merging" select="selection"/>
-            </xsl:call-template>
+                <xsl:call-template name="o:merge-groups-as-is">
+                    <xsl:with-param name="merging" select="selection"/>
+                </xsl:call-template>
             </xsl:variable>
-            <!-- not copying the selection elements only their contents -->
+            <!-- not copying the selection elements, only their contents -->
             <xsl:for-each select="$merged-selections/selection">
                 <xsl:sequence select="* except back-matter"/>
             </xsl:for-each>
@@ -64,7 +76,8 @@
 
 
     <!-- If there is a merge/custom directive, we go down that branch. -->
-    <xsl:template priority="13" match="catalog[exists(merge/custom)]">
+    <xsl:template match="catalog[exists(merge/custom)]" priority="13" as="element(catalog)">
+        <xsl:call-template name="detect-multiple-structuring-directives"/>
         <catalog>
             <xsl:apply-templates select="@*"/>
             <xsl:apply-templates select="metadata"/>
@@ -77,18 +90,34 @@
         </catalog>
     </xsl:template>
 
-    <xsl:template name="combine-back-matter">
-        <xsl:variable name="here" select="self::catalog"/>
-        <xsl:for-each-group select="back-matter/* | selection/back-matter/*" group-by="true()">
+    <xsl:template name="detect-multiple-structuring-directives" as="empty-sequence()">
+        <xsl:context-item as="element(catalog)" use="required"/>
+        <xsl:variable name="flat" as="element(flat)*" select="merge/flat[.=$true-content]"/>
+        <xsl:variable name="as-is" as="element(as-is)*" select="merge/as-is[.=$true-content]"/>
+        <xsl:variable name="custom" as="element(custom)*" select="merge/custom"/>
+        <xsl:if test="count($flat) + count($as-is) + count($custom) gt 1">
+            <xsl:call-template name="mh:message-handler">
+                <xsl:with-param name="text">Found multiple structuring directives. Choose at most one from: flat (default), as-is, custom.</xsl:with-param>
+                <xsl:with-param name="message-type">Error</xsl:with-param>
+                <xsl:with-param name="terminate" select="true()"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="combine-back-matter" as="element(back-matter)?">
+        <xsl:context-item as="element(catalog)" use="required"/>
+        <xsl:where-populated>
             <back-matter>
                 <!-- Using combination logic on back matter elements. -->
-                <xsl:for-each-group select="current-group()" group-by="(@opr:id,@id,generate-id())[1]">
+                <xsl:for-each-group select="back-matter/* | selection/back-matter/*" group-by="(@opr:id,@uuid,generate-id())[1]">
                     <xsl:call-template name="combine-elements">
-                        <xsl:with-param name="who" select="current-group()"/>
+                        <!-- Take last one in group because of spec
+                            requirement id="req-backmatter-dupe". -->
+                        <xsl:with-param name="who" select="current-group()[last()]" as="element(resource)"/>
                     </xsl:call-template>
                 </xsl:for-each-group>
             </back-matter>
-        </xsl:for-each-group>
+        </xsl:where-populated>
     </xsl:template>
 
     <xsl:template match="selection">
@@ -96,64 +125,58 @@
         <xsl:apply-templates select="control | .//group/control"/>
     </xsl:template>
 
-    <xsl:key name="control-by-id" match="control" use="@id"/>
-
-    <xsl:template match="node() | @*" mode="o:custom-merge">
-        <xsl:copy>
-            <xsl:apply-templates mode="#current" select="node() | @*"/>
-        </xsl:copy>
-    </xsl:template>
-
+    <!-- Process children but do not copy <custom> tags themselves. -->
     <xsl:template match="custom" mode="o:custom-merge">
         <xsl:apply-templates mode="#current"/>
     </xsl:template>
 
+    <!-- Apply the requested ordering.
+        Creating the properly combined sequence of inserted controls
+        is in downstream template. -->
     <xsl:template match="insert-controls" mode="o:custom-merge">
-        <xsl:variable name="inserted-controls">
+        <xsl:variable name="inserted-controls" as="element()*">
             <xsl:apply-templates mode="#current"/>
         </xsl:variable>
         <xsl:variable name="keep-order" select="not(@order = ('descending','ascending'))" as="xs:boolean"/>
         <xsl:variable name="sort-order" select="@order[.='descending'],'ascending'"/>
         <!-- Setting sort-key to '1' sorts into given order -->
-        <xsl:perform-sort  select="$inserted-controls">
-                <xsl:sort select="if ($keep-order) then '1' else @control-id"/>
+        <xsl:perform-sort select="$inserted-controls">
+            <xsl:sort select="if ($keep-order) then '1' else @id" 
+                order="{$sort-order[1]}"/>
         </xsl:perform-sort>
     </xsl:template>
 
-    <xsl:template match="include-controls" mode="o:custom-merge">
-        <xsl:variable name="match-patterns" select="matching/@pattern"/>
-        <xsl:call-template name="combine-elements">
-            <xsl:with-param name="who" select="key('control-by-id', with-id),
-                /*/selection//control[some $p in ($match-patterns) satisfies (matches(@id,o:glob-as-regex(string($p))))]"/>
-        </xsl:call-template>
-    </xsl:template>
+    <xsl:include href="select-or-custom-merge.xsl"/>
 
-    <xsl:template match="include-all" mode="o:custom-merge">
-        <xsl:variable name="match-patterns" select="matching/@pattern"/>
+    <!-- Combine selected controls.
+        Creating the sequence of controls ($who) is in code shared with
+        selection phase. -->
+    <xsl:template match="include-all | include-controls" mode="o:custom-merge">
+        <xsl:variable name="who" as="element(o:control)*">
+            <xsl:apply-templates select="ancestor::*[last()]//selection" mode="o:select">
+                <xsl:with-param tunnel="yes" name="import-instruction" select="ancestor::insert-controls"/>
+            </xsl:apply-templates>
+        </xsl:variable>
         <xsl:call-template name="combine-elements">
-            <xsl:with-param name="who" select="//control"/>
+            <xsl:with-param name="who" select="$who"/>
         </xsl:call-template>
     </xsl:template>
 
-    <xsl:include href="oscal-profile-resolve-functions.xsl"/>
+    <!-- No-op because exclusion logic is handled in the code shared with
+            selection phase. -->
+    <xsl:template match="exclude-controls" mode="o:custom-merge"/>
 
-    <!--<xsl:template match="with-id">
-        <xsl:call-template name="combine-elements">
-            <xsl:with-param name="who" select="key('control-by-id', @control-id)"/>
-        </xsl:call-template>
+    <!-- In o:select mode, process children of selection or group to reach
+        controls, which are handled in select-or-custom-merge.xsl. -->
+    <xsl:template match="selection | selection//group" mode="o:select">
+        <xsl:apply-templates select="group | control" mode="#current"/>
     </xsl:template>
 
-    <xsl:template match="matching" mode="o:custom-merge">
-        <xsl:variable name="p" select="@pattern"/>
-        <xsl:call-template name="combine-elements">
-            <xsl:with-param name="who" select="/*/selection//control[matches(@id,$p)]"/>
-        </xsl:call-template>
-    </xsl:template>-->
-
     <xsl:template name="o:merge-groups-as-is">
-        <xsl:param name="merging" select="()"/>
+        <xsl:context-item as="element()" use="optional"/>
+        <xsl:param name="merging" select="()" as="element()*"/>
         <xsl:for-each-group select="$merging" group-by="(@uuid,@opr:id,@id,generate-id())[1]">
-            <xsl:variable name="merged" select="current-group()"/>
+            <xsl:variable name="merged" select="current-group()" as="element()+"/>
             <xsl:for-each select="$merged[1]">
                 <xsl:copy copy-namespaces="no">
                     <xsl:apply-templates select="$merged/@*"/>
@@ -177,6 +200,7 @@
     </xsl:template>
 
     <xsl:template name="combine-elements">
+        <xsl:context-item as="element()" use="required"/>
         <xsl:param name="who" as="element()*"/>
         <xsl:apply-templates select="ancestor-or-self::catalog" mode="o:combine-elements">
             <xsl:with-param name="elements" select="$who"/>
@@ -194,15 +218,26 @@
         <!-- All the elements coming in have the same name but different opr:id
              we operate on controls and parameters (not groups or group contents otherwise) -->
         <!-- further, we assume all controls or all parameters -->
-        <xsl:if test="$elements/name() != $elements/name()">
-            <opr:error> ... elements of different types combining ...</opr:error></xsl:if>
+        <xsl:variable name="uri-qualified-name" as="function(*)"
+            select="function($node as element()) as xs:string {
+                'Q{' || namespace-uri($node) || '}' || local-name($node)
+            }"/>
+        <xsl:variable name="element-names" as="xs:string*"
+            select="$elements ! $uri-qualified-name(.)"/>
+        <xsl:if test="$element-names != $element-names">
+            <!-- If we get here for a valid profile, it is an XSLT bug rather than a user error. -->
+            <xsl:call-template name="mh:message-handler">
+                <xsl:with-param name="text">Combining elements of different types is not supported.</xsl:with-param>
+                <xsl:with-param name="message-type">Error</xsl:with-param>
+                <xsl:with-param name="terminate" select="$in_xspec"/>
+            </xsl:call-template>
+        </xsl:if>
         <xsl:for-each-group select="$elements" group-by="(@opr:id,@id,generate-id())[1]">
-            <xsl:variable name="merged" select="current-group()"/>
+            <xsl:variable name="merged" select="current-group()" as="element()+"/>
             <xsl:for-each select="$merged[1]">
                 <xsl:copy copy-namespaces="no">
                     <xsl:apply-templates select="$merged/@*"/>
                     <xsl:apply-templates select="$merged/*"/>
-
                 </xsl:copy>
             </xsl:for-each>
         </xsl:for-each-group>
@@ -219,7 +254,7 @@
         <xsl:apply-templates select="$elements"/>
     </xsl:template>
 
-<!-- Scrubbing opr:id values on the way out - we don't need them. -->
+    <!-- Scrubbing opr:id values on the way out - we don't need them. -->
     <xsl:template match="@opr:id"/>
 
 </xsl:stylesheet>
diff --git a/src/utils/util/resolver-pipeline/oscal-profile-resolve-metadata.xsl b/src/utils/util/resolver-pipeline/oscal-profile-resolve-metadata.xsl
index 2f45c909bd..da67371d88 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-resolve-metadata.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-resolve-metadata.xsl
@@ -6,29 +6,53 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:math="http://www.w3.org/2005/xpath-functions/math"
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
-    exclude-result-prefixes="xs math o opr"
+    xmlns:u="http://csrc.nist.gov/ns/uuid"
+    exclude-result-prefixes="xs math o opr u"
     xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0" >
-
+    
     <!-- XSLT 2.0 so as to validate against XSLT 3.0 constructs -->
+    
+    <!-- How to specify top-level UUID for result catalog:
+
+        a) When oscal-profile-RESOLVE.xsl invokes this transform,
+        it passes in a precomputed value for $top-uuid-computed.
+
+        b) Any other caller of this transform should pass in
+        $uuid-method and, if applicable, $top-uuid and $uuid-service,
+        but not $top-uuid-computed. As a result, this transform
+        will compute $top-uuid-computed.
+        -->
+
+    <!-- uuid-method-choice.xsl has global parameters
+        $uuid-method, $top-uuid, and $uuid-service. -->
+    <xsl:import href="uuid-method-choice.xsl"/>
+
+    <!-- Top-level UUID for result catalog. -->
+    <xsl:param name="top-uuid-computed"  as="xs:string">
+        <xsl:call-template name="u:determine-uuid"/>
+    </xsl:param>
 
     <xsl:param name="profile-origin-uri">urn:UNKNOWN</xsl:param>
 
-    <!-- Accepts a uuid as $assign-uuid, or provides a dummy UUID. A calling application can provide a 'random' UUID.  -->
-    <xsl:param name="assign-uuid"  as="xs:string?"/>
-    
-    <xsl:variable name="uuid-v4-regex" as="xs:string">^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$</xsl:variable>
+    <!-- If true, do not record profile URI in output catalog's source-profile
+        metadata, due to privacy or security concerns. This parameter is
+        passed from oscal-profile-RESOLVE.xsl and the end user can override it. -->
+    <xsl:param name="hide-source-profile-uri" as="xs:boolean" select="false()"/>
     
-    <xsl:variable name="use-uuid" as="xs:string"
-        select="( $assign-uuid[matches(.,$uuid-v4-regex)], '00000000-0000-4000-B000-000000000000' )[1]"/>
-       
-    <xsl:template match="* | @*" mode="#all">
+    <!-- Version of this resolution tool -->
+    <xsl:variable name="tool-oscal-version" as="xs:string" select="'1.1.0'"/>
+
+    <xsl:variable name="source-profile" as="xs:string"
+        select="if ($hide-source-profile-uri) then 'profile' else $profile-origin-uri"/>
+
+    <xsl:template match="/ | * | @*" mode="#all">
         <xsl:copy>
             <xsl:apply-templates mode="#current" select="node() | @*"/>
         </xsl:copy>
     </xsl:template>
 
     <xsl:template match="profile" priority="1">
-        <catalog uuid="{ $use-uuid }">
+        <catalog uuid="{ $top-uuid-computed }">
             <!-- Rewriting top-level @id -->
             <!--<xsl:if test="function-available('uuid:randomUUID')" xmlns:uuid="java:java.util.UUID">
                 <xsl:attribute name="uuid" select="uuid:randomUUID()"/>
@@ -38,12 +62,13 @@
     </xsl:template>
 
     <xsl:template match="profile/metadata">
-        <xsl:variable name="leaders" select="(title | published | last-modified | version | oscal-version | doc-id)"/>
+        <xsl:variable name="leaders" select="(title | published | last-modified | version | oscal-version | document-id)"/>
         <xsl:copy>
             <xsl:apply-templates mode="#current" select="@*"/>
             <xsl:apply-templates mode="#current" select="$leaders"/>
             <xsl:apply-templates mode="#current" select="prop"/>
-            <link href="{$profile-origin-uri}" rel="resolution-source"/>
+            <prop name="resolution-tool" value="OSCAL Profile Resolver XSLT Pipeline OPRXP"/>
+            <link href="{$source-profile}" rel="source-profile"/>
             <xsl:apply-templates mode="#current" select="* except ($leaders | prop)"/>
             <!--<xsl:apply-templates select="../selection" mode="imported-metadata"/>-->
         </xsl:copy>
@@ -55,13 +80,34 @@
         </xsl:copy>
     </xsl:template>
 
+    <xsl:template match="profile/metadata/oscal-version">
+        <xsl:copy>
+            <xsl:sequence select="opr:oscal-version(
+                .,
+                ancestor::profile/selection/metadata/oscal-version/normalize-space(),
+                $tool-oscal-version
+                )"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <!-- If there is a common major version among all inputs,
+        return the most recent minor version or the tool version,
+        whichever is earlier.
+        If there is no common major version, return fatal error. -->
+    <xsl:function name="opr:oscal-version" as="xs:string">
+        <xsl:param name="source" as="xs:string"/>
+        <xsl:param name="imported" as="xs:string*"/>
+        <xsl:param name="tool" as="xs:string"/>
+        <xsl:value-of select="'TODO: Not implemented yet'"/>
+    </xsl:function>
+
     <!--<xsl:template match="selection" mode="imported-metadata">
         <resource id="{@id}-RESOURCE" rel="imported">
             <xsl:copy-of select="metadata/title" copy-namespaces="no"/>
             <rlink href="{@opr:src}"/>
         </resource>
     </xsl:template>-->
-
+    
     <xsl:template match="selection/metadata"/>
-
+    
 </xsl:stylesheet>
diff --git a/src/utils/util/resolver-pipeline/oscal-profile-resolve-select.xsl b/src/utils/util/resolver-pipeline/oscal-profile-resolve-select.xsl
index f4654e1009..52ea10a3b2 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-resolve-select.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-resolve-select.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
     xmlns="http://csrc.nist.gov/ns/oscal/1.0"
     xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
@@ -10,7 +10,7 @@
     xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 
     <!-- Purpose: perform operations supporting the selection stage of OSCAL profile resolution. -->
-    <!-- XSLT version: 2.0 -->
+    <!-- XSLT version: 3.0 -->
 
     <xsl:strip-space elements="catalog group control param guideline select part
         metadata back-matter annotation party person org rlink address resource role responsible-party citation
@@ -83,7 +83,6 @@
         </metadata>
     </xsl:template>-->
 
-    <xsl:key name="cross-reference" match="resource" use="'#' || @id"/>
     <xsl:key name="cross-reference" match="resource" use="'#' || @uuid"/>
 
     <xsl:template priority="2" mode="o:select" match="import[starts-with(@href,'#')]">
@@ -94,7 +93,16 @@
 
     <xsl:template match="resource" mode="o:import">
         <xsl:variable name="linked-xml" select="child::rlink[ends-with(@href,'.xml') or matches(@media-type,'xml')][1]"/>
-        <xsl:apply-templates mode="o:select" select="o:resource-or-warning($linked-xml/@href)"/>
+        <xsl:choose>
+            <xsl:when test="exists($linked-xml)">
+                <xsl:apply-templates mode="o:select" select="o:resource-or-error($linked-xml/@href)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message terminate="yes"
+                    expand-text="yes">Document not acquired for resource with uuid {@uuid
+                    }: No rlink with media-type='xml' or href ending with '.xml'</xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
     <xsl:template priority="1" mode="o:select" match="import">
@@ -104,7 +112,7 @@
         <xsl:apply-templates select="$linked-resource" mode="o:import">
             <xsl:with-param name="import-instruction" select="." tunnel="yes"/>
         </xsl:apply-templates>
-        <xsl:apply-templates mode="#current" select="o:resource-or-warning(@href)">
+        <xsl:apply-templates mode="#current" select="o:resource-or-error(@href)">
             <xsl:with-param name="import-instruction" select="." tunnel="yes"/>
         </xsl:apply-templates>
     </xsl:template>
@@ -118,29 +126,6 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template name="add-process-id">
-        <xsl:attribute name="opr:id" namespace="http://csrc.nist.gov/ns/oscal/profile-resolution">
-            <xsl:value-of
-                select="concat(opr:catalog-identifier(/o:catalog), '#', (@id, generate-id())[1])"/>
-        </xsl:attribute>
-    </xsl:template>
-
-    <xsl:function name="opr:catalog-identifier" as="xs:string">
-        <xsl:param name="catalog" as="element(o:catalog)"/>
-        <xsl:sequence select="$catalog/(@uuid,document-uri(root(.)))[1]"/>
-    </xsl:function>
-
-    <!-- A control is included if it is selected by the provided import instruction -->
-    <xsl:template match="control" mode="o:select">
-        <xsl:param name="import-instruction" tunnel="yes" required="yes"/>
-        <xsl:if test="o:selects($import-instruction,.)">
-            <xsl:copy copy-namespaces="no">
-                <xsl:call-template name="add-process-id"/>
-                <xsl:apply-templates mode="#current" select="node() | @*"/>
-            </xsl:copy>
-        </xsl:if>
-    </xsl:template>
-
     <!-- Parameters are always passed through until later stages. -->
     <xsl:template match="param" mode="o:select">
         <xsl:copy copy-namespaces="no">
@@ -161,68 +146,17 @@
         </xsl:if>
     </xsl:template>-->
 
-    <!-- Function o:selects($importing,$candidate) returns a true or false
-         depending on whether the import calls the candidate control  -->
-
-<!-- @with-child-controls='yes' is recursive - given on a control it brings all control descendants, not only children   -->
-    <xsl:function name="o:selects" as="xs:boolean">
-        <xsl:param name="importing" as="element(o:import)"/>
-        <xsl:param name="candidate" as="element(o:control)"/>
-        <xsl:variable name="include-reasons" as="xs:boolean+">
-<!-- we are not optimizing for performance here; nothing is done to prevent all checks even if the first passes -->
-            <!--<xsl:sequence select="empty($importing/include)"/>-->
-            <xsl:sequence select="exists($importing/include-all)"/>
-            <xsl:sequence select="some $c in ($importing/include-controls/with-id)
-                                  satisfies ($c = $candidate/@id)"/>
-            <xsl:sequence select="some $c in ($importing/include-controls[o:calls-children(.)]/with-id)
-                satisfies ($c = $candidate/ancestor::control/@id)"/>
-            <xsl:sequence select="some $m in ($importing/include-controls/matching)
-                                  satisfies (matches($candidate/@id,$m/@pattern/o:glob-as-regex(string(.)) ))"/>
-            <xsl:sequence select="some $m in ($importing/include/matching[o:calls-children(.)])
-                satisfies (matches($candidate/ancestor::control/@id,$m/@pattern/o:glob-as-regex(string(.))))"/>
-        </xsl:variable>
-        <xsl:variable name="exclude-reasons" as="xs:boolean+">
-            <xsl:sequence select="exists($candidate/parent::control) and $importing/include-all/@with-child-controls='no'"/>
-            <xsl:sequence select="some $c in ($importing/exclude-controls/with-id) satisfies ($c = $candidate/@id)"/>
-            <xsl:sequence select="some $c in ($importing/exclude-controls[o:calls-children(.)]/with-id)
-                satisfies ($c = $candidate/ancestor::control/@id)"/>
-            <xsl:sequence select="some $m in ($importing/exclude-controls/matching)
-                satisfies (matches($candidate/@id,$m/@pattern/o:glob-as-regex(string(.))))"/>
-            <xsl:sequence select="some $m in ($importing/exclude-controls[o:calls-children(.)]/matcjomg)
-                satisfies (matches($candidate/ancestor::control/@id,$m/@pattern/o:glob-as-regex(string(.))))"/>
-        </xsl:variable>
-        <!-- predicate [.] filters reasons as booleans -->
-        <xsl:sequence select="exists($include-reasons[.]) and empty($exclude-reasons[.])"/>
-    </xsl:function>
-
-    <xsl:function name="o:calls-children" as="xs:boolean">
-        <xsl:param name="caller" as="element()"/>
-        <xsl:sequence select="$caller/@with-child-controls='yes'"/>
-    </xsl:function>
-
-    <!-- Returns a document when found, a <opr:warning> element when not. -->
-    <xsl:function name="o:resource-or-warning" as="document-node()">
+    <!-- Returns a document when found, a fatal error when not. -->
+    <xsl:function name="o:resource-or-error" as="document-node()">
         <xsl:param name="href" as="attribute(href)"/>
         <xsl:variable name="resolved-href" select="resolve-uri($href,$href/base-uri())"/>
-        <xsl:choose>
-            <xsl:when test="doc-available($resolved-href)">
-                <xsl:sequence select="document($resolved-href)"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:document>
-                    <opr:WARNING>
-                        <xsl:text>Document not acquired: '</xsl:text>
-                        <xsl:value-of select="$href"/>
-                        <xsl:text>' resolved as '</xsl:text>
-                        <xsl:value-of select="$resolved-href"/>
-                        <xsl:text>' (as OSCAL XML)</xsl:text>
-                    </opr:WARNING>
-                </xsl:document>
-            </xsl:otherwise>
-        </xsl:choose>
+        <xsl:assert test="doc-available($resolved-href)"
+            expand-text="yes">Document not acquired: {$href} resolved as {
+            $resolved-href} (as OSCAL XML)</xsl:assert>
+        <xsl:sequence select="document($resolved-href)"/>
     </xsl:function>
 
-    <xsl:include href="oscal-profile-resolve-functions.xsl"/>
+    <xsl:include href="select-or-custom-merge.xsl"/>
 
     <xsl:function name="o:resolve-profile">
         <xsl:param name="profile" as="element(profile)"/>
@@ -237,7 +171,7 @@
         <xsl:variable name="runtime" as="map(xs:string, item())">
             <xsl:map>
                 <xsl:map-entry key="'xslt-version'"        select="3.0"/>
-                <xsl:map-entry key="'stylesheet-location'" select="'../oscal-profile-RESOLVE.xsl'"/>
+                <xsl:map-entry key="'stylesheet-location'" select="'oscal-profile-RESOLVE.xsl'"/>
                 <xsl:map-entry key="'source-node'"         select="root($profile)"/>
                 <xsl:map-entry key="'stylesheet-params'"   select="$runtime-params"/>
             </xsl:map>
diff --git a/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl b/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl
index a423068823..612b5507db 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl
@@ -3,7 +3,8 @@
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     exclude-result-prefixes="#all"
-    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0"
+    default-mode="scrubbing">
 
     <!--
 
diff --git a/src/utils/util/resolver-pipeline/random-util.xsl b/src/utils/util/resolver-pipeline/random-util.xsl
index 25e7701df8..3fe4bdd665 100644
--- a/src/utils/util/resolver-pipeline/random-util.xsl
+++ b/src/utils/util/resolver-pipeline/random-util.xsl
@@ -27,8 +27,8 @@ v4 UUID
     -->
     <xsl:output indent="yes"/>
 
-    <!-- set $germ to a string for reproducible outputs of r:make-uuid-sequence
-         pass in a blind value - and don't save it - for irreproducible outputs -->
+    <!-- Set $germ to a string for reproducible outputs of r:make-uuid.
+         Pass in a blind value - and don't save it - for irreproducible outputs. -->
 
     <xsl:param name="germ" select="current-dateTime() || document-uri(/)"/>
 
@@ -49,49 +49,64 @@ v4 UUID
         </randomness>
     </xsl:template>
 
-    <xsl:function name="r:make-uuid-sequence" as="xs:string*">
+    <!-- r:make-uuid produces one v4 UUID. Output is repeatable for a given seed.
+         If the random-number-generator() function is not available,
+         this function returns an empty sequence. -->
+    <xsl:function name="r:make-uuid" as="xs:string?">
         <xsl:param name="seed" as="item()"/>
-        <xsl:param name="length" as="xs:integer"/>
-        <xsl:sequence use-when="function-available('random-number-generator')" select="r:produce-uuid-sequence($length,random-number-generator($seed))"/>
-    </xsl:function>
-
-    <xsl:function name="r:produce-uuid-sequence" as="xs:string*">
-        <xsl:param name="length" as="xs:integer"/>
-        <xsl:param name="PRNG" as="map(xs:string, item())"/>
-        <xsl:if test="$length gt 0">
-            <xsl:sequence select="string($PRNG?number) => r:make-uuid()"/>
-            <xsl:sequence select="r:produce-uuid-sequence($length - 1, $PRNG?next())"/>
-        </xsl:if>
+        <xsl:sequence select="r:make-uuid-sequence($seed, 1)"/>
     </xsl:function>
 
-    <!-- make-uuid produces a UUID for a given seed - the same UUID every time for the same seed -->
-    <xsl:function name="r:make-uuid" as="xs:string?">
+    <!-- r:make-uuid-sequence produces a sequence of $seq-length v4 UUIDs.
+         Output is repeatable for a given seed. If the random-number-generator()
+         function is not available, this function returns an empty sequence. -->
+    <xsl:function name="r:make-uuid-sequence" as="xs:string*">
         <xsl:param name="seed" as="item()"/>
-        <xsl:sequence use-when="function-available('random-number-generator')" select="r:produce-uuid($uuid-v4-template, random-number-generator($seed))"/>
+        <xsl:param name="seq-length" as="xs:integer"/>
+        <xsl:variable name="uuid-v4-template" as="xs:string">________-____-4___-=___-____________</xsl:variable>
+        <!--                                                 a847eaab-cec8-41bd-98e2-02d02900b554            -->
+        <xsl:sequence select="r:make-random-string-sequence($seed, $seq-length, $uuid-v4-template)"/>
     </xsl:function>
 
-    <!--$template is a string to serve as a template for the UUID syntax
-        $PRNG is a pseudo-random-number generator produced by fn:random-number-generator() -->
-    <xsl:function name="r:produce-uuid" as="xs:string">
+    <!-- r:make-random-string-sequence produces a sequence of $seq-length strings.
+         The $template parameter specifies the pattern of characters in each
+         string, where:
+           * '_' becomes a random hex value 0-9a-f
+           * '=' becomes one of '8','9','a','b' at random
+           * Any other character is copied to the output string
+         Output is repeatable for a given seed. If the random-number-generator()
+         function is not available, this function returns an empty sequence. -->
+    <xsl:function name="r:make-random-string-sequence" as="xs:string*">
+        <xsl:param name="seed" as="item()"/>
+        <xsl:param name="seq-length" as="xs:integer"/>
         <xsl:param name="template" as="xs:string"/>
-        <xsl:param name="PRNG" as="map(xs:string, item())"/>
-        <xsl:value-of>
-            <xsl:apply-templates select="substring($template, 1, 1)" mode="uuid-char">
-                <xsl:with-param name="PRNG" select="$PRNG"/>
-            </xsl:apply-templates>
-            <xsl:if test="matches($template, '.')">
-                <xsl:sequence select="r:produce-uuid(substring($template, 2), $PRNG?next())"/>
-            </xsl:if>
-        </xsl:value-of>
+        <xsl:sequence use-when="function-available('random-number-generator')">
+            <xsl:variable name="PRNG" as="map(xs:string, item())" select="random-number-generator($seed)"/>
+            <xsl:variable name="template-length" as="xs:integer" select="string-length($template)"/>
+            <xsl:variable name="template-char-seq" as="xs:string*"
+                select="$template ! string-to-codepoints(.) ! codepoints-to-string(.)"/>
+            <!-- Draw one long stream from PRNG over sequence of characters in concatenated template,
+                advancing state in each iteration. -->
+            <xsl:variable name="random-chars" as="xs:string">
+                <xsl:value-of>
+                    <xsl:iterate select="for $idx in (1 to $seq-length) return $template-char-seq">
+                        <xsl:param name="PRNG" as="map(xs:string, item())" select="$PRNG"/>
+                        <xsl:apply-templates select="current()" mode="uuid-char">
+                            <xsl:with-param name="PRNG" select="$PRNG"/>
+                        </xsl:apply-templates>
+                        <xsl:next-iteration>
+                            <xsl:with-param name="PRNG" select="$PRNG?next()"/>
+                        </xsl:next-iteration>
+                    </xsl:iterate>
+                </xsl:value-of>
+            </xsl:variable>
+            <!-- Divide $random-chars into nonoverlapping strings:
+                $seq-length of them, each of length $template-length. -->
+            <xsl:sequence select="for $idx in (0 to $seq-length - 1)
+                return substring($random-chars, 1 + $idx * $template-length, $template-length)"/>
+        </xsl:sequence>
     </xsl:function>
 
-    <xsl:variable name="uuid-v4-template" as="xs:string">________-____-4___-=___-____________</xsl:variable>
-    <!--                                                 a847eaab-cec8-41bd-98e2-02d02900b554            -->
-    <!-- replacements for UUID v4:
-           '_' becomes a random hex value 0-9a-f
-           '=' becomes one of '8','9','a','b' at random
-           any other character is copied -->
-
     <xsl:variable name="hex-digits" select="tokenize('0 1 2 3 4 5 6 7 8 9 a b c d e f', ' ')"/>
 
     <xsl:template match=".[. = '_']" mode="uuid-char">
diff --git a/src/utils/util/resolver-pipeline/readme.md b/src/utils/util/resolver-pipeline/readme.md
index aa9cadeb67..0e8913a01b 100644
--- a/src/utils/util/resolver-pipeline/readme.md
+++ b/src/utils/util/resolver-pipeline/readme.md
@@ -1,33 +1,49 @@
-## Resolver pipeline
+## Profile Resolver Pipeline
 
-Profile resolution is implemented here as a set of XSLT transformations to be performed in sequence, applied to defined inputs (a **source profile** with imported **catalog** sources) to produce defined outputs (a **profile resolution result** in the form of a catalog). The word **baseline** is also used to refer to a particular profile in application, whether in its unprocessed form or its resolved, serialized form.
+Profile resolution is implemented here as a sequence of XSLT transformations. The sequence applies to defined inputs (a **source profile** with imported **catalog** sources) and produces defined outputs (a **profile resolution result** in the form of a catalog). The word **baseline** also refers to a particular profile in application, whether in its unprocessed form or its resolved, serialized form.
 
-The sequence reflects and roughly corresponds to the three steps in profile resolution described for OSCAL in the [Profile Resolution Specification](https://pages.nist.gov/OSCAL/concepts/processing/profile-resolution/):
+The sequence of XSLT transformations reflects and roughly corresponds to the steps in profile resolution described for OSCAL in the [Profile Resolution Specification](https://pages.nist.gov/OSCAL/concepts/processing/profile-resolution/):
 
-- **selection** (importing catalogs or profiles and selecting controls from them)
+- **selection**: importing catalogs or profiles, and selecting controls from them
 
-- **organization (merging)** i.e. specifying how selected controls are to be organized in representation
+- **organization (merging)**: organizing the selected controls for the output representation
 
-- **modification** - setting parameters and potentially supplementing, amending or editing control text
+- **modification**: setting parameters and potentially supplementing, amending or editing control text
 
-For demonstration, the expected interim results for test files are kept in the testing/\* folders
+### Tests for this Implementation
 
-Note that these interim results are *not always valid to any OSCAL schema* while at the same time they are quite close to OSCAL profile and catalog syntax.
+The `testing/*` folders contain XSpec tests that indicate expected interim results of each XSLT transformation in the sequence.
 
-Testing files for profile resolution in general are kept [with the specification](../../../specifications/profile-resolution). The testing files in this subdirectory are only for this implementation.
+Note that these interim results are *not necessarily valid to any OSCAL schema*, although they are quite close to OSCAL profile and catalog syntax.
 
-### Invoking the XSLT:
+The files in `testing/*` are only for this implementation. Implementation-independent tests and sample files for profile resolution are [with the specification](../../../specifications/profile-resolution).
 
-Use a recent version of Saxon for best results -- although we would also be *very interested* to hear from users of other XSLT engines conformant to the 3.1 family of XML standards (XSLT/XPath/XDM/XQuery).
+### Invoking the XSLT
 
-The main entry point for the transformation pipeline is the dynamic build XSLT called `oscal-profile-RESOLVE.xsl`, which invokes the core transformation steps in sequence, taking the source profile document as primary input. Load Saxon with your document and this stylesheet as follows (for example):
+Use a recent version of Saxon for best results &#8212; although we would also be *very interested* to hear from users of other XSLT engines conformant to the 3.1 family of XML standards (XSLT/XPath/XDM/XQuery).
+
+The entry point for the transformation pipeline is `oscal-profile-RESOLVE.xsl`, which invokes the transformation steps in sequence, taking the source profile document as primary input. Load Saxon with your document and this stylesheet as follows (for example):
 
 ```bash
 >  java -cp saxon-he-10.0.jar net.sf.saxon.Transform -t -s:YOUR_PROFILE_DOCUMENT.xml -xsl:path/to/oscal-profile-RESOLVE.xsl -o:YOUR_RESULT_BASELINE.xml
 ```
 
-Alternatively, set up the bindings in an IDE or programmed environment that has XSLT 3.1 support.
+You can optionally set one or more of the parameters listed in the following table, using syntax `name=value` at the end of the command above. The sequence of parameters is not significant.
+
+For example,
+```bash
+>  java -cp saxon-he-10.0.jar net.sf.saxon.Transform -t -s:YOUR_PROFILE_DOCUMENT.xml -xsl:path/to/oscal-profile-RESOLVE.xsl -o:YOUR_RESULT_BASELINE.xml uuid-method=random-xslt hide-source-profile-uri=true
+```
+| Name  | Description  | Default  |
+|---|---|---|
+| `hide-source-profile-uri` | If `true`, the output catalog's metadata does not record the source profile's URI.  | `false` |
+| `path-to-source`  | Path from output catalog to location of source profile. | None |
+| `top-uuid` | UUID value for top-level element in output catalog, if `uuid-method` is `user-provided`. | None |
+| `uuid-method` | Method for computing UUID of top-level element in output catalog. Valid values are: `random-xslt`, in which case the `random-number-generator` XPath function must be available; `random-java`, in which case the `java.util.UUID.randomUUID()` Java method must be available; `user-provided`, in which case you must specify the `top-uuid` parameter; `web-service`, referring to the `uuid-service` parameter value; and `fixed`. | `fixed`|
+| `uuid-service` | URI for a web service that produces a UUID, if `uuid-method` is `web-service`.| `https://www.uuidgenerator.net/api/version4`|
+
+Alternatively, set up the bindings in an IDE or programming environment that has XSLT 3.1 support.
 
-Note that URIs (addresses) given in a profile document must link correctly as absolute or relative paths to their imported catalogs, as demonstrated in examples.
+Note that URIs (addresses) given in a profile document must link correctly as absolute or relative paths to their imported catalogs, as demonstrated in [examples](../../../specifications/profile-resolution/profile-resolution-examples).
 
-A captured and serialized profile resolution will take the form of an OSCAL catalog, and be valid to the catalog schema for correctly formed inputs.
+A serialized output of profile resolution takes the form of an OSCAL catalog. Assuming inputs are correctly formed, the output is valid to the catalog schema.
diff --git a/src/utils/util/resolver-pipeline/select-or-custom-merge.xsl b/src/utils/util/resolver-pipeline/select-or-custom-merge.xsl
new file mode 100644
index 0000000000..62c652ffd3
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/select-or-custom-merge.xsl
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+    xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:math="http://www.w3.org/2005/xpath-functions/math"
+    exclude-result-prefixes="xs math o"
+    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+
+    <xsl:include href="oscal-profile-resolve-functions.xsl"/>
+
+    <!-- A control is included if it is selected by the provided import instruction -->
+    <xsl:template match="control" mode="o:select" as="element(o:control)?">
+        <xsl:param name="import-instruction" tunnel="yes" required="yes"/>
+        <xsl:choose>
+            <xsl:when test="o:selects($import-instruction,.)">
+                <xsl:copy copy-namespaces="no">
+                    <xsl:call-template name="add-process-id"/>
+                    <xsl:apply-templates mode="#current" select="node() | @*"/>
+                </xsl:copy>
+           </xsl:when>
+           <xsl:otherwise>
+               <!-- Visit child controls in case they are selected using
+                   with-parent-controls="no". -->
+               <xsl:apply-templates mode="#current" select="control"/>
+           </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template name="add-process-id" as="attribute(opr:id)">
+        <xsl:param name="context" select="." as="element()"/>
+        <xsl:attribute name="opr:id" namespace="http://csrc.nist.gov/ns/oscal/profile-resolution">
+            <xsl:value-of
+                select="concat(opr:catalog-identifier($context/root()/o:catalog), '#', $context/(@id, generate-id())[1])"/>
+        </xsl:attribute>
+    </xsl:template>
+
+    <!-- Function o:selects($importing,$candidate) returns a true or false
+         depending on whether the import calls the candidate control  -->
+    
+    <!-- @with-child-controls='yes' is recursive - given on a control it brings all control descendants, not only children   -->
+    <xsl:function name="o:selects" as="xs:boolean">
+        <xsl:param name="importing" as="element()"/><!-- o:import in selection phase, o:insert-controls in merge phase -->
+        <xsl:param name="candidate" as="element(o:control)"/>
+        <xsl:variable name="include-reasons" as="xs:boolean+">
+            <!-- we are not optimizing for performance here; nothing is done to prevent all checks even if the first passes -->
+            <!--<xsl:sequence select="empty($importing/include)"/>-->
+            <xsl:sequence select="exists($importing/include-all)"/>
+            <xsl:sequence select="some $c in ($importing/include-controls/with-id)
+                satisfies ($c = $candidate/@id)"/>
+            <xsl:sequence select="some $c in ($importing/include-controls[o:calls-parents(.)]/with-id)
+                satisfies ($c = $candidate/descendant::control/@id)"/>
+            <xsl:sequence select="some $c in ($importing/include-controls[o:calls-children(.)]/with-id)
+                satisfies ($c = $candidate/ancestor::control/@id)"/>
+            <xsl:sequence select="some $m in ($importing/include-controls/matching[@pattern != ''])
+                satisfies (matches($candidate/@id,$m/@pattern/o:glob-as-regex(string(.)) ))"/>
+            <xsl:sequence select="some $m in ($importing/include-controls[o:calls-parents(.)]/matching[@pattern != '']), $a in $candidate/descendant::control 
+                satisfies (matches($a/@id,$m/@pattern/o:glob-as-regex(string(.))))"/>
+            <xsl:sequence select="some $m in ($importing/include-controls[o:calls-children(.)]/matching[@pattern != '']), $a in $candidate/ancestor::control 
+                satisfies (matches($a/@id,$m/@pattern/o:glob-as-regex(string(.))))"/>
+        </xsl:variable>
+        <xsl:variable name="exclude-reasons" as="xs:boolean+">
+            <xsl:sequence select="exists($candidate/parent::control) and $importing/include-all/@with-child-controls='no'"/>
+            <xsl:sequence select="some $c in ($importing/exclude-controls/with-id) satisfies ($c = $candidate/@id)"/>
+            <xsl:sequence select="some $c in ($importing/exclude-controls[o:calls-parents(.)]/with-id)
+                satisfies ($c = $candidate/descendant::control/@id)"/>
+            <xsl:sequence select="some $c in ($importing/exclude-controls[o:calls-children(.)]/with-id)
+                satisfies ($c = $candidate/ancestor::control/@id)"/>
+            <xsl:sequence select="some $m in ($importing/exclude-controls/matching[@pattern != ''])
+                satisfies (matches($candidate/@id,$m/@pattern/o:glob-as-regex(string(.))))"/>
+            <xsl:sequence select="some $m in ($importing/exclude-controls[o:calls-parents(.)]/matching[@pattern != '']), $a in $candidate/descendant::control
+                satisfies (matches($a/@id,$m/@pattern/o:glob-as-regex(string(.))))"/>
+            <xsl:sequence select="some $m in ($importing/exclude-controls[o:calls-children(.)]/matching[@pattern != '']), $a in $candidate/ancestor::control
+                satisfies (matches($a/@id,$m/@pattern/o:glob-as-regex(string(.))))"/>
+        </xsl:variable>
+        <!-- predicate [.] filters reasons as booleans -->
+        <xsl:sequence select="exists($include-reasons[.]) and empty($exclude-reasons[.])"/>
+    </xsl:function>
+    
+    <xsl:function name="o:calls-children" as="xs:boolean">
+        <xsl:param name="caller" as="element()"/>
+        <xsl:sequence select="$caller/@with-child-controls='yes'"/>
+    </xsl:function>
+    
+    <xsl:function name="o:calls-parents" as="xs:boolean">
+        <xsl:param name="caller" as="element()"/>
+        <xsl:sequence select="not($caller/@with-parent-controls='no')"/>
+    </xsl:function>
+
+    <xsl:function name="opr:catalog-identifier" as="xs:string">
+        <xsl:param name="catalog" as="element(o:catalog)"/>
+        <xsl:sequence select="$catalog/(@uuid,document-uri(root(.)))[1]"/>
+    </xsl:function>
+
+</xsl:stylesheet>
diff --git a/src/utils/util/resolver-pipeline/testing/1_selected/catalog-no-uuid.xml b/src/utils/util/resolver-pipeline/testing/1_selected/catalog-no-uuid.xml
new file mode 100644
index 0000000000..78beab5883
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/testing/1_selected/catalog-no-uuid.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"/>
diff --git a/src/utils/util/resolver-pipeline/testing/1_selected/catalog-nonstandard-file-name-ext.xmlcat b/src/utils/util/resolver-pipeline/testing/1_selected/catalog-nonstandard-file-name-ext.xmlcat
new file mode 100644
index 0000000000..a506f84570
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/testing/1_selected/catalog-nonstandard-file-name-ext.xmlcat
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="xmlcat"/>
diff --git a/src/utils/util/resolver-pipeline/testing/1_selected/glob-rewrite.xspec b/src/utils/util/resolver-pipeline/testing/1_selected/glob-rewrite.xspec
index add11d3ed1..e417e4641e 100644
--- a/src/utils/util/resolver-pipeline/testing/1_selected/glob-rewrite.xspec
+++ b/src/utils/util/resolver-pipeline/testing/1_selected/glob-rewrite.xspec
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE x:description [
-<!ENTITY filedir "file:/C:/Users/wap1/Documents/usnistgov/OSCAL/src/specifications/profile-resolution/profile-resolution-examples/catalogs" >
-]>
 <x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0"
     xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
     xmlns:x="http://www.jenitennison.com/xslt/xspec"
     stylesheet="../../oscal-profile-resolve-select.xsl">
+    <x:scenario label="Tests for o:glob-as-regex function">
     <x:scenario label="Simple string">
         <x:call function="o:glob-as-regex">
             <x:param>ac</x:param>
@@ -30,5 +28,12 @@
             <x:param>ac-1(*)</x:param>
         </x:call>
         <x:expect label="Anchored and escaped with substitution" select="'^ac-1\(.*\)$'"/>
+        </x:scenario>
+        <x:scenario label="Empty string (degenerate case)">
+            <x:call function="o:glob-as-regex">
+                <x:param select="''"/>
+            </x:call>
+            <x:expect label="Anchored empty string" select="'^$'"/>
+        </x:scenario>
     </x:scenario>
 </x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/1_selected/resource-media-type.xml b/src/utils/util/resolver-pipeline/testing/1_selected/resource-media-type.xml
new file mode 100644
index 0000000000..5db7281637
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/testing/1_selected/resource-media-type.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../../../../specifications/profile-resolution/example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:08.131-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="427f8c54-c3af-4ca3-a92c-f6abaa015ba5">
+   <metadata>
+      <title>Test Profile with Nonstandard File Name Extension in resource/rlink</title>
+      <last-modified>2020-05-30T14:39:37.3-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0-rc2</oscal-version>
+   </metadata>
+   <import href="#0050231f-4fd0-43d6-8fa0-431367cd83e1">
+      <include-all/>
+   </import>
+   <back-matter>
+      <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e1">
+         <rlink href="https://some-non-xml-url"/>
+         <rlink href="catalog-nonstandard-file-name-ext.xmlcat" media-type="xml"/>
+      </resource>
+      <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e1">
+         <!-- Duplicate uuid is intentional, for testing template with
+            mode="o:select" match="import[starts-with(@href,'#')]" -->
+         <rlink href="catalog-nonstandard-file-name-ext.xmlcat" media-type="xml"/>
+      </resource>
+   </back-matter>
+</profile>
diff --git a/src/utils/util/resolver-pipeline/testing/1_selected/resource-multiple-rlinks.xml b/src/utils/util/resolver-pipeline/testing/1_selected/resource-multiple-rlinks.xml
new file mode 100644
index 0000000000..1f41a36168
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/testing/1_selected/resource-multiple-rlinks.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../../../../specifications/profile-resolution/example-checkup.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<!-- Modified by conversion XSLT 2021-04-05T11:22:08.131-04:00 - RC2 OSCAL becomes RC3 OSCAL -->
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="427f8c54-c3af-4ca3-a92c-f6abaa015ba5">
+   <metadata>
+      <title>Test Profile with Nonstandard File Name Extension in resource/rlink</title>
+      <last-modified>2020-05-30T14:39:37.3-04:00</last-modified>
+      <version>1.0</version>
+      <oscal-version>1.0.0-rc2</oscal-version>
+   </metadata>
+   <import href="#0050231f-4fd0-43d6-8fa0-431367cd83e1">
+      <include-all/>
+   </import>
+   <back-matter>
+      <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e1">
+         <rlink href="catalog-nonstandard-file-name-ext.xmlcat" media-type="xml"/>
+         <rlink href="catalog-no-uuid.xml"/>
+      </resource>
+   </back-matter>
+</profile>
diff --git a/src/utils/util/resolver-pipeline/testing/1_selected/select-mapping-controls.xspec b/src/utils/util/resolver-pipeline/testing/1_selected/select-mapping-controls.xspec
new file mode 100644
index 0000000000..950e4a241f
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/testing/1_selected/select-mapping-controls.xspec
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+  xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+  xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+  xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable"
+  xmlns:x="http://www.jenitennison.com/xslt/xspec"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  stylesheet="../../oscal-profile-resolve-select.xsl"
+  xslt-version="3.0">
+
+    <!-- This file contains preliminary tests for behavior described in the
+        "Mapping Controls" section of the spec. The tests are at an
+        "integration" level rather than per-template or per-function level
+        because the feature is not implemented yet (i.e., the breakdown
+        into templates and functions is not determined).
+
+        Future integration-level or system-level tests should also cover
+        updating "all known references to the old ID in other included content,
+        allowing the new ID to be used in subsequent profile sections." -->
+
+    <!-- SPEC QUESTION: What are the optional sections of <mapping>
+        other than <controls>? Are groups, params, and parts among them?
+        https://github.com/usnistgov/OSCAL/discussions/1114
+        When this is determined, tests can be added for those sections. -->
+
+    <!-- Location of sample files, relative to compiled test in xspec/ subdirectory -->
+    <x:variable name="ov:filedir" as="xs:string" select="resolve-uri('../../../../../../specifications/profile-resolution/profile-resolution-examples')"/>
+
+    <x:scenario label="Import controls using ID mapping">
+        <x:scenario label="Basic case" pending="Mapping is not implemented yet">
+            <x:context mode="o:select">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls>
+                        <with-id>x1</with-id>
+                    </include-controls>
+                    <mapping>
+                        <controls>
+                            <map from="x1" to="map-x1"/>
+                        </controls>
+                    </mapping>
+                </import>
+            </x:context>
+            <x:expect label="Control X1 with id=map-x1">
+                <selection uuid="..." opr:src="...">
+                    <metadata>...</metadata>
+                    <group opr:id="...">
+                        <title>Group X of XYZ</title>
+                        <control id="map-x1" opr:id="...">
+                            <title>Control X1</title>
+                        </control>
+                    </group>
+                    <group opr:id="...">...</group>
+                    <group opr:id="...">...</group>
+                </selection>
+            </x:expect>
+            <x:expect label="opr:id of Control X1 has mapped ID after #"
+                test="$x:result//o:title[.='Control X1']/parent::o:control/@opr:id ! substring-after(.,'#')"
+                select="'map-x1'"/>
+        </x:scenario>
+        <x:scenario label="Catalog imported twice with different mappings" pending="Mapping is not implemented yet">
+            <x:context mode="o:select">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls>
+                        <with-id>x1</with-id>
+                    </include-controls>
+                    <mapping>
+                        <controls>
+                            <map from="x1" to="map1-x1"/>
+                        </controls>
+                    </mapping>
+                </import>
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls>
+                        <with-id>x1</with-id>
+                    </include-controls>
+                    <mapping>
+                        <controls>
+                            <map from="x1" to="map2-x1"/>
+                        </controls>
+                    </mapping>
+                </import>
+            </x:context>
+            <x:expect label="Control X1 twice with IDs map1-x1 and map2-x1">
+                <selection uuid="..." opr:src="...">
+                    <metadata>...</metadata>
+                    <group opr:id="...">
+                        <title>Group X of XYZ</title>
+                        <control id="map1-x1" opr:id="...">
+                            <title>Control X1</title>
+                        </control>
+                    </group>
+                    <group opr:id="...">...</group>
+                    <group opr:id="...">...</group>
+                </selection>
+                <selection uuid="..." opr:src="...">
+                    <metadata>...</metadata>
+                    <group opr:id="...">
+                        <title>Group X of XYZ</title>
+                        <control id="map2-x1" opr:id="...">
+                            <title>Control X1</title>
+                        </control>
+                    </group>
+                    <group opr:id="...">...</group>
+                    <group opr:id="...">...</group>
+                </selection>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Partial matching of text" pending="Mapping is not implemented yet">
+            <x:context mode="o:select">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls with-child-controls="yes">
+                        <with-id>z3</with-id>
+                    </include-controls>
+                    <mapping>
+                        <controls>
+                            <map from="z3.a" to="map-z3.a"/>
+                        </controls>
+                    </mapping>
+                </import>
+            </x:context>
+            <x:expect label="Control Z3-A has mapped ID, while Z3-A-1 has unchanged ID"
+                test="$x:result//o:title[.='Control Z3']/parent::o:control">
+                <control id="z3" opr:id="..."><title>Control Z3</title>
+                    <control id="map-z3.a" opr:id="..."><title>Control Z3-A</title>
+                        <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
+                    </control>
+                </control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Attempt to use pattern in 'from'">
+            <x:context mode="o:select">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls with-child-controls="yes">
+                        <with-id>z3</with-id>
+                    </include-controls>
+                    <mapping>
+                        <controls>
+                            <map from="z3*" to="map-z3"/>
+                        </controls>
+                    </mapping>
+                </import>
+            </x:context>
+            <x:expect label="IDs are unchanged because 'from' must be exact match"
+                test="$x:result//o:title[.='Control Z3']/parent::o:control">
+                <control id="z3" opr:id="..."><title>Control Z3</title>
+                    <control id="z3.a" opr:id="..."><title>Control Z3-A</title>
+                        <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
+                    </control>
+                </control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Multiple mappings from the same ID" pending="Mapping is not implemented yet">
+            <x:context mode="o:select">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls>
+                        <with-id>x1</with-id>
+                    </include-controls>
+                    <mapping>
+                        <controls>
+                            <map from="x1" to="map-x1"/>
+                            <map from="x1" to="map-again-x1"/>
+                        </controls>
+                    </mapping>
+                </import>
+            </x:context>
+            <x:expect label="ID of Control X1 uses first value (SPEC QUESTION: is that the expected behavior? https://github.com/usnistgov/OSCAL/discussions/1115)"
+                test="$x:result//o:title[.='Control X1']/parent::o:control/@id/string()"
+                select="'map-x1'"/>
+        </x:scenario>
+        <x:scenario label="'to' of one mapping matches 'from' of another mapping" pending="Mapping is not implemented yet">
+            <x:context mode="o:select">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls>
+                        <with-id>x1</with-id>
+                    </include-controls>
+                    <mapping>
+                        <controls>
+                            <map from="x1" to="map-x1"/>
+                            <map from="map-x1" to="map-again-x1"/>
+                        </controls>
+                    </mapping>
+                </import>
+            </x:context>
+            <x:expect label="ID of Control X1 uses 'to' value, ignoring subsequent mapping (SPEC QUESTION: is that the expected behavior? https://github.com/usnistgov/OSCAL/discussions/1115)"
+                test="$x:result//o:title[.='Control X1']/parent::o:control/@id/string()"
+                select="'map-x1'"/>
+        </x:scenario>
+        <x:scenario label="'to' ID appears in exclusion directive">
+            <x:context mode="o:select">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls>
+                        <with-id>x1</with-id>
+                    </include-controls>
+                    <exclude-controls>
+                        <with-id>map-x1</with-id>
+                    </exclude-controls>
+                    <mapping>
+                        <controls>
+                            <map from="x1" to="map-x1"/>
+                        </controls>
+                    </mapping>
+                </import>
+            </x:context>
+            <x:expect label="Control X1 is included (mapping occurs after exclusion logic) (SPEC QUESTION: is that the expected behavior? https://github.com/usnistgov/OSCAL/discussions/1116)"
+                test="exists($x:result//o:title[.='Control X1'])"/>
+        </x:scenario>
+        <x:scenario label="ID matches but mapping is not for controls">
+            <x:context mode="o:select">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls>
+                        <with-id>x1</with-id>
+                    </include-controls>
+                    <mapping>
+                        <params>
+                            <map from="x1" to="map-x1"/>
+                        </params>
+                    </mapping>
+                </import>
+            </x:context>
+            <x:expect label="ID of Control X1 is unchanged"
+                test="$x:result//o:title[.='Control X1']/parent::o:control/@id/string()"
+                select="'x1'"/>
+        </x:scenario>
+        <x:scenario label="No applicable mapping">
+            <x:context mode="o:select">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                    <include-controls>
+                        <with-id>x1</with-id>
+                    </include-controls>
+                    <mapping>
+                        <controls>
+                            <map from="nonexistent" to="map-x1"/>
+                        </controls>
+                    </mapping>
+                </import>
+            </x:context>
+            <x:expect label="ID of Control X1 is unchanged"
+                test="$x:result//o:title[.='Control X1']/parent::o:control/@id/string()"
+                select="'x1'"/>
+        </x:scenario>
+    </x:scenario>
+
+</x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/1_selected/select-rlink.xspec b/src/utils/util/resolver-pipeline/testing/1_selected/select-rlink.xspec
index 65f5006cf9..cb70e55295 100644
--- a/src/utils/util/resolver-pipeline/testing/1_selected/select-rlink.xspec
+++ b/src/utils/util/resolver-pipeline/testing/1_selected/select-rlink.xspec
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE x:description [
-<!ENTITY filedir "file:/C:/Users/wap1/Documents/usnistgov/OSCAL/src/specifications/profile-resolution/profile-resolution-examples/catalogs" >
-]>
 <x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0"
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable"
     xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
     stylesheet="../../oscal-profile-resolve-select.xsl">
+    
+    <!-- Location of sample files, relative to compiled test in xspec/ subdirectory -->
+    <x:variable name="ov:filedir" as="xs:string" select="resolve-uri('../../../../../../specifications/profile-resolution/profile-resolution-examples')"/>
+
     <x:scenario label="Direct import by file href">
         <x:context>
             <profile>
-                <import href="&filedir;/xyz-tiny_catalog.xml">
+                <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
                     <include-controls>
                         <with-id>z3</with-id>
                     </include-controls>
@@ -50,7 +53,7 @@
                 <back-matter>
                     <resource uuid="6e57d296-39c1-4e83-8107-4dcc2ede751b">
                         <title>Tiny Catalog</title>
-                        <rlink href="&filedir;/xyz-tiny_catalog.xml"/>
+                        <rlink href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml"/>
                     </resource>
                 </back-matter>
             </profile>
@@ -95,13 +98,13 @@
                 <back-matter>
                     <resource uuid="6e57d296-39c1-4e83-8107-4dcc2ede751b">
                         <title>Tiny Catalog</title>
-                        <rlink href="&filedir;/xyz-tiny_catalog.xml"/>
-                        <rlink href="&filedir;/xyz-tiny_catalog.json"/>
+                        <rlink href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml"/>
+                        <rlink href="{$ov:filedir}/catalogs/xyz-tiny_catalog.json"/>
                     </resource>
                 </back-matter>
             </profile>
         </x:context>
-        <x:expect label="Select all controls, grouped">
+        <x:expect label="Control selected from XML remote resource, ignoring JSON resource">
             <profile>
                 <selection uuid="..." opr:src="...">
                     <metadata>
diff --git a/src/utils/util/resolver-pipeline/testing/1_selected/select.xspec b/src/utils/util/resolver-pipeline/testing/1_selected/select.xspec
index 7df1cae86a..7f94a578ef 100644
--- a/src/utils/util/resolver-pipeline/testing/1_selected/select.xspec
+++ b/src/utils/util/resolver-pipeline/testing/1_selected/select.xspec
@@ -1,367 +1,1517 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE x:description [
-<!ENTITY filedir "file:/C:/Users/wap1/Documents/usnistgov/OSCAL/src/specifications/profile-resolution/profile-resolution-examples/catalogs" >
-]>
 <x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable"
     xmlns:x="http://www.jenitennison.com/xslt/xspec"
-    stylesheet="../../oscal-profile-resolve-select.xsl">
-    <x:scenario label="Profile root">
-        <x:context>
-            <profile/>
-        </x:context>
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    stylesheet="../../oscal-profile-resolve-select.xsl"
+    xslt-version="3.0">
 
-        <x:expect label="root becomes root">
-            <profile/>
-        </x:expect>
-    </x:scenario>
-    <x:scenario label="Profile select empty import">
-        <x:context>
-            <profile>
-                <import href="&filedir;/xyz-tiny_catalog.xml"/>
-            </profile>
-        </x:context>
+    <!-- Location of sample files, relative to compiled test in xspec/ subdirectory -->
+    <x:variable name="ov:filedir" as="xs:string" select="resolve-uri('../../../../../../specifications/profile-resolution/profile-resolution-examples')"/>
 
-        <x:expect label="Select no controls">
-            <profile>
-                <selection uuid="..." opr:src="...">
-                    <metadata>
-                        <title>XYZ Tiny Catalog</title>
-                        <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
-                        <version>1.0</version>
-                        <oscal-version>1.0.0-rc2</oscal-version>
-                    </metadata>
-                    <group opr:id="160a974c-2aaf-45cd-b504-44bb86bebada#d19e10">
-                        <title>Group X of XYZ</title>
-                    </group>
-                    <group opr:id="160a974c-2aaf-45cd-b504-44bb86bebada#d19e18">
-                        <title>Group Y of XYZ</title>
-                    </group>
-                    <group opr:id="160a974c-2aaf-45cd-b504-44bb86bebada#d19e26">
-                        <title>Group Z of XYZ</title>
-                    </group>
-                </selection>
-            </profile>
-        </x:expect>
+    <x:variable name="ov:unique" as="function(*)"
+        select="function($seq as xs:string*) as xs:boolean {
+        count($seq) = count(distinct-values($seq))
+        }"/>
+
+    <x:variable name="ov:catalog-selection-structure" as="element(o:selection)">
+        <selection opr:src="..." uuid="...">
+            <metadata>...</metadata>
+            <group opr:id="...">...</group>
+            <group opr:id="...">...</group>
+            <group opr:id="...">...</group>
+        </selection>
+    </x:variable>
+
+    <x:scenario label="Tests for match='* | @*' template for all modes">
+        <x:variable name="ov:arbitrary-element" as="element(arbitrary-element)">
+            <arbitrary-element xmlns="" arbitrary-attribute="val">text<child/></arbitrary-element>
+        </x:variable>
+        <x:scenario label="Element">
+            <x:context select="$ov:arbitrary-element"/>
+            <x:expect label="Copy" select="$ov:arbitrary-element"/>
+        </x:scenario>
+        <x:scenario label="Attribute">
+            <x:context select="$ov:arbitrary-element/@arbitrary-attribute"/>
+            <x:expect label="Copy"
+                test="$x:result instance of attribute(arbitrary-attribute) and $x:result/string()='val'"/>
+        </x:scenario>
     </x:scenario>
-    <x:scenario label="Profile select include all">
-        <x:context>
-            <profile>
-                <import href="&filedir;/xyz-tiny_catalog.xml">
-                    <include-all/>
-                </import>
-            </profile>
-        </x:context>
-        <x:expect label="Select all controls, grouped">
-            <profile>
-                <selection uuid="..." opr:src="...">
-                    <metadata>
-                        <title>XYZ Tiny Catalog</title>
-                        <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
-                        <version>1.0</version>
-                        <oscal-version>1.0.0-rc2</oscal-version>
-                    </metadata>
-                    <group opr:id="...">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="..."><title>Control X1</title></control>
-                        <control id="x2" opr:id="..."><title>Control X2</title></control>
-                        <control id="x3" opr:id="..."><title>Control X3</title></control>
-                    </group>
-                    <group opr:id="...">
-                        <title>Group Y of XYZ</title>
-                        <control id="y1" opr:id="..."><title>Control Y1</title></control>
-                        <control id="y2" opr:id="..."><title>Control Y2</title></control>
-                        <control id="y3" opr:id="..."><title>Control Y3</title></control>
-                    </group>
-                    <group opr:id="...">
-                        <title>Group Z of XYZ</title>
-                        <control id="z1" opr:id="..."><title>Control Z1</title></control>
-                        <control id="z2" opr:id="..."><title>Control Z2</title></control>
-                        <control id="z3" opr:id="..."><title>Control Z3</title>
-                            <control id="z3.a" opr:id="..."><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
-                    </group>
-                </selection>
-            </profile>
-        </x:expect>
+
+    <x:scenario label="Tests for match='comment() | processing-instruction()' template for all modes">
+        <x:scenario label="Comment">
+            <x:context><!--comment--></x:context>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
+        <x:scenario label="Processing instruction">
+            <x:context><?pi type="sample" href="file.css"?></x:context>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
     </x:scenario>
-    <x:scenario label="Profile select include call control-id">
-        <x:context>
-            <profile>
-                <import href="&filedir;/xyz-tiny_catalog.xml">
-                    <include-controls>
-                        <with-id>x1</with-id>
-                    </include-controls>
-                </import>
-            </profile>
-        </x:context>
 
-        <x:expect label="Control x1, in its group, with other groups empty">
-            <profile>
-                <selection uuid="..." opr:src="...">
-                    <metadata>
-                        <title>XYZ Tiny Catalog</title>
-                        <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
-                        <version>1.0</version>
-                        <oscal-version>1.0.0-rc2</oscal-version>
-                    </metadata>
-                    <group opr:id="...">
+    <x:scenario label="Tests for match='profile' template">
+        <x:scenario label="Profile root">
+            <x:context>
+                <profile/>
+            </x:context>
+    
+            <x:expect label="root becomes root">
+                <profile/>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Profile select empty import">
+            <x:context>
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml"/>
+                </profile>
+            </x:context>
+    
+            <x:expect label="Include group structure but select no controls">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>
+                            <title>XYZ Tiny Catalog</title>
+                            <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
+                            <version>1.0</version>
+                            <oscal-version>1.0.0-rc2</oscal-version>
+                        </metadata>
+                        <group opr:id="...">
+                            <title>Group X of XYZ</title>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Y of XYZ</title>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Z of XYZ</title>
+                        </group>
+                    </selection>
+                </profile>
+            </x:expect>
+            <x:expect label="opr:id values are unique"
+                test="$x:result//*/@opr:id => $ov:unique()"/>
+            <!-- If the pattern of opr:id values isn't worth testing, then delete the next
+                variables and assertions. Similar in "Profile select include all" scenario.--> 
+            <x:variable name="ov:group_id" as="attribute()+" select="$x:result//o:group/@opr:id"/>
+            <x:variable name="ov:catalog_uuid" as="xs:string" select="doc($ov:filedir || '/catalogs/xyz-tiny_catalog.xml')/o:catalog/@uuid"/>
+            <x:expect label="Each group has opr:id whose substring before # matches the selection uuid,"
+                test="every $id in $ov:group_id satisfies starts-with($id, $id/ancestor::o:selection/@uuid || '#')"/>
+            <x:expect label="which matches the original catalog's top-level uuid."
+                test="$x:result/o:selection/@uuid = $ov:catalog_uuid"/>
+        </x:scenario>
+        <x:scenario label="Error case: Profile cannot find catalog" catch="yes">
+            <x:context>
+                <profile>
+                    <import href="nonexistent_catalog.xml"/>
+                </profile>
+            </x:context>
+            <x:expect label="Fatal XSLT error"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+        </x:scenario>
+        <x:scenario label="Profile select include all">
+            <x:context>
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                        <include-all/>
+                    </import>
+                </profile>
+            </x:context>
+            <x:expect label="Select all controls, grouped">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
+                            <title>Group X of XYZ</title>
+                            <control id="x1" opr:id="..."><title>Control X1</title></control>
+                            <control id="x2" opr:id="..."><title>Control X2</title></control>
+                            <control id="x3" opr:id="..."><title>Control X3</title></control>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Y of XYZ</title>
+                            <control id="y1" opr:id="..."><title>Control Y1</title></control>
+                            <control id="y2" opr:id="..."><title>Control Y2</title></control>
+                            <control id="y3" opr:id="..."><title>Control Y3</title></control>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Z of XYZ</title>
+                            <control id="z1" opr:id="..."><title>Control Z1</title></control>
+                            <control id="z2" opr:id="..."><title>Control Z2</title></control>
+                            <control id="z3" opr:id="..."><title>Control Z3</title>
+                                <control id="z3.a" opr:id="..."><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
+                                </control>
+                            </control>
+                        </group>
+                    </selection>
+                </profile>
+            </x:expect>
+            <x:expect label="opr:id values are unique"
+                test="$x:result//*/@opr:id => $ov:unique()"/>
+            <x:variable name="ov:control_id" as="attribute()+" select="$x:result//o:control/@opr:id"/>
+            <x:variable name="ov:catalog_uuid" as="xs:string" select="doc($ov:filedir || '/catalogs/xyz-tiny_catalog.xml')/o:catalog/@uuid"/>
+            <x:expect label="Each control has opr:id whose substring before # matches the selection uuid,"
+                test="every $id in $ov:control_id satisfies starts-with($id, $id/ancestor::o:selection/@uuid || '#')"/>
+            <x:expect label="which matches the original catalog's top-level uuid."
+                test="$x:result/o:selection/@uuid = $ov:catalog_uuid"/>
+        </x:scenario>
+        <x:scenario label="Profile select include call control-id">
+            <x:variable name="ov:profile-using-with-id" as="element(o:profile)">
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                        <include-controls>
+                            <with-id>x2</with-id>
+                            <with-id>x1</with-id>
+                        </include-controls>
+                    </import>
+                </profile>
+            </x:variable>
+            <x:context select="$ov:profile-using-with-id"/>
+            <x:expect label="Control x1 and x2, in their group, with other groups empty">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
                             <title>Group X of XYZ</title>
                             <control id="x1" opr:id="..."><title>Control X1</title></control>
+                            <control id="x2" opr:id="..."><title>Control X2</title></control>
                         </group>
                        <group opr:id="..."><title>Group Y of XYZ</title></group>
                        <group opr:id="..."><title>Group Z of XYZ</title></group>
                    </selection>
-            </profile>
-        </x:expect>
+                </profile>
+            </x:expect>
+            <!-- Assertions about the order of controls in output catalog are relevant for merge phase. -->
+            <x:expect label="Order of controls in output is x1, x2 as in the input catalog."
+                test="$x:result//o:control/@id/string()" select="('x1','x2')"/>
+            <x:expect label="In this case, order of controls in output does not match order of with-id elements in profile."
+                test="not(deep-equal($x:result//o:control/@id/string(), $ov:profile-using-with-id//o:control/@id/string()))"/>
+        </x:scenario>
+    
+        <x:scenario label="Profile select include call match">
+            <x:context>
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                        <include-controls>
+                            <!-- any x control -->
+                            <matching pattern="x*"/>
+                        </include-controls>
+                    </import>
+                </profile>
+            </x:context>
+    
+            <x:expect label="The x controls, matched as such">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
+                            <title>Group X of XYZ</title>
+                            <control id="x1" opr:id="..."><title>Control X1</title></control>
+                            <control id="x2" opr:id="..."><title>Control X2</title></control>
+                            <control id="x3" opr:id="..."><title>Control X3</title></control>
+                        </group>
+                        <group opr:id="..."><title>Group Y of XYZ</title></group>
+                        <group opr:id="..."><title>Group Z of XYZ</title></group>
+                    </selection>
+                </profile>
+            </x:expect>
+        </x:scenario>
+    
+        <x:scenario label="Profile implicit select all, excluding x1 y1 z1">
+            <x:context>
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                        <include-all/>
+                        <exclude-controls>
+                            <with-id>x1</with-id>
+                            <with-id>y1</with-id>
+                            <with-id>z1</with-id>
+                        </exclude-controls>
+                    </import>
+                </profile>
+            </x:context>
+    
+            <x:expect label="All controls but x1,y1,z1, grouped">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
+                            <title>Group X of XYZ</title>
+                            <control id="x2" opr:id="..."><title>Control X2</title></control>
+                            <control id="x3" opr:id="..."><title>Control X3</title></control>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Y of XYZ</title>
+                            <control id="y2" opr:id="..."><title>Control Y2</title></control>
+                            <control id="y3" opr:id="..."><title>Control Y3</title></control>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Z of XYZ</title>
+                            <control id="z2" opr:id="..."><title>Control Z2</title></control>
+                            <control id="z3" opr:id="..."><title>Control Z3</title>
+                                <control id="z3.a" opr:id="..."><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
+                                </control>
+                            </control>
+                        </group>
+                    </selection>
+                </profile>
+            </x:expect>
+        </x:scenario>
+    
+        <x:scenario label="Recursive 'with-child-controls'">
+            <x:context>
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                        <include-controls with-child-controls="yes">
+                            <with-id>z3</with-id>
+                        </include-controls>
+                    </import>
+                </profile>
+            </x:context>
+    
+            <x:expect label="Only the Z3 control, with all control descendants">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
+                            <title>Group X of XYZ</title>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Y of XYZ</title>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Z of XYZ</title>
+                            <control id="z3" opr:id="..."><title>Control Z3</title>
+                                <control id="z3.a" opr:id="..."><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
+                                </control>
+                            </control>
+                        </group>
+                    </selection>
+                </profile>
+            </x:expect>
+        </x:scenario>
+    
+        <x:scenario label="Default value of 'with-parent-controls' (yes)">
+            <x:context>
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                        <include-controls with-parent-controls="yes">
+                            <with-id>z3.a-1</with-id>
+                        </include-controls>
+                    </import>
+                </profile>
+            </x:context>
+            
+            <x:expect label="Control Z3-A-1 and all its ancestors">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
+                            <title>Group X of XYZ</title>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Y of XYZ</title>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Z of XYZ</title>
+                            <control id="z3" opr:id="..."><title>Control Z3</title>
+                                <control id="z3.a" opr:id="..."><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
+                                </control>
+                            </control>
+                        </group>
+                    </selection>
+                </profile>
+            </x:expect>
+        </x:scenario>
+
+        <x:scenario label="Nondefault value of 'with-parent-controls' (no)">
+            <x:context>
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                        <include-controls with-parent-controls="no">
+                            <with-id>z3.a-1</with-id>
+                        </include-controls>
+                    </import>
+                </profile>
+            </x:context>
+            
+            <x:expect label="Control Z3-A-1 without its ancestor controls">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
+                            <title>Group X of XYZ</title>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Y of XYZ</title>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Z of XYZ</title>
+                            <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
+                        </group>
+                    </selection>
+                </profile>
+            </x:expect>
+        </x:scenario>
+
+        <x:scenario label="Doubled import, exclusive call">
+            <x:context>
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                        <include-controls>
+                            <with-id>x1</with-id>
+                        </include-controls>
+                    </import>
+                    <import href="{$ov:filedir}/catalogs/xyz-tiny_catalog.xml">
+                        <include-controls>
+                            <with-id>y1</with-id>
+                        </include-controls>
+                    </import>
+                </profile>
+            </x:context>
+    
+            <x:expect label="Showing two control selections">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
+                            <title>Group X of XYZ</title>
+                            <control id="x1" opr:id="..."><title>Control X1</title></control>
+                        </group>
+                        <group opr:id="..."><title>Group Y of XYZ</title></group>
+                        <group opr:id="..."><title>Group Z of XYZ</title></group>
+                    </selection>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
+                            <title>Group X of XYZ</title>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group Y of XYZ</title>
+                            <control id="y1" opr:id="..."><title>Control Y1</title></control>
+                        </group>
+                        <group opr:id="..."><title>Group Z of XYZ</title></group>
+                    </selection>
+                </profile>
+            </x:expect>
+            <x:expect label="In this implementation, the doubled import makes the group IDs non-unique"
+                test="$x:result//o:group/@opr:id => $ov:unique() => not()"/>
+            <x:expect label="In this implementation, the doubled import makes the selection UUIDs non-unique"
+                test="$x:result//o:selection/@uuid => $ov:unique() => not()"/>
+            <x:expect label="Within each selection, opr:id values are unique"
+                test="every $sel in $x:result//o:selection satisfies $sel//*/@opr:id => $ov:unique()"/>
+        </x:scenario>
+    
+        <x:scenario label="Loose parameters">
+            <x:context>
+                <profile>
+                    <import href="{$ov:filedir}/catalogs/abc-full_catalog.xml">
+                        <include-controls>
+                            <with-id>a1</with-id>
+                            <with-id>b1</with-id>
+                        </include-controls>
+                    </import>
+                </profile>
+            </x:context>
+    
+            <x:expect label="Two controls in three groups with back matter and loose parameters">
+                <profile>
+                    <selection uuid="..." opr:src="...">
+                        <metadata>...</metadata>
+                        <group opr:id="...">
+                            <title>Group A of C</title>
+                            <param id="param-A.a" opr:id="...">
+                                <label>A.a parameter</label>
+                                <value>A.a value</value>
+                            </param>
+                            <param id="param-A.b" opr:id="...">
+                                <select>
+                                    <choice>A.b parameter selection choice 1</choice>
+                                    <choice>A.b parameter selection choice 2</choice>
+                                    <choice>A.b parameter selection choice 3</choice>
+                                </select>
+                            </param>
+                            <control id="a1" opr:id="...">
+                                <title>Control A1</title>
+                                <param id="param-a1.a" opr:id="...">
+                                    <label>a1.a parameter</label>
+                                    <value>a1.a value</value>
+                                </param>
+                                <prop name="label" value="1st"/>
+                                <part name="statement" id="a1-stmt">
+                                    <p>A1 aaaaa aaaaaaaaaa</p>
+                                    <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+                                    <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
+                                </part>
+                            </control>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group B of C</title>
+                            <control id="b1" opr:id="...">
+                                <title>Control B1</title>
+                                <prop name="label" value="4th"/>
+                                <part name="statement" id="b1-stmt">
+                                    <p>B1 bbbb bbbbbbb.</p>
+                                </part>
+                            </control>
+                        </group>
+                        <group opr:id="...">
+                            <title>Group C of C</title>
+                        </group>
+                        <back-matter>
+                            <resource uuid="...">
+                                <citation>
+                                    <text>A citation to an out of line document.</text>
+                                </citation>
+                            </resource>
+                            <resource uuid="...">
+                                <citation>
+                                    <text>A citation to an out of line document.</text>
+                                </citation>
+                            </resource>
+                            <resource uuid="...">
+                                <prop name="keep" value="always"/>
+                                <citation>
+                                    <text>A citation to an out of line document.</text>
+                                </citation>
+                            </resource>
+                        </back-matter>
+                    </selection>
+                </profile>
+            </x:expect>
+        </x:scenario>
     </x:scenario>
 
-    <x:scenario label="Profile select include call match">
-        <x:context>
-            <profile>
-                <import href="&filedir;/xyz-tiny_catalog.xml">
-                    <include-controls>
-                        <!-- any x control -->
-                        <matching pattern="x*"/>
-                    </include-controls>
-                </import>
-            </profile>
-        </x:context>
+    <x:scenario label="Tests for match='profile' mode='o:select' template">
+        <!-- Tests for this template are incomplete. When it is decided whether to keep this
+            approach, we can add more test scenarios.-->
+        <x:scenario label="Profile that calls itself" catch="yes" pending="Returns nothing now">
+            <x:context mode="o:select" select="doc($ov:filedir || '/base-test_profile.xml')/o:profile">
+                <x:param name="uri-stack" tunnel="yes"
+                    select="xs:anyURI($ov:filedir || '/base-test_profile.xml')"/>
+            </x:context>
+            <x:expect label="Fatal XSLT error due to circular reference"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+        </x:scenario>
+        <x:scenario label="Profile that calls a distinct profile"
+            pending="Not implemented yet; revisit later">
+            <x:context mode="o:select" select="doc($ov:filedir || '/base2-test_profile.xml')/o:profile">
+                <x:param name="uri-stack" tunnel="yes"
+                    select="xs:anyURI($ov:filedir || '/base-test_profile.xml')"/>
+            </x:context>
+            <x:expect label="Catalog">
+                <catalog uuid="...">...</catalog>
+            </x:expect>
+        </x:scenario>
+    </x:scenario>
 
-        <x:expect label="The x controls, matched as such">
-            <profile>
-                <selection uuid="..." opr:src="...">
-                    <metadata>
-                        <title>XYZ Tiny Catalog</title>
-                        <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
-                        <version>1.0</version>
-                        <oscal-version>1.0.0-rc2</oscal-version>
-                    </metadata>
-                    <group opr:id="...">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="..."><title>Control X1</title></control>
-                        <control id="x2" opr:id="..."><title>Control X2</title></control>
-                        <control id="x3" opr:id="..."><title>Control X3</title></control>
-                    </group>
-                    <group opr:id="..."><title>Group Y of XYZ</title></group>
-                    <group opr:id="..."><title>Group Z of XYZ</title></group>
-                </selection>
-            </profile>
-        </x:expect>
+    <x:scenario label="Tests for match='catalog' mode='o:select' template">
+        <x:scenario label="Catalog document">
+            <x:context mode="o:select" select="doc($ov:filedir || '/catalogs/xyz-tiny_catalog.xml')//o:catalog">
+                <x:param name="import-instruction" tunnel="yes">
+                    <import/>
+                </x:param>
+            </x:context>
+            <x:expect label="Selection from catalog"
+                select="$ov:catalog-selection-structure"/>
+        </x:scenario>
+        <x:scenario label="Catalog with attributes from various namespaces">
+            <x:context mode="o:select">
+                <o:catalog uuid="val" y:attr1="val1" z:attr2="val2" xmlns:y="some-ns" xmlns:z="http://www.w3.org/2001/XMLSchema-instance"/>
+            </x:context>
+            <x:expect label="Attributes other than from XMLSchema-instance namespace get copied">
+                <selection opr:src="..." uuid="val" y:attr1="val1" xmlns:y="some-ns"/>
+            </x:expect>
+        </x:scenario>
     </x:scenario>
 
-    <x:scenario label="Profile implicit select all, excluding x1 y1 z1">
-        <x:context>
-            <profile>
-                <import href="&filedir;/xyz-tiny_catalog.xml">
-                    <include-all/>
-                    <exclude-controls>
-                        <with-id>x1</with-id>
-                        <with-id>y1</with-id>
-                        <with-id>z1</with-id>
-                    </exclude-controls>
-                </import>
-            </profile>
-        </x:context>
+    <x:scenario label="Tests for match='import[starts-with(@href,'#')]' mode='o:select' template">
+        <x:scenario label="import element matches resource element">
+            <x:context mode="o:select" select="(doc($ov:filedir || '/base2-test_profile.xml')//o:import)[1]"/>
+            <x:expect label="Selection from linked catalog"
+                select="$ov:catalog-selection-structure"/>
+        </x:scenario>
+        <x:scenario label="import element matches multiple resource elements">
+            <x:context mode="o:select" href="resource-media-type.xml"
+                select="(//o:import)[1]"/>
+            <x:expect label="One selection from linked catalog, per matching resource element">
+                <selection opr:src="..." uuid="xmlcat">...</selection>
+                <selection opr:src="..." uuid="xmlcat">...</selection>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="import element does not match resource element">
+            <!-- QUESTION: Is the behavior correct? https://github.com/usnistgov/OSCAL/issues/1079 -->
+            <x:context mode="o:select">
+                <import href="#nonexistent"/>
+            </x:context>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
+    </x:scenario>
 
-        <x:expect label="All controls but x1,y1,z1, grouped">
-            <profile>
-                <selection uuid="..." opr:src="...">
-                    <metadata>
-                        <title>XYZ Tiny Catalog</title>
-                        <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
-                        <version>1.0</version>
-                        <oscal-version>1.0.0-rc2</oscal-version>
-                    </metadata>
-                    <group opr:id="...">
-                        <title>Group X of XYZ</title>
-                        <control id="x2" opr:id="..."><title>Control X2</title></control>
-                        <control id="x3" opr:id="..."><title>Control X3</title></control>
-                    </group>
-                    <group opr:id="...">
-                        <title>Group Y of XYZ</title>
-                        <control id="y2" opr:id="..."><title>Control Y2</title></control>
-                        <control id="y3" opr:id="..."><title>Control Y3</title></control>
-                    </group>
-                    <group opr:id="...">
-                        <title>Group Z of XYZ</title>
-                        <control id="z2" opr:id="..."><title>Control Z2</title></control>
-                        <control id="z3" opr:id="..."><title>Control Z3</title>
-                            <control id="z3.a" opr:id="..."><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
-                    </group>
-                </selection>
-            </profile>
-        </x:expect>
+    <x:scenario label="Tests for match='resource' mode='o:import' template">
+        <x:scenario label="Select rlink by href alone">
+            <x:context mode="o:import" select="(doc($ov:filedir || '/base2-test_profile.xml')//o:resource)[1]">
+                <x:param name="import-instruction" tunnel="yes">
+                    <import/>
+                </x:param>
+            </x:context>
+            <!-- Above, $import-instruction tunnel param is required by dowstream template. -->
+            <x:expect label="Selection from linked catalog"
+                select="$ov:catalog-selection-structure"/>
+        </x:scenario>
+        <x:scenario label="Select rlink by media-type attribute">
+            <x:context mode="o:import" href="resource-media-type.xml"
+                select="(//o:resource)[1]"/>
+            <x:expect label="Selection from linked catalog">
+                <selection opr:src="..." uuid="...">...</selection>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Multiple viable rlink children">
+            <x:context mode="o:import" href="resource-multiple-rlinks.xml"
+                select="(//o:resource)[1]"/>
+            <x:expect label="Selection based on first viable rlink">
+                <selection opr:src="..." uuid="xmlcat">...</selection>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Error case: No rlink child with suitable href or media-type" catch="yes">
+            <x:context mode="o:import">
+                <resource uuid="foo">
+                    <rlink href="foo.json"/>
+                </resource>
+            </x:context>
+            <x:variable name="ov:expected_error" as="xs:string">Document not acquired for resource with uuid foo: No rlink with media-type='xml' or href ending with '.xml'</x:variable>
+            <x:expect label="Fatal XSLT error"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+            <!-- The next assertion requires a newer XSpec version; passes in Oxygen v24, fails in Oxygen v22.1 -->
+            <x:expect label="with message specific to situation"
+                test="$x:result('err')('value')/string()"
+                select="$ov:expected_error"/>
+        </x:scenario>
     </x:scenario>
 
-    <x:scenario label="Recursive 'with-child-controls'">
-        <x:context>
-            <profile>
-                <import href="&filedir;/xyz-tiny_catalog.xml">
-                    <include-controls with-child-controls="yes">
-                        <with-id>z3</with-id>
-                    </include-controls>
-                </import>
-            </profile>
-        </x:context>
+    <x:scenario label="Tests for match='import' mode='o:select' template">
+        <x:scenario label="Resource is available">
+            <x:context mode="o:select"
+                select="(doc($ov:filedir || '/base-test_profile.xml')//o:import)[1]"/>
+            <x:expect label="Selection from imported catalog"
+                select="$ov:catalog-selection-structure"/>
+        </x:scenario>
+        <x:scenario label="Error case: Resource is not available" catch="yes">
+            <x:context mode="o:select"
+                select="(doc($ov:filedir || '/broken_profile.xml')//o:import)[1]"/>
+            <x:expect label="Fatal XSLT error"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+        </x:scenario>
+        <x:scenario label="Error case: Resource reference is circular" catch="yes" pending="XSLT needs to catch up to spec">
+            <x:context mode="o:select"
+                select="(doc($ov:filedir || '/circular_profile.xml')//o:import)[1]"/>
+            <x:expect label="Fatal XSLT error"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+        </x:scenario>
+        <x:scenario label="Error case: href is not castable as xs:anyURI" catch="yes">
+            <x:context mode="o:select"><import/></x:context>
+            <x:expect label="Fatal XSLT error"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+        </x:scenario>
+    </x:scenario>
 
-        <x:expect label="Only the Z3 control, with all control descendants">
-            <profile>
-                <selection uuid="..." opr:src="...">
-                    <metadata>
-                        <title>XYZ Tiny Catalog</title>
-                        <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
-                        <version>1.0</version>
-                        <oscal-version>1.0.0-rc2</oscal-version>
-                    </metadata>
-                    <group opr:id="...">
-                        <title>Group X of XYZ</title>
-                    </group>
-                    <group opr:id="...">
-                        <title>Group Y of XYZ</title>
-                    </group>
-                    <group opr:id="...">
-                        <title>Group Z of XYZ</title>
-                        <control id="z3" opr:id="..."><title>Control Z3</title>
-                            <control id="z3.a" opr:id="..."><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="..."><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
-                    </group>
-                </selection>
-            </profile>
+    <x:scenario label="Tests for match='group' mode='o:select' template">
+        <x:context mode="o:select" select="//o:group">
+            <catalog uuid="catalog-uuid">
+               <group attr="val">
+                   <title>Group X of XYZ</title>
+               </group>
+            </catalog>
+        </x:context>
+        <x:expect label="Copy of element with opr:id inserted">
+            <group attr="val" opr:id="...">
+                <title>Group X of XYZ</title>
+            </group>
         </x:expect>
     </x:scenario>
 
-    <x:scenario label="Doubled import, exclusive call">
-        <x:context>
-            <profile>
-                <import href="&filedir;/xyz-tiny_catalog.xml">
-                    <include-controls>
-                        <with-id>x1</with-id>
-                    </include-controls>
-                </import>
-                <import href="&filedir;/xyz-tiny_catalog.xml">
-                    <include-controls>
-                        <with-id>y1</with-id>
-                    </include-controls>
-                </import>
-            </profile>
-        </x:context>
+    <x:scenario label="Tests for add-process-id template">
+        <x:scenario label="Context element has id">
+            <x:context select="//o:control">
+                <catalog uuid="catalog-uuid">
+                    <control id="control-id"/>
+                </catalog>
+            </x:context>
+            <x:call template="add-process-id"/>
+            <x:expect label="opr:id attribute"
+                test="$x:result instance of attribute(opr:id)"/>
+            <x:expect label="whose value is hash-separated join of catalog uuid and context id"
+                test="$x:result/string()" select="'catalog-uuid#control-id'"/>
+        </x:scenario>
+        <x:scenario label="Context element lacks id">
+            <x:context select="//o:control">
+                <catalog uuid="catalog-uuid">
+                    <control/>
+                </catalog>
+            </x:context>
+            <x:call template="add-process-id"/>
+            <x:expect label="opr:id attribute"
+                test="$x:result instance of attribute(opr:id)"/>
+            <x:expect label="whose value is hash-separated join of catalog uuid and a generated id"
+                test="matches($x:result/string(), 'catalog-uuid#.+')"/>
+        </x:scenario>
+    </x:scenario>
+    
+    <x:scenario label="Tests for opr:catalog-identifier function">
+        <x:scenario label="Catalog has uuid">
+            <x:call function="opr:catalog-identifier">
+                <x:param>
+                    <catalog uuid="abc"/>
+                </x:param>
+            </x:call>
+            <x:expect label="Returns uuid" select="'abc'"/>
+        </x:scenario>
+        <x:scenario label="Catalog lacks uuid">
+            <x:call function="opr:catalog-identifier">
+                <x:param href="catalog-no-uuid.xml" select="/o:catalog"/>
+            </x:call>
+            <x:expect label="Returns document URI of catalog" test="ends-with($x:result,'/catalog-no-uuid.xml')"/>
+        </x:scenario>
+    </x:scenario>
 
-        <x:expect label="Showing two control selections">
-            <profile>
-                <selection uuid="..." opr:src="...">
-                    <metadata>
-                        <title>XYZ Tiny Catalog</title>
-                        <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
-                        <version>1.0</version>
-                        <oscal-version>1.0.0-rc2</oscal-version>
-                    </metadata>
-                    <group opr:id="...">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="..."><title>Control X1</title></control>
-                    </group>
-                    <group opr:id="..."><title>Group Y of XYZ</title></group>
-                    <group opr:id="..."><title>Group Z of XYZ</title></group>
-                </selection>
-                <selection uuid="..." opr:src="...">
-                    <metadata>
-                        <title>XYZ Tiny Catalog</title>
-                        <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
-                        <version>1.0</version>
-                        <oscal-version>1.0.0-rc2</oscal-version>
-                    </metadata>
-                    <group opr:id="...">
-                        <title>Group X of XYZ</title>
-                    </group>
-                    <group opr:id="...">
-                        <title>Group Y of XYZ</title>
-                        <control id="y1" opr:id="..."><title>Control Y1</title></control>
-                    </group>
-                    <group opr:id="..."><title>Group Z of XYZ</title></group>
-                </selection>
-            </profile>
-        </x:expect>
+    <x:scenario label="Tests for match='control' mode='o:select' template">
+        <x:scenario label="Control is selected">
+            <!--Below, $import-instruction is an <import> element that
+                selects the control with id="a1" and the context node
+                has id="a1". -->
+            <x:context mode="o:select"
+                select="doc($ov:filedir || '/catalogs/abc-simple_catalog.xml')//o:control[@id='a1']">
+                <x:param name="import-instruction" tunnel="yes"
+                    select="(doc($ov:filedir || '/base2-test_profile.xml')//o:import)[1]"/>
+            </x:context>
+            <x:expect label="Copy of control element with opr:id inserted">
+                <control id="a1" opr:id="...">...</control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Control is not selected">
+            <x:context mode="o:select">
+                <x:param name="import-instruction" tunnel="yes">
+                    <import/>
+                </x:param>
+                <control id="x1"/>
+            </x:context>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
     </x:scenario>
 
-    <x:scenario label="Loose parameters">
-        <x:context>
-            <profile>
-                <import href="&filedir;/abc-full_catalog.xml">
-                    <include-controls>
-                        <with-id>a1</with-id>
-                        <with-id>b1</with-id>
-                    </include-controls>
-                </import>
-            </profile>
+    <x:scenario label="Tests for match='param' mode='o:select' template">
+        <x:context mode="o:select" select="//o:param">
+            <catalog uuid="catalog-uuid">
+                <!--Skip metadata because not relevant for this scenario.-->
+                <control id="a1">
+                    <title>Control A1</title>
+                    <param id="a1_prm1">
+                        <label>A1 Parameter 1</label>
+                    </param>
+                </control>
+            </catalog>
         </x:context>
-
-        <x:expect label="Two controls in three groups with back matter and loose parameters">
-            <profile>
-                <selection uuid="..." opr:src="...">
-                    <metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                        <title>ABC Catalog</title>
-                        <last-modified>2020-05-30T14:51:38.311-04:00</last-modified>
-                        <version>1.0</version>
-                        <oscal-version>1.0.0-rc2</oscal-version>
-                    </metadata>
-                    <group opr:id="...">
-                        <title>Group A of C</title>
-                        <param id="param-A.a" opr:id="...">
-                            <label>A.a parameter</label>
-                            <value>A.a value</value>
-                        </param>
-                        <param id="param-A.b" opr:id="...">
-                            <select>
-                                <choice>A.b parameter selection choice 1</choice>
-                                <choice>A.b parameter selection choice 2</choice>
-                                <choice>A.b parameter selection choice 3</choice>
-                            </select>
-                        </param>
-                        <control id="a1" opr:id="...">
-                            <title>Control A1</title>
-                            <param id="param-a1.a" opr:id="...">
-                                <label>a1.a parameter</label>
-                                <value>a1.a value</value>
-                            </param>
-                            <prop name="place" value="1st"/>
-                            <part name="statement" id="a1-stmt">
-                                <p>A1 aaaaa aaaaaaaaaa</p>
-                                <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>...</p>
-                                <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>...</p>
-                                <p>Also, we <a href="#citation">refer to a citation</a>.</p>
-                            </part>
-                        </control>
-                    </group>
-                    <group opr:id="...">
-                        <title>Group B of C</title>
-                        <control id="b1" opr:id="...">
-                            <title>Control B1</title>
-                            <prop name="place" value="4th"/>
-                            <part name="statement" id="b1-stmt">
-                                <p>B1 bbbb bbbbbbb.</p>
-                            </part>
-                        </control>
-                    </group>
-                    <group opr:id="...">
-                        <title>Group C of C</title>
-                    </group>
-                    <back-matter>
-                        <resource uuid="...">
-                            <citation>
-                                <text>A citation to an out of line document.</text>
-                            </citation>
-                        </resource>
-                    </back-matter>
-                </selection>
-            </profile>
+        <x:expect label="Copy of param element with opr:id inserted">
+            <param id="a1_prm1" opr:id="...">
+                <label>A1 Parameter 1</label>
+            </param>
         </x:expect>
     </x:scenario>
 
+    <x:scenario label="Tests for o:selects function">
+        <x:variable name="ov:control-hierarchy" as="element(o:control)">
+            <control id="level-one">
+                <control id="level-two">
+                    <control id="level-three">
+                        <control id="level-four"/>
+                    </control>
+                </control>
+            </control>
+        </x:variable>
+        <x:scenario label="Test each include reason, with no exclude reasons. ">
+            <x:scenario label="Include all.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control/>
+                    </x:param>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Include all, omit with-child-controls, and candidate is descendant.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Select by ID.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <with-id>abc</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="abc"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Select by ID, but candidate does not match.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <with-id>abc</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="nonmatch"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Select descendant ID, omitting with-parent-controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <with-id>level-four</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="true (with-parent-controls defaults to yes)" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Select descendant ID, and explicitly include parent controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-parent-controls="yes">
+                                <with-id>level-four</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Select descendant ID and do not include parent controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-parent-controls="no">
+                                <with-id>level-four</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Select ancestor ID and include child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-child-controls="yes">
+                                <with-id>level-two</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Select ancestor ID, omitting with-child-controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <with-id>level-two</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="false (with-child-controls defaults to no)" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Select ancestor ID and do not include child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-child-controls="no">
+                                <with-id>level-two</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Match ID.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <matching pattern="ab*"/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="abc"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Try to match ID, but candidate is not a match.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <matching pattern="ab*"/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="nonmatch"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="matching object with no pattern.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <matching/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="abc"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="matching object with empty string as pattern.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <matching pattern=""/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id=""/>
+                    </x:param>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Match descendant ID, omitting with-parent-controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <matching pattern="*-four"/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="true (with-parent-controls defaults to yes)" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Match descendant ID, with parent controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-parent-controls="yes">
+                                <matching pattern="*-four"/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Match descendant ID, without parent controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-parent-controls="no">
+                                <matching pattern="*-four"/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Match ancestor ID, omitting with-child-controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <matching pattern="*-two"/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="false (with-child-controls defaults to no)" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Match ancestor ID, with child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-child-controls="yes">
+                                <matching pattern="*-two"/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Match ancestor ID, without child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-child-controls="no">
+                                <matching pattern="*-two"/>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Include grandchild with parent controls, and include child without parent controls">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-parent-controls="yes">
+                                <with-id>level-four</with-id>
+                            </include-controls>
+                            <include-controls with-parent-controls="no">
+                                <with-id>level-three</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate"
+                        select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Include grandparent with child controls, and include parent without child controls">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-child-controls="yes">
+                                <with-id>level-two</with-id>
+                            </include-controls>
+                            <include-controls with-child-controls="no">
+                                <with-id>level-three</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate"
+                        select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+        </x:scenario>
+        <x:scenario label="Provide an include reason, and test each exclude reason. ">
+            <x:scenario label="Include all, but explicitly not with child controls, and candidate is descendant.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all with-child-controls="no"/>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Exclude by ID.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <with-id>abc</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="abc"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Exclude by ID but candidate does not match.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <with-id>abc</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="nonmatch"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Exclude descendant ID, omitting with-parent-controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <with-id>level-four</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="false (with-parent-controls defaults to yes)" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Exclude descendant ID with parent controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls with-parent-controls="yes">
+                                <with-id>level-four</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Exclude descendant ID without parent controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls with-parent-controls="no">
+                                <with-id>level-four</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Exclude ancestor ID, omitting with-child-controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <with-id>level-two</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="true (with-child-controls defaults to no)" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Exclude ancestor ID and child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls with-child-controls="yes">
+                                <with-id>level-two</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Exclude ancestor ID without child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls with-child-controls="no">
+                                <with-id>level-two</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Include grandparent with child controls, and exclude parent with child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-child-controls="yes">
+                                <with-id>level-two</with-id>
+                            </include-controls>
+                            <exclude-controls with-child-controls="yes">
+                                <with-id>level-three</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate"
+                        select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Include grandparent with child controls, and exclude parent without excluding child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls with-child-controls="yes">
+                                <with-id>level-two</with-id>
+                            </include-controls>
+                            <exclude-controls with-child-controls="no">
+                                <with-id>level-three</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate"
+                        select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Match ID.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <matching pattern="ab*"/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="abc"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Try to match ID, but candidate is not a match.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <matching pattern="ab*"/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="nonmatch"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="matching object with no pattern.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <matching pattern=""/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id="abc"/>
+                    </x:param>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="matching object with empty string as pattern.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <matching pattern=""/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate">
+                        <control id=""/>
+                    </x:param>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Match descendant ID, omitting with-parent-controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <matching pattern="*-four"/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="false (with-parent-controls defaults to yes)" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Match descendant ID, with parent controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls with-parent-controls="yes">
+                                <matching pattern="*-four"/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Match descendant ID, without parent controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls with-parent-controls="no">
+                                <matching pattern="*-four"/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-two']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Match ancestor ID, omitting with-child-controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls>
+                                <matching pattern="*-two"/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="true (with-child-controls defaults to no)" select="true()"/>
+            </x:scenario>
+            <x:scenario label="Match ancestor ID, with child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls with-child-controls="yes">
+                                <matching pattern="*-two"/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="Match ancestor ID, without child controls.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-all/>
+                            <exclude-controls with-child-controls="no">
+                                <matching pattern="*-two"/>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="true" select="true()"/>
+            </x:scenario>
+        </x:scenario>
+        <x:scenario label="Spot-check that having multiple include reasons is fine.">
+            <x:call function="o:selects">
+                <x:param name="importing">
+                    <import>
+                        <include-controls with-child-controls="yes">
+                            <matching pattern="*-two"/>
+                        </include-controls>
+                        <include-controls>
+                            <with-id>level-four</with-id>
+                        </include-controls>
+                    </import>
+                </x:param>
+                <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+            </x:call>
+            <x:expect label="true" select="true()"/>
+        </x:scenario>
+        <x:scenario label="Spot-check that having multiple exclude reasons is fine.">
+            <x:call function="o:selects">
+                <x:param name="importing">
+                    <import>
+                        <exclude-controls with-child-controls="yes">
+                            <matching pattern="*-two"/>
+                        </exclude-controls>
+                        <exclude-controls>
+                            <with-id>level-four</with-id>
+                        </exclude-controls>
+                    </import>
+                </x:param>
+                <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+            </x:call>
+            <x:expect label="false" select="false()"/>
+        </x:scenario>
+        <x:scenario label="Spot-check that exclude reasons override include reasons, ">
+            <x:scenario label="if exclude reason appears first.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <exclude-controls>
+                                <with-id>level-four</with-id>
+                            </exclude-controls>
+                            <include-controls>
+                                <with-id>level-four</with-id>
+                            </include-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+            <x:scenario label="if exclude reason appears second.">
+                <x:call function="o:selects">
+                    <x:param name="importing">
+                        <import>
+                            <include-controls>
+                                <with-id>level-four</with-id>
+                            </include-controls>
+                            <exclude-controls>
+                                <with-id>level-four</with-id>
+                            </exclude-controls>
+                        </import>
+                    </x:param>
+                    <x:param name="candidate" select="$ov:control-hierarchy//o:control[@id='level-four']"/>
+                </x:call>
+                <x:expect label="false" select="false()"/>
+            </x:scenario>
+        </x:scenario>
+        <x:scenario label="Edge case of no import instructions">
+            <x:call function="o:selects">
+                <x:param name="importing">
+                    <import/>
+                </x:param>
+                <x:param name="candidate">
+                    <control/>
+                </x:param>
+            </x:call>
+            <x:expect label="false" select="false()"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for o:calls-children function">
+        <x:scenario label="with-child-controls attribute is 'yes'">
+            <x:call function="o:calls-children">
+                <x:param>
+                    <elem with-child-controls="yes"/>
+                </x:param>
+            </x:call>
+            <x:expect label="true" select="true()"/>
+        </x:scenario>
+        <x:scenario label="with-child-controls attribute is 'no'">
+            <x:call function="o:calls-children">
+                <x:param>
+                    <elem with-child-controls="no"/>
+                </x:param>
+            </x:call>
+            <x:expect label="false" select="false()"/>
+        </x:scenario>
+        <x:scenario label="with-child-controls attribute is omitted">
+            <x:call function="o:calls-children">
+                <x:param>
+                    <elem/>
+                </x:param>
+            </x:call>
+            <x:expect label="false" select="false()"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for o:calls-parents function">
+        <x:scenario label="with-parent-controls attribute is 'yes'">
+            <x:call function="o:calls-parents">
+                <x:param>
+                    <elem with-parent-controls="yes"/>
+                </x:param>
+            </x:call>
+            <x:expect label="true" select="true()"/>
+        </x:scenario>
+        <x:scenario label="with-parent-controls attribute is 'no'">
+            <x:call function="o:calls-parents">
+                <x:param>
+                    <elem with-parent-controls="no"/>
+                </x:param>
+            </x:call>
+            <x:expect label="false" select="false()"/>
+        </x:scenario>
+        <x:scenario label="with-parent-controls attribute is omitted">
+            <x:call function="o:calls-parents">
+                <x:param>
+                    <elem/>
+                </x:param>
+            </x:call>
+            <x:expect label="true" select="true()"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for o:resource-or-error function">
+        <x:scenario label="Document is available">
+            <x:call function="o:resource-or-error">
+                <x:param select="(doc($ov:filedir || '/base-test_profile.xml')//o:import)[1]/@href"/>
+            </x:call>
+            <x:expect label="Resolved document" test="exists($x:result/self::document-node()/o:catalog)"/>
+        </x:scenario>
+        <x:scenario label="Error case: Document is not available" catch="yes">
+            <x:call function="o:resource-or-error">
+                <x:param select="(doc($ov:filedir || '/broken_profile.xml')//o:import)[1]/@href"/>
+            </x:call>
+            <x:expect label="Fatal XSLT error"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+        </x:scenario>
+    </x:scenario>
+    
+    <x:scenario label="Tests for o:resolve-profile function" pending="incomplete">
+        <!-- Intended for the case where an profile imports another profile,
+            this function is not in use yet. For now, just test that the
+            function can run. When it is decided whether to keep this
+            approach, we can add more test scenarios. -->
+        <x:scenario label="Sanity check">
+            <x:call function="o:resolve-profile">
+                <x:param name="profile">
+                    <o:profile href="{$ov:filedir}/base-test_profile.xml"/>
+                </x:param>
+                <x:param name="uri-stack" select="xs:anyURI($ov:filedir || '/base-test_profile.xml')"/>
+            </x:call>
+            <x:expect label="Catalog">
+                <catalog uuid="...">...</catalog>
+            </x:expect>
+        </x:scenario>
+    </x:scenario>
 </x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/2_metadata/metadata.xspec b/src/utils/util/resolver-pipeline/testing/2_metadata/metadata.xspec
index a670f3b298..2cb9d2fade 100644
--- a/src/utils/util/resolver-pipeline/testing/2_metadata/metadata.xspec
+++ b/src/utils/util/resolver-pipeline/testing/2_metadata/metadata.xspec
@@ -1,162 +1,359 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <x:description
-    xmlns="http://csrc.nist.gov/ns/oscal/1.0" xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns="http://csrc.nist.gov/ns/oscal/1.0"    
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:ov="http://csrc.nist.gov/ns/oscal/xspec/variable"
+    xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    run-as="external"
     stylesheet="../../oscal-profile-resolve-metadata.xsl">
-    <x:scenario label="Base">
-        <x:context>
-            <profile uuid="test"/>
-        </x:context>
-
-        <x:expect label="profile becomes catalog">
-            <catalog uuid="..."/>
-        </x:expect>
-    </x:scenario>
+    
+    <!-- In this file, the purpose of run-as="external" is to enable
+        individual scenarios to specify values of global XSLT
+        parameters. -->
 
-    <x:scenario label="floor">
-        <x:context>
-            <profile uuid="test">
+    <x:variable name="ov:sample-output-from-pipeline-step-1" as="element(o:profile)">
+        <profile uuid="cb1ec926-3441-458f-8cce-ea11308c9d37">
+            <metadata>
+                <title>Test Profile</title>
+                <last-modified>2021-05-30T14:39:35.84-04:00</last-modified>
+                <version>1.3</version>
+                <oscal-version>1.0.1</oscal-version>
+            </metadata>
+            <selection uuid="6498eb6e-8653-4470-8b97-54054d3ba886" opr:src="some-value">
                 <metadata>
-                    <title>Small Profile for Testing</title>
-                    <last-modified>2019-11-13T12:13:58.517-05:00</last-modified>
+                    <title>XYZ Tiny Catalog</title>
+                    <last-modified>2020-05-30T14:51:42.355-04:00</last-modified>
                     <version>1.0</version>
-                    <oscal-version>1.0-rc2</oscal-version>
+                    <oscal-version>1.0.0</oscal-version>
+                    <prop name="catalog-required" value="some value"/>
+                    <link href="#catalog-internal"><text>Internal link within catalog</text></link>
                 </metadata>
-            </profile>
-        </x:context>
+                <group opr:id="some-id">
+                    <title>Group X of XYZ</title>
+                </group>
+            </selection>
+        </profile>
+    </x:variable>
 
-        <x:expect label="profile becomes catalog">
-            <catalog uuid="...">
-                <metadata>
-                    <title>Small Profile for Testing</title>
-                    <last-modified>...</last-modified>
-                    <version>1.0</version>
-                    <oscal-version>1.0-rc2</oscal-version>
-                    <link href="urn:UNKNOWN" rel="resolution-source"/>
-                </metadata>
-            </catalog>
-        </x:expect>
+    <x:scenario label="Tests for match='/ | * | @*' template for all modes">
+        <x:variable name="ov:arbitrary-element" as="element(arbitrary-element)">
+            <arbitrary-element xmlns="" arbitrary-attribute="val">text<child/></arbitrary-element>
+        </x:variable>
+        <x:scenario label="Element">
+            <x:context select="$ov:arbitrary-element"/>
+            <x:expect label="Copy" select="$ov:arbitrary-element"/>
+        </x:scenario>
+        <x:scenario label="Attribute">
+            <x:context select="$ov:arbitrary-element/@arbitrary-attribute"/>
+            <x:expect label="Copy"
+                test="$x:result instance of attribute(arbitrary-attribute) and $x:result/string()='val'"/>
+        </x:scenario>
     </x:scenario>
-    <x:scenario label="enhance metadata">
+
+    <x:scenario label="Tests for match=profile template">
+        <x:variable name="ov:top-uuid" as="xs:string"
+            select="'12345678-90AB-4CDE-a012-bcdef0123456'"/>
+        <x:param name="profile-origin-uri" select="'urn:UNKNOWN/some-profile-filename.xml'"/>
         <x:context>
-            <profile uuid="pathological-profile">
+            <profile uuid="test"/>
+        </x:context>
+        <x:scenario label="Basic case">
+            <x:param name="top-uuid" select="$ov:top-uuid"/>
+            <x:param name="uuid-method" select="'user-provided'"/>
+            <x:expect label="Catalog uses specified uuid"
+                test="/o:catalog/@uuid/string()" select="$ov:top-uuid"/>
+        </x:scenario>
+        <x:scenario label="selection/metadata has prop and link children">
+            <x:context select="$ov:sample-output-from-pipeline-step-1"/>            
+            <x:expect label="Source catalog prop does not leak into output catalog metadata"
+                test="exists(/o:catalog/o:metadata) and
+                empty(/o:catalog/o:metadata/o:prop[@name='catalog-required'])"/>
+            <x:expect label="Source catalog link does not leak into output catalog metadata"
+                test="exists(/o:catalog/o:metadata) and
+                empty(/o:catalog/o:metadata/o:link[@href='#catalog-internal'])"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for match=profile/metadata template">
+        <x:scenario label="Simple case">
+            <x:context select="$ov:sample-output-from-pipeline-step-1/o:metadata"/>
+            <x:expect label="Metadata includes profile version, resolution-tool prop, and source-profile link">
                 <metadata>
-                    <title>Pathological Profile</title>
-                    <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
-                    <version>1.0</version>
-                    <oscal-version>1.0-rc2</oscal-version>
+                    <title>Test Profile</title>
+                    <last-modified>...</last-modified>
+                    <version>1.3</version>
+                    <oscal-version>...</oscal-version>
+                    <prop name="resolution-tool" value="OSCAL Profile Resolver XSLT Pipeline OPRXP" />
+                    <link href="urn:UNKNOWN" rel="source-profile" />
                 </metadata>
-                <selection uuid="abc-full_catalog">
+            </x:expect>
+            <x:expect label="version value matches version of source profile"
+                test="/o:metadata/o:version/string()" select="'1.3'"/>
+        </x:scenario>
+        <x:scenario label="profile/metadata has additional children, 'leader' and others">
+            <x:context select="/o:profile/o:metadata">
+                <profile uuid="pathological-profile">
                     <metadata>
-                        <title>ABC Catalog</title>
-                        <last-modified>2019-11-01T10:16:22.939-04:00</last-modified>
+                        <title>Pathological Profile</title>
+                        <published>2019-11-13T12:41:07.061-05:00</published>
+                        <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
                         <version>1.0</version>
                         <oscal-version>1.0-rc2</oscal-version>
+                        <document-id scheme="https://www.doi.org/">...doi...</document-id>
+                        <party>
+                            <org>
+                                <org-name>Standing Committee</org-name>
+                            </org>
+                        </party>
                     </metadata>
-                </selection>
-            </profile>
-        </x:context>
-
-        <x:expect label="title amended, with properties and link added">
-            <catalog uuid="...">
+                </profile>
+            </x:context>            
+            <x:expect label="resolution-tool and source-profile are between last 'leader' (document-id) and 'everything else' (party)">
                 <metadata>
-                    <title>Pathological Profile</title>
+                    <title>...</title>
+                    <published>2019-11-13T12:41:07.061-05:00</published>
                     <last-modified>...</last-modified>
-                    <version>1.0</version>
-                    <oscal-version>1.0-rc2</oscal-version>
-                    <link href="urn:UNKNOWN"
-                        rel="resolution-source"/>
-                </metadata>
-                <selection uuid="abc-full_catalog"/>
-            </catalog>
-        </x:expect>
-    </x:scenario>
-    <x:scenario label="place link correctly">
-        <x:context>
-            <profile uuid="pathological-profile">
-                <metadata>
-                    <title>Pathological Profile</title>
-                    <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
-                    <version>1.0</version>
-                    <oscal-version>1.0-rc2</oscal-version>
+                    <version>...</version>
+                    <oscal-version>...</oscal-version>
+                    <document-id scheme="https://www.doi.org/">...doi...</document-id>
+                    <prop name="resolution-tool" value="..."/>
+                    <link href="urn:UNKNOWN" rel="source-profile"/>
                     <party>
                         <org>
                             <org-name>Standing Committee</org-name>
                         </org>
                     </party>
                 </metadata>
-                <selection uuid="abc-full_catalog">
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="profile/metadata has prop child">
+            <x:context select="/o:profile/o:metadata">
+                <profile uuid="pathological-profile">
                     <metadata>
-                        <title>ABC Catalog</title>
-                        <last-modified>2019-11-01T10:16:22.939-04:00</last-modified>
+                        <title>Pathological Profile</title>
+                        <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
                         <version>1.0</version>
                         <oscal-version>1.0-rc2</oscal-version>
+                        <prop name="required" value="some value"/>
+                        <prop name="optional" value="some other value"/>
                     </metadata>
-                </selection>
-            </profile>
-        </x:context>
-
-        <x:expect label="title amended, link added before party">
-            <catalog uuid="...">
+                </profile>
+            </x:context>            
+            <x:expect label="resolution-tool prop is after last prop from input">
                 <metadata>
-                    <title>Pathological Profile</title>
+                    <title>...</title>
                     <last-modified>...</last-modified>
-                    <version>1.0</version>
-                    <oscal-version>1.0-rc2</oscal-version>
-                    <link href="urn:UNKNOWN" rel="resolution-source"/>
-                    <party>
-                        <org>
-                            <org-name>Standing Committee</org-name>
-                        </org>
-                    </party>
-                </metadata>
-                <selection uuid="abc-full_catalog"/>
-            </catalog>
-        </x:expect>
-    </x:scenario>
-    <x:scenario label="place link correctly with another link">
-        <x:context>
-            <profile uuid="pathological-profile">
-                <metadata>
-                    <title>Pathological Profile</title>
-                    <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
-                    <version>1.0</version>
-                    <oscal-version>1.0-rc2</oscal-version>
-                    <link href="#internal"><text>Internal link</text></link>
-                    <party>
-                        <org>
-                            <org-name>Standing Committee</org-name>
-                        </org>
-                    </party>
+                    <version>...</version>
+                    <oscal-version>...</oscal-version>
+                    <prop name="required" value="some value"/>
+                    <prop name="optional" value="some other value"/>
+                    <prop name="resolution-tool" value="..."/>
+                    <link href="..." rel="source-profile"/>
                 </metadata>
-                <selection uuid="abc-full_catalog">
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="profile/metadata has link">
+            <x:context select="/o:profile/o:metadata">
+                <profile uuid="pathological-profile">
                     <metadata>
-                        <title>ABC Catalog</title>
-                        <last-modified>2019-11-01T10:16:22.939-04:00</last-modified>
+                        <title>Pathological Profile</title>
+                        <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
                         <version>1.0</version>
                         <oscal-version>1.0-rc2</oscal-version>
+                        <link href="#internal"><text>Internal link</text></link>
                     </metadata>
-                </selection>
-            </profile>
-        </x:context>
-
-        <x:expect label="title amended, link added before old link">
-            <catalog uuid="...">
+                </profile>
+            </x:context>
+            <x:expect label="source-profile link is inserted before copied link">
                 <metadata>
-                    <title>Pathological Profile</title>
+                    <title>...</title>
                     <last-modified>...</last-modified>
-                    <version>1.0</version>
-                    <oscal-version>1.0-rc2</oscal-version>
-                    <link href="urn:UNKNOWN" rel="resolution-source"/>
+                    <version>...</version>
+                    <oscal-version>...</oscal-version>
+                    <prop name="resolution-tool" value="..."/>
+                    <link href="..." rel="source-profile"/>
                     <link href="#internal"><text>Internal link</text></link>
-                    <party>
-                        <org>
-                            <org-name>Standing Committee</org-name>
-                        </org>
-                    </party>
                 </metadata>
-                <selection uuid="abc-full_catalog"/>
-            </catalog>
-        </x:expect>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Option to hide source profile URI">
+            <x:param name="hide-source-profile-uri" select="true()"/>
+            <x:context select="$ov:sample-output-from-pipeline-step-1/o:metadata"/>
+            <x:expect label="link rel=source-profile has generic href value"
+                test="//o:link[@rel='source-profile']">
+                <link href="profile" rel="source-profile"/>
+            </x:expect>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for match=last-modified template">
+        <x:scenario label="Typical case">
+            <x:context select="$ov:sample-output-from-pipeline-step-1/o:metadata/o:last-modified"/>
+            <x:expect label="last-modified element without attributes">
+                <last-modified>...</last-modified>
+            </x:expect>
+            <x:expect label="Element content is a time stamp"
+                test="$x:result/node() castable as xs:dateTime"/>
+            <!-- last-modified content must represent the time the profile resolution
+                completed. Sanity-check that last-modified is not a copy of the
+                last-modified timestamps from the input document. -->
+            <x:variable name="ov:inputs-last-modified" as="xs:string+"
+                select="$ov:sample-output-from-pipeline-step-1//o:last-modified/string()"/>
+            <x:expect label="last-modified content is not from input document"
+                test="not(o:metadata/o:last-modified/string() = $ov:inputs-last-modified)"/>
+        </x:scenario>
+        <x:scenario label="Empty last-modified in source document">
+            <x:context>
+                <last-modified/>
+            </x:context>
+            <x:expect label="Output still has a time stamp"
+                test="$x:result/self::o:last-modified/node() castable as xs:dateTime"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for match=profile/metadata/oscal-version template">
+        <x:scenario label="Simple case">
+            <x:context select="/o:profile/o:metadata/o:oscal-version">
+                <profile>
+                    <metadata>
+                        <oscal-version>1.3</oscal-version>
+                    </metadata>
+                </profile>
+            </x:context>
+            <x:expect label="oscal-version">
+                <oscal-version>...</oscal-version>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Sanity checks for calling opr:oscal-version with correct inputs: " pending="opr:oscal-version not implemented yet">
+            <x:scenario label="Most recent version is in selection metadata">
+                <x:context select="/o:profile/o:metadata/o:oscal-version">
+                    <profile>
+                        <metadata>
+                            <oscal-version>1.0.3</oscal-version>
+                        </metadata>
+                        <!-- All selections from pipeline's step 1 output
+                            are under consideration, not just first or last. -->
+                        <selection>
+                            <metadata>
+                                <oscal-version>1.0.1</oscal-version>
+                            </metadata>
+                        </selection>
+                        <selection>
+                            <metadata>
+                                <oscal-version>1.0.4</oscal-version>
+                            </metadata>
+                        </selection>
+                        <selection>
+                            <metadata>
+                                <oscal-version>1.0.2</oscal-version>
+                            </metadata>
+                        </selection>
+                    </profile>
+                </x:context>
+                <x:expect label="Most recent minor version mentioned in document">
+                    <oscal-version>1.0.4</oscal-version>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="Most recent version is in profile metadata">
+                <x:context select="/o:profile/o:metadata/o:oscal-version">
+                    <profile>
+                        <metadata>
+                            <oscal-version>1.0.4</oscal-version>
+                        </metadata>
+                        <selection>
+                            <metadata>
+                                <oscal-version>1.0.1</oscal-version>
+                            </metadata>
+                        </selection>
+                    </profile>
+                </x:context>
+                <x:expect label="Most recent minor version mentioned in document">
+                    <oscal-version>1.0.4</oscal-version>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="Tool version is older than document versions">
+                <x:context select="/o:profile/o:metadata/o:oscal-version">
+                    <profile>
+                        <metadata>
+                            <oscal-version>1.4.0</oscal-version>
+                        </metadata>
+                        <selection>
+                            <metadata>
+                                <oscal-version>1.2.0</oscal-version>
+                            </metadata>
+                        </selection>
+                    </profile>
+                </x:context>
+                <x:expect label="Tool version">
+                    <oscal-version>1.1.0</oscal-version>
+                </x:expect>
+            </x:scenario>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for opr:oscal-version function" pending="opr:oscal-version not implemented yet">
+        <x:scenario label="Same major version">
+            <x:scenario label="Source profile version newer than imported document">
+                <x:call function="opr:oscal-version">
+                    <x:param name="source" select="'1.0.1'"/>
+                    <x:param name="imported" select="('1.0.0','1.0.0')"/>
+                    <x:param name="tool" select="'1.0.1'"/>
+                </x:call>
+                <x:expect label="Newest minor version" select="'1.0.1'"/>
+            </x:scenario>
+            <x:scenario label="Source profile version older than imported document">
+                <x:call function="opr:oscal-version">
+                    <x:param name="source" select="'1.0.0'"/>
+                    <x:param name="imported" select="('1.0.1','1.0.1')"/>
+                    <x:param name="tool" select="'1.0.1'"/>
+                </x:call>
+                <x:expect label="Newest minor version" select="'1.0.1'"/>
+            </x:scenario>
+            <x:scenario label="Tool version is older">
+                <x:call function="opr:oscal-version">
+                    <x:param name="source" select="'1.0.1'"/>
+                    <x:param name="imported" select="('1.0.1','1.0.1')"/>
+                    <x:param name="tool" select="'1.0.0'"/>
+                </x:call>
+                <x:expect label="Tool version" select="'1.0.0'"/>
+            </x:scenario>
+        </x:scenario>
+        <x:scenario label="Different major version">
+            <x:scenario label="Source profile version newer than imported document">
+                <x:call function="opr:oscal-version">
+                    <x:param name="source" select="'2.0.1'"/>
+                    <x:param name="imported" select="('1.0.0','1.0.0')"/>
+                    <x:param name="tool" select="'2.0.1'"/>
+                </x:call>
+                <x:expect label="Error"
+                    test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+            </x:scenario>
+            <x:scenario label="Source profile version older than imported document">
+                <x:call function="opr:oscal-version">
+                    <x:param name="source" select="'1.0.0'"/>
+                    <x:param name="imported" select="('2.0.1','2.0.1')"/>
+                    <x:param name="tool" select="'2.0.1'"/>
+                </x:call>
+                <x:expect label="Error"
+                    test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+            </x:scenario>
+            <x:scenario label="Tool version is older">
+                <x:call function="opr:oscal-version">
+                    <x:param name="source" select="'2.0.1'"/>
+                    <x:param name="imported" select="('2.0.1','2.0.1')"/>
+                    <x:param name="tool" select="'1.0.0'"/>
+                </x:call>
+                <x:expect label="Error"
+                    test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>
+            </x:scenario>
+        </x:scenario>
+    </x:scenario>
+    
+    <x:scenario label="Tests for match=selection/metadata template">
+        <x:context select="$ov:sample-output-from-pipeline-step-1//o:selection/o:metadata"/>
+        <x:expect label="Nothing" select="()"/>
     </x:scenario>
 
 </x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/2_metadata/random-util.xspec b/src/utils/util/resolver-pipeline/testing/2_metadata/random-util.xspec
new file mode 100644
index 0000000000..daa5ea4471
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/testing/2_metadata/random-util.xspec
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:ov="http://csrc.nist.gov/ns/oscal/xspec/variable"
+    xmlns:r="http://csrc.nist.gov/ns/random"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    stylesheet="../../random-util.xsl"
+    xslt-version="3.0">
+
+    <!-- For repeatable testing, use a fixed germ. Also, XSpec
+        cannot evaluate document-uri(/) in the default parameter
+        value from the XSLT. -->
+    <x:param name="germ">x</x:param>
+
+    <x:variable name="ov:uuid-v4-regex" as="xs:string">^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$</x:variable>
+    <x:variable name="ov:seed" as="item()" select="'x'"/>
+    <x:variable name="ov:PRNG" as="map(xs:string, item())" select="random-number-generator($ov:seed)"/>
+
+    <x:scenario label="Tests for top-level template">
+        <x:call template="xsl:initial-template"/>
+        <!-- Assertions here are minimal because r:make-uuid
+            has function-level tests below. -->
+        <x:expect label="Repeatable result for the seed, 'a'"
+            test="$x:result/a[1]/string()" select="$x:result/a[2]/string()"/>
+        <x:expect label="The 'b' uuid is different from the 'a' uuid"
+            test="not($x:result/a[1]/string() = $x:result/b/string())"/>
+    </x:scenario>
+
+    <x:scenario label="Tests for r:make-uuid function">
+        <x:call function="r:make-uuid">
+            <x:param name="seed" select="$ov:seed"/>
+        </x:call>
+        <x:expect label="Same as calling r:make-uuid-sequence with seq-length=1"
+            select="r:make-uuid-sequence($ov:seed, 1)"/>      
+    </x:scenario>
+    <x:scenario label="Tests for r:make-uuid-sequence function">
+        <x:scenario label="seq-length=1">
+            <x:variable name="ov:seq-length" as="xs:integer" select="1"/>
+            <x:call function="r:make-uuid-sequence">
+                <x:param name="seed" select="$ov:seed"/>
+                <x:param name="seq-length" select="$ov:seq-length"/>
+            </x:call>
+            <x:like label="SHARED: Check sequence of uuids"/>
+        </x:scenario>
+        <x:scenario label="seq-length=10000">
+            <x:variable name="ov:seq-length" as="xs:integer" select="10000"/>
+            <x:call function="r:make-uuid-sequence">
+                <x:param name="seed" select="$ov:seed"/>
+                <x:param name="seq-length" select="$ov:seq-length"/>
+            </x:call>
+            <x:like label="SHARED: Check sequence of uuids"/>
+            <x:expect label="Check uniqueness of strings in the sequence"
+                test="$x:result => distinct-values() => count() = $ov:seq-length"/>
+            <x:expect label="Check that 2nd uuid is not a shift of 1st uuid"
+                test="not(starts-with($x:result[2],substring($x:result[1],2,7)))"/>
+        </x:scenario>
+        <x:scenario label="seq-length=500,000" pending="To save time, run only when needed">
+            <x:variable name="ov:seq-length" as="xs:integer" select="500000"/>
+            <x:call function="r:make-uuid-sequence">
+                <x:param name="seed" select="$ov:seed"/>
+                <x:param name="seq-length" select="$ov:seq-length"/>
+            </x:call>
+            <x:like label="SHARED: Check sequence of uuids"/>
+            <x:expect label="Check uniqueness of strings in the sequence"
+                test="$x:result => distinct-values() => count() = $ov:seq-length"/>
+        </x:scenario>
+        <x:scenario label="Edge case: seq-length=0">
+            <x:call function="r:make-uuid-sequence">
+                <x:param name="seed" select="$ov:seed"/>
+                <x:param name="seq-length" as="xs:integer" select="0"/>
+            </x:call>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
+    </x:scenario>
+    <x:scenario label="Tests for r:make-random-string-sequence function">
+        <x:scenario label="Template starts with _">
+            <x:variable name="ov:template" select="'_xyz'"/>
+            <x:call function="r:make-random-string-sequence">
+                <x:param name="seed" select="$ov:seed"/>
+                <x:param name="seq-length" select="1"/>
+                <x:param name="template" select="$ov:template"/>
+            </x:call>
+            <x:expect label="Starts with hex digit"
+                test="matches($x:result,'^[0-9a-f]')"/>
+            <x:expect label="Same length as template"
+                test="string-length($x:result)=string-length($ov:template)"/>
+            <x:expect label="For this template, characters after the first are not hex digits"
+                test="not(matches(substring($x:result,2),'[0-9a-f]'))"/>
+        </x:scenario>
+        <x:scenario label="Template starts with =">
+            <x:variable name="ov:template" select="'=xyz'"/>
+            <x:call function="r:make-random-string-sequence">
+                <x:param name="seed" select="$ov:seed"/>
+                <x:param name="seq-length" select="1"/>
+                <x:param name="template" select="$ov:template"/>
+            </x:call>
+            <x:expect label="Starts with 8, 9, a, or b"
+                test="matches($x:result,'^[89ab]')"/>
+            <x:expect label="Same length as template"
+                test="string-length($x:result)=string-length($ov:template)"/>
+            <x:expect label="For this template, characters after the first are not 8, 9, a, or b"
+                test="not(matches(substring($x:result,2),'[89ab]'))"/>
+        </x:scenario>
+        <x:scenario label="Template is empty string">
+            <x:call function="r:make-random-string-sequence">
+                <x:param name="seed" select="$ov:seed"/>
+                <x:param name="seq-length" select="1"/>
+                <x:param name="template" select="''"/>
+            </x:call>
+            <x:expect label="Empty string" select="''"/>
+        </x:scenario>
+        <x:scenario label="Long template of repeated '_' characters">
+            <x:variable name="ov:template" select="string-join(for $j in (1 to 10000) return '_','')"/>
+            <x:variable name="ov:expected-digits" as="xs:string" select="'^[0-9a-f]+$'"/>
+            <x:call function="r:make-random-string-sequence">
+                <x:param name="seed" select="$ov:seed"/>
+                <x:param name="seq-length" select="1"/>
+                <x:param name="template" select="$ov:template"/>
+            </x:call>
+            <x:like label="SHARED: Check long output"/>
+        </x:scenario>
+        <x:scenario label="Long template of repeated '=' characters">
+            <x:variable name="ov:template" select="string-join(for $j in (1 to 10000) return '=','')"/>
+            <x:variable name="ov:expected-digits" as="xs:string" select="'^[89ab]+$'"/>
+            <x:call function="r:make-random-string-sequence">
+                <x:param name="seed" select="$ov:seed"/>
+                <x:param name="seq-length" select="1"/>
+                <x:param name="template" select="$ov:template"/>
+            </x:call>
+            <x:like label="SHARED: Check long output"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Test for '_' character with mode=uuid-char">
+        <x:context select="'_'" mode="uuid-char">
+            <x:param name="PRNG" select="$ov:PRNG"/>
+        </x:context>
+        <x:expect label="One hex digit"
+            test="matches($x:result,'^[0-9a-f]$')"/>
+        <!-- The "Long template of repeated '_' characters" scenario
+            checks that it is not the same hex digit for all PRNG inputs. -->
+    </x:scenario>
+    <x:scenario label="Test for '=' character with mode=uuid-char">
+        <x:context select="'='" mode="uuid-char">
+            <x:param name="PRNG" select="$ov:PRNG"/>
+        </x:context>
+        <x:expect label="One character 8, 9, a, or b"
+            test="matches($x:result,'^[89ab]$')"/>
+        <!-- The "Long template of repeated '=' characters" scenario
+            checks that it is not the same hex digit for all PRNG inputs. -->
+    </x:scenario>
+    <x:scenario label="Tests for characters other than '_' or '=', with mode=uuid-char">
+        <!-- These tests exercise the default template behavior for mode="uuid-char". -->
+        <x:scenario label="Empty string">
+            <x:context select="''" mode="uuid-char">
+                <x:param name="PRNG" select="$ov:PRNG"/>
+            </x:context>
+            <x:expect label="Text node with no content"
+                test="$x:result instance of text() and string-length($x:result) eq 0"/>
+        </x:scenario>
+        <x:scenario label="Hyphen">
+            <x:context select="'-'" mode="uuid-char">
+                <x:param name="PRNG" select="$ov:PRNG"/>
+            </x:context>
+            <x:expect label="Text node with hyphen">-</x:expect>
+        </x:scenario>
+        <x:scenario label="A non-ASCII character">
+            <x:variable name="ov:charnum" as="xs:integer" select="500"/>
+            <x:context select="codepoints-to-string($ov:charnum)" mode="uuid-char">
+                <x:param name="PRNG" select="random-number-generator('123')"/>
+            </x:context>
+            <x:expect label="Text node with same character"
+                expand-text="yes">{codepoints-to-string($ov:charnum)}</x:expect>
+        </x:scenario>
+    </x:scenario>
+
+    <!-- SHARED scenarios -->
+
+    <x:scenario shared="yes" label="SHARED: Check long output">
+        <!-- This set of shared assertions expects the referencing
+            scenario to have defined <x:variable name="ov:expected-digits" .../> -->
+        <x:expect label="String of digits in expected set"
+            test="matches($x:result,$ov:expected-digits)"/>
+        <x:expect label="Same length as template"
+            test="string-length($x:result) = string-length($ov:template)"/>
+        <x:variable name="ov:distinct-codepoints" as="xs:integer+"
+            select="$x:result => string-to-codepoints() => distinct-values()"/>
+        <x:expect label="String is not the same digit repeated"
+            test="count($ov:distinct-codepoints) gt 1"/>
+    </x:scenario>
+    
+    <x:scenario shared="yes" label="SHARED: Check sequence of uuids">
+        <!-- This set of shared assertions expects the referencing
+            scenario or its ancestor to have defined
+            <x:variable name="ov:seq-length" .../> and
+            <x:variable name="ov:seed" .../> -->
+        <x:expect label="Correct number of strings"
+            test="$x:result instance of xs:string+ and count($x:result) eq $ov:seq-length"/>
+        <x:expect label="Each string matches uuid regular expression"
+            test="every $uuid in $x:result satisfies matches($uuid, $ov:uuid-v4-regex)"/>
+        <x:expect label="Check repeatability for same seed"
+            test="deep-equal($x:result, r:make-uuid-sequence($ov:seed, $ov:seq-length))"/>
+        <x:expect label="Not typically equal to function output for a different seed"
+            test="not(deep-equal($x:result, r:make-uuid-sequence($ov:seed || '1', $ov:seq-length)))"/>
+    </x:scenario>
+
+</x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/2_metadata/uuid-method-choice.xspec b/src/utils/util/resolver-pipeline/testing/2_metadata/uuid-method-choice.xspec
new file mode 100644
index 0000000000..f1a5f6b8e3
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/testing/2_metadata/uuid-method-choice.xspec
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:ov="http://csrc.nist.gov/ns/oscal/xspec/variable"
+    xmlns:u="http://csrc.nist.gov/ns/uuid"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    stylesheet="../../uuid-method-choice.xsl">
+    
+    <x:scenario label="Tests for u:determine-uuid template">
+        <x:variable name="ov:fixed" as="xs:string" select="'00000000-0000-4000-B000-000000000000'"/>
+        <x:variable name="ov:specified" as="xs:string" select="'f0ad1e6c-5de5-44cd-b92e-a4c507805f0f'"/>
+        <x:variable name="ov:service" as="xs:string" select="resolve-uri('../uuid-value.txt')"/>
+        <x:scenario label="Valid user-provided UUID">
+            <x:call template="u:determine-uuid">
+                <x:param name="top-uuid" select="$ov:specified"/>
+                <x:param name="uuid-method" select="'user-provided'"/>
+            </x:call>
+            <x:expect label="Specified UUID" select="$ov:specified"/>
+        </x:scenario>
+        <x:scenario label="Invalid user-provided UUID">
+            <x:call template="u:determine-uuid">
+                <x:param name="top-uuid" select="'123'"/>
+                <x:param name="uuid-method" select="'user-provided'"/>
+            </x:call>
+            <x:expect label="Fixed UUID" select="$ov:fixed"/>
+        </x:scenario>
+        <x:scenario label="Random UUID using XSLT">
+            <!-- Random XSLT method requires a global context item.
+                For this test's purpose, the context item does not
+                matter, so just use this file itself. -->
+            <x:context href="uuid-method-choice.xspec"/>
+            <x:call template="u:determine-uuid">
+                <x:param name="top-uuid" select="$ov:specified"/>
+                <x:param name="uuid-method" select="'random-xslt'"/>
+            </x:call>
+            <x:expect label="Nonempty string"
+                test="$x:result instance of xs:string and $x:result != ''"/>
+            <x:expect label="UUID is neither fixed one nor specified one"
+                test="$x:result ne $ov:specified and $x:result ne $ov:fixed"/>
+        </x:scenario>
+        <x:scenario label="Random UUID using Java">
+            <x:call template="u:determine-uuid">
+                <x:param name="top-uuid" select="$ov:specified"/>
+                <x:param name="uuid-method" select="'random-java'"/>
+            </x:call>
+            <x:expect label="Nonempty string"
+                test="$x:result instance of xs:string and $x:result != ''"/>
+            <x:expect label="UUID is neither fixed one nor specified one"
+                test="$x:result ne $ov:specified and $x:result ne $ov:fixed"/>
+        </x:scenario>
+        <!-- FYI: Because the transform relies on use-when, which is evaluated at
+            compile time, the same test invocation cannot check both
+            when the XSLT and Java random number generators are available
+            and when they are unavailable. This XSpec test does not cover
+            the fallback behavior that produces the fixed UUID value. -->
+        <x:scenario label="web-service method, available">
+            <!-- To avoid having the test require access to the Internet,
+                mock the web service as a text file that XSLT reads using
+                unparsed-text(). -->
+            <x:call template="u:determine-uuid">
+                <x:param name="uuid-service" select="$ov:service"/>
+                <x:param name="uuid-method" select="'web-service'"/>
+            </x:call>
+            <x:expect label="Value from the 'web service' (in this case, a text file)"
+                select="'309deb03-491b-4677-9148-bc1b79a21c9c'"/>
+        </x:scenario>
+        <x:scenario label="web-service method, unavailable">
+            <x:call template="u:determine-uuid">
+                <x:param name="uuid-service" select="'nonexistent.txt'"/>
+                <x:param name="uuid-method" select="'web-service'"/>
+            </x:call>
+            <x:expect label="Fixed UUID" select="$ov:fixed"/>
+        </x:scenario>
+        <x:scenario label="Fixed UUID">
+            <x:call template="u:determine-uuid">
+                <x:param name="uuid-method" select="'fixed'"/>
+            </x:call>
+            <x:expect label="Fixed UUID" select="$ov:fixed"/>
+        </x:scenario>
+        <x:scenario label="Unrecognized method">
+            <x:call template="u:determine-uuid">
+                <x:param name="uuid-method" select="'junk'"/>
+            </x:call>
+            <x:expect label="Fixed UUID" select="$ov:fixed"/>
+        </x:scenario>
+    </x:scenario>
+</x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/2_metadata/uuid-value.txt b/src/utils/util/resolver-pipeline/testing/2_metadata/uuid-value.txt
new file mode 100644
index 0000000000..a8e02be099
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/testing/2_metadata/uuid-value.txt
@@ -0,0 +1 @@
+309deb03-491b-4677-9148-bc1b79a21c9c
\ No newline at end of file
diff --git a/src/utils/util/resolver-pipeline/testing/3_merged/merge-as-is.xspec b/src/utils/util/resolver-pipeline/testing/3_merged/merge-as-is.xspec
index f262452115..f08929c155 100644
--- a/src/utils/util/resolver-pipeline/testing/3_merged/merge-as-is.xspec
+++ b/src/utils/util/resolver-pipeline/testing/3_merged/merge-as-is.xspec
@@ -1,52 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
     xmlns:x="http://www.jenitennison.com/xslt/xspec"
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
-    stylesheet="../../oscal-profile-resolve-merge.xsl">
-    <x:scenario label="Base">
-        <x:context>
-            <catalog uuid="zzz"/>
-        </x:context>
+    stylesheet="../../oscal-profile-resolve-merge.xsl"
+    xslt-version="3.0">
 
-        <x:expect label="root becomes root">
-            <catalog uuid="zzz"/>
-        </x:expect>
-    </x:scenario>
-    <x:scenario label="Single import, as-is merge">
-        <x:context>
-            <catalog>
-                <selection uuid="xyz-tiny_catalog" opr:id="...">
-                    <group id="x" opr:id="xyz-tiny_catalog#x">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
-                        <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
-                        <control id="x3" opr:id="xyz-tiny_catalog#x3"><title>Control X3</title></control>
-                    </group>
-                    <group id="y" opr:id="xyz-tiny_catalog#y">
-                        <title>Group Y of XYZ</title>
-                        <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
-                        <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
-                        <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
-                    </group>
-                    <group id="z" opr:id="xyz-tiny_catalog#z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
-                        <control id="z2" opr:id="xyz-tiny_catalog#z2"><title>Control Z2</title></control>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
+    <x:scenario label="Tests for match=catalog[merge/as-is=$true-content] priority=12 template">
+        <x:scenario label="Single import, as-is merge">
+            <x:context>
+                <catalog>
+                    <selection uuid="xyz-tiny_catalog" opr:id="...">
+                        <group id="x" opr:id="xyz-tiny_catalog#x">
+                            <title>Group X of XYZ</title>
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                            <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                            <control id="x3" opr:id="xyz-tiny_catalog#x3"><title>Control X3</title></control>
+                        </group>
+                        <group id="y" opr:id="xyz-tiny_catalog#y">
+                            <title>Group Y of XYZ</title>
+                            <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
+                            <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
+                            <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
+                        </group>
+                        <group id="z" opr:id="xyz-tiny_catalog#z">
+                            <title>Group Z of XYZ</title>
+                            <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
+                            <control id="z2" opr:id="xyz-tiny_catalog#z2"><title>Control Z2</title></control>
+                            <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
+                                <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
+                                </control>
                             </control>
-                        </control>
-                    </group>
-                </selection>
-                <merge>
-                    <as-is>true</as-is>
-                </merge>
-            </catalog>
-        </x:context>
-        <x:expect label="XYZ catalog with original grouping">
-            <catalog>
-
+                        </group>
+                    </selection>
+                    <merge>
+                        <as-is>true</as-is>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="XYZ catalog with original grouping">
+                <catalog>
                     <group id="x">
                         <title>Group X of XYZ</title>
                         <control id="x1"><title>Control X1</title></control>
@@ -69,182 +63,568 @@
                             </control>
                         </control>
                     </group>
-            </catalog>
-        </x:expect>
-    </x:scenario>
-    <x:scenario label="Parallel imports, as-is merge">
-        <x:context>
-            <catalog>
-                <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
-                    <group id="x" opr:id="xyz-tiny_catalog#x">
+                </catalog>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Parallel imports, as-is merge">
+            <x:context>
+                <catalog>
+                    <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                        <group id="x" opr:id="xyz-tiny_catalog#x">
+                            <title>Group X of XYZ</title>
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                        </group>
+                        <group id="z" opr:id="xyz-tiny_catalog#z">
+                            <title>Group Z of XYZ</title>
+                            <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
+                            <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
+                                <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
+                                </control>
+                            </control>
+                        </group>
+                    </selection>
+                    <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                        <group id="x" opr:id="xyz-tiny_catalog#x">
+                            <title>Group X of XYZ</title>
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                            <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                        </group>
+                        <group id="y" opr:id="xyz-tiny_catalog#y">
+                            <title>Group Y of XYZ</title>
+                            <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
+                            <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
+                            <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
+                        </group>
+                        <group id="z" opr:id="xyz-tiny_catalog#z">
+                            <title>Group Z of XYZ</title>
+                            <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
+                                <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
+                                </control>
+                            </control>
+                        </group>
+                    </selection>
+                    <merge>
+                        <as-is>true</as-is>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="XYZ catalog merged, with some redundancy">
+                <catalog>
+                    <group id="x">
                         <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                        <control id="x1"><title>Control X1</title></control>
+                        <control id="x1"><title>Control X1</title></control>
+                        <control id="x2"><title>Control X2</title></control>
                     </group>
-                    <group id="z" opr:id="xyz-tiny_catalog#z">
+                    <group id="z">
                         <title>Group Z of XYZ</title>
-                        <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
+                        <control id="z1"><title>Control Z1</title></control>
+                        <control id="z3"><title>Control Z3</title>
+                            <control id="z3.a"><title>Control Z3-A</title>
+                                <control id="z3.a-1"><title>Control Z3-A-1</title></control>
+                            </control>
+                        </control>
+                        <control id="z3"><title>Control Z3</title>
+                            <control id="z3.a"><title>Control Z3-A</title>
+                                <control id="z3.a-1"><title>Control Z3-A-1</title></control>
                             </control>
                         </control>
                     </group>
-                </selection>
-                <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
-                    <group id="x" opr:id="xyz-tiny_catalog#x">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
-                        <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
-                    </group>
-                    <group id="y" opr:id="xyz-tiny_catalog#y">
+                    <group id="y">
                         <title>Group Y of XYZ</title>
-                        <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
-                        <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
-                        <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
+                        <control id="y1"><title>Control Y1</title></control>
+                        <control id="y2"><title>Control Y2</title></control>
+                        <control id="y3"><title>Control Y3</title></control>
                     </group>
-                    <group id="z" opr:id="xyz-tiny_catalog#z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
+                </catalog>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Merge with loose parameters">
+            <x:context>
+                <catalog>
+                    <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                        <group id="x" opr:id="xyz-tiny_catalog#x">
+                            <title>Group X of XYZ</title>
+                            <prop value="special" name="status"/>
+                            <param id="param-x">
+                                <label>Param X</label>
+                                <constraint>no control</constraint>
+                            </param>
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                        </group>
+                    </selection>
+                    <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                        <group id="x" opr:id="xyz-tiny_catalog#x">
+                            <title>Group X of XYZ</title>
+                            <prop value="special" name="status"/>
+                            <param id="param-x">
+                                <select>
+                                    <choice>some choice</choice>
+                                    <choice>some other choice</choice>
+                                </select>
+                            </param>
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                            <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                        </group>
+                    </selection>
+                    <merge>
+                        <as-is>true</as-is>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="Output has loose parameters with redundancy">
+                <catalog>
+                    <group id="x">
+                        <title>Group X of XYZ</title>
+                        <prop value="special" name="status"/>
+                        <prop value="special" name="status"/>
+                        <param id="param-x">
+                            <label>Param X</label>
+                            <constraint>no control</constraint>
+                        </param>
+                        <param id="param-x">
+                            <select>
+                                <choice>some choice</choice>
+                                <choice>some other choice</choice>
+                            </select>
+                        </param>
+                        <control id="x1"><title>Control X1</title></control>
+                        <control id="x1"><title>Control X1</title></control>
+                        <control id="x2"><title>Control X2</title></control>
                     </group>
-                </selection>
-                <merge>
-                    <as-is>true</as-is>
-                </merge>
-            </catalog>
-        </x:context>
-        <x:expect label="XYZ catalog merged, with some redundancy">
-            <catalog>
-                <group id="x">
-                    <title>Group X of XYZ</title>
+                </catalog>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Catalog with attribute, metadata, and modify child">
+            <x:context>
+                <catalog uuid="zzz">
+                    <metadata>
+                        <title>Test Profile</title>
+                        <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
+                        <version>1.3</version>
+                        <oscal-version>1.0.2</oscal-version>
+                        <prop name="resolution-tool" value="OSCAL Profile Resolver XSLT Pipeline OPRXP" />
+                        <link href="urn:UNKNOWN" rel="source-profile" />
+                    </metadata>
+                    <selection uuid="xyz-tiny_catalog">
+                        <control id="x1"><title>Control X1</title></control>
+                    </selection>
+                    <merge>
+                        <as-is>true</as-is>
+                    </merge>
+                    <modify>
+                        <set-parameter param-id="a1_prm1">
+                            <constraint>
+                                <description>
+                                    <p>at least every 3 years</p>
+                                </description>
+                            </constraint>
+                        </set-parameter>
+                    </modify>
+                </catalog>
+            </x:context>
+            <x:expect label="Output includes catalog attribute, metadata, and modify child">
+                <catalog uuid="zzz">
+                    <metadata>
+                        <title>Test Profile</title>
+                        <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
+                        <version>1.3</version>
+                        <oscal-version>1.0.2</oscal-version>
+                        <prop name="resolution-tool" value="OSCAL Profile Resolver XSLT Pipeline OPRXP" />
+                        <link href="urn:UNKNOWN" rel="source-profile" />
+                    </metadata>
                     <control id="x1"><title>Control X1</title></control>
+                    <modify>
+                        <set-parameter param-id="a1_prm1">
+                            <constraint>
+                                <description>
+                                    <p>at least every 3 years</p>
+                                </description>
+                            </constraint>
+                        </set-parameter>
+                    </modify>
+                </catalog>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Catalog with back matter inside and outside selection">
+            <x:context>
+                <catalog uuid="zzz">
+                    <selection uuid="xyz-tiny_catalog">
+                        <control id="x1"><title>Control X1</title></control>
+                        <back-matter>
+                            <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                                <title>Ref BBB</title>
+                                <citation>
+                                    <text>Bbb bbbbb Bbb b.</text>
+                                </citation>
+                                <rlink href="bbb.html"/>
+                            </resource>
+                        </back-matter>
+                    </selection>
+                    <merge>
+                        <as-is>true</as-is>
+                    </merge>
+                    <back-matter>
+                        <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e1">
+                            <title>Ref AAA</title>
+                            <citation>
+                                <text>Aaaa aaaa aaaa</text>
+                            </citation>
+                            <rlink href="aaa.html"/>
+                        </resource>
+                    </back-matter>
+                </catalog>
+            </x:context>
+            <x:expect label="Output includes consolidated back matter">
+                <catalog uuid="zzz">
                     <control id="x1"><title>Control X1</title></control>
-                    <control id="x2"><title>Control X2</title></control>
-                </group>
-                <group id="z">
-                    <title>Group Z of XYZ</title>
-                    <control id="z1"><title>Control Z1</title></control>
-                    <control id="z3"><title>Control Z3</title>
-                        <control id="z3.a"><title>Control Z3-A</title>
-                            <control id="z3.a-1"><title>Control Z3-A-1</title></control>
-                        </control>
-                    </control>
-                    <control id="z3"><title>Control Z3</title>
-                        <control id="z3.a"><title>Control Z3-A</title>
-                            <control id="z3.a-1"><title>Control Z3-A-1</title></control>
-                        </control>
-                    </control>
-                </group>
-                <group id="y">
-                    <title>Group Y of XYZ</title>
-                    <control id="y1"><title>Control Y1</title></control>
-                    <control id="y2"><title>Control Y2</title></control>
-                    <control id="y3"><title>Control Y3</title></control>
-                </group>
-            </catalog>
-        </x:expect>
+                    <back-matter>
+                        <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                            <title>Ref BBB</title>
+                            <citation>
+                                <text>Bbb bbbbb Bbb b.</text>
+                            </citation>
+                            <rlink href="bbb.html"/>
+                        </resource>
+                        <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e1">
+                            <title>Ref AAA</title>
+                            <citation>
+                                <text>Aaaa aaaa aaaa</text>
+                            </citation>
+                            <rlink href="aaa.html"/>
+                        </resource>
+                    </back-matter>
+                </catalog>
+            </x:expect>
+        </x:scenario>
     </x:scenario>
-    <x:scenario label="Ugly merge with loose parameters and stuff">
-        <x:context>
-            <catalog>
-                <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
-                    <group id="x" opr:id="xyz-tiny_catalog#x">
+
+    <x:scenario label="Tests for o:merge-groups-as-is template">
+        <x:scenario label="$merging is sequence of selection elements ">
+            <x:scenario label="with duplicate identifiers">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:selection)+">
+                        <selection uuid="a"><title>uuid a</title></selection>
+                        <selection uuid="a"><title>uuid a again</title></selection>
+                        <selection opr:id="b"><title>opr:id b</title></selection>
+                        <selection opr:id="b"><title>opr:id b again</title></selection>
+                        <selection uuid="c"><title>uuid c</title></selection>
+                        <selection opr:id="c"><title>opr:id c</title></selection>
+                    </x:param>
+                </x:call>
+                <x:expect label="One output per unique identifier name/value pair, but opr:id is omitted">
+                    <selection uuid="a"><title>uuid a</title></selection>
+                    <selection><title>opr:id b</title></selection>
+                    <selection uuid="c"><title>uuid c</title></selection>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="ungrouped with children other than title, param, control">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:selection)+" select="//o:selection">
+                        <catalog>
+                          <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                              <prop value="special" name="status"/>
+                              <param id="param-x">
+                                  <label>Param X</label>
+                                  <constraint>no control</constraint>
+                              </param>
+                              <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                              <back-matter>
+                                  <resource opr:id="ref001">
+                                      <title>Ref AAA</title>
+                                  </resource>
+                              </back-matter>
+                          </selection>
+                          <merge>
+                              <as-is>true</as-is>
+                          </merge>
+                      </catalog>
+                    </x:param>
+                </x:call>
+                <!-- This template's output has back-matter in the "wrong" place,
+                    but that is OK because the caller ignores back-matter. -->
+                <x:expect label="'other' children followed by params and controls">
+                    <selection id="xyz-tiny_catalog">
+                        <prop value="special" name="status"/>
+                        <back-matter>
+                            <resource>
+                                <title>Ref AAA</title>
+                            </resource>
+                        </back-matter>
+                        <param id="param-x">
+                            <label>Param X</label>
+                            <constraint>no control</constraint>
+                        </param>
+                        <control id="x1"><title>Control X1</title></control>
+                    </selection>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="grouped with children other than title, param, control">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:selection)+" select="//o:selection">
+                        <catalog>
+                            <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                                <group>
+                                    <title>Group X of XYZ</title>
+                                    <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                                </group>
+                                <back-matter>
+                                    <resource opr:id="ref001">
+                                        <title>Ref AAA</title>
+                                    </resource>
+                                </back-matter>
+                            </selection>
+                            <merge>
+                                <as-is>true</as-is>
+                            </merge>
+                        </catalog>
+                    </x:param>
+                </x:call>
+                <!-- This template's output has back-matter in the "wrong" place,
+                    but that is OK because the caller ignores back-matter. -->
+                <x:expect label="'other' children followed by group">
+                    <selection id="xyz-tiny_catalog">
+                        <back-matter>
+                            <resource>
+                                <title>Ref AAA</title>
+                            </resource>
+                        </back-matter>
+                        <group>
+                            <title>Group X of XYZ</title>
+                            <control id="x1"><title>Control X1</title></control>
+                        </group>
+                    </selection>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="grouped but no controls in groups">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:selection)+" select="//o:selection">
+                        <catalog>
+                            <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                                <group>
+                                    <title>Group X of XYZ</title>
+                                </group>
+                            </selection>
+                            <merge>
+                                <as-is>true</as-is>
+                            </merge>
+                        </catalog>
+                    </x:param>
+                </x:call>
+                <x:expect label="selection but no groups">
+                    <selection id="xyz-tiny_catalog"/>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="grouped with controls not as children but only deeper descendants">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:selection)+" select="//o:selection">
+                        <catalog>
+                            <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                                <group>
+                                    <title>Group X of XYZ</title>
+                                    <group>
+                                        <title>Group XX</title>
+                                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                                    </group>
+                                </group>
+                            </selection>
+                            <merge>
+                                <as-is>true</as-is>
+                            </merge>
+                        </catalog>
+                    </x:param>
+                </x:call>
+                <x:expect label="Groups are retained in output">
+                    <selection id="xyz-tiny_catalog">
+                        <group>
+                            <title>Group X of XYZ</title>
+                            <group>
+                                <title>Group XX</title>
+                                <control id="x1"><title>Control X1</title></control>
+                            </group>
+                        </group>
+                    </selection>
+                </x:expect> 
+            </x:scenario>
+            <x:scenario label="with params and controls that need merging">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:selection)+" select="//o:selection">
+                        <catalog>
+                            <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                                <param id="param-x">
+                                    <label>Param X</label>
+                                    <constraint>no control</constraint>
+                                </param>
+                                <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                            </selection>
+                            <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                                <param id="param-x">
+                                    <label>Param X</label>
+                                    <constraint>no control</constraint>
+                                </param>
+                                <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                            </selection>
+                            <merge>
+                                <as-is>true</as-is>
+                                <combine method="use-first"/>
+                            </merge>
+                        </catalog>
+                    </x:param>
+                </x:call>
+                <x:expect label="merged params and controls, following use-first directive">
+                    <selection id="xyz-tiny_catalog">
+                        <param id="param-x">
+                            <label>Param X</label>
+                            <constraint>no control</constraint>
+                        </param>
+                        <control id="x1"><title>Control X1</title></control>
+                    </selection>
+                </x:expect>
+            </x:scenario>
+        </x:scenario>
+        <x:scenario label="$merging is sequence of group elements ">
+            <x:scenario label="with duplicate identifiers">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:group)+">
+                        <group id="a"><title>id a</title></group>
+                        <group id="a"><title>id a again</title></group>
+                        <group opr:id="b"><title>opr:id b</title></group>
+                        <group opr:id="b"><title>opr:id b again</title></group>
+                        <group id="c"><title>id c</title></group>
+                        <group opr:id="c"><title>opr:id c</title></group>
+                    </x:param>
+                </x:call>
+                <x:expect label="One output per unique identifier name/value pair, but opr:id is omitted">
+                    <group id="a"><title>id a</title></group>
+                    <group><title>opr:id b</title></group>
+                    <group id="c"><title>id c</title></group>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="with children other than title, param, control">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:group)+" select="//o:group">
+                        <catalog>
+                            <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                                <group>
+                                    <title>Group X of XYZ</title>
+                                    <prop value="special" name="status"/>
+                                    <param id="param-x">
+                                        <label>Param X</label>
+                                        <constraint>no control</constraint>
+                                    </param>
+                                    <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                                </group>
+                                <group id="group-y">
+                                    <title>Group Y of XYZ</title>
+                                    <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
+                                </group>
+                            </selection>
+                            <merge>
+                                <as-is>true</as-is>
+                            </merge>
+                        </catalog>
+                    </x:param>
+                </x:call>
+                <x:expect label="groups with title followed by 'other' children, params, and controls">
+                    <group>
                         <title>Group X of XYZ</title>
                         <prop value="special" name="status"/>
                         <param id="param-x">
                             <label>Param X</label>
                             <constraint>no control</constraint>
                         </param>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                        <control id="x1"><title>Control X1</title></control>
                     </group>
-                    <group id="z" opr:id="xyz-tiny_catalog#z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
+                    <group id="group-y">
+                        <title>Group Y of XYZ</title>
+                        <control id="y1"><title>Control Y1</title></control>
                     </group>
-                </selection>
-                <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
-                    <group id="x" opr:id="xyz-tiny_catalog#x">
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="with nested groups">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:group)+" select="//o:selection/o:group">
+                        <catalog>
+                            <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                                <group>
+                                    <title>Group X of XYZ</title>
+                                    <prop value="special" name="status"/>
+                                    <param id="param-x">
+                                        <label>Param X</label>
+                                        <constraint>no control</constraint>
+                                    </param>
+                                    <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                                </group>
+                                <group id="group-y">
+                                    <title>Group Y of XYZ</title>
+                                    <group id="group-yy">
+                                        <title>Group YY</title>
+                                        <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
+                                    </group>
+                                </group>
+                            </selection>
+                            <merge>
+                                <as-is>true</as-is>
+                            </merge>
+                        </catalog>
+                    </x:param>
+                </x:call>
+                <x:expect label="groups including nested group">
+                    <group>
                         <title>Group X of XYZ</title>
                         <prop value="special" name="status"/>
                         <param id="param-x">
-                            <select>
-                                <choice>some choice</choice>
-                                <choice>some other choice</choice>
-                            </select>
+                            <label>Param X</label>
+                            <constraint>no control</constraint>
                         </param>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
-                        <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                        <control id="x1"><title>Control X1</title></control>
                     </group>
-                    <group id="y" opr:id="xyz-tiny_catalog#y">
+                    <group id="group-y">
                         <title>Group Y of XYZ</title>
-                        <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
-                        <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
-                        <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
+                        <group id="group-yy">
+                            <title>Group YY</title>
+                            <control id="y1"><title>Control Y1</title></control>
+                        </group>
                     </group>
-                    <group id="z" opr:id="xyz-tiny_catalog#z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="with controls not as children but only deeper descendants">
+                <x:call template="o:merge-groups-as-is">
+                    <x:param name="merging" as="element(o:group)+" select="//o:selection/o:group">
+                        <catalog>
+                            <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                                <group>
+                                    <title>Group X of XYZ</title>
+                                    <group>
+                                        <title>Group XX</title>
+                                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                                    </group>
+                                </group>
+                            </selection>
+                            <merge>
+                                <as-is>true</as-is>
+                            </merge>
+                        </catalog>
+                    </x:param>
+                </x:call>
+                <x:expect label="Groups are retained in output">
+                    <group>
+                        <title>Group X of XYZ</title>
+                        <group>
+                            <title>Group XX</title>
+                            <control id="x1"><title>Control X1</title></control>
+                        </group>
                     </group>
-                </selection>
-                <merge>
-                    <as-is>true</as-is>
-                </merge>
-            </catalog>
-        </x:context>
-        <x:expect label="XYZ ugly merged, with extra redundancy">
-            <catalog>
-                <group id="x">
-                    <title>Group X of XYZ</title>
-                    <prop value="special" name="status"/>
-                    <prop value="special" name="status"/>
-                    <param id="param-x">
-                        <label>Param X</label>
-                        <constraint>no control</constraint>
-                    </param>
-                    <param id="param-x">
-                        <select>
-                            <choice>some choice</choice>
-                            <choice>some other choice</choice>
-                        </select>
-                    </param>
-                    <control id="x1"><title>Control X1</title></control>
-                    <control id="x1"><title>Control X1</title></control>
-                    <control id="x2"><title>Control X2</title></control>
-                </group>
-                <group id="z">
-                    <title>Group Z of XYZ</title>
-                    <control id="z1"><title>Control Z1</title></control>
-                    <control id="z3"><title>Control Z3</title>
-                        <control id="z3.a"><title>Control Z3-A</title>
-                            <control id="z3.a-1"><title>Control Z3-A-1</title></control>
-                        </control>
-                    </control>
-                    <control id="z3"><title>Control Z3</title>
-                        <control id="z3.a"><title>Control Z3-A</title>
-                            <control id="z3.a-1"><title>Control Z3-A-1</title></control>
-                        </control>
-                    </control>
-                </group>
-                <group id="y">
-                    <title>Group Y of XYZ</title>
-                    <control id="y1"><title>Control Y1</title></control>
-                    <control id="y2"><title>Control Y2</title></control>
-                    <control id="y3"><title>Control Y3</title></control>
-                </group>
-            </catalog>
-        </x:expect>
+                </x:expect> 
+            </x:scenario>
+        </x:scenario>
+        <x:scenario label="$merging is empty sequence">
+            <x:call template="o:merge-groups-as-is">
+                <x:param name="merging" select="()"/>
+            </x:call>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
     </x:scenario>
-
 </x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/3_merged/merge-back-matter.xspec b/src/utils/util/resolver-pipeline/testing/3_merged/merge-back-matter.xspec
deleted file mode 100644
index 3c1e92ee7c..0000000000
--- a/src/utils/util/resolver-pipeline/testing/3_merged/merge-back-matter.xspec
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-    xmlns:x="http://www.jenitennison.com/xslt/xspec" xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution" stylesheet="../../oscal-profile-resolve-merge.xsl">
-    <x:scenario label="Base">
-        <x:context>
-            <catalog/>
-        </x:context>
-
-        <x:expect label="profile becomes catalog">
-            <catalog/>
-        </x:expect>
-    </x:scenario>
-
-    <x:scenario label="Merge with back matter">
-        <x:context>
-            <catalog>
-                <selection uuid="xyz-tiny_catalog">
-                    <group id="x">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
-                    </group>
-                    <group id="z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
-                    </group>
-                    <back-matter>
-                        <resource id="ref001">
-                            <title>Ref AAA</title>
-                            <citation>
-                                <text>Aaaa aaaa aaaa</text>
-                            </citation>
-                            <rlink href="aaa.html"/>
-                        </resource>
-                        <resource id="ref002">
-                            <title>Ref BBB</title>
-                            <citation>
-                                <text>Bbb bbbbb Bbb b.</text>
-                            </citation>
-                            <rlink href="bbb.html"/>
-                        </resource>
-                    </back-matter>
-                </selection>
-
-            </catalog>
-        </x:context>
-        <x:expect label="Losing structure but back matter comes through">
-            <catalog>
-                <control id="x1"><title>Control X1</title></control>
-                <control id="z1"><title>Control Z1</title></control>
-                <control id="z3"><title>Control Z3</title>
-                    <control id="z3.a"><title>Control Z3-A</title>
-                        <control id="z3.a-1">
-                            <title>Control Z3-A-1</title></control>
-                    </control>
-                </control>
-                <back-matter>
-                    <resource id="ref001">
-                        <title>Ref AAA</title>
-                        <citation>
-                            <text>Aaaa aaaa aaaa</text>
-                        </citation>
-                        <rlink href="aaa.html"/>
-                    </resource>
-                    <resource id="ref002">
-                        <title>Ref BBB</title>
-                        <citation>
-                            <text>Bbb bbbbb Bbb b.</text>
-                        </citation>
-                        <rlink href="bbb.html"/>
-                    </resource>
-                </back-matter>
-            </catalog>
-        </x:expect>
-    </x:scenario>
-
-    <x:scenario label="Merge as-is with back matter">
-        <x:context>
-            <catalog>
-                <selection uuid="xyz-tiny_catalog">
-                    <group id="x">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
-                    </group>
-                    <group id="z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
-                    </group>
-                    <back-matter>
-                        <resource id="ref001">
-                            <title>Ref AAA</title>
-                            <citation>
-                                <text>Aaaa aaaa aaaa</text>
-                            </citation>
-                            <rlink href="aaa.html"/>
-                        </resource>
-                        <resource id="ref002">
-                            <title>Ref BBB</title>
-                            <citation>
-                                <text>Bbb bbbbb Bbb b.</text>
-                            </citation>
-                            <rlink href="bbb.html"/>
-                        </resource>
-                    </back-matter>
-                </selection>
-                <merge>
-                    <as-is>true</as-is>
-                </merge>
-            </catalog>
-        </x:context>
-        <x:expect label="Back matter comes through">
-            <catalog>
-                <group id="x">
-                    <title>Group X of XYZ</title>
-                    <control id="x1"><title>Control X1</title></control>
-                </group>
-                <group id="z">
-                    <title>Group Z of XYZ</title>
-                    <control id="z1"><title>Control Z1</title></control>
-                    <control id="z3"><title>Control Z3</title>
-                        <control id="z3.a"><title>Control Z3-A</title>
-                            <control id="z3.a-1">
-                                <title>Control Z3-A-1</title></control>
-                        </control>
-                    </control>
-                </group>
-                <back-matter>
-                    <resource id="ref001">
-                        <title>Ref AAA</title>
-                        <citation>
-                            <text>Aaaa aaaa aaaa</text>
-                        </citation>
-                        <rlink href="aaa.html"/>
-                    </resource>
-                    <resource id="ref002">
-                        <title>Ref BBB</title>
-                        <citation>
-                            <text>Bbb bbbbb Bbb b.</text>
-                        </citation>
-                        <rlink href="bbb.html"/>
-                    </resource>
-                </back-matter>
-            </catalog>
-        </x:expect>
-    </x:scenario>
-</x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/3_merged/merge-combine.xspec b/src/utils/util/resolver-pipeline/testing/3_merged/merge-combine.xspec
new file mode 100644
index 0000000000..6a514161b1
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/testing/3_merged/merge-combine.xspec
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:ov="http://csrc.nist.gov/ns/oscal/xspec/variable"
+    xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    stylesheet="../../oscal-profile-resolve-merge.xsl">
+
+    <!-- Override value of $in_xspec global XSLT variable so that error behavior
+        in "Error case: Elements of different kinds" scenario can differ for
+        testing vs. production usage. -->
+    <x:param name="in_xspec" select="true()"/>
+
+    <!-- These variables provide contexts that indicate how to combine elements. -->
+    <x:variable name="ov:combine-merge">
+        <catalog>
+            <merge>
+                <combine method="merge"/>
+            </merge>
+        </catalog>
+    </x:variable>
+    <x:variable name="ov:combine-use-first">
+        <catalog>
+            <merge>
+                <combine method="use-first"/>
+            </merge>
+        </catalog>
+    </x:variable>
+    <x:variable name="ov:combine-keep">
+        <catalog/>
+    </x:variable>
+
+    <x:scenario label="Tests for combine-elements template">
+        <x:variable name="ov:who" as="element(o:control)+" select="//o:control">
+            <selection>
+                <control id="a" attr="val"><title>Control A</title></control>
+                <control id="b"><title>Control B</title></control>
+                <control id="a" attr1="val1"><title>Control A1</title></control>
+            </selection>
+        </x:variable>
+        <x:scenario label="Typical case: $who is nonempty and context has ancestor catalog ">
+            <x:scenario label="with 'merge' method">
+                <x:context select="$ov:combine-merge"/>
+                <x:call template="combine-elements">
+                    <x:param name="who" select="$ov:who"/>
+                </x:call>
+                <x:expect label="Dispatches to handler for 'merge' method">
+                    <control id="a" attr="val" attr1="val1">
+                        <title>Control A</title>
+                        <title>Control A1</title>
+                    </control>
+                    <control id="b"><title>Control B</title></control>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="with 'use-first' method">
+                <x:context select="$ov:combine-use-first"/>
+                <x:call template="combine-elements">
+                    <x:param name="who" select="$ov:who"/>
+                </x:call>
+                <x:expect label="Dispatches to handler for 'use-first' method">
+                    <control id="a" attr="val"><title>Control A</title></control>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="with no method">
+                <x:context select="$ov:combine-keep"/>
+                <x:call template="combine-elements">
+                    <x:param name="who" select="$ov:who"/>
+                </x:call>
+                <x:expect label="Dispatches to handler for 'keep' method">
+                    <control id="a" attr="val"><title>Control A</title></control>
+                    <control id="b"><title>Control B</title></control>
+                    <control id="a" attr1="val1"><title>Control A1</title></control>
+                </x:expect>
+            </x:scenario>
+        </x:scenario>
+        <x:scenario label="Edge case: No elements">
+            <x:context select="$ov:combine-keep"/>
+            <x:call template="combine-elements">
+                <x:param name="who" as="empty-sequence()"/>
+            </x:call>
+            <x:expect label="Nothing"/>
+        </x:scenario>
+        <x:scenario label="Edge case that shouldn't happen: No catalog ancestor">
+            <x:context>
+                <not-catalog/>
+            </x:context>
+            <x:call template="combine-elements">
+                <x:param name="who" select="$ov:who"/>
+            </x:call>
+            <x:expect label="Nothing"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for match=catalog[merge/combine/@method='merge'] priority=10 mode=o:combine-elements template">
+        <x:scenario label="Elements of same kind with duplicate id but distinct opr:id">
+            <x:context mode="o:combine-elements" select="$ov:combine-merge">
+                <x:param name="elements" as="element()+">
+                    <control id="a" opr:id="a"><title>Control A</title></control>
+                    <control id="a" opr:id="a1"><title>Control A1</title></control>
+                </x:param>
+            </x:context>
+            <x:expect label="Distinct elements">
+                <control id="a"><title>Control A</title></control>
+                <control id="a"><title>Control A1</title></control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Elements of same kind with duplicate identifier">
+            <x:context mode="o:combine-elements" select="$ov:combine-merge">
+                <x:param name="elements" as="element()+" select="//o:control">
+                    <catalog>
+                        <control id="a" attr="val"><title>Control A</title></control>
+                        <control id="b"><title>Control B</title></control>
+                        <control id="a" attr1="val1"><title>Control A1</title></control>
+                    </catalog>
+                </x:param>
+            </x:context>
+            <x:expect label="For each distinct identifier, one wrapper element and merged attributes and child elements">
+                <control id="a" attr="val" attr1="val1">
+                    <title>Control A</title>
+                    <title>Control A1</title>
+                </control>
+                <control id="b">
+                    <title>Control B</title>
+                </control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Edge case: Elements of same kind despite different notation">
+            <x:context mode="o:combine-elements" select="$ov:combine-merge">
+                <x:param name="elements" as="element()+" xmlns="foo" select="//*:control">
+                    <some-wrapper>
+                        <o:control id="a" attr="val"><o:title>Control A</o:title></o:control>
+                        <ccc:control xmlns:ccc="http://csrc.nist.gov/ns/oscal/1.0" id="b"><ccc:title>Control B</ccc:title></ccc:control>
+                        <control xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="a" attr1="val1"><title>Control A1</title></control>
+                    </some-wrapper>
+                </x:param>
+            </x:context>
+            <x:expect label="Same result as in case of consistent notation, and no error">
+                <control id="a" attr="val" attr1="val1">
+                    <title>Control A</title>
+                    <title>Control A1</title>
+                </control>
+                <control id="b">
+                    <title>Control B</title>
+                </control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Error case: Elements of different kinds" catch="yes">
+            <x:context mode="o:combine-elements" select="$ov:combine-merge">
+                <x:param name="elements" as="element()+" select="//*:control">
+                    <selection>
+                        <control/>
+                        <control xmlns="foo"/>
+                    </selection>
+                </x:param>
+            </x:context>
+            <x:expect label="XSLT error, fatal when $in_xspec is true"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>            
+        </x:scenario>
+        <x:scenario label="Empty sequence">
+            <x:context mode="o:combine-elements" select="$ov:combine-merge">
+                <x:param name="elements" select="()"/>
+            </x:context>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
+    </x:scenario>
+    
+    <x:scenario label="Tests for match=catalog[merge/combine/@method='use-first'] priority=10 mode=o:combine-elements template">
+        <x:scenario label="Elements of same kind with duplicate id but distinct opr:id">
+            <x:context mode="o:combine-elements" select="$ov:combine-use-first">
+                <x:param name="elements" as="element()+" select="//o:control">
+                    <selection>
+                        <control id="a" opr:id="a"><title>Control A</title></control>
+                        <control id="a" opr:id="a1"><title>Control A1</title></control>
+                    </selection>
+                </x:param>
+            </x:context>
+            <x:expect label="First element">
+                <control id="a">
+                    <title>Control A</title>
+                </control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Elements of same kind with duplicate identifier">
+            <x:context mode="o:combine-elements" select="$ov:combine-use-first">
+                <x:param name="elements" as="element()+" select="//o:control">
+                    <selection>
+                        <control id="a" attr="val"><title>Control A</title></control>
+                        <control id="b"><title>Control B</title></control>
+                        <control id="a" attr1="val1"><title>Control A1</title></control>
+                    </selection>
+                </x:param>
+            </x:context>
+            <x:expect label="First element">
+                <control id="a" attr="val">
+                    <title>Control A</title>
+                </control>
+            </x:expect>
+            <x:expect label="No title from 2nd id=a control" test="empty(//title[.='Control  A1'])"/>
+            <x:expect label="No attr1 from 2nd id=a control" test="empty(//*[@attr1])"/>
+        </x:scenario>
+        <x:scenario label="Elements of different kinds">
+            <x:context mode="o:combine-elements" select="$ov:combine-use-first">
+                <x:param name="elements" as="element()+" select="//*:control">
+                    <selection>
+                        <control/>
+                        <control xmlns="foo"/>
+                    </selection>
+                </x:param>
+            </x:context>
+            <x:expect label="First element">
+                <control/>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Empty sequence">
+            <x:context mode="o:combine-elements" select="$ov:combine-use-first">
+                <x:param name="elements" select="()"/>
+            </x:context>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for match=catalog priority=5 mode=o:combine-elements template">
+        <x:scenario label="Elements of same kind with duplicate id but distinct opr:id">
+            <x:context mode="o:combine-elements" select="$ov:combine-keep">
+                <x:param name="elements" as="element()+" select="//o:control">
+                    <selection>
+                        <control id="a" opr:id="a"><title>Control A</title></control>
+                        <control id="a" opr:id="a1"><title>Control A1</title></control>
+                    </selection>
+                </x:param>
+            </x:context>
+            <x:expect label="All elements">
+                <control id="a"><title>Control A</title></control>
+                <control id="a"><title>Control A1</title></control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Elements of same kind with duplicate identifier">
+            <x:context mode="o:combine-elements" select="$ov:combine-keep">
+                <x:param name="elements" as="element()+" select="//o:control">
+                    <selection>
+                        <control id="a" attr="val"><title>Control A</title></control>
+                        <control id="b"><title>Control B</title></control>
+                        <control id="a" attr1="val1"><title>Control A1</title></control>
+                    </selection>
+                </x:param>
+            </x:context>
+            <x:expect label="All elements">
+                <control id="a" attr="val"><title>Control A</title></control>
+                <control id="b"><title>Control B</title></control>
+                <control id="a" attr1="val1"><title>Control A1</title></control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Elements of different kinds">
+            <x:context mode="o:combine-elements" select="$ov:combine-keep">
+                <x:param name="elements" as="element()+" select="//*:control">
+                    <selection>
+                        <control/>
+                        <control xmlns="foo"/>
+                    </selection>
+                </x:param>
+            </x:context>
+            <x:expect label="All elements">
+                <control/>
+                <control xmlns="foo"/>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Empty sequence">
+            <x:context mode="o:combine-elements" select="$ov:combine-keep">
+                <x:param name="elements" select="()"/>
+            </x:context>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
+    </x:scenario>
+
+</x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/3_merged/merge-custom.xspec b/src/utils/util/resolver-pipeline/testing/3_merged/merge-custom.xspec
index 10ec033a70..4cf7ba997a 100644
--- a/src/utils/util/resolver-pipeline/testing/3_merged/merge-custom.xspec
+++ b/src/utils/util/resolver-pipeline/testing/3_merged/merge-custom.xspec
@@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-    xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
     xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable"
+    xmlns:x="http://www.jenitennison.com/xslt/xspec"
     stylesheet="../../oscal-profile-resolve-merge.xsl">
 
-    <!-- Still needing unit tests
-      more elaborated merge scenarios
-      different selections and sorting
-      different rules on control/parameter merging using combine @method=keep|use-first|merge
-      -->
-
-    <x:scenario label="Base">
-        <x:context>
-            <catalog/>
-        </x:context>
-
-        <x:expect label="profile becomes catalog">
-            <catalog/>
-        </x:expect>
-    </x:scenario>
-    <x:scenario label="Single import, custom structure">
-        <x:context>
-            <catalog>
-                <selection uuid="xyz-tiny_catalog">
+    <x:scenario label="Tests for match=catalog[exists(merge/custom)] priority=13 template">
+        <x:scenario label="Single import, custom structure">
+            <x:context>
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection uuid="xyz-tiny_catalog_selection">
                         <group id="x">
                             <title>Group X of XYZ</title>
                             <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
@@ -49,7 +37,7 @@
                     </selection>
                     <merge>
                         <custom>
-                            <group>
+                            <group id="g1">
                                 <title>New Group 1</title>
                                 <insert-controls>
                                     <include-controls>
@@ -59,8 +47,8 @@
                                     </include-controls>
                                 </insert-controls>
                             </group>
-                            <group>
-                                <title>New Group 1</title>
+                            <group id="g2">
+                                <title>New Group 2</title>
                                 <insert-controls>
                                     <include-controls>
                                         <with-id>x2</with-id>
@@ -71,93 +59,577 @@
                             </group>
                         </custom>
                     </merge>
-            </catalog>
-        </x:context>
-        <x:expect label="New groups for XYZ 1 and 2">
-            <catalog>
-                <group>
-                    <title>New Group 1</title>
-                    <control id="x1"><title>Control X1</title></control>
-                    <control id="y1"><title>Control Y1</title></control>
-                    <control id="z1"><title>Control Z1</title></control>
-                </group>
-                <group>
-                    <title>New Group 1</title>
-                    <control id="x2"><title>Control X2</title></control>
-                    <control id="y2"><title>Control Y2</title></control>
-                    <control id="z2"><title>Control Z2</title></control>
-                </group>
-            </catalog>
-        </x:expect>
+                </catalog>
+            </x:context>
+            <x:expect label="Catalog with its attributes, and result of processing merge/custom">
+                <catalog uuid="xyz-tiny_catalog">
+                    <group id="g1">...</group>
+                    <group id="g2">...</group>
+                </catalog>
+            </x:expect>
+        </x:scenario>
     </x:scenario>
 
-    <x:scenario label="Parallel imports, no merge, keeping all">
-        <x:context>
-            <catalog>
-                <selection uuid="xyz-tiny_catalog">
-                    <group id="x">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+    <x:scenario label="Tests for match=custom mode=o:custom-merge template">
+        <x:scenario label="Basic structure">
+            <x:context mode="o:custom-merge">
+                <custom>
+                    <foo/>
+                </custom>
+            </x:context>
+            <x:expect label="Processed child without custom wrapper tags">
+                <foo/>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Test behavior of custom groups">
+            <x:scenario label="Single import with groups, merged into custom groups">
+                <x:context mode="o:custom-merge" select="//o:custom">
+                    <catalog uuid="xyz-tiny_catalog">
+                        <selection uuid="xyz-tiny_catalog_selection">
+                            <group id="x">
+                                <title>Group X of XYZ</title>
+                                <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                                <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                                <control id="x3" opr:id="xyz-tiny_catalog#x3"><title>Control X3</title></control>
+                            </group>
+                            <group id="y">
+                                <title>Group Y of XYZ</title>
+                                <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
+                                <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
+                                <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
+                            </group>
+                            <group id="z">
+                                <title>Group Z of XYZ</title>
+                                <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
+                                <control id="z2" opr:id="xyz-tiny_catalog#z2"><title>Control Z2</title></control>
+                                <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
+                                    <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
+                                        <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1">
+                                            <title>Control Z3-A-1</title></control>
+                                    </control>
+                                </control>
+                            </group>
+                        </selection>
+                        <merge>
+                            <custom>
+                                <group id="g1">
+                                    <title>New Group 1</title>
+                                    <insert-controls>
+                                        <include-controls>
+                                            <with-id>x1</with-id>
+                                            <with-id>y1</with-id>
+                                            <with-id>z1</with-id>
+                                        </include-controls>
+                                    </insert-controls>
+                                </group>
+                                <group id="g2">
+                                    <title>New Group 2</title>
+                                    <insert-controls>
+                                        <include-controls>
+                                            <with-id>x2</with-id>
+                                            <with-id>y2</with-id>
+                                            <with-id>z2</with-id>
+                                        </include-controls>
+                                    </insert-controls>
+                                </group>
+                            </custom>
+                        </merge>
+                    </catalog>
+                </x:context>
+                <x:expect label="New groups for XYZ 1 and 2">
+                    <group id="g1">
+                        <title>New Group 1</title>
+                        <control id="x1"><title>Control X1</title></control>
+                        <control id="y1"><title>Control Y1</title></control>
+                        <control id="z1"><title>Control Z1</title></control>
                     </group>
-                    <group id="z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
+                    <group id="g2">
+                        <title>New Group 2</title>
+                        <control id="x2"><title>Control X2</title></control>
+                        <control id="y2"><title>Control Y2</title></control>
+                        <control id="z2"><title>Control Z2</title></control>
+                    </group>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="Multiple imports with different group structure">
+                <x:context mode="o:custom-merge" select="//o:custom">
+                    <catalog uuid="xyz-tiny_catalog">
+                        <selection uuid="x_selection">
+                            <group id="x">
+                                <title>Group X of XYZ</title>
+                                <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                                <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                                <control id="x3" opr:id="xyz-tiny_catalog#x3"><title>Control X3</title></control>
+                            </group>
+                        </selection>
+                        <selection uuid="y_selection">
+                            <group id="parent">
+                                <title>Parent of Group Y</title>
+                                <group id="y">
+                                    <title>Group Y of XYZ</title>
+                                    <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
+                                    <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
+                                    <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
+                                </group>
+                            </group>
+                        </selection>
+                        <selection uuid="z:selection">
+                            <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
+                            <control id="z2" opr:id="xyz-tiny_catalog#z2"><title>Control Z2</title></control>
+                            <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
+                                <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1">
+                                        <title>Control Z3-A-1</title></control>
+                                </control>
                             </control>
-                        </control>
+                        </selection>
+                        <merge>
+                            <custom>
+                                <group id="g1">
+                                    <title>New Group 1</title>
+                                    <insert-controls>
+                                        <include-controls>
+                                            <with-id>x1</with-id>
+                                            <with-id>y1</with-id>
+                                            <with-id>z1</with-id>
+                                        </include-controls>
+                                    </insert-controls>
+                                </group>
+                                <group id="g2">
+                                    <title>New Group 2</title>
+                                    <insert-controls>
+                                        <include-controls>
+                                            <with-id>x2</with-id>
+                                            <with-id>y2</with-id>
+                                            <with-id>z2</with-id>
+                                        </include-controls>
+                                    </insert-controls>
+                                </group>
+                            </custom>
+                        </merge>
+                    </catalog>
+                </x:context>
+                <x:expect label="New groups for XYZ 1 and 2">
+                    <group id="g1">
+                        <title>New Group 1</title>
+                        <control id="x1"><title>Control X1</title></control>
+                        <control id="y1"><title>Control Y1</title></control>
+                        <control id="z1"><title>Control Z1</title></control>
                     </group>
-                </selection>
-                <selection uuid="xyz-tiny_catalog">
-                    <group id="x">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1">
-                            <title>Control X1</title>
-                            <prop value="modified property" name="mod"/>
-                        </control>
-                        <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                    <group id="g2">
+                        <title>New Group 2</title>
+                        <control id="x2"><title>Control X2</title></control>
+                        <control id="y2"><title>Control Y2</title></control>
+                        <control id="z2"><title>Control Z2</title></control>
                     </group>
-                    <group id="y">
-                        <title>Group Y of XYZ</title>
-                        <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
-                        <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
-                        <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="Custom groups using include-all, exclude-controls, and insert-controls">
+                <x:context mode="o:custom-merge" select="//o:custom">
+                    <catalog uuid="xyz-tiny_catalog">
+                        <selection uuid="xyz-tiny_catalog_selection">
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                            <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                            <control id="x3" opr:id="xyz-tiny_catalog#x3"><title>Control X3</title></control>
+                        </selection>
+                        <merge>
+                            <custom>
+                                <group>
+                                    <title>Group A</title>
+                                    <insert-controls>
+                                        <include-all/>
+                                        <exclude-controls>
+                                            <with-id>x2</with-id>
+                                        </exclude-controls>
+                                    </insert-controls>
+                                </group>
+                                <group>
+                                    <title>Group B</title>
+                                    <insert-controls>
+                                        <include-controls>
+                                            <with-id>x2</with-id>
+                                        </include-controls>
+                                    </insert-controls>
+                                </group>
+                            </custom>
+                        </merge>
+                    </catalog>
+                </x:context>
+                <x:expect label="Group A with controls x1 and x3" test="/o:group[1]">
+                    <group>
+                        <title>Group A</title>
+                        <control id="x1"><title>Control X1</title></control>
+                        <control id="x3"><title>Control X3</title></control>
                     </group>
-                    <group id="z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
+                </x:expect>
+                <x:expect label="Group B with control x2" test="/o:group[2]">
+                    <group>
+                        <title>Group B</title>
+                        <control id="x2"><title>Control X2</title></control>
                     </group>
+                </x:expect>
+            </x:scenario>
+            <x:scenario label="Nested custom groups">
+                <x:context mode="o:custom-merge" select="//o:custom">
+                    <catalog uuid="xyz-tiny_catalog">
+                        <selection uuid="xyz-tiny_catalog_selection">
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                            <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                            <control id="x3" opr:id="xyz-tiny_catalog#x3"><title>Control X3</title></control>
+                        </selection>
+                        <merge>
+                            <custom>
+                                <group id="a">
+                                    <title>Group A</title>
+                                    <group id="a.1">
+                                        <title>Group A.1</title>
+                                        <insert-controls>
+                                            <include-controls>
+                                                <with-id>x2</with-id>
+                                                <with-id>nonexistent</with-id>
+                                            </include-controls>
+                                        </insert-controls>
+                                    </group>
+                                </group>
+                                <group id="b">
+                                    <title>Group B</title>
+                                    <group id="b.1">
+                                        <title>Group B.1</title>
+                                        <insert-controls>
+                                            <include-controls>
+                                                <matching>q*</matching>
+                                            </include-controls>
+                                        </insert-controls>
+                                    </group>
+                                </group>
+                            </custom>
+                        </merge>
+                    </catalog>
+                </x:context>
+                <x:expect label="Group A containing group A.1 containing control x2" test="/o:group[1]">
+                    <group id="a">
+                        <title>Group A</title>
+                        <group id="a.1">
+                            <title>Group A.1</title>
+                            <control id="x2"><title>Control X2</title></control>
+                        </group>
+                    </group>
+                </x:expect>
+                <x:expect label="Group B containing group B.1 containing no controls" test="/o:group[2]">
+                    <group id="b">
+                        <title>Group B</title>
+                        <group id="b.1">
+                            <title>Group B.1</title>
+                        </group>
+                    </group>
+                </x:expect>
+            </x:scenario>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for match=insert-controls mode=o:custom-merge template">
+        <x:scenario label="include-all followed by exclude-controls">
+            <x:context mode="o:custom-merge" select="//o:insert-controls">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection uuid="xyz-tiny_catalog">
+                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                        <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                        <control id="x3" opr:id="xyz-tiny_catalog#x3"><title>Control X3</title></control>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-all/>
+                                <exclude-controls>
+                                    <with-id>x2</with-id>
+                                    <matching pattern="*1"/>
+                                </exclude-controls>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="Control x3 because x1 and x2 were excluded">
+                <control id="x3"><title>Control X3</title></control>                
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="insert-controls looking for controls not in catalog/selection">
+            <x:context mode="o:custom-merge" select="//o:custom">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection uuid="xyz-tiny_catalog_selection">
+                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                        <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                        <control id="x3" opr:id="xyz-tiny_catalog#x3"><title>Control X3</title></control>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-controls>
+                                    <matching pattern="nonexistent*"/>
+                                    <with-id>nonexistent</with-id>
+                                </include-controls>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
+        <x:scenario label="Descending order by control ID">
+            <x:variable name="ov:order" select="'descending'"/>
+            <x:like label="SHARED: Context with placeholder for insert-controls order"/>
+            <x:expect label="Controls x3, x1, and ax2 in that order">
+                <control id="x3"><title>Control X3</title></control>
+                <control id="x1"><title>Control X1</title></control>
+                <control id="ax2"><title>Control X2</title></control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Ascending by control ID">
+            <x:variable name="ov:order" select="'ascending'"/>
+            <x:like label="SHARED: Context with placeholder for insert-controls order"/>
+            <x:expect label="Controls ax2, x1, and x3 in that order">
+                <control id="ax2"><title>Control X2</title></control>
+                <control id="x1"><title>Control X1</title></control>
+                <control id="x3"><title>Control X3</title></control>                
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Keep order from catalog">
+            <!-- Note: Output of selection phase XSLT has catalog/selection that
+                reflects order of controls in input catalog. For tests that confirm
+                this behavior, search select.xspec for "Order of controls in output". -->
+            <x:variable name="ov:order" select="'keep'"/>
+            <x:like label="SHARED: Context with placeholder for insert-controls order"/>
+            <x:expect label="Controls x1, ax2, and x3 in that order">
+                <control id="x1"><title>Control X1</title></control>
+                <control id="ax2"><title>Control X2</title></control>
+                <control id="x3"><title>Control X3</title></control>                
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Empty string for order attribute (behaves like order=keep)">
+            <x:variable name="ov:order" select="''"/>
+            <x:like label="SHARED: Context with placeholder for insert-controls order"/>
+            <x:expect label="Controls x1, ax2, and x3 in that order">
+                <control id="x1"><title>Control X1</title></control>
+                <control id="ax2"><title>Control X2</title></control>
+                <control id="x3"><title>Control X3</title></control>
+            </x:expect>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario shared="yes" label="SHARED: Context with placeholder for insert-controls order">
+        <x:context mode="o:custom-merge" select="//o:insert-controls">
+            <catalog uuid="xyz-tiny_catalog">
+                <selection uuid="xyz-tiny_catalog_selection">
+                    <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                    <control id="ax2" opr:id="xyz-tiny_catalog#ax2"><title>Control X2</title></control>
+                    <control id="x3" opr:id="xyz-tiny_catalog#x3"><title>Control X3</title></control>
                 </selection>
+                <merge>
+                    <custom>
+                        <insert-controls order="{$ov:order}">
+                            <include-controls><!-- Order of with-id elements does not matter. -->
+                                <with-id>x1</with-id>
+                                <with-id>x3</with-id>
+                                <with-id>ax2</with-id>
+                            </include-controls>
+                        </insert-controls>                            
+                    </custom>
+                </merge>
             </catalog>
         </x:context>
-        <x:expect label="XYZ catalog twice, flat, with clashing controls">
-            <catalog>
-                <control id="x1"><title>Control X1</title></control>
-                <control id="z1"><title>Control Z1</title></control>
-                <control id="z3"><title>Control Z3</title>
-                    <control id="z3.a"><title>Control Z3-A</title>
-                        <control id="z3.a-1"><title>Control Z3-A-1</title></control>
-                    </control>
-                </control>
-                <control id="x1">
-                    <title>Control X1</title>
-                    <prop value="modified property" name="mod"/>
+    </x:scenario>
+
+    <x:scenario label="Tests for match=include-all | include-controls mode=o:custom-merge template">
+        <!-- Template shares code with selection phase, which is tested in select.xspec.
+            These scenarios merely spot-check. -->
+        <x:scenario label="include-controls matches something">
+            <x:context mode="o:custom-merge" select="//o:include-controls">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection>
+                        <control id="a1"/>
+                        <control id="a2"/>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-controls>
+                                    <with-id>a1</with-id>
+                                </include-controls>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="Specified controls">
+                <control id="a1"/>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="include-controls does not match anything">
+            <x:context mode="o:custom-merge" select="//o:include-controls">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection>
+                        <control id="a1"/>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-controls>
+                                    <with-id>nonexistent</with-id>
+                                </include-controls>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="Nothing" select="()"/>
+        </x:scenario>
+        <x:scenario label="include-all with no exclusions">
+            <x:context mode="o:custom-merge" select="//o:include-all">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection>
+                        <control id="a1"/>
+                        <control id="a2"/>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-all/>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="All controls">
+                <control id="a1"/>
+                <control id="a2"/>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="include-all with exclusions">
+            <x:context mode="o:custom-merge" select="//o:include-all">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection>
+                        <control id="a1"/>
+                        <control id="a2"/>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-all/>
+                                <exclude-controls>
+                                    <matching pattern="a*"/>
+                                </exclude-controls>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="All controls not excluded - in this case, nothing"
+                select="()"/>
+        </x:scenario>
+        <x:scenario label="include-controls without child controls (default choice)">
+            <x:context mode="o:custom-merge" select="//o:include-controls">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection>
+                        <control id="a1">
+                            <control id="a1.1"/>
+                        </control>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-controls with-child-controls="no">
+                                    <with-id>a1</with-id>
+                                </include-controls>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="Parent control without child control">
+                <control id="a1"/>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="include-controls with child controls (nondefault choice)">
+            <x:context mode="o:custom-merge" select="//o:include-controls">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection>
+                        <control id="a1">
+                            <control id="a1.1"/>
+                        </control>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-controls with-child-controls="yes">
+                                    <with-id>a1</with-id>
+                                </include-controls>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="Parent control with child control">
+                <control id="a1">
+                    <control id="a1.1"/>
                 </control>
-                <control id="x2"><title>Control X2</title></control>
-                <control id="y1"><title>Control Y1</title></control>
-                <control id="y2"><title>Control Y2</title></control>
-                <control id="y3"><title>Control Y3</title></control>
-                <control id="z3"><title>Control Z3</title>
-                    <control id="z3.a"><title>Control Z3-A</title>
-                        <control id="z3.a-1"><title>Control Z3-A-1</title></control>
-                    </control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="include-controls with parent controls (default choice)">
+            <x:context mode="o:custom-merge" select="//o:include-controls">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection>
+                        <control id="a1">
+                            <control id="a1.1"/>
+                        </control>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-controls with-parent-controls="yes">
+                                    <with-id>a1.1</with-id>
+                                </include-controls>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="Parent control with child">
+                <control id="a1">
+                    <control id="a1.1"/>
                 </control>
-            </catalog>
-        </x:expect>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="include-controls without parent controls (nondefault choice)">
+            <x:context mode="o:custom-merge" select="//o:include-controls">
+                <catalog uuid="xyz-tiny_catalog">
+                    <selection>
+                        <control id="a1">
+                            <control id="a1.1"/>
+                        </control>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-controls with-parent-controls="no">
+                                    <with-id>a1.1</with-id>
+                                </include-controls>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:expect label="Child control without parent">
+                <control id="a1.1"/>
+            </x:expect>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for match=exclude-controls mode=o:custom-merge template">
+        <x:context mode="o:custom-merge">
+            <exclude-controls>
+                <with-id>x1</with-id>
+            </exclude-controls>
+        </x:context>
+        <x:expect label="Nothing" select="()"/>
     </x:scenario>
 </x:description>
diff --git a/src/utils/util/resolver-pipeline/testing/3_merged/merge.xspec b/src/utils/util/resolver-pipeline/testing/3_merged/merge.xspec
index c4619ccbea..d9e44c873d 100644
--- a/src/utils/util/resolver-pipeline/testing/3_merged/merge.xspec
+++ b/src/utils/util/resolver-pipeline/testing/3_merged/merge.xspec
@@ -1,17 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?><x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0" xmlns:x="http://www.jenitennison.com/xslt/xspec" xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution" stylesheet="../../oscal-profile-resolve-merge.xsl">
-    <x:scenario label="Base">
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
+    xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
+    xmlns:ov="http://csrc.nist.gov/ns/oscal/xspec/variable"
+    xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    stylesheet="../../oscal-profile-resolve-merge.xsl">
+
+    <x:scenario label="Tests for match='/ | * | @*' template for all modes">
+        <!-- Include wrapper in $ov:arbitrary-element to bypass match="/*" template. -->
+        <x:variable name="ov:arbitrary-element" as="element(arbitrary-element)" select="//arbitrary-element">
+            <some-wrapper>
+                <arbitrary-element xmlns="" arbitrary-attribute="val">text<child/></arbitrary-element>
+            </some-wrapper>
+        </x:variable>
+        <x:scenario label="Element">
+            <x:context select="$ov:arbitrary-element"/>
+            <x:expect label="Copy" select="$ov:arbitrary-element"/>
+        </x:scenario>
+        <x:scenario label="Attribute">
+            <x:context select="$ov:arbitrary-element/@arbitrary-attribute"/>
+            <x:expect label="Copy"
+                test="$x:result instance of attribute(arbitrary-attribute) and $x:result/string()='val'"/>
+        </x:scenario>
+    </x:scenario>
+
+
+    <x:scenario label="Test for match=/* priority=1 template, which should not be reached in practice">
         <x:context>
-            <catalog/>
+            <not-a-catalog/>
         </x:context>
+        <x:expect label="Nothing" select="()"/>
+    </x:scenario>
 
-        <x:expect label="profile becomes catalog">
-            <catalog/>
+    <x:scenario label="Test for match=catalog priority=2 template">
+        <!-- Context is a catalog with neither selection nor merge. -->
+        <x:context>
+            <catalog uuid="zzz">
+                <metadata/>
+            </catalog>
+        </x:context>
+        <x:expect label="Copy of catalog">
+            <catalog uuid="zzz">
+                <metadata/>
+            </catalog>
         </x:expect>
     </x:scenario>
-    <x:scenario label="Single import, no merge (flat)">
-        <x:context>
-            <catalog>
-                <selection uuid="xyz-tiny_catalog">
+
+    <x:scenario label="Tests for match=catalog[exists(selection)] priority=10 template">
+        <!-- Context is a catalog with at least one selection child but no merge child. -->
+        <x:scenario label="Single import, no merge (flat)">
+            <x:context>
+                <catalog>
+                    <selection uuid="xyz-tiny_catalog">
                         <group id="x">
                             <title>Group X of XYZ</title>
                             <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
@@ -36,29 +76,206 @@
                             </control>
                         </group>
                     </selection>
-                <!-- no merge -->
-            </catalog>
-        </x:context>
-        <x:expect label="All XYZ controls, ungrouped">
-            <catalog>
-                <control id="x1"><title>Control X1</title></control>
-                <control id="x2"><title>Control X2</title></control>
-                <control id="x3"><title>Control X3</title></control>
-                <control id="y1"><title>Control Y1</title></control>
-                <control id="y2"><title>Control Y2</title></control>
-                <control id="y3"><title>Control Y3</title></control>
-                <control id="z1"><title>Control Z1</title></control>
-                <control id="z2"><title>Control Z2</title></control>
-                <control id="z3"><title>Control Z3</title>
-                    <control id="z3.a"><title>Control Z3-A</title>
-                        <control id="z3.a-1"><title>Control Z3-A-1</title></control>
+                    <!-- no merge -->
+                </catalog>
+            </x:context>
+            <x:expect label="All XYZ controls, ungrouped">
+                <catalog>
+                    <control id="x1"><title>Control X1</title></control>
+                    <control id="x2"><title>Control X2</title></control>
+                    <control id="x3"><title>Control X3</title></control>
+                    <control id="y1"><title>Control Y1</title></control>
+                    <control id="y2"><title>Control Y2</title></control>
+                    <control id="y3"><title>Control Y3</title></control>
+                    <control id="z1"><title>Control Z1</title></control>
+                    <control id="z2"><title>Control Z2</title></control>
+                    <control id="z3"><title>Control Z3</title>
+                        <control id="z3.a"><title>Control Z3-A</title>
+                            <control id="z3.a-1"><title>Control Z3-A-1</title></control>
+                        </control>
                     </control>
-                </control>
-            </catalog>
-        </x:expect>
+                </catalog>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Parallel imports, no merge, keeping all">
+            <x:context>
+                <catalog>
+                    <selection uuid="xyz-tiny_catalog">
+                        <group id="x">
+                            <title>Group X of XYZ</title>
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                        </group>
+                        <group id="z">
+                            <title>Group Z of XYZ</title>
+                            <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
+                            <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
+                                <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
+                                </control>
+                            </control>
+                        </group>
+                    </selection>
+                    <selection uuid="xyz-tiny_catalog">
+                        <group id="x">
+                            <title>Group X of XYZ</title>
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1">
+                                <title>Control X1</title>
+                                <prop value="modified property" name="mod"/>
+                            </control>
+                            <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
+                        </group>
+                        <group id="y">
+                            <title>Group Y of XYZ</title>
+                            <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
+                            <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
+                            <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
+                        </group>
+                        <group id="z">
+                            <title>Group Z of XYZ</title>
+                            <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
+                                <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
+                                    <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
+                                </control>
+                            </control>
+                        </group>
+                    </selection>
+                    <!-- no merge -->
+                </catalog>
+            </x:context>
+            <x:expect label="XYZ catalog twice, flat, with clashing controls">
+                <catalog>
+                    <control id="x1"><title>Control X1</title></control>
+                    <control id="z1"><title>Control Z1</title></control>
+                    <control id="z3"><title>Control Z3</title>
+                        <control id="z3.a"><title>Control Z3-A</title>
+                            <control id="z3.a-1"><title>Control Z3-A-1</title></control>
+                        </control>
+                    </control>
+                    <control id="x1">
+                        <title>Control X1</title>
+                        <prop value="modified property" name="mod"/>
+                    </control>
+                    <control id="x2"><title>Control X2</title></control>
+                    <control id="y1"><title>Control Y1</title></control>
+                    <control id="y2"><title>Control Y2</title></control>
+                    <control id="y3"><title>Control Y3</title></control>
+                    <control id="z3"><title>Control Z3</title>
+                        <control id="z3.a"><title>Control Z3-A</title>
+                            <control id="z3.a-1"><title>Control Z3-A-1</title></control>
+                        </control>
+                    </control>
+                </catalog>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Catalog with attribute, metadata, and modify child">
+            <x:context>
+                <catalog uuid="zzz">
+                    <metadata>
+                        <title>Test Profile</title>
+                        <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
+                        <version>1.3</version>
+                        <oscal-version>1.0.2</oscal-version>
+                        <prop name="resolution-tool" value="OSCAL Profile Resolver XSLT Pipeline OPRXP" />
+                        <link href="urn:UNKNOWN" rel="source-profile" />
+                    </metadata>
+                    <selection uuid="xyz-tiny_catalog">
+                        <control id="x1"><title>Control X1</title></control>
+                    </selection>
+                    <!-- no merge -->
+                    <modify>
+                        <set-parameter param-id="a1_prm1">
+                            <constraint>
+                                <description>
+                                    <p>at least every 3 years</p>
+                                </description>
+                            </constraint>
+                        </set-parameter>
+                    </modify>
+                </catalog>
+            </x:context>
+            <x:expect label="Output includes catalog attribute, metadata, and modify child">
+                <catalog uuid="zzz">
+                    <metadata>
+                        <title>Test Profile</title>
+                        <last-modified>2019-11-13T12:41:07.061-05:00</last-modified>
+                        <version>1.3</version>
+                        <oscal-version>1.0.2</oscal-version>
+                        <prop name="resolution-tool" value="OSCAL Profile Resolver XSLT Pipeline OPRXP" />
+                        <link href="urn:UNKNOWN" rel="source-profile" />
+                    </metadata>
+                    <control id="x1"><title>Control X1</title></control>
+                    <modify>
+                        <set-parameter param-id="a1_prm1">
+                            <constraint>
+                                <description>
+                                    <p>at least every 3 years</p>
+                                </description>
+                            </constraint>
+                        </set-parameter>
+                    </modify>
+                </catalog>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Catalog with back matter inside and outside selection">
+            <x:context>
+                <catalog uuid="zzz">
+                    <selection uuid="xyz-tiny_catalog">
+                        <control id="x1"><title>Control X1</title></control>
+                        <back-matter>
+                            <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                                <title>Ref BBB</title>
+                                <citation>
+                                    <text>Bbb bbbbb Bbb b.</text>
+                                </citation>
+                                <rlink href="bbb.html"/>
+                            </resource>
+                        </back-matter>
+                    </selection>
+                    <!-- no merge -->
+                    <back-matter>
+                        <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e1">
+                            <title>Ref AAA</title>
+                            <citation>
+                                <text>Aaaa aaaa aaaa</text>
+                            </citation>
+                            <rlink href="aaa.html"/>
+                        </resource>
+                    </back-matter>
+                </catalog>
+            </x:context>
+            <x:expect label="Output includes consolidated back matter">
+                <catalog uuid="zzz">
+                    <control id="x1"><title>Control X1</title></control>
+                    <back-matter>
+                        <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                            <title>Ref BBB</title>
+                            <citation>
+                                <text>Bbb bbbbb Bbb b.</text>
+                            </citation>
+                            <rlink href="bbb.html"/>
+                        </resource>
+                        <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e1">
+                            <title>Ref AAA</title>
+                            <citation>
+                                <text>Aaaa aaaa aaaa</text>
+                            </citation>
+                            <rlink href="aaa.html"/>
+                        </resource>
+                    </back-matter>
+                </catalog>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="as-is element appears but content is not true">
+            <x:variable name="ov:as-is-content">0</x:variable>
+            <x:like label="SHARED: as-is element with placeholder for content"/>
+        </x:scenario>
+        <x:scenario label="as-is element appears but has no content">
+            <x:variable name="ov:as-is-content"/>
+            <x:like label="SHARED: as-is element with placeholder for content"/>
+        </x:scenario>
     </x:scenario>
 
-    <x:scenario label="Parallel imports, no merge, keeping all">
+    <x:scenario shared="yes" label="SHARED: as-is element with placeholder for content">
         <x:context>
             <catalog>
                 <selection uuid="xyz-tiny_catalog">
@@ -66,65 +283,450 @@
                         <title>Group X of XYZ</title>
                         <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
                     </group>
-                    <group id="z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z1" opr:id="xyz-tiny_catalog#z1"><title>Control Z1</title></control>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
-                    </group>
-                </selection>
-                <selection uuid="xyz-tiny_catalog">
-                    <group id="x">
-                        <title>Group X of XYZ</title>
-                        <control id="x1" opr:id="xyz-tiny_catalog#x1">
-                            <title>Control X1</title>
-                            <prop value="modified property" name="mod"/>
-                        </control>
-                        <control id="x2" opr:id="xyz-tiny_catalog#x2"><title>Control X2</title></control>
-                    </group>
                     <group id="y">
                         <title>Group Y of XYZ</title>
                         <control id="y1" opr:id="xyz-tiny_catalog#y1"><title>Control Y1</title></control>
-                        <control id="y2" opr:id="xyz-tiny_catalog#y2"><title>Control Y2</title></control>
-                        <control id="y3" opr:id="xyz-tiny_catalog#y3"><title>Control Y3</title></control>
-                    </group>
-                    <group id="z">
-                        <title>Group Z of XYZ</title>
-                        <control id="z3" opr:id="xyz-tiny_catalog#z3"><title>Control Z3</title>
-                            <control id="z3.a" opr:id="xyz-tiny_catalog#z3.a"><title>Control Z3-A</title>
-                                <control id="z3.a-1" opr:id="xyz-tiny_catalog#z3.a-1"><title>Control Z3-A-1</title></control>
-                            </control>
-                        </control>
                     </group>
                 </selection>
+                <merge>
+                    <as-is x:expand-text="true">{$ov:as-is-content}</as-is>
+                </merge>
             </catalog>
         </x:context>
-        <x:expect label="XYZ catalog twice, flat, with clashing controls">
+        <x:expect label="Flat structure, not grouped">
             <catalog>
                 <control id="x1"><title>Control X1</title></control>
-                <control id="z1"><title>Control Z1</title></control>
-                <control id="z3"><title>Control Z3</title>
-                    <control id="z3.a"><title>Control Z3-A</title>
-                        <control id="z3.a-1"><title>Control Z3-A-1</title></control>
-                    </control>
-                </control>
-                <control id="x1">
-                    <title>Control X1</title>
-                    <prop value="modified property" name="mod"/>
-                </control>
-                <control id="x2"><title>Control X2</title></control>
                 <control id="y1"><title>Control Y1</title></control>
-                <control id="y2"><title>Control Y2</title></control>
-                <control id="y3"><title>Control Y3</title></control>
-                <control id="z3"><title>Control Z3</title>
-                    <control id="z3.a"><title>Control Z3-A</title>
-                        <control id="z3.a-1"><title>Control Z3-A-1</title></control>
-                    </control>
-                </control>
             </catalog>
         </x:expect>
     </x:scenario>
+
+    <!-- Tests for match=catalog[merge/as-is=$true-content] priority=12 template are in merge-as-is.xspec -->
+    <!-- Tests for match=catalog[exists(merge/custom)] priority=13 template are in merge-custom.xspec -->
+
+    <x:scenario label="Tests for detect-multiple-structuring-directives template">
+        <x:scenario label="Error case: custom appears and as-is is true" catch="yes">
+            <x:context>
+                <catalog uuid="xyz-tiny_catalog">
+                    <merge>
+                        <custom/>
+                        <as-is>1</as-is>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:call template="detect-multiple-structuring-directives"/>
+            <x:expect label="Fatal XSLT error"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>            
+        </x:scenario>
+        <x:scenario label="Error case: custom appears and flat is true" catch="yes">
+            <x:context>
+                <catalog uuid="xyz-tiny_catalog">
+                    <merge>
+                        <custom/>
+                        <flat>true</flat>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:call template="detect-multiple-structuring-directives"/>
+            <x:expect label="Fatal XSLT error"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>            
+        </x:scenario>
+        <x:scenario label="Error case: as-is and flat are both true" catch="yes">  
+            <x:context>
+                <catalog>
+                    <merge>
+                        <flat>true</flat>
+                        <as-is>1</as-is>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:call template="detect-multiple-structuring-directives"/>
+            <x:expect label="Fatal XSLT error"
+                test="$x:result instance of map(*) and $x:result('err') instance of map(*)"/>            
+        </x:scenario>
+        <x:scenario label="Non-error case: as-is and flat both appear but flat is not true" catch="no">  
+            <x:context>
+                <catalog>
+                    <merge>
+                        <flat/>
+                        <as-is>1</as-is>
+                    </merge>
+                </catalog>
+            </x:context>
+            <x:call template="detect-multiple-structuring-directives"/>
+            <x:expect label="No XSLT error" select="()"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for combine-back-matter template">
+        <x:scenario label="Back matter as child of catalog">
+            <x:context>
+                <catalog>
+                    <back-matter>
+                        <resource>
+                            <title>Ref CCC</title>
+                        </resource>
+                        <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                            <title>Ref BBB</title>
+                        </resource>
+                        <resource opr:id="ref001">
+                            <title>Ref AAA</title>
+                        </resource>
+                    </back-matter>
+                </catalog>
+            </x:context>
+            <x:call template="combine-back-matter"/>
+            <x:expect label="back-matter with items, @opr:id omitted">
+                <back-matter>
+                    <resource>
+                        <title>Ref CCC</title>
+                    </resource>
+                    <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                        <title>Ref BBB</title>
+                    </resource>
+                    <resource>
+                        <title>Ref AAA</title>
+                    </resource>
+                </back-matter>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Back matter as child of selection">
+            <x:context>
+                <catalog>
+                    <selection uuid="xyz-tiny_catalog">
+                        <control id="x1"><title>Control X1</title></control>
+                        <back-matter>
+                            <resource>
+                                <title>Ref CCC</title>
+                            </resource>
+                            <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                                <title>Ref BBB</title>
+                            </resource>
+                        </back-matter>
+                    </selection>
+                    <selection uuid="xyz-tiny_catalog2">
+                        <control id="x2"><title>Control X2</title></control>
+                        <back-matter>
+                            <resource opr:id="ref001">
+                                <title>Ref AAA</title>
+                            </resource>
+                        </back-matter>
+                    </selection>
+                </catalog>
+            </x:context>
+            <x:call template="combine-back-matter"/>
+            <x:expect label="back-matter with items, @opr:id omitted">
+                <back-matter>
+                    <resource>
+                        <title>Ref CCC</title>
+                    </resource>
+                    <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                        <title>Ref BBB</title>
+                    </resource>
+                    <resource>
+                        <title>Ref AAA</title>
+                    </resource>
+                </back-matter>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Back matter in multiple places with duplication">
+            <x:context>
+                <catalog>
+                    <selection uuid="xyz-tiny_catalog">
+                        <control id="x1"><title>Control X1</title></control>
+                        <back-matter>
+                            <resource>
+                                <title>Ref CCC</title>
+                            </resource>
+                            <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                                <title>Ref BBB, first</title>
+                            </resource>
+                            <resource opr:id="ref001">
+                                <title>Ref AAA</title>
+                            </resource>
+                        </back-matter>
+                    </selection>
+                    <selection uuid="xyz-tiny_catalog2">
+                        <control id="x2"><title>Control X2</title></control>
+                        <back-matter>
+                            <resource>
+                                <title>Ref CCC</title>
+                            </resource>
+                            <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                                <title>Ref BBB, second</title>
+                            </resource>
+                            <resource opr:id="ref001">
+                                <title>Ref AAA</title>
+                            </resource>
+                        </back-matter>
+                    </selection>
+                    <back-matter>
+                        <resource>
+                            <title>Ref CCC</title>
+                        </resource>
+                        <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                            <title>Ref BBB, third</title>
+                        </resource>
+                        <resource opr:id="ref001">
+                            <title>Ref AAA</title>
+                        </resource>
+                    </back-matter>
+                </catalog>
+            </x:context>
+            <x:call template="combine-back-matter"/>
+            <x:expect label="back-matter with last item for each distinct uuid or distinct opr:id.">
+                <back-matter>
+                    <resource>
+                        <title>Ref CCC</title>
+                    </resource>
+                    <resource uuid="0050231f-4fd0-43d6-8fa0-431367cd83e2">
+                        <title>Ref BBB, third</title>
+                    </resource>
+                    <resource>
+                        <title>Ref AAA</title>
+                    </resource>
+                    <resource>
+                        <title>Ref CCC</title>
+                    </resource>
+                    <resource>
+                        <title>Ref CCC</title>
+                    </resource>
+                </back-matter>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="No back matter in input context">
+            <x:context>
+                <catalog>
+                    <selection>
+                        <back-matter/>
+                    </selection>
+                    <back-matter/>
+                </catalog>
+            </x:context>
+            <x:call template="combine-back-matter"/>
+            <x:expect label="Nothing (in particular, no empty back-matter wrapper)" select="()"/>
+        </x:scenario>
+    </x:scenario>
+
+    <x:scenario label="Tests for match=selection template">
+        <!-- In <x:context>, <selection> must have a parent element.
+            Otherwise, we reach the match="/*" template instead of the
+            match="selection" template. -->
+        <x:scenario label="Parameters grouped and ungrouped">
+            <x:context select="//o:selection">
+                <catalog>
+                    <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                        <param id="param-a">
+                            <label>Param A</label>
+                            <constraint>no control</constraint>
+                        </param>
+                        <group>
+                            <title>Group X of XYZ</title>
+                            <param id="param-x">
+                                <label>Param X</label>
+                                <constraint>no control</constraint>
+                            </param>
+                            <param id="param-y">
+                                <label>Param Y</label>
+                                <constraint>no control</constraint>
+                            </param>
+                            <group>
+                                <title>Group X2</title>
+                                <param id="param-x2">
+                                    <label>Param X2</label>
+                                    <constraint>no control</constraint>
+                                </param>
+                                <param id="param-y2">
+                                    <label>Param Y2</label>
+                                    <constraint>no control</constraint>
+                                </param>
+                            </group>
+                        </group>
+                    </selection>
+                </catalog>
+            </x:context>
+            <x:expect label="All parameters in document order at all group levels">
+                <param id="param-a">
+                    <label>Param A</label>
+                    <constraint>no control</constraint>
+                </param>
+                <param id="param-x">
+                    <label>Param X</label>
+                    <constraint>no control</constraint>
+                </param>
+                <param id="param-y">
+                    <label>Param Y</label>
+                    <constraint>no control</constraint>
+                </param>
+                <param id="param-x2">
+                    <label>Param X2</label>
+                    <constraint>no control</constraint>
+                </param>
+                <param id="param-y2">
+                    <label>Param Y2</label>
+                    <constraint>no control</constraint>
+                </param>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Controls grouped and ungrouped">
+            <x:context select="//o:selection">
+                <catalog>
+                    <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                        <control id="a"><title>Control A</title></control>
+                        <group>
+                            <title>Group X of XYZ</title>
+                            <control id="x1"><title>Control X1</title></control>
+                            <control id="y1"><title>Control Y1</title></control>
+                            <group>
+                                <title>Group X2</title>
+                                <control id="x2"><title>Control X2</title></control>
+                                <control id="y2"><title>Control Y2</title></control>
+                            </group>
+                        </group>
+                    </selection>
+                </catalog>
+            </x:context>
+            <x:expect label="All controls in document order at all group levels">
+                <control id="a"><title>Control A</title></control>
+                <control id="x1"><title>Control X1</title></control>
+                <control id="y1"><title>Control Y1</title></control>
+                <control id="x2"><title>Control X2</title></control>
+                <control id="y2"><title>Control Y2</title></control>
+            </x:expect>
+        </x:scenario>
+        <x:scenario label="Parameters and controls">
+            <x:context select="//o:selection">
+                <catalog>
+                    <selection id="xyz-tiny_catalog" opr:id="xyz-tiny_catalog#xyz-tiny_catalog">
+                        <param id="param-a">
+                            <label>Param A</label>
+                            <constraint>no control</constraint>
+                        </param>
+                        <control id="a"><title>Control A</title></control>
+                        <group>
+                            <title>Group X of XYZ</title>
+                            <param id="param-x1">
+                                <label>Param X1</label>
+                                <constraint>no control</constraint>
+                            </param>
+                            <control id="x1"><title>Control X1</title></control>
+                        </group>
+                    </selection>
+                </catalog>
+            </x:context>
+            <x:expect label="All parameters followed by all controls">
+                <param id="param-a">...</param>
+                <param id="param-x1">...</param>
+                <control id="a">...</control>
+                <control id="x1">...</control>
+            </x:expect>
+        </x:scenario>
+    </x:scenario>
+
+    <!-- Tests for all mode=o:custom-merge templates are in merge-custom.xspec -->
+    
+    <x:scenario label="Tests for match=selection|selection//group mode=o:select template">
+        <x:variable name="ov:control">
+            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>            
+        </x:variable>
+        <x:scenario label="Context is selection with child control">
+            <x:variable name="ov:context">
+                <catalog uuid="zzz">
+                    <selection>
+                        <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-all/>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:variable>
+            <x:context mode="o:select" select="$ov:context//o:selection">
+                <x:param name="import-instruction" tunnel="yes" select="$ov:context//o:insert-controls"/>
+            </x:context>
+            <x:expect label="Child control" select="$ov:control"/>
+        </x:scenario>
+        <x:scenario label="Context is selection with child group">
+            <x:variable name="ov:context">
+                <catalog uuid="zzz">
+                    <selection>
+                        <group id="parent">
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                        </group>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-all/>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:variable>
+            <x:context mode="o:select" select="$ov:context//o:selection">
+                <x:param name="import-instruction" tunnel="yes" select="$ov:context//o:insert-controls"/>
+            </x:context>
+            <x:expect label="Descendant control" select="$ov:control"/>
+        </x:scenario>
+        <x:scenario label="Context is group with nested group">
+            <x:variable name="ov:context">
+                <catalog uuid="zzz">
+                    <selection>
+                        <group id="parent">
+                            <group id="child">
+                                <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                            </group>
+                        </group>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-all/>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:variable>
+            <x:context mode="o:select" select="$ov:context//o:group[@id='parent']">
+                <x:param name="import-instruction" tunnel="yes" select="$ov:context//o:insert-controls"/>
+            </x:context>
+            <x:expect label="Descendant control" select="$ov:control"/>
+        </x:scenario>
+        <x:scenario label="Context is group with child control">
+            <x:variable name="ov:context">
+                <catalog uuid="zzz">
+                    <selection>
+                        <group id="parent">
+                            <control id="x1" opr:id="xyz-tiny_catalog#x1"><title>Control X1</title></control>
+                        </group>
+                    </selection>
+                    <merge>
+                        <custom>
+                            <insert-controls>
+                                <include-all/>
+                            </insert-controls>
+                        </custom>
+                    </merge>
+                </catalog>
+            </x:variable>
+            <x:context mode="o:select" select="$ov:context//o:group">
+                <x:param name="import-instruction" tunnel="yes" select="$ov:context//o:insert-controls"/>
+            </x:context>
+            <x:expect label="Child control" select="$ov:control"/>
+        </x:scenario>
+    </x:scenario>
+
+    <!-- Tests for o:merge-groups-as-is template are in merge-as-is.xspec -->
+    <!-- Tests for combine-elements template are in merge-combine.xspec -->
+    <!-- Tests for all mode="o:combine-elements" templates are in merge-combine.xspec -->
+
+    <x:scenario label="Tests for match=@opr:id template">
+        <x:context select="@opr:id">
+            <foo opr:id="intermediate-value-id"/>
+        </x:context>
+        <x:expect label="Nothing" select="()"/>
+    </x:scenario>
 </x:description>
diff --git a/src/utils/util/resolver-pipeline/uuid-method-choice.xsl b/src/utils/util/resolver-pipeline/uuid-method-choice.xsl
new file mode 100644
index 0000000000..97c028fb55
--- /dev/null
+++ b/src/utils/util/resolver-pipeline/uuid-method-choice.xsl
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+    xmlns:javaUUID="java.util.UUID"
+    xmlns:mh="http://csrc.nist.gov/ns/message"
+    xmlns:r="http://csrc.nist.gov/ns/random"
+    xmlns:u="http://csrc.nist.gov/ns/uuid"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="#all"
+    version="3.0">
+
+    <xsl:import href="random-util.xsl"/>
+    <xsl:import href="message-handler.xsl"/>
+
+    <!-- Select an approach for assigning the top-level UUID for the 
+        result catalog. Supported values:
+        - 'random-xslt'    No parameters.
+        - 'random-java'    No parameters.
+        - 'user-provided'  Parameter $top-uuid is required in this case.
+        - 'web-service'    Parameter $uuid-service is optional.
+        - 'fixed'          No parameters.
+        -->
+    <xsl:param name="uuid-method" as="xs:string" select="'fixed'"/>
+    
+    <!-- Explicit top-level UUID for the result catalog. -->
+    <xsl:param name="top-uuid" as="xs:string?"/>
+    
+    <!-- Alternatively, call a web service if the processor supports it -->
+    <xsl:param name="uuid-service" select="'https://www.uuidgenerator.net/api/version4'"/>
+
+    <xsl:template name="u:determine-uuid" as="xs:string">
+        <xsl:param name="uuid-method" select="$uuid-method" as="xs:string"/>
+        <xsl:param name="uuid-service" select="$uuid-service" as="xs:string"/>
+        <xsl:param name="top-uuid" select="$top-uuid" as="xs:string?"/>
+        
+        <xsl:variable name="uuid-v4-regex" as="xs:string">^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$</xsl:variable>
+        <xsl:variable name="fixed-uuid" as="xs:string">00000000-0000-4000-B000-000000000000</xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$uuid-method eq 'user-provided' and
+                matches($top-uuid,$uuid-v4-regex)">
+                <xsl:sequence select="$top-uuid"/>
+            </xsl:when>
+            <xsl:when test="$uuid-method eq 'user-provided'">
+                <!-- If we reach this block, the provided value does not match the regex. -->
+                <xsl:call-template name="mh:message-handler">
+                    <xsl:with-param name="message-type">Warning</xsl:with-param>
+                    <xsl:with-param name="text" expand-text="yes">top-uuid value, '{$top-uuid}', does not meet UUID requirements. Using default UUID instead.</xsl:with-param>
+                </xsl:call-template>
+                <xsl:sequence select="$fixed-uuid"/>
+            </xsl:when>
+            <xsl:when test="$uuid-method eq 'random-xslt'" use-when="function-available('random-number-generator')">
+                <!-- seed splices a timestamp with a given @uuid -->
+                <xsl:sequence select="r:make-uuid( /*/@uuid || '-' || replace( string(current-dateTime()),'\D','') )"/>
+            </xsl:when>
+            <xsl:when test="$uuid-method eq 'random-java'" use-when="function-available('javaUUID:randomUUID')">
+                <xsl:sequence select="javaUUID:randomUUID()"/>
+            </xsl:when>
+            <xsl:when test="$uuid-method = ('random-xslt','random-java')">
+                <!-- If we reach this block, the requested random method is not available. -->
+                <xsl:call-template name="mh:message-handler">
+                    <xsl:with-param name="message-type">Warning</xsl:with-param>
+                    <xsl:with-param name="text" expand-text="yes">uuid-method, '{$uuid-method}', is not available. Using default UUID instead.</xsl:with-param>
+                </xsl:call-template>
+                <xsl:sequence select="$fixed-uuid"/>
+            </xsl:when>
+            <xsl:when test="$uuid-method eq 'web-service' and unparsed-text-available($uuid-service)">
+                <xsl:sequence select="unparsed-text($uuid-service)"/>
+            </xsl:when>
+            <xsl:when test="$uuid-method eq 'web-service'">
+                <xsl:call-template name="mh:message-handler">
+                    <xsl:with-param name="message-type">Warning</xsl:with-param>
+                    <xsl:with-param name="text" expand-text="yes">uuid-service, '{$uuid-service}', is not available. Using default UUID instead.</xsl:with-param>
+                </xsl:call-template>
+                <xsl:sequence select="$fixed-uuid"/>
+            </xsl:when>
+            <xsl:when test="$uuid-method eq 'fixed'">
+                <xsl:sequence select="$fixed-uuid"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:call-template name="mh:message-handler">
+                    <xsl:with-param name="message-type">Warning</xsl:with-param>
+                    <xsl:with-param name="text" expand-text="yes">uuid-method, '{$uuid-method}', is not recognized. Using default UUID instead.</xsl:with-param>
+                </xsl:call-template>
+                <xsl:sequence select="$fixed-uuid"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/schema/oscal_complete_schema.xsd b/xml/schema/oscal_complete_schema.xsd
index 0ed7f73115..41569c3f27 100644
--- a/xml/schema/oscal_complete_schema.xsd
+++ b/xml/schema/oscal_complete_schema.xsd
@@ -1847,7 +1847,7 @@
                   <xs:restriction base="xs:boolean"/>
                </xs:simpleType>
             </xs:element>
-            <xs:element name="custom" minOccurs="0" maxOccurs="1">
+            <xs:element name="custom" minOccurs="1" maxOccurs="1">
                <xs:complexType>
                   <xs:annotation>
                      <xs:appinfo>
diff --git a/xml/schema/oscal_profile_schema.xsd b/xml/schema/oscal_profile_schema.xsd
index e27d43d1e0..9337de97f1 100644
--- a/xml/schema/oscal_profile_schema.xsd
+++ b/xml/schema/oscal_profile_schema.xsd
@@ -154,7 +154,7 @@
                   <xs:restriction base="xs:boolean"/>
                </xs:simpleType>
             </xs:element>
-            <xs:element name="custom" minOccurs="0" maxOccurs="1">
+            <xs:element name="custom" minOccurs="1" maxOccurs="1">
                <xs:complexType>
                   <xs:annotation>
                      <xs:appinfo>