Rework still in progress to add more events