Listeners fixed

Still problem with stage 2