Jhbate/metrics

@cheddar @kentquirk this includes the addition of highwater code that wasn't included before.
yeah - it was a filler and the win being i didn't have to think :)