diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/BARO.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/BARO.xml
new file mode 100644
index 0000000000..69f433a99b
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/BARO.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter  abbreviation="BARO" name="Barometric Velocity Vectors" unit="m/s">
+    <Method name="Vector">
+    	<Field abbreviation="UBARO"/>
+    	<Field abbreviation="VBARO"/>
+    </Method>
+</DerivedParameter>
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DIRC.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DIRC.xml
new file mode 100644
index 0000000000..e233f7ee08
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/DIRC.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter  abbreviation="DIRC" name="Current Direction" unit="°">
+    <Method name="Direction">
+    	<Field abbreviation="UOGRD"/>
+    	<Field abbreviation="VOGRD"/>
+    </Method>
+    <Method name="Direction">
+    	<Field abbreviation="OGRD"/>
+    </Method>
+</DerivedParameter>
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/OGRD.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/OGRD.xml
new file mode 100644
index 0000000000..6e34190962
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/OGRD.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter  abbreviation="OGRD" name="Current Vectors" unit="m/s">
+    <Method name="Vector">
+    	<Field abbreviation="UOGRD"/>
+    	<Field abbreviation="VOGRD"/>
+    </Method>
+</DerivedParameter>
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SPBARO.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SPBARO.xml
new file mode 100644
index 0000000000..18056579ff
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SPBARO.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter  abbreviation="SPBARO" name="Barotropic Velocity" unit="m/s">
+    <Method name="Magnitude">
+    	<Field abbreviation="UBARO"/>
+    	<Field abbreviation="VOGRD"/>
+    </Method>
+    <Method name="Magnitude">
+    	<Field abbreviation="BARO"/>
+    </Method>
+</DerivedParameter>
+
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SPC.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SPC.xml
new file mode 100644
index 0000000000..d2b3bd9098
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/SPC.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter  abbreviation="SPC" name="Current Speed" unit="m/s">
+    <Method name="Magnitude">
+    	<Field abbreviation="UOGRD"/>
+    	<Field abbreviation="VOGRD"/>
+    </Method>
+    <Method name="Magnitude">
+    	<Field abbreviation="OGRD"/>
+    </Method>
+</DerivedParameter>
diff --git a/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml b/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
index 6243e3da42..a32ce3d6bd 100644
--- a/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
+++ b/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
@@ -138,4 +138,6 @@
 	<field key="NetIO" volumePlaneType="K"/>
 	<field key="PAdv" volumePlaneType="K"/>
 	<field key="DpDt" volumePlaneType="K"/>
+	<field key="OGRD" displayTypes="ARROW,STREAMLINE"/>
+	<field key="SPBARO" displayTypes="ARROW,STREAMLINE"/>
 </fieldDisplayTypesFile>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
index 596084ebf7..3aa31f23d7 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
@@ -495,6 +495,24 @@
 				 indentText="false" />
 			<contribute xsi:type="menuItem" menuText="Ice growth rate"
 				key="ICEG"  indentText="false" />
+			<contribute xsi:type="menuItem" menuText="Salinity"
+				key="SALTY"  indentText="false" />
+			<contribute xsi:type="menuItem" menuText="Sea Surface Height"
+				key="SSHG"  indentText="false" />
+			<contribute xsi:type="menuItem" menuText="Water Temperature"
+				key="TEMPWTR"  indentText="false" />
+			<contribute xsi:type="menuItem" menuText="Current Vectors"
+				key="OGRD"  indentText="false" />
+			<contribute xsi:type="menuItem" menuText="Current Speed"
+				key="SPC"  indentText="false" />
+			<contribute xsi:type="menuItem" menuText="Current Direction"
+				key="DIRC"  indentText="false" />
+			<contribute xsi:type="menuItem" menuText="Sea Level Deviation"
+				key="DEVMSL"  indentText="false" />
+			<contribute xsi:type="menuItem" menuText="Barometric Velocity Vectors"
+				key="BARO"  indentText="false" />
+			<contribute xsi:type="menuItem" menuText="Barometric Velocity"
+				key="SPBARO"  indentText="false" />
 		</contribute>
 
 		<contribute xsi:type="toolbarSubMenu" menuText="GFSLAMP Station">
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
index ec736b0584..d7c6698e81 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
@@ -332,6 +332,7 @@
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="PV20"  indentText="false"/>
     	<contribute xsi:type="menuItem" menuText="Primary" key="Primary"  indentText="false"/>
     	<contribute xsi:type="menuItem" menuText="Secondary" key="Secondary"  indentText="false"/>
+    	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="0BSS"  indentText="false"/>    	
     </contribute>
     
     <!-- 
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml
index 295028eef1..b39d3e1cb9 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml
@@ -1348,4 +1348,7 @@
 	<Level displayName="Surface" key="1HYB">
 		<DatabaseLevel levelName="HYB" levelOneValue="1" />
 	</Level>
+	<Level displayName="Sea Surface" key="0BSS">
+		<DatabaseLevel levelName="BSS" levelOneValue="0" />
+	</Level>
 </LevelMappings>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
index d0bda66730..5fdfc623a8 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
@@ -97,6 +97,21 @@
 	<vbSource key="RTGSST" category="SfcGrid" views="PLANVIEW TIMESERIES" />
 	<vbSource key="RTGSSTHR" category="SfcGrid" views="PLANVIEW TIMESERIES" />
 	<vbSource key="RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-GulfMexico" category="SfcGrid/RTOFS" subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-GulfStream" category="SfcGrid/RTOFS" subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-GulfMaine" category="SfcGrid/RTOFS" subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-Atlantic" category="SfcGrid/RTOFS" subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-Alaska" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-Arctic" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-Bering" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-Guam" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-GulfAlaska" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-Honolulu" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-HudsonBaffin" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-Samoa" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-TropPaciLowres" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-WestAtl" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
+	<vbSource key="RTOFS-WestConus" category="SfcGrid/RTOFS" subCategory="Global" views="PLANVIEW TIMESERIES" />
 	<vbSource key="SeaIce" category="SfcGrid" views="PLANVIEW TIMESERIES" />
 	<vbSource key="SPCGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
 	<vbSource key="HurWind226" category="SfcGrid" views="PLANVIEW TIMESERIES" />
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
index 86744f23f0..ef3a812859 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
@@ -21,11 +21,9 @@ package com.raytheon.viz.volumebrowser.vbui;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -40,7 +38,6 @@ import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -48,9 +45,13 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
-import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
+import com.raytheon.uf.common.menus.xml.CommonToolBarContribution;
+import com.raytheon.uf.common.menus.xml.VariableSubstitution;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.viz.core.VizApp;
+import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.points.IPointChangedListener;
 import com.raytheon.uf.viz.points.PointsDataManager;
 import com.raytheon.viz.awipstools.IToolChangedListener;
