Moving Delay Gate back into Event class