Implemented rpc-store in cli, TODO fixup