@@ -59,12 +60,8 @@ import com.raytheon.viz.volumebrowser.datacatalog.DataCatalogManager;
 import com.raytheon.viz.volumebrowser.vbui.VBMenuBarItemsMgr.SpaceTimeMenu;
 import com.raytheon.viz.volumebrowser.vbui.VBMenuBarItemsMgr.ViewMenu;
 import com.raytheon.viz.volumebrowser.widget.MenuContributionItem;
-import com.raytheon.viz.volumebrowser.widget.TitleImgContributionItem;
-import com.raytheon.viz.volumebrowser.widget.ToolBarContributionItem;
 import com.raytheon.viz.volumebrowser.xml.MenuContribution;
-import com.raytheon.viz.volumebrowser.xml.TitleImgContribution;
 import com.raytheon.viz.volumebrowser.xml.ToolBarContribution;
-import com.raytheon.viz.volumebrowser.xml.VbSource;
 import com.raytheon.viz.volumebrowser.xml.VbSourceList;
 
 /**
@@ -86,6 +83,8 @@ import com.raytheon.viz.volumebrowser.xml.VbSourceList;
  *                                    menu's are recreated correctly on a
  *                                    pointChange action.
  * Dec 11, 2013  2602     bsteffen    Remove dead catch block.
+ * Mar 18, 2014  2874     bsteffen    Move creation of Sources toolbar
+ *                                    contributions to VbSourceList
  * 
  * </pre>
  * 
@@ -94,6 +93,8 @@ import com.raytheon.viz.volumebrowser.xml.VbSourceList;
  */
 public class DataListsProdTableComp extends Composite implements
         IDataMenuAction {
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(DataListsProdTableComp.class);
 
     /**
      * Listener to update planes current point menu.
@@ -231,18 +232,13 @@ public class DataListsProdTableComp extends Composite implements
 
             toolbar = new MultiToolbar(composite, SWT.NONE);
             toolbar.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-            toolbar.addToolItemSelectionListener(new SelectionListener() {
+            toolbar.addToolItemSelectionListener(new SelectionAdapter() {
 
                 @Override
                 public void widgetSelected(SelectionEvent e) {
                     activeList = list;
                     currentDataSelection = data;
                 }
-
-                @Override
-                public void widgetDefaultSelected(SelectionEvent e) {
-
-                }
             });
             initializeFind(labelText.toString());
         }
@@ -663,87 +659,28 @@ public class DataListsProdTableComp extends Composite implements
         // Dispose of all the tool items.
         sourceControl.toolbar.disposeToolbars();
 
-        /*
-         * Read in the selected Sources menu xml and create the tool
-         * items/menus.
-         */
+        List<CommonToolBarContribution> contribs = VbSourceList
+                .getToolBarContributions(setting);
+        ToolBarContribution common = new ToolBarContribution();
+        VariableSubstitution[] subs = new VariableSubstitution[0];
+        Set<String> removals = Collections.emptySet();
+        try {
+            for (CommonToolBarContribution contrib : contribs) {
+                for (IContributionItem item : common.getContributionItems(
+                        contrib, subs, removals)) {
+                    sourceControl.toolbar.add(item);
 
-        // Linked HashMap used to preserve the ordering of categories
-        Map<String, List<IContributionItem>> catMap = new LinkedHashMap<String, List<IContributionItem>>();
-        Map<String, Map<String, List<IContributionItem>>> subCatMap = new LinkedHashMap<String, Map<String, List<IContributionItem>>>();
-        for (VbSource source : VbSourceList.getInstance().getEntries()) {
-            if (source.getViews() != null
-                    && !source.getViews().contains(setting)) {
-                continue;
-            }
-            List<IContributionItem> catList = null;
-            if (source.getSubCategory() != null) {
-                catList = catMap.get(source.getCategory());
-                if (catList == null) {
-                    catList = new ArrayList<IContributionItem>();
-                    catMap.put(source.getCategory(), catList);
-                }
-                Map<String, List<IContributionItem>> subMap = subCatMap
-                        .get(source.getCategory());
-                if (subMap == null) {
-                    subMap = new LinkedHashMap<String, List<IContributionItem>>();
-                    subCatMap.put(source.getCategory(), subMap);
-                }
-                catList = subMap.get(source.getSubCategory());
-                if (catList == null) {
-                    catList = new ArrayList<IContributionItem>();
-                    subMap.put(source.getSubCategory(), catList);
-                }
-            } else {
-                catList = catMap.get(source.getCategory());
-                if (catList == null) {
-                    catList = new ArrayList<IContributionItem>();
-                    catMap.put(source.getCategory(), catList);
                 }
             }
-            MenuContribution mContrib = new MenuContribution();
-            mContrib.xml.key = source.getKey();
-            if (source.getName() != null) {
-                mContrib.xml.menuText = source.getName();
-            } else {
-                // Attempt a lookup in the grib model table
-                DatasetInfo info = DatasetInfoLookup.getInstance().getInfo(
-                        source.getKey());
-                if (info != null) {
-                    mContrib.xml.menuText = info.getTitle();
-                } else {
-                    mContrib.xml.menuText = source.getKey();
-                }
-            }
-            catList.add(new MenuContributionItem(mContrib));
+        } catch (VizException e) {
+            statusHandler.handle(Priority.PROBLEM,
+                    "Error creating Sources menus", e);
         }
-        for (Entry<String, List<IContributionItem>> entry : catMap.entrySet()) {
-            ToolBarContribution tbContrib = new ToolBarContribution();
-            tbContrib.xml.toolItemText = entry.getKey();
-            tbContrib.xml.id = setting.toString() + entry.getKey();
-            Map<String, List<IContributionItem>> subMap = subCatMap.get(entry
-                    .getKey());
-            if (subMap != null) {
-                for (Entry<String, List<IContributionItem>> subEntry : subMap
-                        .entrySet()) {
-                    TitleImgContribution tContrib = new TitleImgContribution();
-                    tContrib.xml.titleText = subEntry.getKey();
-                    tContrib.xml.displayDashes = true;
-                    tContrib.xml.displayImage = true;
-                    entry.getValue()
-                            .add(new TitleImgContributionItem(tContrib));
-                    entry.getValue().addAll(subEntry.getValue());
-                }
-            }
-            sourceControl.toolbar.add(new ToolBarContributionItem(tbContrib,
-                    entry.getValue().toArray(new IContributionItem[0])));
-
-        }
-
         try {
             sourceControl.toolbar.update();
         } catch (Exception e) {
-            e.printStackTrace();
+            statusHandler.handle(Priority.PROBLEM,
+                    "Error creating Sources menus", e);
         }
 
         /*
@@ -803,7 +740,9 @@ public class DataListsProdTableComp extends Composite implements
         try {
             fieldControl.toolbar.update();
         } catch (Exception e) {
-            e.printStackTrace();
+            statusHandler.handle(Priority.PROBLEM,
+                    "Error creating Fields menus", e);
+
         }
 
     }
@@ -853,9 +792,7 @@ public class DataListsProdTableComp extends Composite implements
             }
             break;
         case SOUNDING:
-            if (pointDisplayString == null) {
-                pointDisplayString = "Sounding";
-            }
+            pointDisplayString = "Sounding";
         case TIMEHEIGHT:
             if (pointDisplayString == null) {
                 pointDisplayString = "Tsect";
@@ -899,7 +836,9 @@ public class DataListsProdTableComp extends Composite implements
         try {
             planeControl.toolbar.update();
         } catch (Exception e) {
-            e.printStackTrace();
+            statusHandler.handle(Priority.PROBLEM,
+                    "Error creating Planes menus", e);
+
         }
     }
 
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/xml/VbSourceList.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/xml/VbSourceList.java
index 0ff0853d35..3a78a162fd 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/xml/VbSourceList.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/xml/VbSourceList.java
@@ -1,6 +1,12 @@
 package com.raytheon.viz.volumebrowser.xml;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.xml.bind.JAXB;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -8,10 +14,18 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
+import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.menus.xml.CommonAbstractMenuContribution;
+import com.raytheon.uf.common.menus.xml.CommonMenuContribution;
+import com.raytheon.uf.common.menus.xml.CommonTitleImgContribution;
+import com.raytheon.uf.common.menus.xml.CommonToolBarContribution;
+import com.raytheon.uf.common.menus.xml.CommonToolbarSubmenuContribution;
+import com.raytheon.viz.volumebrowser.vbui.VBMenuBarItemsMgr.ViewMenu;
 
 /**
  * 
@@ -25,6 +39,8 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
  * ------------- -------- ----------- -----------------------------------------
  * Jan 06, 2011           bsteffen    Initial creation
  * Dec 11, 2013  2602     bsteffen    Remove ISerializableObject.
+ * Mar 18, 2014  2874     bsteffen    Allow subMenus and move contribution
+ *                                    creation from DataListsProdTableComp
  * 
  * </pre>
  * 
@@ -37,6 +53,8 @@ public class VbSourceList {
 
     private final static String VB_SOURCE_FILE = "volumebrowser/VbSources.xml";
 
+    private final static char SUB_MENU_SPLIT = '/';
+
     private static class VbSourceListener implements ILocalizationFileObserver {
 
         /*
@@ -93,4 +111,180 @@ public class VbSourceList {
             return instance;
         }
     }
+
+    /**
+     * Use the VbSources information to build {@link CommonToolBarContribution}
+     * s.
+     * 
+     * @param selectedView
+     *            the active viewMenu for the sources tool bar.
+     * @return
+     */
+    public static List<CommonToolBarContribution> getToolBarContributions(
+            ViewMenu selectedView) {
+        /*
+         * When processing the VbSource objects we need to look up the
+         * contributions based off String values in the XML.
+         */
+        Map<String, CommonAbstractMenuContribution> contributions = new HashMap<String, CommonAbstractMenuContribution>();
+        /*
+         * For every category, subcategory or subMenu keep a list of all menu
+         * contributions that fall within that cataegory/menu.
+         */
+        Map<CommonAbstractMenuContribution, List<CommonAbstractMenuContribution>> subContributions = new LinkedHashMap<CommonAbstractMenuContribution, List<CommonAbstractMenuContribution>>();
+
+        for (VbSource source : VbSourceList.getInstance().getEntries()) {
+            /* Skip sources that are not active for this view */
+            if (source.getViews() != null
+                    && !source.getViews().contains(selectedView)) {
+                continue;
+            }
+            String cat = source.getCategory();
+            String subCat = source.getSubCategory();
+
+            /*
+             * Start with the menu item for the source and then find where it
+             * goes.
+             */
+            CommonMenuContribution mContrib = new CommonMenuContribution();
+            mContrib.key = source.getKey();
+            if (source.getName() != null) {
+                mContrib.menuText = source.getName();
+            } else {
+                // Attempt a lookup in the grib model table
+                DatasetInfo info = DatasetInfoLookup.getInstance().getInfo(
+                        source.getKey());
+                if (info != null) {
+                    mContrib.menuText = info.getTitle();
+                } else {
+                    mContrib.menuText = source.getKey();
+                }
+            }
+
+            CommonAbstractMenuContribution contrib = mContrib;
+
+            if (subCat != null) {
+                /*
+                 * If there is a subCategory then that should appear within the
+                 * category and any submenues within that category.
+                 */
+                String subCatkey = cat + ':' + subCat;
+                if (contributions.containsKey(subCatkey)) {
+                    CommonTitleImgContribution tContrib = (CommonTitleImgContribution) contributions
+                            .get(subCatkey);
+                    List<CommonAbstractMenuContribution> subList = subContributions
+                            .get(tContrib);
+                    subList.add(contrib);
+                    contrib = null;
+                } else {
+                    CommonTitleImgContribution tContrib = new CommonTitleImgContribution();
+                    tContrib.titleText = subCat;
+                    tContrib.displayDashes = true;
+                    tContrib.displayImage = true;
+                    List<CommonAbstractMenuContribution> subList = new ArrayList<CommonAbstractMenuContribution>();
+                    subList.add(contrib);
+                    subContributions.put(tContrib, subList);
+                    contributions.put(subCatkey, tContrib);
+                    contrib = tContrib;
+                }
+
+            }
+            /*
+             * contrib will be null if the subCategory was already created by a
+             * different source in which case no further processing is needed.
+             */
+            if (contrib != null) {
+                int sepInd = cat.lastIndexOf(SUB_MENU_SPLIT);
+                while (sepInd > -1) {
+                    String parent = cat.substring(0, sepInd);
+                    String child = cat.substring(sepInd + 1);
+                    if (contributions.containsKey(cat)) {
+                        CommonAbstractMenuContribution sContrib = contributions
+                                .get(cat);
+                        List<CommonAbstractMenuContribution> subList = subContributions
+                                .get(sContrib);
+                        subList.add(contrib);
+                        contrib = null;
+                        /*
+                         * If the subMenu already exists we don't need to
+                         * process any further
+                         */
+                        break;
+                    } else {
+                        CommonToolbarSubmenuContribution sContrib = new CommonToolbarSubmenuContribution();
+                        sContrib.menuText = child;
+                        sContrib.id = selectedView + cat;
+                        List<CommonAbstractMenuContribution> subList = new ArrayList<CommonAbstractMenuContribution>();
+                        subList.add(contrib);
+                        subContributions.put(sContrib, subList);
+                        contributions.put(cat, sContrib);
+                        contrib = sContrib;
+                    }
+                    cat = parent;
+                    sepInd = cat.lastIndexOf(SUB_MENU_SPLIT);
+                }
+                if (contrib != null) {
+                    if (contributions.containsKey(cat)) {
+                        CommonAbstractMenuContribution pContrib = contributions
+                                .get(cat);
+                        List<CommonAbstractMenuContribution> subList = subContributions
+                                .get(pContrib);
+                        subList.add(contrib);
+                    } else {
+                        CommonToolBarContribution rContrib = new CommonToolBarContribution();
+                        rContrib.toolItemText = cat;
+                        rContrib.id = selectedView + cat;
+                        List<CommonAbstractMenuContribution> subList = new ArrayList<CommonAbstractMenuContribution>();
+                        subList.add(contrib);
+                        subContributions.put(rContrib, subList);
+                        contributions.put(cat, rContrib);
+                        contrib = rContrib;
+                    }
+                }
+            }
+        }
+        /*
+         * Now that all sources are processed, set the contributions within the
+         * toolbar and submenu contributions. Also add all subcategories to the
+         * end of the menu that ocntains them.
+         */
+        contributions = null;
+        List<CommonToolBarContribution> rootContributions = new ArrayList<CommonToolBarContribution>();
+        for (Entry<CommonAbstractMenuContribution, List<CommonAbstractMenuContribution>> entry : subContributions
+                .entrySet()) {
+            CommonAbstractMenuContribution contrib = entry.getKey();
+            /*
+             * Pull out all sub categories(CommonTitleImgContribution), move
+             * them to the end of the list and then add all items within the
+             * subcategory to the contributions. This is because sub categories
+             * are just a visual seperator not an actual element with children.
+             */
+            List<CommonAbstractMenuContribution> list = entry.getValue();
+            List<CommonAbstractMenuContribution> titleItems = new ArrayList<CommonAbstractMenuContribution>();
+            ListIterator<CommonAbstractMenuContribution> it = list
+                    .listIterator();
+            while (it.hasNext()) {
+                CommonAbstractMenuContribution subContrib = it.next();
+                if (subContrib instanceof CommonTitleImgContribution) {
+                    it.remove();
+                    titleItems.add(subContrib);
+                }
+            }
+            for (CommonAbstractMenuContribution titleItem : titleItems) {
+                list.add(titleItem);
+                list.addAll(subContributions.get(titleItem));
+            }
+            if (contrib instanceof CommonToolBarContribution) {
+                CommonToolBarContribution rContrib = (CommonToolBarContribution) contrib;
+                rContrib.contributions = list
+                        .toArray(new CommonAbstractMenuContribution[0]);
+                rootContributions.add(rContrib);
+            } else if (contrib instanceof CommonToolbarSubmenuContribution) {
+                CommonToolbarSubmenuContribution sContrib = (CommonToolbarSubmenuContribution) contrib;
+                sContrib.contributions = list
+                        .toArray(new CommonAbstractMenuContribution[0]);
+            }
+        }
+        return rootContributions;
+    }
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
index c9a5605518..c32bde4c53 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
@@ -180,4 +180,19 @@
     <alias base="ECMF-MODEL0">ecmfNH</alias>
     <alias base="LAPS">laps</alias>
     <alias base="PHISH">PHISH</alias>
+    <alias base="RTOFS-Atlantic">rtofsAtlantic</alias>
+    <alias base="RTOFS-GulfMexico">rtofsAtlantic</alias>
+    <alias base="RTOFS-GulfStream">rtofsAtlantic</alias>
+    <alias base="RTOFS-GulfMaine">rtofsAtlantic</alias>
+    <alias base="RTOFS-Alaska">rtofsGlobal</alias>
+    <alias base="RTOFS-Arctic">rtofsGlobal</alias>
+    <alias base="RTOFS-Bering">rtofsGlobal</alias>
+    <alias base="RTOFS-Guam">rtofsGlobal</alias>
+    <alias base="RTOFS-GulfAlaska">rtofsGlobal</alias>
+    <alias base="RTOFS-Honolulu">rtofsGlobal</alias>
+    <alias base="RTOFS-HudsonBaffin">rtofsGlobal</alias>
+    <alias base="RTOFS-Samoa">rtofsGlobal</alias>
+    <alias base="RTOFS-TropPaciLowres">rtofsGlobal</alias>
+    <alias base="RTOFS-WestAtl">rtofsGlobal</alias>
+    <alias base="RTOFS-WestConus">rtofsGlobal</alias>
 </aliasList>
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
index f33c105b3f..5d0b3211b9 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
@@ -1059,6 +1059,11 @@ if SID in ALASKA_SITES:
                  ('HiResW-NMM-AK', 'HIRESWnmm'),
                  ('SPCGuide', 'SPC'),
                  ('TPCWindProb', 'TPCProb'),
+                 'RTOFS-Alaska',
+                 'RTOFS-Arctic',
+                 'RTOFS-Bering',
+                 'RTOFS-GulfAlaska',
+                 'RTOFS-HudsonBaffin'
                ]
 
 # Hawaii OCONUS
@@ -1076,6 +1081,7 @@ elif SID == "HFO":
                  ('SPCGuide', 'SPC'),
                  ('TPCWindProb', 'TPCProb'),
                  ('ECMWF-HiRes','ECMWFHiRes'),
+                 'RTOFS-Honolulu',
                ]
 
 # San Juan OCONUS
@@ -1098,6 +1104,7 @@ elif SID == "SJU":
                  ('SPCGuide', 'SPC'),
                  ('TPCWindProb', 'TPCProb'),
                  ('ECMWF-HiRes','ECMWFHiRes'),
+                 'RTOFS-Atlantic',
                ]
 
 # Guam OCONUS
@@ -1107,6 +1114,7 @@ elif SID == "GUM":
                  'GWW233',
                  'GlobalWave',
                  ('TPCWindProb', 'TPCProb'),
+                 'RTOFS-Guam'
                ]
 
 #CONUS sites
