Index: q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 422)
+++ q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 423)
@@ -214,5 +214,5 @@
                </sml:member>
                <sml:member name="">                  
-                  <sml:Document>
+                  <sml:Document gml:id="STANDARDS_METHODS">
                      <gml:description>Standard Methods for the Examination of Water and Wastewater (Ed. 1989)</gml:description>
                   </sml:Document>
@@ -230,5 +230,5 @@
                <gml:usesEngineeringDatum>
                   <gml:EngineeringDatum gml:id="SONDE_DATUM">
-                     <gml:datumName>Sonde Spatial Daturm</gml:datumName>
+                     <gml:datumName>Sonde Spatial Datum</gml:datumName>
                      <gml:anchorPoint>origin at the end of the housing for sensors; x and y are orthogonal to z and undetermined; z extends from end of housing.</gml:anchorPoint>
                   </gml:EngineeringDatum>
@@ -339,5 +339,4 @@
             </sml:OutputList>
          </sml:outputs>
-         
          <!--=======================-->
          <!-- Sonde Parameters      -->
@@ -354,5 +353,5 @@
                            <swe:constraint>
                               <swe:AllowedValues>
-                                 <swe:interval>0 90</swe:interval>  <!-- should this be -90=>90 -->
+                                 <swe:interval>-90 90</swe:interval>  
                               </swe:AllowedValues>
                            </swe:constraint>
@@ -414,6 +413,6 @@
             <sml:ComponentList>
                <!-- xxxx Add response time or latency to all parameters in each component -->
-               <sml:component name="Conductivity" xlink:role="urn:ogc:def:process:OGC:detector">
-                  <sml:Component gml:id="conductivity">
+               <sml:component name="conductivitySensor" xlink:role="urn:ogc:def:process:OGC:detector">
+                  <sml:Component gml:id="conductivitySensor">
                      <gml:description>YSI Conductivity Sensor</gml:description>
                      <sml:identification>
@@ -432,9 +431,43 @@
                      </sml:identification>
                      
+                     <sml:capabilities>
+                        <swe:DataRecord gml:id="conductivityCapabilities" fixed="true">
+                           <swe:field name="range">
+                              <swe:QuantityRange gml:id="conductivityRange" definition="http://mmisw.org/ont/ioos/.../dynamicRange">
+                                 <swe:uom code="mS/cm"/>
+                                 <swe:value>0 100</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="mS/cm"/>
+                                 <swe:value>0.0001</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="resolution">
+                              <swe:QuantityRange>
+                                 <swe:uom code="mS/cm"/>
+                                 <swe:value>0.001 0.1</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 30</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="max depth">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>200</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                        </swe:DataRecord>
+                     </sml:capabilities>
+                     
                      <sml:inputs>
                         <sml:InputList>
                            <sml:input name="conductivity">
-                              <swe:ObservableProperty
-                                 definition="http://mmisw.org/ont/ioos/parameter/conductivity"/>
+                              <swe:ObservableProperty definition="http://mmisw.org/ont/ioos/parameter/conductivity"/>
                            </sml:input>
                         </sml:InputList>
@@ -444,50 +477,16 @@
                         <sml:OutputList>
                            <sml:output name="conductivity">
-                              <swe:Quantity
-                                 definition="http://mmisw.org/ont/ioos/parameter/conductivity">
+                              <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/conductivity">
                                  <swe:uom code="mS/cm"/>
                               </swe:Quantity>
                            </sml:output>
+                           <!--                           <sml:output name="conductivityCapabilities" xlink:href="#conductivityCapabilities"/>-->
                         </sml:OutputList>
                      </sml:outputs>
                      
-                     <sml:parameters>
-                        <sml:ParameterList>
-                           <sml:parameter name="range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="mS/cm"/>
-                                 <swe:value>0 100</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="accuracy">
-                              <swe:Quantity>
-                                 <swe:uom code="mS/cm"/>
-                                 <swe:value>0.0001</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="resolution">
-                              <swe:QuantityRange>
-                                 <swe:uom code="mS/cm"/>
-                                 <swe:value>0.001 0.1</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="temperature range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>-5 30</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="max depth">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>200</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                        </sml:ParameterList>
-                     </sml:parameters>
                   </sml:Component>
                </sml:component>
-               <sml:component name="Temperature" xlink:role="urn:ogc:def:process:OGC:detector">
-                  <sml:Component gml:id="temperature">
+               <sml:component name="temperatureSensor" xlink:role="urn:ogc:def:process:OGC:detector">
+                  <sml:Component gml:id="temperatureSensor">
                      <gml:description>YSI Temperature Sensor</gml:description>
                      <sml:identification>
@@ -505,4 +504,33 @@
                         </sml:IdentifierList>
                      </sml:identification>
