John and Michael debate the best layout of the Water Mills, while Geoff finally gets to the end of his long pilgrimage to Castle.