Event setup moved to new code.
Merge pull request #801 from mfalesni/new_events

Events are now set up via new code