In development...
Implemented the distinction between trigger listeners.
Some more FIXMEs in the code - enjoy. :-)