diff --git a/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml b/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
index c57e136aee..a82ec46999 100644
--- a/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
+++ b/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
@@ -164,4 +164,14 @@
 	<field key="PSurge18ftCumul_PHISH" displayTypes="IMAGE" />
 	<field key="PSurge19ftCumul_PHISH" displayTypes="IMAGE" />
 	<field key="PSurge20ftCumul_PHISH" displayTypes="IMAGE" />
+	<field key="Wave1" displayTypes="ARROW"/>
+	<field key="Wave2" displayTypes="ARROW"/>
+	<field key="Wave3" displayTypes="ARROW"/>
+	<field key="Wave4" displayTypes="ARROW"/>
+	<field key="Wave5" displayTypes="ARROW"/>
+	<field key="Wave6" displayTypes="ARROW"/>
+	<field key="Wave7" displayTypes="ARROW"/>
+	<field key="Wave8" displayTypes="ARROW"/>
+	<field key="Wave9" displayTypes="ARROW"/>
+	<field key="Wave10" displayTypes="ARROW"/>	
 </fieldDisplayTypesFile>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml
index f366dece73..3079a3a629 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml
@@ -99,4 +99,9 @@
         <contribute xsi:type="subinclude"
             fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/NAMDNG5km.xml" />
     </contribute>
+    
+    <contribute xsi:type="toolbarSubMenu" menuText="NWPS">
+        <contribute xsi:type="subinclude"
+            fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/NWPS.xml" />
+    </contribute>
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/NWPS.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/NWPS.xml
new file mode 100644
index 0000000000..e819be7f6d
--- /dev/null
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/NWPS.xml
@@ -0,0 +1,62 @@
+<?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.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <contribute xsi:type="menuItem" menuText="Period1"
+        key="Period1" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Period2"
+        key="Period2" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Period3"
+        key="Period3" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Period4"
+        key="Period4" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Period5"
+        key="Period5" indentText="false" />    
+    <contribute xsi:type="menuItem" menuText="Period6"
+        key="Period6" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Period7"
+        key="Period7" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Period8"
+        key="Period8" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Period9"
+        key="Period9" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Period10"
+        key="Period10" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Wave1"
+        key="Wave1" indentText="false" />
+	<contribute xsi:type="menuItem" menuText="Wave2"
+        key="Wave2" indentText="false" />
+	<contribute xsi:type="menuItem" menuText="Wave3"
+        key="Wave3" indentText="false" />
+	<contribute xsi:type="menuItem" menuText="Wave4"
+        key="Wave4" indentText="false" />
+	<contribute xsi:type="menuItem" menuText="Wave5"
+        key="Wave5" indentText="false" />
+	<contribute xsi:type="menuItem" menuText="Wave6"
+        key="Wave6" indentText="false" />
+	<contribute xsi:type="menuItem" menuText="Wave7"
+        key="Wave7" indentText="false" />
+	<contribute xsi:type="menuItem" menuText="Wave8"
+        key="Wave8" indentText="false" />
+	<contribute xsi:type="menuItem" menuText="Wave9"
+        key="Wave9" indentText="false" />
+	<contribute xsi:type="menuItem" menuText="Wave10"
+        key="Wave10" indentText="false" />
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
index b8daa3f5a5..7e9735ca2e 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
@@ -70,6 +70,7 @@
     <vbSource key="NPHwave15" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="NPHwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="NPHwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="nwpsTrkngCG0" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="OPCWave181" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="OPCWave182" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="OPCWave180" category="SfcGrid" views="PLANVIEW TIMESERIES" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/distribution/grib.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/distribution/grib.xml
index 3387ed6eef..e7587b4c76 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/distribution/grib.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/distribution/grib.xml
@@ -29,6 +29,6 @@
     <regex>ecmwf_decrypted</regex>
 
     <!-- NWPS pattern -->
-    <regex>xxx_nwps_CG1*</regex>
-    <regex>xxx_nwps_CG0_Trkng*</regex>
+    <regex>\p{Alpha}{3}_nwps_CG1</regex>
+    <regex>\p{Alpha}{3}_nwps_CG0_Trkng</regex>
 </requestPatterns>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period1.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period1.xml
