[UNSTABLE] First approach to new system navigation finished