I am also checking in on the 31st. I am on hold right now to ask for some information. I would prefer the 2017 plan as well and will change to room only for the 31st if I need to. We don't even arrive at our resort until after 10:00pm. I will come back and post if I find anything out.