diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob
new file mode 100644
index 0000000000000000000000000000000000000000..d0488e0559b432bdb1f7f4d2101dd80b6ff98fea
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob
@@ -0,0 +1,1184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : Overview</name>
+  <class></class>
+  <macros>
+    <sectName>CWM-CWS05</sectName>
+  </macros>
+  <width>2080</width>
+  <height>1150</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2080</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>Water Skid : $(sectName) - Overview</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1100</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_4</name>
+    <x>20</x>
+    <y>310</y>
+    <width>400</width>
+    <height>280</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_4</name>
+    <text>System</text>
+    <x>20</x>
+    <y>310</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <x>40</x>
+    <y>360</y>
+    <width>360</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Alarms:</text>
+    <x>50</x>
+    <y>370</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update</name>
+    <pv_name>$(sectName)::Alarm</pv_name>
+    <x>150</x>
+    <y>370</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_1</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName)::Cmd_ResetAlarms</pv_name>
+        <value>1</value>
+        <description>Reset</description>
+      </action>
+    </actions>
+    <text>Reset</text>
+    <x>330</x>
+    <y>370</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>40</x>
+    <y>460</y>
+    <width>360</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <text>Status:</text>
+    <x>50</x>
+    <y>470</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(sectName)::SystemStatus</pv_name>
+    <x>150</x>
+    <y>470</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>40</x>
+    <y>520</y>
+    <width>280</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>DC Supply:</text>
+    <x>50</x>
+    <y>530</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_2</name>
+    <pv_name>$(sectName)::PowerSupplyStatus</pv_name>
+    <x>150</x>
+    <y>530</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_3</name>
+    <pv_name>$(sectName)::Trip</pv_name>
+    <x>150</x>
+    <y>410</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_3</name>
+    <text>TRIP Present:</text>
+    <x>50</x>
+    <y>410</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_5</name>
+    <x>20</x>
+    <y>610</y>
+    <width>400</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_5</name>
+    <text>Pump</text>
+    <x>20</x>
+    <y>610</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>40</x>
+    <y>660</y>
+    <width>360</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>Status:</text>
+    <x>50</x>
+    <y>670</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>$(sectName):WtrC-P-510:Status</pv_name>
+    <x>150</x>
+    <y>670</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_5</name>
+    <pv_name>$(sectName):WtrC-P-510:ActualSpeed</pv_name>
+    <x>150</x>
+    <y>710</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>Speed:</text>
+    <x>50</x>
+    <y>710</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_6</name>
+    <x>20</x>
+    <y>790</y>
+    <width>400</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_6</name>
+    <text>Conductivities</text>
+    <x>20</x>
+    <y>790</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>40</x>
+    <y>840</y>
+    <width>360</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_15</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>850</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_7</name>
+    <pv_name>$(sectName):WtrC-CT-513:Cond_MeasValue</pv_name>
+    <x>150</x>
+    <y>850</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_16</name>
+    <text>Setpoint:</text>
+    <x>50</x>
+    <y>890</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_9</name>
+    <pv_name>$(sectName):WtrC-CT-513:Setpoint</pv_name>
+    <x>150</x>
+    <y>890</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>TemperatureGroup</name>
+    <x>1260</x>
+    <y>70</y>
+    <width>390</width>
+    <height>480</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>GroupBackground</name>
+      <width>390</width>
+      <height>480</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>GroupTitle</name>
+      <text>Temperatures</text>
+      <width>390</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="WHITE" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-565</DevName>
+        <subScreen>../Sub/TT565_575.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>110</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_1</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-575</DevName>
+        <subScreen>../Sub/TT565_575.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>170</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_3</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-546</DevName>
+        <subScreen>../Sub/TT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>350</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_4</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-536</DevName>
+        <subScreen>../Sub/TT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>290</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_5</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-526</DevName>
+        <subScreen>../Sub/TT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>230</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_6</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-556</DevName>
+        <subScreen>../Sub/TT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>410</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_2</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-514</DevName>
+        <subScreen>../Sub/TT514.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>50</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>PressuresGroup</name>
+    <x>850</x>
+    <y>70</y>
+    <width>390</width>
+    <height>540</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>GroupBackground_1</name>
+      <width>390</width>
+      <height>540</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>GroupTitle_1</name>
+      <text>Pressures</text>
+      <width>390</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="WHITE" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_7</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-566</DevName>
+        <subScreen>../Sub/PT566_577.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>110</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_8</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-577</DevName>
+        <subScreen>../Sub/PT566_577.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>170</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_9</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-501</DevName>
+        <subScreen>../Sub/PT501.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>230</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_11</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-525</DevName>
+        <subScreen>../Sub/PT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>290</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_12</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-535</DevName>
+        <subScreen>../Sub/PT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>350</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_13</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-545</DevName>
+        <subScreen>../Sub/PT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>410</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_14</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-555</DevName>
+        <subScreen>../Sub/PT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>470</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_10</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-511</DevName>
+        <subScreen>../Sub/PT511.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>50</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>ValvesGroup</name>
+    <x>1670</x>
+    <y>70</y>
+    <width>390</width>
+    <height>490</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>GroupBackground_2</name>
+      <width>390</width>
+      <height>490</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_15</name>
+      <file>../99-Shared/Embedded/YCV.bob</file>
+      <macros>
+        <DevName>WtrC-YCV-568</DevName>
+        <subScreen>../Sub/YCV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>50</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>GroupTitle_2</name>
+      <text>Valves</text>
+      <width>390</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="WHITE" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_16</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-572</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>120</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_17</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-528</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>180</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_18</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-538</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>240</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_19</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-548</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>300</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_20</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-558</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>360</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_21</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-596</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>420</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>FlowsGroup</name>
+    <x>440</x>
+    <y>70</y>
+    <width>390</width>
+    <height>480</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>GroupBackground_3</name>
+      <width>390</width>
+      <height>480</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_22</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-576</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>110</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>GroupTitle_3</name>
+      <text>Flows</text>
+      <width>390</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="WHITE" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_24</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-595</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>170</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_25</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-527</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>230</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_26</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-537</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>290</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_27</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-547</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>350</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_28</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-557</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>410</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_23</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-515</DevName>
+        <subScreen>../Sub/FT515.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>50</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>../99-Shared/Sub/CT.bob</file>
+        <macros>
+          <DevName>WtrC-CT-513</DevName>
+        </macros>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>330</x>
+    <y>865</y>
+    <width>60</width>
+    <height>40</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_2</name>
+    <actions>
+      <action type="open_display">
+        <file>../99-Shared/Sub/P.bob</file>
+        <macros>
+          <DevName>WtrC-P-510</DevName>
+        </macros>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>330</x>
+    <y>685</y>
+    <width>60</width>
+    <height>40</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_3</name>
+    <actions>
+      <action type="open_display">
+        <file>../99-Shared/Sub/SYS.bob</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>330</x>
+    <y>530</y>
+    <width>70</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>20</x>
+    <y>970</y>
+    <width>400</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>PLC</text>
+    <x>20</x>
+    <y>970</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>40</x>
+    <y>1020</y>
+    <width>360</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_4</name>
+    <actions>
+      <action type="open_display">
+        <file>../99-Shared/Sub/PLC.bob</file>
+        <macros>
+          <DevName>Ctrl-PLC-001</DevName>
+        </macros>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>330</x>
+    <y>1045</y>
+    <width>60</width>
+    <height>40</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>iGotHeartbeat:</text>
+    <x>50</x>
+    <y>1030</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>iKickAlive:</text>
+    <x>50</x>
+    <y>1070</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):Ctrl-PLC-001:iGotHeartbeat</pv_name>
+    <x>180</x>
+    <y>1030</y>
+    <width>140</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):Ctrl-PLC-001:iKickAlive</pv_name>
+    <x>180</x>
+    <y>1070</y>
+    <width>140</width>
+    <height>30</height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_24</name>
+    <x>20</x>
+    <y>70</y>
+    <width>400</width>
+    <height>220</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_24</name>
+    <text>IOC</text>
+    <x>20</x>
+    <y>70</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_31</name>
+    <x>40</x>
+    <y>180</y>
+    <width>360</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_39</name>
+    <pv_name>$(sectName):Ctrl-IOC-001:MEM_USED</pv_name>
+    <x>170</x>
+    <y>190</y>
+    <width>220</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_234</name>
+    <text>Memory Used:</text>
+    <x>50</x>
+    <y>190</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_40</name>
+    <pv_name>$(sectName):Ctrl-IOC-001:MEM_FREE</pv_name>
+    <x>170</x>
+    <y>230</y>
+    <width>220</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_235</name>
+    <text>Free Memory:</text>
+    <x>50</x>
+    <y>230</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_33</name>
+    <x>40</x>
+    <y>120</y>
+    <width>360</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_238</name>
+    <text>Hostname:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_43</name>
+    <pv_name>$(sectName):Ctrl-IOC-001:HOSTNAME</pv_name>
+    <x>170</x>
+    <y>130</y>
+    <width>220</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/FT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/FT.bob
new file mode 100644
index 0000000000000000000000000000000000000000..93bc984c5771155a6c1e0f157f133289059a52dd
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/FT.bob
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>FT embedded</name>
+  <class></class>
+  <width>350</width>
+  <height>50</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <width>350</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>$(DevName):</text>
+    <x>10</x>
+    <y>10</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(sectName):$(DevName):Flow_MeasValue</pv_name>
+    <x>140</x>
+    <y>10</y>
+    <width>130</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>$(subScreen)</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>280</x>
+    <y>10</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/PT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/PT.bob
new file mode 100644
index 0000000000000000000000000000000000000000..20434a1d36715b8a83294beb9381416d2f6fb7b7
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/PT.bob
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>PT embedded</name>
+  <class></class>
+  <width>350</width>
+  <height>50</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <width>350</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>$(DevName):</text>
+    <x>10</x>
+    <y>10</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(sectName):$(DevName):Press_MeasValue</pv_name>
+    <x>140</x>
+    <y>10</y>
+    <width>130</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>$(subScreen)</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>280</x>
+    <y>10</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/TT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/TT.bob
new file mode 100644
index 0000000000000000000000000000000000000000..d71da65c555c38cc53e1bf3aeb890ddbd84b4c82
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/TT.bob
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TT embedded</name>
+  <class></class>
+  <width>350</width>
+  <height>50</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <width>350</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>$(DevName):</text>
+    <x>10</x>
+    <y>10</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(sectName):$(DevName):Temp_MeasValue</pv_name>
+    <x>140</x>
+    <y>10</y>
+    <width>130</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>$(subScreen)</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>280</x>
+    <y>10</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YCV.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YCV.bob
new file mode 100644
index 0000000000000000000000000000000000000000..e8f403c240666261275b01b5f870c43a25af2ae9
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YCV.bob
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>YCV embedded</name>
+  <class></class>
+  <width>350</width>
+  <height>50</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <width>350</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>$(DevName):</text>
+    <x>10</x>
+    <y>10</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(sectName):$(DevName):OpeningPosition</pv_name>
+    <x>140</x>
+    <y>10</y>
+    <width>130</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>$(subScreen)</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>280</x>
+    <y>10</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YSV.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YSV.bob
new file mode 100644
index 0000000000000000000000000000000000000000..ad669a1f724e80feccf2a8f484c536ef659fdbb3
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YSV.bob
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>YCV embedded</name>
+  <class></class>
+  <width>350</width>
+  <height>50</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <width>350</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>$(DevName):</text>
+    <x>10</x>
+    <y>10</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(sectName):$(DevName):Status</pv_name>
+    <x>140</x>
+    <y>10</y>
+    <width>130</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>$(subScreen)</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>280</x>
+    <y>10</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/CT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/CT.bob
new file mode 100644
index 0000000000000000000000000000000000000000..4f06e31a5bdc84cef3aba6ea9fe92417ee780287
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/CT.bob
@@ -0,0 +1,583 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : CT</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>610</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>670</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_6</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_6</name>
+    <text>Conductivities</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_15</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_7</name>
+    <pv_name>$(sectName):$(DevName):Cond_MeasValue</pv_name>
+    <x>150</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_16</name>
+    <text>Setpoint:</text>
+    <x>50</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_9</name>
+    <pv_name>$(sectName):$(DevName):Setpoint</pv_name>
+    <x>150</x>
+    <y>170</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>370</x>
+    <y>250</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>250</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>390</x>
+    <y>300</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_18</name>
+    <text>HI:</text>
+    <x>400</x>
+    <y>310</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>HIHI:</text>
+    <x>400</x>
+    <y>350</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>$(sectName):$(DevName):HI</pv_name>
+    <x>460</x>
+    <y>315</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <pv_name>$(sectName):$(DevName):HIHI</pv_name>
+    <x>460</x>
+    <y>355</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>310</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_21</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>350</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+    <x>570</x>
+    <y>310</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+    <x>570</x>
+    <y>350</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_9</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_9</name>
+    <text>Parameters</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_26</name>
+    <text>Threshold:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName):$(DevName):Threshold</pv_name>
+    <x>520</x>
+    <y>130</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_27</name>
+    <text>SP Deadband:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_16</name>
+    <pv_name>$(sectName):$(DevName):Setpoint_DeadBand</pv_name>
+    <x>520</x>
+    <y>170</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_10</name>
+    <x>20</x>
+    <y>250</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_10</name>
+    <text>Scales</text>
+    <x>20</x>
+    <y>250</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_19</name>
+    <x>40</x>
+    <y>300</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_28</name>
+    <text>Maximum:</text>
+    <x>50</x>
+    <y>310</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_17</name>
+    <pv_name>$(sectName):$(DevName):Scale_Max</pv_name>
+    <x>170</x>
+    <y>310</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_29</name>
+    <text>Minimum:</text>
+    <x>50</x>
+    <y>350</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_18</name>
+    <pv_name>$(sectName):$(DevName):Scale_Min</pv_name>
+    <x>170</x>
+    <y>350</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_11</name>
+    <x>20</x>
+    <y>430</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_11</name>
+    <text>Calibration</text>
+    <x>20</x>
+    <y>430</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_20</name>
+    <x>40</x>
+    <y>480</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_30</name>
+    <text>High:</text>
+    <x>50</x>
+    <y>490</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_19</name>
+    <pv_name>$(sectName):$(DevName):Calib_High</pv_name>
+    <x>170</x>
+    <y>490</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_31</name>
+    <text>Low:</text>
+    <x>50</x>
+    <y>530</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_20</name>
+    <pv_name>$(sectName):$(DevName):Calib_Low</pv_name>
+    <x>170</x>
+    <y>530</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>370</x>
+    <y>430</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>IO Status</text>
+    <x>370</x>
+    <y>430</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>390</x>
+    <y>480</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Error:</text>
+    <x>400</x>
+    <y>490</y>
+    <width>70</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>480</x>
+    <y>495</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT.bob
new file mode 100644
index 0000000000000000000000000000000000000000..7b7b9b771400ec20069efc73619057578845e490
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT.bob
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : FT</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>390</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_5</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_5</name>
+    <text>Status</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>Flow:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>$(sectName):$(DevName):Flow_MeasValue</pv_name>
+    <x>180</x>
+    <y>130</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_5</name>
+    <pv_name>$(sectName):$(DevName):Temp_MeasValue</pv_name>
+    <x>180</x>
+    <y>170</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_6</name>
+    <text>Temperature:</text>
+    <x>50</x>
+    <y>170</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>20</x>
+    <y>250</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>IO Status</text>
+    <x>20</x>
+    <y>250</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>40</x>
+    <y>300</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Error:</text>
+    <x>50</x>
+    <y>310</y>
+    <width>70</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>130</x>
+    <y>315</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>LO:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_24</name>
+    <text>LOLO:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName):$(DevName):LO</pv_name>
+    <x>460</x>
+    <y>135</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName):$(DevName):LOLO</pv_name>
+    <x>460</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_25</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>130</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_26</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>170</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT515.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT515.bob
new file mode 100644
index 0000000000000000000000000000000000000000..75d806ca0cb502078cfcfee7a9b4457f019ef278
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT515.bob
@@ -0,0 +1,509 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : FT515</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>570</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_5</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_5</name>
+    <text>Status</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>Flow:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>$(sectName):$(DevName):Flow_MeasValue</pv_name>
+    <x>180</x>
+    <y>130</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_5</name>
+    <pv_name>$(sectName):$(DevName):Temp_MeasValue</pv_name>
+    <x>180</x>
+    <y>170</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_6</name>
+    <text>Temperature:</text>
+    <x>50</x>
+    <y>170</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>370</x>
+    <y>250</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>Faults</text>
+    <x>370</x>
+    <y>250</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>390</x>
+    <y>300</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>IO Error:</text>
+    <x>400</x>
+    <y>310</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>530</x>
+    <y>315</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>LO:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_24</name>
+    <text>LOLO:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName):$(DevName):LO</pv_name>
+    <x>460</x>
+    <y>135</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName):$(DevName):LOLO</pv_name>
+    <x>460</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_25</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>130</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_26</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>170</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_6</name>
+    <x>20</x>
+    <y>250</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_6</name>
+    <text>Limits</text>
+    <x>20</x>
+    <y>250</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_14</name>
+    <x>40</x>
+    <y>300</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_5</name>
+    <text>Max:</text>
+    <x>50</x>
+    <y>310</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_6</name>
+    <pv_name>$(sectName):$(DevName):Flow_Max</pv_name>
+    <x>180</x>
+    <y>310</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_7</name>
+    <pv_name>$(sectName):$(DevName):Flow_Min</pv_name>
+    <x>180</x>
+    <y>350</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>Min:</text>
+    <x>50</x>
+    <y>350</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_27</name>
+    <text>Pump Flow:</text>
+    <x>400</x>
+    <y>350</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>530</x>
+    <y>355</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>20</x>
+    <y>430</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>40</x>
+    <y>480</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Flow Discrepancy</text>
+    <x>20</x>
+    <y>430</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_29</name>
+    <text>Status:</text>
+    <x>50</x>
+    <y>490</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_8</name>
+    <pv_name>$(sectName):$(DevName):Flow_Discr</pv_name>
+    <x>180</x>
+    <y>490</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(sectName):$(DevName):Flow_Discrepancy</pv_name>
+    <x>140</x>
+    <y>495</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob
new file mode 100644
index 0000000000000000000000000000000000000000..b6e82834f72bd5932f8a16afe8b3ad95b8d9fc51
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : P</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>2260</width>
+  <height>1350</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1100</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1000</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_5</name>
+    <x>20</x>
+    <y>70</y>
+    <width>400</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_5</name>
+    <text>Overview</text>
+    <x>20</x>
+    <y>70</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>40</x>
+    <y>120</y>
+    <width>360</width>
+    <height>130</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>Status:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>$(sectName):$(DevName):Status</pv_name>
+    <x>190</x>
+    <y>130</y>
+    <width>200</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_5</name>
+    <pv_name>$(sectName):$(DevName):ActualSpeed</pv_name>
+    <x>190</x>
+    <y>170</y>
+    <width>200</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>Speed:</text>
+    <x>50</x>
+    <y>170</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):OperatingHours</pv_name>
+    <x>190</x>
+    <y>210</y>
+    <width>130</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_15</name>
+    <text>Operating hours:</text>
+    <x>50</x>
+    <y>210</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_6</name>
+    <x>440</x>
+    <y>70</y>
+    <width>240</width>
+    <height>280</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_6</name>
+    <text>Faults</text>
+    <x>440</x>
+    <y>70</y>
+    <width>240</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_14</name>
+    <x>460</x>
+    <y>120</y>
+    <width>200</width>
+    <height>210</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_16</name>
+    <text>Inverter:</text>
+    <x>470</x>
+    <y>130</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_17</name>
+    <text>Flow:</text>
+    <x>470</x>
+    <y>170</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_18</name>
+    <text>Current Overload:</text>
+    <x>470</x>
+    <y>210</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>$(sectName):$(DevName):InverterFault</pv_name>
+    <x>610</x>
+    <y>135</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <pv_name>$(sectName):$(DevName):FlowFault</pv_name>
+    <x>610</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):BasePressureFault</pv_name>
+    <x>610</x>
+    <y>215</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName):$(DevName):CurrentOverload</pv_name>
+    <x>610</x>
+    <y>255</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>Base pressure:</text>
+    <x>470</x>
+    <y>250</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>Base pressure low:</text>
+    <x>470</x>
+    <y>290</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName):$(DevName):CurrentOverload</pv_name>
+    <x>610</x>
+    <y>295</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>20</x>
+    <y>290</y>
+    <width>400</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>40</x>
+    <y>340</y>
+    <width>360</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Manual</text>
+    <x>20</x>
+    <y>290</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_21</name>
+    <text>Speed Control P:</text>
+    <x>50</x>
+    <y>350</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):ManSpeedCtrlP</pv_name>
+    <x>180</x>
+    <y>350</y>
+    <height>30</height>
+    <format>0</format>
+    <show_units>true</show_units>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName):$(DevName):Cmd_StartManually</pv_name>
+        <value>1</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Start</text>
+    <x>40</x>
+    <y>400</y>
+    <width>170</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_1</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName):$(DevName):Cmd_StopManually</pv_name>
+        <value>1</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Stop</text>
+    <x>230</x>
+    <y>400</y>
+    <width>170</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_8</name>
+    <x>20</x>
+    <y>470</y>
+    <width>400</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_8</name>
+    <text>Speed Settings</text>
+    <x>20</x>
+    <y>470</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>40</x>
+    <y>520</y>
+    <width>360</width>
+    <height>130</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Stp Pressure:</text>
+    <x>50</x>
+    <y>530</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Text Update_14</name>
+    <pv_name>$(sectName):$(DevName):SpeedStpPressure</pv_name>
+    <x>180</x>
+    <y>530</y>
+    <height>30</height>
+    <format>0</format>
+    <show_units>true</show_units>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName):$(DevName):SpeedStpFlow</pv_name>
+    <x>180</x>
+    <y>570</y>
+    <height>30</height>
+    <format>0</format>
+    <show_units>true</show_units>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>Stp Flow:</text>
+    <x>50</x>
+    <y>570</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_24</name>
+    <text>Control Method:</text>
+    <x>50</x>
+    <y>610</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="combo" version="2.0.0">
+    <name>Text Update_16</name>
+    <pv_name>$(sectName):$(DevName):SpeedCtrlMethod</pv_name>
+    <x>180</x>
+    <y>610</y>
+    <background_color>
+      <color name="Write_Background" red="224" green="217" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_2</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName):$(DevName):Cmd_ResetOpHours</pv_name>
+        <value>1</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Reset</text>
+    <x>330</x>
+    <y>210</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_17</name>
+    <pv_name>$(sectName):$(DevName):SpeedStpPressure-RB</pv_name>
+    <x>290</x>
+    <y>530</y>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_18</name>
+    <pv_name>$(sectName):$(DevName):SpeedStpFlow-RB</pv_name>
+    <x>290</x>
+    <y>570</y>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_19</name>
+    <pv_name>$(sectName):$(DevName):SpeedCtrlMethod-RB</pv_name>
+    <x>290</x>
+    <y>610</y>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_20</name>
+    <pv_name>$(sectName):$(DevName):ManSpeedCtrlP-RB</pv_name>
+    <x>290</x>
+    <y>350</y>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PLC.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PLC.bob
new file mode 100644
index 0000000000000000000000000000000000000000..dbe2fe44e765c7c8b3fb490b6a99b0aaae3fdc3f
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PLC.bob
@@ -0,0 +1,730 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : PLC</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>1280</width>
+  <height>620</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_15</name>
+    <x>860</x>
+    <y>70</y>
+    <width>400</width>
+    <height>490</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_20</name>
+    <x>880</x>
+    <y>90</y>
+    <width>360</width>
+    <height>450</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_14</name>
+    <x>440</x>
+    <y>70</y>
+    <width>400</width>
+    <height>530</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_19</name>
+    <x>460</x>
+    <y>90</y>
+    <width>360</width>
+    <height>490</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>20</x>
+    <y>70</y>
+    <width>400</width>
+    <height>530</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1280</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName) PLC</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1240</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>40</x>
+    <y>90</y>
+    <width>360</width>
+    <height>490</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update</name>
+    <pv_name>$(sectName):$(DevName):iCalcConn</pv_name>
+    <x>240</x>
+    <y>100</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(sectName):$(DevName):iCheckHash</pv_name>
+    <x>240</x>
+    <y>140</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_2</name>
+    <pv_name>$(sectName):$(DevName):PLCAddrS</pv_name>
+    <x>240</x>
+    <y>180</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_3</name>
+    <pv_name>$(sectName):$(DevName):iS7AddrS</pv_name>
+    <x>240</x>
+    <y>220</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>$(sectName):$(DevName):iGotHeartbeat</pv_name>
+    <x>240</x>
+    <y>260</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_5</name>
+    <pv_name>$(sectName):$(DevName):iKickAlive</pv_name>
+    <x>240</x>
+    <y>300</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_6</name>
+    <pv_name>$(sectName):$(DevName):iInitUploadStat</pv_name>
+    <x>240</x>
+    <y>340</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_7</name>
+    <pv_name>$(sectName):$(DevName):UploadStatR</pv_name>
+    <x>240</x>
+    <y>380</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_8</name>
+    <pv_name>$(sectName):$(DevName):iCommsHashToPLC</pv_name>
+    <x>240</x>
+    <y>420</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_9</name>
+    <pv_name>$(sectName):$(DevName):CommsHashToPLCS</pv_name>
+    <x>240</x>
+    <y>460</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_10</name>
+    <pv_name>$(sectName):$(DevName):HeartbeatToPLCS</pv_name>
+    <x>240</x>
+    <y>500</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):iSetPLCAddrS</pv_name>
+    <x>240</x>
+    <y>540</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):UploadParametersS</pv_name>
+    <x>660</x>
+    <y>100</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):_UploadParamS1-FO</pv_name>
+    <x>660</x>
+    <y>140</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_14</name>
+    <pv_name>$(sectName):$(DevName):iTwo</pv_name>
+    <x>660</x>
+    <y>180</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName):$(DevName):iOne</pv_name>
+    <x>660</x>
+    <y>220</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_17</name>
+    <pv_name>$(sectName):$(DevName):ModbusConnectedR</pv_name>
+    <x>660</x>
+    <y>260</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_18</name>
+    <pv_name>$(sectName):$(DevName):S7ConnectedR</pv_name>
+    <x>660</x>
+    <y>300</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_19</name>
+    <pv_name>$(sectName):$(DevName):ConnectedR</pv_name>
+    <x>660</x>
+    <y>340</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_20</name>
+    <pv_name>$(sectName):$(DevName):PLCHashCorrectR</pv_name>
+    <x>660</x>
+    <y>380</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_21</name>
+    <pv_name>$(sectName):$(DevName):AliveR</pv_name>
+    <x>660</x>
+    <y>420</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_22</name>
+    <pv_name>$(sectName):$(DevName):CommsOK</pv_name>
+    <x>660</x>
+    <y>460</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_23</name>
+    <pv_name>$(sectName):$(DevName):iHeartbeatToPLC</pv_name>
+    <x>660</x>
+    <y>500</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_24</name>
+    <pv_name>$(sectName):$(DevName):iDoneUploadStat</pv_name>
+    <x>660</x>
+    <y>540</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_25</name>
+    <pv_name>$(sectName):$(DevName):ModVersionR</pv_name>
+    <x>1080</x>
+    <y>100</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_26</name>
+    <pv_name>$(sectName):$(DevName):PLCFCommitR</pv_name>
+    <x>1080</x>
+    <y>140</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_27</name>
+    <pv_name>$(sectName):$(DevName):PLCAddr-RB</pv_name>
+    <x>1080</x>
+    <y>180</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_28</name>
+    <pv_name>$(sectName):$(DevName):ModbusAddr-RB</pv_name>
+    <x>1080</x>
+    <y>220</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_29</name>
+    <pv_name>$(sectName):$(DevName):S7Addr-RB</pv_name>
+    <x>1080</x>
+    <y>260</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_30</name>
+    <pv_name>$(sectName):$(DevName):CommsHashFromPLCR</pv_name>
+    <x>1080</x>
+    <y>300</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_31</name>
+    <pv_name>$(sectName):$(DevName):HeartbeatFromPLCR</pv_name>
+    <x>1080</x>
+    <y>340</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_32</name>
+    <pv_name>$(sectName):$(DevName):iAsyn</pv_name>
+    <x>1080</x>
+    <y>380</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_33</name>
+    <pv_name>$(sectName):$(DevName):iPLCAddr-RB</pv_name>
+    <x>1080</x>
+    <y>420</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_34</name>
+    <pv_name>$(sectName):$(DevName):iCalcS7AddrS</pv_name>
+    <x>1080</x>
+    <y>460</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_35</name>
+    <pv_name>$(sectName):$(DevName):iCalcModbusAddrS</pv_name>
+    <x>1080</x>
+    <y>500</y>
+    <width>150</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>iCalcConn:</text>
+    <x>50</x>
+    <y>100</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <text>iCheckHash:</text>
+    <x>50</x>
+    <y>140</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>PLCAddrS:</text>
+    <x>50</x>
+    <y>180</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_3</name>
+    <text>iS7AddrS:</text>
+    <x>50</x>
+    <y>220</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>iGotHeartbeat:</text>
+    <x>50</x>
+    <y>260</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_5</name>
+    <text>iKickAlive:</text>
+    <x>50</x>
+    <y>300</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_6</name>
+    <text>iInitUploadStat:</text>
+    <x>50</x>
+    <y>340</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>UploadStatR:</text>
+    <x>50</x>
+    <y>380</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_8</name>
+    <text>iCommsHashToPLC:</text>
+    <x>50</x>
+    <y>420</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_9</name>
+    <text>CommsHashToPLCS:</text>
+    <x>50</x>
+    <y>460</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_10</name>
+    <text>HeartbeatToPLCS:</text>
+    <x>50</x>
+    <y>500</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_11</name>
+    <text>iSetPLCAddrS:</text>
+    <x>50</x>
+    <y>540</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_12</name>
+    <text>UploadParametersS:</text>
+    <x>470</x>
+    <y>100</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_13</name>
+    <text>_UploadParamS1-FO:</text>
+    <x>470</x>
+    <y>140</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_14</name>
+    <text>iTwo:</text>
+    <x>470</x>
+    <y>180</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_15</name>
+    <text>iOne:</text>
+    <x>470</x>
+    <y>220</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_16</name>
+    <text>ModbusConnectedR:</text>
+    <x>470</x>
+    <y>260</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_17</name>
+    <text>S7ConnectedR:</text>
+    <x>470</x>
+    <y>300</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_18</name>
+    <text>ConnectedR:</text>
+    <x>470</x>
+    <y>340</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>PLCHashCorrectR:</text>
+    <x>470</x>
+    <y>380</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>AliveR:</text>
+    <x>470</x>
+    <y>420</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_21</name>
+    <text>CommsOK:</text>
+    <x>470</x>
+    <y>460</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>iHeartbeatToPLC:</text>
+    <x>470</x>
+    <y>500</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>iDoneUploadStat:</text>
+    <x>470</x>
+    <y>540</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_24</name>
+    <text>ModVersionR:</text>
+    <x>890</x>
+    <y>100</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_25</name>
+    <text>PLCFCommitR:</text>
+    <x>890</x>
+    <y>140</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_26</name>
+    <text>PLCAddr-RB:</text>
+    <x>890</x>
+    <y>180</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_27</name>
+    <text>ModbusAddr-RB:</text>
+    <x>890</x>
+    <y>220</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_28</name>
+    <text>S7Addr-RB:</text>
+    <x>890</x>
+    <y>260</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_29</name>
+    <text>CommsHashFromPLCR:</text>
+    <x>890</x>
+    <y>300</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_30</name>
+    <text>HeartbeatFromPLCR:</text>
+    <x>890</x>
+    <y>340</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_31</name>
+    <text>iAsyn:</text>
+    <x>890</x>
+    <y>380</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_32</name>
+    <text>iPLCAddr-RB:</text>
+    <x>890</x>
+    <y>420</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_33</name>
+    <text>iCalcS7AddrS:</text>
+    <x>890</x>
+    <y>460</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_34</name>
+    <text>iCalcModbusAddrS:</text>
+    <x>890</x>
+    <y>500</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT.bob
new file mode 100644
index 0000000000000000000000000000000000000000..e1d30332fa07eeb1d0a69aefa2237c209e432d8a
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT.bob
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : PT</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>350</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_18</name>
+    <text>HI:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>HIHI:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>130</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_21</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>170</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>IO Status</text>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>40</x>
+    <y>260</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Error:</text>
+    <x>50</x>
+    <y>270</y>
+    <width>70</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>130</x>
+    <y>275</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Pressure</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):Press_MeasValue</pv_name>
+    <x>150</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>$(sectName):$(DevName):HI</pv_name>
+    <x>460</x>
+    <y>135</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <pv_name>$(sectName):$(DevName):HIHI</pv_name>
+    <x>460</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT501.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT501.bob
new file mode 100644
index 0000000000000000000000000000000000000000..4cb4b269ac1eb7e70264cfbefd60754c06328c1d
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT501.bob
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : PT501</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>350</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_18</name>
+    <text>LO:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>LOLO:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>130</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_21</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>170</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>IO Status</text>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>40</x>
+    <y>260</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Error:</text>
+    <x>50</x>
+    <y>270</y>
+    <width>70</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>130</x>
+    <y>275</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Pressure</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):Press_MeasValue</pv_name>
+    <x>150</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName):$(DevName):LO</pv_name>
+    <x>460</x>
+    <y>135</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName):$(DevName):LOLO</pv_name>
+    <x>460</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT511.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT511.bob
new file mode 100644
index 0000000000000000000000000000000000000000..5dc479391fc3b19d122a30b93c28c2822840ac1d
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT511.bob
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : PT511</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>450</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>260</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_18</name>
+    <text>HI:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>HIHI:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>130</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_21</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>170</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>20</x>
+    <y>310</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>IO Status</text>
+    <x>20</x>
+    <y>310</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>40</x>
+    <y>360</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Error:</text>
+    <x>50</x>
+    <y>370</y>
+    <width>70</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>130</x>
+    <y>375</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>220</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Pressure</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):Press_MeasValue</pv_name>
+    <x>150</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>$(sectName):$(DevName):HI</pv_name>
+    <x>460</x>
+    <y>135</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <pv_name>$(sectName):$(DevName):HIHI</pv_name>
+    <x>460</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_19</name>
+    <x>390</x>
+    <y>220</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_24</name>
+    <text>LO:</text>
+    <x>400</x>
+    <y>230</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_25</name>
+    <text>LOLO:</text>
+    <x>400</x>
+    <y>270</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_26</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>230</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_27</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>270</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_14</name>
+    <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+    <x>570</x>
+    <y>230</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+    <x>570</x>
+    <y>270</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName):$(DevName):LO</pv_name>
+    <x>460</x>
+    <y>235</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName):$(DevName):LOLO</pv_name>
+    <x>460</x>
+    <y>275</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_20</name>
+    <x>40</x>
+    <y>180</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_28</name>
+    <text>Maximum:</text>
+    <x>50</x>
+    <y>190</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_16</name>
+    <pv_name>$(sectName):$(DevName):Pressure_Max</pv_name>
+    <x>150</x>
+    <y>190</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_17</name>
+    <pv_name>$(sectName):$(DevName):Pressure_Min</pv_name>
+    <x>150</x>
+    <y>230</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_29</name>
+    <text>Minimum:</text>
+    <x>50</x>
+    <y>230</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT566_577.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT566_577.bob
new file mode 100644
index 0000000000000000000000000000000000000000..6d38bd4f087dc464080acc0291bde94045e43d1b
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT566_577.bob
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : PT566 577</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>350</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>260</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_18</name>
+    <text>HI:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>HIHI:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>130</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_21</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>170</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>IO Status</text>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>40</x>
+    <y>260</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Error:</text>
+    <x>50</x>
+    <y>270</y>
+    <width>70</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>130</x>
+    <y>275</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Pressure</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):Press_MeasValue</pv_name>
+    <x>150</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>$(sectName):$(DevName):HI</pv_name>
+    <x>460</x>
+    <y>135</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <pv_name>$(sectName):$(DevName):HIHI</pv_name>
+    <x>460</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_19</name>
+    <x>390</x>
+    <y>220</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_24</name>
+    <text>LO:</text>
+    <x>400</x>
+    <y>230</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_25</name>
+    <text>LOLO:</text>
+    <x>400</x>
+    <y>270</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_26</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>230</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_27</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>270</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_14</name>
+    <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+    <x>570</x>
+    <y>230</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+    <x>570</x>
+    <y>270</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName):$(DevName):LO</pv_name>
+    <x>460</x>
+    <y>235</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName):$(DevName):LOLO</pv_name>
+    <x>460</x>
+    <y>275</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/SYS.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/SYS.bob
new file mode 100644
index 0000000000000000000000000000000000000000..00ac355073731324d4d8681742b1482afad53d36
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/SYS.bob
@@ -0,0 +1,1478 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : Sys</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>2010</width>
+  <height>880</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>20</x>
+    <y>70</y>
+    <width>400</width>
+    <height>380</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_22</name>
+    <x>40</x>
+    <y>380</y>
+    <width>360</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_14</name>
+    <x>1700</x>
+    <y>70</y>
+    <width>290</width>
+    <height>560</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_14</name>
+    <text>Faults</text>
+    <x>1700</x>
+    <y>70</y>
+    <width>290</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2010</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName) System</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1000</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Status Overview</text>
+    <x>20</x>
+    <y>70</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>40</x>
+    <y>120</y>
+    <width>360</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_39</name>
+    <text>Alarms:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName)::Alarm</pv_name>
+    <x>150</x>
+    <y>130</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_1</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName)::Cmd_ResetAlarms</pv_name>
+        <value>1</value>
+        <description>Reset</description>
+      </action>
+    </actions>
+    <text>Reset</text>
+    <x>330</x>
+    <y>130</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_19</name>
+    <x>40</x>
+    <y>220</y>
+    <width>360</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_40</name>
+    <text>Status:</text>
+    <x>50</x>
+    <y>230</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_14</name>
+    <pv_name>$(sectName)::SystemStatus</pv_name>
+    <x>150</x>
+    <y>230</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_20</name>
+    <x>40</x>
+    <y>280</y>
+    <width>360</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_41</name>
+    <text>DC Supply:</text>
+    <x>50</x>
+    <y>290</y>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName)::PowerSupplyStatus</pv_name>
+    <x>160</x>
+    <y>290</y>
+    <width>230</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_16</name>
+    <pv_name>$(sectName)::Trip</pv_name>
+    <x>150</x>
+    <y>170</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_42</name>
+    <text>TRIP Present:</text>
+    <x>50</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_21</name>
+    <x>1720</x>
+    <y>120</y>
+    <width>250</width>
+    <height>490</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_78</name>
+    <text>Battery Status:</text>
+    <x>50</x>
+    <y>330</y>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_111</name>
+    <text>Phase fail:</text>
+    <x>1730</x>
+    <y>130</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_112</name>
+    <text>DC Power Supply fault:</text>
+    <x>1730</x>
+    <y>170</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_113</name>
+    <text>PSU Overload fault:</text>
+    <x>1730</x>
+    <y>210</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_114</name>
+    <text>Battery fault:</text>
+    <x>1730</x>
+    <y>250</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_115</name>
+    <text>Battery Low Voltage:</text>
+    <x>1730</x>
+    <y>290</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_116</name>
+    <text>Sensor fault:</text>
+    <x>1730</x>
+    <y>330</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_117</name>
+    <text>Device fault:</text>
+    <x>1730</x>
+    <y>370</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_118</name>
+    <text>Flow / Level fault:</text>
+    <x>1730</x>
+    <y>410</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_119</name>
+    <text>Water quality fault:</text>
+    <x>1730</x>
+    <y>450</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_120</name>
+    <text>Pressure fault:</text>
+    <x>1730</x>
+    <y>490</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_121</name>
+    <text>Temperatur fault:</text>
+    <x>1730</x>
+    <y>530</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_122</name>
+    <text>Pump 1 Alarm:</text>
+    <x>1730</x>
+    <y>570</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName)::Phase</pv_name>
+    <x>1920</x>
+    <y>135</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName)::PSUStatus</pv_name>
+    <x>1920</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(sectName)::PSUOVerload</pv_name>
+    <x>1920</x>
+    <y>215</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(sectName)::BatteryStatus</pv_name>
+    <x>1920</x>
+    <y>255</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_7</name>
+    <pv_name>$(sectName)::BatteryVoltage</pv_name>
+    <x>1920</x>
+    <y>295</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_8</name>
+    <pv_name>$(sectName)::SensorFault</pv_name>
+    <x>1920</x>
+    <y>335</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_9</name>
+    <pv_name>$(sectName)::DeviceFault</pv_name>
+    <x>1920</x>
+    <y>375</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_10</name>
+    <pv_name>$(sectName)::FlowLevelFault</pv_name>
+    <x>1920</x>
+    <y>415</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_11</name>
+    <pv_name>$(sectName)::WaterQualityFault</pv_name>
+    <x>1920</x>
+    <y>455</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_12</name>
+    <pv_name>$(sectName)::PressureFault</pv_name>
+    <x>1920</x>
+    <y>495</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_13</name>
+    <pv_name>$(sectName)::TemperatureFault</pv_name>
+    <x>1920</x>
+    <y>535</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_14</name>
+    <pv_name>$(sectName)::PumpFault</pv_name>
+    <x>1920</x>
+    <y>575</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_17</name>
+    <pv_name>$(sectName)::UPSBatteryStatus</pv_name>
+    <x>160</x>
+    <y>330</y>
+    <width>230</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_211</name>
+    <text>System on AUTO from HMI:</text>
+    <x>50</x>
+    <y>390</y>
+    <width>200</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_2</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName)::Cmd_StopSystemAuto</pv_name>
+        <value>1</value>
+        <description>Start</description>
+      </action>
+    </actions>
+    <text>Start</text>
+    <x>260</x>
+    <y>390</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_3</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName)::Cmd_StopSystemAuto</pv_name>
+        <value>1</value>
+        <description>Stop</description>
+      </action>
+    </actions>
+    <text>Stop</text>
+    <x>330</x>
+    <y>390</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_16</name>
+    <x>20</x>
+    <y>470</y>
+    <width>400</width>
+    <height>390</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_23</name>
+    <x>40</x>
+    <y>520</y>
+    <width>360</width>
+    <height>320</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_16</name>
+    <text>Load Settings</text>
+    <x>20</x>
+    <y>470</y>
+    <width>401</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="bool_button" version="2.0.0">
+    <name>Boolean Button</name>
+    <pv_name>$(sectName)::EnableLoadDT</pv_name>
+    <x>290</x>
+    <y>530</y>
+  </widget>
+  <widget type="bool_button" version="2.0.0">
+    <name>Boolean Button_1</name>
+    <pv_name>$(sectName)::EnableLoadDTCounter</pv_name>
+    <x>290</x>
+    <y>580</y>
+  </widget>
+  <widget type="bool_button" version="2.0.0">
+    <name>Boolean Button_2</name>
+    <pv_name>$(sectName)::EnableLoadStatus</pv_name>
+    <x>290</x>
+    <y>630</y>
+  </widget>
+  <widget type="bool_button" version="2.0.0">
+    <name>Boolean Button_3</name>
+    <pv_name>$(sectName)::EnableLoad_CH1</pv_name>
+    <x>290</x>
+    <y>680</y>
+  </widget>
+  <widget type="bool_button" version="2.0.0">
+    <name>Boolean Button_4</name>
+    <pv_name>$(sectName)::EnableLoad_CH2</pv_name>
+    <x>290</x>
+    <y>720</y>
+  </widget>
+  <widget type="bool_button" version="2.0.0">
+    <name>Boolean Button_5</name>
+    <pv_name>$(sectName)::EnableLoad_CH3</pv_name>
+    <x>290</x>
+    <y>760</y>
+  </widget>
+  <widget type="bool_button" version="2.0.0">
+    <name>Boolean Button_6</name>
+    <pv_name>$(sectName)::EnableLoad_CH4</pv_name>
+    <x>290</x>
+    <y>800</y>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_87</name>
+    <text>Enable Load - Include Channel 4:</text>
+    <x>50</x>
+    <y>800</y>
+    <width>230</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_86</name>
+    <text>Enable Load - Include Channel 3:</text>
+    <x>50</x>
+    <y>760</y>
+    <width>230</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_85</name>
+    <text>Enable Load - Include Channel 2:</text>
+    <x>50</x>
+    <y>720</y>
+    <width>230</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_84</name>
+    <text>Enable Load - Include Channel 1:</text>
+    <x>50</x>
+    <y>680</y>
+    <width>230</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_83</name>
+    <text>Remote Output - Enable Load:</text>
+    <x>50</x>
+    <y>630</y>
+    <width>230</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_82</name>
+    <text>Enable load timer Counter SECS:</text>
+    <x>50</x>
+    <y>580</y>
+    <width>230</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_81</name>
+    <text>Enable Load Time Delay:</text>
+    <x>50</x>
+    <y>530</y>
+    <width>230</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_17</name>
+    <x>1700</x>
+    <y>650</y>
+    <width>289</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_17</name>
+    <text>Sounder</text>
+    <x>1700</x>
+    <y>650</y>
+    <width>290</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_24</name>
+    <x>1720</x>
+    <y>700</y>
+    <width>249</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_5</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName)::Cmd_DisableSound</pv_name>
+        <value>1</value>
+        <description>Disable</description>
+      </action>
+    </actions>
+    <text>Disable</text>
+    <x>1860</x>
+    <y>710</y>
+    <width>90</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_4</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName)::Cmd_EnableSound</pv_name>
+        <value>1</value>
+        <description>Enable</description>
+      </action>
+    </actions>
+    <text>Enable</text>
+    <x>1740</x>
+    <y>710</y>
+    <width>90</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_18</name>
+    <x>440</x>
+    <y>70</y>
+    <width>400</width>
+    <height>240</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_25</name>
+    <x>460</x>
+    <y>120</y>
+    <width>360</width>
+    <height>170</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_18</name>
+    <text>Temp Ctrl Valve Retain</text>
+    <x>440</x>
+    <y>70</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_213</name>
+    <text>Gain:</text>
+    <x>470</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_18</name>
+    <pv_name>$(sectName)::PID_TCtrlValve_Kp</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_214</name>
+    <text>Ti:</text>
+    <x>470</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_19</name>
+    <pv_name>$(sectName)::PID_TCtrlValve_Ti</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_215</name>
+    <text>Td:</text>
+    <x>470</x>
+    <y>210</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_20</name>
+    <pv_name>$(sectName)::PID_TCtrlValve_Td</pv_name>
+    <x>570</x>
+    <y>210</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_21</name>
+    <pv_name>$(sectName)::PID_TCtrlValve_Cycle</pv_name>
+    <x>570</x>
+    <y>250</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_216</name>
+    <text>Cycle:</text>
+    <x>470</x>
+    <y>250</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_19</name>
+    <x>860</x>
+    <y>70</y>
+    <width>400</width>
+    <height>240</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_26</name>
+    <x>880</x>
+    <y>120</y>
+    <width>360</width>
+    <height>170</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_19</name>
+    <text>Pump Speed Flow Retain</text>
+    <x>860</x>
+    <y>70</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_217</name>
+    <text>Gain:</text>
+    <x>890</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_22</name>
+    <pv_name>$(sectName)::PID_FCtrlPump_Kp</pv_name>
+    <x>990</x>
+    <y>130</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_218</name>
+    <text>Ti:</text>
+    <x>890</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_23</name>
+    <pv_name>$(sectName)::PID_FCtrlPump_Ti</pv_name>
+    <x>990</x>
+    <y>170</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_219</name>
+    <text>Td:</text>
+    <x>890</x>
+    <y>210</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_24</name>
+    <pv_name>$(sectName)::PID_FCtrlPump_Td</pv_name>
+    <x>990</x>
+    <y>210</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_25</name>
+    <pv_name>$(sectName)::PID_FCtrlPump_Cycle</pv_name>
+    <x>990</x>
+    <y>250</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_220</name>
+    <text>Cycle:</text>
+    <x>890</x>
+    <y>250</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_20</name>
+    <x>1280</x>
+    <y>70</y>
+    <width>400</width>
+    <height>240</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_27</name>
+    <x>1300</x>
+    <y>120</y>
+    <width>360</width>
+    <height>170</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_20</name>
+    <text>Pump Speed Pressure Retain</text>
+    <x>1280</x>
+    <y>70</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_221</name>
+    <text>Gain:</text>
+    <x>1310</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_26</name>
+    <pv_name>$(sectName)::PID_PCtrlPump_Kp</pv_name>
+    <x>1410</x>
+    <y>130</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_222</name>
+    <text>Ti:</text>
+    <x>1310</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_27</name>
+    <pv_name>$(sectName)::PID_PCtrlPump_Ti</pv_name>
+    <x>1410</x>
+    <y>170</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_223</name>
+    <text>Td:</text>
+    <x>1310</x>
+    <y>210</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_28</name>
+    <pv_name>$(sectName)::PID_PCtrlPump_Td</pv_name>
+    <x>1410</x>
+    <y>210</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_29</name>
+    <pv_name>$(sectName)::PID_PCtrlPump_Cycle</pv_name>
+    <x>1410</x>
+    <y>250</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_224</name>
+    <text>Cycle:</text>
+    <x>1310</x>
+    <y>250</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_21</name>
+    <x>440</x>
+    <y>330</y>
+    <width>400</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_21</name>
+    <text>Temp Ctrl Valve</text>
+    <x>440</x>
+    <y>330</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_28</name>
+    <x>460</x>
+    <y>380</y>
+    <width>360</width>
+    <height>130</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_30</name>
+    <pv_name>$(sectName)::PID_TCtrlValve_Stp</pv_name>
+    <x>570</x>
+    <y>390</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_225</name>
+    <text>Setpoint:</text>
+    <x>470</x>
+    <y>390</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_31</name>
+    <pv_name>$(sectName)::PID_TCtrlValve_In</pv_name>
+    <x>570</x>
+    <y>430</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_226</name>
+    <text>Input:</text>
+    <x>470</x>
+    <y>430</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_32</name>
+    <pv_name>$(sectName)::PID_TCtrlValve_Out</pv_name>
+    <x>570</x>
+    <y>470</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_227</name>
+    <text>Output:</text>
+    <x>470</x>
+    <y>470</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_22</name>
+    <x>860</x>
+    <y>330</y>
+    <width>400</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_22</name>
+    <text>Pump Speed Flow</text>
+    <x>860</x>
+    <y>330</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_29</name>
+    <x>880</x>
+    <y>380</y>
+    <width>360</width>
+    <height>130</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_33</name>
+    <pv_name>$(sectName)::PID_FCtrlPump_Stp</pv_name>
+    <x>990</x>
+    <y>390</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_228</name>
+    <text>Setpoint:</text>
+    <x>890</x>
+    <y>390</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_34</name>
+    <pv_name>$(sectName)::PID_FCtrlPump_In</pv_name>
+    <x>990</x>
+    <y>430</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_229</name>
+    <text>Input:</text>
+    <x>890</x>
+    <y>430</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_35</name>
+    <pv_name>$(sectName)::PID_FCtrlPump_Out</pv_name>
+    <x>990</x>
+    <y>470</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_230</name>
+    <text>Output:</text>
+    <x>890</x>
+    <y>470</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_23</name>
+    <x>1280</x>
+    <y>330</y>
+    <width>400</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_23</name>
+    <text>Pump Speed Pressure</text>
+    <x>1280</x>
+    <y>330</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_30</name>
+    <x>1300</x>
+    <y>380</y>
+    <width>360</width>
+    <height>130</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_36</name>
+    <pv_name>$(sectName)::PID_PCtrlPump_Stp</pv_name>
+    <x>1410</x>
+    <y>390</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_231</name>
+    <text>Setpoint:</text>
+    <x>1310</x>
+    <y>390</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_37</name>
+    <pv_name>$(sectName)::PID_PCtrlPump_In</pv_name>
+    <x>1410</x>
+    <y>430</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_232</name>
+    <text>Input:</text>
+    <x>1310</x>
+    <y>430</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_38</name>
+    <pv_name>$(sectName)::PID_PCtrlPump_Out</pv_name>
+    <x>1410</x>
+    <y>470</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_233</name>
+    <text>Output:</text>
+    <x>1310</x>
+    <y>470</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT.bob
new file mode 100644
index 0000000000000000000000000000000000000000..bb7547eb4c5cbf5f5901d0931a25d138d8e53aa2
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT.bob
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : TT</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>350</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_18</name>
+    <text>HI:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>HIHI:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>$(sectName):$(DevName):HI</pv_name>
+    <x>460</x>
+    <y>135</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <pv_name>$(sectName):$(DevName):HIHI</pv_name>
+    <x>460</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>130</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_21</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>170</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>IO Status</text>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>40</x>
+    <y>260</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Error:</text>
+    <x>50</x>
+    <y>270</y>
+    <width>70</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>130</x>
+    <y>275</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Temperature</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):Temp_MeasValue</pv_name>
+    <x>150</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT514.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT514.bob
new file mode 100644
index 0000000000000000000000000000000000000000..a3f86a5eeacbd11f61d168e3d9ccbbdaa9afe551
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT514.bob
@@ -0,0 +1,581 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : TT514</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>570</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>370</x>
+    <y>350</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>IO Status</text>
+    <x>370</x>
+    <y>350</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>390</x>
+    <y>400</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Error:</text>
+    <x>400</x>
+    <y>410</y>
+    <width>70</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>480</x>
+    <y>415</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Temperature</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):Temp_MeasValue</pv_name>
+    <x>150</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_8</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>260</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_8</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_19</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_24</name>
+    <text>HI:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_25</name>
+    <text>HIHI:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_26</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>130</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_27</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>170</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_14</name>
+    <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName):$(DevName):HI</pv_name>
+    <x>460</x>
+    <y>135</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName):$(DevName):HIHI</pv_name>
+    <x>460</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_20</name>
+    <x>390</x>
+    <y>220</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_28</name>
+    <text>LO:</text>
+    <x>400</x>
+    <y>230</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_29</name>
+    <text>LOLO:</text>
+    <x>400</x>
+    <y>270</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_30</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>230</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_31</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>270</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_16</name>
+    <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+    <x>570</x>
+    <y>230</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_17</name>
+    <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+    <x>570</x>
+    <y>270</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(sectName):$(DevName):LO</pv_name>
+    <x>460</x>
+    <y>235</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(sectName):$(DevName):LOLO</pv_name>
+    <x>460</x>
+    <y>275</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>20</x>
+    <y>430</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>40</x>
+    <y>480</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Setpoint Discrepancy</text>
+    <x>20</x>
+    <y>430</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_32</name>
+    <text>Status:</text>
+    <x>50</x>
+    <y>490</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_8</name>
+    <pv_name>$(sectName):$(DevName):Setpoint_Discr</pv_name>
+    <x>180</x>
+    <y>490</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_7</name>
+    <pv_name>$(sectName):$(DevName):Setpoint_Discrepancy</pv_name>
+    <x>140</x>
+    <y>495</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_14</name>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_14</name>
+    <text>Outlet</text>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_21</name>
+    <x>40</x>
+    <y>260</y>
+    <width>290</width>
+    <height>130</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_33</name>
+    <text>Setpoint:</text>
+    <x>50</x>
+    <y>270</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_18</name>
+    <pv_name>$(sectName):$(DevName):Outlet_Setpoint</pv_name>
+    <x>150</x>
+    <y>270</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_34</name>
+    <text>Maximum:</text>
+    <x>50</x>
+    <y>310</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_19</name>
+    <pv_name>$(sectName):$(DevName):Outlet_Max</pv_name>
+    <x>150</x>
+    <y>310</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_35</name>
+    <text>Minimum:</text>
+    <x>50</x>
+    <y>350</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_20</name>
+    <pv_name>$(sectName):$(DevName):Outlet_Min</pv_name>
+    <x>150</x>
+    <y>350</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT565_575.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT565_575.bob
new file mode 100644
index 0000000000000000000000000000000000000000..cf96e7cfa6ffce11febd84315f857813d43482c8
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT565_575.bob
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : TT565 575</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>350</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_12</name>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_12</name>
+    <text>IO Status</text>
+    <x>20</x>
+    <y>210</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>40</x>
+    <y>260</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Error:</text>
+    <x>50</x>
+    <y>270</y>
+    <width>70</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(sectName):$(DevName):IO_Error</pv_name>
+    <x>130</x>
+    <y>275</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_13</name>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_13</name>
+    <text>Temperature</text>
+    <x>20</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>40</x>
+    <y>120</y>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_23</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):Temp_MeasValue</pv_name>
+    <x>150</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_8</name>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>260</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_8</name>
+    <text>Alarms</text>
+    <x>370</x>
+    <y>70</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_19</name>
+    <x>390</x>
+    <y>120</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_24</name>
+    <text>HI:</text>
+    <x>400</x>
+    <y>130</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_25</name>
+    <text>HIHI:</text>
+    <x>400</x>
+    <y>170</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_26</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>130</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_27</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>170</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_14</name>
+    <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+    <x>570</x>
+    <y>130</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+    <x>570</x>
+    <y>170</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName):$(DevName):HI</pv_name>
+    <x>460</x>
+    <y>135</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName):$(DevName):HIHI</pv_name>
+    <x>460</x>
+    <y>175</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_20</name>
+    <x>390</x>
+    <y>220</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_28</name>
+    <text>LO:</text>
+    <x>400</x>
+    <y>230</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_29</name>
+    <text>LOLO:</text>
+    <x>400</x>
+    <y>270</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_30</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>230</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_31</name>
+    <text>Limit:</text>
+    <x>500</x>
+    <y>270</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_16</name>
+    <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+    <x>570</x>
+    <y>230</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_17</name>
+    <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+    <x>570</x>
+    <y>270</y>
+    <width>90</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(sectName):$(DevName):LO</pv_name>
+    <x>460</x>
+    <y>235</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(sectName):$(DevName):LOLO</pv_name>
+    <x>460</x>
+    <y>275</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YCV.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YCV.bob
new file mode 100644
index 0000000000000000000000000000000000000000..cb39fd300841d17c3ac906472e8c6623a08c9647
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YCV.bob
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : YCV</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>720</width>
+  <height>530</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>370</x>
+    <y>170</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_6</name>
+    <x>20</x>
+    <y>170</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_5</name>
+    <x>20</x>
+    <y>60</y>
+    <width>680</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar_1</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>720</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title_1</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>40</x>
+    <y>80</y>
+    <width>640</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>Status:</text>
+    <x>60</x>
+    <y>90</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>$(sectName):$(DevName):OpeningPosition</pv_name>
+    <x>160</x>
+    <y>90</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_4</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName):$(DevName):Cmd_Close</pv_name>
+        <value>1</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Close</text>
+    <x>520</x>
+    <y>90</y>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_5</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName):$(DevName):Cmd_Open</pv_name>
+        <value>1</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Open</text>
+    <x>410</x>
+    <y>90</y>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>40</x>
+    <y>220</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>390</x>
+    <y>220</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_4</name>
+    <text>Manual Opening</text>
+    <x>20</x>
+    <y>170</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_5</name>
+    <text>Scales</text>
+    <x>370</x>
+    <y>170</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>Position:</text>
+    <x>50</x>
+    <y>230</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_8</name>
+    <text>Minimum:</text>
+    <x>400</x>
+    <y>270</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_9</name>
+    <text>Control:</text>
+    <x>50</x>
+    <y>270</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_10</name>
+    <text>Maximum:</text>
+    <x>400</x>
+    <y>230</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_10</name>
+    <x>370</x>
+    <y>350</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_11</name>
+    <x>20</x>
+    <y>350</y>
+    <width>330</width>
+    <height>160</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_14</name>
+    <x>40</x>
+    <y>400</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>390</x>
+    <y>400</y>
+    <width>290</width>
+    <height>90</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_6</name>
+    <text>Faults</text>
+    <x>20</x>
+    <y>350</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>Calibration</text>
+    <x>370</x>
+    <y>350</y>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_11</name>
+    <text>Opening:</text>
+    <x>50</x>
+    <y>410</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_12</name>
+    <text>Low:</text>
+    <x>400</x>
+    <y>450</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_13</name>
+    <text>Sensor:</text>
+    <x>50</x>
+    <y>450</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_14</name>
+    <text>High:</text>
+    <x>400</x>
+    <y>410</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_5</name>
+    <pv_name>$(sectName):$(DevName):ManualOpeningPos</pv_name>
+    <x>140</x>
+    <y>230</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_7</name>
+    <pv_name>$(sectName):$(DevName):OpeningCtrl</pv_name>
+    <x>140</x>
+    <y>270</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_10</name>
+    <pv_name>$(sectName):$(DevName):Calib_High</pv_name>
+    <x>490</x>
+    <y>410</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):$(DevName):Calib_Low</pv_name>
+    <x>490</x>
+    <y>450</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):OpeningFault</pv_name>
+    <x>140</x>
+    <y>410</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):SensorFault</pv_name>
+    <x>140</x>
+    <y>450</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_14</name>
+    <pv_name>$(sectName):$(DevName):Scale_Max-RB</pv_name>
+    <x>490</x>
+    <y>230</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName):$(DevName):Scale_Min-RB</pv_name>
+    <x>490</x>
+    <y>270</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YSV.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YSV.bob
new file mode 100644
index 0000000000000000000000000000000000000000..2d2765d0ffa02f8748575a307ea28e63f064e495
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YSV.bob
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : YSV</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>730</width>
+  <height>160</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_4</name>
+    <x>50</x>
+    <y>70</y>
+    <width>630</width>
+    <height>70</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>730</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>TS2 Water Skid : $(sectName):$(DevName)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>680</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <x>60</x>
+    <y>80</y>
+    <width>610</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_3</name>
+    <text>Status:</text>
+    <x>70</x>
+    <y>90</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_3</name>
+    <pv_name>$(sectName):$(DevName):Status</pv_name>
+    <x>170</x>
+    <y>90</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName):$(DevName):Cmd_Open</pv_name>
+        <value>1</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Open</text>
+    <x>420</x>
+    <y>90</y>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_1</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName):$(DevName):Cmd_Close</pv_name>
+        <value>1</value>
+        <description>Write PV</description>
+      </action>
+    </actions>
+    <text>Close</text>
+    <x>530</x>
+    <y>90</y>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+</display>