merged all events into one, now need to merge modals into same template