WIP pull finders out. Add some navigation commands