Preliminary todo, part 2