Topic/enhance event lists

No, this does not have to be a class method