WIP commit for new event format for nav events