diff --git a/TODO b/TODO
index 53862049..5469f506 100644
--- a/TODO
+++ b/TODO
@@ -1,25 +1,10 @@
 - PseudoFermions
 
-Done: Cayley, Partial , ContFrac force terms.
-
-Done:
-  - TwoFlavour
-  - TwoFlavourEvenOdd        
-  - TwoFlavourRatio
-  - TwoFlavourRatioEvenOdd
-
-Done:
-  - OneFlavourRationalEvenOdd
-  - OneFlavourRationalRatioEvenOdd
-  - OneFlavourRationalRatio
-
 TODO:
-=> generalise to non-const EE
-=> Test DWF HMC
-=> Clean up HMC
-   - Fix a threading bug that has been introduced and prevents HMC running hybrid OMP mode
 
-=> Integrators
+=> Clean up HMC
+- Link smearing/boundary conds; Policy class based implementation
+- Integrators
   - Force Gradient
   - Multi-timescale looks broken and operating on single timescale for now.
     Fix/debug/rewrite this 
@@ -27,9 +12,9 @@ TODO:
   - Prefer "RefreshInternal" or such like to "init" in naming
   - Rename "Ta" as too unclear
 
-- MacroMagic -> virtual reader class.
+=> Lanczos
 
-- Link smearing/boundary conds; Policy class based implementation
+=> generalise to non-const EE ; likely defer (??)
 
 - Rectangle gauge actions.
   Iwasaki,
@@ -39,7 +24,18 @@ TODO:
 - Prepare multigrid for HMC.
   Alternate setup schemes.
 
-- RNG filling from sparser grid, lower dim grid.
+* Support different boundary conditions (finite temp, chem. potential ... )
+
+* Support different fermion representations? 
+
+* Parallel io improvements
+  - optional parallel MPI2 IO
+  - move Plaquette and link trace checks into nersc reader from the Grid_nersc_io.cc test.
+  * Support for ILDG
+
+* Flavour matrices?
+
+* FFTnD ?
 
 ================================================================
 *** Hacks and bug fixes to clean up and Audits
@@ -68,6 +64,9 @@ Insert/Extract
 
 * Thread scaling tests Xeon, XeonPhi
 
+
+Not sure of status of this -- reverify. Things are working nicely now though.
+
 * Make the Tensor types and Complex etc... play more nicely.
   - TensorRemove is a hack, come up with a long term rationalised approach to Complex vs. Scalar<Scalar<Scalar<Complex > > >
     QDP forces use of "toDouble" to get back to non tensor scalar. This role is presently taken TensorRemove, but I
@@ -84,6 +83,30 @@ Insert/Extract
     template specialize the scalar scalar scalar sum and SliceSum,  on the basis of being
     pure scalar.
 
+Done: Cayley, Partial , ContFrac force terms.
+
+Done:
+  - TwoFlavour
+  - TwoFlavourEvenOdd        
+  - TwoFlavourRatio
+  - TwoFlavourRatioEvenOdd
+
+Done:
+  - OneFlavourRationalEvenOdd
+  - OneFlavourRationalRatioEvenOdd
+  - OneFlavourRationalRatio
+
+Done
+=> Test DWF HMC
+   - Fix a threading bug that has been introduced and prevents HMC running hybrid OMP mode
+
+Done:
+- RNG filling from sparser grid, lower dim grid.
+
+
+DONE
+  - MacroMagic -> virtual reader class.
+
 *** Expression template engine: -- DONE
 
 [   -- Norm2(expression) problem: introduce norm2 unary op, or Introduce conversion automatic from expression to Lattice<vobj>
@@ -103,18 +126,10 @@ Insert/Extract
 
 * CovariantShift support                             -----Use a class to store gauge field? (parallel transport?)
 
-* Parallel io improvements
-  - optional parallel MPI2 IO
-  - move Plaquette and link trace checks into nersc reader from the Grid_nersc_io.cc test.
-
-* Support for ILDG
-
-* Support different boundary conditions (finite temp, chem. potential ... )
-
-* Support different fermion representations? 
-
-Actions -- coherent framework for implementing actions and their forces.
+-- coherent framework for implementing actions and their forces.
+Actions 
 
+DONE
 * Fermion
   - Wilson
   - Clover
@@ -122,6 +137,7 @@ Actions -- coherent framework for implementing actions and their forces.
   - Mobius
   - z-Mobius
 
+
 Algorithms (lots of reuse/port from BFM)
 * LinearOperator
 * LinearSolver
@@ -139,19 +155,11 @@ Algorithms (lots of reuse/port from BFM)
 * Integrators, leapfrog, omelyan, force gradient etc...
 * etc..
 
-* Gauge
-  - Wilson, symanzik, iwasaki
-
-* Flavour matrices?
-
+Done
 * Pauli, SU subgroup, etc.. 
 
 * su3 exponentiation & log etc.. [Jamie's code?]
 
-* TaProj
-
-* FFTnD ?
-
 ======================================================================================================
 FUNCTIONALITY: it pleases me to keep track of things I have done (keeps me arguably sane)
 ======================================================================================================
@@ -184,7 +192,6 @@ FUNCTIONALITY: it pleases me to keep track of things I have done (keeps me argua
   - lib/communicator
   - lib/algorithms
   - lib/qcd
- future
   - lib/io/   -- GridLog, GridIn, GridErr, GridDebug, GridMessage
   - lib/qcd/actions
   - lib/qcd/measurements