Change how metrics work slightly; add some specs