From c3d7ec65fa5cc322ce91729e41baca65911a8b21 Mon Sep 17 00:00:00 2001
From: Guido Cossu <guido.cossu@ed.ac.uk>
Date: Fri, 10 Feb 2017 10:27:51 +0000
Subject: [PATCH] All tests compile.

---
 .travis.yml                                   |   1 +
 lib/DisableWarnings.h                         |  37 +++
 lib/Grid.h                                    |   1 +
 lib/json/json.hpp                             |   1 -
 lib/qcd/hmc/GenericHMCrunner.h                |  12 +-
 tests/hmc/Test_hmc_EODWFRatio.cc              | 230 +++++++++++-------
 ....cc => Test_hmc_EODWFRatioLsVectorised.cc} | 136 ++---------
 .../Test_hmc_EODWFRatioLsVectorised_Binary.cc | 186 --------------
 tests/hmc/Test_hmc_EODWFRatio_Gparity.cc      | 182 +++++++++-----
 tests/hmc/Test_hmc_EOWilsonRatio.cc           | 152 +++++++-----
 tests/hmc/Test_hmc_GparityIwasakiGauge.cc     | 115 +++++----
 tests/hmc/Test_hmc_GparityWilsonGauge.cc      | 113 +++++----
 tests/hmc/Test_hmc_IwasakiGauge.cc            | 109 +++++----
 tests/hmc/Test_hmc_RectGauge.cc               | 149 +++++++-----
 .../hmc/Test_hmc_WilsonAdjointFermionGauge.cc | 129 ++++++----
 ...nary.cc => Test_hmc_WilsonFermionGauge.cc} |   0
 ...auge_Binary.cc => Test_hmc_WilsonGauge.cc} |   0
 ..._WilsonMixedRepresentationsFermionGauge.cc | 173 +++++++------
 tests/hmc/Test_hmc_WilsonRatio.cc             | 158 +++++++-----
 ...hmc_WilsonTwoIndexSymmetricFermionGauge.cc | 129 ++++++----
 tests/hmc/Test_rhmc_EOWilson1p1.cc            | 166 ++++++++-----
 tests/hmc/Test_rhmc_EOWilsonRatio.cc          | 171 ++++++++-----
 tests/hmc/Test_rhmc_Wilson1p1.cc              | 166 ++++++++-----
 tests/hmc/Test_rhmc_WilsonRatio.cc            | 171 ++++++++-----
 tests/solver/Test_dwf_cg_prec_LsVec.cc        |   3 -
 25 files changed, 1482 insertions(+), 1208 deletions(-)
 create mode 100644 lib/DisableWarnings.h
 rename tests/hmc/{Test_hmc_EODWFRatio_Binary.cc => Test_hmc_EODWFRatioLsVectorised.cc} (50%)
 delete mode 100644 tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc
 rename tests/hmc/{Test_hmc_WilsonFermionGauge_Binary.cc => Test_hmc_WilsonFermionGauge.cc} (100%)
 rename tests/hmc/{Test_hmc_WilsonGauge_Binary.cc => Test_hmc_WilsonGauge.cc} (100%)

diff --git a/.travis.yml b/.travis.yml
index ae3efda8..98f13b47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ matrix:
       osx_image: xcode7.2
       compiler: clang
     - compiler: gcc
+      sudo: required
       addons:
         apt:
           sources:
diff --git a/lib/DisableWarnings.h b/lib/DisableWarnings.h
new file mode 100644
index 00000000..b3257c62
--- /dev/null
+++ b/lib/DisableWarnings.h
@@ -0,0 +1,37 @@
+/*************************************************************************************
+
+Grid physics library, www.github.com/paboyle/Grid
+
+Source file: ./lib/DisableWarnings.h
+
+Copyright (C) 2016
+
+Author: Guido Cossu <guido.cossu@ed.ac.uk>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+See the full license in the file "LICENSE" in the top level distribution
+directory
+*************************************************************************************/
+/*  END LEGAL */
+
+#ifndef DISABLE_WARNINGS_H
+#define DISABLE_WARNINGS_H
+
+ //disables and intel compiler specific warning (in json.hpp)
+#pragma warning disable 488  
+
+
+#endif
diff --git a/lib/Grid.h b/lib/Grid.h
index 47b3100c..23c0bd05 100644
--- a/lib/Grid.h
+++ b/lib/Grid.h
@@ -60,6 +60,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 // Grid headers
 ///////////////////
 #include "Config.h"
+#include <Grid/DisableWarnings.h>
 #include <Grid/Timer.h>
 #include <Grid/PerfCount.h>
 #include <Grid/Log.h>
diff --git a/lib/json/json.hpp b/lib/json/json.hpp
index 9423521e..97214f0b 100644
--- a/lib/json/json.hpp
+++ b/lib/json/json.hpp
@@ -1348,7 +1348,6 @@ class basic_json
 
     @since version 1.0.0
     */
-#pragma warning disable 488   //disables and intel compiler specific warning
     template<typename T, typename std::enable_if<
                  not (std::is_same<T, int>::value) and
                  std::is_same<T, number_integer_t>::value, int>::type = 0>
diff --git a/lib/qcd/hmc/GenericHMCrunner.h b/lib/qcd/hmc/GenericHMCrunner.h
index 085b5a35..66b16435 100644
--- a/lib/qcd/hmc/GenericHMCrunner.h
+++ b/lib/qcd/hmc/GenericHMCrunner.h
@@ -179,6 +179,17 @@ using GenericHMCRunnerF = HMCWrapperTemplate<PeriodicGimplF, Integrator>;
 template <template <typename, typename, typename> class Integrator>
 using GenericHMCRunnerD = HMCWrapperTemplate<PeriodicGimplD, Integrator>;
 
+
+// These are for gauge fields, default integrator MinimumNorm2
+template <template <typename, typename, typename> class Integrator>
+using ConjugateHMCRunner = HMCWrapperTemplate<ConjugateGimplR, Integrator>;
+template <template <typename, typename, typename> class Integrator>
+using ConjugateHMCRunnerF = HMCWrapperTemplate<ConjugateGimplF, Integrator>;
+template <template <typename, typename, typename> class Integrator>
+using ConjugateHMCRunnerD = HMCWrapperTemplate<ConjugateGimplD, Integrator>;
+
+
+
 template <class RepresentationsPolicy,
           template <typename, typename, typename> class Integrator>
 using GenericHMCRunnerHirep =
@@ -188,7 +199,6 @@ template <class Implementation, class RepresentationsPolicy,
           template <typename, typename, typename> class Integrator>
 using GenericHMCRunnerTemplate = HMCWrapperTemplate<Implementation, Integrator, RepresentationsPolicy>;
 
-
 typedef HMCWrapperTemplate<ScalarImplR, MinimumNorm2, ScalarFields>
     ScalarGenericHMCRunner;
 
