diff --git a/.devcontainer/devcontainer.env b/.devcontainer/devcontainer.env
index 6118912b..b77eae62 100644
--- a/.devcontainer/devcontainer.env
+++ b/.devcontainer/devcontainer.env
@@ -87,3 +87,5 @@ DF_MAX_FILE_SIZE=10_000_000
 
 # These will show up in doubtfire-api/tmp/mail
 DF_EMAIL_ERRORS_TO=errors@ontrack-test.com
+
+ML_SERVICE_URL = http://effort-predictor:8080/
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 147f864e..d1482446 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -47,6 +47,7 @@ services:
       LATEX_BUILD_PATH: /texlive/shell/latex_build.sh
     depends_on:
       - dev-db
+      - effort-predictor
 
   dev-db:
     container_name: doubtfire-dev-db
@@ -107,6 +108,15 @@ services:
       - ./devcontainer.env
     network_mode: none
 
+  effort-predictor:
+    build:
+      context: ../doubtfire-effort-predict/
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+    networks:
+      - backnet
+
 volumes:
   ws_node_modules:
   web_node_modules:
diff --git a/.gitmodules b/.gitmodules
index a908009b..480a1268 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "doubtfire-lti"]
 	path = doubtfire-lti
 	url = https://github.com/doubtfire-lms/doubtfire-lti.git
+[submodule "doubtfire-effort-predict"]
+	path = doubtfire-effort-predict
+	url = https://github.com/SteveDala/doubtfire-effort-predict.git
diff --git a/development/api.env b/development/api.env
index 72c33f9c..72026837 100644
--- a/development/api.env
+++ b/development/api.env
@@ -61,4 +61,3 @@ DF_PRODUCTION_DB_PASSWORD=pwd
 
 # Mail settings
 DF_MAIL_DELIVERY_METHOD=test
-
diff --git a/doubtfire-api b/doubtfire-api
index 0750fec3..a1f5dbbf 160000
--- a/doubtfire-api
+++ b/doubtfire-api
@@ -1 +1 @@
-Subproject commit 0750fec301d4eba77fab69a665df5bf5c211887e
+Subproject commit a1f5dbbf276ef6df0f110075eef6fcb184d494b8
diff --git a/doubtfire-effort-predict b/doubtfire-effort-predict
new file mode 160000
index 00000000..e5c1fc92
--- /dev/null
+++ b/doubtfire-effort-predict
@@ -0,0 +1 @@
+Subproject commit e5c1fc92d241178e98051760ba714a1709c3e65f
diff --git a/doubtfire-lti b/doubtfire-lti
index e75853d0..feedca5f 160000
--- a/doubtfire-lti
+++ b/doubtfire-lti
@@ -1 +1 @@
-Subproject commit e75853d08fdf25fc099bff88824c530955164d81
+Subproject commit feedca5fdc9f6272ff8cdecdd97f6ae35ae6c6e5
diff --git a/doubtfire-overseer b/doubtfire-overseer
new file mode 160000
index 00000000..ca3496c0
--- /dev/null
+++ b/doubtfire-overseer
@@ -0,0 +1 @@
+Subproject commit ca3496c064894c9f1618ae96dde35ecf11baf718
diff --git a/doubtfire-web b/doubtfire-web
index 866078af..3032ef25 160000
--- a/doubtfire-web
+++ b/doubtfire-web
@@ -1 +1 @@
-Subproject commit 866078af23b6404b4521db79e18a4ffb420f290d
+Subproject commit 3032ef257045ea311471e3a911dad51a62d2477c