Switch to Rewrite & new bootstrapping process