more progress toward #2