+                     
+                     <sml:capabilities>
+                        <swe:DataRecord gml:id="temperatureSensorCapabilities">
+                           <swe:field name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 50</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>0.15</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>0.01</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="max depth">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>200</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                        </swe:DataRecord>
+                     </sml:capabilities>
                      
                      <sml:inputs>
@@ -527,36 +555,8 @@
                      </sml:outputs>
                      
-                     <sml:parameters>
-                        <sml:ParameterList>
-                           <sml:parameter name="range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>-5 50</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="accuracy">
-                              <swe:Quantity>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>0.15</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="resolution">
-                              <swe:Quantity>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>0.01</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="max depth">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>200</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                        </sml:ParameterList>
-                     </sml:parameters>
                   </sml:Component>
                </sml:component>
-               <sml:component name="Salinity" xlink:role="urn:ogc:def:process:OGC:prcoess">
-                  <sml:ProcessModel gml:id="salinity">
+               <sml:component name="salinityProcess" xlink:role="urn:ogc:def:process:OGC:prcoess">
+                  <sml:ProcessModel gml:id="salinityProcess">
                      <gml:description>YSI Salinity Calculation</gml:description>
                      <sml:identification>
@@ -575,4 +575,41 @@
                      </sml:identification>
                      
+                     <sml:capabilities>
+                        <swe:DataRecord gml:id="salinityProcessCapabilities">
+                           <swe:field name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="ppt"/>
+                                 <swe:value>0 70</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="%"/>
+                                 <swe:value>1</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="ppt"/>
+                                 <swe:value>0.01</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 50</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="max depth">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>200</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                        </swe:DataRecord>
+                     </sml:capabilities>
+                     
+                     <sml:documentation xlink:href="#STANDARDS_METHODS"/>
+                     
                      <sml:inputs>
                         <sml:InputList>
@@ -608,44 +645,23 @@
                      </sml:outputs>
                      
-                     <sml:parameters>
-                        <sml:ParameterList>
-                           <sml:parameter name="range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="ppt"/>
-                                 <swe:value>0 70</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="accuracy">
-                              <swe:Quantity>
-                                 <swe:uom code="%"/>
-                                 <swe:value>1</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="resolution">
-                              <swe:Quantity>
-                                 <swe:uom code="ppt"/>
-                                 <swe:value>0.01</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="temperature range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>-5 50</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="max depth">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>200</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                        </sml:ParameterList>
-                     </sml:parameters>
-                     <sml:method/>
+                     
+                     <!--  Manufacturer should complete -->
+                     <sml:method>
+                        <sml:ProcessMethod>
+                           <sml:rules>
+                              <sml:RulesDefinition></sml:RulesDefinition>
+                           </sml:rules>
+                           <sml:algorithm>
+                              <sml:AlgorithmDefinition>
+                                 <gml:description>...</gml:description>
+                                 <sml:mathML/>
+                              </sml:AlgorithmDefinition>
+                           </sml:algorithm>
+                        </sml:ProcessMethod>
+                     </sml:method>
                   </sml:ProcessModel>
                </sml:component>
                
-               <sml:component name="Deep Non-vented Depth"
-                  xlink:role="urn:ogc:def:process:OGC:detector">
+               <sml:component name="Deep Non-vented Depth" xlink:role="urn:ogc:def:process:OGC:detector">
                   <sml:Component gml:id="deep_non_vented_depth">
                      <gml:description>YSI Pressure Sensor</gml:description>
@@ -664,4 +680,33 @@
                         </sml:IdentifierList>
                      </sml:identification>
+                     
+                     <sml:capabilities>
+                        <swe:DataRecord gml:id="deepNonVentedDepthCapabilities">
+                           <swe:field name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0 200</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.3</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.001</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 45</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                        </swe:DataRecord>
+                     </sml:capabilities>
                      
                      <sml:inputs>
@@ -684,34 +729,7 @@
                      </sml:outputs>
                      
-                     <sml:parameters> <!-- Are these settable by user?  Do they affect the measurement?  Should maybe be capabilities -->
-                        <sml:ParameterList>
-                           <sml:parameter name="range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0 200</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="accuracy">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0.3</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="resolution">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0.001</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="temperature range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>-5 45</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                        </sml:ParameterList>
-                     </sml:parameters>
                   </sml:Component>
                </sml:component>
+               
                <sml:component name="Medium Non-vented Depth"
                   xlink:role="urn:ogc:def:process:OGC:detector">
@@ -733,4 +751,33 @@
                      </sml:identification>
                      
+                     <sml:capabilities>
+                        <swe:DataRecord gml:id="mediumNonVentedDepthCapabilities">
+                           <swe:field name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0 61</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.12</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.001</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 45</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                        </swe:DataRecord>
+                     </sml:capabilities>
+                     
                      <sml:inputs>
                         <sml:InputList>
