Moved listner to seperate class