Make heartbeat async (oops)