From 7737cd7bee3a1af65f035f5cd075e98d5b97f62a Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Thu, 12 Oct 2017 11:17:46 -0500
Subject: [PATCH] Leel1 Generic French translation

---
 .../Resources/Level1-BadDHCP.enbx             | 115 ++++++++++--
 EduNetworkBuilder/Resources/Level1-BadIP.enbx |  84 ++++++---
 .../Resources/Level1-DuplicateIPs.enbx        |  94 +++++++---
 .../Resources/Level1-MidDHCP.enbx             | 136 ++++++++++----
 .../Resources/Level1-NoGateway.enbx           | 126 +++++++++----
 .../Resources/Level1_AddingDevices.enbx       |  71 ++++++--
 .../Resources/Level1_BadGateway.enbx          | 166 +++++++++++++++++-
 .../Resources/Level1_BadNetmask.enbx          | 106 +++++++++--
 .../Resources/Level1_DuplicateMAC.enbx        |  78 +++++---
 .../Resources/Level1_OneNetTwoSubnets.enbx    | 128 ++++++++++++--
 .../Resources/Level1_OneNetTwoSubnets2.enbx   | 104 ++++++++---
 .../Resources/Level1_VPNTraceroute.enbx       | 145 ++-------------
 12 files changed, 991 insertions(+), 362 deletions(-)

