diff --git a/install.fish b/tools/tide_actual_install.fish
similarity index 94%
rename from install.fish
rename to tools/tide_actual_install.fish
index c887c53..8b67819 100644
--- a/install.fish
+++ b/tools/tide_actual_install.fish
@@ -1,10 +1,4 @@
-function tide_install
-    # If git isn't installed, there's nothing we can do
-    if not command -q git
-        printf '%s\n' 'Git must be installed to download Tide.'
-        return 1
-    end
-
+function tide_actual_install
     argparse 'l/local' 'd/dev' -- $argv
 
     set -l location $argv[1]
diff --git a/tools/tide_install.fish b/tools/tide_install.fish
new file mode 100644
index 0000000..50c4e56
--- /dev/null
+++ b/tools/tide_install.fish
@@ -0,0 +1,24 @@
+function tide_install
+    # If git isn't installed, there's nothing we can do
+    if not command -q git
+        printf '%s\n' 'Git must be installed to download Tide.'
+        return 1
+    end
+
+    argparse --ignore-unknown 'l/local' -- $argv
+
+    set -l location $argv[-1]
+    if test -z "$location"
+        set location 'master'
+    end
+
+    if set -q _flag_local
+        source "$location/tools/tide_actual_install.fish"
+
+        set -a flags '-l'
+    else
+        curl -s "https://raw.githubusercontent.com/IlanCosman/tide/$location/tools/tide_actual_install.fish" | source
+    end
+
+    tide_actual_install $flags $argv
+end
\ No newline at end of file