diff --git a/.gitignore b/.gitignore
index 8c20a9f6..ec6e5a2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@
 *.d
 *.a
 *~
+*ClassDict.cpp
+*.pcm
+*.rootmap
 lib
 Dependencies
 */a.out
@@ -12,3 +15,4 @@ RemoteControl
 Example/Example
 Example/Example_root
 Win_Mac_translation
+core
diff --git a/Example/Example.cpp b/Example/Example.cpp
index 0b9d5f47..dc45b709 100644
--- a/Example/Example.cpp
+++ b/Example/Example.cpp
@@ -265,19 +265,13 @@ int main(){
   // Each submitted plot with the same name is stored in the database as a different version. 
   /////////////////////////////////////////////////////////////////
   std::vector<float> plot_x(5);
-  for (size_t i = 0; i < plot_x.size(); ++i) plot_x[i] = i;
   std::vector<float> plot_y(plot_x.size());
-  for (auto& y : plot_y) y = rand();
-  
-  std::string plot_layout = "{"
-    "\"title\":\"A random plot\","
-    "\"xaxis\":{\"title\":\"x\"},"
-    "\"yaxis\":{\"title\":\"y\"}"
-  "}";
+  for (size_t i = 0; i < plot_x.size(); ++i) plot_x[i] = i;
   
+  Store store; // for conversion to JSON
   std::vector<std::string> traces(2);
   
-  Store store;
+  for (auto& y : plot_y) y = rand();
   store.Set("x", plot_x);
   store.Set("y", plot_y);
   store >> traces[0];
@@ -287,6 +281,12 @@ int main(){
   store.Set("y", plot_y);
   store >> traces[1];
   
+  std::string plot_layout = "{"
+    "\"title\":\"A random plot\","
+    "\"xaxis\":{\"title\":\"x\"},"
+    "\"yaxis\":{\"title\":\"y\"}"
+  "}";
+  
   DAQ_inter.SendPlotlyPlot("test_plot", traces, plot_layout);
   
   /////////////////////////// generic SQL query example //////////////////////
@@ -294,12 +294,12 @@ int main(){
   std::string resp;
   std::cout<<"Testing submitting generic SQL queries"<<std::endl;
   // single-record query
-  bool qryok = DAQ_inter.SQLQuery("daq","SELECT config_id, name, version, data FROM configurations",resp);
+  bool qryok = DAQ_inter.SQLQuery("SELECT time, message FROM logging ORDER BY time DESC LIMIT 1",resp);
   std::cout<<"single-record query success: "<<qryok<<", response: '"<<resp<<"'"<<std::endl;
   
   // for multi-record queries
   std::vector<std::string> resps;
-  qryok = DAQ_inter.SQLQuery("daq","SELECT version, data FROM device_config WHERE device='"+device_name+"'",resps);
+  qryok = DAQ_inter.SQLQuery("SELECT time, message FROM logging ORDER BY time DESC LIMIT 5",resps);
   std::cout<<"multi-record query success: "<<qryok<<", got "<<resps.size()<<" records:"<<std::endl;
   for(int i=0; i<std::min(resps.size(),size_t(5)); ++i) std::cout<<i<<": '"<<resps.at(i)<<"'"<<std::endl;
   if(resps.size()>5) std::cout<<"...\n"<<std::endl;
@@ -373,7 +373,7 @@ int main(){
       monitoring_data>>monitoring_json; /// prducing monitoring json 
       
       // send to the database
-      bool ok = DAQ_inter.SendMonitoringData("general", monitoring_json);
+      bool ok = DAQ_inter.SendMonitoringData(monitoring_json, "general");
       if(!ok){
       	std::cerr<<"sendmonitoringdata failed"<<std::endl;
       }
diff --git a/Example/Example.py b/Example/Example.py
index cc6a6dd4..4021473e 100644
--- a/Example/Example.py
+++ b/Example/Example.py
@@ -243,12 +243,12 @@ def change_voltage(self, control_name: str) -> str:
   print("testing generic sql queries")
   # single-record query
   resp = std.string()
-  qryok = DAQ_inter.SQLQuery("daq","SELECT config_id, name, version, data FROM configurations",resp)
+  qryok = DAQ_inter.SQLQuery("SELECT time, message FROM logging ORDER BY time DESC LIMIT 1",resp)
   print("single-record query success: ",qryok,", response: '",resp,"'")
   
   # for multi-record queries
   resps = std.vector['std::string']()
-  qryok = DAQ_inter.SQLQuery("daq","SELECT device, version, data FROM device_config",resps)
+  qryok = DAQ_inter.SQLQuery("SELECT time, message FROM logging ORDER BY time DESC LIMIT 5",resps)
   print("multi-record query success: ",qryok,", responses:")
   for i in range(min(5,resps.size())):
      print(i,": '",resps[i],"'")
@@ -336,7 +336,7 @@ def change_voltage(self, control_name: str) -> str:
       monitoring_data.__rshift__['std::string'](monitoring_json)
       
       # send to the Database for plotting on the webpage
-      DAQ_inter.SendMonitoringData("general", monitoring_json)
+      DAQ_inter.SendMonitoringData(monitoring_json, "general")
       
       # retrieve and respond to control changes
       ###########################################
diff --git a/Example/Example_root.cpp b/Example/Example_root.cpp
index ab4066d4..d0e71bed 100644
--- a/Example/Example_root.cpp
+++ b/Example/Example_root.cpp
@@ -68,21 +68,13 @@ int main(int argc, const char** argv){
 	std::string graph_name = "TotallyCoolSine";
 	std::string graph_draw_options = "ALP";
 	
-	// each time the same unique name is inserted, a new version of the plot is stored.
-	// when saving a new version over TCP we may optionally pass a pointer to an integer,
-	// which will be populated with the version number of the created entry.
-	int graph_db_ver=0;
-	
 	// store it in the database
-	bool persistent=true; // TODO
-	// For now this setting only affects whether the request is sent over multicast (false, default) or tcp (true)
-	// At a later date we may add the option for plots to only be stored in a temporary table.
-	std::cout<<"Sending to database via TCP"<<std::endl;
-	bool ok = DAQ_inter.SendROOTplot(graph_name, graph_draw_options, graph_json, persistent, &graph_db_ver);
+	std::cout<<"Sending to database"<<std::endl;
+	bool ok = DAQ_inter.SendROOTplot(graph_name, graph_draw_options, graph_json);
 	if(!ok){
 		std::cerr<<"Error sending plot '"<<graph_name<<"' to database!"<<std::endl;
 	} else {
-		std::cout<<"Created plot '"<<graph_name<<"' version "<<graph_db_ver<<std::endl;
+		std::cout<<"Sent OK"<<std::endl;
 	}
 	
 	// Another example, this time storing a TH2.
@@ -101,13 +93,26 @@ int main(int argc, const char** argv){
 	// and specify the draw options
 	std::string hist_draw_options = "colz";
 	
-	// send to the database. We omit the optional arguments this time.
+	// Each time a plot with the same name as an existing plot is inserted, it makes a new version of that plot.
+	// The 'lifetime' parameter (default=5) defines how long it plots are to be retained in the database.
+	// When a new version of a given plot is created, any existing plots of the same name
+	// that have a (version+lifetime) less than the version number of the new plot will be pruned.
+	// This behaviour may be subject to change: feedback to the DAQ group is welcome!
+	// N.B. pruning is presently not functional as it is likely to be a separate background task.
+	int lifetime=3;
+	
+	// ROOT plots may be sent either via ZMQ or multicast (the 'acknowledged' argument in SendROOTplot).
+	// If SendROOTplotZmq is used explicitly (acknowledged=1) you may pass a version number argument
+	// that will be set to the version number of the newly created entry.
+	int db_ver=0;
+	
+	// send to the database
 	std::cout<<"Sending to database via multicast"<<std::endl;
-	ok = DAQ_inter.SendROOTplot(histo_name, hist_draw_options, hist_json);
+	ok = DAQ_inter.SendROOTplotZmq(histo_name, hist_draw_options, hist_json, db_ver, 0, lifetime);
 	if(!ok){
 		std::cerr<<"Error sending plot '"<<histo_name<<"' to database!"<<std::endl;
 	} else {
-		std::cout<<"Sent OK"<<std::endl;
+		std::cout<<"Created plot version "<<db_ver<<std::endl;
 	}
 	
 	// ============================================================= //
@@ -148,10 +153,9 @@ int main(int argc, const char** argv){
 	// repeat for the histogram
 	std::string ret_hist_draw_options;
 	std::string ret_hist_json;
-	int ret_hist_version=-1;
-	std::cout<<"Getting latest version of plot "<<histo_name<<std::endl;
-	ok = DAQ_inter.GetROOTplot(histo_name, ret_hist_version, ret_hist_draw_options, ret_hist_json);
-	if(!ok) std::cerr<<"Failed to get ROOT plot '"<<histo_name<<"' from database!"<<std::endl;
+	std::cout<<"Getting version "<<db_ver<<" of plot "<<histo_name<<std::endl;
+	ok = DAQ_inter.GetROOTplot(histo_name, db_ver, ret_hist_draw_options, ret_hist_json);
+	if(!ok) std::cerr<<"Failed to get ROOT plot '"<<histo_name<<"' version "<<db_ver<<" from database!"<<std::endl;
 	else std::cout<<"Converting to TH2"<<std::endl;
 	
 	// This time we use an alternative FromJSON signature using raw pointers instead of unique_ptr:
diff --git a/Example/Test.cpp b/Example/Test.cpp
new file mode 100644
index 00000000..6c4c9265
--- /dev/null
+++ b/Example/Test.cpp
@@ -0,0 +1,103 @@
+#include <iostream>
+#include <DAQInterface.h>
+#include <functional>
+
+using namespace ToolFramework;
+
+std::string Check(int ok){
+	return ok ? "\033[32mPASS" : "\033[31mFAIL";
+}
+
+const std::string Reset = "\033[39m";
+
+int main(){
+	
+	int verbose=1;
+	
+	std::string Interface_configfile = "./InterfaceConfig";
+	
+	DAQInterface DAQ_inter(Interface_configfile);
+	//std::this_thread::sleep_for(std::chrono::seconds(2)); // sleep for a little longer, connecting is slow
+	std::string device_name = DAQ_inter.GetDeviceName();
+	std::string tmp;
+	bool ok;
+	
+	if(verbose) std::cout<<"Testing logging..."<<std::flush;
+	ok = DAQ_inter.SendLog("test log message");
+	if(!ok || verbose) std::cout<<"Logs sent: "<<Check(ok)<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Testing monitoring..."<<std::flush;
+	ok = DAQ_inter.SendMonitoringData("{\"message\":\"test mon message\"}","general");
+	if(!ok || verbose) std::cout<<"monitoring sent: "<<Check(ok)<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Sending test alarm..."<<std::flush;
+	ok = DAQ_inter.SendAlarm("Test alarm");
+	if(!ok || verbose) std::cout<<"Test alarm sent: "<<Check(ok)<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Sending test calibration data..."<<std::flush;
+	ok = DAQ_inter.SendCalibrationData("{\"data\":[1,2,3]}","test calib data");
+	if(!ok || verbose) std::cout<<"test calibration data sent: "<<Check(ok)<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"getting test calibration data..."<<std::flush;
+	ok = DAQ_inter.GetCalibrationData(tmp, -1, device_name);
+	if(!ok || verbose) std::cout<<"get calibration data: "<<Check(ok)<<" = "<<tmp<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Sending test device config..."<<std::flush;
+	ok = DAQ_inter.SendDeviceConfig("{\"device settings\":[3,2,1]}","test user","test dev config");
+	if(!ok || verbose) std::cout<<"test device config sent: "<<Check(ok)<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Getting test device config..."<<std::flush;
+	ok = DAQ_inter.GetDeviceConfig(tmp, -1);
+	if(!ok || verbose) std::cout<<"get device config: "<<Check(ok)<<" = "<<tmp<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Sending test run config..."<<std::flush;
+	ok = DAQ_inter.SendRunConfig("{\""+device_name+"\":1}","test run","test user","test run config");
+	if(!ok || verbose) std::cout<<"test run config sent: "<<Check(ok)<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Getting test run config by id..."<<std::flush;
+	ok = DAQ_inter.GetRunConfig(tmp, 1);
+	if(!ok || verbose) std::cout<<"get run config by id: "<<Check(ok)<<" = "<<tmp<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Getting test run config by name & version..."<<std::flush;
+	ok = DAQ_inter.GetRunConfig(tmp, "test run",1);
+	if(!ok || verbose) std::cout<<"get run config by name: "<<Check(ok)<<" = "<<tmp<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Getting test device config by run id..."<<std::flush;
+	ok = DAQ_inter.GetDeviceConfigFromRunConfig(tmp, 1);
+	if(!ok || verbose) std::cout<<"get device config by run config id: "<<Check(ok)<<" = "<<tmp<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Getting test device config by run name and version..."<<std::flush;
+	ok = DAQ_inter.GetDeviceConfigFromRunConfig(tmp, "test run",1);
+	if(!ok || verbose) std::cout<<"get device config by run config name & version: "<<Check(ok)<<" = "<<tmp<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Sending test PlotlyPlot..."<<std::flush;
+	std::string trace = "{\"x\":[1,2,3],\"y\":[3,2,1]}";
+	std::string layout = "{ \"title\":\"test plot\", \"xaxis\":{\"title\":\"x\"}, \"yaxis\":{\"title\":\"y\"} }";
+	ok = DAQ_inter.SendPlotlyPlot("test_plot", trace, layout);
+	if(!ok || verbose) std::cout<<"test plotly plot sent: "<<Check(ok)<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"getting test plotlyplot..."<<std::flush;
+	trace=""; layout="";
+	ok = DAQ_inter.GetPlotlyPlot("test_plot", trace, layout);
+	if(!ok || verbose) std::cout<<"get plotly plot: "<<Check(ok)<<" = "<<trace<<", "<<layout<<Reset<<std::endl;
+	
+	// TODO add testing Get/Send Rootplot
+	// requires either ROOT install, or hard-coded json that may not be small, or a test file
+	
+	if(verbose) std::cout<<"Testing single-record SQL query"<<Reset<<std::endl;
+	ok = DAQ_inter.SQLQuery("SELECT time, message FROM logging ORDER BY time DESC LIMIT 1",tmp);
+	if(!ok || verbose) std::cout<<"single-record SQL sent: "<<Check(ok)<<" = "<<tmp<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Testing multi-record SQL query"<<Reset<<std::endl;
+	std::vector<std::string> resps;
+	ok = DAQ_inter.SQLQuery("SELECT time, message FROM logging ORDER BY time DESC LIMIT 5",resps);
+	if(!ok || verbose) std::cout<<"multi-record SQL sent: "<<Check(ok)<<", got "<<resps.size()<<" rows"<<Reset<<std::endl;
+	if(ok && verbose) for(int i=0; i<resps.size(); ++i) std::cout<<"\t"<<i<<": '"<<resps.at(i)<<"'"<<Reset<<std::endl;
+	
+	if(verbose) std::cout<<"Sending bad SQL query ..."<<Reset<<std::endl;
+	ok = DAQ_inter.SQLQuery("SELECT potato, message FROM logging ORDER BY time DESC LIMIT 1",tmp);
+	if(!ok || verbose) std::cout<<"bad SQL returned: "<<Check(ok)<<" = "<<tmp<<Reset<<std::endl;
+	
+	return 0;
+	
+}
diff --git a/InterfaceConfig b/InterfaceConfig
index 5aa55684..a91e3f5d 100644
--- a/InterfaceConfig
+++ b/InterfaceConfig
@@ -1,18 +1,17 @@
-UUID b16a0186-c5df-474c-b880-9fc6c0670d7d  # unique identifier for client (must be valid uuid)
-device_name Example 			# name of devices
-verbosity 1 				# Verbosity level of interface
-db_name daq                     	#
-max_retries 3				#	
-advertise_endpoints 0			#
-resend_period_ms 1000			#
-print_stats_period_ms 1000		#
-clt_pub_port 55556    			#
-clt_dlr_port 55555			#
-clt_pub_socket_timeout 500		#	
-clt_dlr_socket_timeout 500		#
-inpoll_timeout 50      			# keep these short!
-outpoll_timeout 50 	 		# keep these short!
-command_timeout 2000			#
-log_port 55554				#
-mon_port 55553				#
-multicast_address 239.192.1.1		#
+UUID b16a0186-c5df-474c-b880-9fc6c0670d7d   # unique identifier for client (must be valid uuid)
+device_name Example                         # name of devices
+verbosity 1                                 # Verbosity level of interface
+max_retries 3                               #        
+resend_period_ms 1000                       #
+print_stats_period_ms 1000                  #
+clt_pub_port 55556                          #
+clt_dlr_port 55555                          #
+clt_pub_socket_timeout 500                  #        
+clt_dlr_socket_timeout 500                  #
+inpoll_timeout 50                           # keep these short!
+outpoll_timeout 50                          # keep these short!
+command_timeout 2000                        #
+log_port 5000                               #
+mon_port 5000                               #
+log_address 239.192.1.2                     #
+mon_address 239.192.1.3                     #
diff --git a/Makefile b/Makefile
index 901c1d71..73d5b5b2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,13 @@
 Dependencies=./Dependencies
 
+CXXFLAGS=-g -fmax-errors=3 -std=c++20 -Werror=array-bounds -Werror=return-type -Wpedantic
+
+ifeq ($(MAKECMDGOALS),debug)
+CXXFLAGS+= -O0 -lSegFault -rdynamic -DDEBUG
+else
+CXXFLAGS+= -O3
+endif
+
 ZMQLib= -L $(Dependencies)/zeromq-4.0.7/lib -lzmq
 ZMQInclude= -I $(Dependencies)/zeromq-4.0.7/include/
 
@@ -16,37 +24,51 @@ RootInclude= -I`root-config --incdir`
 RootFlags=`root-config --cflags`
 RootLib= `root-config --libs`
 
-sources= $(filter-out  %DAQInterfaceClassDict.cpp, $(wildcard src/*.cpp))
+sources= $(filter-out  %DAQInterfaceClassDict.cpp, $(wildcard src/*.cpp) $(wildcard include/*.h))
 
 .phony: python
 
-all: lib/libDAQInterface.so Win_Mac_translation Example/Example RemoteControl
+debug: all
+
+all: lib/libDAQInterface.so Win_Mac_translation Example/Example Example/Test RemoteControl
 
 lib/libDAQInterface.so: $(sources)
-	g++ -O3 -fPIC  -Wpedantic -std=c++11 -shared src/DAQInterface.cpp -I include -o lib/libDAQInterface.so -lpthread  $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(ToolDAQInclude) $(ToolFrameworkInclude) $(ToolFrameworkLib) $(BoostInclude) $(BoostLib)
+	g++ $(CXXFLAGS) -fPIC -shared src/DAQInterface.cpp -I include -o lib/libDAQInterface.so -lpthread  $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(ToolDAQInclude) $(ToolFrameworkInclude) $(ToolFrameworkLib) $(BoostInclude) $(BoostLib)
 
 Win_Mac_translation: Win_Mac_translation.cpp lib/libDAQInterface.so
-	g++ -O3  -Wpedantic -std=c++11 Win_Mac_translation.cpp -o Win_Mac_translation  -I ./include/ -L lib/ -lDAQInterface -lpthread  $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(ToolDAQInclude) $(ToolFrameworkInclude) $(ToolFrameworkLib) $(BoostInclude) $(BoostLib) $(ToolDAQLib)  $(BoostLib)
+	g++ $(CXXFLAGS) Win_Mac_translation.cpp -o Win_Mac_translation  -I ./include/ -L lib/ -lDAQInterface -lpthread  $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(ToolDAQInclude) $(ToolFrameworkInclude) $(ToolFrameworkLib) $(BoostInclude) $(BoostLib) $(ToolDAQLib)  $(BoostLib)
 
 # this is the default example showing the majority of features
 Example/Example: Example/Example.cpp lib/libDAQInterface.so
-	g++ -O3  -Wpedantic -std=c++11 $^ -o $@ -I ./include/ -L lib/ -lDAQInterface -lpthread $(ToolDAQInclude) $(ToolDAQLib) $(ToolFrameworkInclude) $(ToolFrameworkLib) $(BoostInclude) $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(BoostLib) $(ToolDAQLib) 
+	g++ $(CXXFLAGS) $^ -o $@ -I ./include/ -L lib/ -lDAQInterface -lpthread $(ToolDAQInclude) $(ToolDAQLib) $(ToolFrameworkInclude) $(ToolFrameworkLib) $(BoostInclude) $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(BoostLib) $(ToolDAQLib)
 
 # this is required ONLY to demonstrate the use of storing and retreiving ROOT plots in the database
 Example/Example_root: Example/Example_root.cpp lib/libDAQInterface.so
-	g++ -O3  -Wpedantic -std=c++11 $(RootFlags) $^ -o $@ -I ./include/ -L lib/ -lDAQInterface -lpthread $(ToolDAQInclude) $(ToolDAQLib) $(RootLib) $(ToolDAQInclude) $(ToolFrameworkInclude) $(ToolDAQLib) $(ToolFrameworkLib) $(BoostInclude) $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(BoostLib) $(ToolDAQLib)
+	g++ $(CXXFLAGS) $(RootFlags) $^ -o $@ -I ./include/ -L lib/ -lDAQInterface -lpthread $(ToolDAQInclude) $(ToolFrameworkInclude) $(BoostInclude) $(ZMQInclude) $(ToolFrameworkLib) $(ToolDAQLib) $(ZMQLib) $(BoostLib) $(RootLib)
 
 # this is required ONLY if you want to run the python example, or use the libDAQInterface in python
-python: lib/libDAQInterfaceClassDict.so
+python: lib/libDAQInterface.so lib/libDAQInterfaceClassDict.so
+
+# functionality testing
+Example/Test: Example/Test.cpp lib/libDAQInterface.so
+	g++ $(CXXFLAGS) $^ -o $@ -I ./include/ -L lib/ -lDAQInterface -lpthread $(ToolDAQInclude) $(ToolDAQLib) $(ToolFrameworkInclude) $(ToolFrameworkLib) $(BoostInclude) $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(BoostLib) $(ToolDAQLib)
 
 lib/libDAQInterfaceClassDict.so: include/DAQInterface.h include/DAQInterfaceLinkdef.h
 	rootcling -f src/DAQInterfaceClassDict.cpp -c -p -rmf lib/libDAQInterfaceClassDict.rootmap $^ -I ./include/ $(ToolFrameworkInclude) $(ToolDAQInclude) $(BoostInclude) $(ZMQInclude)
-	g++ -shared -fPIC src/DAQInterfaceClassDict.cpp -o $@ -I ./ -I ./include/ $(ToolFrameworkInclude) $(ToolDAQInclude) $(BoostInclude) $(ZMQInclude) $(RootInclude) -L lib -lDAQInterface $(RootLib)
+	g++ -shared $(CXXFLAGS) -fPIC src/DAQInterfaceClassDict.cpp -o $@ -I ./ -I ./include/ $(ToolFrameworkInclude) $(ToolDAQInclude) $(BoostInclude) $(ZMQInclude) $(RootInclude) -L lib -lDAQInterface $(RootLib)
 	cp src/DAQInterfaceClassDict_rdict.pcm lib/
 # end python requirements
 
 RemoteControl: $(Dependencies)/ToolDAQFramework/src/RemoteControl/RemoteControl.cpp lib/libDAQInterface.so
-	g++ -O3  -Wpedantic -std=c++11 $(Dependencies)/ToolDAQFramework/src/RemoteControl/RemoteControl.cpp -o RemoteControl  -I ./include/ -L lib/ -lDAQInterface -lpthread $(BoostInclude) $(BoostLib) $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(ToolDAQInclude) $(ToolFrameworkInclude) $(ToolFrameworkLib) $(ToolDAQLib) $(BoostLib)
+	g++ $(CXXFLAGS) $(Dependencies)/ToolDAQFramework/src/RemoteControl/RemoteControl.cpp -o RemoteControl  -I ./include/ -L lib/ -lDAQInterface -lpthread $(BoostInclude) $(BoostLib) $(ZMQInclude) $(ZMQLib) $(ToolDAQLib) $(ToolDAQInclude) $(ToolFrameworkInclude) $(ToolFrameworkLib) $(ToolDAQLib) $(BoostLib)
 
 clean:
-	rm -f lib/libDAQInterface.so RemoteControl Win_Mac_translation Example/Example Example/Example_root
+	rm -f lib/libDAQInterface.so \
+	RemoteControl \
+	Win_Mac_translation \
+	Example/Example \
+	Example/Example_root \
+	lib/DAQInterfaceClassDict_rdict.pcm \
+	lib/libDAQInterfaceClassDict.rootmap \
+	lib/libDAQInterfaceClassDict.so
+
diff --git a/Setup.sh b/Setup.sh
index 05eb3694..7d6b3d41 100644
--- a/Setup.sh
+++ b/Setup.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
 Dependencies=`pwd`/Dependencies
+export PS1='${debian_chroot:+($debian_chroot)}\[\033[01;34m\]\u@\h\[\033[00m\]:\[\033[00;36m\]\w\[\033[00m\]\$ '
 
 export LD_LIBRARY_PATH=`pwd`/lib:${Dependencies}/zeromq-4.0.7/lib:${Dependencies}/boost_1_66_0/install/lib:${Dependencies}/ToolDAQFramework/lib:${Dependencies}/ToolFrameworkCore/lib:$LD_LIBRARY_PATH
diff --git a/SetupDB.sh b/SetupDB.sh
new file mode 100644
index 00000000..b28be00f
--- /dev/null
+++ b/SetupDB.sh
@@ -0,0 +1,5 @@
+export PGHOST=192.166.1.50
+export PGPORT=5432
+export PGUSER=root
+export PGDATABASE=daq
+export PGCOLOR=always
diff --git a/include/DAQInterface.h b/include/DAQInterface.h
index dc3cd0f7..b734c6f8 100644
--- a/include/DAQInterface.h
+++ b/include/DAQInterface.h
@@ -16,6 +16,10 @@
 //#include <boost/progress.hpp>
 #include <Services.h>
 
+namespace {
+  const unsigned int default_timeout=300;
+}
+
 namespace ToolFramework {
   
   class DAQInterface{
@@ -25,29 +29,32 @@ namespace ToolFramework {
     DAQInterface(std::string configuration_file);
     ~DAQInterface();
     
-    bool SQLQuery(const std::string& database, const std::string& query, std::vector<std::string>& responses, const unsigned int timeout=300);
-    bool SQLQuery(const std::string& database, const std::string& query, std::string& response, const unsigned int timeout=300);
-    bool SQLQuery(const std::string& database, const std::string& query, const unsigned int timeout=300);
+    bool SQLQuery(/*const std::string& database,*/ const std::string& query, std::vector<std::string>& responses, const unsigned int timeout=default_timeout);
+    bool SQLQuery(/*const std::string& database,*/ const std::string& query, std::string& response, const unsigned int timeout=default_timeout);
+    bool SQLQuery(/*const std::string& database,*/ const std::string& query, const unsigned int timeout=default_timeout);
     
-    bool SendLog(const std::string& message, unsigned int severity=9, const std::string& device="", const int64_t timestamp=0); //serverity levels are 0 = critical, 1 = Error, 2 = warning, 3= info , 4-9 debug
-    bool SendAlarm(const std::string& message, unsigned int level=0, const std::string& device="", const int64_t timestamp=0, const unsigned int timeout=300);
-    bool SendMonitoringData(const std::string& json_data, const std::string& subject, const std::string& device="", int64_t timestamp=0);
-    bool SendCalibrationData(const std::string& json_data, const std::string& description, const std::string& device="", int64_t timestamp=0, int* version=nullptr, const unsigned int timeout=300);
-    bool GetCalibrationData(std::string& json_data, int version=-1, const std::string& device="", const unsigned int timeout=300);
-    bool SendDeviceConfig(const std::string& json_data, const std::string& author, const std::string& description, const std::string& device="", int64_t timestamp=0, int* version=nullptr, const unsigned int timeout=300);
-    bool SendRunConfig(const std::string& json_data, const std::string& name, const std::string& author, const std::string& description, int64_t timestamp=0, int* version=nullptr, const unsigned int timeout=300);
-    bool GetDeviceConfig(std::string& json_data, const int version, const std::string& device="", const unsigned int timeout=300);
-    bool GetRunConfig(std::string& json_data, const int config_id, const unsigned int timeout=300);
-    bool GetRunConfig(std::string& json_data, const std::string& name, const int version, const unsigned int timeout=300);
-    bool GetDeviceConfigFromRunConfig(std::string& json_data, const int runconfig_id, const std::string& device="", const unsigned int timeout=300);
-    bool GetDeviceConfigFromRunConfig(std::string& json_data, const std::string& runconfig_name, const int runconfig_version, const std::string& device="", const unsigned int timeout=300);
-    bool SendROOTplot(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, bool persistent=false, int* version=nullptr, const int64_t timestamp=0, const unsigned int timeout=300);
-    bool SendTemporaryROOTplot(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, int* version=nullptr, const int64_t timestamp=0);
-    bool SendPersistentROOTplot(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, int* version=nullptr, const int64_t timestamp=0, const unsigned int timeout=300);
-    bool GetROOTplot(const std::string& plot_name, int& version, std::string& draw_option, std::string& json_data, std::string* timestamp=nullptr, const unsigned int timeout=300);
-    bool SendPlotlyPlot(const std::string& name, const std::string& json_trace, const std::string& json_layout="{}", int* version=nullptr, unsigned int timestamp=0, unsigned int timeout=300);
-    bool SendPlotlyPlot(const std::string& name, const std::vector<std::string>& json_traces, const std::string& json_layout="{}", int* version=nullptr, unsigned int timestamp=0, unsigned int timeout=300);
-    bool GetPlotlyPlot(const std::string& name, int& version, std::string& json_trace, std::string& json_layout, unsigned int* timestamp=nullptr, unsigned int timeout=300);
+    bool SendLog(const std::string& message, unsigned int severity=9, const std::string& device="", const uint64_t timestamp=0); //serverity levels are 0 = critical, 1 = Error, 2 = warning, 3= info , 4-9 debug
+    bool SendAlarm(const std::string& message, unsigned int level=0, const std::string& device="", const uint64_t timestamp=0, const unsigned int timeout=default_timeout);
+    bool SendMonitoringData(const std::string& json_data, const std::string& subject, const std::string& device="", const uint64_t timestamp=0);
+    bool SendCalibrationData(const std::string& json_data, const std::string& description, const std::string& device="", const uint64_t timestamp=0, int* version=nullptr, const unsigned int timeout=default_timeout);
+    bool GetCalibrationData(std::string& json_data, int& version, const std::string& device="", const unsigned int timeout=default_timeout);
+    bool GetCalibrationData(std::string& json_data, int&& version=-1, const std::string& device="", const unsigned int timeout=default_timeout);
+    bool SendDeviceConfig(const std::string& json_data, const std::string& author, const std::string& description, const std::string& device="", const uint64_t timestamp=0, int* version=nullptr, const unsigned int timeout=default_timeout);
+    bool SendRunConfig(const std::string& json_data, const std::string& name, const std::string& author, const std::string& description, const uint64_t timestamp=0, int* version=nullptr, const unsigned int timeout=default_timeout);
+    bool GetDeviceConfig(std::string& json_data, const int version, const std::string& device="", const unsigned int timeout=default_timeout);
+    bool GetRunConfig(std::string& json_data, const int config_id, const unsigned int timeout=default_timeout);
+    bool GetRunConfig(std::string& json_data, const std::string& name, const int version, const unsigned int timeout=default_timeout);
+    bool GetDeviceConfigFromRunConfig(std::string& json_data, const int runconfig_id, const std::string& device="", const unsigned int timeout=default_timeout);
+    bool GetDeviceConfigFromRunConfig(std::string& json_data, const std::string& runconfig_name, const int runconfig_version, const std::string& device="", const unsigned int timeout=default_timeout);
+    bool SendROOTplot(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, bool acknowledged=true, const uint64_t timestamp=0, const unsigned int lifetime=5, const unsigned int timeout=default_timeout);
+    bool SendROOTplotMulticast(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, const unsigned int lifetime=5, const uint64_t timestamp=0);
+    bool SendROOTplotZmq(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, int* version=nullptr, const uint64_t timestamp=0, const unsigned int lifetime=5, const unsigned int timeout=default_timeout);
+    bool GetROOTplot(const std::string& plot_name, std::string& draw_option, std::string& json_data, int& version, const unsigned int timeout=default_timeout);
+    bool GetROOTplot(const std::string& plot_name, std::string& draw_option, std::string& json_data, int&& version=-1, const unsigned int timeout=default_timeout);
+    bool SendPlotlyPlot(const std::string& name, const std::string& json_trace, const std::string& json_layout="{}", int* version=nullptr, const uint64_t timestamp=0, const unsigned int lifetime=5, unsigned int timeout=default_timeout);
+    bool SendPlotlyPlot(const std::string& name, const std::vector<std::string>& json_traces, const std::string& json_layout="{}", int* version=nullptr, const uint64_t timestamp=0, const unsigned int lifetime=5, unsigned int timeout=default_timeout);
+    bool GetPlotlyPlot(const std::string& name, std::string& json_trace, std::string& json_layout, int& version, unsigned int timeout=default_timeout);
+    bool GetPlotlyPlot(const std::string& name, std::string& json_trace, std::string& json_layout, int&& version=-1, unsigned int timeout=default_timeout);
     
     SlowControlCollection* GetSlowControlCollection();
     SlowControlElement* GetSlowControlVariable(std::string key);
@@ -73,8 +80,6 @@ namespace ToolFramework {
     zmq::context_t* m_context=nullptr;
     ServiceDiscovery* mp_SD;
     Store vars;
-    // ServicesBackend m_backend_client;
-    // std::string m_dbname;
     std::string m_name;
     
     
diff --git a/scripts/Python/Install.sh b/scripts/Python/Install.sh
index 7813c94a..8e743764 100755
--- a/scripts/Python/Install.sh
+++ b/scripts/Python/Install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-set -x
-#set -e
+#set -x
+#set -e   # we can't set this as some commands may be expected to fail
 
 # a function to check for presence of cppyy. New ROOT versions come with it.
 # XXX for some reason this doesn't like the use of tab for whitespace!!! XXX
@@ -23,7 +23,11 @@ for m in v: print(m, end=' ')
     RESULT="$(echo -n ${RESULT} | xargs echo -n)"
     echo $RESULT | sed 's/ /·/g;s/\t/￫/g;s/\r/§/g;s/$/¶/g'  # check whitespace
     if [ "$RESULT" != "0 1 2 3 4 5 6 7 8 9" ]; then
-        echo "Test Failed! Check your installation of python3 and cppyy!"
+        if [ "$1" != "q" ]; then
+            echo "Test Failed! Check your installation of python3 and cppyy!"
+        else
+            echo "cppyy not found"
+        fi
         return 1
     else
         echo "Test Passed"
@@ -32,7 +36,7 @@ for m in v: print(m, end=' ')
 }
 
 echo "checking for pre-existing presence of cppyy"
-checkcppyy
+checkcppyy "q"
 if [ $? -eq 0 ]; then
 	# if we already have it, we have nothing to do....
 	# TODO the PythonScript c++ interface may require at least python3-devel as well...?
@@ -43,7 +47,7 @@ fi
 CURDIR=${PWD}  # in case we need to return to it. unused.
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
-# first argument is installation destination
+# first argument if given is installation destination:
 INSTALLDIR="/opt"
 if [ $# -gt 0 ]; then
 	INSTALLDIR="$1"
@@ -58,14 +62,14 @@ fi
 # first determine what kind of OS we're on.
 REDHATLIKE=$(yum --version >/dev/null 2>&1; echo $?)
 DEBIANLIKE=$(dpkg --version >/dev/null 2>&1; echo $?)
-NEEDDEPS=""
+unset NEEDDEPS
 if [ ${REDHATLIKE} -eq 0 ]; then
 	echo "red-hat based OS"
 	# red-hat based OS.
 	# trigger yum to update its metadata
 	echo "updating yum metadata..."
 	yum list installed >/dev/null 2>&1
-	DEPS=(gcc-c++ gcc make cmake git python3 python3-libs python3-devel python3-pip patch which)
+	DEPS=(wget git make gcc-c++ gcc binutils libX11-devel libXpm-devel libXft-devel libXext-devel python3 python3-devel openssl-devel fftw-devel libuuid-devel)
 	for DEP in "${DEPS[@]}"; do
 		echo "looking for ${DEP}..."
 		# this is probably not a great check as 'grep' could match on anything
@@ -75,7 +79,7 @@ if [ ${REDHATLIKE} -eq 0 ]; then
 		GOTDEP=$(yum list installed 2>/dev/null | grep "${DEP}" >/dev/null 2>&1; echo $?)
 		if [ ${GOTDEP} -ne 0 ]; then
 			echo "not found"
-			NEEDDEPS="${NEEDDEPS} ${DEP}"
+			NEEDDEPS=( ${NEEDDEPS} ${DEP} )
 		fi
 	done
 elif [ ${DEBIANLIKE} -eq 0 ]; then
@@ -87,7 +91,7 @@ elif [ ${DEBIANLIKE} -eq 0 ]; then
 		GOTDEP=$(dpkg --list | grep "${DEP}" >/dev/null 2>&1; echo $?)
 		if [ ${GOTDEP} -ne 0 ]; then
 			echo "not found"
-			NEEDDEPS="${NEEDDEPS} ${DEP}"
+			NEEDDEPS=( ${NEEDDEPS} ${DEP} )
 		fi
 	done
 else
@@ -104,7 +108,7 @@ else
 				exit 1;
 			else
 				echo "Attempting installation assuming dependencies are installed";
-				NEEDDEPS=""
+				unset NEEDDEPS
 				break;
 			fi
 		else
@@ -146,7 +150,7 @@ else
 								exit 1;
 							else
 								echo "Attempting installation assuming dependencies are installed"
-								NEEDDEPS=""
+								unset NEEDDEPS
 								break;
 							fi
 						else
@@ -157,7 +161,9 @@ else
 				else
 					echo "Installing dependencies..."
 					if [ ${REDHATLIKE} -eq 0 ]; then
-						yum install -y ${NEEDDEPS}
+						for DEP in "${NEEDDEPS[@]}"; do echo "${DEP}";
+							yum install -y ${DEP}
+						done
 						INSTALLOK=$?
 					elif [ ${DEBIANLIKE} -eq 0 ]; then
 						apt-get install -y ${NEEDDEPS}
diff --git a/scripts/Python/Install_root.sh b/scripts/Python/Install_root.sh
index 21a5df88..208d6f0f 100755
--- a/scripts/Python/Install_root.sh
+++ b/scripts/Python/Install_root.sh
@@ -69,7 +69,7 @@ if [ ${REDHATLIKE} -eq 0 ]; then
 	# trigger yum to update its metadata
 	echo "updating yum metadata..."
 	yum list installed >/dev/null 2>&1
-	DEPS=(wget git make gcc-c++ gcc binutils libX11-devel libXpm-devel libXft-devel libXext-devel python3 python3-devel openssl-devel fftw-devel libuuid-devel)
+	DEPS=(wget git make gcc-c++ gcc binutils libX11-devel libXpm-devel libXft-devel libXext-devel python3 python3-devel openssl-devel fftw-devel libuuid-devel patch)
 	# centos7 requires cmake3 from epel
 	RHVER=$(grep "VERSION_ID" /etc/os-release | cut -d\" -f2)
 	RHOLD=$(echo -e "8\n${RHVER}" | sort -V -C; echo $?)
@@ -118,7 +118,7 @@ else
 				exit 1;
 			else
 				echo "Attempting installation assuming dependencies are installed";
-				NEEDDEPS=""
+				unset NEEDDEPS
 				break;
 			fi
 		else
@@ -148,11 +148,11 @@ if [ $(which g++ &> /dev/null; echo $?) -eq 0 ]; then
 	fi
 fi
 
-if [ -z "${NEEDDEPS}" ]; then
+if [ -z "${NEEDDEPS[*]}" ]; then
 	echo "All system dependencies satisfied, continuing"
 else
 	echo "The following system dependencies were not found on your system"
-	echo "${NEEDDEPS}"
+	echo "${NEEDDEPS[*]}"
 	# if we're run as root, offer to install them
 	if [ "$(whoami)" == "root" ]; then
 		echo "Install these packages?"
@@ -236,8 +236,8 @@ rm -f root_v${ROOTVER}.source.tar.gz
 mkdir root_v${ROOTVER}   # install dir
 mkdir rootbuild          # build dir (temporary)
 cd rootbuild
-cmake3 ../root-${ROOTVER} -Dpyroot=ON -Dasimage=ON -Dgdml=ON -Dxml=ON -Dmt=ON -Dmathmore=ON -Dx11=ON -Dimt=ON -Dtmva=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -Dpythia6=ON -Dfftw3=ON -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/root_v${ROOTVER} #-DCMAKE_CXX_STANDARD=14
-#-Dgminimal=ON
+#cmake3 ../root-${ROOTVER} -Dpyroot=ON -Dasimage=ON -Dgdml=ON -Dxml=ON -Dmt=ON -Dmathmore=ON -Dx11=ON -Dimt=ON -Dtmva=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -Dpythia6=ON -Dfftw3=ON -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/root_v${ROOTVER} #-DCMAKE_CXX_STANDARD=14
+cmake3 ../root-${ROOTVER} -Dgminimal=ON -Dpyroot=ON -Dxrootd=OFF -Dbuiltin_xrootd=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/root_v${ROOTVER} -DCMAKE_CXX_STANDARD=20
 make -j$(nproc)
 make install
 cd ../
diff --git a/src/DAQInterface.cpp b/src/DAQInterface.cpp
index 497138c4..50b6f216 100644
--- a/src/DAQInterface.cpp
+++ b/src/DAQInterface.cpp
@@ -41,25 +41,25 @@ DAQInterface::~DAQInterface(){
 // Write Functions
 // ---------------
 
-bool DAQInterface::SendAlarm(const std::string& message, unsigned int level, const std::string& device, int64_t timestamp, const unsigned int timeout){
+bool DAQInterface::SendAlarm(const std::string& message, unsigned int level, const std::string& device, const uint64_t timestamp, const unsigned int timeout){
   
   return m_services->SendAlarm(message, level, device, timestamp, timeout);
   
 }
 
-bool DAQInterface::SendCalibrationData(const std::string& json_data, const std::string& description, const std::string& device, int64_t timestamp, int* version, const unsigned int timeout){
+bool DAQInterface::SendCalibrationData(const std::string& json_data, const std::string& description, const std::string& device, const uint64_t timestamp, int* version, const unsigned int timeout){
   
   return m_services->SendCalibrationData(json_data, description, device, timestamp, version, timeout);
   
 }
 
-bool DAQInterface::SendDeviceConfig(const std::string& json_data, const std::string& author, const std::string& description, const std::string& device, int64_t timestamp, int* version, const unsigned int timeout){
+bool DAQInterface::SendDeviceConfig(const std::string& json_data, const std::string& author, const std::string& description, const std::string& device, const uint64_t timestamp, int* version, const unsigned int timeout){
   
   return m_services->SendDeviceConfig(json_data, author, description, device, timestamp, version, timeout);
   
 }
 
-bool DAQInterface::SendRunConfig(const std::string& json_data, const std::string& name, const std::string& author, const std::string& description, int64_t timestamp, int* version, const unsigned int timeout){
+bool DAQInterface::SendRunConfig(const std::string& json_data, const std::string& name, const std::string& author, const std::string& description, const uint64_t timestamp, int* version, const unsigned int timeout){
   
   return m_services->SendRunConfig(json_data, name, author, description, timestamp, version, timeout);
   
@@ -69,12 +69,18 @@ bool DAQInterface::SendRunConfig(const std::string& json_data, const std::string
 // Read Functions
 // --------------
 
-bool DAQInterface::GetCalibrationData(std::string& json_data, int version, const std::string& device, const unsigned int timeout){
+bool DAQInterface::GetCalibrationData(std::string& json_data, int& version, const std::string& device, const unsigned int timeout){
   
   return m_services->GetCalibrationData(json_data, version, device, timeout);
   
 }
 
+bool DAQInterface::GetCalibrationData(std::string& json_data, int&& version, const std::string& device, const unsigned int timeout){
+
+  return m_services->GetCalibrationData(json_data, version, device, timeout);
+  
+}
+
 bool DAQInterface::GetDeviceConfig(std::string& json_data, int version, const std::string& device, const unsigned int timeout){
   
   return m_services->GetDeviceConfig(json_data, version, device, timeout);
@@ -105,34 +111,46 @@ bool DAQInterface::GetDeviceConfigFromRunConfig(std::string& json_data, const st
   
 }
 
-bool DAQInterface::GetROOTplot(const std::string& plot_name, int& version, std::string& draw_options, std::string& json_data, std::string* timestamp, const unsigned int timeout){
+bool DAQInterface::GetROOTplot(const std::string& plot_name, std::string& draw_options, std::string& json_data, int& version, const unsigned int timeout){
+  
+  return m_services->GetROOTplot(plot_name, draw_options, json_data, version, timeout);
+  
+}
+
+bool DAQInterface::GetROOTplot(const std::string& plot_name, std::string& draw_options, std::string& json_data, int&& version, const unsigned int timeout){
   
+  return m_services->GetROOTplot(plot_name, draw_options, json_data, version, timeout);
   
-  return m_services->GetROOTplot(plot_name, version, draw_options, json_data, timestamp, timeout);
+}
+
+bool DAQInterface::GetPlotlyPlot(const std::string& name, std::string& trace, std::string& layout, int& version, unsigned int timeout) {
+
+  return m_services->GetPlotlyPlot(name, trace, layout, version, timeout);
   
 }
 
-bool DAQInterface::GetPlotlyPlot(const std::string& name, int& version, std::string& trace, std::string& layout, unsigned int* timestamp, unsigned int timeout) {
+bool DAQInterface::GetPlotlyPlot(const std::string& name, std::string& trace, std::string& layout, int&& version, unsigned int timeout) {
 
-  return m_services->GetPlotlyPlot(name, version, trace, layout, timestamp, timeout);
+  return m_services->GetPlotlyPlot(name, trace, layout, version, timeout);
+  
 }
 
-bool DAQInterface::SQLQuery(const std::string& database, const std::string& query, std::vector<std::string>& responses, const unsigned int timeout){
+bool DAQInterface::SQLQuery(/*const std::string& database,*/ const std::string& query, std::vector<std::string>& responses, const unsigned int timeout){
   
   
-  return m_services->SQLQuery(database, query, responses, timeout);
+  return m_services->SQLQuery(/*database,*/ query, responses, timeout);
   
 }
 
-bool DAQInterface::SQLQuery(const std::string& database, const std::string& query, std::string& response, const unsigned int timeout){
+bool DAQInterface::SQLQuery(/*const std::string& database,*/ const std::string& query, std::string& response, const unsigned int timeout){
   
   
-  return m_services->SQLQuery(database, query, response, timeout);
+  return m_services->SQLQuery(/*database,*/ query, response, timeout);
 }
 
-bool DAQInterface::SQLQuery(const std::string& database, const std::string& query, const unsigned int timeout){
+bool DAQInterface::SQLQuery(/*const std::string& database,*/ const std::string& query, const unsigned int timeout){
   
-  return m_services->SQLQuery(database, query, timeout);
+  return m_services->SQLQuery(/*database,*/ query, timeout);
   
 }
 
@@ -140,45 +158,45 @@ bool DAQInterface::SQLQuery(const std::string& database, const std::string& quer
 // Multicast Senders
 // -----------------
 
-bool DAQInterface::SendLog(const std::string& message, unsigned int severity, const std::string& device, int64_t timestamp){
+bool DAQInterface::SendLog(const std::string& message, unsigned int severity, const std::string& device, const uint64_t timestamp){
     
   return m_services->SendLog(message, severity, device, timestamp);
   
 }
 
-bool DAQInterface::SendMonitoringData(const std::string& json_data, const std::string& subject, const std::string& device, int64_t timestamp){
-  
+bool DAQInterface::SendMonitoringData(const std::string& json_data, const std::string& subject, const std::string& device, const uint64_t timestamp){
   
   return m_services->SendMonitoringData(json_data, subject, device, timestamp);
   
 }
 
-// wrapper to send a root plot either to a temporary table or a persistent one
-bool DAQInterface::SendROOTplot(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, bool persistent, int* version, const int64_t timestamp, const unsigned int timeout){
-  if(!persistent) return SendTemporaryROOTplot(plot_name, draw_options, json_data, version, timestamp);
-  return SendPersistentROOTplot(plot_name, draw_options, json_data, version, timestamp, timeout);
+// wrapper to send a root plot either over multicast or zmq
+bool DAQInterface::SendROOTplot(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, bool acknowledged, const uint64_t timestamp, const unsigned int lifetime, const unsigned int timeout){
+  if(!acknowledged) return SendROOTplotMulticast(plot_name, draw_options, json_data, lifetime, timestamp);
+  return SendROOTplotZmq(plot_name, draw_options, json_data, nullptr, timestamp, lifetime, timeout);
 }
 
-// send to persistent table over TCP
-bool DAQInterface::SendPersistentROOTplot(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, int* version, const int64_t timestamp, const unsigned int timeout){
+// send over zmq
+bool DAQInterface::SendROOTplotZmq(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, int* version, const uint64_t timestamp, const unsigned int lifetime, const unsigned int timeout){
   
-  return m_services->SendPersistentROOTplot(plot_name, draw_options, json_data, version, timestamp, timeout);
+  return m_services->SendROOTplotZmq(plot_name, draw_options, json_data, version, timestamp, lifetime, timeout);
   
 }
 
-// send to temporary table over multicast
-bool DAQInterface::SendTemporaryROOTplot(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, int* version, const int64_t timestamp){
+// send over multicast
+bool DAQInterface::SendROOTplotMulticast(const std::string& plot_name, const std::string& draw_options, const std::string& json_data, const unsigned int lifetime, const uint64_t timestamp){
   
-  return m_services->SendTemporaryROOTplot(plot_name, draw_options, json_data, version, timestamp);
+  return m_services->SendROOTplotMulticast(plot_name, draw_options, json_data, lifetime, timestamp);
   
 }
 
-bool DAQInterface::SendPlotlyPlot(const std::string& name, const std::string& trace, const std::string& layout, int* version, unsigned int timestamp, unsigned int timeout) {
-  return m_services->SendPlotlyPlot(name, trace, layout, version, timestamp, timeout);
+// FIXME for now plotlyplots always go over zmq
+bool DAQInterface::SendPlotlyPlot(const std::string& name, const std::string& trace, const std::string& layout, int* version, const uint64_t timestamp, const unsigned int lifetime, unsigned int timeout) {
+  return m_services->SendPlotlyPlot(name, trace, layout, version, timestamp, lifetime, timeout);
 }
 
-bool DAQInterface::SendPlotlyPlot(const std::string& name, const std::vector<std::string>& traces, const std::string& layout, int* version, unsigned int timestamp, unsigned int timeout) {
-  return m_services->SendPlotlyPlot(name, traces, layout, version, timestamp, timeout);
+bool DAQInterface::SendPlotlyPlot(const std::string& name, const std::vector<std::string>& traces, const std::string& layout, int* version, const uint64_t timestamp, const unsigned int lifetime, unsigned int timeout) {
+  return m_services->SendPlotlyPlot(name, traces, layout, version, timestamp, lifetime, timeout);
 }
 
 // ===========================================================================