Work in progress on the navigator.