Preliminary todo, part 32