Add when listeners to listen for events.  Change name of promise based handler.