Ok... so I have spent the weekend.. inc Friday... and Monday... and most of today assembling a new machine, re-installing stuff, backing up, copying, transferring, and swearing occasionally.
Now, finally, the computer is complete. Or at least Miriam and I will both be able to work on it.
Happy Halloween everyone. Make mine a large one!