69654902 apply measure now

@asparke2 @DavidGoldwasser Please review this branch and, barring major bugs, merge into develop by Thursday, June 12.  Thanks!