Initial work on the new statistics service for 2.2