Another changes to client: now it's even compiling