diff --git a/external/solanaceae_bridge b/external/solanaceae_bridge
index b21acd4..3490896 160000
--- a/external/solanaceae_bridge
+++ b/external/solanaceae_bridge
@@ -1 +1 @@
-Subproject commit b21acd4c9976c06809de933e7840e6b67e70d67d
+Subproject commit 34908967aa5d6431843aaa861de551fe804d0333
diff --git a/external/solanaceae_crdtnotes b/external/solanaceae_crdtnotes
index d7400e3..964bb0f 160000
--- a/external/solanaceae_crdtnotes
+++ b/external/solanaceae_crdtnotes
@@ -1 +1 @@
-Subproject commit d7400e375c6c7485659a0c5fc4bd7741cda57e37
+Subproject commit 964bb0ffb98923f324e23681107b461f36deddc1
diff --git a/external/solanaceae_ircclient b/external/solanaceae_ircclient
index d728077..f5cf441 160000
--- a/external/solanaceae_ircclient
+++ b/external/solanaceae_ircclient
@@ -1 +1 @@
-Subproject commit d7280771ce71dcb437d97ea6a6070d8888bf8ade
+Subproject commit f5cf44119b891498881c0ef0fd93498632a202f9
diff --git a/external/solanaceae_llama-cpp-web b/external/solanaceae_llama-cpp-web
index f38da08..301900c 160000
--- a/external/solanaceae_llama-cpp-web
+++ b/external/solanaceae_llama-cpp-web
@@ -1 +1 @@
-Subproject commit f38da08334d1dfb3cdd9fb5f795d6083d808c12a
+Subproject commit 301900c507d5719374b82a3730c19ad66eb10820
diff --git a/external/solanaceae_message3 b/external/solanaceae_message3
index 9728f71..3e6c857 160000
--- a/external/solanaceae_message3
+++ b/external/solanaceae_message3
@@ -1 +1 @@
-Subproject commit 9728f71c9833baa65995e19e993d3450da750c20
+Subproject commit 3e6c857c8ad509a94e5a309a5061c5729fbcc439
diff --git a/external/solanaceae_message_fragment_store b/external/solanaceae_message_fragment_store
index 1f2aaf1..a6c5886 160000
--- a/external/solanaceae_message_fragment_store
+++ b/external/solanaceae_message_fragment_store
@@ -1 +1 @@
-Subproject commit 1f2aaf1ee964c39e61afab0350243e7f03d73cd4
+Subproject commit a6c5886fb6ebdcef63d7822ad755cf06059bab05
diff --git a/external/solanaceae_ngc_ft1 b/external/solanaceae_ngc_ft1
index 1d7416e..4360b65 160000
--- a/external/solanaceae_ngc_ft1
+++ b/external/solanaceae_ngc_ft1
@@ -1 +1 @@
-Subproject commit 1d7416efedfbb98e2720bb7afb099b813e74a1de
+Subproject commit 4360b65309356f67d6369235927ad8ce80fbb485
diff --git a/external/solanaceae_tox b/external/solanaceae_tox
index 1a3d9dd..2e34ad2 160000
--- a/external/solanaceae_tox
+++ b/external/solanaceae_tox
@@ -1 +1 @@
-Subproject commit 1a3d9dd1870b1f45e252ff636adfd0c1f0ccf521
+Subproject commit 2e34ad2100afb314a3cf6d9336adc78d60ced638
diff --git a/external/solanaceae_zox b/external/solanaceae_zox
index a678b62..c81a04a 160000
--- a/external/solanaceae_zox
+++ b/external/solanaceae_zox
@@ -1 +1 @@
-Subproject commit a678b627639f6b043ebf7607b181a552b0d2cad0
+Subproject commit c81a04a778428fc289bdd03bba7f707cf8cf00b7
diff --git a/external/totato b/external/totato
index 77fffb7..1a032ce 160000
--- a/external/totato
+++ b/external/totato
@@ -1 +1 @@
-Subproject commit 77fffb744e2379eefc0b1b4ce71cdfe72292a398
+Subproject commit 1a032ce260ac84dd181092eefac0aefa1a63a374
diff --git a/plugins/plugin_ngcft1.cpp b/plugins/plugin_ngcft1.cpp
index 81cb5af..4d1446c 100644
--- a/plugins/plugin_ngcft1.cpp
+++ b/plugins/plugin_ngcft1.cpp
@@ -39,7 +39,7 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
 		auto* tox_i = PLUG_RESOLVE_INSTANCE(ToxI);
 		auto* tox_event_provider_i = PLUG_RESOLVE_INSTANCE(ToxEventProviderI);
 		auto* cr = PLUG_RESOLVE_INSTANCE_VERSIONED(Contact3Registry, "1");
-		auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModel);
+		auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModelI);
 		auto* tcm = PLUG_RESOLVE_INSTANCE(ToxContactModel2);
 
 		// static store, could be anywhere tho
diff --git a/plugins/plugin_transfer_auto_accept.cpp b/plugins/plugin_transfer_auto_accept.cpp
index 41b1ce9..c868c3c 100644
--- a/plugins/plugin_transfer_auto_accept.cpp
+++ b/plugins/plugin_transfer_auto_accept.cpp
@@ -33,7 +33,7 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
 
 	try {
 		auto* os = PLUG_RESOLVE_INSTANCE(ObjectStore2);
-		auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModel);
+		auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModelI);
 		auto* conf = PLUG_RESOLVE_INSTANCE(ConfigModelI);
 
 		// static store, could be anywhere tho
diff --git a/plugins/transfer_auto_accept.cpp b/plugins/transfer_auto_accept.cpp
index 6ed7a8a..ad51ae4 100644
--- a/plugins/transfer_auto_accept.cpp
+++ b/plugins/transfer_auto_accept.cpp
@@ -10,7 +10,7 @@
 
 #include <iostream>
 
-TransferAutoAccept::TransferAutoAccept(ObjectStore2& os, RegistryMessageModel& rmm, ConfigModelI& conf) : _os(os), _rmm(rmm), _conf(conf) {
+TransferAutoAccept::TransferAutoAccept(ObjectStore2& os, RegistryMessageModelI& rmm, ConfigModelI& conf) : _os(os), _rmm(rmm), _conf(conf) {
 	//_os.subscribe(this, ObjectStore_Event::object_update);
 
 	_rmm.subscribe(this, RegistryMessageModel_Event::message_construct);
diff --git a/plugins/transfer_auto_accept.hpp b/plugins/transfer_auto_accept.hpp
index 80624b1..58dba5c 100644
--- a/plugins/transfer_auto_accept.hpp
+++ b/plugins/transfer_auto_accept.hpp
@@ -10,14 +10,14 @@ struct ConfigModelI;
 
 class TransferAutoAccept : public RegistryMessageModelEventI, public ObjectStoreEventI {
 	ObjectStore2& _os;
-	RegistryMessageModel& _rmm;
+	RegistryMessageModelI& _rmm;
 	//ContactModelI& _cm;
 	ConfigModelI& _conf;
 
 	std::vector<ObjectHandle> _accept_queue;
 
 	public:
-		TransferAutoAccept(ObjectStore2& os, RegistryMessageModel& rmm, ConfigModelI& conf);
+		TransferAutoAccept(ObjectStore2& os, RegistryMessageModelI& rmm, ConfigModelI& conf);
 
 		// TODO: iterate
 		void iterate(void);