Right now metric import is spread over 4 methods and metric calculation is spread over 5, which makes adding new ones and maintaining existing ones a confusing and difficult. This should be cleaned up and consolidated a bit.