Updated logic for Safety demo, still have to get no/expired permit toggling right