Added nested Rumbler class, refined trigger events