Fixing the marshalling of cells; Preparing to implement the ListAll operation
Clean up