diff --git a/atSite/Archive.prj b/atSite/Archive.prj
index 30f4f4f..1b6c2b2 100644
Binary files a/atSite/Archive.prj and b/atSite/Archive.prj differ
diff --git a/atSite/RRF-MainWater-User-ATOM-CRDESKTOP.opt b/atSite/RRF-MainWater-User-ATOM-CRDESKTOP.opt
index f14b5bf..406844e 100644
Binary files a/atSite/RRF-MainWater-User-ATOM-CRDESKTOP.opt and b/atSite/RRF-MainWater-User-ATOM-CRDESKTOP.opt differ
diff --git a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo
index a10d180..fa48566 100644
Binary files a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo and b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo differ
diff --git a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo_guids b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo_guids
index 4543a9a..7ee1cd0 100644
Binary files a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo_guids and b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo_guids differ
diff --git a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.compileinfo b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.compileinfo
index 196051e..fa48566 100644
Binary files a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.compileinfo and b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.compileinfo differ
diff --git a/atSite/RRF-MainWater.Device.Application.xml b/atSite/RRF-MainWater.Device.Application.xml
index eaa995a..9c67043 100644
--- a/atSite/RRF-MainWater.Device.Application.xml
+++ b/atSite/RRF-MainWater.Device.Application.xml
@@ -6,157 +6,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -175,35 +59,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
@@ -222,551 +87,157 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
-
- Alarm logging and active alarm count
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
@@ -780,12 +251,6 @@
Pulse flow meter
-
- cistern level low limits.
-
-
- cistern level low limits.
-
Outflow
@@ -800,27 +265,6 @@
-
- Well control
-
-
- Well control
-
-
- Chemical Injection
-
-
- Fake VFD for well controller
-
-
- Well control
-
-
- Chemical Injection
-
-
- Fake VFD for well controller
-
diff --git a/atSite/RRF-MainWater.project b/atSite/RRF-MainWater.project
index c195afb..c832c03 100644
Binary files a/atSite/RRF-MainWater.project and b/atSite/RRF-MainWater.project differ
diff --git a/atSite/RRF-MainWater.~u b/atSite/RRF-MainWater.~u
deleted file mode 100644
index ad3a7f2..0000000
--- a/atSite/RRF-MainWater.~u
+++ /dev/null
@@ -1,4 +0,0 @@
-User
-ATOM-CRDESKTOP
-20500
-638978119996391959
diff --git a/atSite/RRF-MainWater_autosave.precompilecache b/atSite/RRF-MainWater_autosave.precompilecache
index e431699..3ec2f05 100644
Binary files a/atSite/RRF-MainWater_autosave.precompilecache and b/atSite/RRF-MainWater_autosave.precompilecache differ
diff --git a/atSite/RRF-MainWater_project.precompilecache b/atSite/RRF-MainWater_project.precompilecache
index efa4c4f..3827181 100644
Binary files a/atSite/RRF-MainWater_project.precompilecache and b/atSite/RRF-MainWater_project.precompilecache differ