General changes

This is really a review of Ereng's work on Measures so I'm going to merge directly to master. We should follow the **usual work flow** for changes after this one.