Add ir listener, relay sender and listener, with correct indenting