@@ -1994,4 +2002,4 @@ def doIt():
     IFPConfigServer.requestedISCparms = requestedISCparms
     IFPConfigServer.transmitScript = transmitScript
 
-doIt()
\ No newline at end of file
+doIt()
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
index 6a6ab2ab3d..a74a746f74 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
@@ -456,4 +456,7 @@
     <Level key="WBZ0">
         <DatabaseLevel levelName="WBZ" levelOneValue="0.0"/>
     </Level>
+    <Level key="BSS">
+        <DatabaseLevel levelName="BSS" levelOneValue="0.0"/>
+    </Level>
 </LevelMappings>
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtofsAtlantic.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtofsAtlantic.xml
new file mode 100644
index 0000000000..7b61b05251
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtofsAtlantic.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gridParamInfo xmlns:ns2="group">
+  <valtimeMINUSreftime>
+    <fcst>3600</fcst>
+    <fcst>7200</fcst>
+    <fcst>10800</fcst>
+    <fcst>14400</fcst>
+    <fcst>18000</fcst>
+    <fcst>21600</fcst>
+    <fcst>25200</fcst>
+    <fcst>28800</fcst>
+    <fcst>32400</fcst>
+    <fcst>36000</fcst>
+    <fcst>39600</fcst>
+    <fcst>43200</fcst>
+    <fcst>46800</fcst>
+    <fcst>50400</fcst>
+    <fcst>54000</fcst>
+    <fcst>57600</fcst>
+    <fcst>61200</fcst>
+    <fcst>64800</fcst>
+    <fcst>68400</fcst>
+    <fcst>72000</fcst>
+    <fcst>75600</fcst>
+    <fcst>79200</fcst>
+    <fcst>82800</fcst>
+    <fcst>86400</fcst>
+    <fcst>90000</fcst>
+    <fcst>93600</fcst>
+    <fcst>97200</fcst>
+    <fcst>100800</fcst>
+    <fcst>104400</fcst>
+    <fcst>108000</fcst>
+    <fcst>111600</fcst>
+    <fcst>115200</fcst>
+    <fcst>118800</fcst>
+    <fcst>122400</fcst>
+    <fcst>126000</fcst>
+    <fcst>129600</fcst>
+    <fcst>133200</fcst>
+    <fcst>136800</fcst>
+    <fcst>140400</fcst>
+    <fcst>144000</fcst>
+    <fcst>147600</fcst>
+    <fcst>151200</fcst>
+    <fcst>154800</fcst>
+    <fcst>158400</fcst>
+    <fcst>162000</fcst>
+    <fcst>165600</fcst>
+    <fcst>169200</fcst>
+    <fcst>172800</fcst>
+    <fcst>176400</fcst>
+    <fcst>180000</fcst>
+    <fcst>183600</fcst>
+    <fcst>187200</fcst>
+    <fcst>190800</fcst>
+    <fcst>194400</fcst>
+    <fcst>198000</fcst>
+    <fcst>201600</fcst>
+    <fcst>205200</fcst>
+    <fcst>208800</fcst>
+    <fcst>212400</fcst>
+    <fcst>216000</fcst>
+    <fcst>219600</fcst>
+    <fcst>223200</fcst>
+    <fcst>226800</fcst>
+    <fcst>230400</fcst>
+    <fcst>234000</fcst>
+    <fcst>237600</fcst>
+    <fcst>241200</fcst>
+    <fcst>244800</fcst>
+    <fcst>248400</fcst>
+    <fcst>252000</fcst>
+    <fcst>255600</fcst>
+    <fcst>259200</fcst>
+    <fcst>262800</fcst>
+    <fcst>266400</fcst>
+    <fcst>270000</fcst>
+    <fcst>273600</fcst>
+    <fcst>277200</fcst>
+    <fcst>280800</fcst>
+    <fcst>284400</fcst>
+    <fcst>288000</fcst>
+    <fcst>291600</fcst>
+    <fcst>295200</fcst>
+    <fcst>298800</fcst>
+    <fcst>302400</fcst>
+    <fcst>306000</fcst>
+    <fcst>309600</fcst>
+    <fcst>313200</fcst>
+    <fcst>316800</fcst>
+    <fcst>320400</fcst>
+    <fcst>324000</fcst>
+    <fcst>327600</fcst>
+    <fcst>331200</fcst>
+    <fcst>334800</fcst>
+    <fcst>338400</fcst>
+    <fcst>342000</fcst>
+    <fcst>345600</fcst>
+    <fcst>349200</fcst>
+    <fcst>352800</fcst>
+    <fcst>356400</fcst>
+    <fcst>360000</fcst>
+    <fcst>363600</fcst>
+    <fcst>367200</fcst>
+    <fcst>370800</fcst>
+    <fcst>374400</fcst>
+    <fcst>378000</fcst>
+    <fcst>381600</fcst>
+    <fcst>385200</fcst>
+    <fcst>388800</fcst>
+    <fcst>392400</fcst>
+    <fcst>396000</fcst>
+    <fcst>399600</fcst>
+    <fcst>403200</fcst>
+    <fcst>406800</fcst>
+    <fcst>410400</fcst>
+    <fcst>414000</fcst>
+    <fcst>417600</fcst>
+    <fcst>421200</fcst>
+    <fcst>424800</fcst>
+    <fcst>428400</fcst>
+    <fcst>432000</fcst>
+    <fcst>435600</fcst>
+    <fcst>439200</fcst>
+    <fcst>442800</fcst>
+    <fcst>446400</fcst>
+    <fcst>450000</fcst>
+    <fcst>453600</fcst>
+    <fcst>457200</fcst>
+    <fcst>460800</fcst>
+    <fcst>464400</fcst>
+    <fcst>468000</fcst>
+    <fcst>471600</fcst>
+    <fcst>475200</fcst>
+    <fcst>478800</fcst>
+    <fcst>482400</fcst>
+    <fcst>486000</fcst>
+    <fcst>489600</fcst>
+    <fcst>493200</fcst>
+    <fcst>496800</fcst>
+    <fcst>500400</fcst>
+    <fcst>504000</fcst>
+    <fcst>507600</fcst>
+    <fcst>511200</fcst>
+    <fcst>514800</fcst>
+    <fcst>518400</fcst>
+  </valtimeMINUSreftime>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>SALTY</short_name>
+    <long_name>Salinity</long_name>
+    <units>kg/kg</units>
+    <udunits>kilogram/kilogram</udunits>
+    <uiname>Salinity</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>50.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>TEMPWTR</short_name>
+    <long_name>Water Temperature</long_name>
+    <units>K</units>
+    <udunits>degree_Kelvin</udunits>
+    <uiname>TEMPWTR</uiname>
+    <valid_range>180.0</valid_range>
+    <valid_range>330.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>DEVMSL</short_name>
+    <long_name>Deviation of sea level from mean</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>DEVMSL</uiname>
+    <valid_range>-10.0</valid_range>
+    <valid_range>10.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>UOGRD</short_name>
+    <long_name>u-component of current</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>UOGRD</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>20.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>VOGRD</short_name>
+    <long_name>v-component of current</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>VOGRD</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>20.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+</gridParamInfo>
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtofsGlobal.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtofsGlobal.xml
new file mode 100644
index 0000000000..9d67c3f516
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtofsGlobal.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gridParamInfo xmlns:ns2="group">
+  <valtimeMINUSreftime>
+    <fcst>3600</fcst>
+    <fcst>7200</fcst>
+    <fcst>10800</fcst>
+    <fcst>14400</fcst>
+    <fcst>18000</fcst>
+    <fcst>21600</fcst>
+    <fcst>25200</fcst>
+    <fcst>28800</fcst>
+    <fcst>32400</fcst>
+    <fcst>36000</fcst>
+    <fcst>39600</fcst>
+    <fcst>43200</fcst>
+    <fcst>46800</fcst>
+    <fcst>50400</fcst>
+    <fcst>54000</fcst>
+    <fcst>57600</fcst>
+    <fcst>61200</fcst>
+    <fcst>64800</fcst>
+    <fcst>68400</fcst>
+    <fcst>72000</fcst>
+    <fcst>75600</fcst>
+    <fcst>79200</fcst>
+    <fcst>82800</fcst>
+    <fcst>86400</fcst>
+    <fcst>90000</fcst>
+    <fcst>93600</fcst>
+    <fcst>97200</fcst>
+    <fcst>100800</fcst>
+    <fcst>104400</fcst>
+    <fcst>108000</fcst>
+    <fcst>111600</fcst>
+    <fcst>115200</fcst>
+    <fcst>118800</fcst>
+    <fcst>122400</fcst>
+    <fcst>126000</fcst>
+    <fcst>129600</fcst>
+    <fcst>133200</fcst>
+    <fcst>136800</fcst>
+    <fcst>140400</fcst>
+    <fcst>144000</fcst>
+    <fcst>147600</fcst>
+    <fcst>151200</fcst>
+    <fcst>154800</fcst>
+    <fcst>158400</fcst>
+    <fcst>162000</fcst>
+    <fcst>165600</fcst>
+    <fcst>169200</fcst>
+    <fcst>172800</fcst>
+    <fcst>176400</fcst>
+    <fcst>180000</fcst>
+    <fcst>183600</fcst>
+    <fcst>187200</fcst>
+    <fcst>190800</fcst>
+    <fcst>194400</fcst>
+    <fcst>198000</fcst>
+    <fcst>201600</fcst>
+    <fcst>205200</fcst>
+    <fcst>208800</fcst>
+    <fcst>212400</fcst>
+    <fcst>216000</fcst>
+    <fcst>219600</fcst>
+    <fcst>223200</fcst>
+    <fcst>226800</fcst>
+    <fcst>230400</fcst>
+    <fcst>234000</fcst>
+    <fcst>237600</fcst>
+    <fcst>241200</fcst>
+    <fcst>244800</fcst>
+    <fcst>248400</fcst>
+    <fcst>252000</fcst>
+    <fcst>255600</fcst>
+    <fcst>259200</fcst>
+    <fcst>270000</fcst>
+    <fcst>280800</fcst>
+    <fcst>291600</fcst>
+    <fcst>302400</fcst>
+    <fcst>313200</fcst>
+    <fcst>324000</fcst>
+    <fcst>334800</fcst>
+    <fcst>345600</fcst>
+    <fcst>356400</fcst>
+    <fcst>367200</fcst>
+    <fcst>378000</fcst>
+    <fcst>388800</fcst>
+    <fcst>399600</fcst>
+    <fcst>410400</fcst>
+    <fcst>421200</fcst>
+    <fcst>432000</fcst>
+    <fcst>442800</fcst>
+    <fcst>453600</fcst>
+    <fcst>464400</fcst>
+    <fcst>475200</fcst>
+    <fcst>486000</fcst>
+    <fcst>496800</fcst>
+    <fcst>507600</fcst>
+    <fcst>518400</fcst>
+  </valtimeMINUSreftime>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>SALTY</short_name>
+    <long_name>Salinity</long_name>
+    <units>kg/kg</units>
+    <udunits>kilogram/kilogram</udunits>
+    <uiname>Salinity</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>50.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>BSS</levelsDesc>
+    <levels>
+      <level>BSS</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>TEMPWTR</short_name>
+    <long_name>Water Temperature</long_name>
+    <units>K</units>
+    <udunits>degree_Kelvin</udunits>
+    <uiname>TEMPWTR</uiname>
+    <valid_range>180.0</valid_range>
+    <valid_range>330.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>BSS</levelsDesc>
+    <levels>
+      <level>BSS</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>SSHG</short_name>
+    <long_name>Sea Surface Height</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>SSHG</uiname>
+    <valid_range>-10.0</valid_range>
+    <valid_range>10.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>BSS</levelsDesc>
+    <levels>
+      <level>BSS</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>UOGRD</short_name>
+    <long_name>u-component of current</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>UOGRD</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>20.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>BSS</levelsDesc>
+    <levels>
+      <level>BSS</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>VOGRD</short_name>
+    <long_name>v-component of current</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>VOGRD</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>20.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>BSS</levelsDesc>
+    <levels>
+      <level>BSS</level>
+    </levels>
+  </gridParameterInfo>
+    <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>UBARO</short_name>
+    <long_name>Barotropic U velocity</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>UBARO</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>20.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>BSS</levelsDesc>
+    <levels>
+      <level>BSS</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>VBARO</short_name>
+    <long_name>Barotropic V velocity</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>VBARO</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>20.0</valid_range>
+    <fillValue>-9999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>BSS</levelsDesc>
+    <levels>
+      <level>BSS</level>
+    </levels>
+  </gridParameterInfo>
+</gridParamInfo>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Alaska.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Alaska.xml
new file mode 100755
index 0000000000..2c269732b5
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Alaska.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-Alaska</name>
+    <description>Alaskan Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>40.0</la1>
+    <lo1>140.0</lo1>
+    <nx>350</nx>
+    <ny>150</ny>
+    <dx>0.3</dx>
+    <dy>0.3</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Arctic.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Arctic.xml
new file mode 100755
index 0000000000..271b380289
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Arctic.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-Arctic</name>
+    <description>Arctic Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>60.0</la1>
+    <lo1>160.0</lo1>
+    <nx>950</nx>
+    <ny>250</ny>
+    <dx>0.08</dx>
+    <dy>0.08</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Atlantic-HiRes.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Atlantic-HiRes.xml
new file mode 100755
index 0000000000..89ff4b39e0
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Atlantic-HiRes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-Atlantic-HiRes</name>
+    <description>HiRes Atlantic Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>-26.5</la1>
+    <lo1>254.97</lo1>
+    <nx>2500</nx>
+    <ny>2000</ny>
+    <dx>0.05</dx>
+    <dy>0.05</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid500400001.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Atlantic.xml
similarity index 88%
rename from edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid500400001.xml
rename to edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Atlantic.xml
index c396e14536..7e540d9911 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid500400001.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Atlantic.xml
@@ -19,16 +19,14 @@
         further_licensing_information.
     -->
 <latLonGridCoverage>
