Moved listeners into seperate classes.