Actually added the listeners this time