Now with live (uncached) stats

There is a lot to clean up and improve here

Change-Id: I8a718810c55b68af7960f6762ffe4651a0201542
Caching for stats

Change-Id: Ie658589519470f8dd6ed26a1214069e873bf3a38
Merge "Now with live (uncached) stats"
Merge "Caching for stats"