almost back to work

need to fix those event listeners