diff --git a/src/cmd_fetch.zig b/src/cmd_fetch.zig
index 94e1e1350986ee873237cbc07adbe31b75ea9474..dbae6ed8b097fe111554ec470d9201a20c3afbfa 100644
--- a/src/cmd_fetch.zig
+++ b/src/cmd_fetch.zig
@@ -4,6 +4,7 @@ const fs = std.fs;
 
 const known_folders = @import("known-folders");
 const u = @import("./util/index.zig");
+const common = @import("./common.zig");
 
 //
 //
@@ -12,7 +13,10 @@ pub fn execute(args: [][]u8) !void {
     //
     const dir = try fs.path.join(gpa, &[_][]const u8{".zigmod", "deps"});
 
-    const top_module = try fetch_deps(dir, "zig.mod");
+    const top_module = try common.collect_deps(dir, "zig.mod", .{
+        .log = true,
+        .update = true,
+    });
 
     //
     const f = try fs.cwd().createFile("deps.zig", .{});
@@ -96,149 +100,6 @@ pub fn execute(args: [][]u8) !void {
     try w.writeAll("};\n\n");
 }
 
-fn fetch_deps(dir: []const u8, mpath: []const u8) anyerror!u.Module {
-    const m = try u.ModFile.init(gpa, mpath);
-    const moduledeps = &std.ArrayList(u.Module).init(gpa);
-    var moddir: []const u8 = undefined;
-    for (m.deps) |d| {
-        const p = try fs.path.join(gpa, &[_][]const u8{dir, try d.clean_path()});
-        const pv = try fs.path.join(gpa, &[_][]const u8{dir, try d.clean_path_v()});
-        u.print("fetch: {s}: {s}: {s}", .{m.name, @tagName(d.type), d.path});
-        moddir = p;
-        switch (d.type) {
-            .system_lib => {
-                // no op
-            },
-            .git => blk: {
-                if (!try u.does_folder_exist(p)) {
-                    try d.type.pull(d.path, p);
-                }
-                else {
-                    try d.type.update(p, d.path);
-                }
-                if (d.version.len > 0) {
-                    const vers = u.parse_split(u.GitVersionType, "-").do(d.version) catch |e| switch (e) {
-                        error.IterEmpty => unreachable,
-                        error.NoMemberFound => {
-                            const vtype = d.version[0..std.mem.indexOf(u8, d.version, "-").?];
-                            u.assert(false, "fetch: git: version type '{s}' is invalid.", .{vtype});
-                            unreachable;
-                        },
-                    };
-                    if (try u.does_folder_exist(pv)) {
-                        if (vers.id == .branch) {
-                            try d.type.update(p, d.path);
-                        }
-                        moddir = pv;
-                        break :blk;
-                    }
-                    if ((try u.run_cmd(p, &[_][]const u8{"git", "checkout", vers.string})) > 0) {
-                        u.assert(false, "fetch: git: {s}: {s} {s} does not exist", .{d.path, @tagName(vers.id), vers.string});
-                    } else {
-                        _ = try u.run_cmd(p, &[_][]const u8{"git", "checkout", "-"});
-                    }
-                    try d.type.pull(d.path, pv);
-                    _ = try u.run_cmd(pv, &[_][]const u8{"git", "checkout", vers.string});
-                    if (vers.id != .branch) {
-                        const pvd = try std.fs.cwd().openDir(pv, .{});
-                        try pvd.deleteTree(".git");
-                    }
-                    moddir = pv;
-                }
-            },
-            .hg => {
-                if (!try u.does_folder_exist(p)) {
-                    try d.type.pull(d.path, p);
-                }
-                else {
-                    try d.type.update(p, d.path);
-                }
-            },
-            .http => blk: {
-                if (try u.does_folder_exist(pv)) {
-                    moddir = pv;
-                    break :blk;
-                }
-                const file_name = try u.last(try u.split(d.path, "/"));
-                if (d.version.len > 0) {
-                    const file_path = try std.fs.path.join(gpa, &[_][]const u8{pv, file_name});
-                    try d.type.pull(d.path, pv);
-                    if (try u.validate_hash(try u.last(try u.split(pv, "/")), file_path)) {
-                        try std.fs.deleteFileAbsolute(file_path);
-                        moddir = pv;
-                        break :blk;
-                    }
-                    try u.rm_recv(pv);
-                    u.assert(false, "{s} does not match hash {s}", .{d.path, d.version});
-                    break :blk;
-                }
-                if (try u.does_folder_exist(p)) {
-                    try u.rm_recv(p);
-                }
-                const file_path = try std.fs.path.join(gpa, &[_][]const u8{p, file_name});
-                try d.type.pull(d.path, p);
-                try std.fs.deleteFileAbsolute(file_path);
-            },
-        }
-        switch (d.type) {
-            .system_lib => {
-                if (d.is_for_this()) try moduledeps.append(u.Module{
-                    .is_sys_lib = true,
-                    .id = "",
-                    .name = d.path,
-                    .only_os = d.only_os,
-                    .except_os = d.except_os,
-                    .main = "",
-                    .c_include_dirs = &[_][]const u8{},
-                    .c_source_flags = &[_][]const u8{},
-                    .c_source_files = &[_][]const u8{},
-                    .deps = &[_]u.Module{},
-                    .clean_path = d.path,
-                });
-            },
-            else => blk: {
-                var dd = try fetch_deps(dir, try u.concat(&[_][]const u8{moddir, "/zig.mod"})) catch |e| switch (e) {
-                    error.FileNotFound => {
-                        if (d.main.len > 0 or d.c_include_dirs.len > 0 or d.c_source_files.len > 0) {
-                            var mod_from = try u.Module.from(d);
-                            mod_from.id = try u.random_string(48);
-                            mod_from.clean_path = u.trim_prefix(moddir, dir)[1..];
-                            if (mod_from.is_for_this()) try moduledeps.append(mod_from);
-                        }
-                        break :blk;
-                    },
-                    else => e,
-                };
-                dd.clean_path = u.trim_prefix(moddir, dir)[1..];
-
-                if (dd.id.len == 0) dd.id = try u.random_string(48);
-                if (d.name.len > 0) dd.name = d.name;
-                if (d.main.len > 0) dd.main = d.main;
-                if (d.c_include_dirs.len > 0) dd.c_include_dirs = d.c_include_dirs;
-                if (d.c_source_flags.len > 0) dd.c_source_flags = d.c_source_flags;
-                if (d.c_source_files.len > 0) dd.c_source_files = d.c_source_files;
-                if (d.only_os.len > 0) dd.only_os = d.only_os;
-                if (d.except_os.len > 0) dd.except_os = d.except_os;
-
-                if (dd.is_for_this()) try moduledeps.append(dd);
-            },
-        }
-    }
-    return u.Module{
-        .is_sys_lib = false,
-        .id = m.id,
-        .name = m.name,
-        .main = m.main,
-        .c_include_dirs = m.c_include_dirs,
-        .c_source_flags = m.c_source_flags,
-        .c_source_files = m.c_source_files,
-        .deps = moduledeps.items,
-        .clean_path = "",
-        .only_os = &[_][]const u8{},
-        .except_os = &[_][]const u8{},
-    };
-}
-
 fn print_ids(w: fs.File.Writer, list: []u.Module) !void {
     for (list) |mod| {
         if (mod.is_sys_lib) {