diff --git a/zoxide.py b/zoxide.py
index 0181d20..4e4668f 100644
--- a/zoxide.py
+++ b/zoxide.py
@@ -1,27 +1,54 @@
-from ranger.api.commands import Command
-from subprocess import check_output, CalledProcessError
+import os.path
+import ranger.api
+import ranger.core.fm
+import ranger.ext.signals
+from subprocess import Popen, PIPE
 
-class z(Command):
+hook_init_prev = ranger.api.hook_init
+
+def hook_init(fm):
+    def zoxide_add(signal):
+        path = signal.new.path
+        process = Popen(["zoxide", "add", path])
+        process.wait()
+
+    fm.signal_bind("cd", zoxide_add)
+    return hook_init_prev(fm)
+
+
+ranger.api.hook_init = hook_init
+
+class z(ranger.api.commands.Command):
     """
     :z
 
     Jump around with zoxide (z)
     """
     def execute(self):
-        results = self.query(self.args[1])
-        self.fm.cd(results[0])
+        results = self.query(self.args[1:])
+        if os.path.isdir(results[0]):
+            self.fm.cd(results[0])
 
-    def query(self, req):
+    def query(self, args):
         try:
-            return check_output(['zoxide', 'query', req]).splitlines()
-        except CalledProcessError as e:
-            if e.returncode == 1:
-                self.fm.notify("No matches found", bad=True)
+            p = Popen(
+                ["zoxide", "query"] + self.args[1:],
+                stdout=PIPE,
+                stderr=PIPE
+            )
+            stdout, stderr = p.communicate()
+            if p.returncode == 0:
+                output = stdout.decode("utf-8").strip()
+                if output:
+                    return output.splitlines()
+                else:
+                    self.fm.notify("zoxide exited with status {}".format(p.returncode), bad=True)
             else:
-                self.fm.notify("zoxide exited with status: %i".format(e.returncode), bad=True)
+                output = stderr.decode("utf-8").strip() or "zoxide: unexpected error"
+                self.fm.notify(output, bad=True)
         except Exception as e:
-            self.fm.notify("zoxide not found", bad=True)
+            self.fm.notify(e, bad=True)
 
     def tab(self, tabnum):
-        results = self.query(self.args[1])
+        results = self.query(self.args[1:])
         return ["z {}".format(x) for x in results]