Refactored base events
Started refactoring triggers