diff --git a/tests/hmc/Test_hmc_EODWFRatio.cc b/tests/hmc/Test_hmc_EODWFRatio.cc
index 6010ea03..40b6c040 100644
--- a/tests/hmc/Test_hmc_EODWFRatio.cc
+++ b/tests/hmc/Test_hmc_EODWFRatio.cc
@@ -1,104 +1,160 @@
-    /*************************************************************************************
+/*************************************************************************************
 
-    Grid physics library, www.github.com/paboyle/Grid 
+Grid physics library, www.github.com/paboyle/Grid
 
-    Source file: ./tests/Test_hmc_EODWFRatio.cc
+Source file: ./tests/Test_hmc_EODWFRatio.cc
 
-    Copyright (C) 2015
+Copyright (C) 2015-2016
 
-Author: Peter Boyle <paboyle@ph.ed.ac.uk>
-Author: paboyle <paboyle@ph.ed.ac.uk>
+Author: Peter Boyle <pabobyle@ph.ed.ac.uk>
+Author: Guido Cossu <guido.cossu@ed.ac.uk>
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-    See the full license in the file "LICENSE" in the top level distribution directory
-    *************************************************************************************/
-    /*  END LEGAL */
+See the full license in the file "LICENSE" in the top level distribution
+directory
+*************************************************************************************/
+/*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
-
-namespace Grid { 
-  namespace QCD { 
 
 
-class HmcRunner : public NerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    typedef DomainWallFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    const int Ls = 8;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid);
-    FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid);
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    WilsonGaugeActionR Waction(5.6);
-
-    Real mass= 0.04;
-    Real pv  = 1.0;
-    RealD M5 = 1.5;
-    FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5);
-  
-    ConjugateGradient<FermionField>  CG(1.0e-8,10000);
-    TwoFlavourEvenOddRatioPseudoFermionAction<ImplPolicy> Nf2(NumOp, DenOp,CG,CG);
-  
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1;
-    Level1.push_back(&Nf2);
-    Level1.push_back(&Waction);
-    TheAction.push_back(Level1);
-
-    NumOp.ZeroCounters();
-    DenOp.ZeroCounters();
-    Run(argc,argv);
-    
-    std::cout << GridLogMessage << "Numerator report, Pauli-Villars term         : " << std::endl;
-    NumOp.Report();
-    std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl;
-    DenOp.Report();
-    
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+  typedef WilsonImplR FermionImplPolicy;
+  typedef DomainWallFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_EODWF_lat";
+  CPparams.rng_prefix = "ckpoint_EODWF_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 5.6 ;
+  WilsonGaugeActionR Waction(beta);
+    
+
+  const int Ls = 8;
+  auto GridPtr   = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
+  auto FGrid     = SpaceTimeGrid::makeFiveDimGrid(Ls,GridPtr);
+  auto FrbGrid   = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,GridPtr);
+
+
+  // temporarily need a gauge field
+  LatticeGaugeField U(GridPtr);
+
+  Real mass = 0.04;
+  Real pv   = 1.0;
+  RealD M5  = 1.5;
+
+  FermionAction DenOp(U,*FGrid,*FrbGrid,*GridPtr,*GridRBPtr,mass,M5);
+  FermionAction NumOp(U,*FGrid,*FrbGrid,*GridPtr,*GridRBPtr,pv,  M5);
+
+  double StoppingCondition = 1.0e-8;
+  double MaxCGIterations = 10000;
+  ConjugateGradient<FermionField>  CG(StoppingCondition,MaxCGIterations);
+  TwoFlavourEvenOddRatioPseudoFermionAction<FermionImplPolicy> Nf2(NumOp, DenOp,CG,CG);
+
+    // Set smearing (true/false), default: false
+  Nf2.is_smeared = true;
+
+  // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&Nf2);
+
+  ActionLevel<HMCWrapper::Field> Level2(4);
+  Level2.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
+  /////////////////////////////////////////////////////////////
+
+  /*
+    double rho = 0.1;  // smearing parameter
+    int Nsmear = 2;    // number of smearing levels
+    Smear_Stout<HMCWrapper::ImplPolicy> Stout(rho);
+    SmearedConfiguration<HMCWrapper::ImplPolicy> SmearingPolicy(
+        UGrid, Nsmear, Stout);
+  */
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+
+  // Reset performance counters 
+  NumOp.ZeroCounters();
+  DenOp.ZeroCounters();
+  TheHMC.Run();  // no smearing
+  // TheHMC.Run(SmearingPolicy); // for smearing
+
+  std::cout << GridLogMessage << "Numerator report, Pauli-Villars term         : " << std::endl;
+  NumOp.Report();
+  std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl;
+  DenOp.Report();
+
+
+
+
+  Grid_finalize();
+
+
+
+
+} // main
 
-}
diff --git a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc b/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
similarity index 50%
rename from tests/hmc/Test_hmc_EODWFRatio_Binary.cc
rename to tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
index 1acd05f8..ccf859f4 100644
--- a/tests/hmc/Test_hmc_EODWFRatio_Binary.cc
+++ b/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
@@ -2,11 +2,12 @@
 
 Grid physics library, www.github.com/paboyle/Grid
 
-Source file: ./tests/Test_hmc_EODWFRatio.cc
+Source file: ./tests/Test_hmc_WilsonFermionGauge.cc
 
-Copyright (C) 2015-2016
+Copyright (C) 2015
 
 Author: Peter Boyle <pabobyle@ph.ed.ac.uk>
+Author: neo <cossu@post.kek.jp>
 Author: Guido Cossu <guido.cossu@ed.ac.uk>
 
 This program is free software; you can redistribute it and/or modify
@@ -42,8 +43,9 @@ int main(int argc, char **argv) {
 
    // Typedefs to simplify notation
   typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
-  typedef WilsonImplR FermionImplPolicy;
-  typedef DomainWallFermionR FermionAction;
+
+  typedef DomainWallVec5dImplR FermionImplPolicy;
+  typedef DomainWallFermion<FermionImplPolicy> FermionAction;
   typedef typename FermionAction::FermionField FermionField;
 
 
@@ -86,11 +88,14 @@ int main(int argc, char **argv) {
   RealD beta = 5.6 ;
   WilsonGaugeActionR Waction(beta);
     
+
+  const int Ls = 8;
   auto GridPtr   = TheHMC.Resources.GetCartesian();
   auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
   auto FGrid     = SpaceTimeGrid::makeFiveDimGrid(Ls,GridPtr);
   auto FrbGrid   = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,GridPtr);
-
+  auto sUGrid    = SpaceTimeGrid::makeFourDimDWFGrid(GridDefaultLatt(),GridDefaultMpi());
+  auto sUrbGrid  = SpaceTimeGrid::makeFourDimRedBlackGrid(sUGrid);
 
   // temporarily need a gauge field
   LatticeGaugeField U(GridPtr);
@@ -99,16 +104,17 @@ int main(int argc, char **argv) {
   Real pv   = 1.0;
   RealD M5  = 1.5;
 
-  FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5);
-  FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,  M5);
+  FermionAction DenOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,mass,M5);
+  FermionAction NumOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,pv,M5);
+
 
   double StoppingCondition = 1.0e-8;
   double MaxCGIterations = 10000;
   ConjugateGradient<FermionField>  CG(StoppingCondition,MaxCGIterations);
-  TwoFlavourEvenOddRatioPseudoFermionAction<ImplPolicy> Nf2(NumOp, DenOp,CG,CG);
+  TwoFlavourEvenOddRatioPseudoFermionAction<FermionImplPolicy> Nf2(NumOp, DenOp,CG,CG);
 
     // Set smearing (true/false), default: false
-  Nf2.is_smeared = true;
+  Nf2.is_smeared = false;
 
   // Collect actions
   ActionLevel<HMCWrapper::Field> Level1(1);
