Borked, but about to make serious changes
Swapping computers