diff --git a/EduNetworkBuilder/Resources/Level1-BadDHCP.enbx b/EduNetworkBuilder/Resources/Level1-BadDHCP.enbx
index 83b4b57..3453556 100644
--- a/EduNetworkBuilder/Resources/Level1-BadDHCP.enbx
+++ b/EduNetworkBuilder/Resources/Level1-BadDHCP.enbx
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>The Server is giving out bad DHCP.  Edit the DHCP settings to tell it to give correct DHCP.  (You do this by selecting 'DHCP' from the device-editing screen) Then do a DHCP request on all the PCs.</message>
-    <title>Bad DHCP</title>
+    <en_message>The Server is giving out bad DHCP.  Edit the DHCP settings to tell it to give correct DHCP.  (You do this by selecting 'DHCP' from the device-editing screen) Then do a DHCP request on all the PCs.</en_message>
+    <fr_message>Le serveur donne du mauvais DHCP. Modifiez les paramètres DHCP pour lui indiquer de donner DHCP correct. (Pour ce faire, sélectionnez "DHCP" dans l'écran de modification du périphérique). Ensuite, effectuez une requête DHCP sur tous les PC.</fr_message>
+    <en_title>Bad DHCP</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>True</showlabels>
-    <uniqueidentifier>126</uniqueidentifier>
+    <showlabels>full</showlabels>
     <level>1</level>
-    <sortorder>02.00</sortorder>
+    <sortorder>2</sortorder>
+    <uniqueidentifier>126</uniqueidentifier>
+    <startinghelplevel>none</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -37,6 +41,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -45,6 +51,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -59,6 +67,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -67,6 +77,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -81,6 +93,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -89,6 +103,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -103,6 +119,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -111,6 +129,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -125,6 +145,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -133,6 +155,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -147,6 +171,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -155,6 +181,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -169,6 +197,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -177,6 +207,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -191,6 +223,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -199,6 +233,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -213,6 +249,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -221,6 +259,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -250,6 +290,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -258,6 +300,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -272,14 +316,18 @@
         <nictype>eth</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
-            <ip>192.168.1.51</ip>
-            <mask>255.255.255.0</mask>
-            <gateway>192.168.1.254</gateway>
-            <type>route</type>
+            <ip>0.0.0.0</ip>
+            <mask>0.0.0.0</mask>
+            <gateway>0.0.0.0</gateway>
+            <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -309,6 +357,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -317,6 +367,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -331,14 +383,18 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
-            <ip>192.168.1.50</ip>
-            <mask>255.255.255.0</mask>
-            <gateway>192.168.1.254</gateway>
-            <type>route</type>
+            <ip>0.0.0.0</ip>
+            <mask>0.0.0.0</mask>
+            <gateway>0.0.0.0</gateway>
+            <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -368,6 +424,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -376,6 +434,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -390,6 +450,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -398,6 +460,8 @@
             <gateway>192.168.1.60</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -427,6 +491,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -435,6 +501,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -449,6 +517,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -457,6 +527,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <dhcprange>
@@ -485,7 +557,8 @@
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>server0_link_net_switch0</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>122</uniqueidentifier>
     </link>
     <link>
@@ -501,7 +574,8 @@
         <hostname>net_switch0</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>123</uniqueidentifier>
     </link>
     <link>
@@ -517,7 +591,8 @@
         <hostname>net_switch0</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch0</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>124</uniqueidentifier>
     </link>
     <link>
@@ -533,7 +608,8 @@
         <hostname>net_switch0</hostname>
         <nicname>port4</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc2_link_net_switch0</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>125</uniqueidentifier>
     </link>
     <nettest>
@@ -547,5 +623,8 @@
       <thetest>NeedsLocalIPTo</thetest>
     </nettest>
     <tag>DHCP</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1-BadIP.enbx b/EduNetworkBuilder/Resources/Level1-BadIP.enbx
index 260101a..334dad8 100644
--- a/EduNetworkBuilder/Resources/Level1-BadIP.enbx
+++ b/EduNetworkBuilder/Resources/Level1-BadIP.enbx
@@ -3,15 +3,18 @@
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
     <en_message>PC0 cannot ping one of the other computers.  Figure out which one, and change the IP address of that computer so it works.</en_message>
+    <fr_message>PC0 ne peut pas cingler l'un des autres ordinateurs. Déterminez lequel, et changez l'adresse IP de cet ordinateur pour qu'il fonctionne.</fr_message>
     <en_title>Bad IP</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>True</showlabels>
+    <showlabels>full</showlabels>
     <level>1</level>
     <sortorder>1</sortorder>
     <uniqueidentifier>126</uniqueidentifier>
     <startinghelplevel>none</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -38,7 +41,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -47,6 +50,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -61,7 +66,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -70,6 +75,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -84,7 +91,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -93,6 +100,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -107,7 +116,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -116,6 +125,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -130,7 +141,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -139,6 +150,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -153,7 +166,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -162,6 +175,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -176,7 +191,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -185,6 +200,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -199,7 +216,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -208,6 +225,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -222,7 +241,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -231,6 +250,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -260,7 +281,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -269,6 +290,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -283,7 +306,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -292,6 +315,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -321,7 +346,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -330,6 +355,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -344,7 +371,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -353,6 +380,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -382,7 +411,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -391,6 +420,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -405,7 +436,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -414,6 +445,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -443,7 +476,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -452,6 +485,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -466,7 +501,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -475,6 +510,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -491,7 +528,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>122</uniqueidentifier>
     </link>
@@ -508,7 +545,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc3_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>123</uniqueidentifier>
     </link>
@@ -525,7 +562,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>124</uniqueidentifier>
     </link>
@@ -542,7 +579,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port4</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc2_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>125</uniqueidentifier>
     </link>
@@ -552,5 +589,8 @@
       <thetest>NeedsLocalIPTo</thetest>
     </nettest>
     <tag>IPAddress</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1-DuplicateIPs.enbx b/EduNetworkBuilder/Resources/Level1-DuplicateIPs.enbx
index 4828588..a381772 100644
--- a/EduNetworkBuilder/Resources/Level1-DuplicateIPs.enbx
+++ b/EduNetworkBuilder/Resources/Level1-DuplicateIPs.enbx
@@ -3,15 +3,18 @@
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
     <en_message>Get the PCs so they are happy</en_message>
+    <fr_message>Obtenez les PC pour qu'ils soient heureux</fr_message>
     <en_title>Duplicate IPs</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>False</showlabels>
+    <showlabels>none</showlabels>
     <level>1</level>
     <sortorder>4</sortorder>
     <uniqueidentifier>162</uniqueidentifier>
     <startinghelplevel>none</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -38,7 +41,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -47,6 +50,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -61,7 +66,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>146</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -70,6 +75,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -84,7 +91,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>147</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -93,6 +100,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -107,7 +116,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>148</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -116,6 +125,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -130,7 +141,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>149</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -139,6 +150,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -153,7 +166,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>150</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -162,6 +175,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -176,7 +191,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>151</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -185,6 +200,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -199,7 +216,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>152</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -208,6 +225,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -222,7 +241,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>153</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -231,6 +250,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -260,7 +281,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -269,6 +290,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -283,7 +306,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -292,6 +315,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -321,7 +346,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -330,6 +355,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -344,7 +371,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -353,6 +380,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -382,7 +411,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -391,6 +420,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -405,7 +436,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -414,6 +445,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -443,7 +476,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>140</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -452,6 +485,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -466,7 +501,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -475,6 +510,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -504,7 +541,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>155</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -513,6 +550,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -527,7 +566,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>156</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -536,6 +575,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <dhcprange>
@@ -564,7 +605,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>server0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>157</uniqueidentifier>
     </link>
@@ -581,7 +622,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>158</uniqueidentifier>
     </link>
@@ -598,7 +639,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>159</uniqueidentifier>
     </link>
@@ -615,7 +656,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port4</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc2_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>160</uniqueidentifier>
     </link>
@@ -632,7 +673,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port5</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc3_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>161</uniqueidentifier>
     </link>
@@ -657,5 +698,8 @@
       <thetest>NeedsLocalIPTo</thetest>
     </nettest>
     <tag>IPAddress</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1-MidDHCP.enbx b/EduNetworkBuilder/Resources/Level1-MidDHCP.enbx
index e3fd141..01a3e77 100644
--- a/EduNetworkBuilder/Resources/Level1-MidDHCP.enbx
+++ b/EduNetworkBuilder/Resources/Level1-MidDHCP.enbx
@@ -3,15 +3,18 @@
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
     <en_message>These IP-Phones cannot have a static IP.  You must add a server on the 192.168.1.0 network and configure the DHCP server.  Give an IP to the phone, so the phone can ping the PCs on the other side of the network</en_message>
+    <fr_message>Ces téléphones IP ne peuvent pas avoir une adresse IP statique. Vous devez ajouter un serveur sur le réseau 192.168.1.0 et configurer le serveur DHCP. Donnez une adresse IP au téléphone afin que le téléphone puisse envoyer un ping aux ordinateurs de l'autre côté du réseau</fr_message>
     <en_title>Add DHCP Server</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>False</showlabels>
+    <showlabels>none</showlabels>
     <level>1</level>
     <sortorder>5</sortorder>
     <uniqueidentifier>146</uniqueidentifier>
     <startinghelplevel>none</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>ip_phone0</hostname>
       <size>100</size>
@@ -38,7 +41,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -47,6 +50,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -61,7 +66,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -70,6 +75,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -99,7 +106,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -108,6 +115,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -122,7 +131,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -131,6 +140,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -145,7 +156,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -154,6 +165,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -168,7 +181,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -177,6 +190,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -191,7 +206,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -200,6 +215,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -214,7 +231,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -223,6 +240,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -237,7 +256,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -246,6 +265,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -260,7 +281,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -269,6 +290,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -283,7 +306,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -292,6 +315,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -321,7 +346,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -330,6 +355,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -344,7 +371,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -353,6 +380,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -367,7 +396,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -376,6 +405,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -390,7 +421,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -399,6 +430,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -413,7 +446,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -422,6 +455,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -436,7 +471,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -445,6 +480,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -459,7 +496,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -468,6 +505,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -482,7 +521,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -491,6 +530,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -505,7 +546,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -514,6 +555,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -543,7 +586,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -552,6 +595,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -566,7 +611,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -575,6 +620,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -604,7 +651,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -613,6 +660,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -627,7 +676,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -636,6 +685,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -665,7 +716,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -674,6 +725,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -688,7 +741,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -697,6 +750,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -726,7 +781,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -735,6 +790,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -749,7 +806,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -758,6 +815,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -772,7 +831,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -781,6 +840,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -797,7 +858,7 @@
         <hostname>net_switch1</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>139</uniqueidentifier>
     </link>
@@ -814,7 +875,7 @@
         <hostname>net_switch1</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>140</uniqueidentifier>
     </link>
@@ -831,7 +892,7 @@
         <hostname>net_switch1</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc2_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>141</uniqueidentifier>
     </link>
@@ -848,7 +909,7 @@
         <hostname>router0</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch1_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>142</uniqueidentifier>
     </link>
@@ -865,7 +926,7 @@
         <hostname>router0</hostname>
         <nicname>eth1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>143</uniqueidentifier>
     </link>
@@ -882,7 +943,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>ip_phone0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>145</uniqueidentifier>
     </link>
@@ -897,5 +958,8 @@
       <thetest>SuccessfullyPings</thetest>
     </nettest>
     <tag>DHCPServer</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1-NoGateway.enbx b/EduNetworkBuilder/Resources/Level1-NoGateway.enbx
index e781587..051f226 100644
--- a/EduNetworkBuilder/Resources/Level1-NoGateway.enbx
+++ b/EduNetworkBuilder/Resources/Level1-NoGateway.enbx
@@ -3,15 +3,18 @@
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
     <en_message>The items on one network cannot ping the items on the other network (separated by the router).  Figure why and fix it.  All computers and switches need fixing, but the router is OK.</en_message>
+    <fr_message>Les éléments d'un réseau ne peuvent pas faire de ping sur les éléments de l'autre réseau (séparés par le routeur). Figure pourquoi et réparez-le. Tous les ordinateurs et les commutateurs doivent être réparés, mais le routeur est correct.</fr_message>
     <en_title>Gateway Puzzle</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>False</showlabels>
+    <showlabels>none</showlabels>
     <level>1</level>
     <sortorder>3</sortorder>
     <uniqueidentifier>142</uniqueidentifier>
     <startinghelplevel>none</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -38,7 +41,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -47,6 +50,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -61,7 +66,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -70,6 +75,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -84,7 +91,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -93,6 +100,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -107,7 +116,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -116,6 +125,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -130,7 +141,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -139,6 +150,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -153,7 +166,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -162,6 +175,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -176,7 +191,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -185,6 +200,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -199,7 +216,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -208,6 +225,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -222,7 +241,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -231,6 +250,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -260,7 +281,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -269,6 +290,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -283,7 +306,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -292,6 +315,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -306,7 +331,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -315,6 +340,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -329,7 +356,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -338,6 +365,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -352,7 +381,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -361,6 +390,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -375,7 +406,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -384,6 +415,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -398,7 +431,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -407,6 +440,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -421,7 +456,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -430,6 +465,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -444,7 +481,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -453,6 +490,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -482,7 +521,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -491,6 +530,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -505,7 +546,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -514,6 +555,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -543,7 +586,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -552,6 +595,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -566,7 +611,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -575,6 +620,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -604,7 +651,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -613,6 +660,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -627,7 +676,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -636,6 +685,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -665,7 +716,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -674,6 +725,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -688,7 +741,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -697,6 +750,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -711,7 +766,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -720,6 +775,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -736,7 +793,7 @@
         <hostname>pc2</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_pc2</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>119</uniqueidentifier>
     </link>
@@ -753,7 +810,7 @@
         <hostname>pc1</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_pc1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>120</uniqueidentifier>
     </link>
@@ -770,7 +827,7 @@
         <hostname>router0</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>139</uniqueidentifier>
     </link>
@@ -787,7 +844,7 @@
         <hostname>net_switch1</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router0_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>140</uniqueidentifier>
     </link>
@@ -804,7 +861,7 @@
         <hostname>pc0</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch1_link_pc0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>141</uniqueidentifier>
     </link>
@@ -834,5 +891,8 @@
       <thetest>NeedsDefaultGW</thetest>
     </nettest>
     <tag>Gateway</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1_AddingDevices.enbx b/EduNetworkBuilder/Resources/Level1_AddingDevices.enbx
index 17b611e..8eecb09 100644
--- a/EduNetworkBuilder/Resources/Level1_AddingDevices.enbx
+++ b/EduNetworkBuilder/Resources/Level1_AddingDevices.enbx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
@@ -6,15 +6,21 @@
 1) Give the switch an IP address
 2) Add an IP-Phone to the network, linking it to the switch, and then do a DHCP request for it.
 3) Ping the switch from the IP-Phone</en_message>
