diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..55b649d
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: Green-Sky
diff --git a/.gitmodules b/.gitmodules
index edc686b..f521a91 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,3 +41,6 @@
 [submodule "external/solanaceae_bridge"]
 	path = external/solanaceae_bridge
 	url = https://github.com/Green-Sky/solanaceae_bridge.git
+[submodule "external/solanaceae_crdtnotes"]
+	path = external/solanaceae_crdtnotes
+	url = https://github.com/Green-Sky/solanaceae_crdtnotes.git
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 3f3b52b..a0275a8 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -25,5 +25,8 @@ add_subdirectory(./solanaceae_toxic_games)
 set(SOLANACEAE_IRCCLIENT_BUILD_PLUGINS ON)
 add_subdirectory(./solanaceae_ircclient)
 
+set(SOLANACEAE_CRDTNOTES_BUILD_PLUGINS ON)
+add_subdirectory(./solanaceae_crdtnotes)
+
 add_subdirectory(./totato)
 
diff --git a/external/solanaceae_crdtnotes b/external/solanaceae_crdtnotes
new file mode 160000
index 0000000..45a3915
--- /dev/null
+++ b/external/solanaceae_crdtnotes
@@ -0,0 +1 @@
+Subproject commit 45a3915985e1b50a3629d0d0f2e5057f65817810
diff --git a/external/totato b/external/totato
index 516b264..6b1d949 160000
--- a/external/totato
+++ b/external/totato
@@ -1 +1 @@
-Subproject commit 516b264a96591de53c0fff49e8699696f0d2b2e3
+Subproject commit 6b1d949810286621f546c8117ddce21216fd8baa
diff --git a/external/toxcore/c-toxcore b/external/toxcore/c-toxcore
index 2e30bfe..f1df709 160000
--- a/external/toxcore/c-toxcore
+++ b/external/toxcore/c-toxcore
@@ -1 +1 @@
-Subproject commit 2e30bfe4ebaaca76a1ed1cd084e313a933a04ce0
+Subproject commit f1df709b8792da4c0e946d826b11df77d565064d