part 2 of v1 update, w/ separate mode for disks vs. VMs