Changing the way the United States measures income and poverty: a progress report, draft