diff --git a/completions/_ssh.zsh b/completions/_ssh.zsh
deleted file mode 100644
index 5f97d38..0000000
--- a/completions/_ssh.zsh
+++ /dev/null
@@ -1,15 +0,0 @@
-#compdef ssh.zsh
-
-function _ssh.zsh() {
-	_arguments \
-		':args: _alternative
-			"hosts:hosts: _ssh_hosts"
-			"users:users: _ssh.zsh_users -qS@"
-			"domains:domains:($(virsh list --all --name))"'
-}
-
-_ssh.zsh_users () {
-	_combination -s '[:@]' my-accounts users-hosts users "$@"
-} 
-
-_ssh.zsh "$@"
diff --git a/deploykernel.zsh b/deploykernel.zsh
index 91a3af4..e5c1beb 100755
--- a/deploykernel.zsh
+++ b/deploykernel.zsh
@@ -13,8 +13,8 @@ deploypkg.zsh $(makepkg --packagelist) $*
 pkgname=$(grep ^pkgname PKGBUILD | awk -F= '{print $2}')
 
 for vm in $*; do
-	title=$(ssh.zsh $vm grub-list.zsh -e | grep $pkgname$)
-	ssh.zsh $vm "sudo grub-reboot \"$title\""
+	title=$(ssh $vm grub-list.zsh -e | grep $pkgname$)
+	ssh $vm "sudo grub-reboot \"$title\""
 done
 
 echo
@@ -24,5 +24,5 @@ echo
 
 tags=($(python /home/anna/bin/colors/vm.py $*))
 for ((i=1; i<=$#; i++)); do
-	echo "${tags[i]} $fg_bold[default]$(ssh.zsh ${@[i]} uname -rsn)$reset_color"
+	echo "${tags[i]} $fg_bold[default]$(ssh ${@[i]} uname -rsn)$reset_color"
 done
diff --git a/deploypkg.zsh b/deploypkg.zsh
index 6fd1378..afe7e7a 100755
--- a/deploypkg.zsh
+++ b/deploypkg.zsh
@@ -10,9 +10,9 @@ pkg=$(basename $1)
 shift
 
 function deploy_package() {
-	ssh.zsh $1 "mkdir -pv pkg" 2>&1 | sed -e "s/^/$2 /"
+	ssh $1 "mkdir -pv pkg" 2>&1 | sed -e "s/^/$2 /"
 	script -q -c "scp $pkg $1:pkg/ 2>&1" 2>&1 | sed -e "s/^/$2 /"
-	ssh.zsh $1 "sudo pacman --noconfirm -U pkg/$pkg" | python $colors/pacman.py $2
+	ssh $1 "sudo pacman --noconfirm -U pkg/$pkg" | python $colors/pacman.py $2
 }
 
 tags=($(python $colors/vm.py $*))
diff --git a/preexec.zsh b/preexec.zsh
new file mode 100755
index 0000000..715f8eb
--- /dev/null
+++ b/preexec.zsh
@@ -0,0 +1,12 @@
+#!/bin/zsh
+#
+# Be sure to add:
+#      preexec() { /path/to/script/preexec.zsh $* }
+# to your .zshrc
+
+cmd=($(echo "$1" | sed 's/\-\w //g'))
+
+# Boot offline VMs
+if [[ $cmd[1] == "ssh" ]]; then
+	vm.zsh boot $(echo $cmd[2] | sed 's/^\w*@//')
+fi
diff --git a/ssh.zsh b/ssh.zsh
deleted file mode 100755
index c76b844..0000000
--- a/ssh.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/zsh
-
-vm.zsh boot $1
-ssh $*