Trigger system improvements 

@AmbientOSX @BrettASwift 
@BrettASwift Did you remove this?  Should it be removed?