-    <name>500400001</name>
-    <description>200000-point (500x400) global Lon/Lat grid</description>
+    <name>RTOFS-Atlantic</name>
+    <description>Atlantic(Full Basin) Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
     <la1>-26.5</la1>
     <lo1>254.97</lo1>
-    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
     <nx>500</nx>
     <ny>400</ny>
     <dx>0.255</dx>
     <dy>0.255</dy>
-    <spacingUnit>degree</spacingUnit>
-    <la2>26.5</la2>
-    <lo2>-22.47</lo2>
 </latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Bering.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Bering.xml
new file mode 100755
index 0000000000..9b0a06810e
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Bering.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-Bering</name>
+    <description>Bering Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>40.0</la1>
+    <lo1>155.0</lo1>
+    <nx>700</nx>
+    <ny>340</ny>
+    <dx>0.08</dx>
+    <dy>0.08</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Guam.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Guam.xml
new file mode 100755
index 0000000000..ab9db2c5f3
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Guam.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-Guam</name>
+    <description>Guam Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>0</la1>
+    <lo1>130.0</lo1>
+    <nx>625</nx>
+    <ny>375</ny>
+    <dx>0.08</dx>
+    <dy>0.08</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfAlaska.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfAlaska.xml
new file mode 100755
index 0000000000..195dc13c58
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfAlaska.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-GulfAlaska</name>
+    <description>Gulf of Alaska Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>40.0</la1>
+    <lo1>195.0</lo1>
+    <nx>84</nx>
+    <ny>45</ny>
+    <dx>0.5</dx>
+    <dy>0.5</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfMaine.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfMaine.xml
new file mode 100755
index 0000000000..528831e1b2
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfMaine.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-GulfStream</name>
+    <description>Gulf Stream Region Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>25.0</la1>
+    <lo1>277.0</lo1>
+    <nx>500</nx>
+    <ny>500</ny>
+    <dx>0.062</dx>
+    <dy>0.046</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid500500001.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfMexico.xml
similarity index 89%
rename from edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid500500001.xml
rename to edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfMexico.xml
index 4f491b65e0..20856d6311 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid500500001.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfMexico.xml
@@ -19,16 +19,14 @@
         further_licensing_information.
     -->
 <latLonGridCoverage>
