We have made progress in some areas, agreeing with Homes for Scotland, and developers, that the programme of identification, assessment and remediation of buildings will be delivered in more than one wave with each wave focused on a different cohort of developers.