WIP move enqueue support