                         let oldItem = playitems[row+newIndexOffset+1]
 
                         //  We've shifted so remove old item at new location
-                        removeItem(oldItem, atIndex: row+newIndexOffset+1)
+                        remove(play: oldItem, atIndex: row+newIndexOffset+1)
                     }
                 }
                 else
                 {
-                    addItem(item!, atIndex: -1)
+                    add(play: item!, atIndex: -1)
                 }
                 newIndexOffset += 1
             }

    //  but use their index to update the controller scrolling only initially.

    //  "Play" items are individual PlayItem items, part of a playlist
    internal func addItem(_ item: PlayItem, atIndex p_index: Int) {
        var index = p_index
        if let undo = self.undoManager {
            undo.registerUndo(withTarget: self, handler: {[oldVals = ["item": item, "index": index] as [String : Any]] (PlaylistViewController) -> () in
                self.removeItem(oldVals["item"] as! PlayItem, atIndex: oldVals["index"] as! Int)
                if !undo.isUndoing {
                    undo.setActionName("Add PlayItem")
                }

        if whoAmI == playlistTableView {
            let item = PlayList()
            
            self.add(list: item, atIndex: -1)
        }
        else
        if let selectedPlaylist = playlistArrayController.selectedObjects.first as? PlayList {
