Index: MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/NOAA/OSCAR.py
===================================================================
--- MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/NOAA/OSCAR.py (revision 911)
+++ MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/NOAA/OSCAR.py (revision 913)
@@ -169,5 +169,5 @@
         if name in ['CornerCoords', 'Shape']:
             if self._Grid is None:
-                self._Grid = cls._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory)
+                self._Grid = self._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory)
 
             if name == 'CornerCoords':
@@ -189,5 +189,5 @@
 
         if self._Grid is None:
-            self._Grid = cls._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory)
+            self._Grid = self._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory)
         
         return self._Grid._GetCoords(coord, coordNum, slices, sliceDims, fixedIncrementOffset)
@@ -205,5 +205,5 @@
 
         if self._Grid is None:
-            self._Grid = cls._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory)
+            self._Grid = self._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory)
 
         sliceList = [sliceList[0], slice(0, 1), sliceList[1], sliceList[2]]
@@ -215,8 +215,8 @@
 
         # If the caller just wants u, v, u_anom, or v_anom, construct
-        # and return a OSCAR5DayThirdDegreeCurrents instance.
+        # and return a _OSCAR5DayThirdDegreeCurrents4D instance.
         
         if parameter in [u'u', u'v', u'u_anom', u'v_anom']:
-            OSCAR5DayThirdDegreeCurrents(parameter, timeout, maxRetryTime, cacheDirectory)
+            return _OSCAR5DayThirdDegreeCurrents4D(parameter, timeout, maxRetryTime, cacheDirectory)
 
         # The caller wants something derived from both u and v. First
@@ -224,9 +224,9 @@
 
         if parameter.endswith('_anom'):
-            uGrid = OSCAR5DayThirdDegreeCurrents(u'u_anom', timeout, maxRetryTime, cacheDirectory)
-            vGrid = OSCAR5DayThirdDegreeCurrents(u'v_anom', timeout, maxRetryTime, cacheDirectory)
+            uGrid = _OSCAR5DayThirdDegreeCurrents4D(u'u_anom', timeout, maxRetryTime, cacheDirectory)
+            vGrid = _OSCAR5DayThirdDegreeCurrents4D(u'v_anom', timeout, maxRetryTime, cacheDirectory)
         else:
-            uGrid = OSCAR5DayThirdDegreeCurrents(u'u', timeout, maxRetryTime, cacheDirectory)
-            vGrid = OSCAR5DayThirdDegreeCurrents(u'v', timeout, maxRetryTime, cacheDirectory)
+            uGrid = _OSCAR5DayThirdDegreeCurrents4D(u'u', timeout, maxRetryTime, cacheDirectory)
+            vGrid = _OSCAR5DayThirdDegreeCurrents4D(u'v', timeout, maxRetryTime, cacheDirectory)
 
         # Now construct and return the appropriate DerivedGrid
@@ -512,8 +512,8 @@
 * dir_anom - Direction of water flow (from u_anom and v_anom).
 
-* eke - Eddy kinetic energy, in cm^2/s^2, computed as 0.5*(u^2 + v^2).
+* eke - Eddy kinetic energy, in m^2/s^2, computed as 0.5*(u^2 + v^2).
 
 * mag - Absolute magnitude (or modulus) of the water velocity vector,
-  in cm/s.
+  in m/s.
 
 * mag_anom - Absolute magnitude of water velocity (from u_anom and