This will add the listener for every task created no? I don't think that is what we want.