Viz stats unbroken

Stats pull request to merge on master.

You should already know how this is working (check commited docs for more details)