Rearrangements, updated TODO