It was very hard work getting everything slotted in so it fitted. I'm afraid I'm not quite sure I've the ingenuity to sort out the S/J side of this as well. As it is, I think I'm tying myself up in timelines left, right and centre (and I hate it when I do that - it's the historian in me, the chronology has to work).