New trigger system

A bit of work for the issue #138