+    <fr_message>Ce puzzle a trois tâches à lui:
+1) Donner au commutateur une adresse IP
+2) Ajoutez un téléphone IP au réseau, en le liant au commutateur, puis faites une demande DHCP.
+3) Ping le commutateur de l'IP-Phone</fr_message>
     <en_title>Adding Devices</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>True</showlabels>
+    <showlabels>full</showlabels>
     <level>1</level>
     <sortorder>4.3</sortorder>
     <uniqueidentifier>125</uniqueidentifier>
     <startinghelplevel>basic</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -41,7 +47,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -50,6 +56,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -64,7 +72,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -73,6 +81,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -87,7 +97,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -96,6 +106,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -110,7 +122,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -119,6 +131,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -133,7 +147,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -142,6 +156,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -156,7 +172,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -165,6 +181,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -179,7 +197,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -188,6 +206,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -202,7 +222,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -211,6 +231,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -225,7 +247,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -234,6 +256,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -263,7 +287,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -272,6 +296,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -286,7 +312,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -295,6 +321,8 @@
             <gateway>192.168.1.40</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -324,7 +352,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -333,6 +361,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -347,7 +377,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -356,6 +386,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <dhcprange>
@@ -384,7 +416,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>server0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>116</uniqueidentifier>
     </link>
