Begin major rewrite (through step 2)