Fixing the Listeners, but I still need to make some changes to the wall listeners