Partway through changing to JSONRPC