another WIP ready to send off to see if I have got the clients changes correct...