Getting ready to fix this nav