Right, updated the OP, streamlined a plot - would anyone else be interested?