More work on the navigation framework.