v1 -> v2: - Implemented all the review recommendations. I didn't add a test. Is it even possible to test this without a VMware server? I did however test it myself with a real server and it works as expected for me. Rich.