a little more work on go_fish