[WIP] Synergy/navigation

Don't merge this pull request!