Various updates to support the 3 providers.  Testing VirtualBox today.