diff --git a/features/fedramp_extensions.feature b/features/fedramp_extensions.feature
index de16a4d56..92939c9d0 100644
--- a/features/fedramp_extensions.feature
+++ b/features/fedramp_extensions.feature
@@ -97,6 +97,7 @@ Examples:
| has-system-id |
| has-system-name-short |
| has-user-guide |
+ | implementation-status-has-remarks |
| import-profile-has-available-document |
| import-profile-resolves-to-fedramp-content |
| incomplete-implemented-requirements |
@@ -314,6 +315,8 @@ Examples:
| has-system-name-short-PASS.yaml |
| has-user-guide-FAIL.yaml |
| has-user-guide-PASS.yaml |
+ | implementation-status-has-remarks-FAIL.yaml |
+ | implementation-status-has-remarks-PASS.yaml |
| import-profile-has-available-document-FAIL.yaml |
| import-profile-has-available-document-PASS.yaml |
| import-profile-resolves-to-fedramp-content-FAIL.yaml |
diff --git a/src/validations/constraints/content/ssp-implementation-status-has-remarks-INVALID.xml b/src/validations/constraints/content/ssp-implementation-status-has-remarks-INVALID.xml
new file mode 100644
index 000000000..606612a42
--- /dev/null
+++ b/src/validations/constraints/content/ssp-implementation-status-has-remarks-INVALID.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml
index 2cca026e8..f63bd985b 100644
--- a/src/validations/constraints/fedramp-external-constraints.xml
+++ b/src/validations/constraints/fedramp-external-constraints.xml
@@ -646,6 +646,17 @@
+
+
+
+
+
+
+
diff --git a/src/validations/constraints/unit-tests/implementation-status-has-remarks-FAIL.yaml b/src/validations/constraints/unit-tests/implementation-status-has-remarks-FAIL.yaml
new file mode 100644
index 000000000..51d45c85a
--- /dev/null
+++ b/src/validations/constraints/unit-tests/implementation-status-has-remarks-FAIL.yaml
@@ -0,0 +1,9 @@
+test-case:
+ name: Negative Test for implementation-status-has-remarks
+ description: >-
+ This test case validates the behavior of constraint
+ implementation-status-has-remarks
+ content: ../content/ssp-implementation-status-has-remarks-INVALID.xml
+ expectations:
+ - constraint-id: implementation-status-has-remarks
+ result: fail
diff --git a/src/validations/constraints/unit-tests/implementation-status-has-remarks-PASS.yaml b/src/validations/constraints/unit-tests/implementation-status-has-remarks-PASS.yaml
new file mode 100644
index 000000000..c5db3cb64
--- /dev/null
+++ b/src/validations/constraints/unit-tests/implementation-status-has-remarks-PASS.yaml
@@ -0,0 +1,9 @@
+test-case:
+ name: Positive Test for implementation-status-has-remarks
+ description: >-
+ This test case validates the behavior of constraint
+ implementation-status-has-remarks
+ content: ../../../content/rev5/examples/ssp/xml/fedramp-ssp-example.oscal.xml
+ expectations:
+ - constraint-id: implementation-status-has-remarks
+ result: pass