diff --git a/MOM6_GEOSPlug/MOM6_GEOSPlug.F90 b/MOM6_GEOSPlug/MOM6_GEOSPlug.F90
index 608e45d..cc470c8 100644
--- a/MOM6_GEOSPlug/MOM6_GEOSPlug.F90
+++ b/MOM6_GEOSPlug/MOM6_GEOSPlug.F90
@@ -912,21 +912,20 @@ subroutine Run  ( GC, IMPORT, EXPORT, CLOCK, RC )
     call ocean_model_get_UV_surf(Ocean_State, Ocean, 'ua', U, isc, jsc) ! this comes to us in m/s
     call ocean_model_get_UV_surf(Ocean_State, Ocean, 'va', V, isc, jsc) ! this comes to us in m/s
 
-    if(associated(UW )) then
+    if(associated(UW ) .and. associated(VW )) then
       where(MOM_2D_MASK(:,:) > 0.0)
-        UW = real(U, kind=GeosKind)
+        UW = real(U, kind=GeosKind) * cos_rot + real(V, kind=GeosKind) * sin_rot
+        VW = real(V, kind=GeosKind) * cos_rot - real(U, kind=GeosKind) * sin_rot
       elsewhere
         UW=0.0
+        VW=0.0
       end where
+    else
+       print *, 'Both UW and VW MUST be allocated.'
+       ASSERT_(.false.)
     endif
 
-    if(associated(VW )) then
-      where(MOM_2D_MASK(:,:) > 0.0)
-        VW = real(V, kind=GeosKind)
-      elsewhere
-        VW=0.0
-      end where
-    end if
+
 
 !   B-grid currents (for CICE dynamics)
     U = 0.0; V = 0.0
diff --git a/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt b/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt
index 99239df..4c1cb5a 100644
--- a/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt
+++ b/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt
@@ -36,10 +36,26 @@ list( APPEND MOM6_SRCS
    src/ALE/polynomial_functions.F90
    src/ALE/PPM_functions.F90
    src/ALE/PQM_functions.F90
+   src/ALE/Recon1d_EMPLM_CWK.F90
+   src/ALE/Recon1d_EMPLM_WA.F90
+   src/ALE/Recon1d_EMPLM_WA_poly.F90
+   src/ALE/Recon1d_EPPM_CWK.F90
+   src/ALE/Recon1d_MPLM_CWK.F90
+   src/ALE/Recon1d_MPLM_WA.F90
+   src/ALE/Recon1d_MPLM_WA_poly.F90
+   src/ALE/Recon1d_PCM.F90
+   src/ALE/Recon1d_PLM_CW.F90
+   src/ALE/Recon1d_PLM_CWK.F90
+   src/ALE/Recon1d_PLM_hybgen.F90
+   src/ALE/Recon1d_PPM_CW.F90
+   src/ALE/Recon1d_PPM_CWK.F90
+   src/ALE/Recon1d_PPM_H4_2018.F90
+   src/ALE/Recon1d_PPM_H4_2019.F90
+   src/ALE/Recon1d_PPM_hybgen.F90
+   src/ALE/Recon1d_type.F90
    src/ALE/regrid_consts.F90
    src/ALE/regrid_edge_values.F90
    src/ALE/regrid_interp.F90
-   src/ALE/remapping_attic.F90
    src/ALE/regrid_solvers.F90
    src/core/MOM_barotropic.F90
    src/core/MOM_boundary_update.F90
@@ -69,6 +85,7 @@ list( APPEND MOM6_SRCS
    src/core/MOM_verticalGrid.F90
    src/core/MOM_porous_barriers.F90
    src/diagnostics/MOM_debugging.F90
+   src/diagnostics/MOM_diagnose_KdWork.F90
    src/diagnostics/MOM_diagnose_MLD.F90
    src/diagnostics/MOM_diagnostics.F90
    src/diagnostics/MOM_harmonic_analysis.F90
@@ -144,6 +161,7 @@ list( APPEND MOM6_SRCS
    src/framework/MOM_intrinsic_functions.F90
    src/framework/MOM_io.F90
    src/framework/MOM_io_file.F90
+   src/framework/MOM_murmur_hash.F90
    src/framework/MOM_netcdf.F90
    src/framework/MOM_random.F90
    src/framework/MOM_restart.F90
@@ -152,6 +170,7 @@ list( APPEND MOM6_SRCS
    src/framework/MOM_unique_scales.F90
    src/framework/MOM_unit_scaling.F90
    src/framework/MOM_write_cputime.F90
+   src/framework/numerical_testing_type.F90
    src/framework/posix.F90
    src/framework/posix.h
    src/ice_shelf/MOM_ice_shelf_diag_mediator.F90
@@ -182,6 +201,7 @@ list( APPEND MOM6_SRCS
    src/parameterizations/lateral/MOM_thickness_diffuse.F90
    src/parameterizations/lateral/MOM_spherical_harmonics.F90
    src/parameterizations/lateral/MOM_tidal_forcing.F90
+   src/parameterizations/lateral/MOM_wave_drag.F90
    src/parameterizations/lateral/MOM_Zanna_Bolton.F90
    src/parameterizations/vertical/MOM_ALE_sponge.F90
    src/parameterizations/vertical/MOM_bkgnd_mixing.F90
@@ -214,14 +234,16 @@ list( APPEND MOM6_SRCS
    src/tracer/dye_example.F90
    src/tracer/ideal_age_example.F90
    src/tracer/ISOMIP_tracer.F90
+   src/tracer/MARBL_forcing_mod.F90
+   src/tracer/MARBL_tracers.F90
    src/tracer/MOM_CFC_cap.F90
-   src/tracer/MOM_generic_tracer.F90
    src/tracer/MOM_hor_bnd_diffusion.F90
    src/tracer/MOM_neutral_diffusion.F90
    src/tracer/MOM_OCMIP2_CFC.F90
    src/tracer/MOM_offline_aux.F90
    src/tracer/MOM_offline_main.F90
    src/tracer/MOM_tracer_advect.F90
+   src/tracer/MOM_tracer_advect_schemes.F90
    src/tracer/MOM_tracer_diabatic.F90
    src/tracer/MOM_tracer_flow_control.F90
    src/tracer/MOM_tracer_hor_diff.F90
@@ -505,6 +527,7 @@ list( APPEND MOM6_SRCS
    config_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90
    config_src/external/GFDL_ocean_BGC/generic_tracer.F90
    config_src/external/GFDL_ocean_BGC/generic_tracer_utils.F90
+   config_src/external/GFDL_ocean_BGC/MOM_generic_tracer.F90
    # drifters-particles
    config_src/external/drifters/MOM_particles.F90
    config_src/external/drifters/MOM_particles_types.F90
@@ -514,6 +537,11 @@ list( APPEND MOM6_SRCS
    # database comms
    config_src/external/database_comms/database_client_interface.F90
    config_src/external/database_comms/MOM_database_comms.F90
+   # MARBL
+   config_src/external/MARBL/marbl_constants_mod.F90
+   config_src/external/MARBL/marbl_interface.F90
+   config_src/external/MARBL/marbl_interface_public_types.F90
+   config_src/external/MARBL/marbl_logging.F90
 )