First-go at adding triggers