should we put these two things into a single Metrics struct instead of hanging the two of them off of structs everywhere?