@@ -120,15 +126,6 @@ int main(int argc, char **argv) {
   TheHMC.TheAction.push_back(Level1);
   TheHMC.TheAction.push_back(Level2);
   /////////////////////////////////////////////////////////////
-
-  /*
-    double rho = 0.1;  // smearing parameter
-    int Nsmear = 2;    // number of smearing levels
-    Smear_Stout<HMCWrapper::ImplPolicy> Stout(rho);
-    SmearedConfiguration<HMCWrapper::ImplPolicy> SmearingPolicy(
-        UGrid, Nsmear, Stout);
-  */
-
   // HMC parameters are serialisable 
   TheHMC.Parameters.MD.MDsteps = 20;
   TheHMC.Parameters.MD.trajL   = 1.0;
@@ -139,7 +136,6 @@ int main(int argc, char **argv) {
   NumOp.ZeroCounters();
   DenOp.ZeroCounters();
   TheHMC.Run();  // no smearing
-  // TheHMC.Run(SmearingPolicy); // for smearing
 
   std::cout << GridLogMessage << "Numerator report, Pauli-Villars term         : " << std::endl;
   NumOp.Report();
@@ -157,105 +153,3 @@ int main(int argc, char **argv) {
 } // main
 
 
-
-
-// Derive from the BinaryHmcRunner (templated for gauge fields)
-class HmcRunner : public BinaryHmcRunner {
-public:
-  void BuildTheAction(int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    //typedef ScaledShamirFermion<ImplPolicy> FermionAction;
-    typedef DomainWallFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    const int Ls = 8;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-    
-    FGrid   = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid);
-    FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid);
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    double beta = 5.6;
-    WilsonGaugeActionR Waction(beta);
-
-    Real mass = 0.04;
-    Real pv   = 1.0;
-    RealD M5  = 1.5;
-    RealD scale = 2.0;
-    /*
-    FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,scale);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5,scale);
-    */
-    FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5);
-
-    double StoppingCondition = 1.0e-8;
-    double MaxCGIterations = 10000;
-    ConjugateGradient<FermionField>  CG(StoppingCondition,MaxCGIterations);
-    TwoFlavourEvenOddRatioPseudoFermionAction<ImplPolicy> Nf2(NumOp, DenOp,CG,CG);
-
-    // Set smearing (true/false), default: false
-    Nf2.is_smeared = true;
-
-    // Collect actions
-    // here an example of 2 level integration
-    ActionLevel<Field> Level1(1);
-    Level1.push_back(&Nf2);
-    Level1.push_back(&Waction);
-
-    // this level will integrate with a
-    // step that is 4 times finer
-    // than the previous level
-    //ActionLevel<Field> Level2(4);
-    
-
-    TheAction.push_back(Level1);
-    //TheAction.push_back(Level2);
-
-    // Add observables
-    int SaveInterval = 1;
-    std::string format = std::string("IEEE64BIG");
-    std::string conf_prefix = std::string("DWF_ckpoint_lat");
-    std::string rng_prefix = std::string("DWF_ckpoint_rng");
-    BinaryHmcCheckpointer<BinaryHmcRunner::ImplPolicy> Checkpoint(conf_prefix, rng_prefix, SaveInterval, format);
-    // Can implement also a specific function in the hmcrunner
-    // AddCheckpoint (...) that takes the same parameters + a string/tag
-    // defining the type of the checkpointer
-    // with tags can be implemented by overloading and no ifs
-    // Then force all checkpoint to have few common functions
-    // return an object that is then passed to the Run function
-
-    PlaquetteLogger<BinaryHmcRunner::ImplPolicy> PlaqLog(std::string("Plaquette"));
-    ObservablesList.push_back(&PlaqLog);
-    ObservablesList.push_back(&Checkpoint);
-
-    // Smearing section, omit if not needed
-    double rho = 0.1;  // smearing parameter
-    int Nsmear = 2;    // number of smearing levels
-    Smear_Stout<BinaryHmcRunner::ImplPolicy> Stout(rho);
-    SmearedConfiguration<BinaryHmcRunner::ImplPolicy> SmearingPolicy(
-        UGrid, Nsmear, Stout);
-    ///////////////////
-
-    NumOp.ZeroCounters();
-    DenOp.ZeroCounters();
-    //Run(argc, argv, Checkpoint, SmearingPolicy); 
-    Run(argc, argv, Checkpoint);  // no smearing
-
-
-
-    std::cout << GridLogMessage << "Numerator report, Pauli-Villars term         : " << std::endl;
-    NumOp.Report();
-    std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl;
-    DenOp.Report();
-};
-};
-}
-}
diff --git a/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc b/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc
deleted file mode 100644
index ee2df810..00000000
--- a/tests/hmc/Test_hmc_EODWFRatioLsVectorised_Binary.cc
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************************
-
-Grid physics library, www.github.com/paboyle/Grid
-
-Source file: ./tests/Test_hmc_WilsonFermionGauge.cc
-
-Copyright (C) 2015
-
-Author: Peter Boyle <pabobyle@ph.ed.ac.uk>
-Author: neo <cossu@post.kek.jp>
-Author: Guido Cossu <guido.cossu@ed.ac.uk>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-See the full license in the file "LICENSE" in the top level distribution
-directory
-*************************************************************************************/
-/*  END LEGAL */
-#include <Grid/Grid.h>
-
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
-
-namespace Grid {
-namespace QCD {
-
-  class HMCRunnerParameters : Serializable {
-  public:
-    GRID_SERIALIZABLE_CLASS_MEMBERS(HMCRunnerParameters,
-      double, beta,
-      double, mass,
-      int, MaxCGIterations,
-      double, StoppingCondition,
-      bool, smearedAction,
-      int, SaveInterval,
-      std::string, format,
-      std::string, conf_prefix,
-      std::string, rng_prefix,
-      double, rho,
-      int, SmearingLevels,
-      );
-
-    HMCRunnerParameters() {}
-  };
-
-// Derive from the BinaryHmcRunner (templated for gauge fields)
-class HmcRunner : public BinaryHmcRunner {
-public:
-  void BuildTheAction(int argc, char **argv)
-
-  {
-    typedef DomainWallVec5dImplR ImplPolicy;
-    //typedef ScaledShamirFermion<ImplPolicy> FermionAction;
-    typedef DomainWallFermion<ImplPolicy> FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    const int Ls = 8;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-
-
-    GridCartesian* sUGrid   = SpaceTimeGrid::makeFourDimDWFGrid(GridDefaultLatt(),GridDefaultMpi());
-    GridRedBlackCartesian* sUrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(sUGrid);
-
-    
-    FGrid   = SpaceTimeGrid::makeFiveDimDWFGrid(Ls,UGrid);
-    FrbGrid = SpaceTimeGrid::makeFiveDimDWFRedBlackGrid(Ls,UGrid);
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    double beta = 5.6;
-    WilsonGaugeActionR Waction(beta);
-
-    Real mass = 0.04;
-    Real pv   = 1.0;
-    RealD M5  = 1.5;
-    RealD scale = 2.0;
-    /*  
-    // Scaled Shamir
-    FermionAction DenOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,mass,M5,scale);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,pv,M5,scale);
-    */
-    // Std Domain wall fermion
-    FermionAction DenOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,mass,M5);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,*sUGrid,*sUrbGrid,pv,M5);
-
-    double StoppingCondition = 1.0e-8;
-    double MaxCGIterations = 10000;
-    ConjugateGradient<FermionField>  CG(StoppingCondition,MaxCGIterations);
-    TwoFlavourEvenOddRatioPseudoFermionAction<ImplPolicy> Nf2(NumOp, DenOp,CG,CG);
-
-    // Set smearing (true/false), default: false
-    Nf2.is_smeared = false;
-
-    // Collect actions
-    // here an example of 2 level integration
-    ActionLevel<Field> Level1(1);
-    Level1.push_back(&Nf2);
-
-    // this level will integrate with a
-    // step that is 4 times finer
-    // than the previous level
-    ActionLevel<Field> Level2(4);
-    Level2.push_back(&Waction);
-
-    TheAction.push_back(Level1);
-    TheAction.push_back(Level2);
-
-    // Add observables
-    int SaveInterval = 1;
-    std::string format = std::string("IEEE64BIG");
-    std::string conf_prefix = std::string("DWF_ckpoint_lat");
-    std::string rng_prefix = std::string("DWF_ckpoint_rng");
-    BinaryHmcCheckpointer<BinaryHmcRunner::ImplPolicy> Checkpoint(conf_prefix, rng_prefix, SaveInterval, format);
-    // Can implement also a specific function in the hmcrunner
-    // AddCheckpoint (...) that takes the same parameters + a string/tag
-    // defining the type of the checkpointer
-    // with tags can be implemented by overloading and no ifs
-    // Then force all checkpoint to have few common functions
-    // return an object that is then passed to the Run function
-
-    PlaquetteLogger<BinaryHmcRunner::ImplPolicy> PlaqLog(std::string("Plaquette"));
-    ObservablesList.push_back(&PlaqLog);
-    ObservablesList.push_back(&Checkpoint);
-
-    // Smearing section, omit if not needed
-    double rho = 0.1;  // smearing parameter
-    int Nsmear = 2;    // number of smearing levels
-    Smear_Stout<BinaryHmcRunner::ImplPolicy> Stout(rho);
-    SmearedConfiguration<BinaryHmcRunner::ImplPolicy> SmearingPolicy(
-        UGrid, Nsmear, Stout);
-    ///////////////////
-
-    NumOp.ZeroCounters();
-    DenOp.ZeroCounters();
-    //Run(argc, argv, Checkpoint, SmearingPolicy); 
-    Run(argc, argv, Checkpoint);  // no smearing
-
-
-    std::cout << GridLogMessage << "Numerator report, Pauli-Villars term         : " << std::endl;
-    NumOp.Report();
-    std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl;
-    DenOp.Report();
-
-};
-};
-}
-}
-
-int main(int argc, char **argv) {
-  Grid_init(&argc, &argv);
-
-  int threads = GridThread::GetThreads();
-  std::cout << GridLogMessage << "Grid is setup to use " << threads
-            << " threads" << std::endl;
-
-  HmcRunner TheHMC;
-
-
-  // Seeds for the random number generators
-  std::vector<int> SerSeed({1, 2, 3, 4, 5});
-  std::vector<int> ParSeed({6, 7, 8, 9, 10});
-  TheHMC.RNGSeeds(SerSeed, ParSeed);
-
-  TheHMC.MDparameters.set(40, 1.0);// MDsteps, traj length
-
-  TheHMC.BuildTheAction(argc, argv);
-
-  Grid_finalize();
-}
diff --git a/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc b/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
index 78d23437..09c63a6a 100644
--- a/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
+++ b/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
@@ -27,76 +27,126 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
-
-namespace Grid { 
-  namespace QCD { 
 
 
-class HmcRunner : public ConjugateNerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    typedef GparityWilsonImplR ImplPolicy;
-    typedef GparityDomainWallFermionR FermionAction;
-
-    typedef typename FermionAction::FermionField FermionField;
-
-    const int Ls = 8;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = SpaceTimeGrid::makeFiveDimGrid(Ls,UGrid);
-    FrbGrid = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,UGrid);
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    ConjugateWilsonGaugeActionR Waction(5.6);
-
-    // Fermion action
-    const int nu = 3;
-    std::vector<int> twists(Nd,0);
-    twists[nu] = 1;
-    FermionAction::ImplParams params;
-    params.twists = twists;
-    Real mass=0.04;
-    Real pv  =1.0;
-    RealD M5=1.5;
-    FermionAction DenOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,params);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,*UGrid,*UrbGrid,pv,M5,params);
-  
-    ConjugateGradient<FermionField>  CG(1.0e-8,10000);
-    TwoFlavourEvenOddRatioPseudoFermionAction<ImplPolicy> Nf2(NumOp, DenOp,CG,CG);
-  
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1;
-    Level1.push_back(&Nf2);
-    Level1.push_back(&Waction);
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef ConjugateHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+
+  typedef GparityWilsonImplR FermionImplPolicy;
+  typedef GparityDomainWallFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_EODWF_lat";
+  CPparams.rng_prefix = "ckpoint_EODWF_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 5.6 ;
+  ConjugateWilsonGaugeActionR Waction(beta);
+
+  const int Ls = 8;
+  auto GridPtr   = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
+  auto FGrid     = SpaceTimeGrid::makeFiveDimGrid(Ls,GridPtr);
+  auto FrbGrid   = SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls,GridPtr);
+
+
+  // temporarily need a gauge field
+  LatticeGaugeField U(GridPtr);
+
+  const int nu = 3;
+  std::vector<int> twists(Nd,0);
+  twists[nu] = 1;
+  FermionAction::ImplParams params;
+  params.twists = twists;
+  Real mass=0.04;
+  Real pv  =1.0;
+  RealD M5=1.5;
+
+  FermionAction DenOp(U,*FGrid,*FrbGrid,*GridPtr,*GridRBPtr,mass,M5, params);
+  FermionAction NumOp(U,*FGrid,*FrbGrid,*GridPtr,*GridRBPtr,pv,  M5, params);
+
+  double StoppingCondition = 1.0e-8;
+  double MaxCGIterations = 10000;
+  ConjugateGradient<FermionField>  CG(StoppingCondition,MaxCGIterations);
+  TwoFlavourEvenOddRatioPseudoFermionAction<FermionImplPolicy> Nf2(NumOp, DenOp,CG,CG);
+
+  // Set smearing (true/false), default: false
+  Nf2.is_smeared = false;
+
+  // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&Nf2);
+
+  ActionLevel<HMCWrapper::Field> Level2(4);
+  Level2.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
+  /////////////////////////////////////////////////////////////
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+
+  // Reset performance counters 
+  NumOp.ZeroCounters();
+  DenOp.ZeroCounters();
+  TheHMC.Run();  // no smearing
+  // TheHMC.Run(SmearingPolicy); // for smearing
+
+  std::cout << GridLogMessage << "Numerator report, Pauli-Villars term         : " << std::endl;
+  NumOp.Report();
+  std::cout << GridLogMessage << "Denominator report, Dw(m) term (includes CG) : " << std::endl;
+  DenOp.Report();
+
+  Grid_finalize();
+
+
+
+
+} // main
 
