My apologies - I was going to get this thread updated before heading out to WDW but I have run out of time

And double apologies for the State I got wrong! I think this exercise is turning out to be very educational for me!