diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
index c079012be4..318ecaf90a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
@@ -38,18 +38,18 @@
     </template>
 
     <transition-group>
-      <template v-for="child in treeChildren">
+      <template v-for="child in children">
         <TopicNode
-          v-if="hasChildren(child.id)"
+          v-if="hasClipboardChildren(child.id)"
           :key="child.id"
           :nodeId="child.id"
-          :sourceId="child.source_id"
+          :level="level + 1"
         />
         <ContentNode
           v-else
           :key="child.id"
           :nodeId="child.id"
-          :sourceId="child.source_id"
+          :level="level + 1"
         />
       </template>
     </transition-group>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
index 0aa632158b..d580aacf9c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
@@ -3,6 +3,7 @@
   <VHover>
     <ContextMenu slot-scope="{ hover }">
       <VListTile
+        v-if="contentNode"
         class="content-item py-2"
         :class="{hover, selected}"
         :style="{'padding-left': indentPadding}"
@@ -48,12 +49,12 @@
               </VBtn>
             </template>
 
-            <ContentNodeOptions :nodeId="nodeId" :sourceId="sourceId" />
+            <ContentNodeOptions :nodeId="nodeId" :ancestorId="ancestorId" />
           </VMenu>
         </VListTileAction>
       </VListTile>
-      <template #menu>
-        <ContentNodeOptions :nodeId="nodeId" :sourceId="sourceId" />
+      <template v-if="contentNode" #menu>
+        <ContentNodeOptions :nodeId="nodeId" :ancestorId="ancestorId" />
       </template>
     </ContextMenu>
   </VHover>
@@ -76,16 +77,18 @@
       ContextMenu,
     },
     mixins: [clipboardMixin],
-    props: {
-      sourceId: {
-        type: String,
-        required: true,
-      },
-    },
     computed: {
       thumbnailAttrs() {
-        const { title, kind, thumbnail_src: src, thumbnail_encoding: encoding } = this.contentNode;
-        return { title, kind, src, encoding };
+        if (this.contentNode) {
+          const {
+            title,
+            kind,
+            thumbnail_src: src,
+            thumbnail_encoding: encoding,
+          } = this.contentNode;
+          return { title, kind, src, encoding };
+        }
+        return {};
       },
     },
     $trs: {},
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
index 48e5ae44ee..1e984e3d07 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
@@ -7,7 +7,7 @@
     <VListTile @click="duplicateNode()">
       <VListTileTitle>{{ $tr('makeACopy') }}</VListTileTitle>
     </VListTile>
-    <VListTile v-if="canEdit" @click.stop="setMoveNodes([sourceId])">
+    <VListTile v-if="canEdit" @click.stop="moveNode">
       <VListTileTitle>{{ $tr('moveTo') }}</VListTileTitle>
     </VListTile>
     <VListTile @click="removeNode()">
@@ -22,7 +22,6 @@
   import { mapActions, mapGetters, mapMutations } from 'vuex';
   import { RouterNames } from '../../constants';
   import { withChangeTracker } from 'shared/data/changes';
-  import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 
   export default {
     name: 'ContentNodeOptions',
@@ -31,44 +30,41 @@
         type: String,
         required: true,
       },
