Stage 1 Rewrite