State of the art ready for revision

Please @ccottap or @amorag have a look at it