Trying to expose less of the server comms to make ready for undoable operations
Tidying