Revisit

@apg this is here for us to discuss mostly.
We should probably be initializing all metrics here, since they're always counters now.