@@ -751,37 +798,8 @@
                         </sml:OutputList>
                      </sml:outputs>
-                     
-                     <sml:parameters>
-                        <sml:ParameterList>
-                           <sml:parameter name="range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0 61</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="accuracy">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0.12</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="resolution">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0.001</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="temperature range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>-5 45</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                        </sml:ParameterList>
-                     </sml:parameters>
                   </sml:Component>
                </sml:component>
-               <sml:component name="Shallow Non-vented Depth"
-                  xlink:role="urn:ogc:def:process:OGC:detector">
+               
+               <sml:component name="Shallow Non-vented Depth" xlink:role="urn:ogc:def:process:OGC:detector">
                   <sml:Component gml:id="shallow_non_vented_depth">
                      <gml:description>YSI Pressure Sensor</gml:description>
@@ -800,4 +818,33 @@
                         </sml:IdentifierList>
                      </sml:identification>
+                     
+                     <sml:capabilities>
+                        <swe:DataRecord gml:id="shallowNonVentedDepthCapabilities">
+                           <swe:field name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0 9.1</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.018</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.001</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 45</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                        </swe:DataRecord>
+                     </sml:capabilities>
                      
                      <sml:inputs>
@@ -819,37 +866,8 @@
                         </sml:OutputList>
                      </sml:outputs>
-                     
-                     <sml:parameters>
-                        <sml:ParameterList>
-                           <sml:parameter name="range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0 9.1</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="accuracy">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0.018</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="resolution">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0.001</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="temperature range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>-5 45</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                        </sml:ParameterList>
-                     </sml:parameters>
                   </sml:Component>
                </sml:component>
-               <sml:component name="Shallow Vented Water Level"
-                  xlink:role="urn:ogc:def:process:OGC:detector">
+               
+               <sml:component name="Shallow Vented Water Level" xlink:role="urn:ogc:def:process:OGC:detector">
                   <sml:Component gml:id="shallow_vented_level">
                      <gml:description>YSI Pressure Sensor </gml:description>
@@ -868,4 +886,33 @@
                         </sml:IdentifierList>
                      </sml:identification>
+                     
+                     <sml:capabilities>
+                        <swe:DataRecord gml:id="shallowVentedWaterLevelCapabilities">
+                           <swe:field name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0 9.1</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                           <swe:field name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.018</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.001</swe:value>
+                              </swe:Quantity>
+                           </swe:field>
+                           <swe:field name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 45</swe:value>
+                              </swe:QuantityRange>
+                           </swe:field>
+                        </swe:DataRecord>
+                     </sml:capabilities>
                      
                      <sml:inputs>
@@ -888,33 +935,4 @@
                         </sml:OutputList>
                      </sml:outputs>
-                     
-                     <sml:parameters>
-                        <sml:ParameterList>
-                           <sml:parameter name="range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0 9.1</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                           <sml:parameter name="accuracy">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0.018</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="resolution">
-                              <swe:Quantity>
-                                 <swe:uom code="m"/>
-                                 <swe:value>0.001</swe:value>
-                              </swe:Quantity>
-                           </sml:parameter>
-                           <sml:parameter name="temperature range">
-                              <swe:QuantityRange>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>-5 45</swe:value>
-                              </swe:QuantityRange>
-                           </sml:parameter>
-                        </sml:ParameterList>
-                     </sml:parameters>
                   </sml:Component>
                </sml:component>
@@ -922,5 +940,12 @@
                <!-- xxxx THE FOLLOWING NEED TO BE COMPLETED -->
                <sml:component name="Optical Dissolved Oxygen">
-                  <sml:Component gml:id="optical_dissolved_oxygen"></sml:Component>
+                  <sml:Component gml:id="optical_dissolved_oxygen">
+                     <gml:description></gml:description>
+                     <sml:capabilities></sml:capabilities>
+                     <sml:inputs></sml:inputs>
+                     <sml:outputs></sml:outputs>
+                     <sml:parameters></sml:parameters>
+                     <sml:method>   </sml:method>
+                  </sml:Component>
                </sml:component>
                <sml:component name="Electrochemical Dissolved Oxygen"/>
@@ -964,5 +989,5 @@
                   <sml:Link>
                      <sml:source ref="this/inputs/water_temperature"/>  <!-- sea_water_temp? -->
-                     <sml:destination ref="temperature/inputs/water_temperature"/>
+                     <sml:destination ref="temperatureSensor/inputs/water_temperature"/>
                   </sml:Link>
                </sml:connection>
@@ -979,11 +1004,11 @@
                   <sml:Link>
                      <sml:source ref="this/inputs/conductivity"/>
