More userevent work done. https://app.asana.com/0/19128794071848/19632912982001