Choice processing appears to be correct
Normalization process is now correct. Contains-by tables closer to correct.