WIP: Adding contanct event handler