Working on a solution with the Client