seems to work except for client

Signed-off-by: James Paton <jpaton2@gmail.com>