diff --git a/modules/aeolus/datasource.py b/modules/aeolus/datasource.py
index 8fffd0236a64f3cabee8ccdfe015e56ea0923a04..744c1c37a30e87cd882ecb7967e4ce27556548d7 100644
--- a/modules/aeolus/datasource.py
+++ b/modules/aeolus/datasource.py
@@ -8,6 +8,7 @@ from pathlib import Path
 
 from aeolus.geos_nav import GEOSNavigation
 from util.util import GenericException
+from util.lon_lat_grid import LonLatGrid
 
 
 def get_parameters_clavrx(filename='/home/rink/data/clavrx/clavrx_OR_ABI-L1b-RadF-M6C01_G16_s20192930000343.level2.nc'):
@@ -113,6 +114,7 @@ class GOESL1B(Files):
         return dto
 
 
+# GOES-16, CONUS. TODO: Generalize to G-16 and FD, MESO
 class CLAVRx(Files):
     def __init__(self, files_path):
         super().__init__(files_path, 10, 'clavrx_OR_ABI-L1b*.level2.nc')
@@ -128,6 +130,9 @@ class CLAVRx(Files):
     def get_parameters(self):
         return self.params
 
+    def get_navigation(self, h5f):
+        return GEOSNavigation(sub_lon=-75.0, CFAC=5.6E-05, COFF=-0.101332, LFAC=-5.6E-05, LOFF=0.128212, num_elems=2500, num_lines=1500)
+
 
 class CLAVRx_VIIRS(Files):
     def __init__(self, files_path):
@@ -144,6 +149,13 @@ class CLAVRx_VIIRS(Files):
     def get_parameters(self):
         return self.params
 
+    def get_navigation(self, h5f):
+        lons = h5f['longitude'][:, :]
+        lats = h5f['latitude'][:, :]
+        lons = np.where(lons < 0, lons + 360, lons)
+        ll_grid = LonLatGrid(lons, lats)
+        return ll_grid
+
 
 class RAOBfiles(Files):
     def __init__(self, files_path, file_time_span=10):