[UNSTABLE] Initial approach to the new system navigation