Almost final version before re-ordering of stats stuff