-    <name>500500001</name>
-    <description>250000-point (500x500) global Lon/Lat grid</description>
+    <name>RTOFS-GulfMexico</name>
+    <description>Gulf of Mexico Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
     <la1>15</la1>
     <lo1>262</lo1>
-    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
     <nx>500</nx>
     <ny>500</ny>
     <dx>0.056</dx>
     <dy>0.034</dy>
-    <spacingUnit>degree</spacingUnit>
-    <la2>32</la2>
-    <lo2>280</lo2>
 </latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfStream.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfStream.xml
new file mode 100755
index 0000000000..bbd75c4340
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-GulfStream.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-GulfMaine</name>
+    <description>Gulf of Maine Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>39.0</la1>
+    <lo1>288.0</lo1>
+    <nx>500</nx>
+    <ny>500</ny>
+    <dx>0.022</dx>
+    <dy>0.014</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Honolulu.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Honolulu.xml
new file mode 100755
index 0000000000..b58e710c69
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Honolulu.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-Honolulu</name>
+    <description>Honolulu Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>0.0</la1>
+    <lo1>180.0</lo1>
+    <nx>625</nx>
+    <ny>500</ny>
+    <dx>0.08</dx>
+    <dy>0.08</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-HudsonBaffin.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-HudsonBaffin.xml
new file mode 100755
index 0000000000..b219166244
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-HudsonBaffin.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-HudsonBaffin</name>
+    <description>HudsonBaffin Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>45.0</la1>
+    <lo1>251.0</lo1>
+    <nx>328</nx>
+    <ny>132</ny>
+    <dx>0.25</dx>
+    <dy>0.25</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Samoa.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Samoa.xml
new file mode 100755
index 0000000000..a5d069e9dc
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-Samoa.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-Samoa</name>
+    <description>Samoan Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>-30.0</la1>
+    <lo1>170.0</lo1>
+    <nx>560</nx>
+    <ny>375</ny>
+    <dx>0.08</dx>
+    <dy>0.08</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-TropPaciLowres.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-TropPaciLowres.xml
new file mode 100755
index 0000000000..83679ad0f3
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-TropPaciLowres.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-TropPaciLowres</name>
+    <description>Lowres Tropical Pacific Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>-40.0</la1>
+    <lo1>130.0</lo1>
+    <nx>120</nx>
+    <ny>80</ny>
+    <dx>1</dx>
+    <dy>1</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-WestAtl.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-WestAtl.xml
new file mode 100755
index 0000000000..ac3896eabe
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-WestAtl.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-WestAtl</name>
+    <description>Alaskan Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>10.0</la1>
+    <lo1>260.0</lo1>
+    <nx>575</nx>
+    <ny>435</ny>
+    <dx>0.08</dx>
+    <dy>0.08</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-WestConus.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-WestConus.xml
new file mode 100755
index 0000000000..9f5b448bff
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/RTOFS/RTOFS-WestConus.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<latLonGridCoverage>
+    <name>RTOFS-WestConus</name>
+    <description>West Conus Real Time Ocean Forecast System</description>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <spacingUnit>degree</spacingUnit>
+    <la1>10.0</la1>
+    <lo1>210.0</lo1>
+    <nx>625</nx>
+    <ny>625</ny>
+    <dx>0.08</dx>
+    <dy>0.08</dy>
+</latLonGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/RTOFS.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/RTOFS.xml
new file mode 100644
index 0000000000..02c6e5c10e
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/RTOFS.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<gribModelSet>
+	<model>
+		<name>RTOFS-Alaska</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-Alaska</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-Arctic</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-Arctic</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-Bering</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-Bering</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-Guam</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-Guam</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-GulfAlaska</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-GulfAlaska</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-Honolulu</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-Honolulu</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-HudsonBaffin</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-HudsonBaffin</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-Samoa</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-Samoa</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-TropPaciLowres</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-TropPaciLowres</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-WestAtl</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-WestAtl</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+
+	<model>
+		<name>RTOFS-WestConus</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grids>
+			<id>RTOFS-WestConus</id>
+		</grids>
+		<process>
+			<id>0</id>
+		</process>
+	</model>
+	
+	<model>
+		<name>RTOFS-Atlantic</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grid>RTOFS-Atlantic</grid>
+		<process>
+			<id>45</id>
+		</process>
+	</model>
+	
+	<model>
+		<name>RTOFS-Atlantic-HiRes</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grid>RTOFS-Atlantic-HiRes</grid>
+		<process>
+			<id>45</id>
+		</process>
+	</model>
+	
+	<model>
+		<name>RTOFS-GulfMaine</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grid>RTOFS-GulfMaine</grid>
+		<process>
+			<id>45</id>
+		</process>
+	</model>
+	
+	<model>
+		<name>RTOFS-GulfMexico</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grid>RTOFS-GulfMexico</grid>
+		<process>
+			<id>45</id>
+		</process>
+	</model>
+	
+	<model>
+		<name>RTOFS-GulfStream</name>
+		<center>7</center>
+		<subcenter>0</subcenter>
+		<grid>RTOFS-GulfStream</grid>
+		<process>
+			<id>45</id>
+		</process>
+	</model>
+</gribModelSet>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
index cec4d8e4e3..06d90d8177 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
@@ -362,26 +362,6 @@
 		</process>
 	</model>
 
