Revised Navigation System

Signed-off-by: Oz Ramos <x@ozramos.com>