adding in some new stuff to return list of events