Added some badass event listeners