2.0 all the way

completely change broom stick mechanics