Added references to legacy and new ids

The time will come when there is no legacyOptionId (for newly created options, or challenges, or rescues for that matter). The challenges data needs to provide the fall back legacy option id data, and a place to store the option Id.