really good progress on rebuild