Initial commit of rewrite goals