Listener branch1

errm merging I guess.