1.9 Refratoring continues. EventQueue after the 2.0.