Uniformized trigger calls
Merge branch 'triggers' into qe
Added TODOs