From f5353c4c61787626ca37109c9a24ed19ded81bea Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Tue, 31 May 2022 12:59:47 -0400
Subject: [PATCH] Profile resolution unit tests and specification updates
 (#1219)

* Updates to tests including whitespace scrub test
* Adding oXygen project
* Integration work on specs and unit tests / XSLT and Schematron
* Profile resolution testing infrastructure, plus some tests
* Some test files with expected results
* Updated and improved XSpec generation and tests - now driven directly from SpecML source
* Adjusted gitignore; extended spec with more bindings; illustrator XSLT
* Added XSLT producing Markdown summary of requirements w/ examples; updates
* Added a small utility for converting JSON "prop" fields to "props" fields (emended 1.0.2 syntax)
* Updated to Profile Resolution spec (with example files now tagged) and readme.md
* Updated profile resolution (spec) readme with clarification regarding unit testing
---
 .../content-upgrade/json-prop-to-props.xsl    |   39 +
 .../profile-resolution/.gitignore             |    2 +
 .../profile-resolution/example-set.xspec      |  128 ++
 .../lib/build-examples-xspec.xsl              |  111 +
 .../lib/build-reqs-xspec.xsl                  |   94 +
 .../profile-resolution/lib/build-xspec.xsl    |  111 +
 .../{ => lib}/html-to-specml.xsl              |    0
 .../lib/illustrate-resolution.xsl             |  331 +++
 .../lib/oscal-profile-test-helper.xsl         |   90 +
 .../lib/reqs-md-punchlist.xsl                 |   72 +
 .../profile-resolution/lib/spec-checkup.sch   |   77 +
 .../{ => lib}/specml-html-hugo-uswds.xsl      |    1 +
 .../{ => lib}/specml-html-preview.xsl         |   83 +-
 .../{ => lib}/specml-html-static.xsl          |    0
 .../{ => lib}/specml-html-xslt1.xsl           |   24 +-
 .../{ => lib}/specml-html-xslt3.xsl           |    0
 .../lib/specml-tidy-config.xml                |    9 +
 .../profile-resolution/lib/specml-tidy.xsl    |  106 +
 .../profile-resolution/{ => lib}/specml.css   |   12 +-
 .../profile-resolution/{ => lib}/specml.rnc   |    8 +-
 .../profile-resolution/lib/xspec-oxygen.css   |   68 +
 .../profile-resolution/lib/xspec-test-dev.sch |   91 +
 .../profile-resolution/oscal-specs_share.xpr  | 1820 +++++++++++++++++
 .../assess-test-coverage.xsl                  |  110 +
 .../example-set.xspec                         |   41 +
 .../profile-element-usage-survey.html         |  229 +++
 .../scrub-testing.xspec                       |   43 +
 .../profile-resolution-queryset.xspec         |   33 +
 .../profile-resolution-specml-files.xspec     |  102 +
 ...ofile-resolution-specml-requirements.xspec |  445 ++++
 ...le-resolution-specml-working-current.xspec |   36 +
 .../profile-resolution-specml-working.xml     | 1063 ++++++++++
 .../profile-resolution-specml.xml             |  264 ++-
 .../profile-resolution/readme.md              |   76 +-
 .../requirement-tests.xspec                   |   22 +
 .../catalogs/abc-full_catalog.xml             |  141 ++
 .../catalogs/abc-mixed-up_catalog.xml         |  105 +
 .../catalogs/abc-simple_catalog.xml           |  106 +
 .../catalogs/loose-parameters.xml             |   59 +
 .../catalogs/xyz-tiny_catalog.xml             |   55 +
 .../req-include-all-asis-view.html            |  603 ++++++
 .../illustrations/req-include-by-id-view.html |  487 +++++
 .../keep-everything-twice.xml                 |   17 +
 .../req-include-all-asis_RESOLVED.xml         |  103 +
 .../req-include-all-flat_RESOLVED.xml         |   94 +
 .../keep-everything-twice_RESOLVED.xml        |  178 ++
 .../req-chained-all-asis_RESOLVED.xml         |  104 +
 .../req-chained-deepA_RESOLVED.xml            |   81 +
 .../req-circular_import_RESOLVED.xml          |   12 +
 .../req-import-by-resource_RESOLVED.xml       |  103 +
 .../req-include-all-asis_RESOLVED.xml         |  103 +
 .../req-include-all-flat_RESOLVED.xml         |   94 +
 .../req-include-by-id_RESOLVED.xml            |   56 +
 .../req-include-by-match-empty_RESOLVED.xml   |   11 +
 .../req-include-by-match_RESOLVED.xml         |   52 +
 .../req-include-exclude1_RESOLVED.xml         |   42 +
 .../req-include-exclude2_RESOLVED.xml         |   28 +
 .../req-include-exclude3_RESOLVED.xml         |   25 +
 .../req-include-exclude4_RESOLVED.xml         |   25 +
 .../req-include-exclude5_RESOLVED.xml         |   25 +
 .../req-with-child-controls-no_RESOLVED.xml   |   42 +
 .../req-with-child-controls-none_RESOLVED.xml |   42 +
 .../req-with-parent-controls-no1_RESOLVED.xml |   24 +
 ...req-with-parent-controls-none_RESOLVED.xml |   25 +
 ...req-with-parent-controls-yes1_RESOLVED.xml |   32 +
 ...req-with-parent-controls-yes2_RESOLVED.xml |   25 +
 .../requirement-tests/req-broken-import.xml   |   17 +
 .../req-chained-all-asis.xml                  |   18 +
 .../requirement-tests/req-chained-deepA.xml   |   29 +
 .../requirement-tests/req-circular_import.xml |   17 +
 .../req-circular_importer.xml                 |   17 +
 .../req-import-by-resource.xml                |   22 +
 .../req-include-all-asis.xml                  |   17 +
 .../req-include-all-flat.xml                  |   14 +
 .../requirement-tests/req-include-by-id.xml   |   20 +
 .../req-include-by-match-empty.xml            |   18 +
 .../req-include-by-match.xml                  |   18 +
 .../req-include-exclude1.xml                  |   21 +
 .../req-include-exclude2.xml                  |   20 +
 .../req-include-exclude3.xml                  |   22 +
 .../req-include-exclude4.xml                  |   22 +
 .../req-include-exclude5.xml                  |   25 +
 .../req-missing-resource.xml                  |   22 +
 .../req-spoofing-resource.xml                 |   22 +
 .../req-with-child-controls-no.xml            |   20 +
 .../req-with-child-controls-none.xml          |   20 +
 .../req-with-parent-controls-no1.xml          |   17 +
 .../req-with-parent-controls-none.xml         |   17 +
 .../req-with-parent-controls-yes1.xml         |   17 +
 .../req-with-parent-controls-yes2.xml         |   17 +
 .../requirement-tests/spoofed-resource.xml    |    4 +
 .../profile-resolution/spec-checkup.sch       |   12 -
 .../oscal-profile-test-helper.xsl             |    3 +-
 93 files changed, 8975 insertions(+), 153 deletions(-)
 create mode 100644 src/release/content-upgrade/json-prop-to-props.xsl
 create mode 100644 src/specifications/profile-resolution/.gitignore
 create mode 100644 src/specifications/profile-resolution/example-set.xspec
 create mode 100644 src/specifications/profile-resolution/lib/build-examples-xspec.xsl
 create mode 100644 src/specifications/profile-resolution/lib/build-reqs-xspec.xsl
 create mode 100644 src/specifications/profile-resolution/lib/build-xspec.xsl
 rename src/specifications/profile-resolution/{ => lib}/html-to-specml.xsl (100%)
 create mode 100644 src/specifications/profile-resolution/lib/illustrate-resolution.xsl
 create mode 100644 src/specifications/profile-resolution/lib/oscal-profile-test-helper.xsl
 create mode 100644 src/specifications/profile-resolution/lib/reqs-md-punchlist.xsl
 create mode 100644 src/specifications/profile-resolution/lib/spec-checkup.sch
 rename src/specifications/profile-resolution/{ => lib}/specml-html-hugo-uswds.xsl (97%)
 rename src/specifications/profile-resolution/{ => lib}/specml-html-preview.xsl (64%)
 rename src/specifications/profile-resolution/{ => lib}/specml-html-static.xsl (100%)
 rename src/specifications/profile-resolution/{ => lib}/specml-html-xslt1.xsl (90%)
 rename src/specifications/profile-resolution/{ => lib}/specml-html-xslt3.xsl (100%)
 create mode 100644 src/specifications/profile-resolution/lib/specml-tidy-config.xml
 create mode 100644 src/specifications/profile-resolution/lib/specml-tidy.xsl
 rename src/specifications/profile-resolution/{ => lib}/specml.css (93%)
 rename src/specifications/profile-resolution/{ => lib}/specml.rnc (86%)
 create mode 100644 src/specifications/profile-resolution/lib/xspec-oxygen.css
 create mode 100644 src/specifications/profile-resolution/lib/xspec-test-dev.sch
 create mode 100644 src/specifications/profile-resolution/oscal-specs_share.xpr
 create mode 100644 src/specifications/profile-resolution/profile-resolution-examples/assess-test-coverage.xsl
 create mode 100644 src/specifications/profile-resolution/profile-resolution-examples/profile-element-usage-survey.html
 create mode 100644 src/specifications/profile-resolution/profile-resolution-examples/scrub-testing.xspec
 create mode 100644 src/specifications/profile-resolution/profile-resolution-queryset.xspec
 create mode 100644 src/specifications/profile-resolution/profile-resolution-specml-files.xspec
 create mode 100644 src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec
 create mode 100644 src/specifications/profile-resolution/profile-resolution-specml-working-current.xspec
 create mode 100644 src/specifications/profile-resolution/profile-resolution-specml-working.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests.xspec
 create mode 100644 src/specifications/profile-resolution/requirement-tests/catalogs/abc-full_catalog.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/catalogs/abc-mixed-up_catalog.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/catalogs/abc-simple_catalog.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/catalogs/loose-parameters.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/catalogs/xyz-tiny_catalog.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/illustrations/req-include-all-asis-view.html
 create mode 100644 src/specifications/profile-resolution/requirement-tests/illustrations/req-include-by-id-view.html
 create mode 100644 src/specifications/profile-resolution/requirement-tests/keep-everything-twice.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-asis_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-flat_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/keep-everything-twice_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-circular_import_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-id_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match-empty_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude1_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude2_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude3_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude4_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude5_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-no_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-none_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-no1_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-none_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes1_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes2_RESOLVED.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-broken-import.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-chained-all-asis.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-chained-deepA.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-circular_import.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-circular_importer.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-import-by-resource.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-all-asis.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-all-flat.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-by-id.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-by-match-empty.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-by-match.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-exclude1.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-exclude2.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-exclude3.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-exclude4.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-include-exclude5.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-missing-resource.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-spoofing-resource.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-with-child-controls-no.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-with-child-controls-none.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-no1.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-none.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes1.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes2.xml
 create mode 100644 src/specifications/profile-resolution/requirement-tests/spoofed-resource.xml
 delete mode 100644 src/specifications/profile-resolution/spec-checkup.sch

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-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-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..cc1e238418
--- /dev/null
+++ b/src/specifications/profile-resolution/lib/spec-checkup.sch
@@ -0,0 +1,77 @@
+<?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-sets" value="document($test-filenames,/)"/>
+    
+    <sch:let name="known-tests" value="$test-sets/*/x:scenario/processing-instruction('requirement')/normalize-space(.)"/>
+    
+    <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:assert test="count($all-requirements[@id=$me/@id]) eq 1">Requirement id '<sch:value-of select="@id"/>' is not distinct</sch:assert>
+            
+            <sch:report role="warning" test="empty(descendant::os:eg)">No example yet for requirement "<sch:value-of select="."/>"</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: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 90%
rename from src/specifications/profile-resolution/specml-html-xslt1.xsl
rename to src/specifications/profile-resolution/lib/specml-html-xslt1.xsl
index 3228178bdf..249f3160c6 100644
--- a/src/specifications/profile-resolution/specml-html-xslt1.xsl
+++ b/src/specifications/profile-resolution/lib/specml-html-xslt1.xsl
@@ -100,7 +100,13 @@
          <xsl:apply-templates/>
       </code>
    </xsl:template>
-
+   
+   <xsl:template match="o:int">
+      <code class="int">
+         <xsl:apply-templates/>
+      </code>
+   </xsl:template>
+   
    <xsl:template match="o:ul">
       <ul>
          <xsl:apply-templates/>
@@ -143,7 +149,21 @@
          <xsl:apply-templates/>
       </em>
    </xsl:template>
-
+   
+   <xsl:template match="o:req">
+      <span class="{local-name()} {@level}">
+         <xsl:copy-of select="@id"/>
+         <xsl:apply-templates select="." mode="reqlabel"/>
+         <xsl:apply-templates/>
+      </span>
+   </xsl:template>
+   
+   <xsl:template match="o:req" mode="reqlabel">
+      <span class="reqlabel">
+         <xsl:value-of select="@id"/>
+      </span>
+   </xsl:template>
+   
    <xsl:template match="o:xpath">
       <b class="{local-name()}">
          <xsl:apply-templates/>
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 86%
rename from src/specifications/profile-resolution/specml.rnc
rename to src/specifications/profile-resolution/lib/specml.rnc
index 820bc54ef0..3c2a990652 100644
--- a/src/specifications/profile-resolution/specml.rnc
+++ b/src/specifications/profile-resolution/lib/specml.rnc
@@ -24,16 +24,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 | eg)*
 
 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 }
