Started stats development in tmp till Crystal PR is merged so as to avoid cluttering existing PR