-      sourceId: {
+      ancestorId: {
         type: String,
-        required: true,
+        default: null,
       },
     },
     computed: {
       ...mapGetters('channel', ['getChannel']),
-      ...mapGetters('contentNode', ['getContentNode', 'getTreeNode']),
-      treeNode() {
-        return this.getTreeNode(this.sourceId);
-      },
+      ...mapGetters('clipboard', ['getClipboardNodeForRender', 'getCopyTrees']),
       node() {
-        return this.getContentNode(this.sourceId);
+        return this.getClipboardNodeForRender(this.nodeId);
       },
       channelId() {
-        return this.treeNode.channel_id;
+        return this.node.channel_id;
       },
       viewLink() {
         return {
           name: RouterNames.TREE_VIEW,
           params: {
-            nodeId: this.treeNode.parent,
-            detailNodeId: this.sourceId,
+            nodeId: this.node.parent,
+            detailNodeId: this.node.id,
           },
         };
       },
       canEdit() {
         return this.getChannel(this.channelId) && this.getChannel(this.channelId).edit;
       },
-      isTopic() {
-        return this.node.kind === ContentKindsNames.TOPIC;
-      },
     },
     methods: {
       ...mapActions(['showSnackbar']),
-      ...mapActions('clipboard', ['copy']),
-      ...mapActions('contentNode', ['deleteContentNodes']),
-      ...mapMutations('contentNode', { setMoveNodes: 'SET_MOVE_NODES' }),
+      ...mapActions('clipboard', ['copy', 'deleteClipboardNode']),
+      ...mapMutations('clipboard', { setCopyNodes: 'SET_CLIPBOARD_MOVE_NODES' }),
+      moveNode() {
+        const copyTrees = this.getCopyTrees(this.nodeId, null, this.ancestorId, true);
+        this.setCopyNodes(copyTrees);
+      },
       removeNode: withChangeTracker(function(changeTracker) {
         this.showSnackbar({
           duration: null,
@@ -77,7 +73,10 @@
           actionCallback: () => changeTracker.revert(),
         });
 
-        return this.deleteContentNodes([this.nodeId]).then(() => {
+        return this.deleteClipboardNode({
+          clipboardNodeId: this.nodeId,
+          ancestorId: this.ancestorId,
+        }).then(() => {
           return this.showSnackbar({
             text: this.$tr('removedFromClipboard'),
             actionText: this.$tr('undo'),
@@ -94,8 +93,8 @@
         });
 
         return this.copy({
-          id: this.sourceId,
-          deep: this.isTopic,
+          node_id: this.node.node_id,
+          channel_id: this.node.channel_id,
         }).then(() => {
           return this.showSnackbar({
             text: this.$tr('copiedItemsToClipboard'),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/TopicNode.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/TopicNode.vue
index 9149898c1c..2139965c33 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/TopicNode.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/TopicNode.vue
@@ -10,12 +10,12 @@
     <template v-slot:activator>
       <ContentNode
         :nodeId="nodeId"
-        :sourceId="sourceId"
+        :level="level"
       >
         <VListTileContent class="description-col py-2 pl-2 shrink">
           <VBadge color="primary">
             <template #badge>
-              <span class="caption font-weight-bold">{{ descendantCount }}</span>
+              <span class="caption font-weight-bold">{{ contentNode.resource_count }}</span>
             </template>
             <VListTileTitle class="text-truncate notranslate">
               {{ contentNode.title }}
@@ -34,18 +34,20 @@
     </template>
 
     <transition-group>
-      <template v-for="child in treeChildren">
+      <template v-for="child in children">
         <TopicNode
-          v-if="hasChildren(child.id)"
+          v-if="hasClipboardChildren(child.id)"
           :key="child.id"
           :nodeId="child.id"
-          :sourceId="child.source_id"
+          :level="level + 1"
+          :ancestorId="childAncestorId"
         />
         <ContentNode
           v-else
           :key="child.id"
           :nodeId="child.id"
-          :sourceId="child.source_id"
+          :level="level + 1"
+          :ancestorId="childAncestorId"
         />
       </template>
     </transition-group>
@@ -65,9 +67,9 @@
     },
     mixins: [clipboardMixin, parentMixin],
     props: {
-      sourceId: {
+      ancestorId: {
         type: String,
-        required: true,
+        default: null,
       },
     },
     data() {
@@ -75,6 +77,18 @@
         open: false,
       };
     },
+    computed: {
+      childAncestorId() {
+        return this.isClipboardNode(this.nodeId) ? this.nodeId : this.ancestorId;
+      },
+    },
+    mounted() {
+      // Prefetch content node data. Since we're using `lazy` with the
+      // nested VListGroup, this prefetches one level at a time!
+      if (this.contentNode.total_count > 0) {
+        this.loadClipboardNodes({ parent: this.nodeId, ancestorId: this.childAncestorId });
+      }
+    },
   };
 
 </script>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
index 53103acbcc..b260a5b74b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
@@ -139,7 +139,7 @@
         'getCopyTrees',
       ]),
       selectedNodeIds() {
-        return this.selectedNodes.map(n => n.id);
+        return this.selectedNodes.map(([sid]) => sid);
       },
       canEdit() {
         return !this.selectedChannels.find(channel => !channel.edit);
@@ -166,9 +166,8 @@
     },
     methods: {
       ...mapActions(['showSnackbar']),
-      ...mapMutations('contentNode', { setMoveNodes: 'SET_MOVE_NODES' }),
-      ...mapActions('clipboard', ['loadChannels', 'copy']),
-      ...mapActions('contentNode', ['deleteContentNodes']),
+      ...mapMutations('clipboard', { setCopyNodes: 'SET_CLIPBOARD_MOVE_NODES' }),
+      ...mapActions('clipboard', ['loadChannels', 'copy', 'deleteClipboardNodes']),
       refresh() {
         if (this.refreshing) {
           return;
@@ -181,14 +180,15 @@
         this.elevated = this.$refs.nodeList.scrollTop > 0;
       },
       moveNodes() {
-        if (!this.selectedNodeIds.length) {
+        const trees = this.getCopyTrees(this.clipboardRootId);
+        if (!trees.length) {
           return;
         }
 
-        this.setMoveNodes(this.selectedNodes.map(n => n.source_id));
+        this.setCopyNodes(trees);
       },
       duplicateNodes: withChangeTracker(function(changeTracker) {
-        const trees = this.getCopyTrees(this.clipboardRootId);
+        const trees = this.getCopyTrees(this.clipboardRootId, this.clipboardRootId);
 
         if (!trees.length) {
           return Promise.resolve([]);
@@ -213,9 +213,9 @@
         });
       }),
       removeNodes: withChangeTracker(function(changeTracker) {
-        const id__in = this.selectedNodeIds;
+        const selectionIds = this.selectedNodeIds;
 
-        if (!id__in.length) {
+        if (!selectionIds.length) {
           return Promise.resolve([]);
         }
 
@@ -226,7 +226,7 @@
           actionCallback: () => changeTracker.revert(),
         });
 
-        return this.deleteContentNodes(id__in).then(() => {
+        return this.deleteClipboardNodes(selectionIds).then(() => {
           return this.showSnackbar({
             text: this.$tr('removedFromClipboard'),
             actionText: this.$tr('undo'),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/mixins.js b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/mixins.js
index 9b1c3c304b..5a4d5d3b32 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/mixins.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/mixins.js
@@ -1,5 +1,4 @@
 import { mapActions, mapGetters } from 'vuex';
-import uniq from 'lodash/uniq';
 import { SelectionFlags } from 'frontend/channelEdit/vuex/clipboard/constants';
 
 export default {
@@ -8,32 +7,33 @@ export default {
       type: String,
       required: true,
     },
-    sourceId: {
+    ancestorId: {
       type: String,
+      default: null,
+    },
+    level: {
+      type: Number,
+      default: 0,
     },
   },
   computed: {
-    ...mapGetters('contentNode', ['getContentNode', 'getTreeNode']),
     ...mapGetters('clipboard', [
-      'currentSelectionState',
+      'getClipboardNodeForRender',
+      'getSelectionState',
       'getNextSelectionState',
       'getClipboardChildren',
     ]),
-    treeNode() {
-      return this.getTreeNode(this.nodeId);
-    },
     contentNode() {
-      return this.sourceId ? this.getContentNode(this.sourceId) : null;
+      return this.nodeId ? this.getClipboardNodeForRender(this.nodeId) : null;
     },
     indentPadding() {
-      const level = this.treeNode.level || 0;
-      return `${level * 32}px`;
+      return `${this.level * 32}px`;
     },
     selectionState() {
-      return this.currentSelectionState(this.nodeId);
+      return this.getSelectionState(this.nodeId, this.ancestorId);
     },
     nextSelectionState() {
-      return this.getNextSelectionState(this.nodeId);
+      return this.getNextSelectionState(this.nodeId, this.ancestorId);
     },
     selected() {
       return Boolean(this.selectionState & SelectionFlags.SELECTED);
@@ -45,39 +45,42 @@ export default {
   methods: {
     ...mapActions('clipboard', ['setSelectionState', 'resetSelectionState']),
     goNextSelectionState() {
-      this.setSelectionState({ id: this.nodeId, selectionState: this.nextSelectionState });
+      this.setSelectionState({
+        id: this.nodeId,
+        selectionState: this.nextSelectionState,
+        ancestorId: this.ancestorId,
+      });
     },
   },
 };
 
 export const parentMixin = {
-  computed: {
-    ...mapGetters('contentNode', [
-      'hasChildren',
-      'getTreeNodeChildren',
-      'countTreeNodeDescendants',
-    ]),
-    ...mapGetters('clipboard', ['channelIds', 'getClipboardChildren']),
-    treeChildren() {
-      return this.getClipboardChildren(this.nodeId);
+  props: {
+    nodeId: {
+      type: String,
+      required: true,
     },
-    childrenSourceIds() {
-      return this.treeChildren.map(child => child.source_id);
+    ancestorId: {
+      type: String,
+      default: null,
     },
-    descendantCount() {
-      return this.countTreeNodeDescendants(this.nodeId);
+    level: {
+      type: Number,
+      default: 0,
     },
   },
-  mounted() {
-    const id__in = uniq(this.childrenSourceIds);
-
-    // Prefetch content node data. Since we're using `lazy` with the
-    // nested VListGroup, this prefetches one level at a time!
-    if (id__in.length) {
-      this.$nextTick(() => this.loadContentNodes({ id__in }));
-    }
+  computed: {
+    ...mapGetters('clipboard', [
+      'channelIds',
+      'getClipboardChildren',
+      'hasClipboardChildren',
+      'isClipboardNode',
+    ]),
+    children() {
+      return this.getClipboardChildren(this.nodeId, this.ancestorId);
+    },
   },
   methods: {
-    ...mapActions('contentNode', ['loadContentNodes']),
+    ...mapActions('clipboard', ['loadClipboardNodes']),
   },
 };
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
index e7f01c8450..e1369137d7 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
@@ -48,7 +48,7 @@
     },
     computed: {
       ...mapGetters('currentChannel', ['canEdit', 'trashId']),
-      ...mapGetters('contentNode', ['getContentNode', 'getTreeNode']),
+      ...mapGetters('contentNode', ['getContentNode']),
       node() {
         return this.getContentNode(this.nodeId);
       },
@@ -73,9 +73,6 @@
           },
         };
       },
-      treeNode() {
-        return this.getTreeNode(this.nodeId);
-      },
     },
     methods: {
       ...mapActions(['showSnackbar']),
@@ -115,13 +112,15 @@
           actionCallback: () => changeTracker.revert(),
         });
 
-        return this.copy({ id: this.nodeId }).then(() => {
-          return this.showSnackbar({
-            text: this.$tr('copiedToClipboardSnackbar'),
-            actionText: this.$tr('undo'),
-            actionCallback: () => changeTracker.revert(),
-          });
-        });
+        return this.copy({ node_id: this.node.node_id, channel_id: this.node.channel_id }).then(
+          () => {
+            return this.showSnackbar({
+              text: this.$tr('copiedToClipboardSnackbar'),
+              actionText: this.$tr('undo'),
+              actionCallback: () => changeTracker.revert(),
+            });
+          }
+        );
       }),
       duplicateNode: withChangeTracker(function(changeTracker) {
         this.showSnackbar({
@@ -130,7 +129,7 @@
           actionText: this.$tr('cancel'),
           actionCallback: () => changeTracker.revert(),
         });
-        const target = this.treeNode.parent;
+        const target = this.node.parent;
         return this.copyContentNode({ id: this.nodeId, target, deep: true }).then(() => {
           return this.showSnackbar({
             text: this.$tr('copiedSnackbar'),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/NodeTreeNavigation.vue b/contentcuration/contentcuration/frontend/channelEdit/components/NodeTreeNavigation.vue
index b7686c46ee..27499f4527 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/NodeTreeNavigation.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/NodeTreeNavigation.vue
@@ -45,10 +45,6 @@
       event: 'updateSelectedNodeId',
     },
     props: {
-      treeId: {
-        type: String,
-        required: true,
-      },
       selectedNodeId: {
         type: String,
         required: true,
@@ -107,7 +103,6 @@
           this.loadContentNode(nodeId),
           this.loadAncestors({
             id: nodeId,
-            includeSelf: true,
           }),
         ];
 
@@ -115,7 +110,6 @@
           promises.push(
             this.loadChildren({
               parent: nodeId,
-              tree_id: this.treeId,
             })
           );
         }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.spec.js
index 27bd13914f..aa77ed91e7 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.spec.js
@@ -7,7 +7,7 @@ import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 const localVue = createLocalVue();
 localVue.use(Vuex);
 
-const TREE_ID = 'tree-id';
+const ROOT_ID = 'tree-id';
 const NODE_ID = 'node-id';
 
 const initWrapper = ({ getters = {}, mutations = {}, actions = {}, propsData = {} } = {}) => {
@@ -46,7 +46,7 @@ const initWrapper = ({ getters = {}, mutations = {}, actions = {}, propsData = {
 
   return mount(StudioTree, {
     propsData: {
-      treeId: TREE_ID,
+      treeId: ROOT_ID,
       nodeId: NODE_ID,
       onNodeClick: jest.fn(),
       ...propsData,
@@ -172,7 +172,7 @@ describe('StudioTree', () => {
         });
 
         expect(mockLoadChildren).toHaveBeenCalledTimes(1);
-        expect(mockLoadChildren.mock.calls[0][1]).toEqual({ parent: NODE_ID, tree_id: TREE_ID });
+        expect(mockLoadChildren.mock.calls[0][1]).toEqual({ parent: NODE_ID });
       });
 
       it("doesn't dispatch load children action if node has no resources", () => {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
index 12b5d5f710..99c0b8de86 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
@@ -85,7 +85,6 @@
           <StudioTree
             v-for="child in subtopics"
             :key="child.id"
-            :treeId="treeId"
             :nodeId="child.id"
             :selectedNodeId="selectedNodeId"
             :allowEditing="allowEditing"
@@ -115,10 +114,6 @@
       LoadingText,
     },
     props: {
-      treeId: {
-        type: String,
-        required: true,
-      },
       nodeId: {
         type: String,
         required: true,
@@ -140,12 +135,16 @@
         type: Boolean,
         default: false,
       },
+      dataPreloaded: {
+        type: Boolean,
+        default: false,
+      },
     },
-    data: () => {
+    data() {
       return {
         ContentKindsNames,
         loading: false,
-        loaded: false,
+        loaded: this.dataPreloaded,
       };
     },
     computed: {
@@ -153,12 +152,11 @@
       node() {
         return this.getContentNode(this.nodeId);
       },
+      children() {
+        return this.getContentNodeChildren(this.nodeId) || [];
+      },
       subtopics() {
-        const children = this.getContentNodeChildren(this.nodeId);
-        if (!children) {
-          return [];
-        }
-        return children.filter(child => child.kind === this.ContentKindsNames.TOPIC);
+        return this.children.filter(child => child.kind === this.ContentKindsNames.TOPIC);
       },
       showExpansion() {
         return this.node && this.node.total_count > this.node.resource_count;
@@ -198,7 +196,6 @@
           this.loading = true;
           return this.loadChildren({
             parent: this.nodeId,
-            tree_id: this.treeId,
           }).then(() => {
             this.loading = false;
             this.loaded = true;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
index d2443793aa..8b6e2ca9b3 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
@@ -162,21 +162,22 @@
     },
     computed: {
       ...mapState('contentNode', { moveNodeIds: 'moveNodes' }),
+      ...mapState('clipboard', { copyNodes: 'clipboardMoveNodes' }),
       ...mapGetters('currentChannel', ['currentChannel', 'rootId']),
       ...mapGetters('contentNode', [
         'getContentNode',
         'getContentNodeChildren',
-        'getTreeNode',
         'getContentNodeAncestors',
         'getTopicAndResourceCounts',
       ]),
       dialog: {
         get() {
-          return Boolean(this.moveNodeIds.length);
+          return Boolean(this.moveNodeIds.length || this.copyNodes.length);
         },
         set(value) {
           if (!value) {
             this.setMoveNodes([]);
+            this.setCopyNodes([]);
           }
         },
       },
@@ -184,8 +185,8 @@
         return this.$tr('moveItems', this.getTopicAndResourceCounts(this.moveNodeIds));
       },
       currentLocationId() {
-        let treeNode = this.getTreeNode(this.moveNodeIds[0]);
-        return treeNode && treeNode.parent;
+        const contentNode = this.getContentNode(this.moveNodeIds[0]);
+        return contentNode && contentNode.parent;
       },
       currentNode() {
         return this.getContentNode(this.targetNodeId);
@@ -209,8 +210,15 @@
       this.targetNodeId = this.currentLocationId || this.rootId;
     },
     methods: {
-      ...mapActions('contentNode', ['createContentNode', 'loadChildren', 'moveContentNodes']),
+      ...mapActions('contentNode', [
+        'createContentNode',
+        'loadChildren',
+        'moveContentNodes',
+        'copyContentNode',
+      ]),
+      ...mapActions('clipboard', ['deleteClipboardNodes']),
       ...mapMutations('contentNode', { setMoveNodes: 'SET_MOVE_NODES' }),
+      ...mapMutations('clipboard', { setCopyNodes: 'SET_CLIPBOARD_MOVE_NODES' }),
       isDisabled(node) {
         return this.moveNodeIds.includes(node.id);
       },
@@ -234,7 +242,7 @@
           this.loading = true;
           return this.loadChildren({
             parent: this.targetNodeId,
-            tree_id: this.rootId,
+            root_id: this.rootId,
           }).then(() => {
             this.loading = false;
           });
@@ -249,7 +257,24 @@
         });
       },
       moveNodes() {
-        this.moveContentNodes({ id__in: this.moveNodeIds, parent: this.targetNodeId }).then(() => {
+        let promise;
+        if (this.moveNodeIds.length) {
+          promise = this.moveContentNodes({ id__in: this.moveNodeIds, parent: this.targetNodeId });
+        } else if (this.copyNodes.length) {
+          promise = Promise.all(
+            this.copyNodes.map(copyNode =>
+              this.copyContentNode({
+                id: copyNode.id,
+                deep: copyNode.deep,
+                target: this.targetNodeId,
+                children: copyNode.children,
+              })
+            )
+          ).then(() =>
+            this.deleteClipboardNodes(this.copyNodes.map(copyNode => copyNode.selectionId))
+          );
+        }
+        promise.then(() => {
           this.dialog = false;
           this.$store.dispatch('showSnackbar', {
             text: this.$tr('movedMessage', { title: this.currentNode.title }),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js
index 8e469dfdb5..df4c6b5d4d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js
@@ -13,21 +13,20 @@ localVue.use(Vuex);
 localVue.use(VueRouter);
 
 const NODE_ID = 'id-reading';
-const ROOT_TREE_ID = 'channel-root-tree';
+const ROOT_ID = 'channel-root-tree';
 
 const GETTERS = {
   global: {
     isCompactViewMode: jest.fn(),
   },
   currentChannel: {
-    rootId: () => ROOT_TREE_ID,
+    rootId: () => ROOT_ID,
     currentChannel: () => jest.fn(),
     stagingId: jest.fn(),
     hasStagingTree: jest.fn(),
     getCurrentChannelStagingDiff: jest.fn(),
   },
   contentNode: {
-    getTreeNodeChildren: () => jest.fn(),
     getContentNodeChildren: () => jest.fn(),
     getContentNodeAncestors: () => jest.fn(),
     getContentNode: () => jest.fn(),
@@ -174,7 +173,7 @@ describe('StagingTreePage', () => {
     const wrapper = initWrapper();
     const link = wrapper.find({ name: 'ToolBar' }).find('[data-test="root-tree-link"]');
 
-    expect(link.attributes().href).toBe(`#/${ROOT_TREE_ID}`);
+    expect(link.attributes().href).toBe(`#/${ROOT_ID}`);
   });
 
   it('renders no resources found message if a channel has no staging tree', () => {
@@ -211,9 +210,6 @@ describe('StagingTreePage', () => {
           },
         };
       };
-      getters.contentNode.getTreeNodeChildren = () => () => {
-        return [{ id: 'id-topic' }, { id: 'id-document' }, { id: 'id-exercise' }];
-      };
       getters.contentNode.getContentNodeChildren = () => () => {
         return [
           { id: 'id-topic', title: 'Topic', kind: ContentKindsNames.TOPIC },
@@ -425,7 +421,7 @@ describe('StagingTreePage', () => {
 
         expect(wrapper.vm.$router.currentRoute.name).toBe(RouterNames.TREE_VIEW);
         expect(wrapper.vm.$router.currentRoute.params).toEqual({
-          nodeId: ROOT_TREE_ID,
+          nodeId: ROOT_ID,
         });
       });
     });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
index 226aa3c6e5..bc223703e6 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
@@ -323,13 +323,9 @@
         'hasStagingTree',
         'getCurrentChannelStagingDiff',
       ]),
-      ...mapGetters('contentNode', [
-        'getTreeNodeChildren',
-        'getContentNodeChildren',
-        'getContentNodeAncestors',
-      ]),
+      ...mapGetters('contentNode', ['getContentNodeChildren', 'getContentNodeAncestors']),
       isEmpty() {
-        return !this.hasStagingTree || !this.getTreeNodeChildren(this.stagingId);
+        return !this.hasStagingTree || !this.getContentNodeChildren(this.stagingId);
       },
       rootTreeRoute() {
         return {
@@ -405,8 +401,8 @@
     },
     watch: {
       nodeId(newNodeId) {
-        this.loadAncestors({ id: newNodeId, includeSelf: true });
-        this.loadChildren({ parent: newNodeId, tree_id: this.stagingId });
+        this.loadAncestors({ id: newNodeId });
+        this.loadChildren({ parent: newNodeId, root_id: this.stagingId });
       },
       detailNodeId(newDetailNodeId) {
         if (!newDetailNodeId) {
@@ -424,18 +420,13 @@
     },
     created() {
       return this.loadCurrentChannel({ staging: true })
-        .then(channel => {
-          if (channel.staging_root_id) {
-            return this.loadTree({ tree_id: channel.staging_root_id });
-          }
-        })
         .then(() => {
           if (!this.hasStagingTree) {
             return;
           }
           Promise.all([
-            this.loadAncestors({ id: this.nodeId, includeSelf: true }),
-            this.loadChildren({ parent: this.nodeId, tree_id: this.stagingId }),
+            this.loadAncestors({ id: this.nodeId }),
+            this.loadChildren({ parent: this.nodeId, root_id: this.stagingId }),
           ]).then(() => {
             this.isLoading = false;
             this.loadCurrentChannelStagingDiff();
@@ -450,7 +441,7 @@
       ...mapActions('channel', ['loadChannel']),
       ...mapActions('currentChannel', ['loadCurrentChannelStagingDiff', 'deployCurrentChannel']),
       ...mapActions('currentChannel', { loadCurrentChannel: 'loadChannel' }),
-      ...mapActions('contentNode', ['loadAncestors', 'loadChildren', 'loadTree']),
+      ...mapActions('contentNode', ['loadAncestors', 'loadChildren']),
       ...mapMutations('contentNode', {
         collapseAll: 'COLLAPSE_ALL_EXPANDED',
         setExpanded: 'SET_EXPANSION',
diff --git a/contentcuration/contentcuration/frontend/channelEdit/router.js b/contentcuration/contentcuration/frontend/channelEdit/router.js
index f6f5b48abe..1604fb755f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/router.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/router.js
@@ -23,13 +23,9 @@ const router = new VueRouter({
       component: Sandbox,
       beforeEnter: (to, from, next) => {
         const channelPromise = store.dispatch('currentChannel/loadChannel');
-        const treePromise = store.dispatch(
-          'contentNode/loadTree',
-          store.state.currentChannel.currentChannelId
-        );
         const nodePromise = store.dispatch('contentNode/loadContentNode', to.params.nodeId);
         // api call to get ancestors if nodeId is a child descendant???
-        return Promise.all([channelPromise, treePromise, nodePromise])
+        return Promise.all([channelPromise, nodePromise])
           .then(() => next())
           .catch(() => {});
       },
@@ -80,10 +76,9 @@ const router = new VueRouter({
       props: true,
       component: AddPreviousStepsPage,
       beforeEnter: (to, from, next) => {
-        const { currentChannelId } = store.state.currentChannel;
         const { targetNodeId } = to.params;
         const promises = [
-          store.dispatch('channel/loadChannel', currentChannelId),
+          store.dispatch('currentChannel/loadChannel'),
           store.dispatch('contentNode/loadRelatedResources', targetNodeId),
         ];
 
@@ -100,10 +95,9 @@ const router = new VueRouter({
       props: true,
       component: AddNextStepsPage,
       beforeEnter: (to, from, next) => {
-        const { currentChannelId } = store.state.currentChannel;
         const { targetNodeId } = to.params;
         const promises = [
-          store.dispatch('channel/loadChannel', currentChannelId),
+          store.dispatch('currentChannel/loadChannel'),
           store.dispatch('contentNode/loadRelatedResources', targetNodeId),
         ];
 
@@ -218,13 +212,8 @@ const router = new VueRouter({
       props: true,
       component: TreeView,
       beforeEnter: (to, from, next) => {
-        const { currentChannelId } = store.state.currentChannel;
-
         return store
           .dispatch('currentChannel/loadChannel')
-          .then(() => {
-            return store.dispatch('contentNode/loadChannelTree', currentChannelId);
-          })
           .catch(error => {
             throw new Error(error);
           })
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index a14438e939..49357510d5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -227,17 +227,18 @@
       ...mapGetters('currentChannel', ['canEdit', 'currentChannel', 'trashId']),
       ...mapGetters('contentNode', [
         'getContentNode',
+        'getContentNodes',
         'getContentNodeAncestors',
-        'getTreeNodeChildren',
         'getTopicAndResourceCounts',
+        'getContentNodeChildren',
       ]),
       selectAll: {
         get() {
-          return this.selected.length === this.treeChildren.length;
+          return this.selected.length === this.children.length;
         },
         set(value) {
           if (value) {
-            this.selected = this.treeChildren.map(node => node.id);
+            this.selected = this.children.map(node => node.id);
           } else {
             this.selected = [];
           }
@@ -256,8 +257,8 @@
           };
         });
       },
-      treeChildren() {
-        return this.getTreeNodeChildren(this.topicId);
+      children() {
+        return this.getContentNodeChildren(this.topicId);
       },
       uploadFilesLink() {
         return { name: RouterNames.UPLOAD_FILES };
@@ -288,7 +289,7 @@
         this.selected = [];
 
         this.loadingAncestors = true;
-        this.loadAncestors({ id: this.topicId, includeSelf: true }).then(() => {
+        this.loadAncestors({ id: this.topicId }).then(() => {
           this.loadingAncestors = false;
         });
       },
@@ -305,12 +306,6 @@
         }
       },
     },
-    created() {
-      this.loadingAncestors = true;
-      this.loadAncestors({ id: this.topicId, includeSelf: true }).then(() => {
-        this.loadingAncestors = false;
-      });
-    },
     methods: {
       ...mapActions(['showSnackbar']),
       ...mapActions(['setViewMode', 'addViewModeOverride', 'removeViewModeOverride']),
@@ -379,7 +374,8 @@
           });
         });
       }),
-      copyToClipboard: withChangeTracker(function(id__in, changeTracker) {
+      copyToClipboard: withChangeTracker(function(ids, changeTracker) {
+        const nodes = this.getContentNodes(ids);
         this.showSnackbar({
           duration: null,
           text: this.$tr('creatingClipboardCopies'),
@@ -387,7 +383,7 @@
           actionCallback: () => changeTracker.revert(),
         });
 
-        return this.copyAll({ id__in, deep: true }).then(() => {
+        return this.copyAll({ nodes }).then(() => {
           this.selectAll = false;
           return this.showSnackbar({
             text: this.$tr('copiedItemsToClipboard'),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
index ff9545f60a..9f11e0b6c4 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
@@ -85,7 +85,7 @@
       };
     },
     computed: {
-      ...mapGetters('contentNode', ['getContentNodeAncestors', 'getTreeNode']),
+      ...mapGetters('contentNode', ['getContentNodeAncestors']),
       selectAll: {
         get() {
           return this.ancestorIsSelected || !differenceBy(this.nodes, this.selected, 'id').length;
@@ -94,9 +94,6 @@
           this.$emit('change_selected', { isSelected, nodes: this.nodes });
         },
       },
-      topicNode() {
-        return this.getTreeNode(this.topicId);
-      },
       isSelected() {
         return function(node) {
           if (this.ancestorIsSelected) {
@@ -141,7 +138,6 @@
         this.loading = true;
         return this.loadChildren({
           parent,
-          tree_id: this.topicNode.tree_id,
         }).then(nodes => {
           this.nodes = nodes;
           this.loading = false;
@@ -150,18 +146,16 @@
     },
     mounted() {
       this.loading = true;
-      return this.loadChannelTree(this.$route.params.channelId).then(nodes => {
-        return Promise.all([
-          this.loadChildren({ parent: this.topicId, tree_id: nodes[0].tree_id }),
-          this.loadAncestors({ id: this.topicId, includeSelf: true }),
-        ]).then(([nodes]) => {
-          this.nodes = nodes;
-          this.loading = false;
-        });
+      return Promise.all([
+        this.loadChildren({ parent: this.topicId }),
+        this.loadAncestors({ id: this.topicId }),
+      ]).then(([nodes]) => {
+        this.nodes = nodes;
+        this.loading = false;
       });
     },
     methods: {
-      ...mapActions('contentNode', ['loadChildren', 'loadAncestors', 'loadChannelTree']),
+      ...mapActions('contentNode', ['loadChildren', 'loadAncestors']),
       // @public
       scrollToNode(nodeId) {
         const ref = this.$refs[nodeId];
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
index 50b69f0eb7..2014cf597d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
@@ -155,7 +155,7 @@
           actionText: this.$tr('cancel'),
           actionCallback: () => changeTracker.revert(),
         });
-        return this.copy({ id: this.copyNode.id })
+        return this.copy({ node_id: this.copyNode.node_id, channel_id: this.copyNode.channel_id })
           .then(() => {
             return this.$store.dispatch('showSnackbar', {
               text: this.$tr('copiedToClipboard'),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
index 217313167a..210404663e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
@@ -94,10 +94,10 @@
         return this.rootId === this.parentId;
       },
     },
-    mounted() {
+    created() {
       if (this.node && this.node.total_count && !this.children.length) {
         this.loading = true;
-        this.loadChildren({ parent: this.parentId, tree_id: this.rootId }).then(() => {
+        this.loadChildren({ parent: this.parentId }).then(() => {
           this.loading = false;
         });
       }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 7d834ae820..af080d901e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -119,7 +119,7 @@
     <GlobalSnackbar />
     <PublishModal v-if="showPublishModal" v-model="showPublishModal" />
     <ProgressModal />
-    <MoveModal v-if="moveNodes && moveNodes.length" />
+    <MoveModal />
     <template v-if="isPublished">
       <ChannelTokenModal v-model="showTokenModal" :channel="currentChannel" />
     </template>
@@ -149,7 +149,7 @@
 
 <script>
 
-  import { mapGetters, mapState } from 'vuex';
+  import { mapGetters } from 'vuex';
   import { RouterNames } from '../../constants';
   import MoveModal from '../../components/move/MoveModal';
   import PublishModal from '../../components/publish/PublishModal';
@@ -189,7 +189,6 @@
       };
     },
     computed: {
-      ...mapState('contentNode', ['moveNodes']),
       ...mapGetters('contentNode', ['getContentNode']),
       ...mapGetters('currentChannel', ['currentChannel', 'canEdit', 'canManage', 'rootId']),
       rootNode() {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js
index b6e50dc81f..a941b6f6a9 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js
@@ -18,11 +18,13 @@ const GETTERS = {
     hasStagingTree: jest.fn(),
     stagingId: jest.fn(),
     rootId: jest.fn(),
+    canEdit: jest.fn(() => true),
   },
   contentNode: {
-    getContentNodeChildren: () => jest.fn(),
-    getContentNodeAncestors: () => jest.fn(),
-    getContentNode: () => jest.fn(),
+    getContentNodeChildren: () => jest.fn(() => []),
+    getContentNodeAncestors: () => jest.fn(() => []),
+    getContentNode: () => jest.fn(() => ({})),
+    getTopicAndResourceCounts: () => jest.fn(() => ({ topicCount: 0, resourceCount: 0 })),
   },
 };
 
@@ -30,6 +32,7 @@ const ACTIONS = {
   contentNode: {
     loadAncestors: jest.fn(),
     loadContentNode: jest.fn(),
+    loadContentNodes: jest.fn(),
   },
 };
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
index 4728e3ae99..82c0165c25 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
@@ -54,19 +54,23 @@
               />
             </VLayout>
             <div style="margin-left: -24px;">
+              <LoadingText v-if="loading" />
               <StudioTree
+                v-else
                 :treeId="rootId"
                 :nodeId="rootId"
                 :selectedNodeId="nodeId"
                 :onNodeClick="onTreeNodeClick"
                 :allowEditing="true"
                 :root="true"
+                :dataPreloaded="true"
               />
             </div>
           </ResizableNavigationDrawer>
         </VFlex>
         <VContainer fluid class="pa-0 ma-0" style="height: calc(100vh - 64px);">
-          <CurrentTopicView :topicId="nodeId" :detailNodeId="detailNodeId" />
+          <LoadingText v-if="loading" />
+          <CurrentTopicView v-else :topicId="nodeId" :detailNodeId="detailNodeId" />
         </VContainer>
 
       </VLayout>
@@ -78,13 +82,14 @@
 
 <script>
 
-  import { mapGetters, mapMutations } from 'vuex';
+  import { mapActions, mapGetters, mapMutations } from 'vuex';
   import { RouterNames } from '../../constants';
   import StudioTree from '../../components/StudioTree/StudioTree';
   import CurrentTopicView from '../CurrentTopicView';
   import TreeViewBase from './TreeViewBase';
   import Banner from 'shared/views/Banner';
   import IconButton from 'shared/views/IconButton';
+  import LoadingText from 'shared/views/LoadingText';
   import ResizableNavigationDrawer from 'shared/views/ResizableNavigationDrawer';
 
   export default {
@@ -96,6 +101,7 @@
       IconButton,
       ResizableNavigationDrawer,
       CurrentTopicView,
+      LoadingText,
     },
     props: {
       nodeId: {
@@ -107,14 +113,16 @@
         required: false,
       },
     },
+    data() {
+      return {
+        loading: true,
+      };
+    },
     computed: {
       ...mapGetters('currentChannel', ['currentChannel', 'hasStagingTree', 'stagingId', 'rootId']),
       ...mapGetters('contentNode', ['getContentNodeChildren', 'getContentNodeAncestors']),
       isEmptyChannel() {
-        return (
-          !this.getContentNodeChildren(this.rootId) ||
-          !this.getContentNodeChildren(this.rootId).length
-        );
+        return !this.getContentNodeChildren(this.rootId).length;
       },
       ancestors() {
         return this.getContentNodeAncestors(this.nodeId);
@@ -148,11 +156,18 @@
         });
       },
     },
+    created() {
+      Promise.all([
+        this.loadContentNodes({ parent__in: [this.nodeId, this.rootId] }),
+        this.loadAncestors({ id: this.nodeId }),
+      ]).then(() => (this.loading = false));
+    },
     methods: {
       ...mapMutations('contentNode', {
         collapseAll: 'COLLAPSE_ALL_EXPANDED',
         setExpanded: 'SET_EXPANSION',
       }),
+      ...mapActions('contentNode', ['loadAncestors', 'loadContentNodes']),
       jumpToLocation() {
         this.ancestors.forEach(ancestor => {
           this.setExpanded({ id: ancestor.id, expanded: true });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
index adc2e2dde0..f4bbca7f80 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
@@ -196,14 +196,12 @@
         this.loading = false;
         return;
       }
-      this.loadTrashTree(this.trashId)
-        .then(nodes => {
-          return nodes.length ? this.loadContentNodes({ id__in: nodes.map(node => node.id) }) : [];
-        })
-        .then(() => (this.loading = false));
+      this.loadChildren({ parent: this.trashId }).then(() => {
+        this.loading = false;
+      });
     },
     methods: {
-      ...mapActions('contentNode', ['deleteContentNodes', 'loadTrashTree', 'loadContentNodes']),
+      ...mapActions('contentNode', ['deleteContentNodes', 'loadChildren']),
       ...mapMutations('contentNode', { setMoveNodes: 'SET_MOVE_NODES' }),
       reset() {
         this.previewNodeId = null;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js
index 6ea3170568..0de7a2826a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js
@@ -1,43 +1,40 @@
+import get from 'lodash/get';
 import uniq from 'lodash/uniq';
+import uniqBy from 'lodash/uniqBy';
 import * as Vibrant from 'node-vibrant';
 import { SelectionFlags } from './constants';
-import { Tree } from 'shared/data/resources';
+import { selectionId } from './utils';
 import { promiseChunk } from 'shared/utils';
-import { RELATIVE_TREE_POSITIONS } from 'shared/data/constants';
+import { Clipboard } from 'shared/data/resources';
 
 export function loadChannels(context) {
-  return context.dispatch('contentNode/loadClipboardTree', null, { root: true }).then(treeNodes => {
-    return context.dispatch('loadTreeNodes', treeNodes);
-  });
-}
-
-export function loadTreeNodes(context, treeNodes) {
-  const clipboardTreeId = context.rootGetters['clipboardRootId'];
-  const rootNodes = treeNodes.filter(node => node.parent === clipboardTreeId);
-
-  if (!rootNodes.length) {
-    return [];
-  }
+  const clipboardRootId = context.rootGetters['clipboardRootId'];
+  return Clipboard.where({ parent: clipboardRootId }).then(clipboardNodes => {
+    if (!clipboardNodes.length) {
+      return [];
+    }
 
-  const root = true;
+    const root = true;
 
-  // Find the channels we need to load
-  const channelIds = uniq(treeNodes.map(node => node.channel_id).filter(Boolean));
-  return promiseChunk(channelIds, 50, id__in => {
-    // Load up the source channels
-    return context.dispatch('channel/loadChannelList', { id__in }, { root });
-  })
-    .then(channels => {
-      // We need the channel tree for each source, which we need for copying,
-      // although we could probably delay this.
-      //
-      return promiseChunk(channelIds, 5, ids => {
-        return Promise.all(
-          ids.map(id => context.dispatch('contentNode/loadChannelTree', id, { root }))
-        );
-      }).then(() => channels);
-    })
-    .then(channels => {
+    // Find the channels we need to load
+    const channelIds = uniq(
+      clipboardNodes.map(clipboardNode => clipboardNode.source_channel_id).filter(Boolean)
+    );
+    const nodeIdChannelIdPairs = uniqBy(
+      clipboardNodes,
+      c => c.source_node_id + c.source_channel_id
+    ).map(c => [c.source_node_id, c.source_channel_id]);
+    return Promise.all([
+      promiseChunk(channelIds, 50, id__in => {
+        // Load up the source channels
+        return context.dispatch('channel/loadChannelList', { id__in }, { root });
+      }),
+      context.dispatch(
+        'contentNode/loadContentNodes',
+        { '[node_id+channel_id]__in': nodeIdChannelIdPairs },
+        { root }
+      ),
+    ]).then(([channels]) => {
       // Add the channel to the selected state, it acts like a node
       channels.forEach(channel => {
         if (!(channel.id in context.state.selected)) {
@@ -49,7 +46,7 @@ export function loadTreeNodes(context, treeNodes) {
       });
 
       // Be sure to put these in after the channels!
-      treeNodes.forEach(node => {
+      clipboardNodes.forEach(node => {
         if (!(node.id in context.state.selected)) {
           context.commit('UPDATE_SELECTION_STATE', {
             id: node.id,
@@ -60,8 +57,68 @@ export function loadTreeNodes(context, treeNodes) {
 
       // Do not return dispatch, let this operate async
       context.dispatch('loadChannelColors');
-      return treeNodes;
+      context.commit('ADD_CLIPBOARD_NODES', clipboardNodes);
+      return clipboardNodes;
+    });
+  });
+}
+
+export function loadClipboardNodes(context, { parent, ancestorId }) {
+  const parentNode = context.state.clipboardNodesMap[parent];
+  const root = true;
+  if (parentNode && parentNode.total_resources) {
+    return Clipboard.where({ parent }).then(clipboardNodes => {
+      if (!clipboardNodes.length) {
+        return [];
+      }
+
+      const nodeIdChannelIdPairs = uniqBy(
+        clipboardNodes,
+        c => c.source_node_id + c.source_channel_id
+      ).map(c => [c.source_node_id, c.source_channel_id]);
+      return context
+        .dispatch(
+          'contentNode/loadContentNodes',
+          { '[node_id+channel_id]__in': nodeIdChannelIdPairs },
+          { root }
+        )
+        .then(() => {
+          // Be sure to put these in after the channels!
+          clipboardNodes.forEach(node => {
+            if (!(node.id in context.state.selected)) {
+              context.commit('UPDATE_SELECTION_STATE', {
+                id: node.id,
+                selectionState: SelectionFlags.NONE,
+              });
+            }
+          });
+
+          context.commit('ADD_CLIPBOARD_NODES', clipboardNodes);
+          return clipboardNodes;
+        });
     });
+  } else {
+    // Has no child resources, so fetch children of associated contentnode instead
+    const contentNode = context.getters.getClipboardNodeForRender(parent);
+    if (contentNode) {
+      return context
+        .dispatch('contentNode/loadContentNodes', { parent: contentNode.id }, { root })
+        .then(contentNodes => {
+          // Be sure to put these in after the channels!
+          contentNodes.forEach(node => {
+            if (!(node.id in context.state.selected)) {
+              context.commit('UPDATE_SELECTION_STATE', {
+                id: node.id,
+                selectionState: SelectionFlags.NONE,
+                ancestorId,
+              });
+            }
+          });
+          return [];
+        });
+    }
+  }
+  return [];
 }
 
 // Here are the swatches Vibrant gives, and the order we'll check them for colors we can use.
@@ -116,83 +173,74 @@ export function loadChannelColors(context) {
 
 /**
  * @param context
- * @param {string} id
+ * @param {string} node_id
+ * @param {string} channel_id
  * @param {string|null} [target]
  * @param {boolean} [deep]
  * @param children
  * @return {*}
  */
-export function copy(context, { id, target = null, deep = false, children = [] }) {
-  if (deep && children.length) {
-    throw new Error('Both children and deep flag cannot be set');
-  }
+export function copy(
+  context,
+  { node_id, channel_id, children = [], parent = null, extra_fields = null }
+) {
+  const clipboardRootId = context.rootGetters['clipboardRootId'];
 
-  // On the client-side, tree ID's are also the root node ID
-  const clipboardTreeId = context.rootGetters['clipboardRootId'];
-  target = target || clipboardTreeId;
-
-  return Tree.get(id).then(source => {
-    // If the copy source is in the clipboard, "redirect" to real source and try again
-    if (source.tree_id === clipboardTreeId) {
-      return context.dispatch('copy', { id: source.source_id, target, deep, children });
+  // This copies a "bare" copy, if you want a full content node copy,
+  // go to the contentNode state actions
+  return Clipboard.copy(node_id, channel_id, clipboardRootId, parent, extra_fields).then(node => {
+    if (!children.length) {
+      // Refresh our channel list following the copy
+      context.dispatch('loadChannels');
+      return [node];
     }
 
-    // This copies a "bare" copy, if you want a full content node copy,
-    // go to the contentNode state actions
-    return Tree.copy(id, target, RELATIVE_TREE_POSITIONS.LAST_CHILD, deep)
-      .then(treeNodes => {
-        return context.dispatch('loadTreeNodes', treeNodes);
+    return promiseChunk(children, 1, ([child]) => {
+      return context.dispatch(
+        'copy',
+        Object.assign(child, {
+          parent: node.id,
+        })
+      );
+    })
+      .then(otherNodes => {
+        // Add parent to beginning
+        otherNodes.unshift(node);
+        // Refresh our channel list following the copy
+        context.dispatch('loadChannels');
+        return otherNodes;
       })
-      .then(treeNodes => {
-        if (!children.length) {
-          return treeNodes;
-        }
-
-        // If we have children to add, then copy only returned one node
-        const [parentNode] = treeNodes;
-        return promiseChunk(children, 1, ([child]) => {
-          return context.dispatch(
-            'copy',
-            Object.assign(child, {
-              target: parentNode.id,
-            })
-          );
-        }).then(otherTreeNodes => {
-          // Add parent to beginning
-          otherTreeNodes.unshift(parentNode);
-          return otherTreeNodes;
-        });
+      .then(nodes => {
+        context.commit('ADD_CLIPBOARD_NODES', nodes);
       });
   });
 }
 
-export function copyAll(context, { id__in, deep = false }) {
-  const clipboardNode = context.rootGetters['contentNode/getContentNode'](
-    window.user.clipboard_root_id
-  );
-  const copyPromise = promiseChunk(id__in, 20, idChunk => {
-    return Promise.all(idChunk.map(id => context.dispatch('copy', { id, deep })));
+/*
+ * For convenience, this function takes an array of nodes as the argument,
+ * to consolidate any uniquefying.
+ */
+export function copyAll(context, { nodes }) {
+  const sources = uniqBy(nodes, c => c.node_id + c.channel_id)
+    .map(n => ({ node_id: n.node_id, channel_id: n.channel_id }))
+    .filter(n => n.node_id && n.channel_id);
+  return promiseChunk(sources, 20, sourcesChunk => {
+    return Promise.all(sourcesChunk.map(source => context.dispatch('copy', source)));
   });
-
-  // We need to check if the clipboard tree is initialized before we try to copy.
-  if (!clipboardNode) {
-    return context
-      .dispatch('contentNode/loadClipboardTree', null, { root: true })
-      .then(() => copyPromise);
-  } else {
-    return copyPromise;
-  }
 }
 
 /**
  * Recursive function to set selection state for a node, and possibly it's ancestors and descendants
  */
-export function setSelectionState(context, { id, selectionState, deep = true, parents = true }) {
-  const currentState = context.state.selected[id];
+export function setSelectionState(
+  context,
+  { id, selectionState, deep = true, parents = true, ancestorId = null }
+) {
+  const currentState = context.state.selected[selectionId(id, ancestorId)];
 
   // Well, we should only bother if it needs updating
   if (currentState !== selectionState) {
-    context.commit('UPDATE_SELECTION_STATE', { id, selectionState });
+    context.commit('UPDATE_SELECTION_STATE', { id, selectionState, ancestorId });
   } else if (!deep && !parents) {
     return;
   }
@@ -207,27 +255,33 @@ export function setSelectionState(context, { id, selectionState, deep = true, pa
     const children =
       id === clipboardTreeId
         ? context.getters.channelIds
-        : context.getters.getClipboardChildren(id).map(c => c.id);
-
+        : context.getters.getClipboardChildren(id, ancestorId).map(c => c.id);
     // Update descendants
-    children.forEach(id => {
+    children.forEach(cid => {
       context.dispatch('setSelectionState', {
-        id,
+        id: cid,
         selectionState: selectionState === ALL ? ALL : SelectionFlags.NONE,
         parents: false,
+        ancestorId: context.getters.isClipboardNode(cid)
+          ? null
+          : context.getters.isClipboardNode(id)
+          ? id
+          : ancestorId,
       });
     });
   }
 
-  const parentId = context.getters.getClipboardParentId(id);
+  const parentId = context.getters.getClipboardParentId(id, ancestorId);
 
   if (parentId && parents) {
     // Updating the parents at this point is fairly easy, we just recurse upwards, recomputing
     // the new state for the parent
+    const parentAncestorId = ancestorId === parentId ? null : ancestorId;
     context.dispatch('setSelectionState', {
       id: parentId,
-      selectionState: context.getters.getSelectionState(parentId),
+      selectionState: context.getters.getSelectionState(parentId, parentAncestorId),
       deep: false,
+      ancestorId: parentAncestorId,
     });
   }
 }
@@ -243,3 +297,39 @@ export function resetSelectionState(context) {
     deep: true,
   });
 }
+
+export function deleteClipboardNode(context, { clipboardNodeId, ancestorId = null }) {
+  if (context.getters.isClipboardNode(clipboardNodeId)) {
+    return Clipboard.delete(clipboardNodeId).then(() => {
+      context.commit('REMOVE_CLIPBOARD_NODE', { id: clipboardNodeId });
+    });
+  }
+  const ancestor = context.state.clipboardNodesMap[ancestorId];
+  const excluded_descendants = {
+    ...get(ancestor, ['extra_fields', 'excluded_descendants'], {}),
+    [clipboardNodeId]: true,
+  };
+  const update = {
+    extra_fields: {
+      excluded_descendants,
+    },
+  };
+  // Otherwise we have a non clipboard node
+  return Clipboard.update(ancestorId).then(() => {
+    context.commit('ADD_CLIPBOARD_NODE', {
+      ...ancestor,
+      ...update,
+    });
+  });
+}
+
+export function deleteClipboardNodes(context, selectionIds) {
+  return Promise.all(
+    selectionIds.map(selectionId => {
+      return deleteClipboardNode(context, {
+        clipboardNodeId: selectionId.split('-')[0],
+        ancestorId: selectionId.split('-')[1],
+      });
+    })
+  );
+}
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/getters.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/getters.js
index e900cd4040..634c2b9e95 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/getters.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/getters.js
@@ -1,7 +1,10 @@
+import flatten from 'lodash/flatten';
+import get from 'lodash/get';
 import isFunction from 'lodash/isFunction';
 import uniq from 'lodash/uniq';
 import sortBy from 'lodash/sortBy';
 import { SelectionFlags } from './constants';
+import { selectionId, idFromSelectionId } from './utils';
 
 /**
  * Several of these handle the clipboard root and channel ID's because we're
@@ -22,7 +25,20 @@ import { SelectionFlags } from './constants';
  */
 export function clipboardChildren(state, getters, rootState, rootGetters) {
   const rootId = rootGetters['clipboardRootId'];
-  return rootGetters['contentNode/getTreeNodeChildren'](rootId);
+  return Object.values(state.clipboardNodesMap).filter(c => c.parent === rootId);
+}
+
+export function hasClipboardChildren(state, getters) {
+  return function(id) {
+    const node = getters.getClipboardNodeForRender(id);
+    return node && node.total_count > 0;
+  };
+}
+
+export function isClipboardNode(state) {
+  return function(id) {
+    return Boolean(state.clipboardNodesMap[id]);
+  };
 }
 
 export function getClipboardChildren(state, getters, rootState, rootGetters) {
@@ -32,16 +48,40 @@ export function getClipboardChildren(state, getters, rootState, rootGetters) {
    *
    * @param {string} id
    */
-  return function(id) {
+  return function(id, ancestorId = null) {
     const rootId = rootGetters['clipboardRootId'];
 
     if (id === rootId) {
       return getters.channelIds.map(id => ({ id, channel_id: id }));
     }
 
-    return getters.channelIds.includes(id)
-      ? getters.clipboardChildren.filter(child => child.channel_id === id)
-      : rootGetters['contentNode/getTreeNodeChildren'](id);
+    if (getters.channelIds.includes(id)) {
+      // This is a channel level node, so return the channels
+      return sortBy(
+        getters.clipboardChildren.filter(child => child.source_channel_id === id),
+        'lft'
+      );
+    }
+    if (state.clipboardNodesMap[id] && state.clipboardNodesMap[id].total_count) {
+      // We have a clipboard node that has children return its children directly
+      return sortBy(
+        Object.values(state.clipboardNodesMap).filter(c => c.parent === id),
+        'lft'
+      );
+    }
+    const contentNode = getters.getClipboardNodeForRender(id);
+    if (contentNode && contentNode.total_count) {
+      // Last clipboard node ancestor could either be further up the chain or this node
+      const ancestor = state.clipboardNodesMap[ancestorId] || state.clipboardNodesMap[id];
+      const children = rootGetters['contentNode/getContentNodeChildren'](contentNode.id);
+      if (ancestor) {
+        return children.filter(
+          c => !get(ancestor, ['extra_fields', 'excluded_descendants', c.id], false)
+        );
+      }
+      return children;
+    }
+    return [];
   };
 }
 
@@ -52,7 +92,7 @@ export function getClipboardParentId(state, getters, rootState, rootGetters) {
    *
    * @param {string} id
    */
-  return function(id) {
+  return function(id, ancestorId = null) {
     const rootId = rootGetters['clipboardRootId'];
 
     if (id === rootId) {
@@ -63,13 +103,75 @@ export function getClipboardParentId(state, getters, rootState, rootGetters) {
       return rootId;
     }
 
-    const treeNode = rootGetters['contentNode/getTreeNode'](id);
+    const clipboardNode = state.clipboardNodesMap[id];
+
+    if (clipboardNode) {
+      return clipboardNode.parent === rootId
+        ? clipboardNode.source_channel_id
+        : clipboardNode.parent;
+    }
+
+    const contentNode = rootGetters['contentNode/getContentNode'](id);
+
+    if (!contentNode) {
+      return null;
+    }
+
+    // Check if this contentNode is an immediate child of the clipboard ancestor
+    if (getters.getClipboardChildren(ancestorId).find(c => c.id === id)) {
+      return ancestorId;
+    }
+
+    // Otherwise, this is a contentNode that is somewhere further down the tree, so just return
+    // its parent
+    return contentNode.parent;
+  };
+}
+
+export function getClipboardNodeForRender(state, getters, rootState, rootGetters) {
+  /**
+   * Get a ContentNode for the clipboard based on the clipboard node id
+   * this then will look up the content node matching that node_id and channel_id
+   *
+   * @param {string} id
+   */
+  return function(id) {
+    const rootId = rootGetters['clipboardRootId'];
+
+    if (id === rootId) {
+      // Don't need to fetch a contentnode for the root id
+      return null;
+    }
+
+    const clipboardNode = state.clipboardNodesMap[id];
+
+    if (!clipboardNode) {
+      // No record of this node locally try a content node
+      const contentNode = rootGetters['contentNode/getContentNode'](id);
 
-    if (!treeNode) {
+      if (contentNode) {
+        return contentNode;
+      }
       return null;
     }
 
-    return treeNode.parent === rootId ? treeNode.channel_id : treeNode.parent;
+    // First try to look up by source_node_id and source_channel_id
+    const sourceNode = Object.values(rootState.contentNode.contentNodesMap).find(
+      node =>
+        node.node_id === clipboardNode.source_node_id &&
+        node.channel_id === clipboardNode.source_channel_id
+    );
+
+    if (sourceNode) {
+      const contentNode = rootGetters['contentNode/getContentNode'](sourceNode.id);
+      return {
+        ...contentNode,
+        resource_count: clipboardNode.resource_count || contentNode.resource_count,
+        total_count: clipboardNode.total_count || contentNode.total_count,
+      };
+    }
+
+    return null;
   };
 }
 
@@ -77,7 +179,7 @@ export function getClipboardParentId(state, getters, rootState, rootGetters) {
  * List of distinct source channel ID's containing a node on the clipboard
  */
 export function channelIds(state, getters) {
-  return uniq(getters.clipboardChildren.map(n => n.channel_id)).filter(Boolean);
+  return uniq(getters.clipboardChildren.map(n => n.source_channel_id)).filter(Boolean);
 }
 
 /**
@@ -107,11 +209,14 @@ export function filterSelectionIds(state) {
 /**
  * List of the selected tree nodes on the clipboard
  */
-export function selectedNodes(state, getters, rootState, rootGetters) {
+export function selectedNodes(state, getters) {
   return getters
     .filterSelectionIds(SelectionFlags.SELECTED)
-    .map(id => rootGetters['contentNode/getTreeNode'](id))
-    .filter(Boolean);
+    .map(selectionId => [
+      selectionId,
+      getters.getClipboardNodeForRender(idFromSelectionId(selectionId)),
+    ])
+    .filter(p => Boolean(p[1]));
 }
 
 /**
@@ -119,7 +224,7 @@ export function selectedNodes(state, getters, rootState, rootGetters) {
  */
 export function selectedChannels(state, getters, rootState, rootGetters) {
   return getters.selectedNodes
-    .map(node => node.channel_id)
+    .map(([, node]) => node.channel_id)
     .filter(Boolean)
     .reduce((channelIds, channelId) => {
       if (!channelIds.includes(channelId)) {
@@ -191,15 +296,25 @@ export function getSelectionState(state, getters, rootState, rootGetters) {
    *
    * @param {string} id
    */
-  return function(id) {
+  return function(id, ancestorId = null) {
     const rootId = rootGetters['clipboardRootId'];
 
     // Start with simply just 0 or 1, selection state
-    let selectionState = state.selected[id] & SelectionFlags.SELECTED;
+    let selectionState = state.selected[selectionId(id, ancestorId)] & SelectionFlags.SELECTED;
 
     // Compute the children state, if any
+    const children = getters.getClipboardChildren(id, ancestorId);
+    // Calculate the ancestor Id of the children, if they are clipboard nodes,
+    // then they have none, otherwise, either any passed in ancestorId or the id of this node
+    const childAncestorId =
+      children.length && getters.isClipboardNode(children[0].id)
+        ? null
+        : getters.isClipboardNode(id)
+        ? id
+        : ancestorId;
     const childrenState = getters.getSelectionStateFromIds(
-      getters.getClipboardChildren(id).map(c => c.id)
+      children.map(c => c.id),
+      childAncestorId
     );
 
     // No children state, we're done
@@ -233,14 +348,14 @@ export function getSelectionStateFromIds(state, getters) {
    *
    * @param {string[]} ids
    */
-  return function(ids) {
-    const states = ids.map(id => getters.getSelectionState(id));
-
+  return function(ids, ancestorId = null) {
     if (!ids.length) {
       // undefined state
       return null;
     }
 
+    const states = ids.map(id => getters.getSelectionState(id, ancestorId));
+
     // If all states are none, then none
     if (!states.find(s => s > SelectionFlags.NONE)) {
       return SelectionFlags.NONE;
@@ -274,9 +389,9 @@ export function getNextSelectionState(state, getters) {
    *
    * @param {string} id
    */
-  return function(id) {
+  return function(id, ancestorId = null) {
     // Compute the current state
-    const current = getters.getSelectionState(id);
+    const current = getters.getSelectionState(id, ancestorId);
 
     // Carefully determine each bit/piece of the state
     // Be sure to cast to bool because if we compare ===, we want true/false values
@@ -312,41 +427,82 @@ export function getCopyTrees(state, getters) {
    * @param {string} target
    * @return {[{ id: Number, deep: Boolean, target: string, children: [] }]}
    */
-  return function(target) {
-    const selectedNodes = getters.selectedNodes;
-
-    if (!selectedNodes.length) {
-      return [];
+  return function(rootId, target, ancestorId = null, ignoreSelection = false) {
+    function recurseForUnselectedIds(id, ancestorId) {
+      const selectionState = getters.getSelectionState(id, ancestorId);
+      // Nothing is selected, so return early.
+      if (selectionState === SelectionFlags.NONE) {
+        return [id];
+      }
+      return flatten(
+        getters
+          .getClipboardChildren(id, ancestorId)
+          .map(c => recurseForUnselectedIds(c.id, ancestorId))
+      );
     }
 
-    // Ensure we go down in tree order
-    const updates = sortBy(selectedNodes, 'lft').reduce((updates, selectedNode) => {
-      const selectionState = getters.currentSelectionState(selectedNode.id);
-      const update = {
-        id: selectedNode.source_id,
-        target,
-        deep: Boolean(selectionState & SelectionFlags.ALL_DESCENDANTS),
-        children: [],
-        ignore: false,
-      };
-
-      if (selectedNode.parent in updates) {
-        const parentUpdate = updates[selectedNode.parent];
-
-        if (!parentUpdate.deep) {
-          // Target will be set after parent is copied
-          update.target = null;
-          parentUpdate.children.push(update);
+    function recurseforCopy(id, ancestorId = null, target) {
+      const selectionState = getters.getSelectionState(id, ancestorId);
+      // Nothing is selected, so return early.
+      if (selectionState === SelectionFlags.NONE && !ignoreSelection) {
+        return [];
+      }
+      const children = getters.getClipboardChildren(id, ancestorId);
+      // Calculate the ancestor Id of the children, if they are clipboard nodes,
+      // then they have none, otherwise, either any passed in ancestorId or the id of this node
+      const childrenAreClipboardNodes = children.length && getters.isClipboardNode(children[0].id);
+      const childAncestorId = childrenAreClipboardNodes
+        ? null
+        : getters.isClipboardNode(id)
+        ? id
+        : ancestorId;
+      if (selectionState & SelectionFlags.SELECTED || ignoreSelection) {
+        // Node itself is selected, so this can be a starting point in a tree node
+        const selectedNode = getters.getClipboardNodeForRender(id);
+        const update = {
+          node_id: selectedNode.node_id,
+          channel_id: selectedNode.channel_id,
+          id: selectedNode.id,
+          selectionId: selectionId(id, ancestorId),
+          target,
+        };
+        if (childrenAreClipboardNodes || !target) {
+          // If the children are clipboard nodes or we have no target
+          // map out all the children as lack of target indicates this is a copy operation
+          // out of the clipboard
+          update.children = flatten(
+            children.map(c => recurseforCopy(c.id, childAncestorId, id))
+          ).filter(Boolean);
+        } else if (children.length) {
+          // We have copied the parent as a clipboard node, and the children are content nodes
+          // can now switch mode to just return ids
+          const sourceClipboardNode = state.clipboardNodesMap[id];
+          const excluded_descendants = {};
+          if (sourceClipboardNode) {
+            for (let key in get(
+              sourceClipboardNode,
+              ['extra_fields', 'excluded_descendants'],
+              {}
+            )) {
+              excluded_descendants[key] = true;
+            }
+          }
+          for (let child of children) {
+            for (let key of recurseForUnselectedIds(child.id)) {
+              excluded_descendants[key] = true;
+            }
+          }
+          update.extra_fields = {
+            excluded_descendants,
+          };
         }
-
-        // We'll mark to ignore which doesn't affect the update appended to the children above
-        update.ignore = true;
+        return [update];
       }
+      return flatten(children.map(c => recurseforCopy(c.id, childAncestorId, target))).filter(
+        Boolean
+      );
+    }
 
-      updates[selectedNode.id] = update;
-      return updates;
-    }, {});
-
-    return Object.values(updates).filter(update => !update.ignore);
+    return recurseforCopy(rootId, ancestorId, target);
   };
 }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/index.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/index.js
index 4cc4480151..044dab5a83 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/index.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/index.js
@@ -2,6 +2,7 @@ import * as getters from './getters';
 import * as actions from './actions';
 import * as mutations from './mutations';
 import persistFactory from 'shared/vuex/persistFactory';
+import { TABLE_NAMES, CHANGE_TYPES } from 'shared/data';
 
 export default {
   namespaced: true,
@@ -28,9 +29,22 @@ export default {
      * in the selection state management
      */
     channelMap: {},
+    /**
+     * A map of clipboard node ID => clipboard node
+     *
+     */
+    clipboardNodesMap: {},
+    // Temporary state to store data about clipboard nodes for moving in the move modal
+    clipboardMoveNodes: [],
   }),
   getters,
   actions,
   mutations,
   plugins: [persistFactory('clipboard', ['ADD_CHANNEL_COLOR'])],
+  listeners: {
+    [TABLE_NAMES.CLIPBOARD]: {
+      [CHANGE_TYPES.CREATED]: 'ADD_CLIPBOARD_NODE',
+      [CHANGE_TYPES.DELETED]: 'REMOVE_CLIPBOARD_NODE',
+    },
+  },
 };
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/mutations.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/mutations.js
index 080e6ec1e7..b2cdc3ebaa 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/mutations.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import { selectionId } from './utils';
 
 export function ADD_CHANNEL(state, channel) {
   Vue.set(state.channelMap, channel.id, channel);
@@ -8,6 +9,24 @@ export function ADD_CHANNEL_COLOR(state, { id, color }) {
   Vue.set(state.channelColors, id, color);
 }
 
-export function UPDATE_SELECTION_STATE(state, { id, selectionState }) {
-  Vue.set(state.selected, id, selectionState);
+export function UPDATE_SELECTION_STATE(state, { id, selectionState, ancestorId = null } = {}) {
+  Vue.set(state.selected, selectionId(id, ancestorId), selectionState);
+}
+
+export function ADD_CLIPBOARD_NODE(state, clipboardNode) {
+  Vue.set(state.clipboardNodesMap, clipboardNode.id, clipboardNode);
+}
+
+export function ADD_CLIPBOARD_NODES(state, clipboardNodes) {
+  for (let clipboardNode of clipboardNodes) {
+    ADD_CLIPBOARD_NODE(state, clipboardNode);
+  }
+}
+
+export function REMOVE_CLIPBOARD_NODE(state, clipboardNode) {
+  Vue.delete(state.clipboardNodesMap, clipboardNode.id);
+}
+
+export function SET_CLIPBOARD_MOVE_NODES(state, moveNodes) {
+  state.clipboardMoveNodes = moveNodes;
 }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/utils.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/utils.js
new file mode 100644
index 0000000000..de7dbdf910
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/utils.js
@@ -0,0 +1,7 @@
+export function selectionId(id, ancestorId = null) {
+  return ancestorId ? `${id}-${ancestorId}` : id;
+}
+
+export function idFromSelectionId(selectionId) {
+  return selectionId.split('-')[0];
+}
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js
index f4608df1ff..fca506447f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js
@@ -1,7 +1,7 @@
 import contentNode from '../index';
 import currentChannel from '../../currentChannel/index';
 import file from 'shared/vuex/file';
-import { ContentNode, Tree } from 'shared/data/resources';
+import { ContentNode } from 'shared/data/resources';
 import storeFactory from 'shared/vuex/baseStore';
 
 jest.mock('../../currentChannel/index');
@@ -13,27 +13,20 @@ const parentId = '000000000000000000000000000000000000';
 describe('contentNode actions', () => {
   let store;
   let id;
-  const contentNodeDatum = { title: 'test', parent: parentId };
+  const contentNodeDatum = { title: 'test', parent: parentId, lft: 1 };
   beforeEach(() => {
     return ContentNode.put(contentNodeDatum).then(newId => {
       id = newId;
       contentNodeDatum.id = newId;
-      return ContentNode.put({ title: 'notatest', parent: newId }).then(childId => {
-        return Tree.table
-          .bulkPut([
-            { id: childId, parent: newId, lft: 2 },
-            { id: newId, parent: null, lft: 1 },
-          ])
-          .then(() => {
-            store = storeFactory({
-              modules: {
-                contentNode,
-                currentChannel,
-                file,
-              },
-            });
-            store.state.session.currentUser.id = userId;
-          });
+      return ContentNode.put({ title: 'notatest', parent: newId, lft: 2 }).then(() => {
+        store = storeFactory({
+          modules: {
+            contentNode,
+            currentChannel,
+            file,
+          },
+        });
+        store.state.session.currentUser.id = userId;
       });
     });
   });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/getters.spec.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/getters.spec.js
index 8a532b3cf5..5e88c4be44 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/getters.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/getters.spec.js
@@ -14,35 +14,21 @@ describe('contentNode getters', () => {
     beforeEach(() => {
       state = {
         // English -> Elementary -> Literacy -> Reading
-        treeNodesMap: {
-          'id-elementary': {
-            id: 'id-elementary',
-            parent: 'id-english',
-          },
-          'id-literacy': {
-            id: 'id-literacy',
-            parent: 'id-elementary',
-          },
-          'id-reading': {
-            id: 'id-reading',
-            parent: 'id-reading',
-          },
-          'id-english': {
-            id: 'id-english',
-          },
-        },
         contentNodesMap: {
           'id-elementary': {
             id: 'id-elementary',
             title: 'Elementary',
+            parent: 'id-english',
           },
           'id-literacy': {
             id: 'id-literacy',
             title: 'Literacy',
+            parent: 'id-elementary',
           },
           'id-reading': {
             id: 'id-reading',
             title: 'Reading',
+            parent: 'id-literacy',
           },
           'id-english': {
             id: 'id-english',
@@ -68,11 +54,13 @@ describe('contentNode getters', () => {
           id: 'id-elementary',
           thumbnail_encoding: {},
           title: 'Elementary',
+          parent: 'id-english',
         },
         {
           id: 'id-literacy',
           thumbnail_encoding: {},
           title: 'Literacy',
+          parent: 'id-elementary',
         },
       ]);
     });
@@ -89,6 +77,7 @@ describe('contentNode getters', () => {
           id: 'id-elementary',
           thumbnail_encoding: {},
           title: 'Elementary',
+          parent: 'id-english',
         },
       ]);
     });
@@ -99,80 +88,54 @@ describe('contentNode getters', () => {
 
     beforeEach(() => {
       state = {
-        treeNodesMap: {
-          'id-science': {
-            id: 'id-science',
-            parent: 'id-channel',
-          },
-          'id-literacy': {
-            id: 'id-literacy',
-            parent: 'id-channel',
-          },
-          'id-alphabet': {
-            id: 'id-alphabet',
-            parent: 'id-literacy',
-          },
-          'id-reading': {
-            id: 'id-reading',
-            parent: 'id-literacy',
-          },
-          'id-counting': {
-            id: 'id-counting',
-            parent: 'id-science',
-          },
-          'id-integrals': {
-            id: 'id-integrals',
-            parent: 'id-science',
-          },
-          'id-geography': {
-            id: 'id-geography',
-            parent: 'id-science',
-          },
-          'id-philosophy': {
-            id: 'id-philosophy',
-            parent: 'id-arts',
-          },
-        },
         contentNodesMap: {
           'id-science': {
             id: 'id-science',
             title: 'Science',
             kind: 'topic',
+            parent: 'id-channel',
           },
           'id-literacy': {
             id: 'id-literacy',
             title: 'Literacy',
             kind: 'topic',
+            parent: 'id-channel',
           },
           'id-alphabet': {
             id: 'id-alphabet',
             title: 'Alphabet',
             kind: 'document',
+            parent: 'id-literacy',
           },
           'id-reading': {
             id: 'id-reading',
             title: 'Reading',
             kind: 'document',
+            parent: 'id-literacy',
           },
           'id-counting': {
             id: 'id-counting',
             title: 'Counting',
             kind: 'video',
+            parent: 'id-science',
           },
           'id-integrals': {
             id: 'id-integrals',
             title: 'Integrals',
             kind: 'document',
+            parent: 'id-science',
           },
           'id-geography': {
             id: 'id-geography',
             title: 'Geography',
             kind: 'html5',
+            parent: 'id-science',
           },
           'id-philosophy': {
             id: 'id-philosophy',
             title: 'Philosophy',
             kind: 'document',
+            parent: 'id-arts',
           },
         },
         nextStepsMap: [
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
index 98f48985d0..87869606e2 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
@@ -3,7 +3,7 @@ import union from 'lodash/union';
 import { NOVALUE } from 'shared/constants';
 import client from 'shared/client';
 import { RELATIVE_TREE_POSITIONS } from 'shared/data/constants';
-import { ContentNode, Tree } from 'shared/data/resources';
+import { ContentNode } from 'shared/data/resources';
 import { promiseChunk } from 'shared/utils';
 
 export function loadContentNodes(context, params = {}) {
@@ -24,75 +24,14 @@ export function loadContentNode(context, id) {
     });
 }
 
-export function loadTree(context, params) {
-  return Tree.where(params).then(nodes => {
-    context.commit('ADD_TREENODES', nodes);
-    return nodes;
-  });
-}
-
-export function loadTreeNode(context, id) {
-  return Tree.get(id).then(node => {
-    context.commit('ADD_TREENODE', node);
-    return node;
-  });
-}
-
-export function loadChannelTree(context, channel_id) {
-  return context.dispatch('loadTree', { channel_id });
-}
-
-export function loadTrashTree(context, tree_id) {
-  return context.dispatch('loadTree', { tree_id });
-}
-
-export function loadClipboardTree(context) {
-  const tree_id = context.rootGetters['clipboardRootId'];
-  return client.get(window.Urls.get_clipboard_channels()).then(response => {
-    if (response.data && response.data.length) {
-      return promiseChunk(response.data, 1, ids =>
-        context.dispatch('loadTree', { tree_id, channel_id: ids[0] })
-      );
-    } else {
-      // If response comes back as [] then we still want to load the tree,
-      // but just don't have to worry about channels
-      return context.dispatch('loadTree', { tree_id }).then(nodes => Promise.resolve(nodes));
-    }
-  });
-}
-
-export function loadChildren(context, { parent, tree_id }) {
-  return Tree.where({ parent, tree_id }).then(nodes => {
-    if (!nodes || !nodes.length) {
-      return Promise.resolve([]);
-    }
-    context.commit('ADD_TREENODES', nodes);
-    return loadContentNodes(context, { id__in: nodes.map(node => node.id) });
-  });
+export function loadChildren(context, { parent }) {
+  return loadContentNodes(context, { parent });
 }
 
-export function loadAncestors(context, { id, includeSelf = false }) {
-  return loadTreeNodeAncestors(context, { id, includeSelf }).then(nodes => {
-    if (!nodes || !nodes.length) {
-      return Promise.resolve();
-    }
-    return loadContentNodes(context, { id__in: nodes.map(node => node.id) });
-  });
-}
-
-export function loadTreeNodeAncestors(context, { id, includeSelf = false }) {
-  return loadTreeNode(context, id).then(node => {
-    if (node.parent) {
-      return loadTreeNodeAncestors(context, { id: node.parent, includeSelf: true }).then(nodes => {
-        if (includeSelf) {
-          nodes.push(node);
-        }
-
-        return nodes;
-      });
-    }
-
-    return includeSelf ? [node] : [];
+export function loadAncestors(context, { id }) {
+  return ContentNode.getAncestors(id).then(contentNodes => {
+    context.commit('ADD_CONTENTNODES', contentNodes);
+    return contentNodes;
   });
 }
 
@@ -246,6 +185,7 @@ export function createContentNode(context, { parent, kind = 'topic', ...payload
     extra_fields: {},
     isNew: true,
     language: session.preferences ? session.preferences.language : session.currentLanguage,
+    parent,
     ...context.rootGetters['currentChannel/currentChannel'].content_defaults,
     ...payload,
   };
@@ -255,16 +195,11 @@ export function createContentNode(context, { parent, kind = 'topic', ...payload
     contentNodeData.files.forEach(file => {
       context.dispatch('file/updateFile', { id: file, contentnode: id }, { root: true });
     });
-
-    return Tree.move(id, parent, RELATIVE_TREE_POSITIONS.LAST_CHILD).then(treeNode => {
-      context.commit('ADD_CONTENTNODE', {
-        id,
-        ...contentNodeData,
-      });
-
-      context.commit('ADD_TREENODE', treeNode);
-      return id;
+    context.commit('ADD_CONTENTNODE', {
+      id,
+      ...contentNodeData,
     });
+    return id;
   });
 }
 
@@ -378,10 +313,7 @@ export function removeTags(context, { ids, tags }) {
 
 export function deleteContentNode(context, contentNodeId) {
   return ContentNode.delete(contentNodeId).then(() => {
-    return Tree.delete(contentNodeId).then(() => {
-      context.commit('REMOVE_CONTENTNODE', { id: contentNodeId });
-      context.commit('REMOVE_TREENODE', { id: contentNodeId });
-    });
+    context.commit('REMOVE_CONTENTNODE', { id: contentNodeId });
   });
 }
 
@@ -395,33 +327,33 @@ export function deleteContentNodes(context, contentNodeIds) {
 
 export function copyContentNode(
   context,
-  { id, target, position = RELATIVE_TREE_POSITIONS.LAST_CHILD, deep = false }
+  { id, target, position = RELATIVE_TREE_POSITIONS.LAST_CHILD, deep = false, children = [] }
 ) {
+  if (deep && children.length) {
+    throw new TypeError('Cannot use deep and specify children');
+  }
   // First, this will parse the tree and create the copy the local tree nodes,
   // with a `source_id` of the source node then create the content node copies
-  return ContentNode.copy(id, target, position, deep).then(results => {
-    const { treeNodes, nodes } = results;
+  return ContentNode.copy(id, target, position, deep).then(nodes => {
     context.commit('ADD_CONTENTNODES', nodes);
-    context.commit('ADD_TREENODES', treeNodes);
 
     return promiseChunk(nodes, 10, chunk => {
       // create a map of the source ID to the our new ID
       // this will help orchestrate file and assessessmentItem copying
-      const treeNodeMap = chunk.reduce((treeNodeMap, node) => {
-        const treeNode = context.getters.getTreeNode(node.id);
-        if (treeNode.source_id in treeNodeMap) {
+      const nodeMap = chunk.reduce((nodeMap, node) => {
+        if (node.source_id in nodeMap) {
           // I don't think this should happen
           throw new Error('Not implemented');
         }
 
-        treeNodeMap[treeNode.source_id] = treeNode;
-        return treeNodeMap;
+        nodeMap[node.source_id] = node;
+        return nodeMap;
       }, {});
 
-      const contentnode__in = Object.keys(treeNodeMap);
+      const contentnode__in = Object.keys(nodeMap);
       const updater = fileOrAssessment => {
         return {
-          contentnode: treeNodeMap[fileOrAssessment.contentnode].id,
+          contentnode: nodeMap[fileOrAssessment.contentnode].id,
         };
       };
 
@@ -444,6 +376,19 @@ export function copyContentNode(
         ),
       ]);
     }).then(() => {
+      if (children.length) {
+        return Promise.all(
+          children.map(child =>
+            copyContentNode(context, {
+              id: child.id,
+              target: nodes[0].id,
+              children: child.children,
+            })
+          )
+        ).then(([childNodes]) => {
+          return nodes.concat(childNodes);
+        });
+      }
       return nodes;
     });
   });
@@ -463,8 +408,8 @@ export function copyContentNodes(context, { id__in, target, deep = false }) {
 export function moveContentNodes(context, { id__in, parent: target }) {
   return Promise.all(
     id__in.map(id => {
-      return Tree.move(id, target, RELATIVE_TREE_POSITIONS.LAST_CHILD).then(treeNode => {
-        context.commit('UPDATE_TREENODE', treeNode);
+      return ContentNode.move(id, target, RELATIVE_TREE_POSITIONS.LAST_CHILD).then(node => {
+        context.commit('UPDATE_CONTENTNODE', node);
         return id;
       });
     })
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
index 2419533484..0e3c5541d4 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
@@ -24,37 +24,10 @@ export function getContentNode(state) {
   };
 }
 
-export function getTreeNode(state) {
-  return function(treeNodeId) {
-    return state.treeNodesMap[treeNodeId];
-  };
-}
-
-export function getTreeNodeAncestors(state) {
-  return function(id, includeSelf = false) {
-    let node = state.treeNodesMap[id];
-
-    if (!node || !node.parent) {
-      return [node].filter(Boolean);
-    }
-
-    const self = includeSelf ? [node] : [];
-    return getTreeNodeAncestors(state)(node.parent, true).concat(self);
-  };
-}
-
-export function getTreeNodeChildren(state) {
-  return function(treeNodeId) {
-    return sorted(
-      Object.values(state.treeNodesMap).filter(contentNode => contentNode.parent === treeNodeId)
-    );
-  };
-}
-
-export function getTreeNodeDescendants(state, getters) {
-  return function(treeNodeId) {
+export function getContentNodeDescendants(state, getters) {
+  return function(contentNodeId) {
     // First find the immediate children of the target tree node
-    return getters.getTreeNodeChildren(treeNodeId).reduce((descendants, treeNode) => {
+    return getters.getContentNodeChildren(contentNodeId).reduce((descendants, contentNode) => {
       // Then recursively call ourselves again for each child, so for this structure:
       // (target)
       //  > (child-1)
@@ -62,7 +35,7 @@ export function getTreeNodeDescendants(state, getters) {
       //  > (child-2)
       //
       // it should map out to: [(child-1), (grandchild-1), (child-2)]
-      descendants.push(treeNode, ...getters.getTreeNodeDescendants(treeNode.id));
+      descendants.push(contentNode, ...getters.getContentNodeDescendants(contentNode.id));
       return descendants;
     }, []);
   };
@@ -70,13 +43,13 @@ export function getTreeNodeDescendants(state, getters) {
 
 export function hasChildren(state) {
   return function(id) {
-    return !!Object.values(state.treeNodesMap).find(contentNode => contentNode.parent === id);
+    return getContentNode(state)(id).total_count > 0;
   };
 }
 
-export function countTreeNodeDescendants(state, getters) {
-  return function(treeNodeId) {
-    return getters.getTreeNodeDescendants(treeNodeId).length;
+export function countContentNodeDescendants(state, getters) {
+  return function(contentNodeId) {
+    return getters.getContentNodeDescendants(contentNodeId).length;
   };
 }
 
@@ -104,16 +77,27 @@ export function getTopicAndResourceCounts(state) {
   };
 }
 
-export function getContentNodeChildren(state, getters) {
+export function getContentNodeChildren(state) {
   return function(contentNodeId) {
-    return getters.getContentNodes(getters.getTreeNodeChildren(contentNodeId).map(node => node.id));
+    return sorted(
+      Object.values(state.contentNodesMap)
+        .filter(contentNode => contentNode.parent === contentNodeId)
+        .map(node => getContentNode(state)(node.id))
+        .filter(Boolean)
+    );
   };
 }
 
 export function getContentNodeAncestors(state) {
-  return function(contentNodeId, includeSelf = false) {
-    const nodes = getTreeNodeAncestors(state)(contentNodeId, includeSelf);
-    return nodes.length ? getContentNodes(state)(nodes.map(n => n.id)) : [];
+  return function(id, includeSelf = false) {
+    let node = getContentNode(state)(id);
+
+    if (!node || !node.parent) {
+      return [node].filter(Boolean);
+    }
+
+    const self = includeSelf ? [node] : [];
+    return getContentNodeAncestors(state)(node.parent, true).concat(self);
   };
 }
 
@@ -173,7 +157,7 @@ function getStepDetail(state, contentNodeId) {
   stepDetail.title = node.title;
   stepDetail.kind = node.kind;
 
-  const parentNodeId = state.treeNodesMap[contentNodeId].parent;
+  const parentNodeId = state.contentNodesMap[contentNodeId].parent;
 
   if (parentNodeId) {
     const parentNode = getContentNode(state)(parentNodeId);
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/index.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/index.js
index 215eea7ada..0260c85959 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/index.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/index.js
@@ -13,7 +13,6 @@ export default {
     // }
     return {
       contentNodesMap: {},
-      treeNodesMap: {},
       expandedNodes,
 
       /*
@@ -48,10 +47,5 @@ export default {
       [CHANGE_TYPES.UPDATED]: 'UPDATE_CONTENTNODE',
       [CHANGE_TYPES.DELETED]: 'REMOVE_CONTENTNODE',
     },
-    [TABLE_NAMES.TREE]: {
-      [CHANGE_TYPES.CREATED]: 'ADD_TREENODE',
-      [CHANGE_TYPES.UPDATED]: 'UPDATE_TREENODE',
-      [CHANGE_TYPES.DELETED]: 'REMOVE_TREENODE',
-    },
   },
 };
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js
index 46f4375725..fa7439e971 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js
@@ -73,30 +73,6 @@ export function SET_MOVE_NODES(state, ids) {
   state.moveNodes = ids;
 }
 
-export function ADD_TREENODE(state, treeNode) {
-  state.treeNodesMap = mergeMapItem(state.treeNodesMap, treeNode);
-}
-
-export function ADD_TREENODES(state, treeNodes = []) {
-  state.treeNodesMap = treeNodes.reduce((treeNodesMap, treeNode) => {
-    return mergeMapItem(treeNodesMap, treeNode);
-  }, state.treeNodesMap);
-}
-
-export function REMOVE_TREENODE(state, treeNode) {
-  Vue.delete(state.treeNodesMap, treeNode.id);
-}
-
-export function UPDATE_TREENODE(state, { id, ...payload } = {}) {
-  if (!id) {
-    throw ReferenceError('id must be defined to update a tree node');
-  }
-  state.treeNodesMap[id] = {
-    ...state.treeNodesMap[id],
-    ...payload,
-  };
-}
-
 /**
  * Saves the complete chain of previous/next steps (pre/post-requisites)
  * of a node to next steps map.
diff --git a/contentcuration/contentcuration/frontend/shared/client.js b/contentcuration/contentcuration/frontend/shared/client.js
index 61cac422f1..05885bb813 100644
--- a/contentcuration/contentcuration/frontend/shared/client.js
+++ b/contentcuration/contentcuration/frontend/shared/client.js
@@ -1,13 +1,31 @@
 import axios from 'axios';
 import qs from 'qs';
 
+export function paramsSerializer(params) {
+  // Do custom querystring stingifying to comma separate array params
+  return qs.stringify(params, {
+    arrayFormat: 'comma',
+    encoder: function(str, defaultEncoder, charset, type) {
+      if (type === 'key') {
+        // Handle params for queries to joint indexes
+        // of the form [index1+index2]
+        // Turn into parameter:
+        // _index1_index2_
+        // This is mostly an implementation detail caused by the
+        // fact that filters are defined in Python with bare variables names
+        // and the []+ characters would violate Python variable naming rules
+        return defaultEncoder(str.replace(/[[\]+]/g, '_'));
+      } else if (type === 'value') {
+        return defaultEncoder(str);
+      }
+    },
+  });
+}
+
 const client = axios.create({
   xsrfCookieName: 'csrftoken',
   xsrfHeaderName: 'X-CSRFToken',
-  paramsSerializer: function(params) {
-    // Do custom querystring stingifying to comma separate array params
-    return qs.stringify(params, { arrayFormat: 'comma' });
-  },
+  paramsSerializer,
 });
 
 client.interceptors.response.use(
diff --git a/contentcuration/contentcuration/frontend/shared/data/changes.js b/contentcuration/contentcuration/frontend/shared/data/changes.js
index d2f509a533..75e99a7a0e 100644
--- a/contentcuration/contentcuration/frontend/shared/data/changes.js
+++ b/contentcuration/contentcuration/frontend/shared/data/changes.js
@@ -172,11 +172,23 @@ export class ChangeTracker extends EventEmitter {
    */
   stop() {
     this._isTracking = false;
-
     // This sets the expiry, from 0 to an actual expiry. The clock is ticking...
     return this.renew(this.expiry);
   }
 
+  clearTimeout() {
+    if (this._timeout) {
+      // Clear the timeout for dismissing the lock, as we will dismiss
+      // it once we are done reverting.
+      clearTimeout(this._timeout);
+    }
+  }
+
+  setTimeout() {
+    this.clearTimeout();
+    this._timeout = setTimeout(this.dismiss.bind(this), this.expiry);
+  }
+
   /**
    * Extends the current safety delay by `milliseconds`
    *
@@ -198,7 +210,7 @@ export class ChangeTracker extends EventEmitter {
             lock.expiry += milliseconds;
             return lock;
           })
-        );
+        ).then(() => this.setTimeout);
       });
     });
   }
@@ -217,6 +229,8 @@ export class ChangeTracker extends EventEmitter {
       throw new Error('Unable to revert changes without locks');
     }
 
+    this.clearTimeout();
+
     this._isReverted = true;
 
     if (Dexie.currentTransaction) {
diff --git a/contentcuration/contentcuration/frontend/shared/data/constants.js b/contentcuration/contentcuration/frontend/shared/data/constants.js
index 2989b4382b..2b4fc27435 100644
--- a/contentcuration/contentcuration/frontend/shared/data/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/data/constants.js
@@ -21,6 +21,7 @@ export const TABLE_NAMES = {
   EDITOR_M2M: 'editor_m2m',
   VIEWER_M2M: 'viewer_m2m',
   SAVEDSEARCH: 'savedsearch',
+  CLIPBOARD: 'clipboard',
 };
 
 export const MESSAGES = {
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index 8d5a568d66..f176037ca3 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -6,7 +6,6 @@ import isFunction from 'lodash/isFunction';
 import matches from 'lodash/matches';
 import overEvery from 'lodash/overEvery';
 import pick from 'lodash/pick';
-import uniq from 'lodash/uniq';
 
 import uuidv4 from 'uuid/v4';
 import channel from './broadcastChannel';
@@ -24,12 +23,12 @@ import mergeAllChanges from './mergeChanges';
 import db, { CLIENTID, Collection } from './db';
 import { API_RESOURCES, INDEXEDDB_RESOURCES } from './registry';
 import { NEW_OBJECT } from 'shared/constants';
-import client from 'shared/client';
+import client, { paramsSerializer } from 'shared/client';
 import { constantStrings } from 'shared/mixins';
 import { promiseChunk } from 'shared/utils';
 
 // Number of seconds after which data is considered stale.
-const REFRESH_INTERVAL = 60;
+const REFRESH_INTERVAL = 5;
 
 const LAST_FETCHED = '__last_fetch';
 
@@ -437,10 +436,23 @@ class Resource extends mix(APIResource, IndexedDBResource) {
     API_RESOURCES[urlName] = this;
     // Overwrite the false default for IndexedDBResource
     this.syncable = syncable;
+    // A map of stringified request params to a last fetched time and a promise
+    this._requests = {};
   }
 
   fetchCollection(params) {
-    return client.get(this.collectionUrl(), { params }).then(response => {
+    const now = Date.now();
+    const queryString = paramsSerializer(params);
+    const cachedRequest = this._requests[queryString];
+    if (
+      cachedRequest &&
+      cachedRequest[LAST_FETCHED] &&
+      cachedRequest[LAST_FETCHED] + REFRESH_INTERVAL * 1000 > now &&
+      cachedRequest.promise
+    ) {
+      return cachedRequest.promise;
+    }
+    const promise = client.get(this.collectionUrl(), { params }).then(response => {
       const now = Date.now();
       let itemData;
       let pageData;
@@ -513,16 +525,24 @@ class Resource extends mix(APIResource, IndexedDBResource) {
           });
       });
     });
+    this._requests[queryString] = {
+      [LAST_FETCHED]: now,
+      promise,
+    };
+    return promise;
   }
 
   where(params = {}) {
+    if (process.env.NODE_ENV !== 'production' && !process.env.TRAVIS) {
+      console.groupCollapsed(`Getting data for ${this.tableName} table with params: `, params);
+      console.trace();
+      console.groupEnd();
+    }
     return super.where(params).then(objs => {
       if (!objs.length) {
         return this.requestCollection(params);
       }
-      if (objectsAreStale(objs)) {
-        this.requestCollection(params);
-      }
+      this.requestCollection(params);
       return objs;
     });
   }
@@ -562,6 +582,11 @@ class Resource extends mix(APIResource, IndexedDBResource) {
   }
 
   get(id) {
+    if (process.env.NODE_ENV !== 'production' && !process.env.TRAVIS) {
+      console.groupCollapsed(`Getting instance for ${this.tableName} table with id: ${id}`);
+      console.trace();
+      console.groupEnd();
+    }
     return this.table.get(id).then(obj => {
       if (obj) {
         return obj;
@@ -670,19 +695,6 @@ class Resource extends mix(APIResource, IndexedDBResource) {
   }
 }
 
-/**
- * @param {string} mode
- * @param {Function} callback
- * @return {Promise}
- */
-function treeTransaction(mode, callback) {
-  const tables = [TABLE_NAMES.CONTENTNODE, TABLE_NAMES.TREE, CHANGES_TABLE];
-  return db.transaction(mode, ...tables, () => {
-    Dexie.currentTransaction.source = CLIENTID;
-    return callback();
-  });
-}
-
 export const Channel = new Resource({
   tableName: TABLE_NAMES.CHANNEL,
   urlName: 'channel',
@@ -734,8 +746,17 @@ export const Channel = new Resource({
 export const ContentNode = new Resource({
   tableName: TABLE_NAMES.CONTENTNODE,
   urlName: 'contentnode',
-  indexFields: ['title', 'language'],
-  transaction: treeTransaction,
+  indexFields: [
+    'title',
+    'language',
+    'parent',
+    'channel_id',
+    'node_id',
+    'root_id',
+    'lft',
+    '[root_id+parent]',
+    '[node_id+channel_id]',
+  ],
   /**
    * @param {string} id The ID of the node to treeCopy
    * @param {string} target The ID of the target node used for positioning
@@ -748,274 +769,124 @@ export const ContentNode = new Resource({
       throw new TypeError(`${position} is not a valid position`);
     }
 
-    // Override the change type, since we'll be issuing the COPY change, so all we
-    // need is the update to position, aka MOVED
-    const changeType = CHANGE_TYPES.MOVED;
-    return Tree.copy(id, target, position, deep, changeType).then(treeNodes => {
-      return promiseChunk(treeNodes, 50, treeNodes => {
-        return Tree.table
-          .where('parent')
-          .anyOf(uniq(treeNodes.map(n => n.parent)))
-          .toArray()
-          .then(siblings => {
-            // Count all nodes with the same source that are siblings so we
-            // can determine how many copies of the source element there are
-            const countMap = siblings.reduce((countMap, sibling) => {
-              if (!(sibling.parent in countMap)) {
-                countMap[sibling.parent] = {};
-              }
+    if (process.env.NODE_ENV !== 'production' && !process.env.TRAVIS) {
+      console.groupCollapsed(`Copying contentnode from ${id} with target ${target}`);
+      console.trace();
+      console.groupEnd();
+    }
 
-              if (!(sibling.source_id in countMap[sibling.parent])) {
-                countMap[sibling.parent][sibling.source_id] = 0;
-              }
+    const changeType = CHANGE_TYPES.COPIED;
+    if (!validPositions.has(position)) {
+      throw new TypeError(`${position} is not a valid position`);
+    }
 
-              countMap[sibling.parent][sibling.source_id]++;
-              return countMap;
-            }, {});
-
-            const sourceNodeMap = treeNodes.reduce((sourceNodeMap, treeNode) => {
-              sourceNodeMap[treeNode.source_id] = treeNode;
-              return sourceNodeMap;
-            }, {});
-            const sourceNodeIds = treeNodes.map(node => node.source_id);
-
-            return promiseChunk(Object.keys(sourceNodeMap), 10, chunk => {
-              // All of these should be loaded already, but we'll chunk anyway
-              return Promise.all(chunk.map(id => Tree.get(id))).then(sourceTreeNodes => {
-                return this.bulkCopy({ id__in: sourceNodeIds }, sourceNode => {
-                  const treeNode = sourceNodeMap[sourceNode.id];
-                  const sourceTreeNode = sourceTreeNodes.find(
-                    sourceTreeNode => sourceTreeNode.id === treeNode.source_id
-                  );
-                  let title = sourceNode.title;
-
-                  // When we've made a copy as a sibling of source, update the title
-                  if (treeNode.parent === sourceTreeNode.parent) {
-                    title =
-                      countMap[treeNode.parent][treeNode.source_id] <= 2
-                        ? constantStrings.$tr('firstCopy', { title })
-                        : constantStrings.$tr('nthCopy', {
-                            title,
-                            n: countMap[treeNode.parent][treeNode.source_id],
-                          });
-                  }
-
-                  return {
-                    id: treeNode.id,
-                    channel_id: treeNode.channel_id,
-                    source_channel_id: sourceTreeNode.channel_id,
-                    title,
-
-                    // Should be removing these soon
-                    files: [],
-                    assessment_items: [],
-                    prerequisite: [],
-                  };
-                });
-              });
-            });
+    return this.transaction('rw', CHANGES_TABLE, () => {
+      // Ignore changes from this operation except for the
+      // explicit copy change we generate.
+      Dexie.currentTransaction.source = IGNORED_SOURCE;
+      return this.tableCopy(id, target, position, changeType);
+    }).then(data => {
+      if (!deep) {
+        return [data];
+      }
+
+      return this.table
+        .where({ parent: id })
+        .sortBy('lft')
+        .then(children => {
+          // Chunk children, and call `copy` again for each, merging all results together
+          return promiseChunk(children, 50, children => {
+            return Promise.all(
+              children.map(child => {
+                // Recurse for all children of the node we just copied
+                return this.copy(child.id, data.id, RELATIVE_TREE_POSITIONS.LAST_CHILD, deep);
+              })
+            );
           });
-      }).then(nodes => {
-        return {
-          treeNodes,
-          nodes,
-        };
-      });
+        })
+        .then(results => {
+          return results.reduce((all, subset) => all.concat(subset), []);
+        })
+        .then(results => {
+          // Be sure to add our first node's result to the beginning of our results
+          results.unshift(data);
+          return results;
+        });
     });
   },
-});
-
-export const ChannelSet = new Resource({
-  tableName: TABLE_NAMES.CHANNELSET,
-  urlName: 'channelset',
-});
-
-export const Invitation = new Resource({
-  tableName: TABLE_NAMES.INVITATION,
-  urlName: 'invitation',
-});
 
-export const SavedSearch = new Resource({
-  tableName: TABLE_NAMES.SAVEDSEARCH,
-  urlName: 'savedsearch',
-});
+  tableCopy(id, target, position, changeType) {
+    if (!validPositions.has(position)) {
+      return Promise.reject();
+    }
 
-export const User = new Resource({
-  tableName: TABLE_NAMES.USER,
-  urlName: 'user',
-  uuid: false,
-});
+    return this.getNewParentAndSiblings(target, position).then(({ parent, siblings }) => {
+      let lft = 1;
 
-export const EditorM2M = new IndexedDBResource({
-  tableName: TABLE_NAMES.EDITOR_M2M,
-  indexFields: ['channel'],
-  idField: '[user+channel]',
-  uuid: false,
-  put(channel, user) {
-    return this.transaction('rw', CHANGES_TABLE, () => {
-      return this.table.put({ user, channel }).then(() => {
-        return db[CHANGES_TABLE].put({
-          obj: {
-            user,
-            channel,
-          },
-          source: CLIENTID,
-          table: this.tableName,
-          type: CHANGE_TYPES.CREATED_RELATION,
-        });
-      });
-    });
-  },
-});
+      if (siblings.length) {
+        lft = this.getNewSortOrder(id, target, position, siblings);
+      } else {
+        // if there are no siblings, overwrite
+        target = parent;
+        position = RELATIVE_TREE_POSITIONS.LAST_CHILD;
+      }
 
-export const ViewerM2M = new IndexedDBResource({
-  tableName: TABLE_NAMES.VIEWER_M2M,
-  indexFields: ['channel'],
-  idField: '[user+channel]',
-  uuid: false,
-  delete(channel, user) {
-    return this.transaction('rw', CHANGES_TABLE, () => {
-      return this.table.delete([user, channel]).then(() => {
-        return db[CHANGES_TABLE].put({
-          obj: {
-            user,
-            channel,
+      // Get source node and parent so we can reference some specifics
+      const nodePromise = this.table.get(id);
+      const parentNodePromise = this.table.get(parent);
+
+      // Next, we'll add the new node immediately
+      return Promise.all([nodePromise, parentNodePromise]).then(([node, parentNode]) => {
+        let title = node.title;
+
+        // When we've made a copy as a sibling of source, update the title
+        if (node.parent === parentNode.id) {
+          // Count all nodes with the same source that are siblings so we
+          // can determine how many copies of the source element there are
+          const totalSiblingCopies = siblings.filter(s => s.source_node_id === node.source_node_id)
+            .length;
+          title =
+            totalSiblingCopies <= 2
+              ? constantStrings.$tr('firstCopy', { title })
+              : constantStrings.$tr('nthCopy', {
+                  title,
+                  n: totalSiblingCopies,
+                });
+        }
+        const data = {
+          ...node,
+          id: uuid4(),
+          original_source_node_id: node.original_source_node_id || node.node_id,
+          lft,
+          title,
+          source_channel_id: node.channel_id,
+          source_node_id: node.node_id,
+          root_id: parentNode.root_id,
+          parent: parentNode.id,
+          level: parentNode.level + 1,
+        };
+        // Manually put our changes into the tree changes for syncing table
+        db[CHANGES_TABLE].put({
+          key: data.id,
+          from_key: id,
+          mods: {
+            target,
+            position,
+            title,
           },
           source: CLIENTID,
+          oldObj: null,
           table: this.tableName,
-          type: CHANGE_TYPES.DELETED_RELATION,
-        });
-      });
-    });
-  },
-});
-
-export const ChannelUser = new APIResource({
-  urlName: 'channeluser',
-  makeEditor(channel, user) {
-    return ViewerM2M.delete(channel, user).then(() => {
-      return EditorM2M.put(channel, user);
-    });
-  },
-  removeViewer(channel, user) {
-    return ViewerM2M.delete(channel, user);
-  },
-  fetchCollection(params) {
-    return client.get(this.collectionUrl(), { params }).then(response => {
-      const now = Date.now();
-      const itemData = response.data;
-      const userData = [];
-      const editorM2M = [];
-      const viewerM2M = [];
-      for (let datum of itemData) {
-        const userDatum = {
-          ...datum,
-        };
-        userDatum[LAST_FETCHED] = now;
-        delete userDatum.can_edit;
-        delete userDatum.can_view;
-        userData.push(userDatum);
-        const m2mDatum = {
-          [LAST_FETCHED]: now,
-          user: datum.id,
-          channel: params.channel,
-        };
-        if (datum.can_edit) {
-          editorM2M.push(m2mDatum);
-        } else if (datum.can_view) {
-          viewerM2M.push(m2mDatum);
-        }
-      }
-
-      return db.transaction('rw', User.tableName, EditorM2M.tableName, ViewerM2M.tableName, () => {
-        // Explicitly set the source of this as a fetch
-        // from the server, to prevent us from trying
-        // to sync these changes back to the server!
-        Dexie.currentTransaction.source = IGNORED_SOURCE;
-        return Promise.all([
-          EditorM2M.table.bulkPut(editorM2M),
-          ViewerM2M.table.bulkPut(viewerM2M),
-          User.table.bulkPut(userData),
-        ]).then(() => {
-          return itemData;
+          type: changeType,
         });
+        return this.table.put(data).then(() => ({
+          // Return the id along with the data for further processing
+          source_id: id,
+          ...data,
+        }));
       });
     });
   },
-  where({ channel }) {
-    if (!channel) {
-      throw TypeError('Not a valid channelId');
-    }
-    const params = {
-      channel,
-    };
-    const editorCollection = EditorM2M.table.where(params);
-    const viewerCollection = ViewerM2M.table.where(params);
-    return Promise.all([editorCollection.toArray(), viewerCollection.toArray()]).then(
-      ([editors, viewers]) => {
-        if (!editors.length && !viewers.length) {
-          return this.requestCollection(params);
-        }
-        if (objectsAreStale(editors) || objectsAreStale(viewers)) {
-          // Do a synchronous refresh instead of background refresh here.
-          return this.requestCollection(params);
-        }
-        const editorSet = new Set(editors.map(editor => editor.user));
-        const viewerSet = new Set(viewers.map(viewer => viewer.user));
-        // Directly query indexeddb here, to avoid triggering
-        // an additional request if the user data is stale but the M2M table data is not.
-        return User.table
-          .where('id')
-          .anyOf(...editorSet.values(), ...viewerSet.values())
-          .toArray(users => {
-            return users.map(user => {
-              const can_edit = editorSet.has(user.id);
-              const can_view = viewerSet.has(user.id);
-              return {
-                ...user,
-                can_edit,
-                can_view,
-              };
-            });
-          });
-      }
-    );
-  },
-});
-
-export const AssessmentItem = new Resource({
-  tableName: TABLE_NAMES.ASSESSMENTITEM,
-  urlName: 'assessmentitem',
-  idField: 'assessment_id',
-  indexFields: ['contentnode'],
-});
-
-export const File = new Resource({
-  tableName: TABLE_NAMES.FILE,
-  urlName: 'file',
-  indexFields: ['contentnode'],
-});
-
-export const Tree = new Resource({
-  tableName: TABLE_NAMES.TREE,
-  urlName: 'tree',
-  indexFields: [
-    'channel_id',
-    'parent',
-    'source_id',
-    'tree_id',
-    'lft',
-    '[tree_id+parent]',
-    '[channel_id+parent]',
-  ],
-  // Any changes made to the tree table should only be propagated to the
-  // backend via moves, so that we can make local tree changes in the frontend
-  // and have them replicated in the backend on the global tree state.
-  syncable: false,
-  // ids have to exactly correlate with content node ids, so don't auto
-  // set uuids on this table.
-  uuid: false,
-  transaction: treeTransaction,
 
   /**
    * @param {string} target
@@ -1121,7 +992,10 @@ export const Tree = new Resource({
     if (!validPositions.has(position)) {
       throw new TypeError(`${position} is not a valid position`);
     }
-    return this.transaction('rw', () => {
+    return this.transaction('rw', CHANGES_TABLE, () => {
+      // Ignore changes from this operation except for the
+      // explicit move change we generate.
+      Dexie.currentTransaction.source = IGNORED_SOURCE;
       return this.tableMove(id, target, position);
     });
   },
@@ -1162,9 +1036,7 @@ export const Tree = new Resource({
               id,
               parent,
               lft,
-              tree_id: parentNode.tree_id,
-              channel_id: parentNode.channel_id,
-              source_id: null,
+              root_id: parentNode.root_id,
             };
             return this.table.put(data).then(() => data);
           });
@@ -1185,131 +1057,239 @@ export const Tree = new Resource({
     });
   },
 
-  /**
-   * @param {string} id - The ID of the node to treeCopy
-   * @param {string} target - The ID of the target node used for positioning
-   * @param {string} [position] - The position relative to `target`
-   * @param {boolean} [deep] - Whether or not to treeCopy all descendants
-   * @param {number} [changeType] - Override the change type
-   * @return {Promise<Object[]>}
-   */
-  copy(
-    id,
-    target,
-    position = RELATIVE_TREE_POSITIONS.LAST_CHILD,
-    deep = false,
-    changeType = CHANGE_TYPES.COPIED
-  ) {
-    if (!validPositions.has(position)) {
-      throw new TypeError(`${position} is not a valid position`);
-    }
-
-    return this.transaction('rw', () => {
-      return this.tableCopy(id, target, position, changeType);
-    })
-      .then(data => {
-        if (!deep) {
-          return [data];
-        }
+  getAncestors(id) {
+    return this.table.get(id).then(node => {
+      if (node) {
+        if (node.parent) {
+          return this.getAncestors(node.parent).then(nodes => {
+            nodes.push(node);
 
-        return this.table
-          .where({ parent: id })
-          .sortBy('lft')
-          .then(children => {
-            // Chunk children, and call `copy` again for each, merging all results together
-            return promiseChunk(children, 50, children => {
-              return Promise.all(
-                children.map(child => {
-                  // Recurse for all children of the node we just copied
-                  return this.copy(
-                    child.id,
-                    data.id,
-                    RELATIVE_TREE_POSITIONS.LAST_CHILD,
-                    deep,
-                    changeType
-                  );
-                })
-              );
-            });
-          })
-          .then(results => {
-            return results.reduce((all, subset) => all.concat(subset), []);
-          })
-          .then(results => {
-            // Be sure to add our first node's result to the beginning of our results
-            results.unshift(data);
-            return results;
+            return nodes;
           });
-      })
-      .then(results => {
-        if (changeType === CHANGE_TYPES.COPIED) {
-          return results;
         }
+        return [node];
+      }
+      return this.requestCollection({ ancestors_of: id });
+    });
+  },
+});
+
+export const ChannelSet = new Resource({
+  tableName: TABLE_NAMES.CHANNELSET,
+  urlName: 'channelset',
+});
+
+export const Invitation = new Resource({
+  tableName: TABLE_NAMES.INVITATION,
+  urlName: 'invitation',
+});
+
+export const SavedSearch = new Resource({
+  tableName: TABLE_NAMES.SAVEDSEARCH,
+  urlName: 'savedsearch',
+});
+
+export const User = new Resource({
+  tableName: TABLE_NAMES.USER,
+  urlName: 'user',
+  uuid: false,
+});
+
+export const EditorM2M = new IndexedDBResource({
+  tableName: TABLE_NAMES.EDITOR_M2M,
+  indexFields: ['channel'],
+  idField: '[user+channel]',
+  uuid: false,
+  put(channel, user) {
+    return this.transaction('rw', CHANGES_TABLE, () => {
+      return this.table.put({ user, channel }).then(() => {
+        return db[CHANGES_TABLE].put({
+          obj: {
+            user,
+            channel,
+          },
+          source: CLIENTID,
+          table: this.tableName,
+          type: CHANGE_TYPES.CREATED_RELATION,
+        });
+      });
+    });
+  },
+});
 
-        return this.transaction('rw', () => {
-          // Change source to ignored so we avoid tracking the changes. This is because
-          // the creation of tree node here is creating a bare content node, so we'll put the
-          // ID in IndexedDB so later updates sync correctly
-          Dexie.currentTransaction.source = IGNORED_SOURCE;
-          return ContentNode.table.bulkPut(results.map(result => ({ id: result.id })));
-        }).then(() => results);
+export const ViewerM2M = new IndexedDBResource({
+  tableName: TABLE_NAMES.VIEWER_M2M,
+  indexFields: ['channel'],
+  idField: '[user+channel]',
+  uuid: false,
+  delete(channel, user) {
+    return this.transaction('rw', CHANGES_TABLE, () => {
+      return this.table.delete([user, channel]).then(() => {
+        return db[CHANGES_TABLE].put({
+          obj: {
+            user,
+            channel,
+          },
+          source: CLIENTID,
+          table: this.tableName,
+          type: CHANGE_TYPES.DELETED_RELATION,
+        });
       });
+    });
   },
+});
 
-  tableCopy(id, target, position, changeType) {
-    if (!validPositions.has(position)) {
-      return Promise.reject();
+export const ChannelUser = new APIResource({
+  urlName: 'channeluser',
+  makeEditor(channel, user) {
+    return ViewerM2M.delete(channel, user).then(() => {
+      return EditorM2M.put(channel, user);
+    });
+  },
+  removeViewer(channel, user) {
+    return ViewerM2M.delete(channel, user);
+  },
+  fetchCollection(params) {
+    return client.get(this.collectionUrl(), { params }).then(response => {
+      const now = Date.now();
+      const itemData = response.data;
+      const userData = [];
+      const editorM2M = [];
+      const viewerM2M = [];
+      for (let datum of itemData) {
+        const userDatum = {
+          ...datum,
+        };
+        userDatum[LAST_FETCHED] = now;
+        delete userDatum.can_edit;
+        delete userDatum.can_view;
+        userData.push(userDatum);
+        const m2mDatum = {
+          [LAST_FETCHED]: now,
+          user: datum.id,
+          channel: params.channel,
+        };
+        if (datum.can_edit) {
+          editorM2M.push(m2mDatum);
+        } else if (datum.can_view) {
+          viewerM2M.push(m2mDatum);
+        }
+      }
+
+      return db.transaction('rw', User.tableName, EditorM2M.tableName, ViewerM2M.tableName, () => {
+        // Explicitly set the source of this as a fetch
+        // from the server, to prevent us from trying
+        // to sync these changes back to the server!
+        Dexie.currentTransaction.source = IGNORED_SOURCE;
+        return Promise.all([
+          EditorM2M.table.bulkPut(editorM2M),
+          ViewerM2M.table.bulkPut(viewerM2M),
+          User.table.bulkPut(userData),
+        ]).then(() => {
+          return itemData;
+        });
+      });
+    });
+  },
+  where({ channel }) {
+    if (!channel) {
+      throw TypeError('Not a valid channelId');
     }
+    const params = {
+      channel,
+    };
+    const editorCollection = EditorM2M.table.where(params);
+    const viewerCollection = ViewerM2M.table.where(params);
+    return Promise.all([editorCollection.toArray(), viewerCollection.toArray()]).then(
+      ([editors, viewers]) => {
+        if (!editors.length && !viewers.length) {
+          return this.requestCollection(params);
+        }
+        if (objectsAreStale(editors) || objectsAreStale(viewers)) {
+          // Do a synchronous refresh instead of background refresh here.
+          return this.requestCollection(params);
+        }
+        const editorSet = new Set(editors.map(editor => editor.user));
+        const viewerSet = new Set(viewers.map(viewer => viewer.user));
+        // Directly query indexeddb here, to avoid triggering
+        // an additional request if the user data is stale but the M2M table data is not.
+        return User.table
+          .where('id')
+          .anyOf(...editorSet.values(), ...viewerSet.values())
+          .toArray(users => {
+            return users.map(user => {
+              const can_edit = editorSet.has(user.id);
+              const can_view = viewerSet.has(user.id);
+              return {
+                ...user,
+                can_edit,
+                can_view,
+              };
+            });
+          });
+      }
+    );
+  },
+});
+
+export const AssessmentItem = new Resource({
+  tableName: TABLE_NAMES.ASSESSMENTITEM,
+  urlName: 'assessmentitem',
+  idField: 'assessment_id',
+  indexFields: ['contentnode'],
+});
+
+export const File = new Resource({
+  tableName: TABLE_NAMES.FILE,
+  urlName: 'file',
+  indexFields: ['contentnode'],
+});
 
-    return this.getNewParentAndSiblings(target, position)
-      .then(({ parent, siblings }) => {
+export const Clipboard = new Resource({
+  tableName: TABLE_NAMES.CLIPBOARD,
+  urlName: 'clipboard',
+  indexFields: ['parent'],
+  copy(node_id, channel_id, clipboardRootId, parent = null, extra_fields = null) {
+    return this.transaction('rw', TABLE_NAMES.CONTENTNODE, () => {
+      return this.tableCopy(node_id, channel_id, clipboardRootId, parent, extra_fields);
+    });
+  },
+
+  tableCopy(node_id, channel_id, clipboardRootId, parent = null, extra_fields = null) {
+    parent = parent || clipboardRootId;
+    return this.table
+      .where({ parent })
+      .sortBy('lft')
+      .then(siblings => {
         let lft = 1;
 
         if (siblings.length) {
-          lft = this.getNewSortOrder(id, target, position, siblings);
-        } else {
-          // if there are no siblings, overwrite
-          target = parent;
-          position = RELATIVE_TREE_POSITIONS.LAST_CHILD;
+          lft = siblings.slice(-1)[0].lft + 1;
         }
 
-        const data = {
-          id: uuid4(),
-          source_id: id,
-          lft,
-        };
-
-        // Get source node and parent so we can reference some specifics
-        const node = this.table.get(id);
-        const parentNode = this.table.get(parent);
+        // Get source node so we can reference some specifics
+        const nodePromise = ContentNode.table.get({
+          '[node_id+channel_id]': [node_id, channel_id],
+        });
 
-        // Next, we'll add the new tree node immediately
-        return Promise.all([node, parentNode]).then(([node, parentNode]) => ({
-          ...data,
-          tree_id: parentNode.tree_id,
-          channel_id: node.channel_id,
-          parent: parentNode.id,
-          level: parentNode.level + 1,
-        }));
-      })
-      .then(data => this.table.put(data).then(() => data))
-      .then(data => {
-        // Manually put our changes into the tree changes for syncing table
-        const { id: key, lft, channel_id } = data;
-        return db[CHANGES_TABLE].put({
-          key,
-          from_key: id,
-          mods: {
-            target,
-            position,
+        // Next, we'll add the new node immediately
+        return nodePromise.then(node => {
+          const data = {
+            id: uuid4(),
             lft,
-            channel_id,
-          },
-          source: CLIENTID,
-          oldObj: null,
-          table: this.tableName,
-          type: changeType,
-        }).then(() => data);
+            source_channel_id: channel_id,
+            source_node_id: node_id,
+            root_id: clipboardRootId,
+            kind: node.kind,
+            parent,
+            extra_fields,
+          };
+          return this.table.put(data).then(() => ({
+            // Return the id along with the data for further processing
+            source_id: node.id,
+            ...data,
+          }));
+        });
       });
   },
 });
diff --git a/contentcuration/contentcuration/frontend/shared/data/serverSync.js b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
index 6ca93c2645..2630e08e25 100644
--- a/contentcuration/contentcuration/frontend/shared/data/serverSync.js
+++ b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
@@ -22,7 +22,7 @@ const SYNC_BUFFER = 1000;
 
 // When this many seconds pass without a syncable
 // change being registered, sync changes!
-const SYNC_IF_NO_CHANGES_FOR = 10;
+const SYNC_IF_NO_CHANGES_FOR = 2;
 
 // In order to listen to messages being sent
 // by all windows, including this one, for requests
@@ -241,7 +241,10 @@ const debouncedSyncChanges = debounce(() => {
 }, SYNC_IF_NO_CHANGES_FOR * 1000);
 
 if (process.env.NODE_ENV !== 'production') {
-  window.forceServerSync = debouncedSyncChanges;
+  window.forceServerSync = function() {
+    debouncedSyncChanges();
+    debouncedSyncChanges.flush();
+  };
 }
 
 function handleChanges(changes) {
@@ -250,17 +253,21 @@ function handleChanges(changes) {
     const { rev, ...filteredChange } = change; // eslint-disable-line no-unused-vars
     return filteredChange;
   });
-  const lockChanges = changes.filter(change => change.table === CHANGE_LOCKS_TABLE);
+  const lockChanges = changes.find(
+    change => change.table === CHANGE_LOCKS_TABLE && change.type === CHANGE_TYPES.DELETED
+  );
+  const newChangeChanges = changes.find(
+    change => change.table === CHANGES_TABLE && change.type !== CHANGE_TYPES.DELETED
+  );
 
   if (syncableChanges.length) {
     // Flatten any changes before we store them in the changes table
-    db[CHANGES_TABLE].bulkPut(mergeAllChanges(syncableChanges, true)).then(() => {
-      debouncedSyncChanges();
-    });
+    db[CHANGES_TABLE].bulkPut(mergeAllChanges(syncableChanges, true));
   }
 
-  // If we detect locks were removed, then we'll trigger sync
-  if (lockChanges.length && lockChanges.find(change => change.type === CHANGE_TYPES.DELETED)) {
+  // If we detect locks were removed, or changes were written to the changes table
+  // then we'll trigger sync
+  if (lockChanges || newChangeChanges) {
     debouncedSyncChanges();
   }
 }
diff --git a/contentcuration/contentcuration/tests/viewsets/test_contentnode.py b/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
index 3a91889db6..e68d12389c 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
@@ -7,13 +7,13 @@
 from le_utils.constants import content_kinds
 
 from contentcuration import models
-from contentcuration.tests.base import StudioAPITestCase
 from contentcuration.tests import testdata
+from contentcuration.tests.base import StudioAPITestCase
 from contentcuration.viewsets.sync.constants import CONTENTNODE
 from contentcuration.viewsets.sync.utils import generate_copy_event
 from contentcuration.viewsets.sync.utils import generate_create_event
-from contentcuration.viewsets.sync.utils import generate_update_event
 from contentcuration.viewsets.sync.utils import generate_delete_event
+from contentcuration.viewsets.sync.utils import generate_update_event
 
 
 class SyncTestCase(StudioAPITestCase):
@@ -55,6 +55,26 @@ def test_create_contentnode(self):
         except models.ContentNode.DoesNotExist:
             self.fail("ContentNode was not created")
 
+    def test_create_contentnode_with_parent(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        channel.editors.add(user)
+        self.client.force_authenticate(user=user)
+        contentnode = self.contentnode_metadata
+        contentnode["parent"] = channel.main_tree_id
+        response = self.client.post(
+            self.sync_url,
+            [generate_create_event(contentnode["id"], CONTENTNODE, contentnode)],
+            format="json",
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+        try:
+            new_node = models.ContentNode.objects.get(id=contentnode["id"])
+        except models.ContentNode.DoesNotExist:
+            self.fail("ContentNode was not created")
+
+        self.assertEqual(new_node.parent_id, channel.main_tree_id)
+
     def test_create_contentnodes(self):
         user = testdata.user()
         self.client.force_authenticate(user=user)
@@ -168,13 +188,22 @@ def test_delete_contentnodes(self):
             pass
 
     def test_copy_contentnode(self):
+        channel = testdata.channel()
         user = testdata.user()
+        channel.editors.add(user)
         contentnode = models.ContentNode.objects.create(**self.contentnode_db_metadata)
         new_node_id = uuid.uuid4().hex
         self.client.force_authenticate(user=user)
         response = self.client.post(
             self.sync_url,
-            [generate_copy_event(new_node_id, CONTENTNODE, contentnode.id, {})],
+            [
+                generate_copy_event(
+                    new_node_id,
+                    CONTENTNODE,
+                    contentnode.id,
+                    {"target": channel.main_tree_id},
+                )
+            ],
             format="json",
         )
         self.assertEqual(response.status_code, 200, response.content)
@@ -184,7 +213,7 @@ def test_copy_contentnode(self):
         except models.ContentNode.DoesNotExist:
             self.fail("ContentNode was not copied")
 
-        self.assertEqual(new_node.parent_id, settings.ORPHANAGE_ROOT_ID)
+        self.assertEqual(new_node.parent_id, channel.main_tree_id)
 
     def test_create_contentnode_moveable(self):
         """
@@ -223,13 +252,22 @@ def test_copy_contentnode_moveable(self):
         Regression test to ensure that nodes created here are able to be moved to
         other MPTT trees without invalidating data.
         """
+        channel = testdata.channel()
         user = testdata.user()
+        channel.editors.add(user)
         contentnode = models.ContentNode.objects.create(**self.contentnode_db_metadata)
         new_node_id = uuid.uuid4().hex
         self.client.force_authenticate(user=user)
         response = self.client.post(
             self.sync_url,
-            [generate_copy_event(new_node_id, CONTENTNODE, contentnode.id, {})],
+            [
+                generate_copy_event(
+                    new_node_id,
+                    CONTENTNODE,
+                    contentnode.id,
+                    {"target": channel.main_tree_id},
+                )
+            ],
             format="json",
         )
         self.assertEqual(response.status_code, 200, response.content)
@@ -274,7 +312,7 @@ def test_update_orphanage_root(self):
 
     def test_delete_orphanage_root(self):
         user = testdata.user()
-        contentnode = models.ContentNode.objects.create(**self.contentnode_db_metadata)
+        models.ContentNode.objects.create(**self.contentnode_db_metadata)
 
         self.client.force_authenticate(user=user)
         response = self.client.post(
@@ -401,7 +439,7 @@ def test_update_orphanage_root(self):
 
     def test_delete_orphanage_root(self):
         user = testdata.user()
-        contentnode = models.ContentNode.objects.create(**self.contentnode_db_metadata)
+        models.ContentNode.objects.create(**self.contentnode_db_metadata)
 
         self.client.force_authenticate(user=user)
         response = self.client.delete(
diff --git a/contentcuration/contentcuration/urls.py b/contentcuration/contentcuration/urls.py
index 11f2935031..330d253589 100644
--- a/contentcuration/contentcuration/urls.py
+++ b/contentcuration/contentcuration/urls.py
@@ -49,11 +49,11 @@
 from contentcuration.viewsets.channel import CatalogViewSet
 from contentcuration.viewsets.channel import ChannelViewSet
 from contentcuration.viewsets.channelset import ChannelSetViewSet
+from contentcuration.viewsets.clipboard import ClipboardViewSet
 from contentcuration.viewsets.contentnode import ContentNodeViewSet
 from contentcuration.viewsets.file import FileViewSet
 from contentcuration.viewsets.invitation import InvitationViewSet
 from contentcuration.viewsets.sync.endpoint import sync
-from contentcuration.viewsets.tree import TreeViewSet
 from contentcuration.viewsets.user import AdminUserViewSet
 from contentcuration.viewsets.user import ChannelUserViewSet
 from contentcuration.viewsets.user import UserViewSet
@@ -166,8 +166,8 @@ def get_queryset(self):
 router.register(r'invitation', InvitationViewSet)
 router.register(r'contentnode', ContentNodeViewSet)
 router.register(r'assessmentitem', AssessmentItemViewSet)
-router.register(r'tree', TreeViewSet, base_name='tree')
 router.register(r'admin-users', AdminUserViewSet, base_name='admin-users')
+router.register(r'clipboard', ClipboardViewSet, base_name='clipboard')
 
 urlpatterns = [
     url(r'^$', views.base, name='base'),
@@ -188,7 +188,6 @@ def get_queryset(self):
     url(r'^api/download_channel_content_csv/(?P<channel_id>[^/]{32})$', views.download_channel_content_csv, name='download_channel_content_csv'),
     url(r'^api/probers/get_prober_channel', views.get_prober_channel, name='get_prober_channel'),
     url(r'^api/sync/$', sync, name="sync"),
-    url(r'^api/get_clipboard_channels/$', views.get_clipboard_channels, name="get_clipboard_channels"),
 ]
 
 # if activated, turn on django prometheus urls
diff --git a/contentcuration/contentcuration/views/base.py b/contentcuration/contentcuration/views/base.py
index c3bc59d4bf..61fbf17a72 100644
--- a/contentcuration/contentcuration/views/base.py
+++ b/contentcuration/contentcuration/views/base.py
@@ -158,7 +158,7 @@ def channel_list(request):
             PREFERENCES: json_for_parse_from_data(preferences),
             MESSAGES: json_for_parse_from_data(get_messages()),
             "LIBRARY_MODE": settings.LIBRARY_MODE,
-            'public_languages': json_for_parse_from_data({l['lang_code']: l['count'] for l in public_lang_query}),
+            'public_languages': json_for_parse_from_data({lang['lang_code']: lang['count'] for lang in public_lang_query}),
             'public_collections': json_for_parse_from_serializer(PublicChannelSetSerializer(public_channelset_query, many=True))
         },
     )
@@ -450,13 +450,3 @@ def get_context_data(self, **kwargs):
             }
         )
         return kwargs
-
-
-@api_view(["GET"])
-@authentication_classes((TokenAuthentication, SessionAuthentication))
-@permission_classes((IsAuthenticated,))
-def get_clipboard_channels(request):
-    if not request.user:
-        return Response([])
-    channel_ids = request.user.clipboard_tree.get_descendants().order_by('original_channel_id').values_list('original_channel_id', flat=True).distinct()
-    return Response(channel_ids)
diff --git a/contentcuration/contentcuration/viewsets/base.py b/contentcuration/contentcuration/viewsets/base.py
index dbeac59f62..5e12380eee 100644
--- a/contentcuration/contentcuration/viewsets/base.py
+++ b/contentcuration/contentcuration/viewsets/base.py
@@ -22,6 +22,9 @@
 from contentcuration.viewsets.common import MissingRequiredParamsException
 
 
+_valid_positions = {"first-child", "last-child", "left", "right"}
+
+
 class SimpleReprMixin(object):
     def __repr__(self):
         """
@@ -626,6 +629,43 @@ def copy_from_changes(self, changes):
         return errors, changes_to_return
 
 
+class MoveMixin(object):
+    def validate_targeting_args(self, target, position):
+        if target is None:
+            raise ValidationError("A target must be specified")
+        try:
+            target = self.get_edit_queryset().get(pk=target)
+        except ObjectDoesNotExist:
+            raise ValidationError("Target: {} does not exist".format(target))
+        except ValueError:
+            raise ValidationError("Invalid target specified: {}".format(target))
+        if position not in _valid_positions:
+            raise ValidationError(
+                "Invalid position specified, must be one of {}".format(
+                    ", ".join(_valid_positions)
+                )
+            )
+        return target, position
+
+    def move_from_changes(self, changes):
+        errors = []
+        changes = []
+        for move in changes:
+            # Move change will have key, must also have target property
+            # optionally can include the desired position.
+            target = move["mods"].get("target")
+            position = move["mods"].get("position")
+            move_error, move_change = self.move(
+                move["key"], target=target, position=position
+            )
+            if move_error:
+                move.update({"errors": [move_error]})
+                errors.append(move)
+            if move_change:
+                changes.append(move_change)
+        return errors, changes
+
+
 class RelationMixin(object):
     def create_relation_from_changes(self, changes):
         errors = []
diff --git a/contentcuration/contentcuration/viewsets/clipboard.py b/contentcuration/contentcuration/viewsets/clipboard.py
new file mode 100644
index 0000000000..f194099536
--- /dev/null
+++ b/contentcuration/contentcuration/viewsets/clipboard.py
@@ -0,0 +1,116 @@
+import re
+
+from django.db.models import F
+from django.db.models import OuterRef
+from django.db.models import Subquery
+from django_filters.rest_framework import DjangoFilterBackend
+from le_utils.constants import content_kinds
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.serializers import RegexField
+from rest_framework.serializers import ValidationError
+
+from contentcuration.models import Channel
+from contentcuration.models import ContentNode
+from contentcuration.models import User
+from contentcuration.viewsets.base import BulkListSerializer
+from contentcuration.viewsets.base import BulkModelSerializer
+from contentcuration.viewsets.base import RequiredFilterSet
+from contentcuration.viewsets.base import ValuesViewset
+from contentcuration.viewsets.common import SQCount
+
+
+class ClipboardFilter(RequiredFilterSet):
+    class Meta:
+        model = ContentNode
+        fields = ("parent",)
+
+
+uuidregex = re.compile("^[0-9a-f]{32}$")
+
+
+class ClipboardSerializer(BulkModelSerializer):
+    """
+    This is a write only serializer - we leverage it to do create and update
+    operations, but read operations are handled by the Viewset.
+    """
+
+    # These are set as editable=False on the model so by default DRF does not allow us
+    # to set them.
+    source_channel_id = RegexField(uuidregex)
+    source_node_id = RegexField(uuidregex)
+
+    class Meta:
+        model = ContentNode
+        fields = (
+            "id",
+            "kind",
+            "parent",
+            "source_node_id",
+            "source_channel_id",
+            "extra_fields",
+        )
+        list_serializer_class = BulkListSerializer
+
+    def create(self, validated_data):
+        # Creating a new node, by default put it in the clipboard root.
+        if "parent" not in validated_data:
+            if "request" in self.context and self.context["request"].user:
+                validated_data["parent_id"] = self.context[
+                    "request"
+                ].user.clipboard_tree_id
+            else:
+                raise ValidationError(
+                    "Trying to create a clipboard node when there is no user"
+                )
+        try:
+            channel_query = Channel.objects.filter(
+                main_tree__tree_id=OuterRef("tree_id")
+            )
+            ContentNode.objects.all().annotate(
+                # Annotate channel id
+                channel_id=Subquery(channel_query.values_list("id", flat=True)[:1])
+            ).get(
+                node_id=validated_data["source_node_id"],
+                channel_id=validated_data["source_channel_id"],
+            )
+        except ContentNode.DoesNotExist:
+            raise ValidationError("ContentNode does not exist")
+        return super(ClipboardSerializer, self).create(validated_data)
+
+
+class ClipboardViewSet(ValuesViewset):
+    permission_classes = [IsAuthenticated]
+    filter_backends = (DjangoFilterBackend,)
+    filter_class = ClipboardFilter
+    serializer_class = ClipboardSerializer
+    values = (
+        "id",
+        "source_node_id",
+        "source_channel_id",
+        "extra_fields",
+        "parent",
+        "lft",
+        "total_count",
+        "resource_count",
+    )
+
+    def get_queryset(self):
+        user_id = not self.request.user.is_anonymous() and self.request.user.id
+        user_queryset = User.objects.filter(id=user_id)
+
+        clipboard_tree_id_query = ContentNode.objects.filter(
+            pk=user_queryset.values_list("clipboard_tree_id", flat=True)[:1]
+        ).values_list("tree_id", flat=True)[:1]
+
+        return ContentNode.objects.filter(tree_id=clipboard_tree_id_query)
+
+    def annotate_queryset(self, queryset):
+        descendant_resources = ContentNode.objects.filter(
+            tree_id=OuterRef("tree_id"),
+            lft__gt=OuterRef("lft"),
+            rght__lt=OuterRef("rght"),
+        ).exclude(kind_id=content_kinds.TOPIC)
+        return queryset.annotate(
+            total_count=(F("rght") - F("lft") - 1) / 2,
+            resource_count=SQCount(descendant_resources, field="content_id"),
+        )
diff --git a/contentcuration/contentcuration/viewsets/contentnode.py b/contentcuration/contentcuration/viewsets/contentnode.py
index 53febd4574..bd5969d23a 100644
--- a/contentcuration/contentcuration/viewsets/contentnode.py
+++ b/contentcuration/contentcuration/viewsets/contentnode.py
@@ -1,6 +1,4 @@
-import copy
 import json
-import uuid
 
 from django.conf import settings
 from django.db import transaction
@@ -11,10 +9,10 @@
 from django.db.models import Subquery
 from django_filters.rest_framework import CharFilter
 from django_filters.rest_framework import DjangoFilterBackend
+from django_filters.rest_framework import UUIDFilter
 from le_utils.constants import content_kinds
 from le_utils.constants import roles
 from rest_framework.permissions import IsAuthenticated
-from rest_framework.serializers import empty
 from rest_framework.serializers import PrimaryKeyRelatedField
 from rest_framework.serializers import ValidationError
 
@@ -29,6 +27,7 @@
 from contentcuration.viewsets.base import BulkModelSerializer
 from contentcuration.viewsets.base import BulkUpdateMixin
 from contentcuration.viewsets.base import CopyMixin
+from contentcuration.viewsets.base import MoveMixin
 from contentcuration.viewsets.base import RequiredFilterSet
 from contentcuration.viewsets.base import ValuesViewset
 from contentcuration.viewsets.common import NotNullArrayAgg
@@ -36,29 +35,58 @@
 from contentcuration.viewsets.common import UUIDInFilter
 from contentcuration.viewsets.sync.constants import CONTENTNODE
 from contentcuration.viewsets.sync.constants import DELETED
-from contentcuration.viewsets.sync.constants import UPDATED
 
 
 orphan_tree_id_subquery = ContentNode.objects.filter(
     pk=settings.ORPHANAGE_ROOT_ID
 ).values_list("tree_id", flat=True)[:1]
 
+channel_query = Channel.objects.filter(main_tree__tree_id=OuterRef("tree_id"))
+
 
 class ContentNodeFilter(RequiredFilterSet):
     id__in = UUIDInFilter(name="id")
-    channel_root = CharFilter(method="filter_channel_root")
+    root_id = UUIDFilter(method="filter_root_id")
+    ancestors_of = UUIDFilter(method="filter_ancestors_of")
+    parent__in = UUIDInFilter(name="parent")
+    _node_id_channel_id___in = CharFilter(method="filter__node_id_channel_id")
 
     class Meta:
         model = ContentNode
-        fields = ("parent", "id__in", "kind", "channel_root")
+        fields = (
+            "parent",
+            "parent__in",
+            "id__in",
+            "kind",
+            "root_id",
+            "ancestors_of",
+            "_node_id_channel_id___in",
+        )
 
-    def filter_channel_root(self, queryset, name, value):
+    def filter_root_id(self, queryset, name, value):
         return queryset.filter(
             parent=Channel.objects.filter(pk=value).values_list(
                 "main_tree__id", flat=True
             )
         )
 
+    def filter_ancestors_of(self, queryset, name, value):
+        # For simplicity include the target node in the query
+        target_node_query = ContentNode.objects.filter(pk=value)
+        return queryset.filter(
+            tree_id=target_node_query.values_list("tree_id", flat=True)[:1],
+            lft__lte=target_node_query.values_list("lft", flat=True)[:1],
+            rght__gte=target_node_query.values_list("rght", flat=True)[:1],
+        )
+
+    def filter__node_id_channel_id(self, queryset, name, value):
+        query = Q()
+        values = value.split(",")
+        num_pairs = len(values) // 2
+        for i in range(0, num_pairs):
+            query |= Q(node_id=values[i * 2], channel_id=values[i * 2 + 1])
+        return queryset.filter(query)
+
 
 class ContentNodeListSerializer(BulkListSerializer):
     def gather_prerequisites(self, validated_data, add_empty=True):
@@ -147,6 +175,7 @@ class Meta:
             "provider",
             "extra_fields",
             "thumbnail_encoding",
+            "parent",
         )
         list_serializer_class = ContentNodeListSerializer
 
@@ -159,6 +188,14 @@ def create(self, validated_data):
 
         return super(ContentNodeSerializer, self).create(validated_data)
 
+    def update(self, instance, validated_data):
+        if "parent" in validated_data:
+            raise ValidationError(
+                {"parent": "This field should only be changed by a move operation"}
+            )
+
+        return super(ContentNodeSerializer, self).update(instance, validated_data)
+
     def post_save_create(self, instance, many_to_many=None):
         prerequisite_ids = getattr(self, "prerequisite_ids", [])
         super(ContentNodeSerializer, self).post_save_create(
@@ -254,7 +291,7 @@ def copy_tags(from_node, to_channel_id, to_node):
 
 
 # Apply mixin first to override ValuesViewset
-class ContentNodeViewSet(BulkUpdateMixin, CopyMixin, ValuesViewset):
+class ContentNodeViewSet(BulkUpdateMixin, CopyMixin, MoveMixin, ValuesViewset):
     queryset = ContentNode.objects.all()
     serializer_class = ContentNodeSerializer
     permission_classes = [IsAuthenticated]
@@ -279,6 +316,8 @@ class ContentNodeViewSet(BulkUpdateMixin, CopyMixin, ValuesViewset):
         "copyright_holder",
         "extra_fields",
         "node_id",
+        "root_id",
+        "channel_id",
         "original_source_node_id",
         "original_channel_id",
         "original_channel_name",
@@ -296,6 +335,7 @@ class ContentNodeViewSet(BulkUpdateMixin, CopyMixin, ValuesViewset):
         "has_children",
         "parent_id",
         "complete",
+        "lft",
     )
 
     field_map = {
@@ -307,6 +347,7 @@ class ContentNodeViewSet(BulkUpdateMixin, CopyMixin, ValuesViewset):
         "assessment_items": "assessment_items_ids",
         "thumbnail_src": retrieve_thumbail_src,
         "title": get_title,
+        "parent": "parent_id",
     }
 
     def get_queryset(self):
@@ -321,7 +362,10 @@ def get_queryset(self):
                     public=True, main_tree__tree_id=OuterRef("tree_id")
                 )
             ),
+            # Annotate channel id
+            channel_id=Subquery(channel_query.values_list("id", flat=True)[:1]),
         )
+
         queryset = queryset.filter(
             Q(view=True)
             | Q(edit=True)
@@ -337,6 +381,8 @@ def get_edit_queryset(self):
 
         queryset = ContentNode.objects.annotate(
             edit=Exists(user_queryset.filter(edit_filter)),
+            # Annotate channel id
+            channel_id=Subquery(channel_query.values_list("id", flat=True)[:1]),
         )
 
         queryset = queryset.filter(Q(edit=True) | Q(tree_id=orphan_tree_id_subquery))
@@ -346,30 +392,15 @@ def get_edit_queryset(self):
     def annotate_queryset(self, queryset):
         queryset = queryset.annotate(total_count=(F("rght") - F("lft") - 1) / 2)
 
-        descendant_resources = (
-            ContentNode.objects.filter(
-                tree_id=OuterRef("tree_id"),
-                lft__gt=OuterRef("lft"),
-                rght__lt=OuterRef("rght"),
-            )
-            .exclude(kind_id=content_kinds.TOPIC)
-            .order_by("id")
-            .distinct("id")
-            .values_list("id", flat=True)
-        )
+        descendant_resources = ContentNode.objects.filter(
+            tree_id=OuterRef("tree_id"),
+            lft__gt=OuterRef("lft"),
+            rght__lt=OuterRef("rght"),
+        ).exclude(kind_id=content_kinds.TOPIC)
 
         # Get count of descendant nodes with errors
-        descendant_errors = (
-            ContentNode.objects.filter(
-                tree_id=OuterRef("tree_id"),
-                lft__gt=OuterRef("lft"),
-                rght__lt=OuterRef("rght"),
-            )
-            .filter(complete=False)
-            .order_by("id")
-            .distinct("id")
-            .values_list("id", flat=True)
-        )
+        descendant_errors = descendant_resources.filter(complete=False)
+
         thumbnails = File.objects.filter(
             contentnode=OuterRef("id"), preset__thumbnail=True
         )
@@ -380,11 +411,15 @@ def annotate_queryset(self, queryset):
         original_node = ContentNode.objects.filter(
             node_id=OuterRef("original_source_node_id")
         ).filter(node_id=F("original_source_node_id"))
+
+        root_id = ContentNode.objects.filter(
+            tree_id=OuterRef("tree_id"), parent__isnull=True
+        ).values_list("id", flat=True)[:1]
+
         queryset = queryset.annotate(
             resource_count=SQCount(descendant_resources, field="id"),
             coach_count=SQCount(
-                descendant_resources.filter(role_visibility=roles.COACH),
-                field="id",
+                descendant_resources.filter(role_visibility=roles.COACH), field="id",
             ),
             error_count=SQCount(descendant_errors, field="id"),
             thumbnail_checksum=Subquery(thumbnails.values("checksum")[:1]),
@@ -395,6 +430,7 @@ def annotate_queryset(self, queryset):
             original_parent_id=Subquery(original_node.values("parent_id")[:1]),
             original_node_id=Subquery(original_node.values("pk")[:1]),
             has_children=Exists(ContentNode.objects.filter(parent=OuterRef("id"))),
+            root_id=Subquery(root_id),
         )
         queryset = queryset.annotate(content_tags=NotNullArrayAgg("tags__tag_name"))
         queryset = queryset.annotate(file_ids=NotNullArrayAgg("files__id"))
@@ -407,88 +443,96 @@ def annotate_queryset(self, queryset):
 
         return queryset
 
-    def copy(self, pk, from_key=None, **mods):
-        delete_response = [
-            dict(key=pk, table=CONTENTNODE, type=DELETED,),
-        ]
+    def move(self, pk, target=None, position="last-child"):
+        try:
+            contentnode = self.get_edit_queryset().get(pk=pk)
+        except ContentNode.DoesNotExist:
+            error = ValidationError("Specified node does not exist")
+            return str(error), None
 
         try:
-            with transaction.atomic():
-                try:
-                    source = ContentNode.objects.get(pk=from_key)
-                except ContentNode.DoesNotExist:
-                    error = ValidationError("Copy source node does not exist")
-                    return str(error), delete_response
-
-                if ContentNode.objects.filter(pk=pk).exists():
-                    raise ValidationError("Copy pk already exists")
-
-                # clone the model (in-memory) and update the fields on the cloned model
-                new_node = copy.copy(source)
-                new_node.pk = pk
-                new_node.published = False
-                new_node.changed = True
-                new_node.cloned_source = source
-                new_node.node_id = uuid.uuid4().hex
-                new_node.source_node_id = source.node_id
-                new_node.freeze_authoring_data = not Channel.objects.filter(
-                    pk=source.original_channel_id, editors=self.request.user
-                ).exists()
-
-                # Creating a new node, by default put it in the orphanage on initial creation.
-                new_node.parent_id = settings.ORPHANAGE_ROOT_ID
-
-                # There might be some legacy nodes that don't have these, so ensure they are added
-                if (
-                    not new_node.original_channel_id
-                    or not new_node.original_source_node_id
-                ):
-                    original_node = source.get_original_node()
-                    original_channel = original_node.get_channel()
-                    new_node.original_channel_id = (
-                        original_channel.id if original_channel else None
-                    )
-                    new_node.original_source_node_id = original_node.node_id
+            target, position = self.validate_targeting_args(target, position)
+            try:
+                contentnode.move_to(target, position)
+            except ValueError:
+                raise ValidationError(
+                    "Invalid position argument specified: {}".format(position)
+                )
 
-                new_node.source_channel_id = mods.pop("source_channel_id", None)
-                if not new_node.source_channel_id:
-                    source_channel = source.get_channel()
-                    new_node.source_channel_id = (
-                        source_channel.id if source_channel else None
-                    )
+            return (
+                None,
+                None,
+            )
+        except ValidationError as e:
+            return str(e), None
+
+    def copy(self, pk, from_key=None, **mods):
 
-                new_node.save(force_insert=True)
+        target = mods.pop("target")
+        position = mods.pop("position", "last-child")
 
-                # because we don't know the tree yet, and tag data model currently uses channel,
-                # we can't copy them unless we were given the new channel
-                channel_id = mods.pop("channel_id", None)
-                if channel_id:
-                    copy_tags(source, channel_id, new_node)
+        try:
+            target, position = self.validate_targeting_args(target, position)
+        except ValidationError as e:
+            return str(e), None
+
+        try:
+            source = self.get_queryset().get(pk=from_key)
+        except ContentNode.DoesNotExist:
+            error = ValidationError("Copy source node does not exist")
+            return str(error), [dict(key=pk, table=CONTENTNODE, type=DELETED)]
+
+        if ContentNode.objects.filter(pk=pk).exists():
+            error = ValidationError("Copy pk already exists")
+            return str(error), None
+
+        with transaction.atomic():
+            # create a very basic copy
+
+            new_node_data = {
+                "id": pk,
+                "content_id": source.content_id,
+                "kind": source.kind,
+                "title": source.title,
+                "description": source.description,
+                "cloned_source": source,
+                "source_channel_id": source.channel_id,
+                "source_node_id": source.node_id,
+                "freeze_authoring_data": not Channel.objects.filter(
+                    pk=source.original_channel_id, editors=self.request.user
+                ).exists(),
+                "changed": True,
+                "published": False,
+            }
 
-                # Remove these because we do not want to define any mod operations on them during copy
-                def clean_copy_data(data):
-                    return {
-                        key: empty if key in copy_ignore_fields else value
-                        for key, value in data.items()
-                    }
+            # Add any additional modifications sent from the frontend
+            new_node_data.update(mods)
 
-                serializer = ContentNodeSerializer(
-                    instance=new_node, data=clean_copy_data(mods), partial=True
+            # There might be some legacy nodes that don't have these, so ensure they are added
+            if source.original_channel_id:
+                new_node_data["original_channel_id"] = source.original_channel_id
+            else:
+                original_node = source.get_original_node()
+                original_channel = original_node.get_channel()
+                new_node_data["original_channel_id"] = (
+                    original_channel.id if original_channel else None
                 )
+
+            serializer = ContentNodeSerializer(data=new_node_data, partial=True)
+            try:
+
                 serializer.is_valid(raise_exception=True)
-                node = serializer.save()
-                node.save()
-
-                return (
-                    None,
-                    [
-                        dict(
-                            key=pk,
-                            table=CONTENTNODE,
-                            type=UPDATED,
-                            mods=clean_copy_data(serializer.validated_data),
-                        ),
-                    ],
-                )
-        except ValidationError as e:
-            return e.detail, None
+
+            except ValidationError as e:
+                return e.detail, None
+
+            new_node = ContentNode(**new_node_data)
+
+            new_node.insert_at(target, position, save=False, allow_existing_pk=True)
+
+            new_node.save(force_insert=True)
+
+            return (
+                None,
+                None,
+            )
diff --git a/contentcuration/contentcuration/viewsets/sync/constants.py b/contentcuration/contentcuration/viewsets/sync/constants.py
index 4bc6eb7d8c..fd8c3a3107 100644
--- a/contentcuration/contentcuration/viewsets/sync/constants.py
+++ b/contentcuration/contentcuration/viewsets/sync/constants.py
@@ -14,15 +14,25 @@
 ASSESSMENTITEM = "assessmentitem"
 FILE = "file"
 INVITATION = "invitation"
-TREE = "tree"
 USER = "user"
 EDITOR_M2M = "editor_m2m"
 VIEWER_M2M = "viewer_m2m"
 SAVEDSEARCH = "savedsearch"
+CLIPBOARD = "clipboard"
 
 
 ALL_TABLES = set(
-    [CHANNEL, CONTENTNODE, ASSESSMENTITEM, CHANNELSET, FILE, TREE, INVITATION, USER, SAVEDSEARCH]
+    [
+        CHANNEL,
+        CLIPBOARD,
+        CONTENTNODE,
+        ASSESSMENTITEM,
+        CHANNELSET,
+        FILE,
+        INVITATION,
+        USER,
+        SAVEDSEARCH,
+    ]
 )
 
 
diff --git a/contentcuration/contentcuration/viewsets/sync/endpoint.py b/contentcuration/contentcuration/viewsets/sync/endpoint.py
index 6f4cf01205..458732d712 100644
--- a/contentcuration/contentcuration/viewsets/sync/endpoint.py
+++ b/contentcuration/contentcuration/viewsets/sync/endpoint.py
@@ -24,12 +24,14 @@
 from contentcuration.viewsets.assessmentitem import AssessmentItemViewSet
 from contentcuration.viewsets.channel import ChannelViewSet
 from contentcuration.viewsets.channelset import ChannelSetViewSet
+from contentcuration.viewsets.clipboard import ClipboardViewSet
 from contentcuration.viewsets.contentnode import ContentNodeViewSet
 from contentcuration.viewsets.file import FileViewSet
 from contentcuration.viewsets.invitation import InvitationViewSet
 from contentcuration.viewsets.sync.constants import ASSESSMENTITEM
 from contentcuration.viewsets.sync.constants import CHANNEL
 from contentcuration.viewsets.sync.constants import CHANNELSET
+from contentcuration.viewsets.sync.constants import CLIPBOARD
 from contentcuration.viewsets.sync.constants import CONTENTNODE
 from contentcuration.viewsets.sync.constants import COPIED
 from contentcuration.viewsets.sync.constants import CREATED
@@ -41,12 +43,10 @@
 from contentcuration.viewsets.sync.constants import INVITATION
 from contentcuration.viewsets.sync.constants import MOVED
 from contentcuration.viewsets.sync.constants import SAVEDSEARCH
-from contentcuration.viewsets.sync.constants import TREE
 from contentcuration.viewsets.sync.constants import UPDATED
 from contentcuration.viewsets.sync.constants import USER
 from contentcuration.viewsets.sync.constants import VIEWER_M2M
 from contentcuration.viewsets.sync.utils import get_and_clear_user_events
-from contentcuration.viewsets.tree import TreeViewSet
 from contentcuration.viewsets.user import ChannelUserViewSet
 from contentcuration.viewsets.user import UserViewSet
 
@@ -84,10 +84,10 @@ def __init__(self, change_type, time, changes):
         # Tree operations require content nodes to exist, and any new assessment items
         # need to point to an existing content node
         (CONTENTNODE, ContentNodeViewSet),
+        (CLIPBOARD, ClipboardViewSet),
         # The exact order of these three is not important.
         (ASSESSMENTITEM, AssessmentItemViewSet),
         (CHANNELSET, ChannelSetViewSet),
-        (TREE, TreeViewSet),
         (FILE, FileViewSet),
         (EDITOR_M2M, ChannelUserViewSet),
         (VIEWER_M2M, ChannelUserViewSet),
diff --git a/contentcuration/contentcuration/viewsets/tree.py b/contentcuration/contentcuration/viewsets/tree.py
deleted file mode 100644
index 84b9794a26..0000000000
--- a/contentcuration/contentcuration/viewsets/tree.py
+++ /dev/null
@@ -1,281 +0,0 @@
-import uuid
-
-from django.db import transaction
-from django.db.models import CharField
-from django.db.models.functions import Coalesce
-from django.db.models.sql.constants import LOUTER
-from django.shortcuts import get_object_or_404
-from django_cte import With
-from django_filters.rest_framework import DjangoFilterBackend
-from django_filters.rest_framework import FilterSet
-from rest_framework.permissions import IsAuthenticated
-from rest_framework.response import Response
-from rest_framework.serializers import Serializer
-from rest_framework.serializers import ValidationError
-from rest_framework.viewsets import GenericViewSet
-
-from contentcuration.models import Channel
-from contentcuration.models import ContentNode
-from contentcuration.viewsets.base import CopyMixin
-from contentcuration.viewsets.common import MissingRequiredParamsException
-from contentcuration.viewsets.sync.constants import CONTENTNODE
-from contentcuration.viewsets.sync.constants import DELETED
-from contentcuration.viewsets.sync.constants import TREE
-from contentcuration.viewsets.sync.constants import UPDATED
-
-
-_valid_positions = {"first-child", "last-child", "left", "right"}
-
-
-class TreeFilter(FilterSet):
-    class Meta:
-        model = ContentNode
-        fields = (
-            "id",
-            "parent",
-        )
-
-
-def validate_targeting_args(target, position):
-    if target is None:
-        raise ValidationError("A target content node must be specified")
-    try:
-        target = ContentNode.objects.get(pk=target)
-    except ContentNode.DoesNotExist:
-        raise ValidationError("Target content node: {} does not exist".format(target))
-    except ValueError:
-        raise ValidationError(
-            "Invalid target content node specified: {}".format(target)
-        )
-    if position not in _valid_positions:
-        raise ValidationError(
-            "Invalid node position specified, must be one of {}".format(
-                ", ".join(_valid_positions)
-            )
-        )
-    return target, position
-
-
-def map_source_id(item):
-    return item.pop("real_source_id")
-
-
-def map_channel_id(item):
-    return item.pop("source_channel_id", item.pop("original_channel_id", None))
-
-
-class Mapper(object):
-    def __init__(self, field_map, channel_id=None, tree_id=None):
-        self.field_map = field_map
-        self.channel_id = channel_id
-        self.tree_id = tree_id
-
-    def __call__(self, item):
-        item.update({key: mapping(item) for key, mapping in self.field_map.items()})
-
-        item["channel_id"] = self.channel_id or item["channel_id"]
-        item["tree_id"] = self.tree_id
-        return item
-
-
-class TreeViewSet(GenericViewSet, CopyMixin):
-    permission_classes = [IsAuthenticated]
-    filter_backends = (DjangoFilterBackend,)
-    filter_class = TreeFilter
-    serializer_class = Serializer
-    values = (
-        "id",
-        "tree_id",
-        "real_source_id",
-        "source_channel_id",
-        "original_channel_id",
-        "parent",
-        "level",
-        "lft",
-    )
-
-    field_map = {"source_id": map_source_id, "channel_id": map_channel_id}
-
-    def add_source_cte(self, queryset, field):
-        cte = With(
-            ContentNode.objects.filter(node_id__in=queryset.values(field)).values(
-                "id", "node_id"
-            ),
-            name="{}_cte".format(field),
-        )
-
-        queryset = cte.join(
-            queryset, _join_type=LOUTER, **{field: cte.col.node_id}
-        ).with_cte(cte)
-        return queryset, cte
-
-    def annotate_queryset(self, queryset):
-        queryset, source_node_cte = self.add_source_cte(queryset, "source_node_id")
-        queryset, original_node_cte = self.add_source_cte(
-            queryset, "original_source_node_id"
-        )
-
-        real_source_id = Coalesce(
-            source_node_cte.col.id, original_node_cte.col.id, output_field=CharField()
-        )
-        return queryset.annotate(real_source_id=real_source_id)
-
-    @classmethod
-    def id_attr(cls):
-        return None
-
-    def list(self, request, *args, **kwargs):
-        channel_id = request.query_params.get("channel_id")
-        tree_id = request.query_params.get("tree_id")
-
-        if channel_id is None and tree_id is None:
-            raise MissingRequiredParamsException(
-                "tree_id or channel_id query parameter is required but was missing from the request"
-            )
-
-        root_filter = dict()
-        if not tree_id:
-            root_filter.update(channel_main=channel_id)
-        else:
-            root_filter.update(pk=tree_id)
-
-        root = get_object_or_404(ContentNode, **root_filter)
-
-        # Temporary hack: filter by channel_id if both tree_id and channel_id are provided
-        if tree_id and channel_id:
-            queryset = self.filter_queryset(root.get_descendants(include_self=True).filter(original_channel_id=channel_id))
-        else:
-            queryset = self.filter_queryset(root.get_descendants(include_self=True))
-
-        if tree_id is None:
-            tree_id = root.pk
-
-        map_data = Mapper(self.field_map, channel_id=channel_id, tree_id=tree_id)
-
-        tree = map(map_data, self.annotate_queryset(queryset).values(*self.values))
-        return Response(tree)
-
-    def map_model(self, node):
-        tree_id = node.get_root_id()
-        channel_id = (
-            Channel.objects.filter(main_tree_id=tree_id)
-            .values_list("pk", flat=True)
-            .first()
-        )
-
-        mapper = Mapper(self.field_map, channel_id=channel_id, tree_id=tree_id)
-        queryset = self.annotate_queryset(ContentNode.objects.filter(pk=node.pk))
-        return next(map(mapper, queryset.values(*self.values)))
-
-    def move(self, pk, target=None, position="first-child"):
-        try:
-            contentnode = ContentNode.objects.get(pk=pk)
-        except ContentNode.DoesNotExist:
-            error = ValidationError("Specified node does not exist")
-            return str(error), None
-
-        try:
-            target, position = validate_targeting_args(target, position)
-            try:
-                contentnode.move_to(target, position)
-            except ValueError:
-                raise ValidationError(
-                    "Invalid position argument specified: {}".format(position)
-                )
-
-            contentnode.refresh_from_db()
-            return (
-                None,
-                dict(
-                    key=pk, table=TREE, type=UPDATED, mods=self.map_model(contentnode)
-                ),
-            )
-        except ValidationError as e:
-            return str(e), None
-
-    def move_from_changes(self, changes):
-        errors = []
-        changes = []
-        for move in changes:
-            # Move change will have key, must also have target property
-            # optionally can include the desired position.
-            target = move["mods"].get("target")
-            position = move["mods"].get("position")
-            move_error, move_change = self.move(
-                move["key"], target=target, position=position
-            )
-            if move_error:
-                move.update({"errors": [move_error]})
-                errors.append(move)
-            if move_change:
-                changes.append(move_change)
-        return errors, changes
-
-    def copy(self, pk, from_key=None, **mods):
-        """
-        Creates a minimal copy, primarily for the clipboard
-        """
-        target = mods.pop("target")
-        position = mods.pop("position")
-        sort_order = mods.pop("lft")
-        channel_id = mods.pop("channel_id")
-
-        delete_response = [
-            dict(key=pk, table=TREE, type=DELETED,),
-            dict(key=pk, table=CONTENTNODE, type=DELETED,),
-        ]
-
-        try:
-            target, position = validate_targeting_args(target, position)
-        except ValidationError as e:
-            return str(e), None
-
-        try:
-            source = ContentNode.objects.get(pk=from_key)
-        except ContentNode.DoesNotExist:
-            error = ValidationError("Copy source node does not exist")
-            return str(error), delete_response
-
-        if ContentNode.objects.filter(pk=pk).exists():
-            error = ValidationError("Copy pk already exists")
-            return str(error), None
-
-        with transaction.atomic():
-            # create a very basic copy
-            new_node = ContentNode(
-                content_id=source.content_id,
-                kind=source.kind,
-                title=source.title,
-                description=source.description,
-                sort_order=sort_order,
-                cloned_source=source,
-                source_channel_id=channel_id,
-                node_id=uuid.uuid4().hex,
-                source_node_id=source.node_id,
-                freeze_authoring_data=True,
-                changed=True,
-                published=False,
-            )
-            new_node.id = pk
-
-            # There might be some legacy nodes that don't have these, so ensure they are added
-            if not new_node.original_channel_id or not new_node.original_source_node_id:
-                original_node = source.get_original_node()
-                original_channel = original_node.get_channel()
-                new_node.original_channel_id = (
-                    original_channel.id if original_channel else None
-                )
-                new_node.original_source_node_id = original_node.node_id
-
-            new_node.insert_at(target, position, save=False, allow_existing_pk=True)
-            new_node.save(force_insert=True)
-            new_node.refresh_from_db()
-
-            return (
-                None,
-                [
-                    dict(
-                        key=pk, table=TREE, type=UPDATED, mods=self.map_model(new_node)
-                    ),
-                ],
-            )
diff --git a/contentcuration/search/viewsets/contentnode.py b/contentcuration/search/viewsets/contentnode.py
index 417594a5a9..5d32a1e58d 100644
--- a/contentcuration/search/viewsets/contentnode.py
+++ b/contentcuration/search/viewsets/contentnode.py
@@ -83,7 +83,7 @@ def filter_languages(self, queryset, name, value):
         return queryset.filter(language__lang_code__in=value.split(","))
 
     def filter_licenses(self, queryset, name, value):
-        licenses = [int(l) for l in value.split(",")]
+        licenses = [int(li) for li in value.split(",")]
         return queryset.filter(license__in=licenses)
 
     def filter_kinds(self, queryset, name, value):
@@ -123,17 +123,11 @@ class Meta:
 class SearchContentNodeViewSet(ContentNodeViewSet):
     filter_class = ContentNodeFilter
     pagination_class = ListPagination
-    values = ContentNodeViewSet.values + (
-        "channel_id",
-        "location_ids",
-        "location_channel_ids",
-    )
+    values = ContentNodeViewSet.values + ("location_ids", "location_channel_ids",)
 
     def get_accessible_nodes_queryset(self):
         # jayoshih: May the force be with you, optimizations team...
         user_id = not self.request.user.is_anonymous() and self.request.user.id
-        # Annotate channel id
-        channel_query = Channel.objects.filter(main_tree__tree_id=OuterRef("tree_id"))
 
         # Filter by channel type
         channel_type = self.request.query_params.get("channel_list", "public")
@@ -157,7 +151,7 @@ def get_accessible_nodes_queryset(self):
             .exclude(pk=self.request.query_params.get("exclude_channel", ""))
             .values_list("main_tree__tree_id", flat=True)
             .distinct()
-        ).annotate(channel_id=Subquery(channel_query.values("id")[:1]),)
+        )
 
     def get_queryset(self):
         return self.get_accessible_nodes_queryset()