It's all back in place, and as far as I can tell it's working... I'm actually quite glad I didn't get to wash up, now, since it meant most of my plates etc weren't in the cupboard when they hauled it out and moved it across the kitchen... ^_^'