Reorganized the code
Added some NAT and rendezvous code