Index: q2o/sos_unc/trunk/sos_unc/NCCOOS_System.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/NCCOOS_System.xml (revision 396)
+++ q2o/sos_unc/trunk/sos_unc/NCCOOS_System.xml (revision 398)
@@ -25,6 +25,16 @@
 
                     <sml:component name="Morgan Bay" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/morgan.xml"/>
+                    <sml:component name="Stones Bay" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/stones.xml"/>
+                    <sml:component name="Hampton Shoals" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/hampton.xml"/>
+                    <sml:component name="Bay Point" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/bay_point.xml"/>
+             
+                    <sml:component name="Raleigh Bay Buoy" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/raleigh_bay.xml"/>
+                    <sml:component name="Oregon Inlet Buoy" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/oregon_inlet.xml"/>
+                    <sml:component name="T23 Tower" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/t23.xml"/>
+                    
                     <sml:component name="Bogue Inlet Pier" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/bogue.xml"/>
-
+                    <sml:component name="Jennettes Pier" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/jennettes.xml"/>
+                    <sml:component name="Ramses Slocum Glider" xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/ramses.xml"/>
+                    
                 </sml:ComponentList>
             </sml:components>
Index: q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 395)
+++ q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 398)
@@ -29,5 +29,4 @@
          <sml:identification>
             <sml:IdentifierList id="identifiers">
-
                <sml:identifier name="longName">
                   <sml:Term definition="urn:ogc:def:property:OGC:longName">
@@ -50,11 +49,4 @@
                   </sml:Term>
                </sml:identifier>
-               <sml:identifier name="Serial Number">
-                  <sml:Term definition="urn:ogc:def:identifier:OGC:serialNumber">
-                     <!-- xxxx How can this get changed for each instance of this component -->
-                     <sml:value>xxxx</sml:value>
-                  </sml:Term>
-               </sml:identifier>
-
             </sml:IdentifierList>
          </sml:identification>
@@ -140,53 +132,26 @@
          <!--============       System Capabilities       =============-->
          <!--==========================================================-->
-
          <!-- searchable quick list -->
-         <!-- system like battery voltage and what components can be attached (??) -->
-         <!-- Describe all the ranges and resolutions and accuracies in parameters of each component-->
-
          <sml:capabilities name="SondeProperties">
             <swe:DataRecord>
-
-               <swe:field name="conductivityRange">
-                  <swe:QuantityRange definition="urn:ysi:def:property:::range">
-                     <swe:uom code="mS/cm"/>
-                     <swe:value>0 100</swe:value>
-                  </swe:QuantityRange>
-               </swe:field>
-
-               <swe:field name="conductivityResolution">
-                  <swe:QuantityRange definition="urn:ysi:def:property:::resolution">
-                     <swe:uom code="mS/cm"/>
-                     <swe:value>0.001 0.1</swe:value>
-                  </swe:QuantityRange>
-               </swe:field>
-
-               <swe:field name="temperatureRange">
-                  <swe:QuantityRange definition="urn:ysi:def:property:::range">
+               <swe:field name="operatingTemperatureRange">
+                  <swe:QuantityRange>
                      <swe:uom code="degC"/>
                      <swe:value>-5 +50</swe:value>
                   </swe:QuantityRange>
                </swe:field>
-
-               <swe:field name="temperatureResolution">
-                  <swe:Quantity definition="urn:ysi:def:property:::resolution">
+               <swe:field name="operatingDepthRange">
+                  <swe:QuantityRange>
+                     <swe:uom code="m"/>
+                     <swe:value>0 200</swe:value>
+                  </swe:QuantityRange>
+               </swe:field>
+               <swe:field name="storageTemperatureRange">
+                  <swe:QuantityRange>
                      <swe:uom code="degC"/>
