Bare bone version of statistics. Try to fix the 504 error
Merge branch 'development' into production
Merge branch 'production'