-}
diff --git a/tests/hmc/Test_hmc_EOWilsonRatio.cc b/tests/hmc/Test_hmc_EOWilsonRatio.cc
index 3cf81f4c..3f1c5583 100644
--- a/tests/hmc/Test_hmc_EOWilsonRatio.cc
+++ b/tests/hmc/Test_hmc_EOWilsonRatio.cc
@@ -28,70 +28,104 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
-
-namespace Grid { 
-  namespace QCD { 
 
 
-class HmcRunner : public NerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    typedef WilsonFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    WilsonGaugeActionR Waction(5.6);
-
-    RealD mass=-0.77;
-    RealD pv  =0.0;
-    FermionAction DenOp(U,*FGrid,*FrbGrid,mass);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,pv);
-  
-    ConjugateGradient<FermionField>  CG(1.0e-8,10000);
-    TwoFlavourEvenOddRatioPseudoFermionAction<ImplPolicy> Nf2(NumOp, DenOp,CG,CG);
-  
-    //Set smearing (true/false), default: false
-    Nf2.is_smeared=true;
-  
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1;
-    Level1.push_back(&Nf2);
-    Level1.push_back(&Waction);
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+  typedef WilsonImplR FermionImplPolicy;
+  typedef WilsonFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 5.6 ;
+  WilsonGaugeActionR Waction(beta);
+    
+  auto GridPtr = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
+
+  // temporarily need a gauge field
+  LatticeGaugeField U(GridPtr);
+
+  Real mass = -0.77;
+  RealD pv  =  0.0;
+
+  // Can we define an overloaded operator that does not need U and initialises
+  // it with zeroes?
+  FermionAction DenOp(U, *GridPtr, *GridRBPtr, mass);
+  FermionAction NumOp(U, *GridPtr, *GridRBPtr, pv);
+
+  ConjugateGradient<FermionField> CG(1.0e-8, 2000);
+
+  TwoFlavourEvenOddRatioPseudoFermionAction<FermionImplPolicy> Nf2(NumOp, DenOp,CG,CG);
+
+  // Set smearing (true/false), default: false
+  Nf2.is_smeared = false;
+
+
+    // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&Nf2);
+
+  ActionLevel<HMCWrapper::Field> Level2(4);
+  Level2.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
+  /////////////////////////////////////////////////////////////
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+
+  Grid_finalize();
+
+} // main
 
-}
 
diff --git a/tests/hmc/Test_hmc_GparityIwasakiGauge.cc b/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
index 32733b1f..8d793640 100644
--- a/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
+++ b/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
@@ -27,54 +27,81 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
 
-namespace Grid { 
-  namespace QCD { 
-
-
-class HmcRunner : public ConjugateNerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    ConjugateIwasakiGaugeActionR Gaction(2.6);
-
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1(1);
-    Level1.push_back(&Gaction);
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef ConjugateHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+
+  typedef GparityWilsonImplR FermionImplPolicy;
+  typedef GparityDomainWallFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_EODWF_lat";
+  CPparams.rng_prefix = "ckpoint_EODWF_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 2.6 ;
+  ConjugateIwasakiGaugeActionR Waction(beta);
+
+ 
+
+  // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  /////////////////////////////////////////////////////////////
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+
+  TheHMC.Run();  // no smearing
+
+  Grid_finalize();
+} // main
 
-}
 
diff --git a/tests/hmc/Test_hmc_GparityWilsonGauge.cc b/tests/hmc/Test_hmc_GparityWilsonGauge.cc
index 9531d8ee..0cb898ad 100644
--- a/tests/hmc/Test_hmc_GparityWilsonGauge.cc
+++ b/tests/hmc/Test_hmc_GparityWilsonGauge.cc
@@ -27,54 +27,81 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
-
-namespace Grid { 
-  namespace QCD { 
 
 
-class HmcRunner : public ConjugateNerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    ConjugateWilsonGaugeActionR Waction(5.6);
-
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1(1);
-    Level1.push_back(&Waction);
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef ConjugateHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+
+  typedef GparityWilsonImplR FermionImplPolicy;
+  typedef GparityDomainWallFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_EODWF_lat";
+  CPparams.rng_prefix = "ckpoint_EODWF_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 5.6 ;
+  ConjugateWilsonGaugeActionR Waction(beta);
+   
+
+  // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  /////////////////////////////////////////////////////////////
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+
+  TheHMC.Run();  // no smearing
+
+  Grid_finalize();
+} // main
 
-}
 
diff --git a/tests/hmc/Test_hmc_IwasakiGauge.cc b/tests/hmc/Test_hmc_IwasakiGauge.cc
index 6780dfe3..a401cbcb 100644
--- a/tests/hmc/Test_hmc_IwasakiGauge.cc
+++ b/tests/hmc/Test_hmc_IwasakiGauge.cc
@@ -27,58 +27,71 @@ Author: Azusa Yamaguchi <ayamaguc@staffmail.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
 
-namespace Grid { 
-  namespace QCD { 
-
-
-class HmcRunner : public NerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    typedef WilsonFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    IwasakiGaugeActionR Gaction(2.6);
-
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1(1);
-    Level1.push_back(&Gaction);
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 20;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 2.6 ;
+  IwasakiGaugeActionR Iaction(beta);
+  
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&Iaction);
+  //Level1.push_back(WGMod.getPtr());
+  TheHMC.TheAction.push_back(Level1);
+  /////////////////////////////////////////////////////////////
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+
+  Grid_finalize();
+
+} // main
 
-}
 
