WIP commit for listener support.