EventService code complete, needs testing