Alot more of Repair() being implemented