More nav cat work