bit of tweaking - get event emmitter working