Don't wait, add logging, abstract event listening