Step 2 of Rebuild Everything