Okay - update (and thanks).

I believe I am all sorted on incoming parts (I'm sure I've missed something, but my initial list is all checked off at the moment).

cheers - Jay