reorder TODO a bit