Jhbate/metrics

@cheddar @kentquirk this includes the addition of highwater code that wasn't included before.