Preparing for a rewrite