Add measurement selection, units. Update save to handle changes