Add race and ethnicity. Handle gender similarly.
Measure 6 exclusion - medical reason in measurement period