More Work on the Metric View Controller.