Add stats; reorgnize stuff.