Add todo for waiting thing