Committing current changes as we prepare for a massive rewrite.