diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b608982
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "backend/deps/guile-toolkit"]
+	path = backend/deps/guile-toolkit
+	url = https://git.bradymcd.ca/brady/guile-toolkit.git
+[submodule "backend/deps/guile-csv"]
+	path = backend/deps/guile-csv
+	url = https://gitlab.com/bradymcd/guile-csv
diff --git a/backend/deps/guile-csv b/backend/deps/guile-csv
new file mode 160000
index 0000000..ac87ac1
--- /dev/null
+++ b/backend/deps/guile-csv
@@ -0,0 +1 @@
+Subproject commit ac87ac1294de72a6bbc84b0eb68a605d17058796
diff --git a/backend/deps/guile-toolkit b/backend/deps/guile-toolkit
new file mode 160000
index 0000000..bd06431
--- /dev/null
+++ b/backend/deps/guile-toolkit
@@ -0,0 +1 @@
+Subproject commit bd06431dc8d878440f6eb2853543252434fad736
diff --git a/backend/main.scm b/backend/main.scm
index 75de9f0..6077e5d 100644
--- a/backend/main.scm
+++ b/backend/main.scm
@@ -6,7 +6,6 @@
              (ice-9 string-fun)
              (ice-9 textual-ports)
              (ice-9 threads)
-	     (mcron base)
              (srfi srfi-1)
              (srfi srfi-11)
              (srfi srfi-19)
@@ -17,8 +16,8 @@
              (tk short))
 
 
-(begin (primitive-load "./src/debugging.scm")
-       (primitive-load "./src/repo.scm")
-       (primitive-load "./src/associations.scm")
-       (primitive-load "./src/scheduler.scm")
-       (primitive-load "./src/spawn_interaction.scm"))
+(include "./src/debugging.scm")
+(include "./src/repo.scm")
+(include "./src/associations.scm")
+(include "./src/scheduler.scm")
+(include "./src/spawn_interaction.scm")
diff --git a/backend/src/repo.scm b/backend/src/repo.scm
index 62ea764..4fb5f0b 100644
--- a/backend/src/repo.scm
+++ b/backend/src/repo.scm
@@ -1,3 +1,8 @@
+(use-modules (git clone)
+             (git repository)
+             (git remote))
+
+(define %new-repo-url "https://github.com/ccodwg/CovidTimelineCanada")
 (define %repo-url "https://github.com/ccodwg/Covid19Canada.git")
 (define %repo-dir "./repo")
 
@@ -7,17 +12,14 @@
 (define path-update-time "./repo/update_time.txt")
 
 (define (repo-exists?)
-  (access? %repo-dir (logior W_OK R_OK)))
+  (openable-repository? %repo-dir))
 
 (define (init-repo)
-  (let ((git (open-pipe* OPEN_READ "git" "clone" %repo-url %repo-dir)))
-    (close-pipe git)))
+  (clone %repo-url %repo-dir))
 
 (define (update-repo)
-  (begin (chdir (string-append (getcwd) "/repo"))
-         (let ((git (open-pipe* OPEN_READ "git" "pull" "--rebase" %repo-url)))
-           (close-pipe git))
-         (chdir "..")))
+  (let ((repo (repository-open %repo-dir)))
+    (remote-fetch (remote-lookup repo "origin"))))
 
 (define (git:fetch)
   (if (repo-exists?)