new file mode 100644
index 0000000000..fca06d7d4a
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period1.xml
@@ -0,0 +1,25 @@
+<?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 name="Period1" abbreviation="Period1" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="Primary" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period10.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period10.xml
new file mode 100644
index 0000000000..3b65787e02
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period10.xml
@@ -0,0 +1,25 @@
+<?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 name="Period10" abbreviation="Period10" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="OSEQD-10" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period2.xml
new file mode 100644
index 0000000000..d27d4ed6d8
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period2.xml
@@ -0,0 +1,25 @@
+<?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 name="Period2" abbreviation="Period2" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="Secondary" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period3.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period3.xml
new file mode 100644
index 0000000000..d7091d75fd
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period3.xml
@@ -0,0 +1,25 @@
+<?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 name="Period3" abbreviation="Period3" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="Tertiary" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period4.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period4.xml
new file mode 100644
index 0000000000..2be0d8123a
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period4.xml
@@ -0,0 +1,25 @@
+<?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 name="Period4" abbreviation="Period4" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="OSEQD-4" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period5.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period5.xml
new file mode 100644
index 0000000000..9288bca990
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period5.xml
@@ -0,0 +1,25 @@
+<?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 name="Period5" abbreviation="Period5" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="OSEQD-5" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period6.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period6.xml
new file mode 100644
index 0000000000..3e657e35d4
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period6.xml
@@ -0,0 +1,25 @@
+<?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 name="Period6" abbreviation="Period6" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="OSEQD-6" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period7.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period7.xml
new file mode 100644
index 0000000000..fa9e05e35a
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period7.xml
@@ -0,0 +1,25 @@
+<?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 name="Period7" abbreviation="Period7" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="OSEQD-7" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period8.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period8.xml
new file mode 100644
index 0000000000..3a70e77517
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period8.xml
@@ -0,0 +1,25 @@
+<?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 name="Period8" abbreviation="Period8" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="OSEQD-8" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period9.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period9.xml
new file mode 100644
index 0000000000..ed930e45fd
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Period9.xml
@@ -0,0 +1,25 @@
+<?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 name="Period9" abbreviation="Period9" unit="s">
+    <Method name="Alias" level="Surface">
+    	<Field abbreviation="SWPER" level="OSEQD-9" />
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave1.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave1.xml
new file mode 100644
index 0000000000..d6466e8aa4
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave1.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave1" abbreviation="Wave1" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="Primary" unit="ft"/>
+        <Field abbreviation="SWDIR" level="Primary" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave10.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave10.xml
new file mode 100644
index 0000000000..e00d063a51
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave10.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave10" abbreviation="Wave10" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="OSEQD-10" unit="ft"/>
+        <Field abbreviation="SWDIR" level="OSEQD-10" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave2.xml
new file mode 100644
index 0000000000..9f0562c3f8
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave2.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave2" abbreviation="Wave2" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="Secondary" unit="ft"/>
+        <Field abbreviation="SWDIR" level="Secondary" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave3.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave3.xml
new file mode 100644
index 0000000000..65f0d2edb5
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave3.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave3" abbreviation="Wave3" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="Tertiary" unit="ft"/>
+        <Field abbreviation="SWDIR" level="Tertiary" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave4.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave4.xml
new file mode 100644
index 0000000000..3d02321de0
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave4.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave4" abbreviation="Wave4" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="OSEQD-4" unit="ft"/>
+        <Field abbreviation="SWDIR" level="OSEQD-4" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave5.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave5.xml
new file mode 100644
index 0000000000..578e5e5b74
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave5.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave5" abbreviation="Wave5" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="OSEQD-5" unit="ft"/>
+        <Field abbreviation="SWDIR" level="OSEQD-5" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave6.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave6.xml
new file mode 100644
index 0000000000..3054ee4cf2
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave6.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave6" abbreviation="Wave6" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="OSEQD-6" unit="ft"/>
+        <Field abbreviation="SWDIR" level="OSEQD-6" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave7.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave7.xml
new file mode 100644
index 0000000000..a0e01be71d
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave7.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave7" abbreviation="Wave7" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="OSEQD-7" unit="ft"/>
+        <Field abbreviation="SWDIR" level="OSEQD-7" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave8.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave8.xml
new file mode 100644
index 0000000000..d0ded47b97
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave8.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave8" abbreviation="Wave8" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="OSEQD-8" unit="ft"/>
+        <Field abbreviation="SWDIR" level="OSEQD-8" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave9.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave9.xml
new file mode 100644
index 0000000000..e952f4dc47
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/NWPS/Wave9.xml
@@ -0,0 +1,27 @@
+<?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 name="Wave9" abbreviation="Wave9" unit="ft" xmlns:ns2="group">
+    <Method name="Vector" level="Surface">
+    	<Field abbreviation="SWELL" level="OSEQD-9" unit="ft"/>
+        <Field abbreviation="SWDIR" level="OSEQD-9" unit="deg"/>
+        <ConstantField value="1"/>
+    </Method>
+</DerivedParameter>