Part 1 of moving stats into Settings