Fixed the step 3.1 nav events - still need to probably go over the logic again once we begin containment/suppression