diff --git a/tests/Test_stencil.cc b/tests/Test_stencil.cc
index cc49ab22..5949fa63 100644
--- a/tests/Test_stencil.cc
+++ b/tests/Test_stencil.cc
@@ -8,6 +8,10 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
+  //  typedef LatticeColourMatrix Field;
+  typedef LatticeComplex Field;
+  typedef typename Field::vector_object vobj;
+  typedef typename vobj::scalar_object sobj;
 
   std::vector<int> latt_size   = GridDefaultLatt();
   std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
@@ -18,23 +22,40 @@ int main (int argc, char ** argv)
   GridCartesian Fine(latt_size,simd_layout,mpi_layout);
   GridRedBlackCartesian rbFine(latt_size,simd_layout,mpi_layout);
   GridParallelRNG       fRNG(&Fine);
+
   //  fRNG.SeedRandomDevice();
   std::vector<int> seeds({1,2,3,4});
   fRNG.SeedFixedIntegers(seeds);
   
-  LatticeColourMatrix Foo(&Fine);
-  LatticeColourMatrix Bar(&Fine);
-  LatticeColourMatrix Check(&Fine);
-  LatticeColourMatrix Diff(&Fine);
-  
+  Field Foo(&Fine);
+  Field Bar(&Fine);
+  Field Check(&Fine);
+  Field Diff(&Fine);
+  LatticeComplex lex(&Fine);
+
+  lex = zero;  
   random(fRNG,Foo);
   gaussian(fRNG,Bar);
 