@@ -401,7 +433,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>117</uniqueidentifier>
     </link>
@@ -433,5 +465,8 @@
       <thetest>SuccessfullyPings</thetest>
     </nettest>
     <tag>DHCP</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
-</EduNetworkBuilder>
+</EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1_BadGateway.enbx b/EduNetworkBuilder/Resources/Level1_BadGateway.enbx
index 145930b..9e9df77 100644
--- a/EduNetworkBuilder/Resources/Level1_BadGateway.enbx
+++ b/EduNetworkBuilder/Resources/Level1_BadGateway.enbx
@@ -3,15 +3,18 @@
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
     <en_message>Computers can only communicate with other computers that are local to them.  Gateways must have an IP address that is local to the client.  Ping pc0 from pc1 and see if you can spot the error.</en_message>
+    <fr_message>Les ordinateurs ne peuvent communiquer qu'avec d'autres ordinateurs qui leur sont locaux. Les passerelles doivent avoir une adresse IP locale au client. Ping pc0 de pc1 et voir si vous pouvez repérer l'erreur.</fr_message>
     <en_title>Bad Gateway</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>False</showlabels>
+    <showlabels>none</showlabels>
     <level>1</level>
     <sortorder>6</sortorder>
     <uniqueidentifier>160</uniqueidentifier>
     <startinghelplevel>full</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -38,6 +41,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -46,6 +51,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -60,6 +67,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -68,6 +77,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -82,6 +93,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -90,6 +103,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -104,6 +119,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -112,6 +129,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -126,6 +145,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -134,6 +155,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -148,6 +171,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -156,6 +181,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -170,6 +197,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -178,6 +207,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -192,6 +223,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -200,6 +233,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -214,6 +249,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -222,6 +259,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -251,6 +290,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -259,6 +300,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -273,6 +316,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -281,6 +326,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -295,6 +342,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -303,6 +352,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -317,6 +368,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -325,6 +378,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -339,6 +394,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -347,6 +404,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -361,6 +420,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -369,6 +430,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -383,6 +446,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -391,6 +456,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -405,6 +472,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -413,6 +482,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -427,6 +498,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -435,6 +508,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -464,6 +539,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -472,6 +549,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -486,6 +565,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -494,6 +575,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -523,6 +606,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>153</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -531,6 +616,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -545,6 +632,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>154</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -553,6 +642,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -582,6 +673,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -590,6 +683,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -604,6 +699,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -612,6 +709,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
         <interface>
           <nicname>eth0</nicname>
@@ -621,6 +720,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -635,6 +736,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -643,6 +746,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <route>
@@ -684,6 +789,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -692,6 +799,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -706,6 +815,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -714,6 +825,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -728,6 +841,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -736,6 +851,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <route>
@@ -777,6 +894,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -785,6 +904,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -799,6 +920,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -807,6 +930,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -821,6 +946,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>143</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -829,6 +956,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <route>
@@ -882,6 +1011,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -890,6 +1021,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -904,6 +1037,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -912,6 +1047,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <dhcprange>
@@ -953,6 +1090,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -961,6 +1100,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -975,6 +1116,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -983,6 +1126,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <dhcprange>
@@ -1011,7 +1156,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>server0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>144</uniqueidentifier>
     </link>
@@ -1028,7 +1173,7 @@
         <hostname>router1</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router2_link_router1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>148</uniqueidentifier>
     </link>
@@ -1045,7 +1190,7 @@
         <hostname>net_switch1</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>151</uniqueidentifier>
     </link>
@@ -1062,7 +1207,7 @@
         <hostname>net_switch1</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>server1_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>150</uniqueidentifier>
     </link>
@@ -1079,7 +1224,7 @@
         <hostname>net_switch1</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router1_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>149</uniqueidentifier>
     </link>
