finished off the rest of this analytics thing

ffffffffff