Added comments to the client for Shane