Some client work

by Finn