diff --git a/tests/hmc/Test_hmc_RectGauge.cc b/tests/hmc/Test_hmc_RectGauge.cc
index c79ebbf8..023ec83d 100644
--- a/tests/hmc/Test_hmc_RectGauge.cc
+++ b/tests/hmc/Test_hmc_RectGauge.cc
@@ -1,84 +1,99 @@
-    /*************************************************************************************
+/*************************************************************************************
 
-    Grid physics library, www.github.com/paboyle/Grid 
+Grid physics library, www.github.com/paboyle/Grid
 
-    Source file: ./tests/Test_hmc_RectGauge.cc
+Source file: ./tests/Test_hmc_RectGauge.cc
 
-    Copyright (C) 2015
+Copyright (C) 2015-2016
 
 Author: Azusa Yamaguchi <ayamaguc@staffmail.ed.ac.uk>
+Author: Guido Cossu <guido.cossu@ed.ac.uk>
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-    See the full license in the file "LICENSE" in the top level distribution directory
-    *************************************************************************************/
-    /*  END LEGAL */
+See the full license in the file "LICENSE" in the top level distribution
+directory
+*************************************************************************************/
+/*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
-
-namespace Grid { 
-  namespace QCD { 
-
-
-class HmcRunner : public NerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    typedef WilsonFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    PlaqPlusRectangleActionR Gaction(2.0,0.331);
-
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1(1);
-    Level1.push_back(&Gaction);
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 20;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 2.0 ;
+  RealD c_rect = 0.331;
+  PlaqPlusRectangleActionR Gaction(beta, c_rect);
+  
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&Gaction);
+  //Level1.push_back(WGMod.getPtr());
+  TheHMC.TheAction.push_back(Level1);
+  /////////////////////////////////////////////////////////////
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+
+  Grid_finalize();
+
+} // main
 
-}
 
diff --git a/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc b/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
index 51171e8e..54cb31ae 100644
--- a/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
@@ -31,77 +31,102 @@ directory
 /*  END LEGAL */
 #include "Grid/Grid.h"
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
-namespace Grid {
-namespace QCD {
+  // Here change the allowed (higher) representations
+  typedef Representations< FundamentalRepresentation, AdjointRepresentation > TheRepresentations;
 
-// Here change the allowed (higher) representations
-typedef Representations< FundamentalRepresentation, AdjointRepresentation > TheRepresentations;
+  Grid_init(&argc, &argv);
+  int threads = GridThread::GetThreads();
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
+
+   // Typedefs to simplify notation
+  typedef GenericHMCRunnerHirep<TheRepresentations, MinimumNorm2> HMCWrapper;
+  typedef WilsonAdjImplR FermionImplPolicy; // gauge field implemetation for the pseudofermions
+  typedef WilsonAdjFermionR FermionAction; // type of lattice fermions (Wilson, DW, ...)
+  typedef typename FermionAction::FermionField FermionField;
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
 
 
-class HmcRunner : public NerscHmcRunnerHirep< TheRepresentations > {
- public:
-  void BuildTheAction(int argc, char **argv)
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
+  
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
 
-  {
-    typedef WilsonAdjImplR ImplPolicy; // gauge field implemetation for the pseudofermions
-    typedef WilsonAdjFermionR FermionAction; // type of lattice fermions (Wilson, DW, ...)
-    typedef typename FermionAction::FermionField FermionField;
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
 
-    UGrid = SpaceTimeGrid::makeFourDimGrid(
-        GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()),
-        GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
 
-    FGrid = UGrid;
-    FrbGrid = UrbGrid;
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 2.25 ;
+  WilsonGaugeActionR Waction(beta);
+    
+  auto GridPtr = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
 
-    // temporarily need a gauge field
-    //LatticeGaugeField U(UGrid);
-    AdjointRepresentation::LatticeField U(UGrid);
+  // temporarily need a gauge field
+  AdjointRepresentation::LatticeField U(GridPtr);
 
-    // Gauge action
-    WilsonGaugeActionR Waction(2.25);
+  Real mass = -0.95;
 
-    Real mass = -0.95;
-    FermionAction FermOp(U, *FGrid, *FrbGrid, mass);
+  // Can we define an overloaded operator that does not need U and initialises
+  // it with zeroes?
+  FermionAction FermOp(U, *GridPtr, *GridRBPtr, mass);
 
-    ConjugateGradient<FermionField> CG(1.0e-8, 10000, false);
-    ConjugateResidual<FermionField> CR(1.0e-8, 10000);
+  ConjugateGradient<FermionField> CG(1.0e-8, 2000, false);
 
-    // Pass two solvers: one for the force computation and one for the action
-    TwoFlavourPseudoFermionAction<ImplPolicy> Nf2(FermOp, CG, CG);
+  TwoFlavourPseudoFermionAction<FermionImplPolicy> Nf2(FermOp, CG, CG);
+
+  // Set smearing (true/false), default: false
+  Nf2.is_smeared = false;
 
-    // Set smearing (true/false), default: false
-    Nf2.is_smeared = false;
 
     // Collect actions
-    ActionLevel<LatticeGaugeField, TheRepresentations > Level1(1);
-    Level1.push_back(&Nf2);
+  ActionLevel<LatticeGaugeField, TheRepresentations > Level1(1);
+  Level1.push_back(&Nf2);
 
-    ActionLevel<LatticeGaugeField, TheRepresentations > Level2(4);
-    Level2.push_back(&Waction);
+  ActionLevel<LatticeGaugeField, TheRepresentations > Level2(4);
+  Level2.push_back(&Waction);
 
-    TheAction.push_back(Level1);
-    TheAction.push_back(Level2);
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
 
-    Run(argc, argv);
-  };
-};
-}
-}
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
 
-int main(int argc, char **argv) {
-  Grid_init(&argc, &argv);
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+  // TheHMC.Run(SmearingPolicy); // for smearing
 
-  int threads = GridThread::GetThreads();
-  std::cout << GridLogMessage << "Grid is setup to use " << threads
-            << " threads" << std::endl;
+  Grid_finalize();
 
-  HmcRunner TheHMC;
+} // main
 
-  TheHMC.BuildTheAction(argc, argv);
-}
diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonFermionGauge.cc
similarity index 100%
rename from tests/hmc/Test_hmc_WilsonFermionGauge_Binary.cc
rename to tests/hmc/Test_hmc_WilsonFermionGauge.cc
diff --git a/tests/hmc/Test_hmc_WilsonGauge_Binary.cc b/tests/hmc/Test_hmc_WilsonGauge.cc
similarity index 100%
rename from tests/hmc/Test_hmc_WilsonGauge_Binary.cc
rename to tests/hmc/Test_hmc_WilsonGauge.cc
diff --git a/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc b/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
index 50cb219e..66511398 100644
--- a/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
@@ -31,83 +31,112 @@ directory
 /*  END LEGAL */
 #include "Grid/Grid.h"
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
 
-namespace Grid {
-namespace QCD {
 
-// Here change the allowed (higher) representations
-typedef Representations< FundamentalRepresentation, AdjointRepresentation , TwoIndexSymmetricRepresentation> TheRepresentations;
-
-class HmcRunner : public NerscHmcRunnerHirep< TheRepresentations > {
- public:
-  void BuildTheAction(int argc, char **argv)
-
-  {
-    typedef WilsonAdjImplR AdjImplPolicy; // gauge field implemetation for the pseudofermions
-    typedef WilsonAdjFermionR AdjFermionAction; // type of lattice fermions (Wilson, DW, ...)
-    typedef WilsonTwoIndexSymmetricImplR SymmImplPolicy; 
-    typedef WilsonTwoIndexSymmetricFermionR SymmFermionAction; 
-
- 
-    typedef typename AdjFermionAction::FermionField AdjFermionField;
-    typedef typename SymmFermionAction::FermionField SymmFermionField;
-
-    UGrid = SpaceTimeGrid::makeFourDimGrid(
-        GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()),
-        GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-
-    FGrid = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    //LatticeGaugeField U(UGrid);
-    AdjointRepresentation::LatticeField UA(UGrid);
-    TwoIndexSymmetricRepresentation::LatticeField US(UGrid);
-
-    // Gauge action
-    WilsonGaugeActionR Waction(5.6);
-
-    Real adjoint_mass = -0.1;
-    Real symm_mass = -0.5;
-    AdjFermionAction AdjFermOp(UA, *FGrid, *FrbGrid, adjoint_mass);
-    SymmFermionAction SymmFermOp(US, *FGrid, *FrbGrid, symm_mass);
-
-    ConjugateGradient<AdjFermionField> CG_adj(1.0e-8, 10000, false);
-    ConjugateGradient<SymmFermionField> CG_symm(1.0e-8, 10000, false);
-
-    // Pass two solvers: one for the force computation and one for the action
-    TwoFlavourPseudoFermionAction<AdjImplPolicy> Nf2_Adj(AdjFermOp, CG_adj, CG_adj);
-    TwoFlavourPseudoFermionAction<SymmImplPolicy> Nf2_Symm(SymmFermOp, CG_symm, CG_symm);
-
-    // Collect actions
-    ActionLevel<LatticeGaugeField, TheRepresentations > Level1(1);
-    Level1.push_back(&Nf2_Adj);
-    Level1.push_back(&Nf2_Symm);
-
-    ActionLevel<LatticeGaugeField, TheRepresentations > Level2(4);
-    Level2.push_back(&Waction);
-
-    TheAction.push_back(Level1);
-    TheAction.push_back(Level2);
-
-    Run(argc, argv);
-  };
-};
-}
-}
 
 int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
+
+  // Here change the allowed (higher) representations
+  typedef Representations< FundamentalRepresentation, AdjointRepresentation , TwoIndexSymmetricRepresentation> TheRepresentations;
+
   Grid_init(&argc, &argv);
-
   int threads = GridThread::GetThreads();
