Finished adding category stats too, with tests in citizenData.