@@ -1096,7 +1241,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port4</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>159</uniqueidentifier>
     </link>
@@ -1113,7 +1258,7 @@
         <hostname>router2</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router0_link_router2</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>147</uniqueidentifier>
     </link>
@@ -1130,7 +1275,7 @@
         <hostname>router0</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>146</uniqueidentifier>
     </link>
@@ -1142,5 +1287,8 @@
     <tag>Gateway</tag>
     <tag>IPAddress</tag>
     <tag>ComparingAddresses</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1_BadNetmask.enbx b/EduNetworkBuilder/Resources/Level1_BadNetmask.enbx
index 408bff5..f29b51b 100644
--- a/EduNetworkBuilder/Resources/Level1_BadNetmask.enbx
+++ b/EduNetworkBuilder/Resources/Level1_BadNetmask.enbx
@@ -7,11 +7,17 @@
 Here, we are using a subnet of 255.255.255.129.  The 129, in binary, is 10000001.  That trailing 1 is the problem.  It basically puts the odd numbers in one subnet and the even numbers in the other subnet.  While it is possible to get networks to function with a terrible subnet mask like this, do not do it.  Use numbers that are properly represented by CIDR notation.  Basically, in binary, you want a bunch of 1s, followed by 0s.  (111000), not 1s and 0s intermingled.  (10101).  CIDR (/25) represents the number of 1s, and the rest are 0.
 
 To solve this puzzle, find the IP Addresses that have the /? and change the subnet to something that works.  Then, try pinging.</en_message>
+    <fr_message>
+L'un des sous-réseaux a un sous-réseau mal conçu. Il y a deux façons de représenter les sous-réseaux. La notation "point-décimal" (255.255.255.0) et CIDR (/ 24).
+
+Ici, nous utilisons un sous-réseau de 255.255.255.129. Le 129, en binaire, est 10000001. Ce trailing 1 est le problème. Il met fondamentalement les nombres impairs dans un sous-réseau et les nombres pairs dans l'autre sous-réseau. Bien qu'il soit possible d'obtenir des réseaux pour fonctionner avec un masque de sous-réseau terrible comme celui-ci, ne le faites pas. Utilisez des nombres correctement représentés par la notation CIDR. Basically, in binary, you want a bunch of 1s, followed by 0s.  (111000), not 1s and 0s intermingled.  (10101).  CIDR (/25) represents the number of 1s, and the rest are 0.
+
+To solve this puzzle, find the IP Addresses that have the /? and change the subnet to something that works.  Then, try pinging.</fr_message>
     <en_title>Bad Netmask</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>True</showlabels>
+    <showlabels>full</showlabels>
     <level>1</level>
     <sortorder>9.7</sortorder>
     <uniqueidentifier>160</uniqueidentifier>
@@ -44,6 +50,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -68,6 +76,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>management_interface</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -92,6 +102,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -116,6 +128,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -140,6 +154,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -164,6 +180,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -188,6 +206,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -212,6 +232,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -236,6 +258,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -275,6 +299,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -299,6 +325,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>management_interface</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -323,6 +351,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -347,6 +377,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -371,6 +403,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -395,6 +429,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -419,6 +455,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -443,6 +481,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -467,6 +507,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -506,6 +548,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -530,6 +574,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -569,6 +615,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -593,6 +641,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -632,6 +682,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>153</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -656,6 +708,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>154</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -695,6 +749,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>156</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -719,6 +775,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>157</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -758,6 +816,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -782,6 +842,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -806,6 +868,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -857,6 +921,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -881,6 +947,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -905,6 +973,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -956,6 +1026,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -980,6 +1052,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1004,6 +1078,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>143</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1067,6 +1143,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1091,6 +1169,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1142,6 +1222,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1166,6 +1248,8 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <nictype>eth</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1204,7 +1288,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>server0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>144</uniqueidentifier>
     </link>
@@ -1221,7 +1305,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>router1</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router2_link_router1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>148</uniqueidentifier>
     </link>
@@ -1238,7 +1322,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>net_switch1</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>151</uniqueidentifier>
     </link>
@@ -1255,7 +1339,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>net_switch1</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>server1_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>150</uniqueidentifier>
     </link>
@@ -1272,7 +1356,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>net_switch1</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router1_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>149</uniqueidentifier>
     </link>
@@ -1289,7 +1373,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>net_switch0</hostname>
         <nicname>port4</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc2_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>159</uniqueidentifier>
     </link>
@@ -1306,7 +1390,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>router2</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router0_link_router2</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>147</uniqueidentifier>
     </link>
@@ -1323,7 +1407,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>router0</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>146</uniqueidentifier>
     </link>
@@ -1340,7 +1424,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>net_switch0</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>145</uniqueidentifier>
     </link>
@@ -1357,7 +1441,7 @@ To solve this puzzle, find the IP Addresses that have the /? and change the subn
         <hostname>net_switch1</hostname>
         <nicname>port4</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc3_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>158</uniqueidentifier>
     </link>
diff --git a/EduNetworkBuilder/Resources/Level1_DuplicateMAC.enbx b/EduNetworkBuilder/Resources/Level1_DuplicateMAC.enbx
index 72de405..b53a0f8 100644
--- a/EduNetworkBuilder/Resources/Level1_DuplicateMAC.enbx
+++ b/EduNetworkBuilder/Resources/Level1_DuplicateMAC.enbx
@@ -3,15 +3,18 @@
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
     <en_message>This puzzle shows you what happens when there are duplicate MAC addresses.  This rarely happens, but it used to happen more often than should be statistically probable.  Cheap network card vendors used to make batches of cards with the same MAC address, and occasionally someone would  buy two of them.  The best solution is to replace one of the NICs that has the duplicate MAC address.  Ping both pc0 and pc1 from pc2.</en_message>
