All kinds of goodness, fixing toggle to event properly