Navigator rewrite drton

This is to discuss Anton's changes and to integrate them with the navigator_rewrite PR. @julianoes Please review / comment.