Partway through converting to use of jsonrpc