Add everything to do with tokens

This should work.
Loading is much slower, and there is probably some general sluggishness.
Compression of the JSON logs is prudent.