Phase 1 of Bootstrap rewrite