Work towards trigger tokens. TODO: adding trigger broken