All working, there is some concurrency issue with the unit test that is an issue however. Think I need to move back to being not static...