First commit of the rewrite