+    <fr_message>Ce puzzle vous montre ce qui se passe quand il y a des adresses MAC en double. Cela arrive rarement, mais cela arrivait plus souvent que cela ne devrait être statistiquement probable. Les fournisseurs de cartes réseau bon marché ont utilisé pour faire des lots de cartes avec la même adresse MAC, et parfois quelqu'un en achèterait deux. La meilleure solution consiste à remplacer l'une des cartes réseau qui a l'adresse MAC en double. Ping à la fois pc0 et pc1 de pc2.</fr_message>
     <en_title>Duplicate MAC addresses</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>True</showlabels>
+    <showlabels>full</showlabels>
     <level>1</level>
     <sortorder>7</sortorder>
     <uniqueidentifier>132</uniqueidentifier>
     <startinghelplevel>full</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -38,7 +41,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -47,6 +50,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -61,7 +66,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -70,6 +75,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -84,7 +91,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -93,6 +100,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -107,7 +116,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -116,6 +125,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -130,7 +141,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -139,6 +150,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -153,7 +166,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -162,6 +175,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -176,7 +191,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -185,6 +200,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -199,7 +216,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -208,6 +225,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -222,7 +241,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -231,6 +250,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -260,7 +281,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -269,6 +290,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -280,11 +303,10 @@
           <hostname>pc0</hostname>
           <nicname>eth0</nicname>
         </myid>
-	<mac>1008b173aa5b</mac>
         <nictype>eth</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -293,6 +315,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -322,7 +346,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -331,6 +355,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -342,11 +368,10 @@
           <hostname>pc1</hostname>
           <nicname>eth0</nicname>
         </myid>
-	<mac>1008b173aa5b</mac>
         <nictype>eth</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -355,6 +380,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -384,7 +411,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -393,6 +420,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -407,7 +436,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -416,6 +445,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -432,7 +463,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>129</uniqueidentifier>
     </link>
@@ -449,7 +480,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>130</uniqueidentifier>
     </link>
@@ -466,7 +497,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc2_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>131</uniqueidentifier>
     </link>
@@ -481,5 +512,8 @@
       <thetest>SuccessfullyPings</thetest>
     </nettest>
     <tag>MACAddress</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
-</EduNetworkBuilder>
+</EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1_OneNetTwoSubnets.enbx b/EduNetworkBuilder/Resources/Level1_OneNetTwoSubnets.enbx
index 2341985..1d8735e 100644
--- a/EduNetworkBuilder/Resources/Level1_OneNetTwoSubnets.enbx
+++ b/EduNetworkBuilder/Resources/Level1_OneNetTwoSubnets.enbx
@@ -1,17 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>This network has two different subnets using the same switch.  Ping from the different PCs to machines on the other network.</message>
-    <title>Two Subnets, Shared Network</title>
+    <en_message>This network has two different subnets using the same switch.  Ping from the different PCs to machines on the other network.</en_message>
+    <fr_message>Ce réseau a deux sous-réseaux différents utilisant le même commutateur. Ping depuis les différents PC vers les machines de l'autre réseau.</fr_message>
+    <en_title>Two Subnets, Shared Network</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>True</showlabels>
+    <showlabels>full</showlabels>
     <level>1</level>
     <sortorder>4</sortorder>
     <uniqueidentifier>137</uniqueidentifier>
     <startinghelplevel>full</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -38,6 +41,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -46,6 +51,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -60,6 +67,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -68,6 +77,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -82,6 +93,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -90,6 +103,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -104,6 +119,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -112,6 +129,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -126,6 +145,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -134,6 +155,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -148,6 +171,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -156,6 +181,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -170,6 +197,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -178,6 +207,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -192,6 +223,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -200,6 +233,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -214,6 +249,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -222,6 +259,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -251,6 +290,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -259,6 +300,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -273,6 +316,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -281,6 +326,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -310,6 +357,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -318,6 +367,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -332,6 +383,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -340,6 +393,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -369,6 +424,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -377,6 +434,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -391,6 +450,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -399,6 +460,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -428,6 +491,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -436,6 +501,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -450,6 +517,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -458,6 +527,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -487,6 +558,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -495,6 +568,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -509,6 +584,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -517,6 +594,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -531,6 +610,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -539,6 +620,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -568,6 +651,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -576,6 +661,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -590,6 +677,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -598,6 +687,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -612,6 +703,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -620,6 +713,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -636,7 +731,8 @@
         <hostname>router1</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router0_link_router1</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>108</uniqueidentifier>
     </link>
     <link>
@@ -652,7 +748,8 @@
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router0_link_net_switch0</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>119</uniqueidentifier>
     </link>
     <link>
@@ -668,7 +765,8 @@
         <hostname>router1</hostname>
         <nicname>eth1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_router1</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>120</uniqueidentifier>
     </link>
     <link>
@@ -684,7 +782,8 @@
         <hostname>net_switch0</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>133</uniqueidentifier>
     </link>
     <link>
@@ -700,7 +799,8 @@
         <hostname>net_switch0</hostname>
         <nicname>port4</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch0</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>134</uniqueidentifier>
     </link>
     <link>
