Moved listening methods to seperate class for tidyness.