initial commit of the rewrite