Adds filterEvents et al
Generalizes ornaments etc