Add some metrics to it now