WIP adding event listeners