Switch to seperate class for Swing event bus.