diff --git a/Makefile b/Makefile
index 8a5d85d..db14251 100644
--- a/Makefile
+++ b/Makefile
@@ -20,3 +20,10 @@ upgrade:
 	
 config_update:
 	tools/convert-config
+
+config_move:
+	mv -f ipv4-* conf/ &>/dev/null
+	mv -f ipv6-* conf/ &>/dev/null
+	mv -f port-forwards* conf/ &>/dev/null
+	mv -f postrun* conf/ &>/dev/null
+	mv -f prerun* conf/ &>/dev/null
diff --git a/bin/firewall-sosdg b/bin/firewall-sosdg
index 305f468..ff23834 100755
--- a/bin/firewall-sosdg
+++ b/bin/firewall-sosdg
@@ -18,7 +18,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-FW_VERSION="0.9.10"
+FW_VERSION="0.9.11"
 
 # These option is here to help pre-1.0 users easily upgrade, defines critical defaults
 # that would otherwise require remaking their options file.  I leave this on by default,
diff --git a/tools/configure-firewall b/tools/configure-firewall
new file mode 100755
index 0000000..e23e86c
--- /dev/null
+++ b/tools/configure-firewall
@@ -0,0 +1,42 @@
+#!/bin/bash
+# By Brielle Bruns <bruns@2mbit.com>
+# URL: http://www.sosdg.org/freestuff/firewall
+# License: GPLv3
+#
+#    Copyright (C) 2009 - 2010  Brielle Bruns
+#    Copyright (C) 2009 - 2010  The Summit Open Source Development Group
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+CONFIGTOOL_VER="0.1"
+
+WHIPTAIL="/usr/bin/whiptail"
+TMPCONFIG=`mktemp`
+
+
+
+# These are string variables
+WELCOME_HEAD="Welcome to the Firewall/SOSDG Config Tool v${CONFIGTOOL_VER}"
+WELCOME_BODY="This tool is a quick way to do a basic setup of the firewall script.
+				The results of this tool will be output to a file of your choosing at
+				the end of configuration.\nContinue?"
+if [ ! -x $WHIPTAIL ]; then
+	echo "Error: please make sure you have whiptail installed, and the WHIPTAIL variable 
+		is set correctly in the tool."
+	exit 1
+fi
+
+if ! ( $WHIPTAIL --yesno "${WELCOME_MSG}\n${WELCOME_BODY}" 12 60 --no-button "Quit" ); then
+	echo "Quitting config tool."
+	exit 1
+fi
\ No newline at end of file