Change format of events
Target correct events
Switch over to new data payload and enable toggling of trivial events
Add in query aggrigation