Getting closer to be able to test this on a fresh machine.