working on switching from events to