WIP: more generic event taps