diff --git a/.idea/bgcval2.iml b/.idea/bgcval2.iml
new file mode 100644
index 00000000..aad402c4
--- /dev/null
+++ b/.idea/bgcval2.iml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="py.test" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 00000000..105ce2da
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..c47c9106
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="bgcval2" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/key_files/ma_aeu.yml b/key_files/ma_aeu.yml
index 5d66f9b5..b272f033 100644
--- a/key_files/ma_aeu.yml
+++ b/key_files/ma_aeu.yml
@@ -3,7 +3,7 @@ name: AEU #AtlanticEquatorialUndercurent
 units: Sv
 dimensions: 1
 model: NEMO
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_U*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_U*.nc
 modelgrid       : eORCA025
 model_vars: uo
 model_convert:
diff --git a/key_files/ma_ammonium.yml b/key_files/ma_ammonium.yml
index d9eb2c0c..04bae9a4 100644
--- a/key_files/ma_ammonium.yml
+++ b/key_files/ma_ammonium.yml
@@ -4,7 +4,7 @@ units           : mmol N/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N4_n
 model_convert   : NoChange
diff --git a/key_files/ma_amoc_26n.yml b/key_files/ma_amoc_26n.yml
index 7d47ec86..40a011cc 100644
--- a/key_files/ma_amoc_26n.yml
+++ b/key_files/ma_amoc_26n.yml
@@ -4,7 +4,7 @@ name: AMOC_26N
 units: Sv
 dimensions: 1
 model: NEMO
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_V*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/**_1m_*grid_V*.nc
 modelgrid       : eORCA025
 model_vars: vo
 model_convert:
diff --git a/key_files/ma_dic.yml b/key_files/ma_dic.yml
index eb7e3d79..ddb8e1dc 100644
--- a/key_files/ma_dic.yml
+++ b/key_files/ma_dic.yml
@@ -4,7 +4,7 @@ units           : mmol C/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/**_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : O3_c
 model_convert   : NoChange
diff --git a/key_files/ma_drake.yml b/key_files/ma_drake.yml
index b8d9695c..6299c09d 100644
--- a/key_files/ma_drake.yml
+++ b/key_files/ma_drake.yml
@@ -3,7 +3,7 @@ name: DrakePassageTransport
 units: Sv
 dimensions: 1
 model: NEMO
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_U*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/**_1m_*grid_U*.nc
 modelgrid       : eORCA025
 model_vars: uo
 model_convert:
diff --git a/key_files/ma_gpp.yml b/key_files/ma_gpp.yml
index 7edc2643..60daa286 100644
--- a/key_files/ma_gpp.yml
+++ b/key_files/ma_gpp.yml
@@ -4,7 +4,7 @@ units           : ""
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ptot_GPP_result
 model_convert   : NoChange
diff --git a/key_files/ma_iron.yml b/key_files/ma_iron.yml
index efb25930..e9ab964b 100644
--- a/key_files/ma_iron.yml
+++ b/key_files/ma_iron.yml
@@ -4,7 +4,7 @@ units           : umol Fe/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N7_f
 model_convert   : NoChange
diff --git a/key_files/ma_mld.yml b/key_files/ma_mld.yml
index 0dbacda0..23732889 100644
--- a/key_files/ma_mld.yml
+++ b/key_files/ma_mld.yml
@@ -4,7 +4,7 @@ units           : m
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_convert   : choose_best_var  
 model_vars      : somxzint1 mldr10_1
diff --git a/key_files/ma_mld_sigma.yml b/key_files/ma_mld_sigma.yml
index 5eb9b743..eba56b17 100644
--- a/key_files/ma_mld_sigma.yml
+++ b/key_files/ma_mld_sigma.yml
@@ -4,7 +4,7 @@ units           : m
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : mldr10_1
 layers          : layerless
diff --git a/key_files/ma_nitrate.yml b/key_files/ma_nitrate.yml
index 638fc596..90924791 100644
--- a/key_files/ma_nitrate.yml
+++ b/key_files/ma_nitrate.yml
@@ -4,7 +4,7 @@ units           : mmol N/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N3_n
 model_convert   : NoChange
diff --git a/key_files/ma_northerntotaliceextent.yml b/key_files/ma_northerntotaliceextent.yml
index 6e37db25..a1745651 100644
--- a/key_files/ma_northerntotaliceextent.yml
+++ b/key_files/ma_northerntotaliceextent.yml
@@ -3,7 +3,7 @@ name            : NorthernTotalIceExtent
 units           : 1E6 km^2
 dimensions      : 1
 model           : CICE
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_T*.nc   
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc   
 model_vars      : soicecov
 model_convert:
     path: bgcval2/functions/ice.py
diff --git a/key_files/ma_npp.yml b/key_files/ma_npp.yml
index d7676aeb..eafa4541 100644
--- a/key_files/ma_npp.yml
+++ b/key_files/ma_npp.yml
@@ -4,7 +4,7 @@ units           : ""
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ptot_NPP_result
 model_convert   : NoChange
diff --git a/key_files/ma_o2.yml b/key_files/ma_o2.yml
index 52735742..4830b9c8 100644
--- a/key_files/ma_o2.yml
+++ b/key_files/ma_o2.yml
@@ -4,7 +4,7 @@ units           : mmol O_2/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : O2_o
 model_convert   : NoChange
diff --git a/key_files/ma_p1c.yml b/key_files/ma_p1c.yml
index 26cae13a..e4d1e04e 100644
--- a/key_files/ma_p1c.yml
+++ b/key_files/ma_p1c.yml
@@ -4,7 +4,7 @@ units           : mg C/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : P1_c
 model_convert   : NoChange
diff --git a/key_files/ma_ph.yml b/key_files/ma_ph.yml
index e83de34a..a929ec32 100644
--- a/key_files/ma_ph.yml
+++ b/key_files/ma_ph.yml
@@ -4,7 +4,7 @@ units           : None
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : O3_pH
 model_convert   : NoChange
diff --git a/key_files/ma_phosphate.yml b/key_files/ma_phosphate.yml
index b7d578eb..0158515b 100644
--- a/key_files/ma_phosphate.yml
+++ b/key_files/ma_phosphate.yml
@@ -4,7 +4,7 @@ units           : mmol P/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N1_p
 model_convert   : NoChange
diff --git a/key_files/ma_silicate.yml b/key_files/ma_silicate.yml
index abf7f862..c651fc53 100644
--- a/key_files/ma_silicate.yml
+++ b/key_files/ma_silicate.yml
@@ -4,7 +4,7 @@ units           : mmol Si/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : N5_s
 model_convert   : NoChange
diff --git a/key_files/ma_southerntotaliceextent.yml b/key_files/ma_southerntotaliceextent.yml
index a2046df7..f965a1c7 100644
--- a/key_files/ma_southerntotaliceextent.yml
+++ b/key_files/ma_southerntotaliceextent.yml
@@ -3,7 +3,7 @@ name            : SouthernTotalIceExtent
 units           : 1E6 km^2
 dimensions      : 1
 model           : CICE
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
 model_vars      : soicecov
 model_convert:
     path: bgcval2/functions/ice.py
diff --git a/key_files/ma_sss.yml b/key_files/ma_sss.yml
index 67b336bf..8887d416 100644
--- a/key_files/ma_sss.yml
+++ b/key_files/ma_sss.yml
@@ -4,7 +4,7 @@ units           : PSU
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : so_abs so
   # dataFile        : /data/sthenno1/scratch/ledm/Observations/WOA/annual/woa13_decav_s00_01v2_AMM.nc
diff --git a/key_files/ma_sst.yml b/key_files/ma_sst.yml
index 666527aa..639870b7 100644
--- a/key_files/ma_sst.yml
+++ b/key_files/ma_sst.yml
@@ -4,7 +4,7 @@ units           : degrees C
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : thetao thetao_con votemper
 model_convert   : choose_best_var
diff --git a/key_files/ma_ta.yml b/key_files/ma_ta.yml
index 1174e228..9f8c7811 100644
--- a/key_files/ma_ta.yml
+++ b/key_files/ma_ta.yml
@@ -4,7 +4,7 @@ units           : umol/kg
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*ptrc_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*ptrc_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : O3_TA
 model_convert   : NoChange
diff --git a/key_files/ma_totalairseafluxco2.yml b/key_files/ma_totalairseafluxco2.yml
index abc8945b..cdb59bc5 100644
--- a/key_files/ma_totalairseafluxco2.yml
+++ b/key_files/ma_totalairseafluxco2.yml
@@ -4,7 +4,7 @@ units           : Pg C/yr
 model           : NEMO-ERSEM
 modelgrid       : eORCA025
 dimensions      : 1
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
 model_vars      : O3_fair
 model_convert   :
     path: bgcval2/functions/AirSeaFluxCO2.py
diff --git a/key_files/ma_totalchlorophyll.yml b/key_files/ma_totalchlorophyll.yml
index 505e0e48..8079db9b 100644
--- a/key_files/ma_totalchlorophyll.yml
+++ b/key_files/ma_totalchlorophyll.yml
@@ -4,7 +4,7 @@ units           : ""
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ptot_Chl_result
 model_convert   : NoChange
diff --git a/key_files/ma_totaliceextent.yml b/key_files/ma_totaliceextent.yml
index b08a342a..c2562d05 100644
--- a/key_files/ma_totaliceextent.yml
+++ b/key_files/ma_totaliceextent.yml
@@ -4,7 +4,7 @@ name            : TotalIceExtent
 units           : 1E6 km^2
 dimensions      : 1
 model           : NEMO-ERSEM
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_T*.nc   
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc   
 model_vars      : soicecov
 model_convert:
     path: bgcval2/functions/ice.py
diff --git a/key_files/ma_totalintgpp.yml b/key_files/ma_totalintgpp.yml
index 94e4d8bd..108f2ae9 100644
--- a/key_files/ma_totalintgpp.yml
+++ b/key_files/ma_totalintgpp.yml
@@ -2,7 +2,7 @@
 name            : TotalIntGPP
 units           : Gt/yr
 dimensions      : 1
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
 model_vars      : Ptot_NPP_result
 model_convert   :
     path: bgcval2/functions/TotalIntPP.py
diff --git a/key_files/ma_totalintnpp.yml b/key_files/ma_totalintnpp.yml
index c17101bb..d931cbed 100644
--- a/key_files/ma_totalintnpp.yml
+++ b/key_files/ma_totalintnpp.yml
@@ -2,7 +2,7 @@
 name            : TotalIntNPP
 units           : Gt/yr
 dimensions      : 1
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
 model_vars      : Ptot_NPP_result
 model_convert   :
     path: bgcval2/functions/TotalIntPP.py
diff --git a/key_files/ma_totalphytoc.yml b/key_files/ma_totalphytoc.yml
index 42d44339..4ab925d1 100644
--- a/key_files/ma_totalphytoc.yml
+++ b/key_files/ma_totalphytoc.yml
@@ -4,7 +4,7 @@ units           : mg C/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ptot_c_result
 model_convert   : NoChange
diff --git a/key_files/ma_totalzooc.yml b/key_files/ma_totalzooc.yml
index 722e5d22..32f61327 100644
--- a/key_files/ma_totalzooc.yml
+++ b/key_files/ma_totalzooc.yml
@@ -4,7 +4,7 @@ units           : mg C/m^3
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*diag_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*diag_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : Ztot_c_result
 model_convert   : NoChange
diff --git a/key_files/ma_zos.yml b/key_files/ma_zos.yml
index e20363f4..a8fc799e 100644
--- a/key_files/ma_zos.yml
+++ b/key_files/ma_zos.yml
@@ -4,7 +4,7 @@ units           : m
 dimensions      : 1
 model           : NEMO025-ERSEM
 modelgrid       : eORCA025
-modelFiles      : $BASEDIR_MODEL/$JOBID/SENEMO*_1m_*grid_T*.nc
+modelFiles      : $BASEDIR_MODEL/$JOBID/*_1m_*grid_T*.nc
 gridFile        : /data/proteus2/scratch/ledm/MissionAtlantic/SENEMO/eORCA025_mesh_mask_mes_v2.nc
 model_vars      : zos
 layers          : layerless