Add new event_listener to just local (this will probably need some refactoring)