Reworking the Event class
Event tests now passing