Started work on making event manager more flexible

..and more consistent. More work still needed.