diff --git a/setup.sh b/setup.sh
index 43eab00..8fd18b0 100644
--- a/setup.sh
+++ b/setup.sh
@@ -10,7 +10,15 @@ DIR="`pwd`"
 echo "Working in '$DIR'."
 
 
-if [[ $1 == "skip" ]]; then
+skip="false"
+if [[ "$1" == "skip" || "$2" == "skip" || "$3" == "skip" ]]; then
+	echo "1='$1'"
+	echo "2='$2'"
+	echo "3='$3'"
+	skip="true"
+fi
+
+if [[ "$skip" == "true" ]]; then
 	echo "\n`date` - Skipping Updates"
 else
 	echo -e "\n`date` - Upgrade Package Repos"
@@ -35,7 +43,7 @@ else
 fi
 
 
-if [[ $1 == "skip" ]]; then
+if [[ "$skip" == "true" ]]; then
 	echo "\n`date` - Skipping Installs"
 else
 	echo -e "\n`date` - Install Software"