Updated to include Client.  Need to verify it works with 3rd Octet Randomization