Provide ability to add listen classes, don't merge this yet.