Just doing this as I go, fw_nav.c needs attention still.