Pretty heavily updating the way event listeners are loaded, by adding Xml files and mapping gamestates to lists of listener attributes, such that, in the future, swapping around listeners will be easy and efficient when switching among gamestates.