Making the client actually work