newer vpn code

Signed-off-by: Nick Campbell <nicholas.j.campbell@gmail.com>