Work on rewriting core code.