Preparing for the full rewrite.