Refactored the stats tracker
v1.7.0
Merge branch 'develop'