[UNSTABLE] New system navigation accepts matrix params