- Finished splitting navigator into navigation, state and tree-creation