Updates & tweaks to allow for multiple hypervisors. Unstable (dev).