Started work on the client code