Almost complete, without client having pets array