Storing more rewrites whilst I fix an issue!
More work on posting since comments removed...

There is still along way to go! All unit tests will have to change.