Waiting for the 15" MacBook Pro refresh

I have two SSDs and a 27" Thunderbold Cinema Display waiting for a new MacBook Pro refresh.   I seriously hope the new MacBook Pro do not omit the ability to swap out drives.