I will be putting in surround as well. 2 surround channels and 2 surround rear channels for sure, as well as wiring for Dolby Atmos(jury is still out on whether or not I'm going to bother with this). I'll also be adding two subs to the mix, right now I'm torn between 2 JL Audio Fathom f212's or 2 Seaton Submersives. I'm going to set it up so the system can perform as both a traditional home theater and a two channel listening room. The home theater is the priority though so the two channel experience may suffer a little due to some of the sound proofing that will be going into the room. I'm hoping to power the front sound stage with all McIntosh amps and hopefully a McIntosh MX151 processor. I may go with a different processor though, because the codecs change so rapidly. Much like computers, these things are outdated before you plug them in. When my wife starts to get a whiff of what is going to go into this room I may just be a dead man walking anyway.