diff --git a/controls/tmx.json.states.ctl b/controls/tmx.json.states.ctl
new file mode 100644
index 0000000000000000000000000000000000000000..8f1a789b024007d16191c42c1b24a3a5969bc2e7
Binary files /dev/null and b/controls/tmx.json.states.ctl differ
diff --git a/documentation/JSON commands.txt b/documentation/JSON commands.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1945fcda09f7a022509bdcc17069b010a2161221
--- /dev/null
+++ b/documentation/JSON commands.txt	
@@ -0,0 +1,15 @@
+Opvragen alle data
+{"Command":"Read.CVT"}
+
+Errors opvragen en wissen
+{"Command":"Read.Errors"}
+{"Command":"Clear.Errors"}
+
+Wijzigen recept
+{"Command":"Write.Recipe","Recipe":[[1,0,11],[0,0,12],[2,0,13],[1,0,14]]}
+
+Wijzigen actief kanaal
+{"Command":"Write.ActChannel","Act. channel":5}
+
+Dump debug info
+{"Command":"Debug"}
\ No newline at end of file
diff --git a/modules/tmx.CVT.vi b/modules/tmx.CVT.vi
index 33b553109a94e09ed476f3aba36b43c0148f4a4f..b5c47f1865ba89456dd605a7bafafd137b9e9b58 100644
Binary files a/modules/tmx.CVT.vi and b/modules/tmx.CVT.vi differ
diff --git a/modules/tmx.ET.vi b/modules/tmx.ET.vi
index cf3d60e964c4cbb164b775c6ce279ff4c825fafc..f390c011348b69d3694866552ac75662e0b565ef 100644
Binary files a/modules/tmx.ET.vi and b/modules/tmx.ET.vi differ
diff --git a/modules/tmx.hw.cRIO.vi b/modules/tmx.hw.cRIO.vi
index da47ec363bdbf5c850a11504e05f6b808a037505..30b2ade59253334374d2142769e0486c5bcab922 100644
Binary files a/modules/tmx.hw.cRIO.vi and b/modules/tmx.hw.cRIO.vi differ
diff --git a/modules/tmx.json.clear.errors.vi b/modules/tmx.json.clear.errors.vi
new file mode 100644
index 0000000000000000000000000000000000000000..b2d937a6b8807573ee07c3614bab4a8e1ea0fb68
Binary files /dev/null and b/modules/tmx.json.clear.errors.vi differ
diff --git a/modules/tmx.json.command.vi b/modules/tmx.json.command.vi
new file mode 100644
index 0000000000000000000000000000000000000000..482595b6baa6ac3349add1247492b91f40dd6061
Binary files /dev/null and b/modules/tmx.json.command.vi differ
diff --git a/modules/tmx.json.read.cvt.vi b/modules/tmx.json.read.cvt.vi
new file mode 100644
index 0000000000000000000000000000000000000000..ed5a0ffe3697e04e4469c79d390ce85b14b9d0b6
Binary files /dev/null and b/modules/tmx.json.read.cvt.vi differ
diff --git a/modules/tmx.json.read.errors.vi b/modules/tmx.json.read.errors.vi
new file mode 100644
index 0000000000000000000000000000000000000000..8f0411eae87c3bf1006aedff0314f24a285f985a
Binary files /dev/null and b/modules/tmx.json.read.errors.vi differ
diff --git a/modules/tmx.json.write.actchannel.vi b/modules/tmx.json.write.actchannel.vi
new file mode 100644
index 0000000000000000000000000000000000000000..684904265db442099089b443ec1390e9c4a020e1
Binary files /dev/null and b/modules/tmx.json.write.actchannel.vi differ
diff --git a/modules/tmx.json.write.recipe.vi b/modules/tmx.json.write.recipe.vi
new file mode 100644
index 0000000000000000000000000000000000000000..1f0db8bf47bc0980eb0731bacf3ad2d96419c760
Binary files /dev/null and b/modules/tmx.json.write.recipe.vi differ
diff --git a/modules/tmx.network.dcp.vi b/modules/tmx.network.dcp.vi
index 8f19886ad21734935cebd099193fc2242e26fd2d..e8ecd61a1e6559bf6788bbd08ca8b68cc14e7f59 100644
Binary files a/modules/tmx.network.dcp.vi and b/modules/tmx.network.dcp.vi differ
diff --git a/modules/tmx.network.debug.vi b/modules/tmx.network.debug.vi
index 5faa45419823affac338204da2370e5eeb063855..4355de67d498bca3bddebce0571f2d2e8f7c62b7 100644
Binary files a/modules/tmx.network.debug.vi and b/modules/tmx.network.debug.vi differ
diff --git a/modules/tmx.network.json.vi b/modules/tmx.network.json.vi
new file mode 100644
index 0000000000000000000000000000000000000000..50c1122174aeb7bb7a33e12f1582d68f69b41651
Binary files /dev/null and b/modules/tmx.network.json.vi differ
diff --git a/modules/tmx.server.afp.vi b/modules/tmx.server.afp.vi
index b7142f24eadbab78228ea7e1c1c696378ce76ca9..0c48e34dd440f770e799c12b5bd08ff1b56fc959 100644
Binary files a/modules/tmx.server.afp.vi and b/modules/tmx.server.afp.vi differ
diff --git a/modules/tmx.server.json.vi b/modules/tmx.server.json.vi
new file mode 100644
index 0000000000000000000000000000000000000000..293b8c6b6d70b11fb546d793b086929f386ed6e7
Binary files /dev/null and b/modules/tmx.server.json.vi differ
diff --git a/modules/tmx.sysinfo.collect.vi b/modules/tmx.sysinfo.collect.vi
index 5d75a13883eab331826da06129e29d2128d45456..8dd98d7a381cadb3fa58e3072b202ba7515c3796 100644
Binary files a/modules/tmx.sysinfo.collect.vi and b/modules/tmx.sysinfo.collect.vi differ
diff --git a/test/cvt.json.read test.vi b/test/cvt.json.read test.vi
new file mode 100644
index 0000000000000000000000000000000000000000..3871f643ae8d32cc37280a2f6f50093518da2199
Binary files /dev/null and b/test/cvt.json.read test.vi differ
diff --git a/test/debug query - stress test.vi b/test/debug query - stress test.vi
deleted file mode 100644
index 5ce75aeb7d57444422d2c09f6c0f51947fd8a019..0000000000000000000000000000000000000000
Binary files a/test/debug query - stress test.vi and /dev/null differ
diff --git a/test/system info test.vi b/test/system info test.vi
deleted file mode 100644
index 12c503f0c476cc1dba145b0747111c29db2ca1fa..0000000000000000000000000000000000000000
Binary files a/test/system info test.vi and /dev/null differ
diff --git a/test/tmx.debug-tool.vi b/test/tmx.debug-tool.vi
deleted file mode 100644
index bf235b4ea1d84f3863a78411bd4c632a06626f49..0000000000000000000000000000000000000000
Binary files a/test/tmx.debug-tool.vi and /dev/null differ
diff --git a/test/websocket/websocket client test.vi b/test/websocket/websocket client test.vi
new file mode 100644
index 0000000000000000000000000000000000000000..6c3e9444d28054a84c9b295e1b524921f702b09c
Binary files /dev/null and b/test/websocket/websocket client test.vi differ
diff --git a/test/websocket/websocket json client loop test.vi b/test/websocket/websocket json client loop test.vi
new file mode 100644
index 0000000000000000000000000000000000000000..31771049b4ddccb06fba00bdf43d1facf60cb027
Binary files /dev/null and b/test/websocket/websocket json client loop test.vi differ
diff --git a/test/websocket/websocket server test.vi b/test/websocket/websocket server test.vi
new file mode 100644
index 0000000000000000000000000000000000000000..c1bb0f5b9cecefcf2dc9b0eaeceb1ed9d7227834
Binary files /dev/null and b/test/websocket/websocket server test.vi differ
diff --git a/tumux.iak b/tumux.iak
index edb00cc029f9acf043e5b812d07d44da240d9a73..0df3d47669e2e8f40b921e7bac186460fab92c4d 100644
Binary files a/tumux.iak and b/tumux.iak differ
diff --git a/tumux.lvlps b/tumux.lvlps
index 2321cef83fea3cd38e04af9d02dfe45a17f1032c..69e81f973d414dc94ab78d47093b5bdd909c031b 100644
--- a/tumux.lvlps
+++ b/tumux.lvlps
@@ -1,5 +1,5 @@
 [ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "175,1989,1078,2416"
+ProjectExplorer.ClassicPosition[String] = "166,1933,1069,2360"
 
 [AB_Cache_{0756750E-B4E8-4BF3-82A3-64077D79CBC8}]
 Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{0756"
diff --git a/tumux.lvproj b/tumux.lvproj
index e84d0257dfe9058c716c3835cca2c560cec22f12..9999139ea9c6089c41f29a3e45250555f090bc0a 100644
Binary files a/tumux.lvproj and b/tumux.lvproj differ
diff --git a/tumux.vi b/tumux.vi
index d6567c1fafe48aaf279d8d66e05649373d7071c8..5fccf7b80da0d8b2d4c9b9af78522b7048b0c38b 100644
Binary files a/tumux.vi and b/tumux.vi differ