Latest client work

To follow