Working on the listeners some more.