Got event handling working