wip: new eventhandling