Feature/create an Event Listener