Basic stats persistence
Merge branch 'feature/stats-persistence' into develop