diff --git a/bin/.idmgr.swp b/bin/.idmgr.swp
deleted file mode 100644
index dc5a5f8..0000000
Binary files a/bin/.idmgr.swp and /dev/null differ
diff --git a/bin/idmgr b/bin/idmgr
index 1be7cf9..fb5b89f 100755
--- a/bin/idmgr
+++ b/bin/idmgr
@@ -35,6 +35,8 @@ IDM_DIR_ID=${IDM_DIR_ID:-$IDM_CONFIG_DIR/id}
 IDM_DIR_LIB=${IDM_DIR_LIB:-$IDM_DIR_ROOT/lib}
 IDM_DIR_CACHE=${IDM_DIR_CACHE:-${XDG_CACHE_HOME:-~/.cache}/idmgr}
 
+# Mod vars ...
+IDM_DISABLE_AUTO=
 
 # Main initialisation settings
 idm_init ()
@@ -233,8 +235,15 @@ idm_core_exec_mod ()
     local val="idm_${i}${action}"
 
     if  [ "$( type -t $val )" = function ]; then
+
+      #set -x
+      # Skip if disabled ...
+      [[ ":${IDM_DISABLE_AUTO// /:}" =~ :${i}${action}: ]] && continue
+      #set +x
+
       #lib_log INFO "Loading module $i ..."
       [ "$sep" == "_" ] || lib_log NOTICE "$(printf "$sep" $i )"
+      export IDM_MOD_EXEC=chain
       ${val} $id  || \
         {
           # DO NOT DISABLE THIS BLOCK, that force plugin to load in anyway
diff --git a/lib/idmgr_mod_git.sh b/lib/idmgr_mod_git.sh
index a266e9d..bacd582 100644
--- a/lib/idmgr_mod_git.sh
+++ b/lib/idmgr_mod_git.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 IDM_MOD_DEPS="id"
-
+IDM_DISABLE_AUTO+=" git__enable git__disable git__kill "
 
 
 
diff --git a/lib/idmgr_mod_ps1.sh b/lib/idmgr_mod_ps1.sh
index 0f429b3..6d7b7dc 100644
--- a/lib/idmgr_mod_ps1.sh
+++ b/lib/idmgr_mod_ps1.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 IDM_MOD_DEPS="id pass gpg ssh"
+IDM_DISABLE_AUTO+="ps1__ls"
 
 ## Prompt functions
 ##########################################
diff --git a/lib/idmgr_mod_tomb.sh b/lib/idmgr_mod_tomb.sh
index 9cf48b5..e811bcd 100644
--- a/lib/idmgr_mod_tomb.sh
+++ b/lib/idmgr_mod_tomb.sh
@@ -5,6 +5,9 @@ IDM_MOD_TAGS="id tool"
 IDM_MOD_PROG="safe yadm"
 IDM_MOD_PREF="core id"
 
+IDM_DISABLE_AUTO+=" tomb__enable tomb__disable tomb__kill "
+
+
 
 ## Tomb functions
 ##########################################