This. Be on the lookout for company grade PCs, like from Dell, Lenovo or Fujitsu, they come in small form factors, offer decent upgradability and are low/on power consumption and noise (most of the time)