diff --git a/deluge/ui/console/commands/move.py b/deluge/ui/console/commands/move.py
new file mode 100644
index 000000000..011031417
--- /dev/null
+++ b/deluge/ui/console/commands/move.py
@@ -0,0 +1,111 @@
+#
+# move.py
+#
+# Copyright (C) 2011 Nick Lanham <nick@afternight.org>
+#
+# Deluge is free software.
+#
+# You may redistribute it and/or modify it under the terms of the
+# GNU General Public License, as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# deluge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+from deluge.ui.console.main import BaseCommand
+from deluge.ui.client import client
+import deluge.component as component
+
+import os.path
+
+
+class Command(BaseCommand):
+    """Move torrents' storage location"""
+    usage = "Usage: move <torrent-id> [<torrent-id> ...] <path>"
+
+    def handle(self, *args, **options):
+        self.console = component.get("ConsoleUI")
+
+        if len(args) < 2:
+            self.console.write(self.usage)
+            return
+
+        path = args[-1]
+        
+        if os.path.exists(path) and not os.path.isdir(path):
+            self.console.write("{!error!}Cannot Move Storage: %s exists and is not a directory"%path)
+            return
+
+        ids = []
+        for i in args[:-1]:
+            ids.extend(self.console.match_torrent(i))
+
+        names = []
+        for i in ids:
+            names.append(self.console.get_torrent_name(i))
+        namestr = ", ".join(names)
+
+        def on_move(res):
+            self.console.write("Moved \"%s\" to %s"%(namestr,path))
+
+        d = client.core.move_storage(ids,path)
+        d.addCallback(on_move)
+        return d
+
+    def complete(self, line):
+        line = os.path.abspath(os.path.expanduser(line))
+        ret = []
+        if os.path.exists(line):
+            # This is a correct path, check to see if it's a directory
+            if os.path.isdir(line):
+                # Directory, so we need to show contents of directory
+                #ret.extend(os.listdir(line))
+                for f in os.listdir(line):
+                    # Skip hidden
+                    if f.startswith("."):
+                        continue
+                    f = os.path.join(line, f)
+                    if os.path.isdir(f):
+                        f += "/"
+                    ret.append(f)
+            else:
+                # This is a file, but we could be looking for another file that
+                # shares a common prefix.
+                for f in os.listdir(os.path.dirname(line)):
+                    if f.startswith(os.path.split(line)[1]):
+                        ret.append(os.path.join( os.path.dirname(line), f))
+        else:
+            # This path does not exist, so lets do a listdir on it's parent
+            # and find any matches.
+            ret = []
+            if os.path.isdir(os.path.dirname(line)):
+                for f in os.listdir(os.path.dirname(line)):
+                    if f.startswith(os.path.split(line)[1]):
+                        p = os.path.join(os.path.dirname(line), f)
+
+                        if os.path.isdir(p):
+                            p += "/"
+                        ret.append(p)
+
+        return ret