Refactored Measures, made them even more general.