@@ -41,6 +38,7 @@ revisit = element revisit { inline-mixed }
 propose = element propose { inline-mixed }
 q       = element q       { inline-mixed }
 em      = element em      { text }
+eg      = element eg      { attribute href { text }?, text } # href should be a URI
 strong  = element strong  { text }
 src     = element src     { text }
 tgt     = element tgt     { text }
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/oscal-specs_share.xpr b/src/specifications/profile-resolution/oscal-specs_share.xpr
new file mode 100644
index 0000000000..7038507e13
--- /dev/null
+++ b/src/specifications/profile-resolution/oscal-specs_share.xpr
@@ -0,0 +1,1820 @@
+<?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>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/req-include-all-asis.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/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-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>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/>
+                                </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}/lib/profile-resolution-working-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-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-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-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>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>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 e17d79042b..9a64e55d10 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/example-set.xspec
+++ b/src/specifications/profile-resolution/profile-resolution-examples/example-set.xspec
@@ -27,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..0a45bc7a3b
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-queryset.xspec
@@ -0,0 +1,33 @@
+<?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-current.xspec b/src/specifications/profile-resolution/profile-resolution-specml-working-current.xspec
new file mode 100644
index 0000000000..2c0a817af3
--- /dev/null
+++ b/src/specifications/profile-resolution/profile-resolution-specml-working-current.xspec
@@ -0,0 +1,36 @@
+<?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-working.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="Testing req-include-all-asis.xml: 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: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="Testing req-include-all-flat.xml: When an import provides the include-all directive, ALL controls and groups in the referenced document (including nested controls) MUST be included."
+      pending="deployment">
+      <?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
+      label="Testing req-include-all-flat.xml: 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:"
+      pending="deployment">
+      <?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: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..3f6665c9fd 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 profile-resolution-specml-working-current.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">
@@ -184,7 +186,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"><eg>PENDING test design</eg>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
@@ -271,39 +277,76 @@ 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"><eg
+              href="requirement-tests/req-include-all-asis.xml">relative URI</eg>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"><eg
+              href="requirement-tests/req-import-by-resource.xml">via internal reference to
+              resource/rlink</eg>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"><eg
+          href="requirement-tests/req-include-all-asis.xml">URI base corresponds to document URI</eg>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"><eg
+              href="requirement-tests/req-missing-resource.xml">PENDING rebase over latest from galtm missing resource</eg>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"><eg href="requirement-tests/req-import-by-resource.xml"/>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"><eg>PENDING test design (support for either/both base64
+                  and rlink)</eg>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"><eg>PENDING test design (correspondence of base64 and
+                  rlink-nominated objects)</eg>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"><eg>PENDING test design (retrieval)</eg>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"><eg>PENDING test design (base64 integrity)</eg>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"><eg>PENDING test design (base64
+                integrity)</eg>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"><eg
+          href="requirement-tests/req-missing-resource.xml">PENDING rebase over latest from galtm</eg><eg
+            href="requirement-tests/req-broken-import.xml">PENDING rebase over latest from galtm</eg>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:
@@ -327,20 +370,28 @@ profile:
       </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"><eg href="requirement-tests/req-chained-all-asis.xml"
