Slight work on packaging the client