Sigh, packing up the bits and moving them to a new host - take 2