Reportstate 11

Provisionally fixes #11
Opening PR with the expectation that there is probably a bit more stuff to do, but some comments would be appreciated.
I think that this should be private