Refactored navigation code. Updated CC and Test along with it. Commented and documented more of Navigation.