+              >PENDING chained profiles</eg>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"><eg
+              href="requirement-tests/req-chained-all-asis.xml">PENDING chained profiles</eg><eg
+              href="requirement-tests/req-chained-deepA.xml">PENDING [bug repair] chained profile
+              merged with controls from its own source catalog</eg>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"><eg href="requirement-tests/req-circular_import.xml"
+              >PENDING circular import detection</eg>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:
@@ -350,9 +401,7 @@ profile:
     - href: "circular_profile.yaml"
       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:
@@ -362,7 +411,8 @@ profile:
     - 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>
+          <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.
@@ -374,9 +424,11 @@ profile:
       </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"><eg href="requirement-tests/req-chained-deepA.xml">PENDING
+              chained profiles</eg>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:
@@ -407,9 +459,9 @@ intermediate:
           - 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><req id="rq-multiple-merge"><eg href="requirement-tests/req-chained-deepA.xml">PENDING
+              chained profiles</eg>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>
@@ -482,19 +534,18 @@ 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">
+            <eg href="requirement-tests/req-include-all-asis.xml"/><eg href="requirement-tests/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">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>
+        <p><req level="must" id="req-include-by-id"><eg href="requirement-tests/req-include-by-id.xml"/>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:
@@ -506,13 +557,13 @@ include-controls:
       <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
