Almost done with the rewrite