progress on #2