Doing some restructuring to clean things up and hopefully get measure conversions working properly.