Client class is done. Could use comments though