Repair-Focused Design