Re-wrote metrics for events, way cleaner