diff --git a/etc/ipv4.conf b/etc/ipv4.conf
index d56e66d..51e01f1 100644
--- a/etc/ipv4.conf
+++ b/etc/ipv4.conf
@@ -4,4 +4,12 @@
 # Allow everything over loopback (lo/127.0.0.0/8)
 # Good idea to keep this turned on, but if you so wish to,
 # you can disable it here.
-AllowAllv4Loopback="yes"
\ No newline at end of file
+# Values: no | yes (default)
+AllowAllv4Loopback="yes"
+
+# Very early on rules to allow for trusted machines to access
+# this machine.  Rather important and helps keep you from getting
+# locked out should the firewalling rules go bad.
+# Config file is located in ipv4/trusted.conf
+# Values: no | yes (default)
+EnableTrustedv4Hosts="yes"
\ No newline at end of file
diff --git a/etc/ipv4/custom/trusted.sh b/etc/ipv4/custom/trusted.sh
deleted file mode 100644
index d31c692..0000000
--- a/etc/ipv4/custom/trusted.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is sourced by the main srfirewall program to inject
-# custom commands/rules during specific moments of the firewall
-# setup.
-#
-# In particular this file injects/commands rules:
-# Before the trusted chains are set up
diff --git a/etc/ipv6.conf b/etc/ipv6.conf
index 6a4adce..94d6d51 100644
--- a/etc/ipv6.conf
+++ b/etc/ipv6.conf
@@ -4,4 +4,5 @@
 # Allow everything over loopback (lo ::1/28)
 # Good idea to keep this turned on, but if you so wish to,
 # you can disable it here.
+# Values: no | yes (default)
 AllowAllv6Loopback="yes"
\ No newline at end of file
diff --git a/etc/ipv6/custom/trusted.sh b/etc/ipv6/custom/trusted.sh
deleted file mode 100644
index d31c692..0000000
--- a/etc/ipv6/custom/trusted.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is sourced by the main srfirewall program to inject
-# custom commands/rules during specific moments of the firewall
-# setup.
-#
-# In particular this file injects/commands rules:
-# Before the trusted chains are set up
diff --git a/lib/iptables.inc b/lib/iptables.inc
index afc3cd4..b9cef0d 100644
--- a/lib/iptables.inc
+++ b/lib/iptables.inc
@@ -78,7 +78,6 @@ function setup_iptables_chains {
 	${display} GREEN "Setting up chains for ${IP_VERSION}..."
 	${VER_IPTABLES} -N ${InPreRules}
 	${VER_IPTABLES} -N ${OutPreRules}
-	${VER_IPTABLES} -N ${Trusted}
 	${VER_IPTABLES} -N ${InEasyBlock}
 	${VER_IPTABLES} -N ${OutEasyBlock}
 	${VER_IPTABLES} -N ${InFilter}
@@ -96,9 +95,6 @@ function setup_iptables_chains {
 	${VER_IPTABLES} -A INPUT -j ${InPreRules}
 	${debug} ${DebugColor} "Setting up OutPreRules"
 	${VER_IPTABLES} -A OUTPUT -j ${OutPreRules}
-	if [ -x ${FWCONFIGDIR}/ipv${IPVER}/custom/trusted.sh ]; then . ${FWCONFIGDIR}/ipv${IPVER}/custom/trusted.sh; fi
-	${debug} ${DebugColor} "Setting up Trusted"
-	${VER_IPTABLES} -A INPUT -j ${Trusted}
 	if [ -x ${FWCONFIGDIR}/ipv${IPVER}/custom/easyblock.sh ]; then . ${FWCONFIGDIR}/ipv${IPVER}/custom/easyblock.sh; fi
 	${debug} ${DebugColor} "Setting up InEasyBlock"
 	${VER_IPTABLES} -A INPUT -j ${InEasyBlock}