Refactor stats classes a bit ; still need to break out into pluggable class hierarchy