WIP commit on keynav logic