Adding async stuff to get litmus working again