+  /*
+  Integer stride =1000;
+  {
+    double nrm;
+    LatticeComplex coor(&Fine);
+
+    for(int d=0;d<Nd;d++){
+      LatticeCoordinate(coor,d);
+      lex = lex + coor*stride;
+      stride=stride/10;
+    }
+    Foo=lex;
+  }
+  */
 
     for(int dir=0;dir<4;dir++){
       for(int disp=0;disp<Fine._fdimensions[dir];disp++){
 
-	std::cout<<GridLogMessage << "Using stencil to shift dim "<<dir<< " by "<<disp<<std::endl;
+	std::cout<< std::fixed <<GridLogMessage << "Using stencil to shift dim "<<dir<< " by "<<disp<<std::endl;
 	// start to test the Cartesian npoint stencil infrastructure
 	int npoint=1;
 	std::vector<int> directions(npoint,dir);
@@ -48,8 +69,8 @@ int main (int argc, char ** argv)
 	  ocoor[dir]=(ocoor[dir]+disp)%Fine._rdimensions[dir];
 	}
 	
-	std::vector<vColourMatrix,alignedAllocator<vColourMatrix> >  comm_buf(myStencil._unified_buffer_size);
-	SimpleCompressor<vColourMatrix> compress;
+	std::vector<vobj,alignedAllocator<vobj> >  comm_buf(myStencil._unified_buffer_size);
+	SimpleCompressor<vobj> compress;
 	myStencil.HaloExchange(Foo,comm_buf,compress);
 
 	Bar = Cshift(Foo,dir,disp);
@@ -75,9 +96,114 @@ int main (int argc, char ** argv)
 	Real nrm  = norm2(Diff);
 	std::cout<<GridLogMessage<<"N2diff ="<<nrm<<" "<<nrmC<<" " <<nrmB<<std::endl;
 
-	Real snrmC =0;
-	Real snrmB =0;
-	Real snrm  =0;
+	std::vector<int> coor(4);
+	for(coor[3]=0;coor[3]<latt_size[3]/mpi_layout[3];coor[3]++){
+	for(coor[2]=0;coor[2]<latt_size[2]/mpi_layout[2];coor[2]++){
+	for(coor[1]=0;coor[1]<latt_size[1]/mpi_layout[1];coor[1]++){
+	for(coor[0]=0;coor[0]<latt_size[0]/mpi_layout[0];coor[0]++){
+
+	  RealD diff;
+	  sobj check,bar;
+	  peekSite(check,Check,coor);
+	  peekSite(bar,Bar,coor);
+
+	  sobj ddiff;
+	  ddiff = check -bar;
+	  diff =norm2(ddiff);
+	  if ( diff > 0){
+	    std::cout <<"Coor (" << coor[0]<<","<<coor[1]<<","<<coor[2]<<","<<coor[3]
+		      <<") " <<check<<" vs "<<bar<<std::endl;
+	  }
+
+	 
+	}}}}
+
+
+
+      }
+    }
+
+    std::cout<<GridLogMessage<<"Testing RedBlack\n ";
+
+
+  Field EFoo(&rbFine);
+  Field OFoo(&rbFine);
+  Field ECheck(&rbFine);
+  Field OCheck(&rbFine);
+  pickCheckerboard(Even,EFoo,Foo);
+  pickCheckerboard(Odd ,OFoo,Foo);
+
+    for(int dir=0;dir<4;dir++){
+      for(int disp=0;disp<rbFine._fdimensions[dir];disp++){
+
+	std::cout<<GridLogMessage << "Using stencil to shift rb dim "<<dir<< " by "<<disp<<std::endl;
+	// start to test the Cartesian npoint stencil infrastructure
+	int npoint=1;
+	std::vector<int> directions(npoint,dir);
+	std::vector<int> displacements(npoint,disp);
+
+	CartesianStencil EStencil(&rbFine,npoint,Even,directions,displacements);
+	CartesianStencil OStencil(&rbFine,npoint,Odd,directions,displacements);
+
+	std::vector<int> ocoor(4);
+	for(int o=0;o<Fine.oSites();o++){
+	  Fine.oCoorFromOindex(ocoor,o);
+	  ocoor[dir]=(ocoor[dir]+disp)%Fine._rdimensions[dir];
+	}
+	
+	std::vector<vobj,alignedAllocator<vobj> >  Ecomm_buf(EStencil._unified_buffer_size);
+	std::vector<vobj,alignedAllocator<vobj> >  Ocomm_buf(OStencil._unified_buffer_size);
+
+	SimpleCompressor<vobj> compress;
+
+	EStencil.HaloExchange(EFoo,Ecomm_buf,compress);
+	OStencil.HaloExchange(OFoo,Ocomm_buf,compress);
+	
+	Bar = Cshift(Foo,dir,disp);
+
+	if ( disp & 0x1 ) {
+	  ECheck.checkerboard = Even;
+	  OCheck.checkerboard = Odd;
+	} else { 
+	  ECheck.checkerboard = Odd;
+	  OCheck.checkerboard = Even;
+	}
+	// Implement a stencil code that should agree with that darn cshift!
+	for(int i=0;i<OCheck._grid->oSites();i++){
+	  int permute_type;
+	  StencilEntry *SE;
+	  SE = EStencil.GetEntry(permute_type,0,i);
+	  std::cout << "Even source "<< i<<" -> " <<SE->_offset << " "<< SE->_is_local<<std::endl;
+
+	  if ( SE->_is_local && SE->_permute )
+	    permute(OCheck._odata[i],EFoo._odata[SE->_offset],permute_type);
+	  else if (SE->_is_local)
+	    OCheck._odata[i] = EFoo._odata[SE->_offset];
+	  else 
+	    OCheck._odata[i] = Ecomm_buf[SE->_offset];
+	}
+	for(int i=0;i<ECheck._grid->oSites();i++){
+	  int permute_type;
+	  StencilEntry *SE;
+	  SE = OStencil.GetEntry(permute_type,0,i);
+	  std::cout << "ODD source "<< i<<" -> " <<SE->_offset << " "<< SE->_is_local<<std::endl;
+	  
+	  if ( SE->_is_local && SE->_permute )
+	    permute(ECheck._odata[i],OFoo._odata[SE->_offset],permute_type);
+	  else if (SE->_is_local)
+	    ECheck._odata[i] = OFoo._odata[SE->_offset];
+	  else 
+	    ECheck._odata[i] = Ocomm_buf[SE->_offset];
+	}
+	
+	setCheckerboard(Check,ECheck);
+	setCheckerboard(Check,OCheck);
+	
+	Real nrmC = norm2(Check);
+	Real nrmB = norm2(Bar);
+	Diff = Check-Bar;
+	Real nrm  = norm2(Diff);
+	std::cout<<GridLogMessage<<"RB N2diff ="<<nrm<<" "<<nrmC<<" " <<nrmB<<std::endl;
 
 	std::vector<int> coor(4);
 	for(coor[3]=0;coor[3]<latt_size[3]/mpi_layout[3];coor[3]++){
@@ -85,33 +211,22 @@ int main (int argc, char ** argv)
 	for(coor[1]=0;coor[1]<latt_size[1]/mpi_layout[1];coor[1]++){
 	for(coor[0]=0;coor[0]<latt_size[0]/mpi_layout[0];coor[0]++){
 
-	  Complex diff;
-	  ColourMatrix check,bar;
+	  RealD diff;
+	  sobj check,bar;
 	  peekSite(check,Check,coor);
 	  peekSite(bar,Bar,coor);
 
-	  for(int r=0;r<3;r++){
-	  for(int c=0;c<3;c++){
-            diff =check()()(r,c)-bar()()(r,c);
-            double nn=real(conjugate(diff)*diff);
-            if ( nn > 0){
-	      printf("Coor (%d %d %d %d) \t rc %d%d \t %le (%le,%le) %le\n",
-		     coor[0],coor[1],coor[2],coor[3],r,c,
-		     nn,
-		     real(check()()(r,c)),
-		     imag(check()()(r,c)),
-		     real(bar()()(r,c))
-		     );
-	    }
-	    snrmC=snrmC+real(conjugate(check()()(r,c))*check()()(r,c));
-	    snrmB=snrmB+real(conjugate(bar()()(r,c))*bar()()(r,c));
-	    snrm=snrm+nn;
-	  }}
+	  sobj ddiff;
+	  ddiff = check -bar;
+	  diff =norm2(ddiff);
+	  if ( diff > 0){
+	    std::cout <<"Coor (" << coor[0]<<","<<coor[1]<<","<<coor[2]<<","<<coor[3] <<") "
+		      <<"shift "<<disp<<" dir "<< dir 
+		      << "  stencil impl " <<check<<" vs cshift impl "<<bar<<std::endl;
+	  }
 	 
 	}}}}
 
-	std::cout<<GridLogMessage<<"scalar N2diff = "<<snrm<<" " <<snrmC<<" "<<snrmB<<std::endl;
-
 
       }
     }