I have updated the list from @MrWhite237 to 4 x 8GB ram, switched the EVO for a PRO SSD, and added a UPS. I am going to check prices on Black Friday and Cyber Monday to get the best possible sales. Changes to the SSD card and Ram after talking to our IT guy. UPS is of course me wanting to protect the new $3000 system. https://pcpartpicker.com/user/gearmiester/saved/yWvYTW