diff --git a/Project-Includes/pi-detect.sh b/Project-Includes/pi-detect.sh
new file mode 100644
index 0000000..b139bbe
--- /dev/null
+++ b/Project-Includes/pi-detect.sh
@@ -0,0 +1,13 @@
+
+function pi-detect()
+{
+echo Now running "$FUNCNAME"....
+if [ -f /sys/firmware/devicetree/base/model ] ; then
+export IS_RASPI="1"
+fi
+
+if [ ! -f /sys/firmware/devicetree/base/model ] ; then
+export IS_RASPI="0"
+fi
+echo Completed running "$FUNCNAME"
+}
\ No newline at end of file
diff --git a/ProjectCode/Modules/Security/secharden-scap-stig.sh b/ProjectCode/Modules/Security/secharden-scap-stig.sh
index 0e5ed84..d786811 100644
--- a/ProjectCode/Modules/Security/secharden-scap-stig.sh
+++ b/ProjectCode/Modules/Security/secharden-scap-stig.sh
@@ -1,18 +1,40 @@
 #!/bin/bash
 
+export FRAMEWORK_INCLUDES_FULL_PATH
+FRAMEWORK_INCLUDES_FULL_PATH="$(realpath ../Framework-Includes)"
 
-function pi-detect()
-{
-echo Now running "$FUNCNAME"....
-if [ -f /sys/firmware/devicetree/base/model ] ; then
-export IS_RASPI="1"
+export FRAMEWORK_CONFIGS_FULL_PATH
+FRAMEWORK_CONFIGS_FULL_PATH="$(realpath ../Framework-ConfigFiles)"
+
+export PROJECT_INCLUDES_FULL_PATH
+PROJECT_INCLUDES_FULL_PATH="$(realpath ../Project-Includes)"
+
+export PROJECT_CONGIGS_FULL_PATH
+PROJECT_INCLUDES_FULL_PATH="$(realpath ../Project-ConfigFiles)"
+
+
+#Framework variables are read from hee
+source $FRAMEWORK_CONFIGS_FULL_PATH/FrameworkVars
+
+#Boilerplate and support functions
+FrameworkIncludeFiles="$(ls -1 --color=none $FRAMEWORK_INCLUDES_FULL_PATH/*)"
+
+IFS=$'\n\t'
+for file in ${FrameworkIncludeFiles[@]}; do
+	. "$file"
+done
+unset IFS
+
+
+if [[ ProjectIncludes = 1 ]]; then
+ProjectIncludeFiles="$(ls -1 --color=none $PROJECT_INCLUDES_FULL_PATH/*)"
+IFS=$'\n\t'
+for file in ${ProjectIncludeFiles[@]}; do
+	. "$file"
+done
+unset IFS
 fi
 
-if [ ! -f /sys/firmware/devicetree/base/model ] ; then
-export IS_RASPI="0"
-fi
-echo Completed running "$FUNCNAME"
-}
 
 # Actual script logic starts here
 
diff --git a/ProjectCode/Modules/Security/secharden-ssh.sh b/ProjectCode/Modules/Security/secharden-ssh.sh
index 17586e2..e1955ff 100644
--- a/ProjectCode/Modules/Security/secharden-ssh.sh
+++ b/ProjectCode/Modules/Security/secharden-ssh.sh
@@ -1,5 +1,40 @@
 #!/bin/bash
 
+export FRAMEWORK_INCLUDES_FULL_PATH
+FRAMEWORK_INCLUDES_FULL_PATH="$(realpath ../Framework-Includes)"
+
+export FRAMEWORK_CONFIGS_FULL_PATH
+FRAMEWORK_CONFIGS_FULL_PATH="$(realpath ../Framework-ConfigFiles)"
+
+export PROJECT_INCLUDES_FULL_PATH
+PROJECT_INCLUDES_FULL_PATH="$(realpath ../Project-Includes)"
+
+export PROJECT_CONGIGS_FULL_PATH
+PROJECT_INCLUDES_FULL_PATH="$(realpath ../Project-ConfigFiles)"
+
+
+#Framework variables are read from hee
+source $FRAMEWORK_CONFIGS_FULL_PATH/FrameworkVars
+
+#Boilerplate and support functions
+FrameworkIncludeFiles="$(ls -1 --color=none $FRAMEWORK_INCLUDES_FULL_PATH/*)"
+
+IFS=$'\n\t'
+for file in ${FrameworkIncludeFiles[@]}; do
+	. "$file"
+done
+unset IFS
+
+
+if [[ ProjectIncludes = 1 ]]; then
+ProjectIncludeFiles="$(ls -1 --color=none $PROJECT_INCLUDES_FULL_PATH/*)"
+IFS=$'\n\t'
+for file in ${ProjectIncludeFiles[@]}; do
+	. "$file"
+done
+unset IFS
+fi
+
 curl --silent ${DL_ROOT}/ConfigFiles/SSH/Configs/tsys-sshd-config > /etc/ssh/sshd_config
 curl --silent ${DL_ROOT}/ConfigFiles/SSH/Configs/ssh-audit_hardening.conf > /etc/ssh/sshd_config.d/ssh-audit_hardening.conf
 
diff --git a/ProjectCode/SetupNewSystem.sh b/ProjectCode/SetupNewSystem.sh
index 538e2a7..c881899 100644
--- a/ProjectCode/SetupNewSystem.sh
+++ b/ProjectCode/SetupNewSystem.sh
@@ -62,19 +62,6 @@ DL_ROOT="https://dl.knownelement.com/KNEL/FetchApply/"
 # Support functions
 #######################
 
-function pi-detect()
-{
-print_info "Now running "$FUNCNAME"...."
-if [ -f /sys/firmware/devicetree/base/model ] ; then
-export IS_RASPI="1"
-fi
-
-if [ ! -f /sys/firmware/devicetree/base/model ] ; then
-export IS_RASPI="0"
-fi
-print_info "Now completed running "$FUNCNAME"...."
-}
-
 function global-oam()
 {
 print_info "Now running "$FUNCNAME"...."