Refactoring and navigation work.