added Metrics class

still so messy!