Index: q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 417)
+++ q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 418)
@@ -281,5 +281,4 @@
          <sml:outputs>
             <sml:OutputList id="outputs">
-               <!-- xxxx need to complete definitions -->
                <sml:output name="depth">
                   <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/depth">
@@ -424,5 +423,5 @@
                <!-- 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>
+                  <sml:Component gml:id="conductivity">
                      <gml:description>YSI Conductivity Sensor</gml:description>
                      <sml:identification>
@@ -498,5 +497,5 @@
                </sml:component>
                <sml:component name="Temperature" xlink:role="urn:ogc:def:process:OGC:detector">
-                  <sml:Component>
+                  <sml:Component gml:id="temperature">
                      <gml:description>YSI Temperature Sensor</gml:description>
                      <sml:identification>
@@ -657,5 +656,5 @@
                <sml:component name="Deep Non-vented Depth"
                   xlink:role="urn:ogc:def:process:OGC:detector">
-                  <sml:Component>
+                  <sml:Component gml:id="deep_non_vented_depth">
                      <gml:description>YSI Pressure Sensor</gml:description>
                      <sml:identification>
@@ -725,5 +724,5 @@
                <sml:component name="Medium Non-vented Depth"
                   xlink:role="urn:ogc:def:process:OGC:detector">
-                  <sml:Component>
+                  <sml:Component gml:id="medium_non_vented_depth">
                      <gml:description>YSI Pressure Sensor</gml:description>
                      <sml:identification>
@@ -793,5 +792,5 @@
                <sml:component name="Shallow Non-vented Depth"
                   xlink:role="urn:ogc:def:process:OGC:detector">
-                  <sml:Component>
+                  <sml:Component gml:id="shallow_non_vented_depth">
                      <gml:description>YSI Pressure Sensor</gml:description>
                      <sml:identification>
@@ -861,5 +860,5 @@
                <sml:component name="Shallow Vented Water Level"
                   xlink:role="urn:ogc:def:process:OGC:detector">
-                  <sml:Component>
+                  <sml:Component gml:id="shallow_vented_level">
                      <gml:description>YSI Pressure Sensor </gml:description>
                      <sml:identification>
@@ -929,7 +928,8 @@
                </sml:component>
 
-               <sml:component name="Optical Dissolved Oxygen"> </sml:component>
-
                <!-- xxxx THE FOLLOWING NEED TO BE COMPLETED -->
+               <sml:component name="Optical Dissolved Oxygen">
+                  <sml:Component gml:id="optical_dissolved_oxygen"></sml:Component>
+               </sml:component>
                <sml:component name="Electrochemical Dissolved Oxygen"/>
                <sml:component name="Turbidity"/>
Index: q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml (revision 416)
+++ q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml (revision 418)
@@ -3,6 +3,5 @@
 <sml:SensorML xmlns:sml="http://www.opengis.net/sensorML/1.0.1"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:swe="http://www.opengis.net/swe/1.0.1" 
-   xmlns:gml="http://www.opengis.net/gml"
+   xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:gml="http://www.opengis.net/gml"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"
@@ -15,10 +14,12 @@
          <gml:description>YSI 6600V2 located at Morgan Bay</gml:description>
          <gml:name>morgan_ysi</gml:name>
-         <sml:keywords xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#keywords"/>
+         <sml:keywords
+            xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#keywords"/>
 
          <!--==========================================================-->
          <!--===================System Identifiers=====================-->
          <!--==========================================================-->
-         <sml:identification xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#identifiers">
+         <sml:identification
+            xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#identifiers">
             <!-- xxxx How do we reference this to change the value for this instance?? -->
             <sml:IdentifierList>
@@ -34,5 +35,6 @@
          <!--===================System Classifiers=====================-->
          <!--==========================================================-->
-         <sml:classification xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#classifiers"/>
+         <sml:classification
+            xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#classifiers"/>
 
          <!--- Valid Time in this context applies to this document -->
@@ -46,8 +48,8 @@
          <!--============       System Contacts           =============-->
          <!--==========================================================-->
-         <sml:contact 
-            xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#contact"/>   
-         <sml:contact 
-            xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/contacts.xml#sara_haines" 
+         <sml:contact
+            xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#contact"/>
+         <sml:contact
+            xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/contacts.xml#sara_haines"
             xlink:arcrole="operator"/>
 
@@ -71,11 +73,33 @@
             </sml:EventList>
          </sml:history>
-         
-         <sml:inputs>
-            
+
+         <sml:inputs
+            xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#inputs">
+            <!-- This references the whole list from manufacturer. -->
+            <!-- How do I subset the list of inputs? -->
+            <sml:InputList>
+               <sml:input name="conductivity"/>
+               <sml:input name="water_temperature"/>
+               <sml:input name="water_pressure"/>
+               <sml:input name="dissolved_oxygen"/>
+            </sml:InputList>
          </sml:inputs>
-         
-         <sml:outputs></sml:outputs>
-         <sml:parameters></sml:parameters>
+
+         <sml:outputs
+            xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#outputs">
+            <!-- This references the whole list from manufacturer. -->
+            <!-- How do I subset the list of outputs? -->
+            <sml:OutputList>
+               <sml:output name="depth"/>
+               <sml:output name="water_level"/>
+               <sml:output name="water_temperature"/>
+               <sml:output name="conductivity"/>
+               <sml:output name="salinity"/>
+               <sml:output name="dissolved_oxygen_saturation"/>
+               <sml:output name="dissolved_oxygen"/>
+            </sml:OutputList>
+         </sml:outputs>
+
+         <sml:parameters/>
 
          <!--=======================-->
@@ -84,8 +108,12 @@
          <sml:components xlink:href="">
             <sml:ComponentList>
-               <sml:component name=""/>
-                  
-               
-
+               <sml:component name="Conductivity" 
+                  xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#conductivity"/>
+               <sml:component name="Temperature" 
+                  xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#temperature"/>
+               <sml:component name="Depth" 
+                  xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#deep_non_vented_depth"/>
+               <sml:component name="Dissolved Oxygen" 
+                  xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml#optical_dissolved_oxygen"/>
             </sml:ComponentList>
          </sml:components>
@@ -98,6 +126,9 @@
                <!-- relative to mechanical profiler -->
                <sml:position name="position">
-                  <swe:Position referenceFrame="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/morgan.xml#PLATFORM_FRAME">
-                     <swe:location xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/morgan.xml#location"/>
+                  <swe:Position
+                     referenceFrame="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/morgan.xml#PLATFORM_FRAME">
+                     <swe:location
+                        xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/morgan.xml#location"
+                     />
                   </swe:Position>
                </sml:position>