Metrics

Adding Enno's Metrics to master