WIP changing over to new RPC
New+import works again.