Ok after this we really need to clean up CensoredLib.
And potentially move some of the new data stuff over to here... probably not tho.