+        <p><req level="must" id="req-include-by-match"><eg href="requirement-tests/req-include-by-match.xml"/>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
+        <p><req level="must" id="req-include-by-match-empty"><eg href="requirement-tests/req-include-by-match-empty.xml"/>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>
@@ -533,18 +584,18 @@ 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-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>.
+          <p><req level="must" id="req-with-child-controls-yes"><eg
+                href="requirement-tests/req-include-by-id.xml"/>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"><eg
+                href="requirement-tests/req-with-child-controls-no.xml"/>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"><eg
+                href="requirement-tests/req-with-child-controls-none.xml"/>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">
@@ -554,39 +605,50 @@ 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"><eg
+                href="requirement-tests/req-with-parent-controls-yes1.xml">PR
+                https://github.com/usnistgov/OSCAL/pull/1207</eg><eg
+                href="requirement-tests/req-with-parent-controls-yes2.xml">PR
+                https://github.com/usnistgov/OSCAL/pull/1207</eg>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"><eg
+                href="requirement-tests/req-with-parent-controls-no1.xml">PENDING PR
+                https://github.com/usnistgov/OSCAL/pull/1207</eg>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"><eg
+                href="requirement-tests/req-with-parent-controls-none.xml">Neither setting is
+                given</eg>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"><eg href="requirement-tests/req-include-exclude1.xml"
+              /><eg href="requirement-tests/req-include-exclude2.xml"/><eg
+              href="requirement-tests/req-include-exclude3.xml"/>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"><eg
+              href="requirement-tests/req-include-exclude4.xml"/>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"><eg
+              href="requirement-tests/req-include-exclude4.xml"/>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 +696,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"><eg>PENDING is this testable?</eg>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,17 +721,17 @@ 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"><eg>PENDING specification</eg>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">
+            <eg href="requirement-tests/keep-everything-twice.xml"/>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:
@@ -804,7 +868,7 @@ intermediate:
       </p>
       <section id="structure-none">
         <head>No Structuring Directive</head>
-        <p><req level="must" id="req-structure-none">If no
+        <p><req level="must" id="req-structure-none"><eg href="requirement-tests/req-include-all-flat.xml"></eg>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
diff --git a/src/specifications/profile-resolution/readme.md b/src/specifications/profile-resolution/readme.md
index bc019f4039..e3a32f2055 100644
--- a/src/specifications/profile-resolution/readme.md
+++ b/src/specifications/profile-resolution/readme.md
@@ -1,3 +1,5 @@
+# Profile Resolution Specification and Testing
+
 ## 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 +8,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-full_catalog.xml b/src/specifications/profile-resolution/requirement-tests/catalogs/abc-full_catalog.xml
new file mode 100644
index 0000000000..59be5755fc
--- /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="citation" 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="citation" 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/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..4ad03f7a78
--- /dev/null
+++ b/src/specifications/profile-resolution/requirement-tests/output-actual/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="628d8b55-8a67-469e-ad66-14e1bcb81a06">
+   <metadata>
+      <title>Test Profile</title>
+      <last-modified>2022-04-18T15:24:18.5370204-04: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-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-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-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-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-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/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/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">
 
     <!--