Opportunity Zones Extended