WIP for Navi_X support.