-  std::cout << GridLogMessage << "Grid is setup to use " << threads
-            << " threads" << std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
+
+   // Typedefs to simplify notation
+  typedef GenericHMCRunnerHirep<TheRepresentations, MinimumNorm2> HMCWrapper;
+
+  typedef WilsonAdjImplR AdjImplPolicy; // gauge field implemetation for the pseudofermions
+  typedef WilsonAdjFermionR AdjFermionAction; // type of lattice fermions (Wilson, DW, ...)
+  typedef WilsonTwoIndexSymmetricImplR SymmImplPolicy; 
+  typedef WilsonTwoIndexSymmetricFermionR SymmFermionAction; 
+
+
+  typedef typename AdjFermionAction::FermionField AdjFermionField;
+  typedef typename SymmFermionAction::FermionField SymmFermionField;
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
+  
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 2.25 ;
+  WilsonGaugeActionR Waction(beta);
+    
+  auto GridPtr = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
+
+  // temporarily need a gauge field
+  AdjointRepresentation::LatticeField UA(GridPtr);
+  TwoIndexSymmetricRepresentation::LatticeField US(GridPtr);
+
+  Real adjoint_mass = -0.1;
+  Real symm_mass = -0.5;
+  AdjFermionAction AdjFermOp(UA, *GridPtr, *GridRBPtr, adjoint_mass);
+  SymmFermionAction SymmFermOp(US, *GridPtr, *GridRBPtr, symm_mass);
+
+  ConjugateGradient<AdjFermionField> CG_adj(1.0e-8, 10000, false);
+  ConjugateGradient<SymmFermionField> CG_symm(1.0e-8, 10000, false);
+
+  // Pass two solvers: one for the force computation and one for the action
+  TwoFlavourPseudoFermionAction<AdjImplPolicy> Nf2_Adj(AdjFermOp, CG_adj, CG_adj);
+  TwoFlavourPseudoFermionAction<SymmImplPolicy> Nf2_Symm(SymmFermOp, CG_symm, CG_symm);
+
+  // Collect actions
+  ActionLevel<LatticeGaugeField, TheRepresentations > Level1(1);
+  Level1.push_back(&Nf2_Adj);
+  Level1.push_back(&Nf2_Symm);
+
+
+  ActionLevel<LatticeGaugeField, TheRepresentations > Level2(4);
+  Level2.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+
+  Grid_finalize();
+
+} // main
 
-  HmcRunner TheHMC;
 
-  TheHMC.BuildTheAction(argc, argv);
-}
diff --git a/tests/hmc/Test_hmc_WilsonRatio.cc b/tests/hmc/Test_hmc_WilsonRatio.cc
index 4bbbfa24..2adb2953 100644
--- a/tests/hmc/Test_hmc_WilsonRatio.cc
+++ b/tests/hmc/Test_hmc_WilsonRatio.cc
@@ -28,71 +28,109 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
 
-namespace Grid { 
-  namespace QCD { 
-
-
-class HmcRunner : public NerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    typedef WilsonFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    WilsonGaugeActionR Waction(5.6);
-
-    RealD mass=-0.77;
-    RealD pv  =0.0;
-    FermionAction DenOp(U,*FGrid,*FrbGrid,mass);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,pv);
-  
-    ConjugateGradient<FermionField>  CG(1.0e-8,10000);
-    TwoFlavourRatioPseudoFermionAction<ImplPolicy> Nf2(NumOp, DenOp,CG,CG);
-
-    //Set smearing (true/false), default: false
-    Nf2.is_smeared=true;
-  
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1;
-    Level1.push_back(&Nf2);
-    Level1.push_back(&Waction);
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+  typedef WilsonImplR FermionImplPolicy;
+  typedef WilsonFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
 
-}
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 5.6 ;
+  WilsonGaugeActionR Waction(beta);
+    
+  auto GridPtr = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
+
+  // temporarily need a gauge field
+  LatticeGaugeField U(GridPtr);
+
+  RealD mass = -0.77;
+  RealD pv   =  0.0;
+
+  FermionAction DenOp(U, *GridPtr, *GridRBPtr, mass);
+  FermionAction NumOp(U, *GridPtr, *GridRBPtr, pv);
+
+  ConjugateGradient<FermionField> CG(1.0e-8, 2000);
+
+  TwoFlavourRatioPseudoFermionAction<FermionImplPolicy> Nf2(NumOp, DenOp,CG,CG);
+
+  // Set smearing (true/false), default: false
+  Nf2.is_smeared = false;
 
 
+    // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&Nf2);
+
+  ActionLevel<HMCWrapper::Field> Level2(4);
+  Level2.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
+  /////////////////////////////////////////////////////////////
+
+  /*
+    double rho = 0.1;  // smearing parameter
+    int Nsmear = 2;    // number of smearing levels
+    Smear_Stout<HMCWrapper::ImplPolicy> Stout(rho);
+    SmearedConfiguration<HMCWrapper::ImplPolicy> SmearingPolicy(
+        UGrid, Nsmear, Stout);
+  */
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+  // TheHMC.Run(SmearingPolicy); // for smearing
+
+  Grid_finalize();
+
+} // main
diff --git a/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc b/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
index b027b111..d03a3cd2 100644
--- a/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
@@ -29,75 +29,104 @@ directory
 /*  END LEGAL */
 #include "Grid/Grid.h"
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
-namespace Grid {
-namespace QCD {
+  // Here change the allowed (higher) representations
+  typedef Representations< FundamentalRepresentation, TwoIndexSymmetricRepresentation > TheRepresentations;
 
-// Here change the allowed (higher) representations
-typedef Representations< FundamentalRepresentation, TwoIndexSymmetricRepresentation > TheRepresentations;
+  Grid_init(&argc, &argv);
+  int threads = GridThread::GetThreads();
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
+
+   // Typedefs to simplify notation
+  typedef GenericHMCRunnerHirep<TheRepresentations, MinimumNorm2> HMCWrapper;
+
+  typedef WilsonTwoIndexSymmetricImplR FermionImplPolicy; // gauge field implemetation for the pseudofermions
+  typedef WilsonTwoIndexSymmetricFermionR FermionAction; // type of lattice fermions (Wilson, DW, ...)
+  typedef typename FermionAction::FermionField FermionField;
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
 
 
-class HmcRunner : public NerscHmcRunnerHirep< TheRepresentations > {
- public:
-  void BuildTheAction(int argc, char **argv)
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
+  
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
 
-  {
-    typedef WilsonTwoIndexSymmetricImplR ImplPolicy; // gauge field implemetation for the pseudofermions
-    typedef WilsonTwoIndexSymmetricFermionR FermionAction; // type of lattice fermions (Wilson, DW, ...)
-    typedef typename FermionAction::FermionField FermionField;
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
 
-    UGrid = SpaceTimeGrid::makeFourDimGrid(
-        GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()),
-        GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
 
-    FGrid = UGrid;
-    FrbGrid = UrbGrid;
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 2.25 ;
+  WilsonGaugeActionR Waction(beta);
+    
+  auto GridPtr = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
 
-    // temporarily need a gauge field
-    TwoIndexSymmetricRepresentation::LatticeField U(UGrid);
+  // temporarily need a gauge field
+  TwoIndexSymmetricRepresentation::LatticeField U(GridPtr);
 
-    // Gauge action
-    WilsonGaugeActionR Waction(2.0);
+  Real mass = -0.95;
 
-    Real mass = -0.0;
-    FermionAction FermOp(U, *FGrid, *FrbGrid, mass);
+  // Can we define an overloaded operator that does not need U and initialises
+  // it with zeroes?
+  FermionAction FermOp(U, *GridPtr, *GridRBPtr, mass);
 
-    ConjugateGradient<FermionField> CG(1.0e-8, 10000, false);
+  ConjugateGradient<FermionField> CG(1.0e-8, 2000, false);
 
-    // Pass two solvers: one for the force computation and one for the action
-    TwoFlavourPseudoFermionAction<ImplPolicy> Nf2(FermOp, CG, CG);
+  TwoFlavourPseudoFermionAction<FermionImplPolicy> Nf2(FermOp, CG, CG);
+
+  // Set smearing (true/false), default: false
+  Nf2.is_smeared = false;
 
-    // Set smearing (true/false), default: false
-    Nf2.is_smeared = false;
 
     // Collect actions
-    ActionLevel<LatticeGaugeField, TheRepresentations > Level1(1);
-    Level1.push_back(&Nf2);
+  ActionLevel<LatticeGaugeField, TheRepresentations > Level1(1);
+  Level1.push_back(&Nf2);
 
-    ActionLevel<LatticeGaugeField, TheRepresentations > Level2(4);
-    Level2.push_back(&Waction);
+  ActionLevel<LatticeGaugeField, TheRepresentations > Level2(4);
+  Level2.push_back(&Waction);
 
-    TheAction.push_back(Level1);
-    TheAction.push_back(Level2);
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
 
-    Run(argc, argv);
-  };
-};
-}
-}
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
 
-int main(int argc, char **argv) {
-  Grid_init(&argc, &argv);
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+  // TheHMC.Run(SmearingPolicy); // for smearing
 
-  int threads = GridThread::GetThreads();
-  std::cout << GridLogMessage << "Grid is setup to use " << threads
-            << " threads" << std::endl;
+  Grid_finalize();
+
+} // main
 
-  HmcRunner TheHMC;
 