-	<model>
-		<name>ofsGmex</name>
-		<center>7</center>
-		<subcenter>0</subcenter>
-		<grid>15058391</grid>
-		<process>
-			<id>45</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ofsWatl</name>
-		<center>7</center>
-		<subcenter>0</subcenter>
-		<grid>-26535243</grid>
-		<process>
-			<id>45</id>
-		</process>
-	</model>
-
 	<model>
 		<name>AVN-NorthernHemisphere</name>
 		<center>7</center>
@@ -2116,26 +2096,6 @@
 		</process>
 	</model>
 
-	<model>
-		<name>ofsWatl</name>
-		<center>7</center>
-		<subcenter>0</subcenter>
-		<grid>500400001</grid>
-		<process>
-			<id>45</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ofsGmex</name>
-		<center>7</center>
-		<subcenter>0</subcenter>
-		<grid>500500001</grid>
-		<process>
-			<id>45</id>
-		</process>
-	</model>
-
 	<!-- END SUBCENTER 0 -->
 
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/7/0/4.2.10.1.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/7/0/4.2.10.1.table
index ae19d6cd16..3aba1f9512 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/7/0/4.2.10.1.table
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/7/0/4.2.10.1.table
@@ -1,3 +1,7 @@
 # Product Discipline 10: Oceanographic products, Parameter Category 1: Currents
 #192-254 Reserved for local use
