Major rewrite of metering monitor