zondag jiske

made event handler m2 and did some testing