We have an upcoming trip planned and have booked Beach Club. A discount has been offered for Boardwalk and Yacht Club and we are trying to decide if we should move to take advantage of the savings. We have stayed at all three resorts and love all of them. The concern is room condition. Beach Club was very recently rehabbed and it sounds like Yacht Club is scheduled for rehab in early 2017. Can anyone share insight in to how 'hammered' Yacht Club might be? We stayed at Boardwalk about 18 months ago and all looked good but quite a bit of time has passed since then. As good as the pool is at Beach/Yacht it is unlikely that we will use it as we never make time to swim. Trying not to sound like a snob but we kind of are hotel snobs and expect everything to be at the highest level (for the money especially when paying Disney prices). We are not talking about a ton of savings here but the money can be allocated to food and/or tours, etc. Looking forward to seeing what you guys think.