-                     <swe:value>0.01</swe:value>
-                  </swe:Quantity>
-               </swe:field>
-
-               <!-- NEEDS TO BE COMPLETED -->
-
-               <!-- depth (use DEEP, Shallow, med and vented here -->
-               <!-- salinity -->
-               <!-- DO %sat ROX -->
-               <!-- DO mg/L ROX -->
-               <!-- DO %sat rapid pulse 6562-->
-               <!-- DO mg/L rapid pulse 6562 -->
-               <!-- turbidity NTU 6136-->
-               <!-- pH 6561 -->
-               <!-- ORP -->
-
-            </swe:DataRecord>
+                     <swe:value>-10 +60</swe:value>
+                  </swe:QuantityRange>
+               </swe:field>
+             </swe:DataRecord>
          </sml:capabilities>
 
@@ -220,4 +185,5 @@
          <!--============       System Documentation       ============-->
          <!--==========================================================-->
+         
          <sml:documentation xlink:arcrole="website">
             <sml:Document>
@@ -472,4 +438,43 @@
                         </sml:IdentifierList>
                      </sml:identification>
+                     
+                     <sml:inputs></sml:inputs>
+                     
+                     <sml:outputs></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>
@@ -492,4 +497,34 @@
                         </sml:IdentifierList>
                      </sml:identification>
+
+                     <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>
Index: q2o/sos_unc/trunk/sos_unc/morgan.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/morgan.xml (revision 397)
+++ q2o/sos_unc/trunk/sos_unc/morgan.xml (revision 398)
@@ -18,4 +18,21 @@
                 </gml:Envelope>
             </gml:boundedBy>
+
+            <sml:spatialReferenceFrame>
+                <gml:EngineeringCRS gml:id="STATION_FRAME">
+                    <gml:srsName>Station Frame</gml:srsName>
+                    <gml:usesCS xlink:href="urn:ogc:cs:OGC:xyzFrame"/>
+                    <gml:usesEngineeringDatum>
+                        <gml:EngineeringDatum gml:id="STATION_DATUM">
+                             <gml:datumName>Station Datum</gml:datumName>
+                            <gml:anchorPoint>origin is at sea surface;
+                                x and y are orthogonal to z but undetermined;
+                                z is positive up
+                            </gml:anchorPoint>
+                        </gml:EngineeringDatum>
+                    </gml:usesEngineeringDatum>
+                </gml:EngineeringCRS>
+            </sml:spatialReferenceFrame>
+
             <sml:components>
                 <sml:ComponentList>
@@ -35,11 +52,11 @@
                 <sml:PositionList>
                     <sml:position name="stationPosition">
-                        <!-- xxxx How best to describe the position of the platform at Morgon Bay, that sites in 3-D space at lat/lon and z=0 (sea surface)-->
-                        <swe:Position gml:id="location" localFrame="#STATION_FRAME"
+                        <swe:Position gml:id="position" localFrame="#STATION_FRAME"
                             referenceFrame="urn:ogc:crs:EPSG:4329">
+                            <!-- xxxx  urn:ogc:crs:EPSG:4329 only lat and lon and does NOT describe vertical changes of sea level-->
                             <swe:location>
                                 <swe:Vector definition="urn:ogc:def:property:OGC:location">
                                     <swe:coordinate name="latitude">
-                                        <swe:Quantity axisID="X"
+                                        <swe:Quantity axisID="Y"
                                             definition="http://mmisw.org/ont/ioos/parameter/latitude">
                                             <swe:uom code="deg"/>
@@ -48,5 +65,5 @@
                                     </swe:coordinate>
                                     <swe:coordinate name="longitude">
-                                        <swe:Quantity axisID="Y"
+                                        <swe:Quantity axisID="X"
                                             definition="http://mmisw.org/ont/ioos/parameter/longitude">
                                             <swe:uom code="deg"/>
@@ -55,5 +72,6 @@
                                     </swe:coordinate>
                                     <swe:coordinate name="depth">
-                                        <!-- xxxx Confirm if this is correct place to use reference to MSL-->
+                                        <!-- xxxx Is this correct place to use reference to MSL or -->
+                                        <!-- xxxx Can we use WSG84, MSL, MLLW etc here?            -->
                                         <swe:Quantity axisID="Z"
                                             definition="http://mmisw.org/ont/ioos/parameter/depth"
@@ -69,4 +87,5 @@
                 </sml:PositionList>
             </sml:positions>
+
         </sml:System>
     </sml:member>
Index: q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml (revision 396)
+++ q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml (revision 398)
@@ -34,5 +34,5 @@
          <!--===================System Classifiers=====================-->
          <!--==========================================================-->
-         <sml:classification xlink:href="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,5 +46,5 @@
          <!--============       System Contacts           =============-->
          <!--==========================================================-->
-         <sml:contact xlink:href="contacts.xml#sara_haines" xlink:arcrole="operator"/>
+         <sml:contact xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/contacts.xml#sara_haines" xlink:arcrole="operator"/>
 
          <!--==========================================================-->
@@ -110,5 +110,7 @@
          <sml:components>
             <sml:ComponentList>
-               <sml:component name="YSI" xlink:href="YSI_6Series_6600V2.xml"/>
+               <sml:component>
+                  
+               </sml:component>
 
             </sml:ComponentList>
@@ -120,11 +122,8 @@
          <sml:positions>
             <sml:PositionList>
-               <!--=================================-->
-               <!-- Position of Platform            -->
-               <!--  Note- need depth here          -->
-               <!--=================================-->
+               <!-- relative to mechanical profiler -->
                <sml:position name="position">
-                  <swe:Position referenceFrame="morgan.xml#PLATFORM_FRAME">
-                     <swe:location xlink:href="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>