Working on stats (warning: breaks)

Warning: currently stats breaks.  Features continues to work so no one
else's work should be affected.  I'm checking this in to get the code
back to my desk in the morning.