I updated my previous post while you were answering, sorry. If you like, see above: partially solved!