Partial work on new client