Merged some nav code from Minishark branch.