Finished +start of adding listeners