diff --git a/template_setup.sh b/template_setup.sh
index 41b5e30..5645339 100644
--- a/template_setup.sh
+++ b/template_setup.sh
@@ -9,16 +9,17 @@ case "$1" in
     *) echo "'$1' is not a valid template-setup command";;
 esac
 
-echo $load_defaults
-exit
-
 ## Script Location
 SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 git -C $SCRIPTDIR pull
 echo ""
 
-source $SCRIPTDIR/defaults-dbb.sh
+
+if [ "$load_defaults" == "defaults" ]; then
+  source $SCRIPTDIR/defaults-dbb.sh
+fi
+echo $TESTVAR
 
 for scriptfile in "$SCRIPTDIR"/[0-9]*.sh
 do
@@ -35,3 +36,4 @@ done
 
 /bin/bash "$SCRIPTDIR/common/avatar.sh"
 echo "template_setup completed"
+#"$@"