-  TheHMC.BuildTheAction(argc, argv);
-}
diff --git a/tests/hmc/Test_rhmc_EOWilson1p1.cc b/tests/hmc/Test_rhmc_EOWilson1p1.cc
index b8605d55..f7470a19 100644
--- a/tests/hmc/Test_rhmc_EOWilson1p1.cc
+++ b/tests/hmc/Test_rhmc_EOWilson1p1.cc
@@ -28,72 +28,112 @@ See the full license in the file "LICENSE" in the top level distribution directo
 /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
-
-namespace Grid {
-namespace QCD {
-
-class HmcRunner : public NerscHmcRunner {
- public:
-  void BuildTheAction(int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    typedef WilsonFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    UGrid = SpaceTimeGrid::makeFourDimGrid(
-        GridDefaultLatt(), GridDefaultSimd(Nd, vComplex::Nsimd()),
-        GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-
-    FGrid = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField U(UGrid);
-
-    // Gauge action
-    WilsonGaugeActionR Waction(5.6);
-
-    Real mass = -0.77;
-    FermionAction FermOp(U, *FGrid, *FrbGrid, mass);
-
-    // 1+1 flavour
-    OneFlavourRationalParams Params(1.0e-4, 64.0, 2000, 1.0e-6);
-    OneFlavourEvenOddRationalPseudoFermionAction<WilsonImplR> WilsonNf1a(
-        FermOp, Params);
-    OneFlavourEvenOddRationalPseudoFermionAction<WilsonImplR> WilsonNf1b(
-        FermOp, Params);
-
-    //Smearing on/off
-    WilsonNf1a.is_smeared = true;
-    WilsonNf1b.is_smeared = true;
-
-    // Collect actions
-    ActionLevel<LatticeGaugeField> Level1;
-    Level1.push_back(&WilsonNf1a);
-    Level1.push_back(&WilsonNf1b);
-    Level1.push_back(&Waction);
-
-    TheAction.push_back(Level1);
-
-    Run(argc, argv);
-  };
-};
-}
-}
 
 int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
+
   Grid_init(&argc, &argv);
-
   int threads = GridThread::GetThreads();
-  std::cout << GridLogMessage << "Grid is setup to use " << threads
-            << " threads" << std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+  typedef WilsonImplR FermionImplPolicy;
+  typedef WilsonFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
+  
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 5.6 ;
+  WilsonGaugeActionR Waction(beta);
+    
+  auto GridPtr = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
+
+  // temporarily need a gauge field
+  LatticeGaugeField U(GridPtr);
+
+  Real mass = -0.77;
+
+  // Can we define an overloaded operator that does not need U and initialises
+  // it with zeroes?
+  FermionAction FermOp(U, *GridPtr, *GridRBPtr, mass);
+
+  // 1+1 flavour
+  OneFlavourRationalParams Params(1.0e-4, 64.0, 2000, 1.0e-6);
+  OneFlavourEvenOddRationalPseudoFermionAction<FermionImplPolicy> WilsonNf1a(FermOp, Params);
+  OneFlavourEvenOddRationalPseudoFermionAction<FermionImplPolicy> WilsonNf1b(FermOp, Params);
+
+  //Smearing on/off
+  WilsonNf1a.is_smeared = false;
+  WilsonNf1b.is_smeared = false;
+
+    // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&WilsonNf1a);
+  Level1.push_back(&WilsonNf1b);
+
+  ActionLevel<HMCWrapper::Field> Level2(4);
+  Level2.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
+  /////////////////////////////////////////////////////////////
+
+  /*
+    double rho = 0.1;  // smearing parameter
+    int Nsmear = 2;    // number of smearing levels
+    Smear_Stout<HMCWrapper::ImplPolicy> Stout(rho);
+    SmearedConfiguration<HMCWrapper::ImplPolicy> SmearingPolicy(
+        UGrid, Nsmear, Stout);
+  */
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+  // TheHMC.Run(SmearingPolicy); // for smearing
+
+  Grid_finalize();
+
+} // main
 
-  TheHMC.BuildTheAction(argc, argv);
-}
diff --git a/tests/hmc/Test_rhmc_EOWilsonRatio.cc b/tests/hmc/Test_rhmc_EOWilsonRatio.cc
index 6a37e38a..fd5935db 100644
--- a/tests/hmc/Test_rhmc_EOWilsonRatio.cc
+++ b/tests/hmc/Test_rhmc_EOWilsonRatio.cc
@@ -28,73 +28,122 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
-
-namespace Grid { 
-  namespace QCD { 
 
 
-class HmcRunner : public NerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    typedef WilsonFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    WilsonGaugeActionR Waction(5.6);
-
-    RealD mass=-0.77;
-    RealD pv  =0.0;
-    FermionAction DenOp(U,*FGrid,*FrbGrid,mass);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,pv);
-  
-
-  // erange,maxiter,resid,npoly
-    OneFlavourRationalParams Params(1.0e-2,64.0,1000,1.0e-6,6);
-    OneFlavourEvenOddRatioRationalPseudoFermionAction<WilsonImplR> WilsonNf1a(NumOp,DenOp,Params);
-    OneFlavourEvenOddRatioRationalPseudoFermionAction<WilsonImplR> WilsonNf1b(NumOp,DenOp,Params);
-  
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1;
-    Level1.push_back(&WilsonNf1a);
-    Level1.push_back(&WilsonNf1b);
-    Level1.push_back(&Waction);
-
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+  typedef WilsonImplR FermionImplPolicy;
+  typedef WilsonFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 5.6 ;
+  WilsonGaugeActionR Waction(beta);
+    
+  auto GridPtr = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
+
+  // temporarily need a gauge field
+  LatticeGaugeField U(GridPtr);
+
+  Real mass = -0.77;
+  Real pv   = 0.0;
+
+  // Can we define an overloaded operator that does not need U and initialises
+  // it with zeroes?
+  FermionAction DenOp(U, *GridPtr, *GridRBPtr, mass);
+  FermionAction NumOp(U, *GridPtr, *GridRBPtr, pv);
+
+
+  // 1+1 flavour
+  // erange,maxiter,resid,npoly
+  OneFlavourRationalParams Params(1.0e-2,64.0,1000,1.0e-6,6);
+
+  OneFlavourEvenOddRatioRationalPseudoFermionAction<FermionImplPolicy> WilsonNf1a(NumOp,DenOp,Params);
+  OneFlavourEvenOddRatioRationalPseudoFermionAction<FermionImplPolicy> WilsonNf1b(NumOp,DenOp,Params);
+
+  //Smearing on/off
+  WilsonNf1a.is_smeared = false;
+  WilsonNf1b.is_smeared = false;
+
+    // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&WilsonNf1a);
+  Level1.push_back(&WilsonNf1b);
+
+  ActionLevel<HMCWrapper::Field> Level2(4);
+  Level2.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
+  /////////////////////////////////////////////////////////////
+
+  /*
+    double rho = 0.1;  // smearing parameter
+    int Nsmear = 2;    // number of smearing levels
+    Smear_Stout<HMCWrapper::ImplPolicy> Stout(rho);
+    SmearedConfiguration<HMCWrapper::ImplPolicy> SmearingPolicy(
+        UGrid, Nsmear, Stout);
+  */
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+  // TheHMC.Run(SmearingPolicy); // for smearing
+
+  Grid_finalize();
+
+} // main
+
+
 
-}
 
 
diff --git a/tests/hmc/Test_rhmc_Wilson1p1.cc b/tests/hmc/Test_rhmc_Wilson1p1.cc
index 0ef2716d..2567d0f5 100644
--- a/tests/hmc/Test_rhmc_Wilson1p1.cc
+++ b/tests/hmc/Test_rhmc_Wilson1p1.cc
@@ -28,73 +28,115 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
-
-namespace Grid { 
-  namespace QCD { 
 
 
-class HmcRunner : public NerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    typedef WilsonFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    WilsonGaugeActionR Waction(5.6);
-
-    Real mass=-0.77;
-    FermionAction FermOp(U,*FGrid,*FrbGrid,mass);
-
-    // 1+1 flavour
-    OneFlavourRationalParams Params(1.0e-4,64.0,1000,1.0e-6);
-    OneFlavourRationalPseudoFermionAction<WilsonImplR> WilsonNf1a(FermOp,Params);
-    OneFlavourRationalPseudoFermionAction<WilsonImplR> WilsonNf1b(FermOp,Params);
-
-    //Set smearing (true/false), default: false
-    WilsonNf1a.is_smeared=false;
-    WilsonNf1b.is_smeared=false;
-
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1;
-    Level1.push_back(&WilsonNf1a);
-    Level1.push_back(&WilsonNf1b);
-    Level1.push_back(&Waction);
-    
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+  typedef WilsonImplR FermionImplPolicy;
+  typedef WilsonFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 5.6 ;
+  WilsonGaugeActionR Waction(beta);
+    
+  auto GridPtr = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
+
+  // temporarily need a gauge field
+  LatticeGaugeField U(GridPtr);
+
+  Real mass = -0.77;
+
+  // Can we define an overloaded operator that does not need U and initialises
+  // it with zeroes?
+  FermionAction FermOp(U, *GridPtr, *GridRBPtr, mass);
+
+  // 1+1 flavour
+  OneFlavourRationalParams Params(1.0e-4, 64.0, 2000, 1.0e-6);
+  OneFlavourRationalPseudoFermionAction<WilsonImplR> WilsonNf1a(FermOp,Params);
+  OneFlavourRationalPseudoFermionAction<WilsonImplR> WilsonNf1b(FermOp,Params);
+
+  //Smearing on/off
+  WilsonNf1a.is_smeared = false;
+  WilsonNf1b.is_smeared = false;
+
+    // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&WilsonNf1a);
+  Level1.push_back(&WilsonNf1b);
+
+  ActionLevel<HMCWrapper::Field> Level2(4);
+  Level2.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
+  /////////////////////////////////////////////////////////////
+
+  /*
+    double rho = 0.1;  // smearing parameter
+    int Nsmear = 2;    // number of smearing levels
+    Smear_Stout<HMCWrapper::ImplPolicy> Stout(rho);
+    SmearedConfiguration<HMCWrapper::ImplPolicy> SmearingPolicy(
+        UGrid, Nsmear, Stout);
+  */
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+  // TheHMC.Run(SmearingPolicy); // for smearing
+
+  Grid_finalize();
+
+} // main
+
 
-}
 