-                     <sml:destination ref="conductivity/inputs/conductivity"/>
-                  </sml:Link>
-               </sml:connection>
-               
-               <sml:connection>
-                  <sml:Link>
-                     <sml:source ref="conductivity/outputs/conductivity"/>
+                     <sml:destination ref="conductivitySensor/inputs/conductivity"/>
+                  </sml:Link>
+               </sml:connection>
+               
+               <sml:connection>
+                  <sml:Link>
+                     <sml:source ref="conductivitySensor/outputs/conductivity"/>
                      <sml:destination ref="this/outputs/conductivity"/>
                   </sml:Link>
@@ -1001,5 +1026,5 @@
                   <sml:Link>
                      <sml:source ref="deep_non_vented_depth/outputs/depth"/>
-                     <sml:destination ref="this/outputs/depth"/>
+                     <sml:destination ref="this/outpuuts/depth"/>
                   </sml:Link>
                </sml:connection>
Index: q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml (revision 422)
+++ q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml (revision 423)
@@ -76,4 +76,8 @@
          </sml:history>
          
+         <!--========================-->
+         <!--  Sonde Inputs          -->
+         <!--========================-->
+         
          <sml:inputs>
             <sml:InputList>
@@ -95,41 +99,49 @@
          </sml:inputs>
          
+         <!--==============================-->
+         <!--  Sonde Outputs               -->
+         <!--==============================-->
          <sml:outputs>
             <sml:OutputList>
-               <sml:output name="depth">
-                  <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/depth">
-                     <swe:uom code="m"/>
-                  </swe:Quantity>
+               <sml:output name="SystemOutputs">
+                  <swe:DataRecord>
+                     <swe:field name="depth">
+                        <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/depth">
+                           <swe:uom code="m"/>
+                        </swe:Quantity>
+                     </swe:field>
+                     <swe:field name="water_level">
+                        <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/water_level">
+                           <swe:uom code="m"/>
+                        </swe:Quantity>
+                     </swe:field>
+                     <swe:field name="water_temperature">
+                        <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/water_temperature">
+                           <swe:uom code="degC"/>
+                        </swe:Quantity>
+                     </swe:field>
+                     <swe:field name="conductivity">
+                        <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/conductivity">
+                           <swe:uom code="mS/cm"/>
+                        </swe:Quantity>
+                     </swe:field>
+                     <swe:field name="salinity">
+                        <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/salinity">
+                           <swe:uom code="ppt"/>
+                        </swe:Quantity>
+                     </swe:field>
+                     <swe:field name="dissolved_oxygen_saturation">
+                        <swe:Quantity definition="">
+                           <swe:uom code="%sat"/>
+                        </swe:Quantity>
+                     </swe:field>
+                     <swe:field name="dissolved_oxygen">
+                        <swe:Quantity definition="">
+                           <swe:uom code="mg/L"/>
+                        </swe:Quantity>
+                     </swe:field>
+                  </swe:DataRecord>
                </sml:output>
-               <sml:output name="water_level">
-                  <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/water_level">
-                     <swe:uom code="m"/>
-                  </swe:Quantity>
-               </sml:output>
-               <sml:output name="water_temperature">
-                  <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/water_temperature">
-                     <swe:uom code="degC"/>
-                  </swe:Quantity>
-               </sml:output>
-               <sml:output name="conductivity">
-                  <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/conductivity">
-                     <swe:uom code="mS/cm"/>
-                  </swe:Quantity>
-               </sml:output>
-               <sml:output name="salinity">
-                  <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/salinity">
-                     <swe:uom code="ppt"/>
-                  </swe:Quantity>
-               </sml:output>
-               <sml:output name="dissolved_oxygen_saturation">
-                  <swe:Quantity definition="">
-                     <swe:uom code="%sat"/>
-                  </swe:Quantity>
-               </sml:output>
-               <sml:output name="dissolved_oxygen">
-                  <swe:Quantity definition="">
-                     <swe:uom code="mg/L"/>
-                  </swe:Quantity>
-               </sml:output>
+              
             </sml:OutputList>
          </sml:outputs>
@@ -200,5 +212,22 @@
                   </sml:Link>
                </sml:connection>
-
+               
+               <!-- water temp -->
+               <sml:connection>
+                  <sml:Link>
+                     <sml:source ref="this/inputs/water_pressure"/>
+                     <sml:destination ref="YSI_6Series_6600V2/inputs/water_pressure"/>
+                  </sml:Link>
+               </sml:connection>
+               
+               <!-- dissolved O2-->
+               <sml:connection>
+                  <sml:Link>
+                     <sml:source ref="this/inputs/dissolved_oxygen"/>
+                     <sml:destination ref="YSI_6Series_6600V2/inputs/dissolved_oxygen"/>
+                  </sml:Link>
+               </sml:connection>
+               
+               
                <!-- Saliinity -->
                <sml:connection>