+192:192:Ocean Mixed Layer U Velocity:m/s:OMLU
+193:193:Ocean Mixed Layer V Velocity:m/s:OMLV
+194:194:Barotropic U Velocity:m/s:UBARO
+195:195:Barotropic V Velocity:m/s:VBARO
 255:255:Missing
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/OFSGMEX/OFSGMEX.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/OFSGMEX/OFSGMEX.xml
index d412154305..0304d34322 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/OFSGMEX/OFSGMEX.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/OFSGMEX/OFSGMEX.xml
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=ofsGmex
+GDFILE=RTOFS-GulfMexico
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/OFSWATL/OFSWATL.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/OFSWATL/OFSWATL.xml
index 43230cfcae..8d52b95946 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/OFSWATL/OFSWATL.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/OFSWATL/OFSWATL.xml
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=ofsWatl
+GDFILE=RTOFS-Atlantic
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
index fa081abfb7..3ed4ae1beb 100644
--- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
+++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
@@ -706,3 +706,11 @@ HDS	^(JUTX(([2-4]1)|53)) (.{4}) (..)(..)(..)
 #example to show P and T radrs (AK, HI, and PR)
 #IDPS|DDPLUS	^(NXUS6.) (P|T)(...) (..)(..)(..) /p(GSM)(...)
 #	FILE	-overwrite -log -close -edex	/data_store/radar/(\4:yyyy)(\4:mm)\4/\5/\2\8/\7/\2\8_\7_\4\5\6-\1_\2\3_(seq).rad.%Y%m%d%H
+
+# RTOFS Global
+# The 3rd letter specifies region
+# A = Alaska      D = Arctic    I = Gulf Alaska    S = Samoa
+# B = Bering      G = Guam      J = Hudson Baffin  T = Trop Paci Lowres
+# C = West Conus  H = Honolulu  K = West Atl
+NGRID	^(E[HS-V][A-DG-KST][B-T]01) (KWBW) (..)(..)(..)
+	FILE	-overwrite -log -close -edex	/data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/RTOFS/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H