feature: more triggers work
Merge branch 'feature/more-triggers-work' into develop