Jhbate/metrics

bringing into the fold with a&i functionality