I'm pretty sure that their future higher end CPUs, especially desktop ones, will vary in the number of cores, and the higher core count ones will cost obscene amount of money, as per usual. So unfortunately not only memory and storage.