Well the first computer has been rebuilt. I need to do some testing to make sure UEFI is enabled, as apparently it's not an easy BIOS setting. Might as well work on the second system now.

Like