Metric getters need refactoring

Currently the metric getters are a mess, and need to be refactored.