First quick stab at organizing TODO under whose TODO item it is.