WIP Decouple metric display from metric collection.