Updated client class, added commands to make file: make r