rename Events object too
do not store selector on data source
first cut, saving geometry