Hacky progress on stats commenting