I still think this should be just event triggering here, but that may be addressed in a later PR