Updated todo, added event service wrappers