Still in progress but have the majority in place