First commit of rewrite