WIP Hotplug and cancel logic