added Navigator; in progress, still has issues
merged navigator