2.0 event handling

Another try on #211