Merging the Rewrite branch at last