added todo comments and functions headers for Navigation