#24 added event listener
#24 added watchingQueue