Stripped down version of stats as a starting point for new structure
Working example new structure
Merge remote-tracking branch 'chiel/stats' into thijs