@@ -716,7 +816,8 @@
         <hostname>net_switch0</hostname>
         <nicname>port5</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc2_link_net_switch0</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>135</uniqueidentifier>
     </link>
     <link>
@@ -732,7 +833,8 @@
         <hostname>net_switch0</hostname>
         <nicname>port6</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc3_link_net_switch0</hostname>
+      <linktype>normal</linktype>
       <uniqueidentifier>136</uniqueidentifier>
     </link>
     <nettest>
@@ -767,6 +869,8 @@
     </nettest>
     <tag>Ping</tag>
     <tag>Router</tag>
-    <tag>Subnets</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1_OneNetTwoSubnets2.enbx b/EduNetworkBuilder/Resources/Level1_OneNetTwoSubnets2.enbx
index d21a35f..38f465c 100644
--- a/EduNetworkBuilder/Resources/Level1_OneNetTwoSubnets2.enbx
+++ b/EduNetworkBuilder/Resources/Level1_OneNetTwoSubnets2.enbx
@@ -1,17 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
     <en_message>This network has two different subnets using the same switch.  The router has two interfaces (IP addresses, both on eth0). One network card functions like two.  Ping from the different PCs to machines on the other network.</en_message>
+    <fr_message>Ce réseau a deux sous-réseaux différents utilisant le même commutateur. Le routeur a deux interfaces (adresses IP, les deux sur eth0). Une carte réseau fonctionne comme deux. Ping depuis les différents PC vers les machines de l'autre réseau.</fr_message>
     <en_title>Two Subnets, Shared Network</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>True</showlabels>
+    <showlabels>full</showlabels>
     <level>1</level>
     <sortorder>4.1</sortorder>
     <uniqueidentifier>142</uniqueidentifier>
     <startinghelplevel>full</startinghelplevel>
+    <vlansenabled>False</vlansenabled>
+    <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -38,7 +41,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -47,6 +50,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -61,7 +66,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -70,6 +75,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -84,7 +91,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -93,6 +100,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -107,7 +116,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -116,6 +125,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -130,7 +141,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -139,6 +150,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -153,7 +166,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -162,6 +175,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -176,7 +191,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -185,6 +200,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -199,7 +216,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -208,6 +225,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -222,7 +241,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -231,6 +250,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -260,7 +281,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -269,6 +290,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -283,7 +306,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -292,6 +315,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -321,7 +346,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -330,6 +355,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -344,7 +371,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -353,6 +380,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -382,7 +411,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -391,6 +420,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -405,7 +436,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -414,6 +445,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -443,7 +476,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -452,6 +485,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -466,7 +501,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -475,6 +510,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -504,7 +541,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -513,6 +550,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -527,7 +566,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -536,6 +575,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
         <interface>
           <nicname>eth0</nicname>
@@ -545,6 +586,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
       <nic>
@@ -559,7 +602,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>140</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -568,6 +611,8 @@
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
+          <VLAN
+            ID="1">Untagged</VLAN>
         </interface>
       </nic>
     </device>
@@ -584,7 +629,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>133</uniqueidentifier>
     </link>
@@ -601,7 +646,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port4</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>134</uniqueidentifier>
     </link>
@@ -618,7 +663,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port5</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc2_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>135</uniqueidentifier>
     </link>
@@ -635,7 +680,7 @@
         <hostname>net_switch0</hostname>
         <nicname>port6</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc3_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>136</uniqueidentifier>
     </link>
@@ -652,7 +697,7 @@
         <hostname>router0</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>141</uniqueidentifier>
     </link>
@@ -686,8 +731,11 @@
       <dhost>192.168.2.255</dhost>
       <thetest>SuccessfullyPings</thetest>
     </nettest>
+    <tag>Subnet</tag>
     <tag>Ping</tag>
     <tag>Router</tag>
-    <tag>Subnet</tag>
+    <VLANName
+      ID="1"
+      Color="Blue">Default</VLANName>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1_VPNTraceroute.enbx b/EduNetworkBuilder/Resources/Level1_VPNTraceroute.enbx
index fc6fb0f..04f8693 100644
--- a/EduNetworkBuilder/Resources/Level1_VPNTraceroute.enbx
+++ b/EduNetworkBuilder/Resources/Level1_VPNTraceroute.enbx
@@ -5,16 +5,19 @@
     <en_message>Packets that go through a VPN are "encapsulated."  This means that they are packed up and put inside a VPN packet.  A traceroute packet has a "TTL" (Time to Live).  Every router along the path is supposed to subtract one from theTTL, and when the TTL is zero, the device that has it will drop the traceroute packet and respond to the originating machine.
 
 As you do the traceroutes, notice that the router in the center never responds to the traceroute.  That is because the traceroute packet is encapsulated.  The "outside" packet has a normal TTL, and so the router in the middle never drops the packet.  But, the firewall in the middle decrypts the packet, processes it, and sends it on.  That firewill will respond to the traceroute.</en_message>
