Add current trigger endpoints; clean up endpoints while I'm at it.