Pushing this, then going to rebase for Luggi to take a spin at fw_nav.c