diff --git a/tests/hmc/Test_rhmc_WilsonRatio.cc b/tests/hmc/Test_rhmc_WilsonRatio.cc
index bbb68eb3..63a623a1 100644
--- a/tests/hmc/Test_rhmc_WilsonRatio.cc
+++ b/tests/hmc/Test_rhmc_WilsonRatio.cc
@@ -28,72 +28,119 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/Grid.h>
 
-using namespace std;
-using namespace Grid;
-using namespace Grid::QCD;
 
-namespace Grid { 
-  namespace QCD { 
-
-
-class HmcRunner : public NerscHmcRunner {
-public:
-
-  void BuildTheAction (int argc, char **argv)
-
-  {
-    typedef WilsonImplR ImplPolicy;
-    typedef WilsonFermionR FermionAction;
-    typedef typename FermionAction::FermionField FermionField;
-
-    UGrid   = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(), GridDefaultSimd(Nd,vComplex::Nsimd()),GridDefaultMpi());
-    UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
-  
-    FGrid   = UGrid;
-    FrbGrid = UrbGrid;
-
-    // temporarily need a gauge field
-    LatticeGaugeField  U(UGrid);
-
-    // Gauge action
-    WilsonGaugeActionR Waction(5.6);
-
-    RealD mass=-0.77;
-    RealD pv  =0.0;
-    FermionAction DenOp(U,*FGrid,*FrbGrid,mass);
-    FermionAction NumOp(U,*FGrid,*FrbGrid,pv);
-  
-
-  // erange,maxiter,resid,npoly
-    OneFlavourRationalParams Params(1.0e-2,64.0,1000,1.0e-6,6);
-    OneFlavourRatioRationalPseudoFermionAction<WilsonImplR> WilsonNf1a(NumOp,DenOp,Params);
-    OneFlavourRatioRationalPseudoFermionAction<WilsonImplR> WilsonNf1b(NumOp,DenOp,Params);
-  
-    //Collect actions
-    ActionLevel<LatticeGaugeField> Level1;
-    Level1.push_back(&WilsonNf1a);
-    Level1.push_back(&WilsonNf1b);
-    Level1.push_back(&Waction);
-
-    TheAction.push_back(Level1);
-
-    Run(argc,argv);
-  };
-
-};
-
-}}
-
-int main (int argc, char ** argv)
-{
-  Grid_init(&argc,&argv);
+int main(int argc, char **argv) {
+  using namespace Grid;
+  using namespace Grid::QCD;
 
+  Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
-  std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
+  // here make a routine to print all the relevant information on the run
+  std::cout << GridLogMessage << "Grid is setup to use " << threads << " threads" << std::endl;
 
-  HmcRunner TheHMC;
+   // Typedefs to simplify notation
+  typedef GenericHMCRunner<MinimumNorm2> HMCWrapper;  // Uses the default minimum norm
+  typedef WilsonImplR FermionImplPolicy;
+  typedef WilsonFermionR FermionAction;
+  typedef typename FermionAction::FermionField FermionField;
+
+
+  //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+  HMCWrapper TheHMC;
+
+  // Grid from the command line
+  TheHMC.Resources.AddFourDimGrid("gauge");
+  // Possibile to create the module by hand 
+  // hardcoding parameters or using a Reader
+
+
+  // Checkpointer definition
+  CheckpointerParameters CPparams;  
+  CPparams.config_prefix = "ckpoint_lat";
+  CPparams.rng_prefix = "ckpoint_rng";
+  CPparams.saveInterval = 5;
+  CPparams.format = "IEEE64BIG";
   
-  TheHMC.BuildTheAction(argc,argv);
+  TheHMC.Resources.LoadBinaryCheckpointer(CPparams);
+
+  RNGModuleParameters RNGpar;
+  RNGpar.SerialSeed = {1,2,3,4,5};
+  RNGpar.ParallelSeed = {6,7,8,9,10};
+  TheHMC.Resources.SetRNGSeeds(RNGpar);
+
+  // Construct observables
+  // here there is too much indirection 
+  PlaquetteObsParameters PlPar;
+  PlPar.output_prefix = "Plaquette";
+  PlaquetteMod<HMCWrapper::ImplPolicy> PlaqModule(PlPar);
+  TheHMC.Resources.AddObservable(&PlaqModule);
+  //////////////////////////////////////////////
+
+  /////////////////////////////////////////////////////////////
+  // Collect actions, here use more encapsulation
+  // need wrappers of the fermionic classes 
+  // that have a complex construction
+  // standard
+  RealD beta = 5.6 ;
+  WilsonGaugeActionR Waction(beta);
+    
+  auto GridPtr = TheHMC.Resources.GetCartesian();
+  auto GridRBPtr = TheHMC.Resources.GetRBCartesian();
+
+  // temporarily need a gauge field
+  LatticeGaugeField U(GridPtr);
+
+  Real mass = -0.77;
+  Real pv   = 0.0;
+
+  // Can we define an overloaded operator that does not need U and initialises
+  // it with zeroes?
+  FermionAction DenOp(U, *GridPtr, *GridRBPtr, mass);
+  FermionAction NumOp(U, *GridPtr, *GridRBPtr, pv);
+
+
+  // 1+1 flavour
+  OneFlavourRationalParams Params(1.0e-4, 64.0, 2000, 1.0e-6);
+  OneFlavourRatioRationalPseudoFermionAction<FermionImplPolicy> WilsonNf1a(NumOp,DenOp,Params);
+  OneFlavourRatioRationalPseudoFermionAction<FermionImplPolicy> WilsonNf1b(NumOp,DenOp,Params);
+
+
+  //Smearing on/off
+  WilsonNf1a.is_smeared = false;
+  WilsonNf1b.is_smeared = false;
+
+    // Collect actions
+  ActionLevel<HMCWrapper::Field> Level1(1);
+  Level1.push_back(&WilsonNf1a);
+  Level1.push_back(&WilsonNf1b);
+
+  ActionLevel<HMCWrapper::Field> Level2(4);
+  Level2.push_back(&Waction);
+
+  TheHMC.TheAction.push_back(Level1);
+  TheHMC.TheAction.push_back(Level2);
+  /////////////////////////////////////////////////////////////
+
+  /*
+    double rho = 0.1;  // smearing parameter
+    int Nsmear = 2;    // number of smearing levels
+    Smear_Stout<HMCWrapper::ImplPolicy> Stout(rho);
+    SmearedConfiguration<HMCWrapper::ImplPolicy> SmearingPolicy(
+        UGrid, Nsmear, Stout);
+  */
+
+  // HMC parameters are serialisable 
+  TheHMC.Parameters.MD.MDsteps = 20;
+  TheHMC.Parameters.MD.trajL   = 1.0;
+
+  TheHMC.ReadCommandLine(argc, argv); // these can be parameters from file
+  TheHMC.Run();  // no smearing
+  // TheHMC.Run(SmearingPolicy); // for smearing
+
+  Grid_finalize();
+
+} // main
+
+
 
-}
 
diff --git a/tests/solver/Test_dwf_cg_prec_LsVec.cc b/tests/solver/Test_dwf_cg_prec_LsVec.cc
index 9fedfb58..27799739 100644
--- a/tests/solver/Test_dwf_cg_prec_LsVec.cc
+++ b/tests/solver/Test_dwf_cg_prec_LsVec.cc
@@ -37,9 +37,6 @@ struct scal {
   d internal;
 };
 
-Gamma::GammaMatrix Gmu[] = {Gamma::GammaX, Gamma::GammaY, Gamma::GammaZ,
-                            Gamma::GammaT};
-
 int main(int argc, char** argv) {
   Grid_init(&argc, &argv);