Serious cruft building up on this now as a result of rushing to get changes made for LKUK13 preso and changes to reporting at work.
Sticking this in git now to avoid losing changes.  Have set a couple of unfinished tests to skip so build keeps working

In need of major clean up / refactor between public part and private part