More cleanup and ability to define the metrics you want.