More work on stats stuff