Initial commit for rewrite branch.