Reorganizing, Updating TODO