Update TODO further