[don't merge quite yet] Ckozak/multiorg hypervisors