Iteration tweak.
BaseTrigger almost complete (needs link delete)