Started working on the client