cleanup, ObjectInterruptions to be all created by the same method
EventGenerator to be defined in new way