progress but still some brokenness