Pushed with a few small tweaks to make it match project style, thanks!
--Daniel Gustafsson https://vmware.com/