+    <fr_message>Les paquets qui passent par un VPN sont "encapsulés". Cela signifie qu'ils sont emballés et placés dans un paquet VPN. Un paquet traceroute a un "TTL" (Time to Live). Chaque routeur le long du chemin est censé soustraire un du TTL, et quand le TTL est zéro, le périphérique qui l'a fait tomber le paquet traceroute et répondre à la machine d'origine.
+
+Lorsque vous effectuez les traceroutes, notez que le routeur au centre ne répond jamais au traceroute. C'est parce que le paquet traceroute est encapsulé. Le paquet "extérieur" a un TTL normal, et donc le routeur au milieu ne fait jamais tomber le paquet. Mais, le pare-feu au milieu déchiffre le paquet, le traite et l'envoie. Ce feu répondra au traceroute.</fr_message>
     <en_title>VPNs and traceroute</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>True</showlabels>
+    <showlabels>full</showlabels>
     <level>2</level>
     <sortorder>1.5</sortorder>
     <uniqueidentifier>186</uniqueidentifier>
     <startinghelplevel>full</startinghelplevel>
-    <vlansenabled>False</vlansenabled>
+    <vlansenabled>True</vlansenabled>
     <VLANPacketColors>False</VLANPacketColors>
     <device>
       <hostname>firewall0</hostname>
@@ -42,8 +45,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -68,8 +69,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>wan</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -94,8 +93,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -120,8 +117,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -147,7 +142,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <uniqueidentifier>157</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
         <encryptionkey>Test</encryptionkey>
-        <ssid />
         <tunnelendpoint>
           <ip>192.168.6.2</ip>
           <mask>255.255.255.0</mask>
@@ -179,7 +173,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <uniqueidentifier>184</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
         <encryptionkey>Secondary</encryptionkey>
-        <ssid />
         <tunnelendpoint>
           <ip>192.168.7.2</ip>
           <mask>255.255.255.0</mask>
@@ -237,8 +230,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -263,8 +254,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>wan</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -289,8 +278,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -315,8 +302,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -342,7 +327,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <uniqueidentifier>156</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
         <encryptionkey>Test</encryptionkey>
-        <ssid />
         <tunnelendpoint>
           <ip>192.168.5.2</ip>
           <mask>255.255.255.0</mask>
@@ -400,8 +384,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>159</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -426,8 +408,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>wan</nictype>
         <uniqueidentifier>162</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -452,8 +432,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>160</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -478,8 +456,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>161</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -505,7 +481,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <uniqueidentifier>185</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
         <encryptionkey>Secondary</encryptionkey>
-        <ssid />
         <tunnelendpoint>
           <ip>192.168.5.2</ip>
           <mask>255.255.255.0</mask>
@@ -563,8 +538,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -589,8 +562,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -630,8 +601,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -656,8 +625,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -697,8 +664,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>177</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -723,8 +688,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>178</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -764,8 +727,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -790,8 +751,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>management_interface</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -816,8 +775,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -842,8 +799,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -868,8 +823,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -894,8 +847,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -920,8 +871,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -946,8 +895,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -972,8 +919,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1013,8 +958,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1039,8 +982,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>management_interface</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1065,8 +1006,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1091,8 +1030,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1117,8 +1054,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1143,8 +1078,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1169,8 +1102,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1195,8 +1126,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1221,8 +1150,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1262,8 +1189,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>164</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1288,8 +1213,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>management_interface</nictype>
         <uniqueidentifier>165</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1314,8 +1237,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>166</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1340,8 +1261,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>167</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1366,8 +1285,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>168</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1392,8 +1309,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>169</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1418,8 +1333,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>170</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1444,8 +1357,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>171</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1470,8 +1381,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>port</nictype>
         <uniqueidentifier>172</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1511,8 +1420,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1537,8 +1444,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1578,8 +1483,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1604,8 +1507,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1645,8 +1546,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>174</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1671,8 +1570,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>175</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1712,8 +1609,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>lo</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1738,8 +1633,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1764,8 +1657,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1790,8 +1681,6 @@ As you do the traceroutes, notice that the router in the center never responds t
         <nictype>eth</nictype>
         <uniqueidentifier>182</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth2</nicname>
           <myip>
@@ -1818,7 +1707,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>net_switch0</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>laptop0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>147</uniqueidentifier>
     </link>
@@ -1835,7 +1724,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>pc2</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch2_link_pc2</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>179</uniqueidentifier>
     </link>
@@ -1852,7 +1741,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>146</uniqueidentifier>
     </link>
@@ -1869,7 +1758,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>net_switch1</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc1_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>149</uniqueidentifier>
     </link>
@@ -1886,7 +1775,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>net_switch1</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>laptop1_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>150</uniqueidentifier>
     </link>
@@ -1903,7 +1792,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>net_switch2</hostname>
         <nicname>port3</nicname>
       </DstNic>
-      <hostname />
+      <hostname>firewall2_link_net_switch2</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>181</uniqueidentifier>
     </link>
@@ -1920,7 +1809,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>router0</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>firewall1_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>153</uniqueidentifier>
     </link>
@@ -1937,7 +1826,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>firewall0</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_firewall0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>154</uniqueidentifier>
     </link>
@@ -1954,7 +1843,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>router0</hostname>
         <nicname>eth1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>firewall0_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>155</uniqueidentifier>
     </link>
@@ -1971,7 +1860,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>firewall1</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch1_link_firewall1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>152</uniqueidentifier>
     </link>
@@ -1988,7 +1877,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>laptop2</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch2_link_laptop2</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>180</uniqueidentifier>
     </link>
@@ -2005,7 +1894,7 @@ As you do the traceroutes, notice that the router in the center never responds t
         <hostname>router0</hostname>
         <nicname>eth2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>firewall2_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>183</uniqueidentifier>
     </link>