Adding event sources everywhere

It's somewhat primitive, but it works.