Nav smallworld

Addresses #866