added more metric/value code much todo