Okay, just put in a i7 and a 1 TB HDD.
people who frequent the computer megathread know what they're talking about so you're bound to get better advice there than making your own topic