diff --git a/.github/ci.sh b/.github/ci.sh
index 72f8becd..7f5e462c 100755
--- a/.github/ci.sh
+++ b/.github/ci.sh
@@ -46,6 +46,7 @@ setup_dist_bins() {
   is_exe "dist/bin" "cryptol" && is_exe "dist/bin" "cryptol-html" && return
   extract_exe "cryptol" "dist/bin"
   extract_exe "cryptol-html" "dist/bin"
+  extract_exe "cryptol-remote-api" "dist/bin"
   strip dist/bin/cryptol* || echo "Strip failed: Ignoring harmless error"
 }
 
@@ -112,6 +113,7 @@ build() {
   cabal v2-update
   cabal v2-configure -j2 --minimize-conflict-set
   retry ./cry build exe:cryptol-html "$@" # retry due to flakiness with windows builds
+  cabal v2-build cryptol-remote-api
 }
 
 install_system_deps() {
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 911b9f5c..574a6821 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -4,6 +4,7 @@ on:
     branches: ["actions/**"]
   schedule:
     - cron: "0 0 * * *"
+  workflow_dispatch:
 
 jobs:
   outputs:
diff --git a/.gitmodules b/.gitmodules
index 7dc47876..cbf4e6ef 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "examples/cryptol-specs"]
 	path = examples/cryptol-specs
 	url = https://github.com/GaloisInc/cryptol-specs.git
+[submodule "deps/argo"]
+	path = deps/argo
+	url = https://github.com/galoisinc/argo
diff --git a/cabal.project b/cabal.project
index 7a74a0ab..c2b0f28f 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,3 +1,5 @@
 packages:
     cryptol.cabal
     tests
+    deps/argo/argo
+    deps/argo/cryptol-remote-api
diff --git a/deps/argo b/deps/argo
new file mode 160000
index 00000000..7c6bd320
--- /dev/null
+++ b/deps/argo
@@ -0,0 +1 @@
+Subproject commit 7c6bd32044321a63ce5039bdaf48662bd33a905f