Add autocomplete for typing the path and begin initial small refactoring