diff --git a/abra b/abra
index 2a58c3b..541a18d 100755
--- a/abra
+++ b/abra
@@ -13,7 +13,7 @@ The cooperative cloud utility belt 🎩🐇
 Usage:
   abra [options] app new [--server=<server>] [--domain=<domain>] [--pass] [--auto] <app>
   abra [options] app (list|ls) [--status] [--server=<server>]
-  abra [options] app <domain> deploy
+  abra [options] app <domain> deploy [--skip-check]
   abra [options] app <domain> undeploy
   abra [options] app <domain> config
   abra [options] app <domain> (delete|rm) [--force]
@@ -145,86 +145,89 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done
 return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() {
 printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() {
 [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() {
-printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1579}
-usage=${DOC:40:1271}; digest=974cf
-shorts=(-h -e -s -v '' '' '' '' '' '' '' '' '')
-longs=(--help --env --stack --version --server --domain --pass --auto --status --force --no-tty --user --all)
-argcounts=(0 1 1 0 1 1 0 0 0 0 0 1 0); node_0(){ switch __help 0; }; node_1(){
-value __env 1; }; node_2(){ value __stack 2; }; node_3(){ switch __version 3; }
+printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1594}
+usage=${DOC:40:1286}; digest=1c8e5
+shorts=(-s -e -v -h '' '' '' '' '' '' '' '' '' '')
+longs=(--stack --env --version --help --server --domain --pass --auto --status --skip-check --force --no-tty --user --all)
+argcounts=(1 1 0 0 1 1 0 0 0 0 0 0 1 0); node_0(){ value __stack 0; }; node_1(){
+value __env 1; }; node_2(){ switch __version 2; }; node_3(){ switch __help 3; }
 node_4(){ value __server 4; }; node_5(){ value __domain 5; }; node_6(){
 switch __pass 6; }; node_7(){ switch __auto 7; }; node_8(){ switch __status 8; }
-node_9(){ switch __force 9; }; node_10(){ switch __no_tty 10; }; node_11(){
-value __user 11; }; node_12(){ switch __all 12; }; node_13(){ value _app_ a; }
-node_14(){ value _domain_ a; }; node_15(){ value _service_ a; }; node_16(){
-value _src_ a; }; node_17(){ value _dst_ a; }; node_18(){ value _args_ a true; }
-node_19(){ value _secret_ a; }; node_20(){ value _version_ a; }; node_21(){
-value _cmd_ a; }; node_22(){ value _data_ a; }; node_23(){ value _command_ a; }
-node_24(){ value _host_ a; }; node_25(){ value _user_ a; }; node_26(){
-value _port_ a; }; node_27(){ _command app; }; node_28(){ _command new; }
-node_29(){ _command list; }; node_30(){ _command ls; }; node_31(){
-_command deploy; }; node_32(){ _command undeploy; }; node_33(){ _command config
-}; node_34(){ _command delete; }; node_35(){ _command rm; }; node_36(){
-_command logs; }; node_37(){ _command multilogs; }; node_38(){ _command cp; }
-node_39(){ _command check; }; node_40(){ _command ps; }; node_41(){ _command run
-}; node_42(){ _command secret; }; node_43(){ _command auto; }; node_44(){
-_command generate; }; node_45(){ _command insert; }; node_46(){ _command server
-}; node_47(){ _command add; }; node_48(){ _command use; }; node_49(){
-_command init; }; node_50(){ _command apps; }; node_51(){ _command upgrade; }
-node_52(){ optional 0 1 2 3; }; node_53(){ optional 52; }; node_54(){ optional 4
-}; node_55(){ optional 5; }; node_56(){ optional 6; }; node_57(){ optional 7; }
-node_58(){ required 53 27 28 54 55 56 57 13; }; node_59(){ either 29 30; }
-node_60(){ required 59; }; node_61(){ optional 8; }; node_62(){
-required 53 27 60 61 54; }; node_63(){ required 53 27 14 31; }; node_64(){
-required 53 27 14 32; }; node_65(){ required 53 27 14 33; }; node_66(){
-either 34 35; }; node_67(){ required 66; }; node_68(){ optional 9; }; node_69(){
-required 53 27 14 67 68; }; node_70(){ optional 15; }; node_71(){
-required 53 27 14 36 70; }; node_72(){ required 53 27 14 37; }; node_73(){
-required 53 27 14 38 16 17; }; node_74(){ required 53 27 14 39; }; node_75(){
-required 53 27 14 40; }; node_76(){ optional 10; }; node_77(){ optional 11; }
-node_78(){ oneormore 18; }; node_79(){ required 53 27 14 41 76 77 15 78; }
-node_80(){ required 53 27 14 41 15 78; }; node_81(){ required 53 27 14 42 43 56
-}; node_82(){ optional 21; }; node_83(){ required 53 27 14 42 44 19 20 82 56; }
-node_84(){ required 53 27 14 42 45 19 20 22 56; }; node_85(){ either 19 12; }
-node_86(){ required 85; }; node_87(){ required 53 27 14 42 67 86 56 68; }
-node_88(){ optional 78; }; node_89(){ required 53 27 14 23 88; }; node_90(){
-optional 25; }; node_91(){ optional 26; }; node_92(){ required 53 46 47 24 90 91
-}; node_93(){ required 53 46 60; }; node_94(){ required 53 46 24 35; }
-node_95(){ required 53 46 24 48; }; node_96(){ required 53 46 24 49; }
-node_97(){ required 53 46 24 50 61; }; node_98(){ required 53 51; }; node_99(){
-either 58 62 63 64 65 69 71 72 73 74 75 79 80 81 83 84 87 89 92 93 94 95 96 97 98
-}; node_100(){ required 99; }; cat <<<' docopt_exit() {
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1271}" >&2
-exit 1; }'; unset var___help var___env var___stack var___version var___server \
-var___domain var___pass var___auto var___status var___force var___no_tty \
-var___user var___all var__app_ var__domain_ var__service_ var__src_ var__dst_ \
-var__args_ var__secret_ var__version_ var__cmd_ var__data_ var__command_ \
-var__host_ var__user_ var__port_ var_app var_new var_list var_ls var_deploy \
-var_undeploy var_config var_delete var_rm var_logs var_multilogs var_cp \
-var_check var_ps var_run var_secret var_auto var_generate var_insert \
-var_server var_add var_use var_init var_apps var_upgrade; parse 100 "$@"
-local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__help" "${prefix}__env" \
-"${prefix}__stack" "${prefix}__version" "${prefix}__server" \
-"${prefix}__domain" "${prefix}__pass" "${prefix}__auto" "${prefix}__status" \
-"${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \
-"${prefix}_app_" "${prefix}_domain_" "${prefix}_service_" "${prefix}_src_" \
-"${prefix}_dst_" "${prefix}_args_" "${prefix}_secret_" "${prefix}_version_" \
-"${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" "${prefix}_host_" \
-"${prefix}_user_" "${prefix}_port_" "${prefix}app" "${prefix}new" \
-"${prefix}list" "${prefix}ls" "${prefix}deploy" "${prefix}undeploy" \
-"${prefix}config" "${prefix}delete" "${prefix}rm" "${prefix}logs" \
-"${prefix}multilogs" "${prefix}cp" "${prefix}check" "${prefix}ps" \
-"${prefix}run" "${prefix}secret" "${prefix}auto" "${prefix}generate" \
-"${prefix}insert" "${prefix}server" "${prefix}add" "${prefix}use" \
-"${prefix}init" "${prefix}apps" "${prefix}upgrade"
-eval "${prefix}"'__help=${var___help:-false}'
-eval "${prefix}"'__env=${var___env:-}'
+node_9(){ switch __skip_check 9; }; node_10(){ switch __force 10; }; node_11(){
+switch __no_tty 11; }; node_12(){ value __user 12; }; node_13(){ switch __all 13
+}; node_14(){ value _app_ a; }; node_15(){ value _domain_ a; }; node_16(){
+value _service_ a; }; node_17(){ value _src_ a; }; node_18(){ value _dst_ a; }
+node_19(){ value _args_ a true; }; node_20(){ value _secret_ a; }; node_21(){
+value _version_ a; }; node_22(){ value _cmd_ a; }; node_23(){ value _data_ a; }
+node_24(){ value _command_ a; }; node_25(){ value _host_ a; }; node_26(){
+value _user_ a; }; node_27(){ value _port_ a; }; node_28(){ _command app; }
+node_29(){ _command new; }; node_30(){ _command list; }; node_31(){ _command ls
+}; node_32(){ _command deploy; }; node_33(){ _command undeploy; }; node_34(){
+_command config; }; node_35(){ _command delete; }; node_36(){ _command rm; }
+node_37(){ _command logs; }; node_38(){ _command multilogs; }; node_39(){
+_command cp; }; node_40(){ _command check; }; node_41(){ _command ps; }
+node_42(){ _command run; }; node_43(){ _command secret; }; node_44(){
+_command auto; }; node_45(){ _command generate; }; node_46(){ _command insert; }
+node_47(){ _command server; }; node_48(){ _command add; }; node_49(){
+_command use; }; node_50(){ _command init; }; node_51(){ _command apps; }
+node_52(){ _command upgrade; }; node_53(){ optional 0 1 2 3; }; node_54(){
+optional 53; }; node_55(){ optional 4; }; node_56(){ optional 5; }; node_57(){
+optional 6; }; node_58(){ optional 7; }; node_59(){
+required 54 28 29 55 56 57 58 14; }; node_60(){ either 30 31; }; node_61(){
+required 60; }; node_62(){ optional 8; }; node_63(){ required 54 28 61 62 55; }
+node_64(){ optional 9; }; node_65(){ required 54 28 15 32 64; }; node_66(){
+required 54 28 15 33; }; node_67(){ required 54 28 15 34; }; node_68(){
+either 35 36; }; node_69(){ required 68; }; node_70(){ optional 10; }
+node_71(){ required 54 28 15 69 70; }; node_72(){ optional 16; }; node_73(){
+required 54 28 15 37 72; }; node_74(){ required 54 28 15 38; }; node_75(){
+required 54 28 15 39 17 18; }; node_76(){ required 54 28 15 40; }; node_77(){
+required 54 28 15 41; }; node_78(){ optional 11; }; node_79(){ optional 12; }
+node_80(){ oneormore 19; }; node_81(){ required 54 28 15 42 78 79 16 80; }
+node_82(){ required 54 28 15 42 16 80; }; node_83(){ required 54 28 15 43 44 57
+}; node_84(){ optional 22; }; node_85(){ required 54 28 15 43 45 20 21 84 57; }
+node_86(){ required 54 28 15 43 46 20 21 23 57; }; node_87(){ either 20 13; }
+node_88(){ required 87; }; node_89(){ required 54 28 15 43 69 88 57 70; }
+node_90(){ optional 80; }; node_91(){ required 54 28 15 24 90; }; node_92(){
+optional 26; }; node_93(){ optional 27; }; node_94(){ required 54 47 48 25 92 93
+}; node_95(){ required 54 47 61; }; node_96(){ required 54 47 25 36; }
+node_97(){ required 54 47 25 49; }; node_98(){ required 54 47 25 50; }
+node_99(){ required 54 47 25 51 62; }; node_100(){ required 54 52; }
+node_101(){
+either 59 63 65 66 67 71 73 74 75 76 77 81 82 83 85 86 89 91 94 95 96 97 98 99 100
+}; node_102(){ required 101; }; cat <<<' docopt_exit() {
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1286}" >&2
+exit 1; }'; unset var___stack var___env var___version var___help var___server \
+var___domain var___pass var___auto var___status var___skip_check var___force \
+var___no_tty var___user var___all var__app_ var__domain_ var__service_ \
+var__src_ var__dst_ var__args_ var__secret_ var__version_ var__cmd_ var__data_ \
+var__command_ var__host_ var__user_ var__port_ var_app var_new var_list var_ls \
+var_deploy var_undeploy var_config var_delete var_rm var_logs var_multilogs \
+var_cp var_check var_ps var_run var_secret var_auto var_generate var_insert \
+var_server var_add var_use var_init var_apps var_upgrade; parse 102 "$@"
+local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" "${prefix}__env" \
+"${prefix}__version" "${prefix}__help" "${prefix}__server" "${prefix}__domain" \
+"${prefix}__pass" "${prefix}__auto" "${prefix}__status" \
+"${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \
+"${prefix}__user" "${prefix}__all" "${prefix}_app_" "${prefix}_domain_" \
+"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" \
+"${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" \
+"${prefix}_command_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
+"${prefix}app" "${prefix}new" "${prefix}list" "${prefix}ls" "${prefix}deploy" \
+"${prefix}undeploy" "${prefix}config" "${prefix}delete" "${prefix}rm" \
+"${prefix}logs" "${prefix}multilogs" "${prefix}cp" "${prefix}check" \
+"${prefix}ps" "${prefix}run" "${prefix}secret" "${prefix}auto" \
+"${prefix}generate" "${prefix}insert" "${prefix}server" "${prefix}add" \
+"${prefix}use" "${prefix}init" "${prefix}apps" "${prefix}upgrade"
 eval "${prefix}"'__stack=${var___stack:-}'
+eval "${prefix}"'__env=${var___env:-}'
 eval "${prefix}"'__version=${var___version:-false}'
+eval "${prefix}"'__help=${var___help:-false}'
 eval "${prefix}"'__server=${var___server:-}'
 eval "${prefix}"'__domain=${var___domain:-}'
 eval "${prefix}"'__pass=${var___pass:-false}'
 eval "${prefix}"'__auto=${var___auto:-false}'
 eval "${prefix}"'__status=${var___status:-false}'
+eval "${prefix}"'__skip_check=${var___skip_check:-false}'
 eval "${prefix}"'__force=${var___force:-false}'
 eval "${prefix}"'__no_tty=${var___no_tty:-false}'
 eval "${prefix}"'__user=${var___user:-}'
@@ -263,19 +266,20 @@ eval "${prefix}"'init=${var_init:-false}'
 eval "${prefix}"'apps=${var_apps:-false}'
 eval "${prefix}"'upgrade=${var_upgrade:-false}'; local docopt_i=1
 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
-declare -p "${prefix}__help" "${prefix}__env" "${prefix}__stack" \
-"${prefix}__version" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \
-"${prefix}__auto" "${prefix}__status" "${prefix}__force" "${prefix}__no_tty" \
-"${prefix}__user" "${prefix}__all" "${prefix}_app_" "${prefix}_domain_" \
-"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" \
-"${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" \
-"${prefix}_command_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
-"${prefix}app" "${prefix}new" "${prefix}list" "${prefix}ls" "${prefix}deploy" \
-"${prefix}undeploy" "${prefix}config" "${prefix}delete" "${prefix}rm" \
-"${prefix}logs" "${prefix}multilogs" "${prefix}cp" "${prefix}check" \
-"${prefix}ps" "${prefix}run" "${prefix}secret" "${prefix}auto" \
-"${prefix}generate" "${prefix}insert" "${prefix}server" "${prefix}add" \
-"${prefix}use" "${prefix}init" "${prefix}apps" "${prefix}upgrade"; done; }
+declare -p "${prefix}__stack" "${prefix}__env" "${prefix}__version" \
+"${prefix}__help" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \
+"${prefix}__auto" "${prefix}__status" "${prefix}__skip_check" \
+"${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \
+"${prefix}_app_" "${prefix}_domain_" "${prefix}_service_" "${prefix}_src_" \
+"${prefix}_dst_" "${prefix}_args_" "${prefix}_secret_" "${prefix}_version_" \
+"${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" "${prefix}_host_" \
+"${prefix}_user_" "${prefix}_port_" "${prefix}app" "${prefix}new" \
+"${prefix}list" "${prefix}ls" "${prefix}deploy" "${prefix}undeploy" \
+"${prefix}config" "${prefix}delete" "${prefix}rm" "${prefix}logs" \
+"${prefix}multilogs" "${prefix}cp" "${prefix}check" "${prefix}ps" \
+"${prefix}run" "${prefix}secret" "${prefix}auto" "${prefix}generate" \
+"${prefix}insert" "${prefix}server" "${prefix}add" "${prefix}use" \
+"${prefix}init" "${prefix}apps" "${prefix}upgrade"; done; }
 # docopt parser above, complete command for generating this parser is `docopt.sh abra`
 
 PROGRAM_NAME=$(basename "$0")
@@ -592,6 +596,10 @@ sub_app_deploy (){
 
   require_app_clone "$APP"
 
+  if [ "$abra___skip_check" == "false" ]; then
+    sub_app_check
+  fi
+
   echo "About to deploy:"
   echo "  Server: $(tput setaf 4)${SERVER}$(tput sgr0)"
   if [ "${COMPOSE_FILE/:/}" == "${COMPOSE_FILE}" ]; then
@@ -652,15 +660,17 @@ sub_app_check (){
   load_instance
   load_instance_env
 
-  APP_ENV=$(grep -v '^#' "$ENV_FILE" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
-  STACK_ENV=$(grep -v '^#' "$APP_DIR/.envrc.sample" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
+  #APP_ENV=$(grep -v '^#' "$ENV_FILE" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
+  APP_ENV=$(grep -v '^#' "$ENV_FILE" | cut -d' ' -f2 | cut -d'=' -f1 | sort)
+  #STACK_ENV=$(grep -v '^#' "$APP_DIR/.envrc.sample" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
+  STACK_ENV=$(grep -v '^#' "$APP_DIR/.envrc.sample" | cut -d' ' -f2 | cut -d'=' -f1 | sort)
 
   # Only show "1", items in STACK_ENV which aren't in APP_ENV
   MISSING_VARS=$(comm -23 <(echo "$STACK_ENV") <(echo "$APP_ENV"))
 
   if [ -z "$MISSING_VARS" ]; then
     success "Yay! All the necessary basic variables are defined"
-    exit 0
+    return 0
   fi
 
   error "Found missing variables: $MISSING_VARS"
@@ -1018,7 +1028,7 @@ abra() {
     abra__secret_ abra__version_ abra__data_ abra___user abra__host_ \
     abra__app_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \
     abra__domain_ abra___server abra___domain abra___force abra___pass \
-    abra___auto abra___status abra___no_tty
+    abra___auto abra___status abra___no_tty abra___skip_check
 
   if ! type tput > /dev/null 2>&1; then
     tput() {