Moved Escaper's to using events instead of callback functions