more progress, maybe done