continued work on the rewrite.